From 1ef517d87ee89417fef98de1f275f107da3f495a Mon Sep 17 00:00:00 2001
From: Ryan Holmes <holmes.ryan.90@gmail.com>
Date: Mon, 4 Mar 2019 10:09:05 -0500
Subject: [PATCH 01/32] Preliminary support for a "all effects" module to help
 with import times hopefully

---
 eos/gamedata.py          | 15 +++++++++++++--
 scripts/effect_rollup.py | 24 ++++++++++++++++++++++++
 2 files changed, 37 insertions(+), 2 deletions(-)
 create mode 100644 scripts/effect_rollup.py

diff --git a/eos/gamedata.py b/eos/gamedata.py
index 1abb3f69b..ef92dcca1 100644
--- a/eos/gamedata.py
+++ b/eos/gamedata.py
@@ -25,6 +25,7 @@ import eos.db
 from .eqBase import EqBase
 from eos.saveddata.price import Price as types_Price
 from collections import OrderedDict
+import importlib
 
 
 from logbook import Logger
@@ -156,9 +157,19 @@ class Effect(EqBase):
         Grab the handler, type and runTime from the effect code if it exists,
         if it doesn't, set dummy values and add a dummy handler
         """
-
         try:
-            self.__effectModule = effectModule = __import__('eos.effects.' + self.handlerName, fromlist=True)
+            import eos.effects.all as all
+            func = getattr(all, self.handlerName)
+            self.__effectModule = effectModule = func()
+            self.__handler = getattr(effectModule, "handler", effectDummy)
+            self.__runTime = getattr(effectModule, "runTime", "normal")
+            self.__activeByDefault = getattr(effectModule, "activeByDefault", True)
+            t = getattr(effectModule, "type", None)
+
+            t = t if isinstance(t, tuple) or t is None else (t,)
+            self.__type = t
+        except ImportError as e:
+            self.__effectModule = effectModule = importlib.import_module('eos.effects.' + self.handlerName)
             self.__handler = getattr(effectModule, "handler", effectDummy)
             self.__runTime = getattr(effectModule, "runTime", "normal")
             self.__activeByDefault = getattr(effectModule, "activeByDefault", True)
diff --git a/scripts/effect_rollup.py b/scripts/effect_rollup.py
new file mode 100644
index 000000000..bb8abfb67
--- /dev/null
+++ b/scripts/effect_rollup.py
@@ -0,0 +1,24 @@
+import os
+import os.path
+
+new_effect_file_contents = ""
+
+for filename in os.listdir(os.path.join('eos', 'effects')):
+    if filename.startswith("_") or not filename.endswith(".py") or filename == 'all.py':
+        continue
+
+    new_effect_file_contents += f"def {os.path.splitext(filename)[0]}():\n"
+
+    file = open(os.path.join('eos', 'effects', filename), "r")
+
+    for line in file:
+        if line.strip().startswith("#") or line.strip() == "":
+            continue
+        new_effect_file_contents += f"    {line}"
+
+    new_effect_file_contents += "\n    return locals()\n\n"
+
+with open(os.path.join('eos', 'effects', 'all.py'), "w") as f:
+    f.write(new_effect_file_contents)
+
+

From b7f53e840263ebaae817f391ecca6a4a33419bad Mon Sep 17 00:00:00 2001
From: Ryan Holmes <holmes.ryan.90@gmail.com>
Date: Mon, 4 Mar 2019 10:09:52 -0500
Subject: [PATCH 02/32] Ignore the all effects file to avoid accidentally
 commiting it

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index a9eb5e25c..09b400aab 100644
--- a/.gitignore
+++ b/.gitignore
@@ -123,3 +123,4 @@ gitversion
 *.swp
 
 *.fsdbinary
+/eos/effects/all.py

From e3971c995e7ed5bb6d29d14427f2bc55670bab8d Mon Sep 17 00:00:00 2001
From: Ryan Holmes <holmes.ryan.90@gmail.com>
Date: Mon, 4 Mar 2019 19:53:19 -0500
Subject: [PATCH 03/32] Fix windows build to use effect rollups

---
 .appveyor.yml | 2 ++
 pyfa.spec     | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/.appveyor.yml b/.appveyor.yml
index 821bbe7d3..8c740b418 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -61,6 +61,8 @@ before_build:
   - ps: $env:PYFA_VERSION = (python ./scripts/dump_version.py)
   - ps: echo("pyfa version ")
   - ps: echo ($env:PYFA_VERSION)
+  - ps: python ./scripts/effect_rollup.py
+
 
 build_script:
   - ECHO "Build pyfa:"
diff --git a/pyfa.spec b/pyfa.spec
index d3156bb80..4f4dda6c7 100644
--- a/pyfa.spec
+++ b/pyfa.spec
@@ -55,7 +55,7 @@ import_these = [
 ]
 
 # Walk directories that do dynamic importing
-paths = ('eos/effects', 'eos/db/migrations', 'service/conversions')
+paths = ('eos/db/migrations', 'service/conversions')
 for root, folders, files in chain.from_iterable(os.walk(path) for path in paths):
     for file_ in files:
         if file_.endswith(".py") and not file_.startswith("_"):

From 23d945c7f2238f0a24579a02eba7d2a266c8d00f Mon Sep 17 00:00:00 2001
From: Ryan Holmes <holmes.ryan.90@gmail.com>
Date: Mon, 4 Mar 2019 20:45:44 -0500
Subject: [PATCH 04/32] disable effect imports to ensure proper handling when
 building

---
 eos/gamedata.py | 31 +++++++++++++++++--------------
 1 file changed, 17 insertions(+), 14 deletions(-)

diff --git a/eos/gamedata.py b/eos/gamedata.py
index ef92dcca1..658a8c82b 100644
--- a/eos/gamedata.py
+++ b/eos/gamedata.py
@@ -161,22 +161,22 @@ class Effect(EqBase):
             import eos.effects.all as all
             func = getattr(all, self.handlerName)
             self.__effectModule = effectModule = func()
-            self.__handler = getattr(effectModule, "handler", effectDummy)
-            self.__runTime = getattr(effectModule, "runTime", "normal")
-            self.__activeByDefault = getattr(effectModule, "activeByDefault", True)
-            t = getattr(effectModule, "type", None)
-
-            t = t if isinstance(t, tuple) or t is None else (t,)
-            self.__type = t
-        except ImportError as e:
-            self.__effectModule = effectModule = importlib.import_module('eos.effects.' + self.handlerName)
-            self.__handler = getattr(effectModule, "handler", effectDummy)
-            self.__runTime = getattr(effectModule, "runTime", "normal")
-            self.__activeByDefault = getattr(effectModule, "activeByDefault", True)
-            t = getattr(effectModule, "type", None)
+            self.__handler = effectModule.get("handler", effectDummy)
+            self.__runTime = effectModule.get("runTime", "normal")
+            self.__activeByDefault = effectModule.get("activeByDefault", True)
+            t = effectModule.get("type", None)
 
             t = t if isinstance(t, tuple) or t is None else (t,)
             self.__type = t
+        # except ImportError as e:
+        #     self.__effectModule = effectModule = importlib.import_module('eos.effects.' + self.handlerName)
+        #     self.__handler = getattr(effectModule, "handler", effectDummy)
+        #     self.__runTime = getattr(effectModule, "runTime", "normal")
+        #     self.__activeByDefault = getattr(effectModule, "activeByDefault", True)
+        #     t = getattr(effectModule, "type", None)
+        #
+        #     t = t if isinstance(t, tuple) or t is None else (t,)
+        #     self.__type = t
         except ImportError as e:
             # Effect probably doesn't exist, so create a dummy effect and flag it with a warning.
             self.__handler = effectDummy
@@ -205,7 +205,10 @@ class Effect(EqBase):
         if not self.__generated:
             self.__generateHandler()
 
-        return getattr(self.__effectModule, key, None)
+        try:
+            return self.__effectModule.get(key, None)
+        except:
+            return getattr(self.__effectModule, key, None)
 
 
 def effectDummy(*args, **kwargs):

From dd9390384e0c35d2e2e7f06c3c266f5e0ed44e90 Mon Sep 17 00:00:00 2001
From: Ryan Holmes <holmes.ryan.90@gmail.com>
Date: Sat, 9 Mar 2019 09:05:39 -0500
Subject: [PATCH 05/32] remove effect file adding in the pyfa.spec file (for
 dev only)

---
 dist_assets/win/pyfa.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dist_assets/win/pyfa.spec b/dist_assets/win/pyfa.spec
index 1bdf820f0..09fac9e28 100644
--- a/dist_assets/win/pyfa.spec
+++ b/dist_assets/win/pyfa.spec
@@ -33,7 +33,7 @@ import_these = [
 ]
 
 # Walk directories that do dynamic importing
-paths = ('eos/effects', 'eos/db/migrations', 'service/conversions')
+paths = ('eos/db/migrations', 'service/conversions')
 for root, folders, files in chain.from_iterable(os.walk(path) for path in paths):
     for file_ in files:
         if file_.endswith(".py") and not file_.startswith("_"):

From 81d040fba687b841dce73e81159def94ccd41344 Mon Sep 17 00:00:00 2001
From: Ryan Holmes <holmes.ryan.90@gmail.com>
Date: Sat, 16 Mar 2019 14:08:20 -0400
Subject: [PATCH 06/32] Convert all effect files to `effect<ID>.py`

---
 eos/effects/{targetattack.py => effect10.py}  |  0
 ...usgunshipcaprecharge2.py => effect1001.py} |  0
 ...laserpulsedamagebonus.py => effect1003.py} |  0
 ...llaserbeamdamagebonus.py => effect1004.py} |  0
 ...ridblasterdamagebonus.py => effect1005.py} |  0
 ...hybridraildamagebonus.py => effect1006.py} |  0
 ...ojectileacdamagebonus.py => effect1007.py} |  0
 ...ectileartydamagebonus.py => effect1008.py} |  0
 ...laserpulsedamagebonus.py => effect1009.py} |  0
 eos/effects/{usemissiles.py => effect101.py}  |  0
 ...mlaserbeamdamagebonus.py => effect1010.py} |  0
 ...ridblasterdamagebonus.py => effect1011.py} |  0
 ...hybridraildamagebonus.py => effect1012.py} |  0
 ...ojectileacdamagebonus.py => effect1013.py} |  0
 ...ectileartydamagebonus.py => effect1014.py} |  0
 ...laserpulsedamagebonus.py => effect1015.py} |  0
 ...elaserbeamdamagebonus.py => effect1016.py} |  0
 ...ridblasterdamagebonus.py => effect1017.py} |  0
 ...hybridraildamagebonus.py => effect1018.py} |  0
 ...ojectileacdamagebonus.py => effect1019.py} |  0
 ...ectileartydamagebonus.py => effect1020.py} |  0
 ...onusgunshiphybriddmg2.py => effect1021.py} |  0
 ...heavyvelocitybonuscc2.py => effect1024.py} |  0
 ...lightvelocitybonuscc2.py => effect1025.py} |  0
 ...ingremotearmorsystems.py => effect1030.py} |  0
 ...tearmorrepaircapneed1.py => effect1033.py} |  0
 ...tearmorrepaircapneed2.py => effect1034.py} |  0
 ...hieldtransfercapneed2.py => effect1035.py} |  0
 ...hieldtransfercapneed1.py => effect1036.py} |  0
 ...ipremotearmorrangegc1.py => effect1046.py} |  0
 ...ipremotearmorrangeac2.py => effect1047.py} |  0
 ...hieldtransferrangecc1.py => effect1048.py} |  0
 ...hieldtransferrangemc2.py => effect1049.py} |  0
 ...gunshiphybridoptimal1.py => effect1056.py} |  0
 ...hipprojectileoptimal1.py => effect1057.py} |  0
 ...ygunshiplaseroptimal1.py => effect1058.py} |  0
 ...hipprojectilefalloff1.py => effect1060.py} |  0
 ...eavygunshiphybriddmg2.py => effect1061.py} |  0
 ...heavygunshiplaserdmg2.py => effect1062.py} |  0
 ...ipprojectiletracking2.py => effect1063.py} |  0
 ...gunshiphybridfalloff1.py => effect1080.py} |  0
 ...avymissileflighttime1.py => effect1081.py} |  0
 ...ghtmissileflighttime1.py => effect1082.py} |  0
 ...hipdronecontrolrange1.py => effect1084.py} |  0
 ...gunshipprojectiledmg2.py => effect1087.py} |  0
 ...projectiletrackingmf2.py => effect1099.py} |  0
 ...lskillabmwdspeedboost.py => effect1176.py} |  0
 ...usgunshiplaserdamage2.py => effect1179.py} |  0
 ...cattributemodifyonline.py => effect118.py} |  0
 ...nergytransfercapneed1.py => effect1181.py} |  0
 ...penergytransferrange1.py => effect1182.py} |  0
 ...nergytransfercapneed2.py => effect1183.py} |  0
 ...penergytransferrange2.py => effect1184.py} |  0
 ...itterarraysigdecrease.py => effect1185.py} |  0
 ...equiringiceharvesting.py => effect1190.py} |  0
 ...{mininginfomultiplier.py => effect1200.py} |  0
 ...stalminingamountinfo2.py => effect1212.py} |  0
 ...penergydrainamountaf1.py => effect1215.py} |  0
 ...spiratesmallhybriddmg.py => effect1218.py} |  0
 ...transferamountbonusab.py => effect1219.py} |  0
 ...transferamountbonusac.py => effect1220.py} |  0
 ...stasiswebrangebonusmb.py => effect1221.py} |  0
 ...tasiswebrangebonusmc2.py => effect1222.py} |  0
 ...pprojectiletrackinggf.py => effect1228.py} |  0
 ...ypiratefactionfrigate.py => effect1230.py} |  0
 ...ctilerofpiratecruiser.py => effect1232.py} |  0
 ...ybriddmgpiratecruiser.py => effect1233.py} |  0
 ...itypiratefactionlight.py => effect1234.py} |  0
 ...lerofpiratebattleship.py => effect1239.py} |  0
 ...iddmgpiratebattleship.py => effect1240.py} |  0
 .../{setbonusbloodraider.py => effect1255.py} |  0
 ...sbloodraidernosferatu.py => effect1256.py} |  0
 .../{setbonusserpentis.py => effect1261.py}   |  0
 ...ceptor2hybridtracking.py => effect1264.py} |  0
 ...rceptor2lasertracking.py => effect1268.py} |  0
 ...ucturalanalysiseffect.py => effect1281.py} |  0
 ...killscanstrengthbonus.py => effect1318.py} |  0
 ...apneedbonusskilllevel.py => effect1360.py} |  0
 ...apneedbonusskilllevel.py => effect1361.py} |  0
 ...apneedbonusskilllevel.py => effect1370.py} |  0
 ...llewcapneedskilllevel.py => effect1372.py} |  0
 ...boostamplifierpassive.py => effect1395.py} |  0
 .../{setbonusguristas.py => effect1397.py}    |  0
 ...tionskillastrometrics.py => effect1409.py} |  0
 ...apneedbonusskilllevel.py => effect1410.py} |  0
 ...pbonushybridoptimalcb.py => effect1412.py} |  0
 ...ldarishipewstrengthcb.py => effect1434.py} |  0
 ...shipewoptimalrangecb3.py => effect1441.py} |  0
 ...shipewoptimalrangecc2.py => effect1442.py} |  0
 ...shipewcapacitorneedcc.py => effect1443.py} |  0
 ...skillrsdmaxrangebonus.py => effect1445.py} |  0
 ...wskilltpmaxrangebonus.py => effect1446.py} |  0
 ...wskilltdmaxrangebonus.py => effect1448.py} |  0
 ...wskillrsdfalloffbonus.py => effect1449.py} |  0
 ...ewskilltpfalloffbonus.py => effect1450.py} |  0
 ...ewskilltdfalloffbonus.py => effect1451.py} |  0
 ...wskillewmaxrangebonus.py => effect1452.py} |  0
 ...ewskillewfalloffbonus.py => effect1453.py} |  0
 ...killaoecloudsizebonus.py => effect1472.py} |  0
 ...ostcapacitorneedbonus.py => effect1500.py} |  0
 ...paintingstrengthbonus.py => effect1550.py} |  0
 ...hipewtargetpaintermf2.py => effect1551.py} |  0
 ...iringlargehybridturret.py => effect157.py} |  0
 .../{angelsetbonus.py => effect1577.py}       |  0
 .../{setbonussansha.py => effect1579.py}      |  0
 ...driveskillsrangebonus.py => effect1581.py} |  0
 ...urretskilllaserdamage.py => effect1585.py} |  0
 ...skillprojectiledamage.py => effect1586.py} |  0
 ...rretskillhybriddamage.py => effect1587.py} |  0
 ...lcitadelkineticdamage.py => effect1588.py} |  0
 ...ringmediumenergyturret.py => effect159.py} |  0
 ...skillaoevelocitybonus.py => effect1590.py} |  0
 ...rskillcitadelemdamage.py => effect1592.py} |  0
 ...itadelexplosivedamage.py => effect1593.py} |  0
 ...lcitadelthermaldamage.py => effect1594.py} |  0
 ...upgradesemdamagebonus.py => effect1595.py} |  0
 ...sexplosivedamagebonus.py => effect1596.py} |  0
 ...deskineticdamagebonus.py => effect1597.py} |  0
 ...ringmediumhybridturret.py => effect160.py} |  0
 ...mediumprojectileturret.py => effect161.py} |  0
 ...ipcommandagilitybonus.py => effect1615.py} |  0
 ...lshipsadvancedagility.py => effect1616.py} |  0
 ...ipcapitalagilitybonus.py => effect1617.py} |  0
 ...iringlargeenergyturret.py => effect162.py} |  0
 ...illcapacitorneedbonus.py => effect1634.py} |  0
 ...emsskilldurationbonus.py => effect1635.py} |  0
 ...pgradespowerneedbonus.py => effect1638.py} |  0
 ...rmoredcommandmindlink.py => effect1643.py} |  0
 ...irmishcommandmindlink.py => effect1644.py} |  0
 ...shieldcommandmindlink.py => effect1645.py} |  0
 ...mationcommandmindlink.py => effect1646.py} |  0
 ...sumptionquantitybonus.py => effect1650.py} |  0
 ...desthermaldamagebonus.py => effect1657.py} |  0
 ...freightercargobonusa2.py => effect1668.py} |  0
 ...freightercargobonusc2.py => effect1669.py} |  0
 ...freightercargobonusg2.py => effect1670.py} |  0
 ...freightercargobonusm2.py => effect1671.py} |  0
 ...termaxvelocitybonusa1.py => effect1672.py} |  0
 ...termaxvelocitybonusc1.py => effect1673.py} |  0
 ...termaxvelocitybonusg1.py => effect1674.py} |  0
 ...termaxvelocitybonusm1.py => effect1675.py} |  0
 eos/effects/{mining.py => effect17.py}        |  0
 ...iringsmallenergyturret.py => effect172.py} |  0
 ...{shieldboostamplifier.py => effect1720.py} |  0
 ...llscapacitorneedbonus.py => effect1722.py} |  0
 ...iringsmallhybridturret.py => effect173.py} |  0
 .../{dronedmgbonus.py => effect1730.py}       |  0
 eos/effects/{dohacking.py => effect1738.py}   |  0
 ...gsmallprojectileturret.py => effect174.py} |  0
 ...skillrapidlauncherrof.py => effect1763.py} |  0
 ...ojectilevelocitybonus.py => effect1764.py} |  0
 ...hipbonusshtfalloffgf2.py => effect1773.py} |  0
 ...parmoremresistanceaf1.py => effect1804.py} |  0
 ...parmorthresistanceaf1.py => effect1805.py} |  0
 ...parmorknresistanceaf1.py => effect1806.py} |  0
 ...parmorexresistanceaf1.py => effect1807.py} |  0
 ...shieldemresistancecc2.py => effect1812.py} |  0
 ...dthermalresistancecc2.py => effect1813.py} |  0
 ...dkineticresistancecc2.py => effect1814.py} |  0
 ...xplosiveresistancecc2.py => effect1815.py} |  0
 ...shieldemresistancecf2.py => effect1816.py} |  0
 ...dthermalresistancecf2.py => effect1817.py} |  0
 ...dkineticresistancecf2.py => effect1819.py} |  0
 ...xplosiveresistancecf2.py => effect1820.py} |  0
 ...miningforemanmindlink.py => effect1848.py} |  0
 eos/effects/{selfrof.py => effect1851.py}     |  0
 ...hipmissileemdamagecf2.py => effect1862.py} |  0
 ...ssilethermaldamagecf2.py => effect1863.py} |  0
 ...ileexplosivedamagecf2.py => effect1864.py} |  0
 ...gyieldmultiplypercent.py => effect1882.py} |  0
 ...selauncherrofbonus2cb.py => effect1885.py} |  0
 ...gelauncherrofbonus2cb.py => effect1886.py} |  0
 ...estingcycletimebarge3.py => effect1896.py} |  0
 ...usvampiredrainamount2.py => effect1910.py} |  0
 ...sgravimetricstrength2.py => effect1911.py} |  0
 ...agnetometricstrength2.py => effect1912.py} |  0
 ...onbonusradarstrength2.py => effect1913.py} |  0
 ...onbonusladarstrength2.py => effect1914.py} |  0
 ...ereconstasiswebbonus2.py => effect1921.py} |  0
 ...nscramblerrangebonus2.py => effect1922.py} |  0
 ...rmorreinforcermassadd.py => effect1959.py} |  0
 ...hieldtransfercapneed1.py => effect1964.py} |  0
 ...armorrepaircapneedgc1.py => effect1969.py} |  0
 ...hipewcapacitorneedcf2.py => effect1996.py} |  0
 .../{dronerangebonusadd.py => effect2000.py}  |  0
 ...ynosuraldurationbonus.py => effect2008.py} |  0
 ...dronemaxvelocitybonus.py => effect2013.py} |  0
 .../{dronemaxrangebonus.py => effect2014.py}  |  0
 ...abilityshieldcapbonus.py => effect2015.py} |  0
 ...urabilityarmorhpbonus.py => effect2016.py} |  0
 ...ronedurabilityhpbonus.py => effect2017.py} |  0
 ...droneshieldbonusbonus.py => effect2019.py} |  0
 ...rmordamageamountbonus.py => effect2020.py} |  0
 ...addtosignatureradius2.py => effect2029.py} |  0
 ...rresonancepostpercent.py => effect2041.py} |  0
 ...dresonancepostpercent.py => effect2052.py} |  0
 ...ngbonusgroupshieldamp.py => effect2053.py} |  0
 ...ngbonusgroupshieldamp.py => effect2054.py} |  0
 ...ngbonusgroupshieldamp.py => effect2055.py} |  0
 ...ngbonusgroupshieldamp.py => effect2056.py} |  0
 ...ieldcapacitybonusonline.py => effect21.py} |  0
 ...onusgrouparmorcoating.py => effect2105.py} |  0
 ...onusgrouparmorcoating.py => effect2106.py} |  0
 ...onusgrouparmorcoating.py => effect2107.py} |  0
 ...onusgrouparmorcoating.py => effect2108.py} |  0
 ...ngbonusgroupenergized.py => effect2109.py} |  0
 ...ngbonusgroupenergized.py => effect2110.py} |  0
 ...ngbonusgroupenergized.py => effect2111.py} |  0
 ...ngbonusgroupenergized.py => effect2112.py} |  0
 ...equiringsensorupgrades.py => effect212.py} |  0
 ...llhybridmaxrangebonus.py => effect2130.py} |  0
 ...llenergymaxrangebonus.py => effect2131.py} |  0
 ...ojectilemaxrangebonus.py => effect2132.py} |  0
 ...ferarraymaxrangebonus.py => effect2133.py} |  0
 ...nsportermaxrangebonus.py => effect2134.py} |  0
 ...rojectormaxrangebonus.py => effect2135.py} |  0
 ...kedtargetslocationchar.py => effect214.py} |  0
 ...hipewtargetpaintermc2.py => effect2143.py} |  0
 ...ipprojectiledamagecs1.py => effect2155.py} |  0
 ...pprojectilefalloffcs2.py => effect2156.py} |  0
 ...andshiplaserdamagecs1.py => effect2157.py} |  0
 ...ommandshiplaserrofcs2.py => effect2158.py} |  0
 ...dshiphybridfalloffcs2.py => effect2160.py} |  0
 ...dshiphybridoptimalcs1.py => effect2161.py} |  0
 ...onusdronehitpointsgc2.py => effect2179.py} |  0
 ...ronehitpointsfixedac2.py => effect2181.py} |  0
 ...onusdronehitpointsgb2.py => effect2186.py} |  0
 ...nedamagemultipliergb2.py => effect2187.py} |  0
 ...nedamagemultipliergc2.py => effect2188.py} |  0
 ...nedamagemultiplierac2.py => effect2189.py} |  0
 ...missilekineticdamage1.py => effect2200.py} |  0
 ...orsprojectilefalloff1.py => effect2201.py} |  0
 ...ratefrigateprojdamage.py => effect2215.py} |  0
 ...axvelocitylocationship.py => effect223.py} |  0
 ...gthbonuspercentonline.py => effect2232.py} |  0
 ...sdroneminingamountac2.py => effect2249.py} |  0
 ...sdroneminingamountgc2.py => effect2250.py} |  0
 ...dshipmultirelayeffect.py => effect2251.py} |  0
 ...cloakmoduledelaybonus.py => effect2252.py} |  0
 ...rtargettingdelaybonus.py => effect2253.py} |  0
 .../{tractorbeamcan.py => effect2255.py}      |  0
 ...onshipgroupafterburner.py => effect227.py} |  0
 ...thbonuspercentpassive.py => effect2298.py} |  0
 ...esrequiringafterburner.py => effect230.py} |  0
 .../{damagecontrol.py => effect2302.py}       |  0
 ...onusenergyneutamount2.py => effect2305.py} |  0
 ...acitorneedlocationship.py => effect235.py} |  0
 ...irercapneedbonusskill.py => effect2354.py} |  0
 ...sfercapneedbonusskill.py => effect2355.py} |  0
 ...sfercapneedbonusskill.py => effect2356.py} |  0
 ...llsuperweapondmgbonus.py => effect2402.py} |  0
 ...onshipgroupafterburner.py => effect242.py} |  0
 ...{implantvelocitybonus.py => effect2422.py} |  0
 ...apacitorcapacitybonus.py => effect2432.py} |  0
 ...inghighspeedmanuvering.py => effect244.py} |  0
 ...usagemultiplypercent2.py => effect2444.py} |  0
 ...eminercpuusagepercent.py => effect2445.py} |  0
 ...gminingupgradepercent.py => effect2456.py} |  0
 ...hipbonusarmorresistab.py => effect2465.py} |  0
 ...ngiceharvestingonline.py => effect2479.py} |  0
 ...{implantarmorhpbonus2.py => effect2485.py} |  0
 ...implantvelocitybonus2.py => effect2488.py} |  0
 ...kingcomputerfalloffmc.py => effect2489.py} |  0
 ...ingcomputerfalloffgc2.py => effect2490.py} |  0
 ...illecmburstrangebonus.py => effect2491.py} |  0
 ...lecmburstcapneedbonus.py => effect2492.py} |  0
 ...{capacitorcapacitybonus.py => effect25.py} |  0
 ...hiphttrackingbonusgb2.py => effect2503.py} |  0
 ...onushybridtrackinggf2.py => effect2504.py} |  0
 ...tshipmissilevelocity1.py => effect2561.py} |  0
 ...hancebonuspostpercent.py => effect2589.py} |  0
 .../{structurerepair.py => effect26.py}       |  0
 ...emshieldresistancecb2.py => effect2602.py} |  0
 ...veshieldresistancecb2.py => effect2603.py} |  0
 ...icshieldresistancecb2.py => effect2604.py} |  0
 ...icshieldresistancecb2.py => effect2605.py} |  0
 ...shipprojectiledamage1.py => effect2611.py} |  0
 ...signatureradiusonline.py => effect2644.py} |  0
 ...utionmultiplieronline.py => effect2645.py} |  0
 .../{maxtargetrangebonus.py => effect2646.py} |  0
 ...vymissilelaunhcerrof2.py => effect2647.py} |  0
 ...ltmissilelaunhcerrof2.py => effect2648.py} |  0
 ...ltmissilelaunhcerrof2.py => effect2649.py} |  0
 ...osteractivepercentage.py => effect2670.py} |  0
 ...needbonuseffectlasers.py => effect2688.py} |  0
 ...eedbonuseffecthybrids.py => effect2689.py} |  0
 ...needbonuseffectlasers.py => effect2690.py} |  0
 ...needbonuseffecthybrid.py => effect2691.py} |  0
 ...loffbonuseffectlasers.py => effect2693.py} |  0
 ...offbonuseffecthybrids.py => effect2694.py} |  0
 ...onuseffectprojectiles.py => effect2695.py} |  0
 ...angebonuseffectlasers.py => effect2696.py} |  0
 ...ngebonuseffecthybrids.py => effect2697.py} |  0
 ...onuseffectprojectiles.py => effect2698.py} |  0
 eos/effects/{armorrepair.py => effect27.py}   |  0
 ...awbackpowerneedlasers.py => effect2706.py} |  0
 ...wbackpowerneedhybrids.py => effect2707.py} |  0
 ...kpowerneedprojectiles.py => effect2708.py} |  0
 ...tpercenthplocationship.py => effect271.py} |  0
 .../{drawbackarmorhp.py => effect2712.py}     |  0
 .../{drawbackcpuoutput.py => effect2713.py}   |  0
 ...wbackcpuneedlaunchers.py => effect2714.py} |  0
 .../{drawbacksigrad.py => effect2716.py}      |  0
 .../{drawbackmaxvelocity.py => effect2717.py} |  0
 ...rawbackshieldcapacity.py => effect2718.py} |  0
 ...requiringrepairsystems.py => effect272.py} |  0
 .../{miningclouds.py => effect2726.py}        |  0
 ...ingmaxgroupskilllevel.py => effect2727.py} |  0
 ...equiringshieldupgrades.py => effect273.py} |  0
 ...cmscanstrengthbonuscf.py => effect2734.py} |  0
 ...boosterarmorhppenalty.py => effect2735.py} |  0
 ...orrepairamountpenalty.py => effect2736.py} |  0
 ...shieldcapacitypenalty.py => effect2737.py} |  0
 ...etoptimalrangepenalty.py => effect2739.py} |  0
 ...rturretfalloffpenalty.py => effect2741.py} |  0
 ...acitorcapacitypenalty.py => effect2745.py} |  0
 ...termaxvelocitypenalty.py => effect2746.py} |  0
 ...turrettrackingpenalty.py => effect2747.py} |  0
 ...issilevelocitypenalty.py => effect2748.py} |  0
 ...losionvelocitypenalty.py => effect2749.py} |  0
 ...nusecmstrengthbonuscc.py => effect2756.py} |  0
 eos/effects/{salvaging.py => effect2757.py}   |  0
 ...boosterarmorpenalties.py => effect2760.py} |  0
 ...yboostershieldpenalty.py => effect2763.py} |  0
 ...tyandcapacitorpenalty.py => effect2766.py} |  0
 ...llboostuniformitybonus.py => effect277.py} |  0
 ...boostermissilepenalty.py => effect2776.py} |  0
 ...yboosterturretpenalty.py => effect2778.py} |  0
 ...gshieldemmisionsystems.py => effect279.py} |  0
 ...sioncloudpenaltyfixed.py => effect2791.py} |  0
 ...ncepostpercentpassive.py => effect2792.py} |  0
 ...ltybonuseffectpassive.py => effect2794.py} |  0
 ...ncepostpercentpassive.py => effect2795.py} |  0
 ...reductionbonuspassive.py => effect2796.py} |  0
 ...nspeedmultiplypassive.py => effect2797.py} |  0
 ...damagemultiplypassive.py => effect2798.py} |  0
 ...peedmultiplierpassive.py => effect2799.py} |  0
 ...nspeedmultiplypassive.py => effect2801.py} |  0
 ...damagemultiplypassive.py => effect2802.py} |  0
 ...damagemultiplypassive.py => effect2803.py} |  0
 ...nspeedmultiplypassive.py => effect2804.py} |  0
 ...energyweapondamageab2.py => effect2805.py} |  0
 ...ssilevelocitybonuscc2.py => effect2809.py} |  0
 ...ultmissileflighttime1.py => effect2810.py} |  0
 ...mburstoptimalrangecb3.py => effect2812.py} |  0
 .../{armorhpbonusadd.py => effect2837.py}     |  0
 ...erytrackingspeedbonus.py => effect2847.py} |  0
 ...errequiringarchaelogy.py => effect2848.py} |  0
 ...ifierrequiringhacking.py => effect2849.py} |  0
 ...usforgroupafterburner.py => effect2850.py} |  0
 ...issiledmgbonuspassive.py => effect2851.py} |  0
 ...uslrsmcloakingpassive.py => effect2853.py} |  0
 .../{cynosuralgeneration.py => effect2857.py} |  0
 .../{velocitybonusonline.py => effect2865.py} |  0
 ...biologytimebonusfixed.py => effect2866.py} |  0
 ...entrydronedamagebonus.py => effect2867.py} |  0
 ...capitalarmorrepairers.py => effect2868.py} |  0
 ...odulesrequiringgunnery.py => effect287.py} |  0
 ...velocitybonusdefender.py => effect2872.py} |  0
 ...sileemdmgbonuscruise3.py => effect2881.py} |  0
 ...losivedmgbonuscruise3.py => effect2882.py} |  0
 ...ineticdmgbonuscruise3.py => effect2883.py} |  0
 ...hermaldmgbonuscruise3.py => effect2884.py} |  0
 ...inggascloudharvesting.py => effect2885.py} |  0
 ...ssileemdmgbonusrocket.py => effect2887.py} |  0
 ...plosivedmgbonusrocket.py => effect2888.py} |  0
 ...kineticdmgbonusrocket.py => effect2889.py} |  0
 ...thermaldmgbonusrocket.py => effect2890.py} |  0
 ...ileemdmgbonusstandard.py => effect2891.py} |  0
 ...osivedmgbonusstandard.py => effect2892.py} |  0
 ...neticdmgbonusstandard.py => effect2893.py} |  0
 ...ermaldmgbonusstandard.py => effect2894.py} |  0
 ...issileemdmgbonusheavy.py => effect2899.py} |  0
 ...odulesrequiringgunnery.py => effect290.py} |  0
 ...xplosivedmgbonusheavy.py => effect2900.py} |  0
 ...ekineticdmgbonusheavy.py => effect2901.py} |  0
 ...ethermaldmgbonusheavy.py => effect2902.py} |  0
 ...{missileemdmgbonusham.py => effect2903.py} |  0
 ...eexplosivedmgbonusham.py => effect2904.py} |  0
 ...ilekineticdmgbonusham.py => effect2905.py} |  0
 ...ilethermaldmgbonusham.py => effect2906.py} |  0
 ...sileemdmgbonustorpedo.py => effect2907.py} |  0
 ...losivedmgbonustorpedo.py => effect2908.py} |  0
 ...ineticdmgbonustorpedo.py => effect2909.py} |  0
 ...hermaldmgbonustorpedo.py => effect2910.py} |  0
 ...duledurationreduction.py => effect2911.py} |  0
 ...sumptionquantitybonus.py => effect2967.py} |  0
 ...irsystemscapneedbonus.py => effect2977.py} |  0
 ...odulesrequiringgunnery.py => effect298.py} |  0
 ...irsystemscapneedbonus.py => effect2980.py} |  0
 ...emoteecmdurationbonus.py => effect2982.py} |  0
 .../{overloadrofbonus.py => effect3001.py}    |  0
 ...loadselfdurationbonus.py => effect3002.py} |  0
 ...ropsbombexplosivedmg1.py => effect3024.py} |  0
 ...erloadselfdamagebonus.py => effect3025.py} |  0
 ...veropsbombkineticdmg1.py => effect3026.py} |  0
 ...veropsbombthermaldmg1.py => effect3027.py} |  0
 ...nuscoveropsbombemdmg1.py => effect3028.py} |  0
 ...dselfemhardeningbonus.py => effect3029.py} |  0
 ...thermalhardeningbonus.py => effect3030.py} |  0
 ...plosivehardeningbonus.py => effect3031.py} |  0
 ...kinetichardeningbonus.py => effect3032.py} |  0
 ...ginvulnerabilitybonus.py => effect3035.py} |  0
 ...eactivationdelaybonus.py => effect3036.py} |  0
 ...velocityofshippassive.py => effect3046.py} |  0
 ...turehpmultiplypassive.py => effect3047.py} |  0
 .../{heatdamagebonus.py => effect3061.py}     |  0
 ...ostmaxactivedronebonus.py => effect315.py} |  0
 ...ortcpuneedbonuseffect.py => effect3169.py} |  0
 ...rmordamagebonuseffect.py => effect3172.py} |  0
 ...hieldbonusbonuseffect.py => effect3173.py} |  0
 ...verloadselfrangebonus.py => effect3174.py} |  0
 ...verloadselfspeedbonus.py => effect3175.py} |  0
 ...dselfecmstrenghtbonus.py => effect3182.py} |  0
 ...amicsskilldamagebonus.py => effect3196.py} |  0
 ...geamountdurationbonus.py => effect3200.py} |  0
 ...eldbonusdurationbonus.py => effect3201.py} |  0
 ...lfofaoecloudsizebonus.py => effect3212.py} |  0
 ...procketexplosivedmgaf.py => effect3234.py} |  0
 ...hiprocketkineticdmgaf.py => effect3235.py} |  0
 ...hiprocketthermaldmgaf.py => effect3236.py} |  0
 .../{shiprocketemdmgaf.py => effect3237.py}   |  0
 ...hiparmoremresistance1.py => effect3241.py} |  0
 ...morthermalresistance1.py => effect3242.py} |  0
 ...morkineticresistance1.py => effect3243.py} |  0
 ...rexplosiveresistance1.py => effect3244.py} |  0
 .../{shipcaprecharge2af.py => effect3249.py}  |  0
 ...sumptionquantitybonus.py => effect3264.py} |  0
 ...figurationorecapital1.py => effect3267.py} |  0
 ...transferamountbonusab.py => effect3297.py} |  0
 ...transferamountbonusac.py => effect3298.py} |  0
 ...transferamountbonusaf.py => effect3299.py} |  0
 ...umpclonebonusskillnew.py => effect3313.py} |  0
 ...uscommandshiparmorhp1.py => effect3331.py} |  0
 ...parmoremresistancemc2.py => effect3335.py} |  0
 ...xplosiveresistancemc2.py => effect3336.py} |  0
 ...rkineticresistancemc2.py => effect3339.py} |  0
 ...rthermalresistancemc2.py => effect3340.py} |  0
 ...orsprojectilefalloff1.py => effect3343.py} |  0
 ...missilevelocitybonus1.py => effect3355.py} |  0
 ...tmissilevelocitybonus.py => effect3356.py} |  0
 ...tmissilevelocitybonus.py => effect3357.py} |  0
 ...nsordampenercapneedgf.py => effect3366.py} |  0
 ...arpscramblermaxrange1.py => effect3367.py} |  0
 ...kshipecmoptimalrange1.py => effect3369.py} |  0
 ...hipstasiswebmaxrange1.py => effect3370.py} |  0
 ...warpscramblercapneed2.py => effect3371.py} |  0
 ...kshipsignatureradius2.py => effect3374.py} |  0
 ...wiringabcapacitorneed.py => effect3379.py} |  0
 .../{warpdisruptsphere.py => effect3380.py}   |  0
 ...energyturrettracking1.py => effect3392.py} |  0
 .../{projectilefired.py => effect34.py}       |  0
 ...lackopscloakvelocity2.py => effect3403.py} |  0
 ...sblackopsmaxvelocity1.py => effect3406.py} |  0
 ...ergyturretdamagerole1.py => effect3415.py} |  0
 ...bridturretdamagerole1.py => effect3416.py} |  0
 ...tileturretdamagerole1.py => effect3417.py} |  0
 ...hybridturrettracking1.py => effect3424.py} |  0
 ...ectileturrettracking1.py => effect3425.py} |  0
 ...ctorbeammaxrangerole2.py => effect3427.py} |  0
 ...torsewtargetpainting1.py => effect3439.py} |  0
 ...shipbonusptfalloffmb1.py => effect3447.py} |  0
 ...tackshiprechargerate2.py => effect3466.py} |  0
 ...hipcapacitorcapacity2.py => effect3467.py} |  0
 ...torwarpscramblerange2.py => effect3468.py} |  0
 ...xtractorvelocityrole3.py => effect3473.py} |  0
 ...amagepiratebattleship.py => effect3478.py} |  0
 .../{shiptrackingbonusab.py => effect3480.py} |  0
 ...etdamagepiratefaction.py => effect3483.py} |  0
 ...ergyturrettrackingac2.py => effect3484.py} |  0
 ...etdamagepiratefaction.py => effect3487.py} |  0
 ...ergyturrettracking2af.py => effect3489.py} |  0
 ...alcargoscanrangebonus.py => effect3493.py} |  0
 ...rveyscannerrangebonus.py => effect3494.py} |  0
 ...pcappropulsionjamming.py => effect3495.py} |  0
 .../{setbonusthukker.py => effect3496.py}     |  0
 .../{setbonussisters.py => effect3498.py}     |  0
 .../{setbonussyndicate.py => effect3499.py}   |  0
 .../{setbonusmordus.py => effect3513.py}      |  0
 ...tor2warpscramblerange.py => effect3514.py} |  0
 ...requiringbomblauncher.py => effect3519.py} |  0
 ...eedbonusbomblaunchers.py => effect3520.py} |  0
 ...heoryconsumptionbonus.py => effect3526.py} |  0
 ...ebonusblackopsagiliy1.py => effect3530.py} |  0
 ...amountbonuspercentage.py => effect3532.py} |  0
 ...iontrackingspeedbonus.py => effect3561.py} |  0
 ...inglinkmaxrangebonus1.py => effect3568.py} |  0
 ...inglinkmaxrangebonus2.py => effect3569.py} |  0
 ...nktrackingspeedbonus2.py => effect3570.py} |  0
 ...nktrackingspeedbonus1.py => effect3571.py} |  0
 ...onscanresolutionbonus.py => effect3586.py} |  0
 ...axtargetrangebonusgc2.py => effect3587.py} |  0
 ...axtargetrangebonusgf2.py => effect3588.py} |  0
 ...canresolutionbonusgf2.py => effect3589.py} |  0
 ...canresolutionbonusgc2.py => effect3590.py} |  0
 ...onmaxtargetrangebonus.py => effect3591.py} |  0
 ...sjumpfreighterhullhp1.py => effect3592.py} |  0
 ...iveconsumptionamount2.py => effect3593.py} |  0
 ...nresolutionbonusbonus.py => effect3597.py} |  0
 ...targetrangebonusbonus.py => effect3598.py} |  0
 ...ackingspeedbonusbonus.py => effect3599.py} |  0
 ...termaxrangebonusbonus.py => effect3600.py} |  0
 ...disallowinempirespace.py => effect3601.py} |  0
 .../{scriptdurationbonus.py => effect3602.py} |  0
 ...atureradiusbonusbonus.py => effect3617.py} |  0
 ...sbonuspercentagebonus.py => effect3618.py} |  0
 ...boostfactorbonusbonus.py => effect3619.py} |  0
 ...speedfactorbonusbonus.py => effect3620.py} |  0
 ...arpscramblerangebonus.py => effect3648.py} |  0
 ...geenergyturretdamage1.py => effect3649.py} |  0
 ...grouprsdmaxrangebonus.py => effect3650.py} |  0
 ...wgrouptpmaxrangebonus.py => effect3651.py} |  0
 ...wgrouptdmaxrangebonus.py => effect3652.py} |  0
 ...ecmburstmaxrangebonus.py => effect3653.py} |  0
 ...rymaxrangebonusonline.py => effect3655.py} |  0
 ...ckingspeedbonusonline.py => effect3656.py} |  0
 ...resolutionbonusonline.py => effect3657.py} |  0
 ...argetrangebonusonline.py => effect3659.py} |  0
 ...targetsbonusaddonline.py => effect3660.py} |  0
 ...mininglaserrangebonus.py => effect3668.py} |  0
 ...inglasermaxrangebonus.py => effect3669.py} |  0
 ...ripminermaxrangebonus.py => effect3670.py} |  0
 ...arvestermaxrangebonus.py => effect3671.py} |  0
 eos/effects/{setbonusore.py => effect3672.py} |  0
 ...ergyturretmaxrangeab2.py => effect3677.py} |  0
 ...umpfreightershieldhp1.py => effect3678.py} |  0
 ...jumpfreighterarmorhp1.py => effect3679.py} |  0
 ...eighteragilitybonusc1.py => effect3680.py} |  0
 ...eighteragilitybonusm1.py => effect3681.py} |  0
 ...eighteragilitybonusg1.py => effect3682.py} |  0
 ...eighteragilitybonusa1.py => effect3683.py} |  0
 ...uterfalloffbonusbonus.py => effect3686.py} |  0
 ...launcherspeedbonusmc2.py => effect3703.py} |  0
 ...bridturretrofbonusgc2.py => effect3705.py} |  0
 ...projectiletrackingmc2.py => effect3706.py} |  0
 ...ltipliereffectpassive.py => effect3726.py} |  0
 ...{velocitybonuspassive.py => effect3727.py} |  0
 ...orcatractorrangebonus.py => effect3739.py} |  0
 ...atractorvelocitybonus.py => effect3740.py} |  0
 ...holdcapacitybonusics1.py => effect3742.py} |  0
 ...foremanburstbonusics2.py => effect3744.py} |  0
 ...rcasurveyscannerbonus.py => effect3745.py} |  0
 ...auncherpowerneedbonus.py => effect3765.py} |  0
 ...dsignatureradiusbonus.py => effect3766.py} |  0
 ...eexplosionvelocitycs2.py => effect3767.py} |  0
 ...rmorhpbonusaddpassive.py => effect3771.py} |  0
 ...rdpointmodifiereffect.py => effect3773.py} |  0
 .../{slotmodifier.py => effect3774.py}        |  0
 ...poweroutputaddpassive.py => effect3782.py} |  0
 ...utaddcpuoutputpassive.py => effect3783.py} |  0
 ...nebandwidthaddpassive.py => effect3797.py} |  0
 ...ddronecapacitypassive.py => effect3799.py} |  0
 eos/effects/{empwave.py => effect38.py}       |  0
 ...targetrangeaddpassive.py => effect3807.py} |  0
 ...atureradiusaddpassive.py => effect3808.py} |  0
 .../{capacityaddpassive.py => effect3810.py}  |  0
 ...torcapacityaddpassive.py => effect3811.py} |  0
 ...eldcapacityaddpassive.py => effect3831.py} |  0
 ...propulsionmaxvelocity.py => effect3857.py} |  0
 ...propulsionmaxvelocity.py => effect3859.py} |  0
 ...propulsionmaxvelocity.py => effect3860.py} |  0
 ...fterburnerspeedfactor.py => effect3861.py} |  0
 ...fterburnerspeedfactor.py => effect3863.py} |  0
 ...fterburnerspeedfactor.py => effect3864.py} |  0
 ...arrpropulsion2agility.py => effect3865.py} |  0
 ...aripropulsion2agility.py => effect3866.py} |  0
 ...ntepropulsion2agility.py => effect3867.py} |  0
 ...tarpropulsion2agility.py => effect3868.py} |  0
 ...propulsion2mwdpenalty.py => effect3869.py} |  0
 ...propulsion2mwdpenalty.py => effect3872.py} |  0
 ...ropulsionabmwdcapneed.py => effect3875.py} |  0
 ...corescanstrengthladar.py => effect3893.py} |  0
 ...strengthmagnetometric.py => effect3895.py} |  0
 ...anstrengthgravimetric.py => effect3897.py} |  0
 eos/effects/{warpdisrupt.py => effect39.py}   |  0
 ...corescanstrengthradar.py => effect3900.py} |  0
 ...modulesrequiringmining.py => effect391.py} |  0
 ...bonuspostpercenthpship.py => effect392.py} |  0
 ...percentmaxvelocityship.py => effect394.py} |  0
 ...postpercentagilityship.py => effect395.py} |  0
 ...sivearmorrepairamount.py => effect3959.py} |  0
 ...ringenergygridupgrades.py => effect396.py} |  0
 ...sivearmorrepairamount.py => effect3961.py} |  0
 ...ieldarmorrepairamount.py => effect3962.py} |  0
 ...siveshieldboostamount.py => effect3964.py} |  0
 ...ationshipgroupcomputer.py => effect397.py} |  0
 ...daridefensiveshieldhp.py => effect3976.py} |  0
 ...efensiveshieldarmorhp.py => effect3979.py} |  0
 ...lentedefensivearmorhp.py => effect3980.py} |  0
 ...amarrdefensivearmorhp.py => effect3982.py} |  0
 .../{systemshieldhp.py => effect3992.py}      |  0
 ...{systemtargetingrange.py => effect3993.py} |  0
 ...systemsignatureradius.py => effect3995.py} |  0
 ...stemarmoremresistance.py => effect3996.py} |  0
 ...orexplosiveresistance.py => effect3997.py} |  0
 ...rmorkineticresistance.py => effect3998.py} |  0
 ...rmorthermalresistance.py => effect3999.py} |  0
 eos/effects/{shieldboosting.py => effect4.py} |  0
 ...systemmissilevelocity.py => effect4002.py} |  0
 .../{systemmaxvelocity.py => effect4003.py}   |  0
 ...magemultipliergunnery.py => effect4016.py} |  0
 ...damagethermalmissiles.py => effect4017.py} |  0
 ...ystemdamageemmissiles.py => effect4018.py} |  0
 ...mageexplosivemissiles.py => effect4019.py} |  0
 ...damagekineticmissiles.py => effect4020.py} |  0
 .../{systemdamagedrones.py => effect4021.py}  |  0
 .../{systemtracking.py => effect4022.py}      |  0
 .../{systemaoevelocity.py => effect4023.py}   |  0
 .../{systemheatdamage.py => effect4033.py}    |  0
 .../{systemoverloadarmor.py => effect4034.py} |  0
 ...verloaddamagemodifier.py => effect4035.py} |  0
 ...overloaddurationbonus.py => effect4036.py} |  0
 ...moverloadeccmstrength.py => effect4037.py} |  0
 ...emoverloadecmstrength.py => effect4038.py} |  0
 ...stemoverloadhardening.py => effect4039.py} |  0
 .../{systemoverloadrange.py => effect4040.py} |  0
 .../{systemoverloadrof.py => effect4041.py}   |  0
 ...moverloadselfduration.py => effect4042.py} |  0
 ...emoverloadshieldbonus.py => effect4043.py} |  0
 ...emoverloadspeedfactor.py => effect4044.py} |  0
 ...{systemsmartbombrange.py => effect4045.py} |  0
 ...stemsmartbombemdamage.py => effect4046.py} |  0
 ...martbombthermaldamage.py => effect4047.py} |  0
 ...martbombkineticdamage.py => effect4048.py} |  0
 ...rtbombexplosivedamage.py => effect4049.py} |  0
 ...stemsmallenergydamage.py => effect4054.py} |  0
 ...smallprojectiledamage.py => effect4055.py} |  0
 ...stemsmallhybriddamage.py => effect4056.py} |  0
 ...{systemrocketemdamage.py => effect4057.py} |  0
 ...rocketexplosivedamage.py => effect4058.py} |  0
 ...emrocketkineticdamage.py => effect4059.py} |  0
 ...emrocketthermaldamage.py => effect4060.py} |  0
 ...dmissilethermaldamage.py => effect4061.py} |  0
 ...andardmissileemdamage.py => effect4062.py} |  0
 ...issileexplosivedamage.py => effect4063.py} |  0
 ...glargeprojectileturret.py => effect408.py} |  0
 ...stemarmorrepairamount.py => effect4086.py} |  0
 ...morremoterepairamount.py => effect4088.py} |  0
 ...eldremoterepairamount.py => effect4089.py} |  0
 ...stemcapacitorcapacity.py => effect4090.py} |  0
 ...stemcapacitorrecharge.py => effect4091.py} |  0
 ...eapondamagemultiplier.py => effect4093.py} |  0
 ...ehybridweaponmaxrange.py => effect4104.py} |  0
 ...vehybridweaponfalloff.py => effect4106.py} |  0
 ...ojectileweaponfalloff.py => effect4114.py} |  0
 ...jectileweaponmaxrange.py => effect4115.py} |  0
 ...offensive1launcherrof.py => effect4122.py} |  0
 ...temshieldemresistance.py => effect4135.py} |  0
 ...ldexplosiveresistance.py => effect4136.py} |  0
 ...ieldkineticresistance.py => effect4137.py} |  0
 ...ieldthermalresistance.py => effect4138.py} |  0
 ...odulesrequiringgunnery.py => effect414.py} |  0
 ...ngheatdamagereduction.py => effect4152.py} |  0
 ...ngheatdamagereduction.py => effect4153.py} |  0
 ...ngheatdamagereduction.py => effect4154.py} |  0
 ...ngheatdamagereduction.py => effect4155.py} |  0
 ...corecapacitorcapacity.py => effect4158.py} |  0
 ...corecapacitorcapacity.py => effect4159.py} |  0
 ...requiringastrometrics.py => effect4161.py} |  0
 ...requiringastrometrics.py => effect4162.py} |  0
 ...usscanprobestrengthcf.py => effect4165.py} |  0
 ...usscanprobestrengthmf.py => effect4166.py} |  0
 ...usscanprobestrengthgf.py => effect4167.py} |  0
 ...opsscanprobestrength2.py => effect4168.py} |  0
 ...ruiseramarrheatdamage.py => effect4187.py} |  0
 ...isercaldariheatdamage.py => effect4188.py} |  0
 ...sergallenteheatdamage.py => effect4189.py} |  0
 ...serminmatarheatdamage.py => effect4190.py} |  0
 ...gyweaponcapacitorneed.py => effect4215.py} |  0
 ...e2energyvampireamount.py => effect4216.py} |  0
 ...rgydestabilizeramount.py => effect4217.py} |  0
 ...launcherkineticdamage.py => effect4248.py} |  0
 ...ffensivedronedamagehp.py => effect4250.py} |  0
 ...eapondamagemultiplier.py => effect4251.py} |  0
 ...ve2missilelauncherrof.py => effect4256.py} |  0
 ...corecapacitorrecharge.py => effect4264.py} |  0
 ...corecapacitorrecharge.py => effect4265.py} |  0
 ...rrcore3scanresolution.py => effect4269.py} |  0
 ...arcore3scanresolution.py => effect4270.py} |  0
 ...ore2maxtargetingrange.py => effect4271.py} |  0
 ...ore2maxtargetingrange.py => effect4272.py} |  0
 ...ore2warpscramblerange.py => effect4273.py} |  0
 ...e2stasiswebifierrange.py => effect4274.py} |  0
 ...ipropulsion2warpspeed.py => effect4275.py} |  0
 ...opulsionwarpcapacitor.py => effect4277.py} |  0
 ...epropulsion2warpspeed.py => effect4278.py} |  0
 .../{systemagility.py => effect4280.py}       |  0
 ...eapondamagemultiplier.py => effect4282.py} |  0
 ...eapondamagemultiplier.py => effect4283.py} |  0
 ...motearmorrepaircapuse.py => effect4286.py} |  0
 ...motearmorrepaircapuse.py => effect4288.py} |  0
 ...nsive2remoterepcapuse.py => effect4290.py} |  0
 ...teshieldboostercapuse.py => effect4292.py} |  0
 ...core2ecmstrengthrange.py => effect4321.py} |  0
 ...fensive3dronedamagehp.py => effect4327.py} |  0
 ...3energyweaponmaxrange.py => effect4330.py} |  0
 ...ensive3hmlhamvelocity.py => effect4331.py} |  0
 ...ore2maxtargetingrange.py => effect4342.py} |  0
 ...ore2maxtargetingrange.py => effect4343.py} |  0
 ...ensive3turrettracking.py => effect4347.py} |  0
 ...ensive3turrettracking.py => effect4351.py} |  0
 ...angebonusmoduleeffect.py => effect4358.py} |  0
 ...ivemissilelauncherrof.py => effect4360.py} |  0
 ...fensive2missiledamage.py => effect4362.py} |  0
 ...nusmediumhybriddmgcc2.py => effect4366.py} |  0
 ...bonuswarpbubbleimmune.py => effect4369.py} |  0
 ...shipewfalloffrangecc2.py => effect4370.py} |  0
 ...shipewfalloffrangecb3.py => effect4372.py} |  0
 ...ffensivecommandbursts.py => effect4373.py} |  0
 ...nustorpedovelocitygf2.py => effect4377.py} |  0
 ...nustorpedovelocitymf2.py => effect4378.py} |  0
 ...nustorpedovelocity2af.py => effect4379.py} |  0
 ...nustorpedovelocitycf2.py => effect4380.py} |  0
 ...sheavymissilevelocity.py => effect4384.py} |  0
 ...ssaultmissilevelocity.py => effect4385.py} |  0
 ...2torpedothermaldamage.py => effect4393.py} |  0
 ...cover2torpedoemdamage.py => effect4394.py} |  0
 ...orpedoexplosivedamage.py => effect4395.py} |  0
 ...2torpedokineticdamage.py => effect4396.py} |  0
 ...pedoexplosionvelocity.py => effect4397.py} |  0
 ...pedoexplosionvelocity.py => effect4398.py} |  0
 ...pedoexplosionvelocity.py => effect4399.py} |  0
 ...pedoexplosionvelocity.py => effect4400.py} |  0
 ...sgf1torpedoflighttime.py => effect4413.py} |  0
 ...smf1torpedoflighttime.py => effect4415.py} |  0
 ...scf1torpedoflighttime.py => effect4416.py} |  0
 ...saf1torpedoflighttime.py => effect4417.py} |  0
 ...trengthmodifiereffect.py => effect4451.py} |  0
 ...trengthmodifiereffect.py => effect4452.py} |  0
 ...trengthmodifiereffect.py => effect4453.py} |  0
 ...trengthmodifiereffect.py => effect4454.py} |  0
 .../{federationsetbonus3.py => effect4456.py} |  0
 .../{imperialsetbonus3.py => effect4457.py}   |  0
 .../{republicsetbonus3.py => effect4458.py}   |  0
 .../{caldarisetbonus3.py => effect4459.py}    |  0
 ...ocationshipgroupshield.py => effect446.py} |  0
 .../{imperialsetlgbonus.py => effect4460.py}  |  0
 ...{federationsetlgbonus.py => effect4461.py} |  0
 .../{caldarisetlgbonus.py => effect4462.py}   |  0
 .../{republicsetlgbonus.py => effect4463.py}  |  0
 .../{shipprojectilerofmf.py => effect4464.py} |  0
 .../{shipbonusstasismf2.py => effect4471.py}  |  0
 .../{shipprojectiledmgmc.py => effect4472.py} |  0
 ...shipvelocitybonusatc1.py => effect4473.py} |  0
 ...hipmtmaxrangebonusatc.py => effect4474.py} |  0
 ...shipmtfalloffbonusatc.py => effect4475.py} |  0
 ...shipmtfalloffbonusatf.py => effect4476.py} |  0
 ...hipmtmaxrangebonusatf.py => effect4477.py} |  0
 ...afterburnercapneedatf.py => effect4478.py} |  0
 ...skillsurveycovertops3.py => effect4479.py} |  0
 ...shipetoptimalrange2af.py => effect4482.py} |  0
 ...pturretfalloffbonusgb.py => effect4484.py} |  0
 ...tasiswebspeedfactormb.py => effect4485.py} |  0
 .../{superweaponamarr.py => effect4489.py}    |  0
 .../{superweaponcaldari.py => effect4490.py}  |  0
 .../{superweapongallente.py => effect4491.py} |  0
 .../{superweaponminmatar.py => effect4492.py} |  0
 ...iswebstrengthbonusmc2.py => effect4510.py} |  0
 ...pturretfalloffbonusgc.py => effect4512.py} |  0
 ...iswebstrengthbonusmf2.py => effect4513.py} |  0
 .../{shipfalloffbonusmf.py => effect4515.py}  |  0
 ...hturretfalloffbonusgc.py => effect4516.py} |  0
 ...eryfalloffbonusonline.py => effect4527.py} |  0
 ...ruisecitadelemdamage1.py => effect4555.py} |  0
 ...tadelexplosivedamage1.py => effect4556.py} |  0
 ...citadelkineticdamage1.py => effect4557.py} |  0
 ...citadelthermaldamage1.py => effect4558.py} |  0
 ...offtrackingspeedbonus.py => effect4559.py} |  0
 ...industrialcoreeffect2.py => effect4575.py} |  0
 ...kinglinkfalloffbonus1.py => effect4576.py} |  0
 ...kinglinkfalloffbonus2.py => effect4577.py} |  0
 ...iswebspeedfactorbonus.py => effect4579.py} |  0
 ...ipbonusdronedamagegf2.py => effect4619.py} |  0
 ...pscramblermaxrangegf2.py => effect4620.py} |  0
 ...ipbonusheatdamageatf1.py => effect4621.py} |  0
 ...allhybridmaxrangeatf2.py => effect4622.py} |  0
 ...bridtrackingspeedatf2.py => effect4623.py} |  0
 ...nushybridtrackingatc2.py => effect4624.py} |  0
 ...onushybridfalloffatc2.py => effect4625.py} |  0
 ...pscramblermaxrangegc2.py => effect4626.py} |  0
 ...andtorpedodamagerole1.py => effect4635.py} |  0
 ...tycruiseandtorpedocb2.py => effect4636.py} |  0
 ...rpedovelocitybonuscb3.py => effect4637.py} |  0
 ...inandthmresistanceac2.py => effect4640.py} |  0
 ...expandkinandthmdmgac1.py => effect4643.py} |  0
 ...ultmissilelauncherrof.py => effect4645.py} |  0
 ...tricandradarstrength1.py => effect4648.py} |  0
 ...gelauncherrofbonus2cb.py => effect4649.py} |  0
 ...nusnoctissalvagecycle.py => effect4667.py} |  0
 ...nusnoctistractorcycle.py => effect4668.py} |  0
 ...noctistractorvelocity.py => effect4669.py} |  0
 ...nusnoctistractorrange.py => effect4670.py} |  0
 ...ivedefensivereduction.py => effect4728.py} |  0
 ...opulsionwarpcapacitor.py => effect4760.py} |  0
 ...ransferamountbonusaf2.py => effect4775.py} |  0
 ...eaponoptimalrangeatf2.py => effect4782.py} |  0
 ...nergyturretdamageatf1.py => effect4789.py} |  0
 ...elauncherheavyrofatc1.py => effect4793.py} |  0
 ...auncherassaultrofatc1.py => effect4794.py} |  0
 ...erheavyassaultrofatc1.py => effect4795.py} |  0
 ...darandmagnetoandradar.py => effect4799.py} |  0
 eos/effects/{powerbooster.py => effect48.py}  |  0
 ...ybonusabsolutepercent.py => effect4804.py} |  0
 ...cstrengthbonuspercent.py => effect4809.py} |  0
 ...rstrengthbonuspercent.py => effect4810.py} |  0
 ...cstrengthbonuspercent.py => effect4811.py} |  0
 ...rstrengthbonuspercent.py => effect4812.py} |  0
 ...tionbonuspercentskill.py => effect4814.py} |  0
 ...duledurationreduction.py => effect4817.py} |  0
 ...yturretpowerneedbonus.py => effect4820.py} |  0
 ...dturretpowerneedbonus.py => effect4821.py} |  0
 ...eturretpowerneedbonus.py => effect4822.py} |  0
 ...rgyturretcpuneedbonus.py => effect4823.py} |  0
 ...ridturretcpuneedbonus.py => effect4824.py} |  0
 ...ileturretcpuneedbonus.py => effect4825.py} |  0
 ...retcapacitorneedbonus.py => effect4826.py} |  0
 ...retcapacitorneedbonus.py => effect4827.py} |  0
 ...tionshipgroupcapacitor.py => effect485.py} |  0
 ...ocationshipgroupshield.py => effect486.py} |  0
 ...nuschristmaspowergrid.py => effect4867.py} |  0
 ...tmascapacitorcapacity.py => effect4868.py} |  0
 ...nuschristmascpuoutput.py => effect4869.py} |  0
 ...mascapacitorrecharge2.py => effect4871.py} |  0
 ...onusdronehitpointsgf2.py => effect4896.py} |  0
 ...ronearmorhitpointsgf2.py => effect4897.py} |  0
 ...oneshieldhitpointsgf2.py => effect4898.py} |  0
 ...tionshipgrouppowercore.py => effect490.py} |  0
 ...ipmissilespeedbonusaf.py => effect4901.py} |  0
 ...natureradiusrolebonus.py => effect4902.py} |  0
 ...{systemdamagefighters.py => effect4906.py} |  0
 ...ldrechargeratepassive.py => effect4911.py} |  0
 .../{microjumpdrive.py => effect4921.py}      |  0
 ...skillmjddurationbonus.py => effect4923.py} |  0
 ...adaptivearmorhardener.py => effect4928.py} |  0
 ...shiparmorrepairinggf2.py => effect4934.py} |  0
 ...{fueledshieldboosting.py => effect4936.py} |  0
 ...ionshipgrouppropulsion.py => effect494.py} |  0
 ...phybriddamagebonuscf2.py => effect4941.py} |  0
 .../{targetbreaker.py => effect4942.py}       |  0
 ...breakerdurationbonus2.py => effect4945.py} |  0
 ...tbreakercapneedbonus2.py => effect4946.py} |  0
 ...onusshieldboostermb1a.py => effect4950.py} |  0
 ...plifierpassivebooster.py => effect4951.py} |  0
 ...airamountshieldskills.py => effect4961.py} |  0
 ...tionbonusshieldskills.py => effect4967.py} |  0
 ...ntpenaltyshieldskills.py => effect4970.py} |  0
 ...ltshiplightmissilerof.py => effect4972.py} |  0
 ...sassaultshiprocketrof.py => effect4973.py} |  0
 ...maraudershieldbonus2a.py => effect4974.py} |  0
 ...usmissilekineticlatf2.py => effect4975.py} |  0
 ...hardenerdurationbonus.py => effect4976.py} |  0
 ...sallincludingcapitals.py => effect4989.py} |  0
 ...gytcapneedbonusrookie.py => effect4990.py} |  0
 ...shipsetdmgbonusrookie.py => effect4991.py} |  0
 ...moremresistancerookie.py => effect4994.py} |  0
 ...morexresistancerookie.py => effect4995.py} |  0
 ...morknresistancerookie.py => effect4996.py} |  0
 ...morthresistancerookie.py => effect4997.py} |  0
 ...ybridrangebonusrookie.py => effect4999.py} |  0
 ...odifyshieldrechargerate.py => effect50.py} |  0
 ...lekineticdamagerookie.py => effect5000.py} |  0
 ...eldemresistancerookie.py => effect5008.py} |  0
 ...osiveresistancerookie.py => effect5009.py} |  0
 ...neticresistancerookie.py => effect5011.py} |  0
 ...ermalresistancerookie.py => effect5012.py} |  0
 ...shipshtdmgbonusrookie.py => effect5013.py} |  0
 ...amagemultiplierrookie.py => effect5014.py} |  0
 ...argetrangebonusrookie.py => effect5015.py} |  0
 ...resolutionbonusrookie.py => effect5016.py} |  0
 ...parmorrepairingrookie.py => effect5017.py} |  0
 ...ipvelocitybonusrookie.py => effect5018.py} |  0
 ...ewtargetpainterrookie.py => effect5019.py} |  0
 ...shipsptdmgbonusrookie.py => effect5020.py} |  0
 ...shipshieldboostrookie.py => effect5021.py} |  0
 ...anstrengthbonusrookie.py => effect5028.py} |  0
 ...droneminingamountrole.py => effect5029.py} |  0
 ...neamountpercentrookie.py => effect5030.py} |  0
 ...sdronehitpointsrookie.py => effect5035.py} |  0
 ...ipbonussalvagecycleaf.py => effect5036.py} |  0
 ...onecontroldistancechar.py => effect504.py} |  0
 ...ipbonussalvagecyclecf.py => effect5045.py} |  0
 ...ipbonussalvagecyclegf.py => effect5048.py} |  0
 ...ipbonussalvagecyclemf.py => effect5051.py} |  0
 ...terdurationmultiplier.py => effect5055.py} |  0
 ...gyieldmultiplypassive.py => effect5058.py} |  0
 ...harvesterdurationore3.py => effect5059.py} |  0
 ...esrequiringafterburner.py => effect506.py} |  0
 ...rgetpainteroptimalmf1.py => effect5066.py} |  0
 ...{shipbonusoreholdore2.py => effect5067.py} |  0
 ...nusshieldcapacityore2.py => effect5068.py} |  0
 ...{mercoxitcrystalbonus.py => effect5069.py} |  0
 ...ionshipgroupelectronic.py => effect507.py} |  0
 ...ssilekineticdamagecf2.py => effect5079.py} |  0
 .../{shippdmgbonusmf.py => effect508.py}      |  0
 ...shipmissilevelocitycf.py => effect5080.py} |  0
 ...nuspostpercentpassive.py => effect5081.py} |  0
 ...bonusdronehitpointsgf.py => effect5087.py} |  0
 .../{shipshieldboostmf.py => effect5090.py}   |  0
 ...modifypowerrechargerate.py => effect51.py} |  0
 ...ieldtransfercapneedcf.py => effect5103.py} |  0
 ...ransferboostamountcf2.py => effect5104.py} |  0
 ...ieldtransfercapneedmf.py => effect5105.py} |  0
 ...ransferboostamountmf2.py => effect5106.py} |  0
 ...earmorrepaircapneedgf.py => effect5107.py} |  0
 ...earmorrepairamountgf2.py => effect5108.py} |  0
 ...earmorrepaircapneedaf.py => effect5109.py} |  0
 ...penergytcapneedbonusaf.py => effect511.py} |  0
 ...earmorrepairamount2af.py => effect5110.py} |  0
 ...pbonusdronetrackinggf.py => effect5111.py} |  0
 ...sscanprobestrength2af.py => effect5119.py} |  0
 .../{shipshtdmgbonusgf.py => effect512.py}    |  0
 ...aytransferamountbonus.py => effect5121.py} |  0
 ...eldtransfercapneedmc1.py => effect5122.py} |  0
 ...armorrepaircapneedac1.py => effect5123.py} |  0
 ...earmorrepairamountac2.py => effect5124.py} |  0
 ...earmorrepairamountgc2.py => effect5125.py} |  0
 ...ransferboostamountcc2.py => effect5126.py} |  0
 ...ransferboostamountmc2.py => effect5127.py} |  0
 ...mpeneroptimalbonusgc1.py => effect5128.py} |  0
 ...hipewtargetpaintermc1.py => effect5129.py} |  0
 .../{shipmissilerofcc.py => effect5131.py}    |  0
 ...turretfalloffbonusmc2.py => effect5132.py} |  0
 .../{shiphtdamagebonuscc.py => effect5133.py} |  0
 ...shipmetcdamagebonusac.py => effect5136.py} |  0
 ...ipminingbonusorefrig1.py => effect5139.py} |  0
 .../{shipsetdmgbonusaf.py => effect514.py}    |  0
 ...hyieldmultiplypassive.py => effect5142.py} |  0
 ...typiratefactionrocket.py => effect5153.py} |  0
 ...gchyieldbonusorefrig2.py => effect5156.py} |  0
 .../{shiptcapneedbonusac.py => effect516.py}  |  0
 ...rhardenercapneedbonus.py => effect5162.py} |  0
 ...onusdronemwdboostrole.py => effect5165.py} |  0
 .../{dronesalvagebonus.py => effect5168.py}   |  0
 ...engthbonusgravimetric.py => effect5180.py} |  0
 ...sorstrengthbonusladar.py => effect5181.py} |  0
 ...gthbonusmagnetometric.py => effect5182.py} |  0
 ...sorstrengthbonusradar.py => effect5183.py} |  0
 ...reamountbonusfixedaf2.py => effect5185.py} |  0
 ...mpenerfalloffbonusgc1.py => effect5187.py} |  0
 ...eedbonuseffecthybrids.py => effect5188.py} |  0
 ...peedbonuseffectlasers.py => effect5189.py} |  0
 ...onuseffectprojectiles.py => effect5190.py} |  0
 ...penaltyreductionbonus.py => effect5201.py} |  0
 ...ettrackingbonusrookie.py => effect5205.py} |  0
 ...setoptimalbonusrookie.py => effect5206.py} |  0
 ...sferamountbonusrookie.py => effect5207.py} |  0
 ...tionamountbonusrookie.py => effect5208.py} |  0
 ...ebvelocitybonusrookie.py => effect5209.py} |  0
 .../{shiphrangebonuscc.py => effect521.py}    |  0
 ...nemwdspeedbonusrookie.py => effect5212.py} |  0
 ...axvelocitybonusrookie.py => effect5213.py} |  0
 ...axvelocitybonusrookie.py => effect5214.py} |  0
 ...ckingspeedbonusrookie.py => effect5215.py} |  0
 ...shtfalloffbonusrookie.py => effect5216.py} |  0
 ...ckingspeedbonusrookie.py => effect5217.py} |  0
 ...sptfalloffbonusrookie.py => effect5218.py} |  0
 ...timalrangebonusrookie.py => effect5219.py} |  0
 ...ctiledmgpiratecruiser.py => effect5220.py} |  0
 ...ileemdmgpiratecruiser.py => effect5221.py} |  0
 ...lekindmgpiratecruiser.py => effect5222.py} |  0
 ...thermdmgpiratecruiser.py => effect5223.py} |  0
 ...leexpdmgpiratecruiser.py => effect5224.py} |  0
 ...ileemdmgpiratecruiser.py => effect5225.py} |  0
 ...leexpdmgpiratecruiser.py => effect5226.py} |  0
 ...lekindmgpiratecruiser.py => effect5227.py} |  0
 ...thermdmgpiratecruiser.py => effect5228.py} |  0
 ...gthbonuspiratecruiser.py => effect5229.py} |  0
 ...dresonancepostpercent.py => effect5230.py} |  0
 ...rresonancepostpercent.py => effect5231.py} |  0
 ...smallmissileexpdmgcf2.py => effect5234.py} |  0
 ...smallmissilekindmgcf2.py => effect5237.py} |  0
 ...allmissilethermdmgcf2.py => effect5240.py} |  0
 ...psmallmissileemdmgcf2.py => effect5243.py} |  0
 ...conshipcloakcpubonus1.py => effect5259.py} |  0
 ...cloakcpupercentbonus1.py => effect5260.py} |  0
 ...overtcloakcpuaddition.py => effect5261.py} |  0
 ...ertopscloakcpupenalty.py => effect5262.py} |  0
 ...{covertcynocpupenalty.py => effect5263.py} |  0
 ...arfarelinkcpuaddition.py => effect5264.py} |  0
 ...warfarelinkcpupenalty.py => effect5265.py} |  0
 ...rcloakcpupercentbonus.py => effect5266.py} |  0
 ...ckrepairsystemspgneed.py => effect5267.py} |  0
 ...{drawbackcapreppgneed.py => effect5268.py} |  0
 .../{shipvelocitybonusmi.py => effect527.py}  |  0
 .../{fueledarmorrepair.py => effect5275.py}   |  0
 .../{shipcargobonusai.py => effect529.py}     |  0
 ...{shiplasercapneed2ad1.py => effect5293.py} |  0
 ...shiplasertracking2ad2.py => effect5294.py} |  0
 ...nedamagemultiplierad1.py => effect5295.py} |  0
 ...onusdronehitpointsad1.py => effect5300.py} |  0
 .../{shiphybridrange1cd1.py => effect5303.py} |  0
 ...shiphybridtrackingcd2.py => effect5304.py} |  0
 ...ssilekineticdamagecd1.py => effect5305.py} |  0
 ...iprocketkineticdmgcd1.py => effect5306.py} |  0
 ...aoevelocityrocketscd2.py => effect5307.py} |  0
 ...tystandardmissilescd2.py => effect5308.py} |  0
 ...shiphybridfalloff1gd1.py => effect5309.py} |  0
 ...hiphybridtracking1gd2.py => effect5310.py} |  0
 ...nedamagemultipliergd1.py => effect5311.py} |  0
 ...onusdronehitpointsgd1.py => effect5316.py} |  0
 ...ipprojectiledamagemd1.py => effect5317.py} |  0
 ...rojectiletracking1md2.py => effect5318.py} |  0
 ...ileexplosivedamagemd1.py => effect5319.py} |  0
 ...rocketexplosivedmgmd1.py => effect5320.py} |  0
 ...mwdsignatureradiusmd2.py => effect5321.py} |  0
 ...rmoremresistance1abc1.py => effect5322.py} |  0
 ...losiveresistance1abc1.py => effect5323.py} |  0
 ...ineticresistance1abc1.py => effect5324.py} |  0
 ...rthermresistance1abc1.py => effect5325.py} |  0
 ...edamagemultiplierabc2.py => effect5326.py} |  0
 ...nusdronehitpointsabc2.py => effect5331.py} |  0
 .../{shiplasercapabc1.py => effect5332.py}    |  0
 ...plaserdamagebonusabc2.py => effect5333.py} |  0
 ...hiphybridoptimal1cbc1.py => effect5334.py} |  0
 ...ieldemresistance1cbc2.py => effect5335.py} |  0
 ...losiveresistance1cbc2.py => effect5336.py} |  0
 ...ineticresistance1cbc2.py => effect5337.py} |  0
 ...hermalresistance1cbc2.py => effect5338.py} |  0
 ...silekineticdamagecbc1.py => effect5339.py} |  0
 ...silekineticdamagecbc1.py => effect5340.py} |  0
 .../{shiphybriddmg1gbc1.py => effect5341.py}  |  0
 ...iparmorrepairing1gbc2.py => effect5342.py} |  0
 ...edamagemultipliergbc1.py => effect5343.py} |  0
 ...nusdronehitpointsgbc1.py => effect5348.py} |  0
 ...issilelauncherrofmbc2.py => effect5349.py} |  0
 ...issilelauncherrofmbc2.py => effect5350.py} |  0
 ...{shipshieldboost1mbc1.py => effect5351.py} |  0
 ...sprojectiledamagembc1.py => effect5352.py} |  0
 ...hipprojectilerof1mbc2.py => effect5353.py} |  0
 ...shiplargelasercapabc1.py => effect5354.py} |  0
 ...elaserdamagebonusabc2.py => effect5355.py} |  0
 ...phybridrangebonuscbc1.py => effect5356.py} |  0
 ...hybriddamagebonuscbc2.py => effect5357.py} |  0
 ...bridtrackingbonusgbc1.py => effect5358.py} |  0
 ...hybriddamagebonusgbc2.py => effect5359.py} |  0
 ...erpostmulcpuoutputship.py => effect536.py} |  0
 ...rojectilerofbonusmbc1.py => effect5360.py} |  0
 ...ctilefalloffbonusmbc2.py => effect5361.py} |  0
 ...emsamountbonuspassive.py => effect5364.py} |  0
 ...emsarmordamageamount2.py => effect5365.py} |  0
 ...epairsystemsbonusatc2.py => effect5366.py} |  0
 ...sarmorrepairamountgb2.py => effect5367.py} |  0
 ...ssileaoecloudsizecbc1.py => effect5378.py} |  0
 ...ssileaoecloudsizecbc1.py => effect5379.py} |  0
 ...hiphybridtrackinggbc2.py => effect5380.py} |  0
 ...hipenergytrackingabc1.py => effect5381.py} |  0
 ...hipbonusmetoptimalac2.py => effect5382.py} |  0
 ...shipmissileemdamagecc.py => effect5383.py} |  0
 ...pmissilethermdamagecc.py => effect5384.py} |  0
 ...hipmissileexpdamagecc.py => effect5385.py} |  0
 ...ipmissilekindamagecc2.py => effect5386.py} |  0
 ...issileaoecloudsizecc2.py => effect5387.py} |  0
 ...issileaoecloudsizecc2.py => effect5388.py} |  0
 ...pbonusdronetrackinggc.py => effect5389.py} |  0
 ...pbonusdronemwdboostgc.py => effect5390.py} |  0
 ...fiermoduleonline2none.py => effect5397.py} |  0
 ...urationmodulemodifier.py => effect5398.py} |  0
 ...trengthmodifiermodule.py => effect5399.py} |  0
 ...vyassaultvelocityabc2.py => effect5402.py} |  0
 ...sileheavyvelocityabc2.py => effect5403.py} |  0
 .../{shiplasercap1abc2.py => effect5410.py}   |  0
 ...hipmissilevelocitycd1.py => effect5411.py} |  0
 ...onedamagemultiplierab.py => effect5417.py} |  0
 ...dronearmorhitpointsab.py => effect5418.py} |  0
 ...roneshieldhitpointsab.py => effect5419.py} |  0
 .../{shipcapneedbonusab.py => effect542.py}   |  0
 ...estructurehitpointsab.py => effect5420.py} |  0
 ...argehybridturretrofgb.py => effect5424.py} |  0
 ...pbonusdronetrackinggb.py => effect5427.py} |  0
 ...usdroneoptimalrangegb.py => effect5428.py} |  0
 ...missileaoevelocitymb2.py => effect5429.py} |  0
 ...citycruisemissilesmb2.py => effect5430.py} |  0
 ...nergyturrettrackingab.py => effect5431.py} |  0
 ...ackingskillvirusbonus.py => effect5433.py} |  0
 ...eologyskillvirusbonus.py => effect5437.py} |  0
 ...dmissilekineticdamage.py => effect5440.py} |  0
 ...orpedoaoecloudsize1cb.py => effect5444.py} |  0
 ...issileaoecloudsize1cb.py => effect5445.py} |  0
 ...hipcruisemissilerofcb.py => effect5456.py} |  0
 .../{shiptorpedorofcb.py => effect5457.py}    |  0
 ...ingvirusstrengthbonus.py => effect5459.py} |  0
 ...amevirusstrengthbonus.py => effect5460.py} |  0
 ...onuspostpercentonline.py => effect5461.py} |  0
 .../{shipbonusagilityci2.py => effect5468.py} |  0
 .../{shipbonusagilitymi2.py => effect5469.py} |  0
 .../{shipbonusagilitygi2.py => effect5470.py} |  0
 .../{shipbonusagilityai2.py => effect5471.py} |  0
 ...ipbonusorecapacitygi2.py => effect5476.py} |  0
 .../{shipbonusammobaymi2.py => effect5477.py} |  0
 ...spicommoditiesholdgi2.py => effect5478.py} |  0
 ...hipbonusmineralbaygi2.py => effect5479.py} |  0
 ...hristmasbonusvelocity.py => effect5480.py} |  0
 ...christmasagilitybonus.py => effect5482.py} |  0
 ...asshieldcapacitybonus.py => effect5483.py} |  0
 ...hristmasarmorhpbonus2.py => effect5484.py} |  0
 ...shipsptoptimalbonusmf.py => effect5485.py} |  0
 ...sprojectiledamagembc2.py => effect5486.py} |  0
 .../{shipptdmgbonusmb.py => effect549.py}     |  0
 ...scommandshiphamrofcs1.py => effect5496.py} |  0
 ...uscommandshiphmrofcs1.py => effect5497.py} |  0
 ...eexplosionvelocitycs2.py => effect5498.py} |  0
 ...ileexplosionradiuscs2.py => effect5499.py} |  0
 .../{targethostiles.py => effect55.py}        |  0
 .../{shiphtdmgbonusgb.py => effect550.py}     |  0
 ...ileexplosionradiuscs2.py => effect5500.py} |  0
 ...mediumhybriddamagecs2.py => effect5501.py} |  0
 ...diumhybridtrackingcs1.py => effect5502.py} |  0
 ...heavydronetrackingcs2.py => effect5503.py} |  0
 ...heavydronevelocitycs2.py => effect5504.py} |  0
 ...hipmediumhybridrofcs1.py => effect5505.py} |  0
 ...saultmissiledamagecs2.py => effect5514.py} |  0
 ...heavymissiledamagecs2.py => effect5521.py} |  0
 ...{shiphttrackingbonusgb.py => effect553.py} |  0
 ...nushmlkineticdamageac.py => effect5539.py} |  0
 ...hipbonushmlemdamageac.py => effect5540.py} |  0
 ...bonushmlthermdamageac.py => effect5541.py} |  0
 ...bonushmlexplodamageac.py => effect5542.py} |  0
 ...itebonusheavygunship1.py => effect5552.py} |  0
 ...itebonusheavygunship1.py => effect5553.py} |  0
 ...onusarmorrepamountgc2.py => effect5554.py} |  0
 ...onusheavydronespeedgc.py => effect5555.py} |  0
 ...sheavydronetrackinggc.py => effect5556.py} |  0
 ...itebonusheavygunship2.py => effect5557.py} |  0
 ...itebonusheavygunship2.py => effect5558.py} |  0
 ...sshieldboostamountmc2.py => effect5559.py} |  0
 ...eactivationdelaybonus.py => effect5560.py} |  0
 ...ffensivecommandbursts.py => effect5564.py} |  0
 ...ffensivecommandbursts.py => effect5568.py} |  0
 ...ffensivecommandbursts.py => effect5570.py} |  0
 ...commandshiparmoredcs3.py => effect5572.py} |  0
 ...uscommandshipsiegecs3.py => effect5573.py} |  0
 ...ommandshipskirmishcs3.py => effect5574.py} |  0
 ...andshipinformationcs3.py => effect5575.py} |  0
 .../{poweroutputmultiply.py => effect56.py}   |  0
 ...oremissionsystemskill.py => effect5607.py} |  0
 ...nergyturretmaxrangeab.py => effect5610.py} |  0
 ...shipbonushtfalloffgb2.py => effect5611.py} |  0
 .../{shipbonusrhmlrof2cb.py => effect5618.py} |  0
 .../{shipbonusrhmlrofcb.py => effect5619.py}  |  0
 ...{shiphtdmgbonusfixedgc.py => effect562.py} |  0
 .../{shipbonusrhmlrofmb.py => effect5620.py}  |  0
 ...{shipbonuscruiserofmb.py => effect5621.py} |  0
 ...shipbonustorpedorofmb.py => effect5622.py} |  0
 ...scruisemissileemdmgmb.py => effect5628.py} |  0
 ...uisemissilethermdmgmb.py => effect5629.py} |  0
 ...semissilekineticdmgmb.py => effect5630.py} |  0
 ...uisemissileexplodmgmb.py => effect5631.py} |  0
 ...pedomissileexplodmgmb.py => effect5632.py} |  0
 ...torpedomissileemdmgmb.py => effect5633.py} |  0
 ...pedomissilethermdmgmb.py => effect5634.py} |  0
 ...domissilekineticdmgmb.py => effect5635.py} |  0
 ...usheavymissileemdmgmb.py => effect5636.py} |  0
 ...eavymissilethermdmgmb.py => effect5637.py} |  0
 ...vymissilekineticdmgmb.py => effect5638.py} |  0
 ...eavymissileexplodmgmb.py => effect5639.py} |  0
 ...nusmissilevelocitycc2.py => effect5644.py} |  0
 ...akcpupercentrolebonus.py => effect5647.py} |  0
 ...hiparmorresistanceaf1.py => effect5650.py} |  0
 ...erceptor2shieldresist.py => effect5657.py} |  0
 ...ptor2projectiledamage.py => effect5673.py} |  0
 ...ileexplosionradiuscd2.py => effect5676.py} |  0
 ...nusmissilevelocityad2.py => effect5688.py} |  0
 ...erdictorsarmorresist1.py => effect5695.py} |  0
 ...{shieldcapacitymultiply.py => effect57.py} |  0
 .../{implantsetwarpspeed.py => effect5717.py} |  0
 ...malrangepiratefaction.py => effect5721.py} |  0
 ...{shiphybridoptimalgd1.py => effect5722.py} |  0
 ...rdictorsmwdsigradius2.py => effect5723.py} |  0
 ...shipshtoptimalbonusgf.py => effect5724.py} |  0
 ...iramountpiratefaction.py => effect5725.py} |  0
 ...malrangepiratefaction.py => effect5726.py} |  0
 ...missiledamageexprole1.py => effect5733.py} |  0
 ...missiledamagekinrole1.py => effect5734.py} |  0
 ...ymissiledamageemrole1.py => effect5735.py} |  0
 ...ssiledamagethermrole1.py => effect5736.py} |  0
 ...gthbonuspiratefaction.py => effect5737.py} |  0
 ...irrangepiratefaction2.py => effect5738.py} |  0
 ...lftrackingmodulebonus.py => effect5754.py} |  0
 ...selfsensormodulebonus.py => effect5757.py} |  0
 ...rloadselfpainterbonus.py => effect5758.py} |  0
 ...irdronehullbonusbonus.py => effect5769.py} |  0
 .../{shipmissilerofmf2.py => effect5778.py}   |  0
 ...hipbonussptfalloffmf2.py => effect5779.py} |  0
 ...nrangedisruptionbonus.py => effect5793.py} |  0
 ...pacitorcapacitymultiply.py => effect58.py} |  0
 ...rburnerspeedfactor2cb.py => effect5802.py} |  0
 ...ltiplierpiratefaction.py => effect5803.py} |  0
 ...ltiplierpiratefaction.py => effect5804.py} |  0
 ...ydronehppiratefaction.py => effect5805.py} |  0
 ...earmorhppiratefaction.py => effect5806.py} |  0
 ...shieldhppiratefaction.py => effect5807.py} |  0
 ...shieldhppiratefaction.py => effect5808.py} |  0
 ...earmorhppiratefaction.py => effect5809.py} |  0
 ...odulesrequiringgunnery.py => effect581.py} |  0
 ...ydronehppiratefaction.py => effect5810.py} |  0
 ...neticmissiledamagegb2.py => effect5811.py} |  0
 ...ermalmissiledamagegb2.py => effect5812.py} |  0
 ...rburnerspeedfactorcf2.py => effect5813.py} |  0
 ...ineticmissiledamagegf.py => effect5814.py} |  0
 ...hermalmissiledamagegf.py => effect5815.py} |  0
 ...ltiplierpiratefaction.py => effect5816.py} |  0
 ...tdronehppiratefaction.py => effect5817.py} |  0
 ...earmorhppiratefaction.py => effect5818.py} |  0
 ...shieldhppiratefaction.py => effect5819.py} |  0
 ...odulesrequiringgunnery.py => effect582.py} |  0
 ...rburnerspeedfactorcc2.py => effect5820.py} |  0
 ...ltiplierpiratefaction.py => effect5821.py} |  0
 ...mdronehppiratefaction.py => effect5822.py} |  0
 ...earmorhppiratefaction.py => effect5823.py} |  0
 ...shieldhppiratefaction.py => effect5824.py} |  0
 ...neticmissiledamagegc2.py => effect5825.py} |  0
 ...ermalmissiledamagegc2.py => effect5826.py} |  0
 ...onustdoptimalbonusaf1.py => effect5827.py} |  0
 ...nusminingdurationore3.py => effect5829.py} |  0
 ...ceharvestingrangeore2.py => effect5832.py} |  0
 ...argeshieldresistance1.py => effect5839.py} |  0
 ...odulesrequiringgunnery.py => effect584.py} |  0
 ...sminingdurationbarge2.py => effect5840.py} |  0
 ...onusexpeditionmining1.py => effect5852.py} |  0
 ...sexpeditionsigradius2.py => effect5853.py} |  0
 ...shipmissileemdamagecb.py => effect5862.py} |  0
 ...hipmissilekindamagecb.py => effect5863.py} |  0
 ...pmissilethermdamagecb.py => effect5864.py} |  0
 ...pmissileexplodamagecb.py => effect5865.py} |  0
 ...arpscramblemaxrangegb.py => effect5866.py} |  0
 ...ondelaypiratefaction2.py => effect5867.py} |  0
 ...drawbackcargocapacity.py => effect5868.py} |  0
 ...strialwarpspeedbonus1.py => effect5869.py} |  0
 ...nshipgroupenergyweapon.py => effect587.py} |  0
 ...ipbonusshieldboostci2.py => effect5870.py} |  0
 ...ipbonusshieldboostmi2.py => effect5871.py} |  0
 ...ipbonusarmorrepairai2.py => effect5872.py} |  0
 ...ipbonusarmorrepairgi2.py => effect5873.py} |  0
 ...ustrialfleetcapacity1.py => effect5874.py} |  0
 ...pgroupprojectileweapon.py => effect588.py} |  0
 ...ustrialshieldresists2.py => effect5881.py} |  0
 ...dustrialarmorresists2.py => effect5888.py} |  0
 ...industrialabheatbonus.py => effect5889.py} |  0
 ...nshipgrouphybridweapon.py => effect589.py} |  0
 ...ndustrialmwdheatbonus.py => effect5890.py} |  0
 ...rmorhardenerheatbonus.py => effect5891.py} |  0
 ...rmorhardenerheatbonus.py => effect5892.py} |  0
 ...ieldhardenerheatbonus.py => effect5893.py} |  0
 ...hieldboosterheatbonus.py => effect5896.py} |  0
 ...larmorrepairheatbonus.py => effect5899.py} |  0
 .../{cargocapacitymultiply.py => effect59.py} |  0
 ...ringenergypulseweapons.py => effect590.py} |  0
 .../{warpspeedaddition.py => effect5900.py}   |  0
 ...{rolebonusbulkheadcpu.py => effect5901.py} |  0
 ...amountbonuspercentage.py => effect5911.py} |  0
 ...ecaptransmitteramount.py => effect5912.py} |  0
 .../{systemarmorhp.py => effect5913.py}       |  0
 ...menergyneutmultiplier.py => effect5914.py} |  0
 ...ergyvampiremultiplier.py => effect5915.py} |  0
 ...mdamageexplosivebombs.py => effect5916.py} |  0
 ...temdamagekineticbombs.py => effect5917.py} |  0
 ...temdamagethermalbombs.py => effect5918.py} |  0
 .../{systemdamageembombs.py => effect5919.py} |  0
 .../{systemaoecloudsize.py => effect5920.py}  |  0
 ...rgetpaintermultiplier.py => effect5921.py} |  0
 ...ierstrengthmultiplier.py => effect5922.py} |  0
 .../{systemneutbombs.py => effect5923.py}     |  0
 ...temgravimetricecmbomb.py => effect5924.py} |  0
 .../{systemladarecmbomb.py => effect5925.py}  |  0
 ...magnetrometricecmbomb.py => effect5926.py} |  0
 .../{systemradarecmbomb.py => effect5927.py}  |  0
 .../{systemdronetracking.py => effect5929.py} |  0
 ...blockmwdwithnpceffect.py => effect5934.py} |  0
 ...ileexplosionradiuscf2.py => effect5938.py} |  0
 ...shiprocketrofbonusaf2.py => effect5939.py} |  0
 ...usinterdictorsshtrof1.py => effect5940.py} |  0
 ...lelauncherrofad1fixed.py => effect5944.py} |  0
 .../{cloakingprototype.py => effect5945.py}   |  0
 .../{drawbackwarpspeed.py => effect5951.py}   |  0
 ...shipmetdamagebonusac2.py => effect5956.py} |  0
 ...nterdictorsmetoptimal.py => effect5957.py} |  0
 ...{shiphybridtrackinggc.py => effect5958.py} |  0
 ...dictorshybridoptimal1.py => effect5959.py} |  0
 .../{ammoinfluencerange.py => effect596.py}   |  0
 .../{ammospeedmultiplier.py => effect598.py}  |  0
 .../{ammofallofmultiplier.py => effect599.py} |  0
 ...sistancekillerhullall.py => effect5994.py} |  0
 ...ekillershieldarmorall.py => effect5995.py} |  0
 ...tersmacapacitybonuso1.py => effect5998.py} |  0
 .../{structurehpmultiply.py => effect60.py}   |  0
 ...ammotrackingmultiplier.py => effect600.py} |  0
 ...ighteragilitybonus2o2.py => effect6001.py} |  0
 ...arrtacticaldestroyer1.py => effect6006.py} |  0
 ...arrtacticaldestroyer2.py => effect6007.py} |  0
 ...arrtacticaldestroyer3.py => effect6008.py} |  0
 ...cpupercentrolebonust3.py => effect6009.py} |  0
 ...maxtargetrangepostdiv.py => effect6010.py} |  0
 ...etoptimalrangepostdiv.py => effect6011.py} |  0
 ...descanstrengthpostdiv.py => effect6012.py} |  0
 ...{modesigradiuspostdiv.py => effect6014.py} |  0
 ...armorresonancepostdiv.py => effect6015.py} |  0
 .../{modeagilitypostdiv.py => effect6016.py}  |  0
 .../{modevelocitypostdiv.py => effect6017.py} |  0
 ...hippturretspeedbonusmc.py => effect602.py} |  0
 ...senergyneutoptimalrs3.py => effect6020.py} |  0
 ...usenergynosoptimalrs3.py => effect6021.py} |  0
 ...bonusmhtoptimalrange1.py => effect6025.py} |  0
 ...ereconbonusmptdamage1.py => effect6027.py} |  0
 ...rpowerneedbonuseffect.py => effect6032.py} |  0
 ...tartacticaldestroyer3.py => effect6036.py} |  0
 ...tartacticaldestroyer1.py => effect6037.py} |  0
 ...tartacticaldestroyer2.py => effect6038.py} |  0
 ...odespttrackingpostdiv.py => effect6039.py} |  0
 .../{shipptspeedbonusmb2.py => effect604.py}  |  0
 ...demwdsigradiuspostdiv.py => effect6040.py} |  0
 ...hieldresonancepostdiv.py => effect6041.py} |  0
 ...rydamagemultipliergc3.py => effect6045.py} |  0
 ...{shipbonussentryhpgc3.py => effect6046.py} |  0
 ...bonussentryarmorhpgc3.py => effect6047.py} |  0
 ...onussentryshieldhpgc3.py => effect6048.py} |  0
 ...nedamagemultipliergc2.py => effect6051.py} |  0
 ...nedamagemultipliergc2.py => effect6052.py} |  0
 ...nedamagemultipliergc2.py => effect6053.py} |  0
 ...pbonusheavydronehpgc2.py => effect6054.py} |  0
 ...sheavydronearmorhpgc2.py => effect6055.py} |  0
 ...heavydroneshieldhpgc2.py => effect6056.py} |  0
 ...ediumdroneshieldhpgc2.py => effect6057.py} |  0
 ...mediumdronearmorhpgc2.py => effect6058.py} |  0
 ...bonusmediumdronehpgc2.py => effect6059.py} |  0
 ...pbonuslightdronehpgc2.py => effect6060.py} |  0
 ...slightdronearmorhpgc2.py => effect6061.py} |  0
 ...lightdroneshieldhpgc2.py => effect6062.py} |  0
 eos/effects/{entosislink.py => effect6063.py} |  0
 eos/effects/{cloaking.py => effect607.py}     |  0
 ...issilevelocitypostdiv.py => effect6076.py} |  0
 ...aritacticaldestroyer3.py => effect6077.py} |  0
 ...ssiledmgpiratefaction.py => effect6083.py} |  0
 ...aritacticaldestroyer1.py => effect6085.py} |  0
 ...ltmissilealldamagemc2.py => effect6088.py} |  0
 ...vymissilealldamagemc2.py => effect6093.py} |  0
 ...htmissilealldamagemc2.py => effect6096.py} |  0
 ...aritacticaldestroyer2.py => effect6098.py} |  0
 eos/effects/{agilitybonus.py => effect61.py}  |  0
 ...tosisdurationmultiply.py => effect6104.py} |  0
 ...levelocitybonusonline.py => effect6110.py} |  0
 ...osiondelaybonusonline.py => effect6111.py} |  0
 ...ecloudsizebonusonline.py => effect6112.py} |  0
 ...oevelocitybonusonline.py => effect6113.py} |  0
 ...oecloudsizebonusbonus.py => effect6128.py} |  0
 ...aoevelocitybonusbonus.py => effect6129.py} |  0
 ...ilevelocitybonusbonus.py => effect6130.py} |  0
 ...losiondelaybonusbonus.py => effect6131.py} |  0
 ...uidancecomputerbonus4.py => effect6135.py} |  0
 ...missileguidancebonus5.py => effect6144.py} |  0
 ...ntetacticaldestroyer3.py => effect6148.py} |  0
 ...ntetacticaldestroyer1.py => effect6149.py} |  0
 ...ntetacticaldestroyer2.py => effect6150.py} |  0
 ...ehullresonancepostdiv.py => effect6151.py} |  0
 ...htoptimalrangepostdiv.py => effect6152.py} |  0
 .../{modemwdcappostdiv.py => effect6153.py}   |  0
 .../{modemwdboostpostdiv.py => effect6154.py} |  0
 ...morrepdurationpostdiv.py => effect6155.py} |  0
 .../{passivespeedlimit.py => effect6163.py}   |  0
 ...maxvelocitypercentage.py => effect6164.py} |  0
 ...onuswdfgnullpenalties.py => effect6166.py} |  0
 .../{entosiscpupenalty.py => effect6170.py}   |  0
 .../{entosiscpuaddition.py => effect6171.py}  |  0
 ...battlecruisermetrange.py => effect6172.py} |  0
 ...battlecruisermhtrange.py => effect6173.py} |  0
 ...battlecruisermptrange.py => effect6174.py} |  0
 ...lecruisermissilerange.py => effect6175.py} |  0
 ...ttlecruiserdronespeed.py => effect6176.py} |  0
 .../{shiphybriddmg1cbc2.py => effect6177.py}  |  0
 ...rojectiletrackingmbc2.py => effect6178.py} |  0
 ...ecapacitortransmitter.py => effect6184.py} |  0
 ...uleremotehullrepairer.py => effect6185.py} |  0
 ...leremoteshieldbooster.py => effect6186.py} |  0
 ...rgyneutralizerfalloff.py => effect6187.py} |  0
 ...leremotearmorrepairer.py => effect6188.py} |  0
 ...gateshieldresistance1.py => effect6195.py} |  0
 ...eharvestingcycletime2.py => effect6196.py} |  0
 ...nergynosferatufalloff.py => effect6197.py} |  0
 .../{doomsdayslash.py => effect6201.py}       |  0
 ...{microjumpportaldrive.py => effect6208.py} |  0
 ...nuscdlinkspgreduction.py => effect6214.py} |  0
 ...rgyneutralizerfalloff.py => effect6216.py} |  0
 ...blockmwdwithnpceffect.py => effect6222.py} |  0
 ...droneamountpercentchar.py => effect623.py} |  0
 ...senergyneutoptimalrs1.py => effect6230.py} |  0
 ...senergyneutfalloffrs2.py => effect6232.py} |  0
 ...senergyneutfalloffrs3.py => effect6233.py} |  0
 ...usenergynosoptimalrs1.py => effect6234.py} |  0
 ...usenergynosfalloffrs2.py => effect6237.py} |  0
 ...usenergynosfalloffrs3.py => effect6238.py} |  0
 ...eharvestingcycletime2.py => effect6239.py} |  0
 ...senergyneutfalloffad1.py => effect6241.py} |  0
 ...senergyneutoptimalad2.py => effect6242.py} |  0
 ...usenergynosoptimalad2.py => effect6245.py} |  0
 ...usenergynosfalloffad1.py => effect6246.py} |  0
 ...usenergyneutoptimalab.py => effect6253.py} |  0
 ...senergyneutfalloffab2.py => effect6256.py} |  0
 ...nusenergynosoptimalab.py => effect6257.py} |  0
 ...usenergynosfalloffab2.py => effect6260.py} |  0
 ...energyneutoptimaleaf1.py => effect6267.py} |  0
 .../{powerincrease.py => effect627.py}        |  0
 ...energyneutfalloffeaf3.py => effect6272.py} |  0
 ...senergynosoptimaleaf1.py => effect6273.py} |  0
 ...senergynosfalloffeaf3.py => effect6278.py} |  0
 ...senergyneutoptimalaf2.py => effect6281.py} |  0
 ...senergyneutfalloffaf3.py => effect6285.py} |  0
 ...usenergynosoptimalaf2.py => effect6287.py} |  0
 ...usenergynosfalloffaf3.py => effect6291.py} |  0
 ...senergyneutoptimalac1.py => effect6294.py} |  0
 ...senergyneutfalloffac3.py => effect6299.py} |  0
 .../{armorhpmultiply.py => effect63.py}       |  0
 ...usenergynosoptimalac1.py => effect6300.py} |  0
 ...snosoptimalfalloffac2.py => effect6301.py} |  0
 ...usenergynosfalloffac3.py => effect6305.py} |  0
 ...nusthermmissiledmgmd1.py => effect6307.py} |  0
 ...pbonusemmissiledmgmd1.py => effect6308.py} |  0
 ...skineticmissiledmgmd1.py => effect6309.py} |  0
 ...xplosivemissiledmgmd1.py => effect6310.py} |  0
 ...anddestroyerskirmish1.py => effect6315.py} |  0
 ...mmanddestroyershield1.py => effect6316.py} |  0
 ...nddestroyermjfgspool2.py => effect6317.py} |  0
 ...emshieldresistancemd2.py => effect6318.py} |  0
 ...icshieldresistancemd2.py => effect6319.py} |  0
 ...alshieldresistancemd2.py => effect6320.py} |  0
 ...veshieldresistancemd2.py => effect6321.py} |  0
 ...ricstrengthbonusbonus.py => effect6322.py} |  0
 ...darstrengthbonusbonus.py => effect6323.py} |  0
 ...ricstrengthbonusbonus.py => effect6324.py} |  0
 ...darstrengthbonusbonus.py => effect6325.py} |  0
 ...ermalmissiledamagecd1.py => effect6326.py} |  0
 ...nusemmissiledamagecd1.py => effect6327.py} |  0
 ...neticmissiledamagecd1.py => effect6328.py} |  0
 ...osivemissiledamagecd1.py => effect6329.py} |  0
 ...shieldemresistancecd2.py => effect6330.py} |  0
 ...dthermalresistancecd2.py => effect6331.py} |  0
 ...dkineticresistancecd2.py => effect6332.py} |  0
 ...xplosiveresistancecd2.py => effect6333.py} |  0
 ...commanddestroyerinfo1.py => effect6334.py} |  0
 ...ticarmorresistancead2.py => effect6335.py} |  0
 ...malarmorresistancead2.py => effect6336.py} |  0
 ...semarmorresistancead2.py => effect6337.py} |  0
 ...ivearmorresistancead2.py => effect6338.py} |  0
 ...manddestroyerarmored1.py => effect6339.py} |  0
 ...ticarmorresistancegd2.py => effect6340.py} |  0
 ...semarmorresistancegd2.py => effect6341.py} |  0
 ...malarmorresistancegd2.py => effect6342.py} |  0
 ...ivearmorresistancegd2.py => effect6343.py} |  0
 ...smallmissilekindmgcf3.py => effect6350.py} |  0
 ...ipmissilekindamagecc3.py => effect6351.py} |  0
 .../{rolebonuswdrange.py => effect6352.py}    |  0
 .../{rolebonuswdcapcpu.py => effect6353.py}   |  0
 ...disruptionstrengthaf2.py => effect6354.py} |  0
 .../{rolebonusecmcapcpu.py => effect6355.py}  |  0
 .../{rolebonusecmrange.py => effect6356.py}   |  0
 ...justscramblerrangegf2.py => effect6357.py} |  0
 ...justscramblerstrength.py => effect6358.py} |  0
 ...saoevelocityrocketsmf.py => effect6359.py} |  0
 ...ocketemthermkindmgmf2.py => effect6360.py} |  0
 .../{shiprocketexpdmgmf3.py => effect6361.py} |  0
 ...{rolebonusstasisrange.py => effect6362.py} |  0
 ...ansporterfalloffbonus.py => effect6368.py} |  0
 ...eldtransferfalloffmc2.py => effect6369.py} |  0
 ...eldtransferfalloffcc1.py => effect6370.py} |  0
 ...remotearmorfalloffgc1.py => effect6371.py} |  0
 ...remotearmorfalloffac2.py => effect6372.py} |  0
 ...projectorfalloffbonus.py => effect6373.py} |  0
 ...hullrepairbonuseffect.py => effect6374.py} |  0
 ...frigarmorrepspeedcap1.py => effect6377.py} |  0
 ...rigshieldrepspeedcap1.py => effect6378.py} |  0
 ...bonuslogifrigarmorhp2.py => effect6379.py} |  0
 ...onuslogifrigshieldhp2.py => effect6380.py} |  0
 ...nuslogifrigsignature2.py => effect6381.py} |  0
 ...leguidancemodulebonus.py => effect6384.py} |  0
 ...ecloakvelocitypenalty.py => effect6385.py} |  0
 ...idancedisruptionbonus.py => effect6386.py} |  0
 ...disruptionstrengthac1.py => effect6395.py} |  0
 ...uremissiledamagebonus.py => effect6396.py} |  0
 ...icsystemscapneedbonus.py => effect6400.py} |  0
 ...ngsystemscapneedbonus.py => effect6401.py} |  0
 ...ssingletargetmissiles.py => effect6402.py} |  0
 ...ssingletargetmissiles.py => effect6403.py} |  0
 ...efalloffeffectiveness.py => effect6404.py} |  0
 ...tralizercapacitorneed.py => effect6405.py} |  0
 ...erigewmaxrangefalloff.py => effect6406.py} |  0
 ...urerigewcapacitorneed.py => effect6407.py} |  0
 ...tructurerigmaxtargets.py => effect6408.py} |  0
 ...rerigsensorresolution.py => effect6409.py} |  0
 ...adiusbonusaoemissiles.py => effect6410.py} |  0
 ...ocitybonusaoemissiles.py => effect6411.py} |  0
 ...ructurerigpdbmaxrange.py => effect6412.py} |  0
 ...rerigpdbcapacitorneed.py => effect6413.py} |  0
 ...rigdoomsdaydamageloss.py => effect6417.py} |  0
 ...motesensordampfalloff.py => effect6422.py} |  0
 ...duleguidancedisruptor.py => effect6423.py} |  0
 ...duletrackingdisruptor.py => effect6424.py} |  0
 ...otetargetpaintfalloff.py => effect6425.py} |  0
 ...remotewebifierfalloff.py => effect6426.py} |  0
 ...otesensorboostfalloff.py => effect6427.py} |  0
 ...emotetrackingcomputer.py => effect6428.py} |  0
 ...ighterabilitymissiles.py => effect6431.py} |  0
 ...lityenergyneutralizer.py => effect6434.py} |  0
 ...abilitystasiswebifier.py => effect6435.py} |  0
 ...abilitywarpdisruption.py => effect6436.py} |  0
 .../{fighterabilityecm.py => effect6437.py}   |  0
 ...ilityevasivemaneuvers.py => effect6439.py} |  0
 ...abilitymicrowarpdrive.py => effect6441.py} |  0
 .../{pointdefense.py => effect6443.py}        |  0
 .../{lightningweapon.py => effect6447.py}     |  0
 ...ssileguidanceenhancer.py => effect6448.py} |  0
 ...allisticcontrolsystem.py => effect6449.py} |  0
 ...fighterabilityattackm.py => effect6465.py} |  0
 .../{remoteecmfalloff.py => effect6470.py}    |  0
 .../{doomsdaybeamdot.py => effect6472.py}     |  0
 .../{doomsdayconedot.py => effect6473.py}     |  0
 eos/effects/{doomsdayhog.py => effect6474.py} |  0
 ...sdaytargetamountbonus.py => effect6475.py} |  0
 .../{doomsdayaoeweb.py => effect6476.py}      |  0
 .../{doomsdayaoeneut.py => effect6477.py}     |  0
 .../{doomsdayaoepaint.py => effect6478.py}    |  0
 .../{doomsdayaoetrack.py => effect6479.py}    |  0
 .../{doomsdayaoedamp.py => effect6481.py}     |  0
 .../{doomsdayaoebubble.py => effect6482.py}   |  0
 ...mergencyhullenergizer.py => effect6484.py} |  0
 ...hterabilitylaunchbomb.py => effect6485.py} |  0
 ...ergywarfareresistance.py => effect6487.py} |  0
 ...sorstrengthbonusbonus.py => effect6488.py} |  0
 ...adnoughta1damagebonus.py => effect6501.py} |  0
 ...dnoughta2armorresists.py => effect6502.py} |  0
 ...sdreadnoughta3capneed.py => effect6503.py} |  0
 ...adnoughtc1damagebonus.py => effect6504.py} |  0
 ...noughtc2shieldresists.py => effect6505.py} |  0
 ...adnoughtg1damagebonus.py => effect6506.py} |  0
 ...dreadnoughtg2rofbonus.py => effect6507.py} |  0
 ...eadnoughtg3repairtime.py => effect6508.py} |  0
 ...adnoughtm1damagebonus.py => effect6509.py} |  0
 ...dreadnoughtm2rofbonus.py => effect6510.py} |  0
 ...eadnoughtm3repairtime.py => effect6511.py} |  0
 .../{doomsdayaoeecm.py => effect6513.py}      |  0
 ...oterepairandcapamount.py => effect6526.py} |  0
 ...xiliarya2armorresists.py => effect6527.py} |  0
 ...rya4warfarelinksbonus.py => effect6533.py} |  0
 ...rym4warfarelinksbonus.py => effect6534.py} |  0
 ...ryg4warfarelinksbonus.py => effect6535.py} |  0
 ...ryc4warfarelinksbonus.py => effect6536.py} |  0
 ...1commandburstcpubonus.py => effect6537.py} |  0
 ...moteboostandcapamount.py => effect6545.py} |  0
 ...iliaryc2shieldresists.py => effect6546.py} |  0
 ...iaryg1remotecycletime.py => effect6548.py} |  0
 ...ryg2localrepairamount.py => effect6549.py} |  0
 ...liarym1remoteduration.py => effect6551.py} |  0
 ...arym2localboostamount.py => effect6552.py} |  0
 ...onenavigationcomputer.py => effect6555.py} |  0
 ...sdronedamageamplifier.py => effect6556.py} |  0
 ...rectionaltrackinglink.py => effect6557.py} |  0
 ...ltrackinglinkoverload.py => effect6558.py} |  0
 ...ionaltrackingenhancer.py => effect6559.py} |  0
 .../{skillbonusfighters.py => effect6560.py}  |  0
 ...illbonuslightfighters.py => effect6561.py} |  0
 ...supportfightersshield.py => effect6562.py} |  0
 ...illbonusheavyfighters.py => effect6563.py} |  0
 .../{citadelrigbonus.py => effect6565.py}     |  0
 ...nusfightersupportunit.py => effect6566.py} |  0
 ...snetworkedsensorarray.py => effect6567.py} |  0
 ...gilitymultipliereffect.py => effect657.py} |  0
 ...ghterhangarmanagement.py => effect6570.py} |  0
 ...ocannonspecialization.py => effect6571.py} |  0
 ...tilleryspecialization.py => effect6572.py} |  0
 ...blasterspecialization.py => effect6573.py} |  0
 ...railgunspecialization.py => effect6574.py} |  0
 ...selaserspecialization.py => effect6575.py} |  0
 ...amlaserspecialization.py => effect6576.py} |  0
 ...missilespecialization.py => effect6577.py} |  0
 ...torpedospecialization.py => effect6578.py} |  0
 ...icdronerepamountbonus.py => effect6580.py} |  0
 ...dulebonustriagemodule.py => effect6581.py} |  0
 ...odulebonussiegemodule.py => effect6582.py} |  0
 ...carriera3warpstrength.py => effect6591.py} |  0
 ...carrierc3warpstrength.py => effect6592.py} |  0
 ...carrierg3warpstrength.py => effect6593.py} |  0
 ...carrierm3warpstrength.py => effect6594.py} |  0
 ...era4warfarelinksbonus.py => effect6595.py} |  0
 ...erc4warfarelinksbonus.py => effect6596.py} |  0
 ...erg4warfarelinksbonus.py => effect6597.py} |  0
 ...erm4warfarelinksbonus.py => effect6598.py} |  0
 ...carriera1armorresists.py => effect6599.py} |  0
 .../{missileemdmgbonus.py => effect660.py}    |  0
 ...arrierc1shieldresists.py => effect6600.py} |  0
 ...arrierg1fighterdamage.py => effect6601.py} |  0
 ...arrierm1fighterdamage.py => effect6602.py} |  0
 ...arriera1fighterdamage.py => effect6603.py} |  0
 ...arrierc1fighterdamage.py => effect6604.py} |  0
 ...arrierg1fighterdamage.py => effect6605.py} |  0
 ...arrierm1fighterdamage.py => effect6606.py} |  0
 ...era5warfarelinksbonus.py => effect6607.py} |  0
 ...erc5warfarelinksbonus.py => effect6608.py} |  0
 ...erg5warfarelinksbonus.py => effect6609.py} |  0
 ...ssileexplosivedmgbonus.py => effect661.py} |  0
 ...erm5warfarelinksbonus.py => effect6610.py} |  0
 ...ierc2afterburnerbonus.py => effect6611.py} |  0
 ...ghterapplicationbonus.py => effect6612.py} |  0
 ...rrole1numwarfarelinks.py => effect6613.py} |  0
 ...rmorshieldmodulebonus.py => effect6614.py} |  0
 ...a4burstprojectorbonus.py => effect6615.py} |  0
 ...c4burstprojectorbonus.py => effect6616.py} |  0
 ...g4burstprojectorbonus.py => effect6617.py} |  0
 ...m4burstprojectorbonus.py => effect6618.py} |  0
 ...rrole1numwarfarelinks.py => effect6619.py} |  0
 ...missilethermaldmgbonus.py => effect662.py} |  0
 ...adnoughtc3reloadbonus.py => effect6620.py} |  0
 ...carriera2armorresists.py => effect6621.py} |  0
 ...arrierc2shieldresists.py => effect6622.py} |  0
 ...ierg2fighterhitpoints.py => effect6623.py} |  0
 ...rierm2fightervelocity.py => effect6624.py} |  0
 ...a2supportfighterbonus.py => effect6625.py} |  0
 ...c2supportfighterbonus.py => effect6626.py} |  0
 ...g2supportfighterbonus.py => effect6627.py} |  0
 ...m2supportfighterbonus.py => effect6628.py} |  0
 ...tresistancebonusbonus.py => effect6629.py} |  0
 ...nustitana1damagebonus.py => effect6634.py} |  0
 ...titanc1kindamagebonus.py => effect6635.py} |  0
 ...nustitang1damagebonus.py => effect6636.py} |  0
 ...nustitanm1damagebonus.py => effect6637.py} |  0
 ...pbonustitanc2rofbonus.py => effect6638.py} |  0
 ...ghterapplicationbonus.py => effect6639.py} |  0
 ...srole1numwarfarelinks.py => effect6640.py} |  0
 ...sshieldextendersbonus.py => effect6641.py} |  0
 ...usdoomsdayrapidfiring.py => effect6642.py} |  0
 ...ustitana3warpstrength.py => effect6647.py} |  0
 ...ustitanc3warpstrength.py => effect6648.py} |  0
 ...ustitang3warpstrength.py => effect6649.py} |  0
 ...ustitanm3warpstrength.py => effect6650.py} |  0
 ...ryremotearmorrepairer.py => effect6651.py} |  0
 ...ryremoteshieldbooster.py => effect6652.py} |  0
 ...ipbonustitana2capneed.py => effect6653.py} |  0
 ...pbonustitang2rofbonus.py => effect6654.py} |  0
 ...pbonustitanm2rofbonus.py => effect6655.py} |  0
 ...ltorpdeovelocitybonus.py => effect6656.py} |  0
 ...titanc5alldamagebonus.py => effect6657.py} |  0
 ...ulebonusbastionmodule.py => effect6658.py} |  0
 ...rierm3fightervelocity.py => effect6661.py} |  0
 ...ierg3fighterhitpoints.py => effect6662.py} |  0
 ...bonusdroneinterfacing.py => effect6663.py} |  0
 ...nusdronesharpshooting.py => effect6664.py} |  0
 ...lbonusdronedurability.py => effect6665.py} |  0
 ...lbonusdronenavigation.py => effect6667.py} |  0
 ...onedurabilityenhancer.py => effect6669.py} |  0
 ...capitaldronescopechip.py => effect6670.py} |  0
 ...aldronespeedaugmentor.py => effect6671.py} |  0
 ...doomsdaydurationbonus.py => effect6679.py} |  0
 ...issilekineticdmgbonus2.py => effect668.py} |  0
 ...srole3numwarfarelinks.py => effect6681.py} |  0
 ...eeffectstasiswebifier.py => effect6682.py} |  0
 ...leeffecttargetpainter.py => effect6683.py} |  0
 ...tremotesensordampener.py => effect6684.py} |  0
 ...ucturemoduleeffectecm.py => effect6685.py} |  0
 ...ffectweapondisruption.py => effect6686.py} |  0
 ...tyremotearmorrepairer.py => effect6687.py} |  0
 ...tyremoteshieldbooster.py => effect6688.py} |  0
 ...ityremotehullrepairer.py => effect6689.py} |  0
 ...{remotewebifierentity.py => effect6690.py} |  0
 ...rgyneutralizerfalloff.py => effect6691.py} |  0
 ...motetargetpaintentity.py => effect6692.py} |  0
 ...emotesensordampentity.py => effect6693.py} |  0
 ...entityweapondisruptor.py => effect6694.py} |  0
 .../{entityecmfalloff.py => effect6695.py}    |  0
 ...rawbackreductionarmor.py => effect6697.py} |  0
 ...reductionastronautics.py => effect6698.py} |  0
 ...awbackreductiondrones.py => effect6699.py} |  0
 eos/effects/{mininglaser.py => effect67.py}   |  0
 ...iwarpscramblingpassive.py => effect670.py} |  0
 ...ckreductionelectronic.py => effect6700.py} |  0
 ...ckreductionprojectile.py => effect6701.py} |  0
 ...reductionenergyweapon.py => effect6702.py} |  0
 ...awbackreductionhybrid.py => effect6703.py} |  0
 ...backreductionlauncher.py => effect6704.py} |  0
 ...awbackreductionshield.py => effect6705.py} |  0
 .../{setbonusasklepian.py => effect6706.py}   |  0
 ...pairamountbonussubcap.py => effect6708.py} |  0
 ...italhybriddamagebonus.py => effect6709.py} |  0
 ...ghtm1webstrengthbonus.py => effect6710.py} |  0
 ...italhybriddamagebonus.py => effect6711.py} |  0
 ...tanm1webstrengthbonus.py => effect6712.py} |  0
 ...urstprojectorwebbonus.py => effect6713.py} |  0
 .../{ecmburstjammer.py => effect6714.py}      |  0
 ...eoreminingdurationcap.py => effect6717.py} |  0
 ...ipbonusdronerepairmc1.py => effect6720.py} |  0
 ...repairoptimalfalloff1.py => effect6721.py} |  0
 ...rrepairoptimalfalloff.py => effect6722.py} |  0
 ...{shipbonuscloakcpumc2.py => effect6723.py} |  0
 ...earmorrepairduration3.py => effect6724.py} |  0
 ...hipbonussetfalloffaf2.py => effect6725.py} |  0
 ...{shipbonuscloakcpumf1.py => effect6726.py} |  0
 ...veropsnosneutfalloff1.py => effect6727.py} |  0
 ...lebonusmicrowarpdrive.py => effect6730.py} |  0
 ...odulebonusafterburner.py => effect6731.py} |  0
 ...bonuswarfarelinkarmor.py => effect6732.py} |  0
 ...onuswarfarelinkshield.py => effect6733.py} |  0
 ...uswarfarelinkskirmish.py => effect6734.py} |  0
 ...ebonuswarfarelinkinfo.py => effect6735.py} |  0
 ...onuswarfarelinkmining.py => effect6736.py} |  0
 ...rgebonuswarfarecharge.py => effect6737.py} |  0
 ...ringenergypulseweapons.py => effect675.py} |  0
 ...etitaneffectgenerator.py => effect6753.py} |  0
 ...{miningdronespecbonus.py => effect6762.py} |  0
 ...perationdurationbonus.py => effect6763.py} |  0
 ...vestingdronespecbonus.py => effect6764.py} |  0
 ...nerationdurationbonus.py => effect6765.py} |  0
 ...ommandprocessoreffect.py => effect6766.py} |  0
 ...{commandburstaoebonus.py => effect6769.py} |  0
 ...ssilelauncheroperation.py => effect677.py} |  0
 ...dcommanddurationbonus.py => effect6770.py} |  0
 ...dcommanddurationbonus.py => effect6771.py} |  0
 ...ncommanddurationbonus.py => effect6772.py} |  0
 ...hcommanddurationbonus.py => effect6773.py} |  0
 ...gforemandurationbonus.py => effect6774.py} |  0
 ...dcommandstrengthbonus.py => effect6776.py} |  0
 ...dcommandstrengthbonus.py => effect6777.py} |  0
 ...ncommandstrengthbonus.py => effect6778.py} |  0
 ...hcommandstrengthbonus.py => effect6779.py} |  0
 ...gforemanstrengthbonus.py => effect6780.py} |  0
 ...dburstreloadtimebonus.py => effect6782.py} |  0
 ...mandburstaoerolebonus.py => effect6783.py} |  0
 ...commandburstbonusics3.py => effect6786.py} |  0
 ...onehpdamageminingics4.py => effect6787.py} |  0
 ...roneiceharvestingics5.py => effect6788.py} |  0
 ...trialbonusdronedamage.py => effect6789.py} |  0
 ...roneiceharvestingrole.py => effect6790.py} |  0
 ...mageminingorecapital4.py => effect6792.py} |  0
 ...burstbonusorecapital2.py => effect6793.py} |  0
 ...burstbonusorecapital3.py => effect6794.py} |  0
 ...harvestingorecapital5.py => effect6795.py} |  0
 ...pmodeshtdamagepostdiv.py => effect6796.py} |  0
 ...pmodesptdamagepostdiv.py => effect6797.py} |  0
 ...pmodesetdamagepostdiv.py => effect6798.py} |  0
 ...lmissiledamagepostdiv.py => effect6799.py} |  0
 ...edamptdresistspostdiv.py => effect6800.py} |  0
 ...emwdandabboostpostdiv.py => effect6801.py} |  0
 ...litycoredurationbonus.py => effect6807.py} |  0
 ...fendermissilevelocity.py => effect6844.py} |  0
 ...yerrole1defenderbonus.py => effect6845.py} |  0
 ...italenergydamagebonus.py => effect6851.py} |  0
 ...stitanm1webrangebonus.py => effect6852.py} |  0
 ...rgywarfareamountbonus.py => effect6853.py} |  0
 ...rgywarfareamountbonus.py => effect6855.py} |  0
 ...noughtm1webrangebonus.py => effect6856.py} |  0
 ...a1nosferaturangebonus.py => effect6857.py} |  0
 ...1nosferatudrainamount.py => effect6858.py} |  0
 ...ole4nosferatucpubonus.py => effect6859.py} |  0
 ...rrepairpowergridbonus.py => effect6860.py} |  0
 ...rrepairpowergridbonus.py => effect6861.py} |  0
 ...tearmorrepairduration.py => effect6862.py} |  0
 ...coveropswarpvelocity1.py => effect6865.py} |  0
 ...lmissileflighttimecf1.py => effect6866.py} |  0
 .../{shipbonussptrofmf.py => effect6867.py}   |  0
 ...ordsecstatustankbonus.py => effect6871.py} |  0
 ...ereconstasiswebbonus1.py => effect6872.py} |  0
 ...nusreconwarpvelocity3.py => effect6873.py} |  0
 ...dmissileflighttimecc2.py => effect6874.py} |  0
 ...blackopswarpvelocity1.py => effect6877.py} |  0
 ...ackopsscramblerrange4.py => effect6878.py} |  0
 ...onusblackopswebrange3.py => effect6879.py} |  0
 ...ipbonuslauncherrof2cb.py => effect6880.py} |  0
 ...emissileflighttimecb1.py => effect6881.py} |  0
 ...rym2localrepairamount.py => effect6883.py} |  0
 ...yneutfittingreduction.py => effect6894.py} |  0
 ...emmetfittingreduction.py => effect6895.py} |  0
 ...emmhtfittingreduction.py => effect6896.py} |  0
 ...emmptfittingreduction.py => effect6897.py} |  0
 ...mmrarfittingreduction.py => effect6898.py} |  0
 ...mmrsbfittingreduction.py => effect6899.py} |  0
 ...ssilefittingreduction.py => effect6900.py} |  0
 ...darinaniterepairtime2.py => effect6908.py} |  0
 ...marrnaniterepairtime2.py => effect6909.py} |  0
 ...entenaniterepairtime2.py => effect6910.py} |  0
 ...atarnaniterepairtime2.py => effect6911.py} |  0
 ...turehpbonusaddpassive.py => effect6920.py} |  0
 ...ive2scanprobestrength.py => effect6921.py} |  0
 ...roffensive1hmlhamvelo.py => effect6923.py} |  0
 ...ensive3missileexpvelo.py => effect6924.py} |  0
 ...ive2dronevelotracking.py => effect6925.py} |  0
 ...opulsionwarpcapacitor.py => effect6926.py} |  0
 ...opulsionwarpcapacitor.py => effect6927.py} |  0
 ...on2propmodheatbenefit.py => effect6928.py} |  0
 ...on2propmodheatbenefit.py => effect6929.py} |  0
 ...core2energyresistance.py => effect6930.py} |  0
 ...core2energyresistance.py => effect6931.py} |  0
 ...core2energyresistance.py => effect6932.py} |  0
 ...core2energyresistance.py => effect6933.py} |  0
 ...argetsbonusaddpassive.py => effect6934.py} |  0
 ...re3energywarheatbonus.py => effect6935.py} |  0
 ...re3stasiswebheatbonus.py => effect6936.py} |  0
 ...re3warpscramheatbonus.py => effect6937.py} |  0
 ...daricore3ecmheatbonus.py => effect6938.py} |  0
 ...efensive2hardenerheat.py => effect6939.py} |  0
 ...efensive2hardenerheat.py => effect6940.py} |  0
 ...efensive2hardenerheat.py => effect6941.py} |  0
 ...efensive2hardenerheat.py => effect6942.py} |  0
 ...efensive3armorrepheat.py => effect6943.py} |  0
 ...efensive3armorrepheat.py => effect6944.py} |  0
 ...nsive3shieldboostheat.py => effect6945.py} |  0
 ...efensive3localrepheat.py => effect6946.py} |  0
 ...ive2scanprobestrength.py => effect6947.py} |  0
 ...ive2scanprobestrength.py => effect6949.py} |  0
 ...ive2scanprobestrength.py => effect6951.py} |  0
 ...erepfittingadjustment.py => effect6953.py} |  0
 ...burstfittingreduction.py => effect6954.py} |  0
 ...ieldboostfalloffbonus.py => effect6955.py} |  0
 ...rrepaireroptimalbonus.py => effect6956.py} |  0
 ...rrepairerfalloffbonus.py => effect6957.py} |  0
 ...remotearmorrepairheat.py => effect6958.py} |  0
 ...remotearmorrepairheat.py => effect6959.py} |  0
 ...moteshieldboosterheat.py => effect6960.py} |  0
 ...fensive3remoterepheat.py => effect6961.py} |  0
 ...rpropulsion2warpspeed.py => effect6962.py} |  0
 ...rpropulsion2warpspeed.py => effect6963.py} |  0
 ...tepropulsionwarpspeed.py => effect6964.py} |  0
 ...g1kinthermdamagebonus.py => effect6981.py} |  0
 ...mexplosivedamagebonus.py => effect6982.py} |  0
 ...stitanc1shieldresists.py => effect6983.py} |  0
 ...terdamageandhitpoints.py => effect6984.py} |  0
 ...g1kinthermdamagebonus.py => effect6985.py} |  0
 ...moteshieldboostamount.py => effect6986.py} |  0
 ...mountandhitpointbonus.py => effect6987.py} |  0
 ...centscanresolutionship.py => effect699.py} |  0
 .../{rolebonusmhtdamage1.py => effect6992.py} |  0
 ...osterpenaltyreduction.py => effect6993.py} |  0
 ...ereconbonusmhtdamage1.py => effect6994.py} |  0
 .../{targetabcattack.py => effect6995.py}     |  0
 ...nbonusarmorrepamount3.py => effect6996.py} |  0
 ...sbonusarmorrepamount4.py => effect6997.py} |  0
 ...elaunchercpuneedbonus.py => effect6999.py} |  0
 ...hipbonusshtfalloffgf1.py => effect7000.py} |  0
 .../{rolebonustorprof1.py => effect7001.py}   |  0
 ...usbomblauncherpwgcpu3.py => effect7002.py} |  0
 ...uscovertopsshtdamage3.py => effect7003.py} |  0
 ...statehitpointmodifier.py => effect7008.py} |  0
 ...werhitpointpostassign.py => effect7009.py} |  0
 ...sassaultdamagecontrol.py => effect7012.py} |  0
 ...kineticmissiledamage1.py => effect7013.py} |  0
 ...thermalmissiledamage1.py => effect7014.py} |  0
 ...nshipemmissiledamage1.py => effect7015.py} |  0
 ...plosivemissiledamage1.py => effect7016.py} |  0
 ...hipexplosionvelocity2.py => effect7017.py} |  0
 .../{shipsetrofaf.py => effect7018.py}        |  0
 ...webifiermaxrangebonus.py => effect7020.py} |  0
 ...turerigmaxtargetrange.py => effect7021.py} |  0
 ...trackingelitegunship2.py => effect7024.py} |  0
 ...criptstandupwarpscram.py => effect7026.py} |  0
 ...apacitorcapacitybonus.py => effect7027.py} |  0
 ...difypowerrechargerate.py => effect7028.py} |  0
 ...structurearmorhpbonus.py => effect7029.py} |  0
 ...uctureaoerofrolebonus.py => effect7030.py} |  0
 ...silekineticdamagecbc2.py => effect7031.py} |  0
 ...silethermaldamagecbc2.py => effect7032.py} |  0
 ...vymissileemdamagecbc2.py => effect7033.py} |  0
 ...leexplosivedamagecbc2.py => effect7034.py} |  0
 ...leexplosivedamagecbc2.py => effect7035.py} |  0
 ...ltmissileemdamagecbc2.py => effect7036.py} |  0
 ...silethermaldamagecbc2.py => effect7037.py} |  0
 ...silekineticdamagecbc2.py => effect7038.py} |  0
 ...ssiledamagemultiplier.py => effect7039.py} |  0
 ...ddenarmorhpmultiplier.py => effect7040.py} |  0
 ...shiparmorhitpointsac1.py => effect7042.py} |  0
 ...hipshieldhitpointscc1.py => effect7043.py} |  0
 .../{shipagilitybonusgc1.py => effect7044.py} |  0
 ...hipsignatureradiusmc1.py => effect7045.py} |  0
 ...ruiserallresistances1.py => effect7046.py} |  0
 ...odulefittingreduction.py => effect7047.py} |  0
 ...nbioluminescencecloud.py => effect7050.py} |  0
 ...aoebeaconcausticcloud.py => effect7051.py} |  0
 ...tpaintermodifications.py => effect7052.py} |  0
 ...rgeweaponsdamagebonus.py => effect7055.py} |  0
 ...oebeaconfilamentcloud.py => effect7058.py} |  0
 .../{weathercaustictoxin.py => effect7059.py} |  0
 ...overtopswarpresistance.py => effect706.py} |  0
 .../{weatherdarkness.py => effect7060.py}     |  0
 ...{weatherelectricstorm.py => effect7061.py} |  0
 .../{weatherinfernal.py => effect7062.py}     |  0
 .../{weatherxenongas.py => effect7063.py}     |  0
 .../{weatherbasic.py => effect7064.py}        |  0
 ...dmgbonusrequiredskill.py => effect7071.py} |  0
 ...dmgbonusrequiredskill.py => effect7072.py} |  0
 ...dmgbonusrequiredskill.py => effect7073.py} |  0
 ...tegratorskilldmgbonus.py => effect7074.py} |  0
 ...tegratorskilldmgbonus.py => effect7075.py} |  0
 ...tegratorskilldmgbonus.py => effect7076.py} |  0
 ...rweapondamagemultiply.py => effect7077.py} |  0
 ...orweaponspeedmultiply.py => effect7078.py} |  0
 ...ippcbsspeedbonuspcbs1.py => effect7079.py} |  0
 ...shippcbsdmgbonuspcbs2.py => effect7080.py} |  0
 ...shipbonuspctdamagepc1.py => effect7085.py} |  0
 ...ipbonuspcttrackingpc2.py => effect7086.py} |  0
 ...hipbonuspctoptimalpf2.py => effect7087.py} |  0
 ...shipbonuspctdamagepf1.py => effect7088.py} |  0
 ...neutcapneedrolebonus2.py => effect7091.py} |  0
 ...erepcapneedrolebonus2.py => effect7092.py} |  0
 ...bombcapneedrolebonus2.py => effect7093.py} |  0
 ...repmaxrangerolebonus1.py => effect7094.py} |  0
 ...pgroupprecursorturret.py => effect7097.py} |  0
 ...precursorturretdamage.py => effect7111.py} |  0
 ...neutcapneedrolebonus2.py => effect7112.py} |  0
 ...conscanprobestrength2.py => effect7116.py} |  0
 .../{rolebonuswarpspeed.py => effect7117.py}  |  0
 ...ops3pctdamagepercycle.py => effect7118.py} |  0
 ...hip3pctdamagepercycle.py => effect7119.py} |  0
 ...{massentanglereffect5.py => effect7142.py} |  0
 ...d1disintegratordamage.py => effect7154.py} |  0
 ...c1disintegratordamage.py => effect7155.py} |  0
 ...tegratormaxrangebonus.py => effect7156.py} |  0
 ...disintegratormaxrange.py => effect7157.py} |  0
 ...kineticresistancepbc2.py => effect7158.py} |  0
 ...thermalresistancepbc2.py => effect7159.py} |  0
 ...armoremresistancepbc2.py => effect7160.py} |  0
 ...plosiveresistancepbc2.py => effect7161.py} |  0
 ...integratormaxrangecbc.py => effect7162.py} |  0
 ...ormutadaptiverepairer.py => effect7166.py} |  0
 ...tortransferrangerole1.py => effect7167.py} |  0
 ...emoterepairrangerole3.py => effect7168.py} |  0
 ...tadaptiverepamountpc1.py => effect7169.py} |  0
 ...adaptiverepcapneedpc2.py => effect7170.py} |  0
 ...tiveremotereprangepc1.py => effect7171.py} |  0
 ...elitebonuslogisitics1.py => effect7172.py} |  0
 ...elitebonuslogisitics2.py => effect7173.py} |  0
 ...nterfacingnotfighters.py => effect7176.py} |  0
 ...durabilitynotfighters.py => effect7177.py} |  0
 ...nerdurationmultiplier.py => effect7179.py} |  0
 ...ationmultiplieronline.py => effect7180.py} |  0
 ...arpscramblerangebonus.py => effect7183.py} |  0
 .../{shipbonuscargo2gi.py => effect726.py}    |  0
 .../{shipbonuscargoci.py => effect727.py}     |  0
 .../{shipbonuscargomi.py => effect728.py}     |  0
 .../{shipbonusvelocitygi.py => effect729.py}  |  0
 .../{shipbonusvelocityci.py => effect730.py}  |  0
 .../{shipvelocitybonusai.py => effect732.py}  |  0
 .../{shipbonuscapcapab.py => effect736.py}    |  0
 ...esrequiringelectronics.py => effect744.py} |  0
 ...hiphybriddamagebonuscf.py => effect754.py} |  0
 .../{shipetdamageaf.py => effect757.py}       |  0
 ...onussmallmissilerofcf2.py => effect760.py} |  0
 .../{missiledmgbonus.py => effect763.py}      |  0
 ...ssilelauncheroperation.py => effect784.py} |  0
 .../{ammoinfluencecapneed.py => effect804.py} |  0
 .../{skillfreightbonus.py => effect836.py}    |  0
 ...dulesrequiringcloaking.py => effect848.py} |  0
 ...anresolutionmultiplier.py => effect854.py} |  0
 .../{warpskillspeed.py => effect856.py}       |  0
 ...ectileoptimalbonusemf2.py => effect874.py} |  0
 ...hiphybridrangebonuscf2.py => effect882.py} |  0
 .../{shipetspeedbonusab2.py => effect887.py}  |  0
 ...auncherspeedmultiplier.py => effect889.py} |  0
 ...tileweaponspeedmultiply.py => effect89.py} |  0
 ...issilevelocitybonuscb3.py => effect891.py} |  0
 ...rpedosvelocitybonuscb3.py => effect892.py} |  0
 .../{covertopscpubonus1.py => effect896.py}   |  0
 ...missilekineticdamagecf.py => effect898.py} |  0
 ...missilekineticdamagecc.py => effect899.py} |  0
 ...escoutthermaldamagegf2.py => effect900.py} |  0
 .../{shiplaserrofac2.py => effect907.py}      |  0
 .../{shiparmorhpac2.py => effect909.py}       |  0
 ...rgyweapondamagemultiply.py => effect91.py} |  0
 ...pmissilelauncherrofcc2.py => effect912.py} |  0
 .../{shipdronesmaxgc2.py => effect918.py}     |  0
 ...{shiphybridtrackinggc2.py => effect919.py} |  0
 ...ileweapondamagemultiply.py => effect92.py} |  0
 ...ridweapondamagemultiply.py => effect93.py} |  0
 ...ergyweaponspeedmultiply.py => effect95.py} |  0
 ...iparmoremresistanceac2.py => effect958.py} |  0
 ...explosiveresistanceac2.py => effect959.py} |  0
 ...bridweaponspeedmultiply.py => effect96.py} |  0
 ...orkineticresistanceac2.py => effect960.py} |  0
 ...orthermalresistanceac2.py => effect961.py} |  0
 .../{shipprojectiledmgmc2.py => effect968.py} |  0
 .../{cloakingwarpsafe.py => effect980.py}     |  0
 ...sgunshiphybridoptimal1.py => effect989.py} |  0
 ...usgunshiplaseroptimal1.py => effect991.py} |  0
 ...gunshiphybridtracking2.py => effect996.py} |  0
 ...shipprojectilefalloff2.py => effect998.py} |  0
 ...nusgunshipshieldboost2.py => effect999.py} |  0
 eos/gamedata.py                               | 45 ++++++++++---------
 1978 files changed, 24 insertions(+), 21 deletions(-)
 rename eos/effects/{targetattack.py => effect10.py} (100%)
 rename eos/effects/{elitebonusgunshipcaprecharge2.py => effect1001.py} (100%)
 rename eos/effects/{selft2smalllaserpulsedamagebonus.py => effect1003.py} (100%)
 rename eos/effects/{selft2smalllaserbeamdamagebonus.py => effect1004.py} (100%)
 rename eos/effects/{selft2smallhybridblasterdamagebonus.py => effect1005.py} (100%)
 rename eos/effects/{selft2smallhybridraildamagebonus.py => effect1006.py} (100%)
 rename eos/effects/{selft2smallprojectileacdamagebonus.py => effect1007.py} (100%)
 rename eos/effects/{selft2smallprojectileartydamagebonus.py => effect1008.py} (100%)
 rename eos/effects/{selft2mediumlaserpulsedamagebonus.py => effect1009.py} (100%)
 rename eos/effects/{usemissiles.py => effect101.py} (100%)
 rename eos/effects/{selft2mediumlaserbeamdamagebonus.py => effect1010.py} (100%)
 rename eos/effects/{selft2mediumhybridblasterdamagebonus.py => effect1011.py} (100%)
 rename eos/effects/{selft2mediumhybridraildamagebonus.py => effect1012.py} (100%)
 rename eos/effects/{selft2mediumprojectileacdamagebonus.py => effect1013.py} (100%)
 rename eos/effects/{selft2mediumprojectileartydamagebonus.py => effect1014.py} (100%)
 rename eos/effects/{selft2largelaserpulsedamagebonus.py => effect1015.py} (100%)
 rename eos/effects/{selft2largelaserbeamdamagebonus.py => effect1016.py} (100%)
 rename eos/effects/{selft2largehybridblasterdamagebonus.py => effect1017.py} (100%)
 rename eos/effects/{selft2largehybridraildamagebonus.py => effect1018.py} (100%)
 rename eos/effects/{selft2largeprojectileacdamagebonus.py => effect1019.py} (100%)
 rename eos/effects/{selft2largeprojectileartydamagebonus.py => effect1020.py} (100%)
 rename eos/effects/{elitebonusgunshiphybriddmg2.py => effect1021.py} (100%)
 rename eos/effects/{shipmissileheavyvelocitybonuscc2.py => effect1024.py} (100%)
 rename eos/effects/{shipmissilelightvelocitybonuscc2.py => effect1025.py} (100%)
 rename eos/effects/{remotearmorsystemscapneedbonuspostpercentcapacitorneedlocationshipmodulesrequiringremotearmorsystems.py => effect1030.py} (100%)
 rename eos/effects/{elitebonuslogisticremotearmorrepaircapneed1.py => effect1033.py} (100%)
 rename eos/effects/{elitebonuslogisticremotearmorrepaircapneed2.py => effect1034.py} (100%)
 rename eos/effects/{elitebonuslogisticshieldtransfercapneed2.py => effect1035.py} (100%)
 rename eos/effects/{elitebonuslogisticshieldtransfercapneed1.py => effect1036.py} (100%)
 rename eos/effects/{shipremotearmorrangegc1.py => effect1046.py} (100%)
 rename eos/effects/{shipremotearmorrangeac2.py => effect1047.py} (100%)
 rename eos/effects/{shipshieldtransferrangecc1.py => effect1048.py} (100%)
 rename eos/effects/{shipshieldtransferrangemc2.py => effect1049.py} (100%)
 rename eos/effects/{elitebonusheavygunshiphybridoptimal1.py => effect1056.py} (100%)
 rename eos/effects/{elitebonusheavygunshipprojectileoptimal1.py => effect1057.py} (100%)
 rename eos/effects/{elitebonusheavygunshiplaseroptimal1.py => effect1058.py} (100%)
 rename eos/effects/{elitebonusheavygunshipprojectilefalloff1.py => effect1060.py} (100%)
 rename eos/effects/{elitebonusheavygunshiphybriddmg2.py => effect1061.py} (100%)
 rename eos/effects/{elitebonusheavygunshiplaserdmg2.py => effect1062.py} (100%)
 rename eos/effects/{elitebonusheavygunshipprojectiletracking2.py => effect1063.py} (100%)
 rename eos/effects/{elitebonusheavygunshiphybridfalloff1.py => effect1080.py} (100%)
 rename eos/effects/{elitebonusheavygunshipheavymissileflighttime1.py => effect1081.py} (100%)
 rename eos/effects/{elitebonusheavygunshiplightmissileflighttime1.py => effect1082.py} (100%)
 rename eos/effects/{elitebonusheavygunshipdronecontrolrange1.py => effect1084.py} (100%)
 rename eos/effects/{elitebonusheavygunshipprojectiledmg2.py => effect1087.py} (100%)
 rename eos/effects/{shipprojectiletrackingmf2.py => effect1099.py} (100%)
 rename eos/effects/{accerationcontrolskillabmwdspeedboost.py => effect1176.py} (100%)
 rename eos/effects/{elitebonusgunshiplaserdamage2.py => effect1179.py} (100%)
 rename eos/effects/{electronicattributemodifyonline.py => effect118.py} (100%)
 rename eos/effects/{elitebonuslogisticenergytransfercapneed1.py => effect1181.py} (100%)
 rename eos/effects/{shipenergytransferrange1.py => effect1182.py} (100%)
 rename eos/effects/{elitebonuslogisticenergytransfercapneed2.py => effect1183.py} (100%)
 rename eos/effects/{shipenergytransferrange2.py => effect1184.py} (100%)
 rename eos/effects/{structurestealthemitterarraysigdecrease.py => effect1185.py} (100%)
 rename eos/effects/{iceharvestcycletimemodulesrequiringiceharvesting.py => effect1190.py} (100%)
 rename eos/effects/{mininginfomultiplier.py => effect1200.py} (100%)
 rename eos/effects/{crystalminingamountinfo2.py => effect1212.py} (100%)
 rename eos/effects/{shipenergydrainamountaf1.py => effect1215.py} (100%)
 rename eos/effects/{shipbonuspiratesmallhybriddmg.py => effect1218.py} (100%)
 rename eos/effects/{shipenergyvampiretransferamountbonusab.py => effect1219.py} (100%)
 rename eos/effects/{shipenergyvampiretransferamountbonusac.py => effect1220.py} (100%)
 rename eos/effects/{shipstasiswebrangebonusmb.py => effect1221.py} (100%)
 rename eos/effects/{shipstasiswebrangebonusmc2.py => effect1222.py} (100%)
 rename eos/effects/{shipprojectiletrackinggf.py => effect1228.py} (100%)
 rename eos/effects/{shipmissilevelocitypiratefactionfrigate.py => effect1230.py} (100%)
 rename eos/effects/{shipprojectilerofpiratecruiser.py => effect1232.py} (100%)
 rename eos/effects/{shiphybriddmgpiratecruiser.py => effect1233.py} (100%)
 rename eos/effects/{shipmissilevelocitypiratefactionlight.py => effect1234.py} (100%)
 rename eos/effects/{shipprojectilerofpiratebattleship.py => effect1239.py} (100%)
 rename eos/effects/{shiphybriddmgpiratebattleship.py => effect1240.py} (100%)
 rename eos/effects/{setbonusbloodraider.py => effect1255.py} (100%)
 rename eos/effects/{setbonusbloodraidernosferatu.py => effect1256.py} (100%)
 rename eos/effects/{setbonusserpentis.py => effect1261.py} (100%)
 rename eos/effects/{interceptor2hybridtracking.py => effect1264.py} (100%)
 rename eos/effects/{interceptor2lasertracking.py => effect1268.py} (100%)
 rename eos/effects/{structuralanalysiseffect.py => effect1281.py} (100%)
 rename eos/effects/{ewskillscanstrengthbonus.py => effect1318.py} (100%)
 rename eos/effects/{ewskillrsdcapneedbonusskilllevel.py => effect1360.py} (100%)
 rename eos/effects/{ewskilltdcapneedbonusskilllevel.py => effect1361.py} (100%)
 rename eos/effects/{ewskilltpcapneedbonusskilllevel.py => effect1370.py} (100%)
 rename eos/effects/{ewskillewcapneedskilllevel.py => effect1372.py} (100%)
 rename eos/effects/{shieldboostamplifierpassive.py => effect1395.py} (100%)
 rename eos/effects/{setbonusguristas.py => effect1397.py} (100%)
 rename eos/effects/{systemscandurationskillastrometrics.py => effect1409.py} (100%)
 rename eos/effects/{propulsionskillcapneedbonusskilllevel.py => effect1410.py} (100%)
 rename eos/effects/{shipbonushybridoptimalcb.py => effect1412.py} (100%)
 rename eos/effects/{caldarishipewstrengthcb.py => effect1434.py} (100%)
 rename eos/effects/{caldarishipewoptimalrangecb3.py => effect1441.py} (100%)
 rename eos/effects/{caldarishipewoptimalrangecc2.py => effect1442.py} (100%)
 rename eos/effects/{caldarishipewcapacitorneedcc.py => effect1443.py} (100%)
 rename eos/effects/{ewskillrsdmaxrangebonus.py => effect1445.py} (100%)
 rename eos/effects/{ewskilltpmaxrangebonus.py => effect1446.py} (100%)
 rename eos/effects/{ewskilltdmaxrangebonus.py => effect1448.py} (100%)
 rename eos/effects/{ewskillrsdfalloffbonus.py => effect1449.py} (100%)
 rename eos/effects/{ewskilltpfalloffbonus.py => effect1450.py} (100%)
 rename eos/effects/{ewskilltdfalloffbonus.py => effect1451.py} (100%)
 rename eos/effects/{ewskillewmaxrangebonus.py => effect1452.py} (100%)
 rename eos/effects/{ewskillewfalloffbonus.py => effect1453.py} (100%)
 rename eos/effects/{missileskillaoecloudsizebonus.py => effect1472.py} (100%)
 rename eos/effects/{shieldoperationskillboostcapacitorneedbonus.py => effect1500.py} (100%)
 rename eos/effects/{ewskilltargetpaintingstrengthbonus.py => effect1550.py} (100%)
 rename eos/effects/{minmatarshipewtargetpaintermf2.py => effect1551.py} (100%)
 rename eos/effects/{largehybridturretdamagemultiplierbonuspostpercentdamagemultiplierlocationshipmodulesrequiringlargehybridturret.py => effect157.py} (100%)
 rename eos/effects/{angelsetbonus.py => effect1577.py} (100%)
 rename eos/effects/{setbonussansha.py => effect1579.py} (100%)
 rename eos/effects/{jumpdriveskillsrangebonus.py => effect1581.py} (100%)
 rename eos/effects/{capitalturretskilllaserdamage.py => effect1585.py} (100%)
 rename eos/effects/{capitalturretskillprojectiledamage.py => effect1586.py} (100%)
 rename eos/effects/{capitalturretskillhybriddamage.py => effect1587.py} (100%)
 rename eos/effects/{capitallauncherskillcitadelkineticdamage.py => effect1588.py} (100%)
 rename eos/effects/{mediumenergyturretdamagemultiplierbonuspostpercentdamagemultiplierlocationshipmodulesrequiringmediumenergyturret.py => effect159.py} (100%)
 rename eos/effects/{missileskillaoevelocitybonus.py => effect1590.py} (100%)
 rename eos/effects/{capitallauncherskillcitadelemdamage.py => effect1592.py} (100%)
 rename eos/effects/{capitallauncherskillcitadelexplosivedamage.py => effect1593.py} (100%)
 rename eos/effects/{capitallauncherskillcitadelthermaldamage.py => effect1594.py} (100%)
 rename eos/effects/{missileskillwarheadupgradesemdamagebonus.py => effect1595.py} (100%)
 rename eos/effects/{missileskillwarheadupgradesexplosivedamagebonus.py => effect1596.py} (100%)
 rename eos/effects/{missileskillwarheadupgradeskineticdamagebonus.py => effect1597.py} (100%)
 rename eos/effects/{mediumhybridturretdamagemultiplierbonuspostpercentdamagemultiplierlocationshipmodulesrequiringmediumhybridturret.py => effect160.py} (100%)
 rename eos/effects/{mediumprojectileturretdamagemultiplierbonuspostpercentdamagemultiplierlocationshipmodulesrequiringmediumprojectileturret.py => effect161.py} (100%)
 rename eos/effects/{shipadvancedspaceshipcommandagilitybonus.py => effect1615.py} (100%)
 rename eos/effects/{skillcapitalshipsadvancedagility.py => effect1616.py} (100%)
 rename eos/effects/{shipcapitalagilitybonus.py => effect1617.py} (100%)
 rename eos/effects/{largeenergyturretdamagemultiplierbonuspostpercentdamagemultiplierlocationshipmodulesrequiringlargeenergyturret.py => effect162.py} (100%)
 rename eos/effects/{capitalshieldoperationskillcapacitorneedbonus.py => effect1634.py} (100%)
 rename eos/effects/{capitalrepairsystemsskilldurationbonus.py => effect1635.py} (100%)
 rename eos/effects/{skilladvancedweaponupgradespowerneedbonus.py => effect1638.py} (100%)
 rename eos/effects/{armoredcommandmindlink.py => effect1643.py} (100%)
 rename eos/effects/{skirmishcommandmindlink.py => effect1644.py} (100%)
 rename eos/effects/{shieldcommandmindlink.py => effect1645.py} (100%)
 rename eos/effects/{informationcommandmindlink.py => effect1646.py} (100%)
 rename eos/effects/{skillsiegemoduleconsumptionquantitybonus.py => effect1650.py} (100%)
 rename eos/effects/{missileskillwarheadupgradesthermaldamagebonus.py => effect1657.py} (100%)
 rename eos/effects/{freightercargobonusa2.py => effect1668.py} (100%)
 rename eos/effects/{freightercargobonusc2.py => effect1669.py} (100%)
 rename eos/effects/{freightercargobonusg2.py => effect1670.py} (100%)
 rename eos/effects/{freightercargobonusm2.py => effect1671.py} (100%)
 rename eos/effects/{freightermaxvelocitybonusa1.py => effect1672.py} (100%)
 rename eos/effects/{freightermaxvelocitybonusc1.py => effect1673.py} (100%)
 rename eos/effects/{freightermaxvelocitybonusg1.py => effect1674.py} (100%)
 rename eos/effects/{freightermaxvelocitybonusm1.py => effect1675.py} (100%)
 rename eos/effects/{mining.py => effect17.py} (100%)
 rename eos/effects/{smallenergyturretdamagemultiplierbonuspostpercentdamagemultiplierlocationshipmodulesrequiringsmallenergyturret.py => effect172.py} (100%)
 rename eos/effects/{shieldboostamplifier.py => effect1720.py} (100%)
 rename eos/effects/{jumpdriveskillscapacitorneedbonus.py => effect1722.py} (100%)
 rename eos/effects/{smallhybridturretdamagemultiplierbonuspostpercentdamagemultiplierlocationshipmodulesrequiringsmallhybridturret.py => effect173.py} (100%)
 rename eos/effects/{dronedmgbonus.py => effect1730.py} (100%)
 rename eos/effects/{dohacking.py => effect1738.py} (100%)
 rename eos/effects/{smallprojectileturretdamagemultiplierbonuspostpercentdamagemultiplierlocationshipmodulesrequiringsmallprojectileturret.py => effect174.py} (100%)
 rename eos/effects/{missileskillrapidlauncherrof.py => effect1763.py} (100%)
 rename eos/effects/{missileskillmissileprojectilevelocitybonus.py => effect1764.py} (100%)
 rename eos/effects/{shipbonusshtfalloffgf2.py => effect1773.py} (100%)
 rename eos/effects/{shiparmoremresistanceaf1.py => effect1804.py} (100%)
 rename eos/effects/{shiparmorthresistanceaf1.py => effect1805.py} (100%)
 rename eos/effects/{shiparmorknresistanceaf1.py => effect1806.py} (100%)
 rename eos/effects/{shiparmorexresistanceaf1.py => effect1807.py} (100%)
 rename eos/effects/{shipshieldemresistancecc2.py => effect1812.py} (100%)
 rename eos/effects/{shipshieldthermalresistancecc2.py => effect1813.py} (100%)
 rename eos/effects/{shipshieldkineticresistancecc2.py => effect1814.py} (100%)
 rename eos/effects/{shipshieldexplosiveresistancecc2.py => effect1815.py} (100%)
 rename eos/effects/{shipshieldemresistancecf2.py => effect1816.py} (100%)
 rename eos/effects/{shipshieldthermalresistancecf2.py => effect1817.py} (100%)
 rename eos/effects/{shipshieldkineticresistancecf2.py => effect1819.py} (100%)
 rename eos/effects/{shipshieldexplosiveresistancecf2.py => effect1820.py} (100%)
 rename eos/effects/{miningforemanmindlink.py => effect1848.py} (100%)
 rename eos/effects/{selfrof.py => effect1851.py} (100%)
 rename eos/effects/{shipmissileemdamagecf2.py => effect1862.py} (100%)
 rename eos/effects/{shipmissilethermaldamagecf2.py => effect1863.py} (100%)
 rename eos/effects/{shipmissileexplosivedamagecf2.py => effect1864.py} (100%)
 rename eos/effects/{miningyieldmultiplypercent.py => effect1882.py} (100%)
 rename eos/effects/{shipcruiselauncherrofbonus2cb.py => effect1885.py} (100%)
 rename eos/effects/{shipsiegelauncherrofbonus2cb.py => effect1886.py} (100%)
 rename eos/effects/{elitebargebonusiceharvestingcycletimebarge3.py => effect1896.py} (100%)
 rename eos/effects/{elitebonusvampiredrainamount2.py => effect1910.py} (100%)
 rename eos/effects/{elitereconbonusgravimetricstrength2.py => effect1911.py} (100%)
 rename eos/effects/{elitereconbonusmagnetometricstrength2.py => effect1912.py} (100%)
 rename eos/effects/{elitereconbonusradarstrength2.py => effect1913.py} (100%)
 rename eos/effects/{elitereconbonusladarstrength2.py => effect1914.py} (100%)
 rename eos/effects/{elitereconstasiswebbonus2.py => effect1921.py} (100%)
 rename eos/effects/{elitereconscramblerrangebonus2.py => effect1922.py} (100%)
 rename eos/effects/{armorreinforcermassadd.py => effect1959.py} (100%)
 rename eos/effects/{shipbonusshieldtransfercapneed1.py => effect1964.py} (100%)
 rename eos/effects/{shipbonusremotearmorrepaircapneedgc1.py => effect1969.py} (100%)
 rename eos/effects/{caldarishipewcapacitorneedcf2.py => effect1996.py} (100%)
 rename eos/effects/{dronerangebonusadd.py => effect2000.py} (100%)
 rename eos/effects/{cynosuraldurationbonus.py => effect2008.py} (100%)
 rename eos/effects/{dronemaxvelocitybonus.py => effect2013.py} (100%)
 rename eos/effects/{dronemaxrangebonus.py => effect2014.py} (100%)
 rename eos/effects/{dronedurabilityshieldcapbonus.py => effect2015.py} (100%)
 rename eos/effects/{dronedurabilityarmorhpbonus.py => effect2016.py} (100%)
 rename eos/effects/{dronedurabilityhpbonus.py => effect2017.py} (100%)
 rename eos/effects/{repairdroneshieldbonusbonus.py => effect2019.py} (100%)
 rename eos/effects/{repairdronearmordamageamountbonus.py => effect2020.py} (100%)
 rename eos/effects/{addtosignatureradius2.py => effect2029.py} (100%)
 rename eos/effects/{modifyarmorresonancepostpercent.py => effect2041.py} (100%)
 rename eos/effects/{modifyshieldresonancepostpercent.py => effect2052.py} (100%)
 rename eos/effects/{emshieldcompensationhardeningbonusgroupshieldamp.py => effect2053.py} (100%)
 rename eos/effects/{explosiveshieldcompensationhardeningbonusgroupshieldamp.py => effect2054.py} (100%)
 rename eos/effects/{kineticshieldcompensationhardeningbonusgroupshieldamp.py => effect2055.py} (100%)
 rename eos/effects/{thermalshieldcompensationhardeningbonusgroupshieldamp.py => effect2056.py} (100%)
 rename eos/effects/{shieldcapacitybonusonline.py => effect21.py} (100%)
 rename eos/effects/{emarmorcompensationhardeningbonusgrouparmorcoating.py => effect2105.py} (100%)
 rename eos/effects/{explosivearmorcompensationhardeningbonusgrouparmorcoating.py => effect2106.py} (100%)
 rename eos/effects/{kineticarmorcompensationhardeningbonusgrouparmorcoating.py => effect2107.py} (100%)
 rename eos/effects/{thermicarmorcompensationhardeningbonusgrouparmorcoating.py => effect2108.py} (100%)
 rename eos/effects/{emarmorcompensationhardeningbonusgroupenergized.py => effect2109.py} (100%)
 rename eos/effects/{explosivearmorcompensationhardeningbonusgroupenergized.py => effect2110.py} (100%)
 rename eos/effects/{kineticarmorcompensationhardeningbonusgroupenergized.py => effect2111.py} (100%)
 rename eos/effects/{thermicarmorcompensationhardeningbonusgroupenergized.py => effect2112.py} (100%)
 rename eos/effects/{sensorupgradescpuneedbonuspostpercentcpulocationshipmodulesrequiringsensorupgrades.py => effect212.py} (100%)
 rename eos/effects/{smallhybridmaxrangebonus.py => effect2130.py} (100%)
 rename eos/effects/{smallenergymaxrangebonus.py => effect2131.py} (100%)
 rename eos/effects/{smallprojectilemaxrangebonus.py => effect2132.py} (100%)
 rename eos/effects/{energytransferarraymaxrangebonus.py => effect2133.py} (100%)
 rename eos/effects/{shieldtransportermaxrangebonus.py => effect2134.py} (100%)
 rename eos/effects/{armorrepairprojectormaxrangebonus.py => effect2135.py} (100%)
 rename eos/effects/{targetingmaxtargetbonusmodaddmaxlockedtargetslocationchar.py => effect214.py} (100%)
 rename eos/effects/{minmatarshipewtargetpaintermc2.py => effect2143.py} (100%)
 rename eos/effects/{elitebonuscommandshipprojectiledamagecs1.py => effect2155.py} (100%)
 rename eos/effects/{elitebonuscommandshipprojectilefalloffcs2.py => effect2156.py} (100%)
 rename eos/effects/{elitebonuscommandshiplaserdamagecs1.py => effect2157.py} (100%)
 rename eos/effects/{elitebonuscommandshiplaserrofcs2.py => effect2158.py} (100%)
 rename eos/effects/{elitebonuscommandshiphybridfalloffcs2.py => effect2160.py} (100%)
 rename eos/effects/{elitebonuscommandshiphybridoptimalcs1.py => effect2161.py} (100%)
 rename eos/effects/{shipbonusdronehitpointsgc2.py => effect2179.py} (100%)
 rename eos/effects/{shipbonusdronehitpointsfixedac2.py => effect2181.py} (100%)
 rename eos/effects/{shipbonusdronehitpointsgb2.py => effect2186.py} (100%)
 rename eos/effects/{shipbonusdronedamagemultipliergb2.py => effect2187.py} (100%)
 rename eos/effects/{shipbonusdronedamagemultipliergc2.py => effect2188.py} (100%)
 rename eos/effects/{shipbonusdronedamagemultiplierac2.py => effect2189.py} (100%)
 rename eos/effects/{elitebonusinterdictorsmissilekineticdamage1.py => effect2200.py} (100%)
 rename eos/effects/{elitebonusinterdictorsprojectilefalloff1.py => effect2201.py} (100%)
 rename eos/effects/{shipbonuspiratefrigateprojdamage.py => effect2215.py} (100%)
 rename eos/effects/{navigationvelocitybonuspostpercentmaxvelocitylocationship.py => effect223.py} (100%)
 rename eos/effects/{scanstrengthbonuspercentonline.py => effect2232.py} (100%)
 rename eos/effects/{shipbonusdroneminingamountac2.py => effect2249.py} (100%)
 rename eos/effects/{shipbonusdroneminingamountgc2.py => effect2250.py} (100%)
 rename eos/effects/{commandshipmultirelayeffect.py => effect2251.py} (100%)
 rename eos/effects/{covertopsandreconopscloakmoduledelaybonus.py => effect2252.py} (100%)
 rename eos/effects/{covertopsstealthbombertargettingdelaybonus.py => effect2253.py} (100%)
 rename eos/effects/{tractorbeamcan.py => effect2255.py} (100%)
 rename eos/effects/{accerationcontrolcapneedbonuspostpercentcapacitorneedlocationshipgroupafterburner.py => effect227.py} (100%)
 rename eos/effects/{scanstrengthbonuspercentpassive.py => effect2298.py} (100%)
 rename eos/effects/{afterburnerdurationbonuspostpercentdurationlocationshipmodulesrequiringafterburner.py => effect230.py} (100%)
 rename eos/effects/{damagecontrol.py => effect2302.py} (100%)
 rename eos/effects/{elitereconbonusenergyneutamount2.py => effect2305.py} (100%)
 rename eos/effects/{warpdriveoperationwarpcapacitorneedbonuspostpercentwarpcapacitorneedlocationship.py => effect235.py} (100%)
 rename eos/effects/{capitalremotearmorrepairercapneedbonusskill.py => effect2354.py} (100%)
 rename eos/effects/{capitalremoteshieldtransfercapneedbonusskill.py => effect2355.py} (100%)
 rename eos/effects/{capitalremoteenergytransfercapneedbonusskill.py => effect2356.py} (100%)
 rename eos/effects/{skillsuperweapondmgbonus.py => effect2402.py} (100%)
 rename eos/effects/{accerationcontrolspeedfbonuspostpercentspeedfactorlocationshipgroupafterburner.py => effect242.py} (100%)
 rename eos/effects/{implantvelocitybonus.py => effect2422.py} (100%)
 rename eos/effects/{energymanagementcapacitorbonuspostpercentcapacitylocationshipgroupcapacitorcapacitybonus.py => effect2432.py} (100%)
 rename eos/effects/{highspeedmanuveringcapacitorneedmultiplierpostpercentcapacitorneedlocationshipmodulesrequiringhighspeedmanuvering.py => effect244.py} (100%)
 rename eos/effects/{minercpuusagemultiplypercent2.py => effect2444.py} (100%)
 rename eos/effects/{iceminercpuusagepercent.py => effect2445.py} (100%)
 rename eos/effects/{miningupgradecpupenaltyreductionmodulesrequiringminingupgradepercent.py => effect2456.py} (100%)
 rename eos/effects/{shipbonusarmorresistab.py => effect2465.py} (100%)
 rename eos/effects/{iceharvestcycletimemodulesrequiringiceharvestingonline.py => effect2479.py} (100%)
 rename eos/effects/{implantarmorhpbonus2.py => effect2485.py} (100%)
 rename eos/effects/{implantvelocitybonus2.py => effect2488.py} (100%)
 rename eos/effects/{shipbonusremotetrackingcomputerfalloffmc.py => effect2489.py} (100%)
 rename eos/effects/{shipbonusremotetrackingcomputerfalloffgc2.py => effect2490.py} (100%)
 rename eos/effects/{ewskillecmburstrangebonus.py => effect2491.py} (100%)
 rename eos/effects/{ewskillecmburstcapneedbonus.py => effect2492.py} (100%)
 rename eos/effects/{capacitorcapacitybonus.py => effect25.py} (100%)
 rename eos/effects/{shiphttrackingbonusgb2.py => effect2503.py} (100%)
 rename eos/effects/{shipbonushybridtrackinggf2.py => effect2504.py} (100%)
 rename eos/effects/{elitebonusassaultshipmissilevelocity1.py => effect2561.py} (100%)
 rename eos/effects/{modifyboostereffectchancewithboosterchancebonuspostpercent.py => effect2589.py} (100%)
 rename eos/effects/{structurerepair.py => effect26.py} (100%)
 rename eos/effects/{shipbonusemshieldresistancecb2.py => effect2602.py} (100%)
 rename eos/effects/{shipbonusexplosiveshieldresistancecb2.py => effect2603.py} (100%)
 rename eos/effects/{shipbonuskineticshieldresistancecb2.py => effect2604.py} (100%)
 rename eos/effects/{shipbonusthermicshieldresistancecb2.py => effect2605.py} (100%)
 rename eos/effects/{elitebonusgunshipprojectiledamage1.py => effect2611.py} (100%)
 rename eos/effects/{increasesignatureradiusonline.py => effect2644.py} (100%)
 rename eos/effects/{scanresolutionmultiplieronline.py => effect2645.py} (100%)
 rename eos/effects/{maxtargetrangebonus.py => effect2646.py} (100%)
 rename eos/effects/{elitebonusheavygunshipheavymissilelaunhcerrof2.py => effect2647.py} (100%)
 rename eos/effects/{elitebonusheavygunshipheavyassaultmissilelaunhcerrof2.py => effect2648.py} (100%)
 rename eos/effects/{elitebonusheavygunshipassaultmissilelaunhcerrof2.py => effect2649.py} (100%)
 rename eos/effects/{sensorboosteractivepercentage.py => effect2670.py} (100%)
 rename eos/effects/{capneedbonuseffectlasers.py => effect2688.py} (100%)
 rename eos/effects/{capneedbonuseffecthybrids.py => effect2689.py} (100%)
 rename eos/effects/{cpuneedbonuseffectlasers.py => effect2690.py} (100%)
 rename eos/effects/{cpuneedbonuseffecthybrid.py => effect2691.py} (100%)
 rename eos/effects/{falloffbonuseffectlasers.py => effect2693.py} (100%)
 rename eos/effects/{falloffbonuseffecthybrids.py => effect2694.py} (100%)
 rename eos/effects/{falloffbonuseffectprojectiles.py => effect2695.py} (100%)
 rename eos/effects/{maxrangebonuseffectlasers.py => effect2696.py} (100%)
 rename eos/effects/{maxrangebonuseffecthybrids.py => effect2697.py} (100%)
 rename eos/effects/{maxrangebonuseffectprojectiles.py => effect2698.py} (100%)
 rename eos/effects/{armorrepair.py => effect27.py} (100%)
 rename eos/effects/{drawbackpowerneedlasers.py => effect2706.py} (100%)
 rename eos/effects/{drawbackpowerneedhybrids.py => effect2707.py} (100%)
 rename eos/effects/{drawbackpowerneedprojectiles.py => effect2708.py} (100%)
 rename eos/effects/{hullupgradesarmorhpbonuspostpercenthplocationship.py => effect271.py} (100%)
 rename eos/effects/{drawbackarmorhp.py => effect2712.py} (100%)
 rename eos/effects/{drawbackcpuoutput.py => effect2713.py} (100%)
 rename eos/effects/{drawbackcpuneedlaunchers.py => effect2714.py} (100%)
 rename eos/effects/{drawbacksigrad.py => effect2716.py} (100%)
 rename eos/effects/{drawbackmaxvelocity.py => effect2717.py} (100%)
 rename eos/effects/{drawbackshieldcapacity.py => effect2718.py} (100%)
 rename eos/effects/{repairsystemsdurationbonuspostpercentdurationlocationshipmodulesrequiringrepairsystems.py => effect272.py} (100%)
 rename eos/effects/{miningclouds.py => effect2726.py} (100%)
 rename eos/effects/{gascloudharvestingmaxgroupskilllevel.py => effect2727.py} (100%)
 rename eos/effects/{shieldupgradespowerneedbonuspostpercentpowerlocationshipmodulesrequiringshieldupgrades.py => effect273.py} (100%)
 rename eos/effects/{shipecmscanstrengthbonuscf.py => effect2734.py} (100%)
 rename eos/effects/{boosterarmorhppenalty.py => effect2735.py} (100%)
 rename eos/effects/{boosterarmorrepairamountpenalty.py => effect2736.py} (100%)
 rename eos/effects/{boostershieldcapacitypenalty.py => effect2737.py} (100%)
 rename eos/effects/{boosterturretoptimalrangepenalty.py => effect2739.py} (100%)
 rename eos/effects/{boosterturretfalloffpenalty.py => effect2741.py} (100%)
 rename eos/effects/{boostercapacitorcapacitypenalty.py => effect2745.py} (100%)
 rename eos/effects/{boostermaxvelocitypenalty.py => effect2746.py} (100%)
 rename eos/effects/{boosterturrettrackingpenalty.py => effect2747.py} (100%)
 rename eos/effects/{boostermissilevelocitypenalty.py => effect2748.py} (100%)
 rename eos/effects/{boostermissileexplosionvelocitypenalty.py => effect2749.py} (100%)
 rename eos/effects/{shipbonusecmstrengthbonuscc.py => effect2756.py} (100%)
 rename eos/effects/{salvaging.py => effect2757.py} (100%)
 rename eos/effects/{boostermodifyboosterarmorpenalties.py => effect2760.py} (100%)
 rename eos/effects/{boostermodifyboostershieldpenalty.py => effect2763.py} (100%)
 rename eos/effects/{boostermodifyboostermaxvelocityandcapacitorpenalty.py => effect2766.py} (100%)
 rename eos/effects/{tacticalshieldmanipulationskillboostuniformitybonus.py => effect277.py} (100%)
 rename eos/effects/{boostermodifyboostermissilepenalty.py => effect2776.py} (100%)
 rename eos/effects/{boostermodifyboosterturretpenalty.py => effect2778.py} (100%)
 rename eos/effects/{shieldemmisionsystemscapneedbonuspostpercentcapacitorneedlocationshipmodulesrequiringshieldemmisionsystems.py => effect279.py} (100%)
 rename eos/effects/{boostermissileexplosioncloudpenaltyfixed.py => effect2791.py} (100%)
 rename eos/effects/{modifyarmorresonancepostpercentpassive.py => effect2792.py} (100%)
 rename eos/effects/{salvagingaccessdifficultybonuseffectpassive.py => effect2794.py} (100%)
 rename eos/effects/{modifyshieldresonancepostpercentpassive.py => effect2795.py} (100%)
 rename eos/effects/{massreductionbonuspassive.py => effect2796.py} (100%)
 rename eos/effects/{projectileweaponspeedmultiplypassive.py => effect2797.py} (100%)
 rename eos/effects/{projectileweapondamagemultiplypassive.py => effect2798.py} (100%)
 rename eos/effects/{missilelauncherspeedmultiplierpassive.py => effect2799.py} (100%)
 rename eos/effects/{energyweaponspeedmultiplypassive.py => effect2801.py} (100%)
 rename eos/effects/{hybridweapondamagemultiplypassive.py => effect2802.py} (100%)
 rename eos/effects/{energyweapondamagemultiplypassive.py => effect2803.py} (100%)
 rename eos/effects/{hybridweaponspeedmultiplypassive.py => effect2804.py} (100%)
 rename eos/effects/{shipbonuslargeenergyweapondamageab2.py => effect2805.py} (100%)
 rename eos/effects/{shipmissileassaultmissilevelocitybonuscc2.py => effect2809.py} (100%)
 rename eos/effects/{elitebonusheavygunshipassaultmissileflighttime1.py => effect2810.py} (100%)
 rename eos/effects/{caldarishipecmburstoptimalrangecb3.py => effect2812.py} (100%)
 rename eos/effects/{armorhpbonusadd.py => effect2837.py} (100%)
 rename eos/effects/{trackingspeedbonuspassiverequiringgunnerytrackingspeedbonus.py => effect2847.py} (100%)
 rename eos/effects/{accessdifficultybonusmodifierrequiringarchaelogy.py => effect2848.py} (100%)
 rename eos/effects/{accessdifficultybonusmodifierrequiringhacking.py => effect2849.py} (100%)
 rename eos/effects/{durationbonusforgroupafterburner.py => effect2850.py} (100%)
 rename eos/effects/{missiledmgbonuspassive.py => effect2851.py} (100%)
 rename eos/effects/{cloakingtargetingdelaybonuslrsmcloakingpassive.py => effect2853.py} (100%)
 rename eos/effects/{cynosuralgeneration.py => effect2857.py} (100%)
 rename eos/effects/{velocitybonusonline.py => effect2865.py} (100%)
 rename eos/effects/{biologytimebonusfixed.py => effect2866.py} (100%)
 rename eos/effects/{sentrydronedamagebonus.py => effect2867.py} (100%)
 rename eos/effects/{armordamageamountbonuscapitalarmorrepairers.py => effect2868.py} (100%)
 rename eos/effects/{controlledburstscapneedbonuspostpercentcapacitorneedlocationshipmodulesrequiringgunnery.py => effect287.py} (100%)
 rename eos/effects/{missilevelocitybonusdefender.py => effect2872.py} (100%)
 rename eos/effects/{missileemdmgbonuscruise3.py => effect2881.py} (100%)
 rename eos/effects/{missileexplosivedmgbonuscruise3.py => effect2882.py} (100%)
 rename eos/effects/{missilekineticdmgbonuscruise3.py => effect2883.py} (100%)
 rename eos/effects/{missilethermaldmgbonuscruise3.py => effect2884.py} (100%)
 rename eos/effects/{gasharvestingcycletimemodulesrequiringgascloudharvesting.py => effect2885.py} (100%)
 rename eos/effects/{missileemdmgbonusrocket.py => effect2887.py} (100%)
 rename eos/effects/{missileexplosivedmgbonusrocket.py => effect2888.py} (100%)
 rename eos/effects/{missilekineticdmgbonusrocket.py => effect2889.py} (100%)
 rename eos/effects/{missilethermaldmgbonusrocket.py => effect2890.py} (100%)
 rename eos/effects/{missileemdmgbonusstandard.py => effect2891.py} (100%)
 rename eos/effects/{missileexplosivedmgbonusstandard.py => effect2892.py} (100%)
 rename eos/effects/{missilekineticdmgbonusstandard.py => effect2893.py} (100%)
 rename eos/effects/{missilethermaldmgbonusstandard.py => effect2894.py} (100%)
 rename eos/effects/{missileemdmgbonusheavy.py => effect2899.py} (100%)
 rename eos/effects/{sharpshooterrangeskillbonuspostpercentmaxrangelocationshipmodulesrequiringgunnery.py => effect290.py} (100%)
 rename eos/effects/{missileexplosivedmgbonusheavy.py => effect2900.py} (100%)
 rename eos/effects/{missilekineticdmgbonusheavy.py => effect2901.py} (100%)
 rename eos/effects/{missilethermaldmgbonusheavy.py => effect2902.py} (100%)
 rename eos/effects/{missileemdmgbonusham.py => effect2903.py} (100%)
 rename eos/effects/{missileexplosivedmgbonusham.py => effect2904.py} (100%)
 rename eos/effects/{missilekineticdmgbonusham.py => effect2905.py} (100%)
 rename eos/effects/{missilethermaldmgbonusham.py => effect2906.py} (100%)
 rename eos/effects/{missileemdmgbonustorpedo.py => effect2907.py} (100%)
 rename eos/effects/{missileexplosivedmgbonustorpedo.py => effect2908.py} (100%)
 rename eos/effects/{missilekineticdmgbonustorpedo.py => effect2909.py} (100%)
 rename eos/effects/{missilethermaldmgbonustorpedo.py => effect2910.py} (100%)
 rename eos/effects/{dataminermoduledurationreduction.py => effect2911.py} (100%)
 rename eos/effects/{skilltriagemoduleconsumptionquantitybonus.py => effect2967.py} (100%)
 rename eos/effects/{skillremotehullrepairsystemscapneedbonus.py => effect2977.py} (100%)
 rename eos/effects/{surgicalstrikefalloffbonuspostpercentfallofflocationshipmodulesrequiringgunnery.py => effect298.py} (100%)
 rename eos/effects/{skillcapitalremotehullrepairsystemscapneedbonus.py => effect2980.py} (100%)
 rename eos/effects/{skillremoteecmdurationbonus.py => effect2982.py} (100%)
 rename eos/effects/{overloadrofbonus.py => effect3001.py} (100%)
 rename eos/effects/{overloadselfdurationbonus.py => effect3002.py} (100%)
 rename eos/effects/{elitebonuscoveropsbombexplosivedmg1.py => effect3024.py} (100%)
 rename eos/effects/{overloadselfdamagebonus.py => effect3025.py} (100%)
 rename eos/effects/{elitebonuscoveropsbombkineticdmg1.py => effect3026.py} (100%)
 rename eos/effects/{elitebonuscoveropsbombthermaldmg1.py => effect3027.py} (100%)
 rename eos/effects/{elitebonuscoveropsbombemdmg1.py => effect3028.py} (100%)
 rename eos/effects/{overloadselfemhardeningbonus.py => effect3029.py} (100%)
 rename eos/effects/{overloadselfthermalhardeningbonus.py => effect3030.py} (100%)
 rename eos/effects/{overloadselfexplosivehardeningbonus.py => effect3031.py} (100%)
 rename eos/effects/{overloadselfkinetichardeningbonus.py => effect3032.py} (100%)
 rename eos/effects/{overloadselfhardeninginvulnerabilitybonus.py => effect3035.py} (100%)
 rename eos/effects/{skillbombdeploymentmodulereactivationdelaybonus.py => effect3036.py} (100%)
 rename eos/effects/{modifymaxvelocityofshippassive.py => effect3046.py} (100%)
 rename eos/effects/{structurehpmultiplypassive.py => effect3047.py} (100%)
 rename eos/effects/{heatdamagebonus.py => effect3061.py} (100%)
 rename eos/effects/{dronesskillboostmaxactivedronebonus.py => effect315.py} (100%)
 rename eos/effects/{shieldtransportcpuneedbonuseffect.py => effect3169.py} (100%)
 rename eos/effects/{dronearmordamagebonuseffect.py => effect3172.py} (100%)
 rename eos/effects/{droneshieldbonusbonuseffect.py => effect3173.py} (100%)
 rename eos/effects/{overloadselfrangebonus.py => effect3174.py} (100%)
 rename eos/effects/{overloadselfspeedbonus.py => effect3175.py} (100%)
 rename eos/effects/{overloadselfecmstrenghtbonus.py => effect3182.py} (100%)
 rename eos/effects/{thermodynamicsskilldamagebonus.py => effect3196.py} (100%)
 rename eos/effects/{overloadselfarmordamageamountdurationbonus.py => effect3200.py} (100%)
 rename eos/effects/{overloadselfshieldbonusdurationbonus.py => effect3201.py} (100%)
 rename eos/effects/{missileskillfofaoecloudsizebonus.py => effect3212.py} (100%)
 rename eos/effects/{shiprocketexplosivedmgaf.py => effect3234.py} (100%)
 rename eos/effects/{shiprocketkineticdmgaf.py => effect3235.py} (100%)
 rename eos/effects/{shiprocketthermaldmgaf.py => effect3236.py} (100%)
 rename eos/effects/{shiprocketemdmgaf.py => effect3237.py} (100%)
 rename eos/effects/{elitebonusgunshiparmoremresistance1.py => effect3241.py} (100%)
 rename eos/effects/{elitebonusgunshiparmorthermalresistance1.py => effect3242.py} (100%)
 rename eos/effects/{elitebonusgunshiparmorkineticresistance1.py => effect3243.py} (100%)
 rename eos/effects/{elitebonusgunshiparmorexplosiveresistance1.py => effect3244.py} (100%)
 rename eos/effects/{shipcaprecharge2af.py => effect3249.py} (100%)
 rename eos/effects/{skillindustrialreconfigurationconsumptionquantitybonus.py => effect3264.py} (100%)
 rename eos/effects/{shipconsumptionquantitybonusindustrialreconfigurationorecapital1.py => effect3267.py} (100%)
 rename eos/effects/{shipenergyneutralizertransferamountbonusab.py => effect3297.py} (100%)
 rename eos/effects/{shipenergyneutralizertransferamountbonusac.py => effect3298.py} (100%)
 rename eos/effects/{shipenergyneutralizertransferamountbonusaf.py => effect3299.py} (100%)
 rename eos/effects/{clonevatmaxjumpclonebonusskillnew.py => effect3313.py} (100%)
 rename eos/effects/{elitebonuscommandshiparmorhp1.py => effect3331.py} (100%)
 rename eos/effects/{shiparmoremresistancemc2.py => effect3335.py} (100%)
 rename eos/effects/{shiparmorexplosiveresistancemc2.py => effect3336.py} (100%)
 rename eos/effects/{shiparmorkineticresistancemc2.py => effect3339.py} (100%)
 rename eos/effects/{shiparmorthermalresistancemc2.py => effect3340.py} (100%)
 rename eos/effects/{elitebonusheavyinterdictorsprojectilefalloff1.py => effect3343.py} (100%)
 rename eos/effects/{elitebonusheavyinterdictorheavymissilevelocitybonus1.py => effect3355.py} (100%)
 rename eos/effects/{elitebonusheavyinterdictorheavyassaultmissilevelocitybonus.py => effect3356.py} (100%)
 rename eos/effects/{elitebonusheavyinterdictorlightmissilevelocitybonus.py => effect3357.py} (100%)
 rename eos/effects/{shipremotesensordampenercapneedgf.py => effect3366.py} (100%)
 rename eos/effects/{elitebonuselectronicattackshipwarpscramblermaxrange1.py => effect3367.py} (100%)
 rename eos/effects/{elitebonuselectronicattackshipecmoptimalrange1.py => effect3369.py} (100%)
 rename eos/effects/{elitebonuselectronicattackshipstasiswebmaxrange1.py => effect3370.py} (100%)
 rename eos/effects/{elitebonuselectronicattackshipwarpscramblercapneed2.py => effect3371.py} (100%)
 rename eos/effects/{elitebonuselectronicattackshipsignatureradius2.py => effect3374.py} (100%)
 rename eos/effects/{implanthardwiringabcapacitorneed.py => effect3379.py} (100%)
 rename eos/effects/{warpdisruptsphere.py => effect3380.py} (100%)
 rename eos/effects/{elitebonusblackopslargeenergyturrettracking1.py => effect3392.py} (100%)
 rename eos/effects/{projectilefired.py => effect34.py} (100%)
 rename eos/effects/{elitebonusblackopscloakvelocity2.py => effect3403.py} (100%)
 rename eos/effects/{elitebonusblackopsmaxvelocity1.py => effect3406.py} (100%)
 rename eos/effects/{elitebonusviolatorslargeenergyturretdamagerole1.py => effect3415.py} (100%)
 rename eos/effects/{elitebonusviolatorslargehybridturretdamagerole1.py => effect3416.py} (100%)
 rename eos/effects/{elitebonusviolatorslargeprojectileturretdamagerole1.py => effect3417.py} (100%)
 rename eos/effects/{elitebonusviolatorslargehybridturrettracking1.py => effect3424.py} (100%)
 rename eos/effects/{elitebonusviolatorslargeprojectileturrettracking1.py => effect3425.py} (100%)
 rename eos/effects/{elitebonusviolatorstractorbeammaxrangerole2.py => effect3427.py} (100%)
 rename eos/effects/{elitebonusviolatorsewtargetpainting1.py => effect3439.py} (100%)
 rename eos/effects/{shipbonusptfalloffmb1.py => effect3447.py} (100%)
 rename eos/effects/{elitebonuselectronicattackshiprechargerate2.py => effect3466.py} (100%)
 rename eos/effects/{elitebonuselectronicattackshipcapacitorcapacity2.py => effect3467.py} (100%)
 rename eos/effects/{elitebonusheavyinterdictorswarpdisruptfieldgeneratorwarpscramblerange2.py => effect3468.py} (100%)
 rename eos/effects/{elitebonusviolatorstractorbeammaxtractorvelocityrole3.py => effect3473.py} (100%)
 rename eos/effects/{shiplaserdamagepiratebattleship.py => effect3478.py} (100%)
 rename eos/effects/{shiptrackingbonusab.py => effect3480.py} (100%)
 rename eos/effects/{shipbonusmediumenergyturretdamagepiratefaction.py => effect3483.py} (100%)
 rename eos/effects/{shipbonusmediumenergyturrettrackingac2.py => effect3484.py} (100%)
 rename eos/effects/{shipbonussmallenergyturretdamagepiratefaction.py => effect3487.py} (100%)
 rename eos/effects/{shipbonussmallenergyturrettracking2af.py => effect3489.py} (100%)
 rename eos/effects/{rorqualcargoscanrangebonus.py => effect3493.py} (100%)
 rename eos/effects/{rorqualsurveyscannerrangebonus.py => effect3494.py} (100%)
 rename eos/effects/{shipcappropulsionjamming.py => effect3495.py} (100%)
 rename eos/effects/{setbonusthukker.py => effect3496.py} (100%)
 rename eos/effects/{setbonussisters.py => effect3498.py} (100%)
 rename eos/effects/{setbonussyndicate.py => effect3499.py} (100%)
 rename eos/effects/{setbonusmordus.py => effect3513.py} (100%)
 rename eos/effects/{interceptor2warpscramblerange.py => effect3514.py} (100%)
 rename eos/effects/{weaponupgradescpuneedbonuspostpercentcpulocationshipmodulesrequiringbomblauncher.py => effect3519.py} (100%)
 rename eos/effects/{skilladvancedweaponupgradespowerneedbonusbomblaunchers.py => effect3520.py} (100%)
 rename eos/effects/{cynosuraltheoryconsumptionbonus.py => effect3526.py} (100%)
 rename eos/effects/{elitebonusblackopsagiliy1.py => effect3530.py} (100%)
 rename eos/effects/{skilljumpdriveconsumptionamountbonuspercentage.py => effect3532.py} (100%)
 rename eos/effects/{ewskilltrackingdisruptiontrackingspeedbonus.py => effect3561.py} (100%)
 rename eos/effects/{elitebonuslogisticstrackinglinkmaxrangebonus1.py => effect3568.py} (100%)
 rename eos/effects/{elitebonuslogisticstrackinglinkmaxrangebonus2.py => effect3569.py} (100%)
 rename eos/effects/{elitebonuslogisticstrackinglinktrackingspeedbonus2.py => effect3570.py} (100%)
 rename eos/effects/{elitebonuslogisticstrackinglinktrackingspeedbonus1.py => effect3571.py} (100%)
 rename eos/effects/{ewskillsignalsuppressionscanresolutionbonus.py => effect3586.py} (100%)
 rename eos/effects/{shipbonusewremotesensordampenermaxtargetrangebonusgc2.py => effect3587.py} (100%)
 rename eos/effects/{shipbonusewremotesensordampenermaxtargetrangebonusgf2.py => effect3588.py} (100%)
 rename eos/effects/{shipbonusewremotesensordampenerscanresolutionbonusgf2.py => effect3589.py} (100%)
 rename eos/effects/{shipbonusewremotesensordampenerscanresolutionbonusgc2.py => effect3590.py} (100%)
 rename eos/effects/{ewskillsignalsuppressionmaxtargetrangebonus.py => effect3591.py} (100%)
 rename eos/effects/{elitebonusjumpfreighterhullhp1.py => effect3592.py} (100%)
 rename eos/effects/{elitebonusjumpfreighterjumpdriveconsumptionamount2.py => effect3593.py} (100%)
 rename eos/effects/{scriptsensorboosterscanresolutionbonusbonus.py => effect3597.py} (100%)
 rename eos/effects/{scriptsensorboostermaxtargetrangebonusbonus.py => effect3598.py} (100%)
 rename eos/effects/{scripttrackingcomputertrackingspeedbonusbonus.py => effect3599.py} (100%)
 rename eos/effects/{scripttrackingcomputermaxrangebonusbonus.py => effect3600.py} (100%)
 rename eos/effects/{scriptwarpdisruptionfieldgeneratorsetdisallowinempirespace.py => effect3601.py} (100%)
 rename eos/effects/{scriptdurationbonus.py => effect3602.py} (100%)
 rename eos/effects/{scriptsignatureradiusbonusbonus.py => effect3617.py} (100%)
 rename eos/effects/{scriptmassbonuspercentagebonus.py => effect3618.py} (100%)
 rename eos/effects/{scriptspeedboostfactorbonusbonus.py => effect3619.py} (100%)
 rename eos/effects/{scriptspeedfactorbonusbonus.py => effect3620.py} (100%)
 rename eos/effects/{scriptwarpscramblerangebonus.py => effect3648.py} (100%)
 rename eos/effects/{elitebonusviolatorslargeenergyturretdamage1.py => effect3649.py} (100%)
 rename eos/effects/{ewgrouprsdmaxrangebonus.py => effect3650.py} (100%)
 rename eos/effects/{ewgrouptpmaxrangebonus.py => effect3651.py} (100%)
 rename eos/effects/{ewgrouptdmaxrangebonus.py => effect3652.py} (100%)
 rename eos/effects/{ewgroupecmburstmaxrangebonus.py => effect3653.py} (100%)
 rename eos/effects/{gunnerymaxrangebonusonline.py => effect3655.py} (100%)
 rename eos/effects/{gunnerytrackingspeedbonusonline.py => effect3656.py} (100%)
 rename eos/effects/{shipscanresolutionbonusonline.py => effect3657.py} (100%)
 rename eos/effects/{shipmaxtargetrangebonusonline.py => effect3659.py} (100%)
 rename eos/effects/{shipmaxlockedtargetsbonusaddonline.py => effect3660.py} (100%)
 rename eos/effects/{mininglaserrangebonus.py => effect3668.py} (100%)
 rename eos/effects/{frequencymininglasermaxrangebonus.py => effect3669.py} (100%)
 rename eos/effects/{stripminermaxrangebonus.py => effect3670.py} (100%)
 rename eos/effects/{gasharvestermaxrangebonus.py => effect3671.py} (100%)
 rename eos/effects/{setbonusore.py => effect3672.py} (100%)
 rename eos/effects/{shipbonuslargeenergyturretmaxrangeab2.py => effect3677.py} (100%)
 rename eos/effects/{elitebonusjumpfreightershieldhp1.py => effect3678.py} (100%)
 rename eos/effects/{elitebonusjumpfreighterarmorhp1.py => effect3679.py} (100%)
 rename eos/effects/{freighteragilitybonusc1.py => effect3680.py} (100%)
 rename eos/effects/{freighteragilitybonusm1.py => effect3681.py} (100%)
 rename eos/effects/{freighteragilitybonusg1.py => effect3682.py} (100%)
 rename eos/effects/{freighteragilitybonusa1.py => effect3683.py} (100%)
 rename eos/effects/{scripttrackingcomputerfalloffbonusbonus.py => effect3686.py} (100%)
 rename eos/effects/{shipmissilelauncherspeedbonusmc2.py => effect3703.py} (100%)
 rename eos/effects/{shiphybridturretrofbonusgc2.py => effect3705.py} (100%)
 rename eos/effects/{shipbonusprojectiletrackingmc2.py => effect3706.py} (100%)
 rename eos/effects/{agilitymultipliereffectpassive.py => effect3726.py} (100%)
 rename eos/effects/{velocitybonuspassive.py => effect3727.py} (100%)
 rename eos/effects/{zcolinorcatractorrangebonus.py => effect3739.py} (100%)
 rename eos/effects/{zcolinorcatractorvelocitybonus.py => effect3740.py} (100%)
 rename eos/effects/{cargoandoreholdcapacitybonusics1.py => effect3742.py} (100%)
 rename eos/effects/{miningforemanburstbonusics2.py => effect3744.py} (100%)
 rename eos/effects/{zcolinorcasurveyscannerbonus.py => effect3745.py} (100%)
 rename eos/effects/{covertopsstealthbombersiegemissilelauncherpowerneedbonus.py => effect3765.py} (100%)
 rename eos/effects/{interceptormwdsignatureradiusbonus.py => effect3766.py} (100%)
 rename eos/effects/{elitebonuscommandshipsheavymissileexplosionvelocitycs2.py => effect3767.py} (100%)
 rename eos/effects/{armorhpbonusaddpassive.py => effect3771.py} (100%)
 rename eos/effects/{hardpointmodifiereffect.py => effect3773.py} (100%)
 rename eos/effects/{slotmodifier.py => effect3774.py} (100%)
 rename eos/effects/{poweroutputaddpassive.py => effect3782.py} (100%)
 rename eos/effects/{cpuoutputaddcpuoutputpassive.py => effect3783.py} (100%)
 rename eos/effects/{dronebandwidthaddpassive.py => effect3797.py} (100%)
 rename eos/effects/{dronecapacityadddronecapacitypassive.py => effect3799.py} (100%)
 rename eos/effects/{empwave.py => effect38.py} (100%)
 rename eos/effects/{maxtargetrangeaddpassive.py => effect3807.py} (100%)
 rename eos/effects/{signatureradiusaddpassive.py => effect3808.py} (100%)
 rename eos/effects/{capacityaddpassive.py => effect3810.py} (100%)
 rename eos/effects/{capacitorcapacityaddpassive.py => effect3811.py} (100%)
 rename eos/effects/{shieldcapacityaddpassive.py => effect3831.py} (100%)
 rename eos/effects/{subsystembonusamarrpropulsionmaxvelocity.py => effect3857.py} (100%)
 rename eos/effects/{subsystembonuscaldaripropulsionmaxvelocity.py => effect3859.py} (100%)
 rename eos/effects/{subsystembonusminmatarpropulsionmaxvelocity.py => effect3860.py} (100%)
 rename eos/effects/{subsystembonusminmatarpropulsionafterburnerspeedfactor.py => effect3861.py} (100%)
 rename eos/effects/{subsystembonuscaldaripropulsionafterburnerspeedfactor.py => effect3863.py} (100%)
 rename eos/effects/{subsystembonusamarrpropulsionafterburnerspeedfactor.py => effect3864.py} (100%)
 rename eos/effects/{subsystembonusamarrpropulsion2agility.py => effect3865.py} (100%)
 rename eos/effects/{subsystembonuscaldaripropulsion2agility.py => effect3866.py} (100%)
 rename eos/effects/{subsystembonusgallentepropulsion2agility.py => effect3867.py} (100%)
 rename eos/effects/{subsystembonusminmatarpropulsion2agility.py => effect3868.py} (100%)
 rename eos/effects/{subsystembonusminmatarpropulsion2mwdpenalty.py => effect3869.py} (100%)
 rename eos/effects/{subsystembonusamarrpropulsion2mwdpenalty.py => effect3872.py} (100%)
 rename eos/effects/{subsystembonusgallentepropulsionabmwdcapneed.py => effect3875.py} (100%)
 rename eos/effects/{subsystembonusminmatarcorescanstrengthladar.py => effect3893.py} (100%)
 rename eos/effects/{subsystembonusgallentecorescanstrengthmagnetometric.py => effect3895.py} (100%)
 rename eos/effects/{subsystembonuscaldaricorescanstrengthgravimetric.py => effect3897.py} (100%)
 rename eos/effects/{warpdisrupt.py => effect39.py} (100%)
 rename eos/effects/{subsystembonusamarrcorescanstrengthradar.py => effect3900.py} (100%)
 rename eos/effects/{astrogeologyminingamountbonuspostpercentminingamountlocationshipmodulesrequiringmining.py => effect391.py} (100%)
 rename eos/effects/{mechanichullhpbonuspostpercenthpship.py => effect392.py} (100%)
 rename eos/effects/{navigationvelocitybonuspostpercentmaxvelocityship.py => effect394.py} (100%)
 rename eos/effects/{evasivemaneuveringagilitybonuspostpercentagilityship.py => effect395.py} (100%)
 rename eos/effects/{subsystembonusamarrdefensivearmorrepairamount.py => effect3959.py} (100%)
 rename eos/effects/{energygridupgradescpuneedbonuspostpercentcpulocationshipmodulesrequiringenergygridupgrades.py => effect396.py} (100%)
 rename eos/effects/{subsystembonusgallentedefensivearmorrepairamount.py => effect3961.py} (100%)
 rename eos/effects/{subsystembonusminmatardefensiveshieldarmorrepairamount.py => effect3962.py} (100%)
 rename eos/effects/{subsystembonuscaldaridefensiveshieldboostamount.py => effect3964.py} (100%)
 rename eos/effects/{electronicscpuoutputbonuspostpercentcpuoutputlocationshipgroupcomputer.py => effect397.py} (100%)
 rename eos/effects/{subsystembonuscaldaridefensiveshieldhp.py => effect3976.py} (100%)
 rename eos/effects/{subsystembonusminmatardefensiveshieldarmorhp.py => effect3979.py} (100%)
 rename eos/effects/{subsystembonusgallentedefensivearmorhp.py => effect3980.py} (100%)
 rename eos/effects/{subsystembonusamarrdefensivearmorhp.py => effect3982.py} (100%)
 rename eos/effects/{systemshieldhp.py => effect3992.py} (100%)
 rename eos/effects/{systemtargetingrange.py => effect3993.py} (100%)
 rename eos/effects/{systemsignatureradius.py => effect3995.py} (100%)
 rename eos/effects/{systemarmoremresistance.py => effect3996.py} (100%)
 rename eos/effects/{systemarmorexplosiveresistance.py => effect3997.py} (100%)
 rename eos/effects/{systemarmorkineticresistance.py => effect3998.py} (100%)
 rename eos/effects/{systemarmorthermalresistance.py => effect3999.py} (100%)
 rename eos/effects/{shieldboosting.py => effect4.py} (100%)
 rename eos/effects/{systemmissilevelocity.py => effect4002.py} (100%)
 rename eos/effects/{systemmaxvelocity.py => effect4003.py} (100%)
 rename eos/effects/{systemdamagemultipliergunnery.py => effect4016.py} (100%)
 rename eos/effects/{systemdamagethermalmissiles.py => effect4017.py} (100%)
 rename eos/effects/{systemdamageemmissiles.py => effect4018.py} (100%)
 rename eos/effects/{systemdamageexplosivemissiles.py => effect4019.py} (100%)
 rename eos/effects/{systemdamagekineticmissiles.py => effect4020.py} (100%)
 rename eos/effects/{systemdamagedrones.py => effect4021.py} (100%)
 rename eos/effects/{systemtracking.py => effect4022.py} (100%)
 rename eos/effects/{systemaoevelocity.py => effect4023.py} (100%)
 rename eos/effects/{systemheatdamage.py => effect4033.py} (100%)
 rename eos/effects/{systemoverloadarmor.py => effect4034.py} (100%)
 rename eos/effects/{systemoverloaddamagemodifier.py => effect4035.py} (100%)
 rename eos/effects/{systemoverloaddurationbonus.py => effect4036.py} (100%)
 rename eos/effects/{systemoverloadeccmstrength.py => effect4037.py} (100%)
 rename eos/effects/{systemoverloadecmstrength.py => effect4038.py} (100%)
 rename eos/effects/{systemoverloadhardening.py => effect4039.py} (100%)
 rename eos/effects/{systemoverloadrange.py => effect4040.py} (100%)
 rename eos/effects/{systemoverloadrof.py => effect4041.py} (100%)
 rename eos/effects/{systemoverloadselfduration.py => effect4042.py} (100%)
 rename eos/effects/{systemoverloadshieldbonus.py => effect4043.py} (100%)
 rename eos/effects/{systemoverloadspeedfactor.py => effect4044.py} (100%)
 rename eos/effects/{systemsmartbombrange.py => effect4045.py} (100%)
 rename eos/effects/{systemsmartbombemdamage.py => effect4046.py} (100%)
 rename eos/effects/{systemsmartbombthermaldamage.py => effect4047.py} (100%)
 rename eos/effects/{systemsmartbombkineticdamage.py => effect4048.py} (100%)
 rename eos/effects/{systemsmartbombexplosivedamage.py => effect4049.py} (100%)
 rename eos/effects/{systemsmallenergydamage.py => effect4054.py} (100%)
 rename eos/effects/{systemsmallprojectiledamage.py => effect4055.py} (100%)
 rename eos/effects/{systemsmallhybriddamage.py => effect4056.py} (100%)
 rename eos/effects/{systemrocketemdamage.py => effect4057.py} (100%)
 rename eos/effects/{systemrocketexplosivedamage.py => effect4058.py} (100%)
 rename eos/effects/{systemrocketkineticdamage.py => effect4059.py} (100%)
 rename eos/effects/{systemrocketthermaldamage.py => effect4060.py} (100%)
 rename eos/effects/{systemstandardmissilethermaldamage.py => effect4061.py} (100%)
 rename eos/effects/{systemstandardmissileemdamage.py => effect4062.py} (100%)
 rename eos/effects/{systemstandardmissileexplosivedamage.py => effect4063.py} (100%)
 rename eos/effects/{largeprojectileturretdamagemultiplierbonuspostpercentdamagemultiplierlocationshipmodulesrequiringlargeprojectileturret.py => effect408.py} (100%)
 rename eos/effects/{systemarmorrepairamount.py => effect4086.py} (100%)
 rename eos/effects/{systemarmorremoterepairamount.py => effect4088.py} (100%)
 rename eos/effects/{systemshieldremoterepairamount.py => effect4089.py} (100%)
 rename eos/effects/{systemcapacitorcapacity.py => effect4090.py} (100%)
 rename eos/effects/{systemcapacitorrecharge.py => effect4091.py} (100%)
 rename eos/effects/{subsystembonusamarroffensiveenergyweapondamagemultiplier.py => effect4093.py} (100%)
 rename eos/effects/{subsystembonuscaldarioffensivehybridweaponmaxrange.py => effect4104.py} (100%)
 rename eos/effects/{subsystembonusgallenteoffensivehybridweaponfalloff.py => effect4106.py} (100%)
 rename eos/effects/{subsystembonusminmataroffensiveprojectileweaponfalloff.py => effect4114.py} (100%)
 rename eos/effects/{subsystembonusminmataroffensiveprojectileweaponmaxrange.py => effect4115.py} (100%)
 rename eos/effects/{subsystembonuscaldarioffensive1launcherrof.py => effect4122.py} (100%)
 rename eos/effects/{systemshieldemresistance.py => effect4135.py} (100%)
 rename eos/effects/{systemshieldexplosiveresistance.py => effect4136.py} (100%)
 rename eos/effects/{systemshieldkineticresistance.py => effect4137.py} (100%)
 rename eos/effects/{systemshieldthermalresistance.py => effect4138.py} (100%)
 rename eos/effects/{gunneryturretspeebonuspostpercentspeedlocationshipmodulesrequiringgunnery.py => effect414.py} (100%)
 rename eos/effects/{subsystembonusamarrengineeringheatdamagereduction.py => effect4152.py} (100%)
 rename eos/effects/{subsystembonuscaldariengineeringheatdamagereduction.py => effect4153.py} (100%)
 rename eos/effects/{subsystembonusgallenteengineeringheatdamagereduction.py => effect4154.py} (100%)
 rename eos/effects/{subsystembonusminmatarengineeringheatdamagereduction.py => effect4155.py} (100%)
 rename eos/effects/{subsystembonuscaldaricorecapacitorcapacity.py => effect4158.py} (100%)
 rename eos/effects/{subsystembonusamarrcorecapacitorcapacity.py => effect4159.py} (100%)
 rename eos/effects/{basemaxscandeviationmodifierrequiringastrometrics.py => effect4161.py} (100%)
 rename eos/effects/{basesensorstrengthmodifierrequiringastrometrics.py => effect4162.py} (100%)
 rename eos/effects/{shipbonusscanprobestrengthcf.py => effect4165.py} (100%)
 rename eos/effects/{shipbonusscanprobestrengthmf.py => effect4166.py} (100%)
 rename eos/effects/{shipbonusscanprobestrengthgf.py => effect4167.py} (100%)
 rename eos/effects/{elitebonuscoveropsscanprobestrength2.py => effect4168.py} (100%)
 rename eos/effects/{shipbonusstrategiccruiseramarrheatdamage.py => effect4187.py} (100%)
 rename eos/effects/{shipbonusstrategiccruisercaldariheatdamage.py => effect4188.py} (100%)
 rename eos/effects/{shipbonusstrategiccruisergallenteheatdamage.py => effect4189.py} (100%)
 rename eos/effects/{shipbonusstrategiccruiserminmatarheatdamage.py => effect4190.py} (100%)
 rename eos/effects/{subsystembonusamarroffensive2energyweaponcapacitorneed.py => effect4215.py} (100%)
 rename eos/effects/{subsystembonusamarrcore2energyvampireamount.py => effect4216.py} (100%)
 rename eos/effects/{subsystembonusamarrcore2energydestabilizeramount.py => effect4217.py} (100%)
 rename eos/effects/{subsystembonuscaldarioffensive2missilelauncherkineticdamage.py => effect4248.py} (100%)
 rename eos/effects/{subsystembonusgallenteoffensivedronedamagehp.py => effect4250.py} (100%)
 rename eos/effects/{subsystembonusminmataroffensive2projectileweapondamagemultiplier.py => effect4251.py} (100%)
 rename eos/effects/{subsystembonusminmataroffensive2missilelauncherrof.py => effect4256.py} (100%)
 rename eos/effects/{subsystembonusminmatarcorecapacitorrecharge.py => effect4264.py} (100%)
 rename eos/effects/{subsystembonusgallentecorecapacitorrecharge.py => effect4265.py} (100%)
 rename eos/effects/{subsystembonusamarrcore3scanresolution.py => effect4269.py} (100%)
 rename eos/effects/{subsystembonusminmatarcore3scanresolution.py => effect4270.py} (100%)
 rename eos/effects/{subsystembonuscaldaricore2maxtargetingrange.py => effect4271.py} (100%)
 rename eos/effects/{subsystembonusgallentecore2maxtargetingrange.py => effect4272.py} (100%)
 rename eos/effects/{subsystembonusgallentecore2warpscramblerange.py => effect4273.py} (100%)
 rename eos/effects/{subsystembonusminmatarcore2stasiswebifierrange.py => effect4274.py} (100%)
 rename eos/effects/{subsystembonuscaldaripropulsion2warpspeed.py => effect4275.py} (100%)
 rename eos/effects/{subsystembonusgallentepropulsionwarpcapacitor.py => effect4277.py} (100%)
 rename eos/effects/{subsystembonusgallentepropulsion2warpspeed.py => effect4278.py} (100%)
 rename eos/effects/{systemagility.py => effect4280.py} (100%)
 rename eos/effects/{subsystembonusgallenteoffensive2hybridweapondamagemultiplier.py => effect4282.py} (100%)
 rename eos/effects/{subsystembonuscaldarioffensive2hybridweapondamagemultiplier.py => effect4283.py} (100%)
 rename eos/effects/{subsystembonusamarroffensive2remotearmorrepaircapuse.py => effect4286.py} (100%)
 rename eos/effects/{subsystembonusgallenteoffensive2remotearmorrepaircapuse.py => effect4288.py} (100%)
 rename eos/effects/{subsystembonusminmataroffensive2remoterepcapuse.py => effect4290.py} (100%)
 rename eos/effects/{subsystembonuscaldarioffensive2remoteshieldboostercapuse.py => effect4292.py} (100%)
 rename eos/effects/{subsystembonuscaldaricore2ecmstrengthrange.py => effect4321.py} (100%)
 rename eos/effects/{subsystembonusamarroffensive3dronedamagehp.py => effect4327.py} (100%)
 rename eos/effects/{subsystembonusamarroffensive3energyweaponmaxrange.py => effect4330.py} (100%)
 rename eos/effects/{subsystembonuscaldarioffensive3hmlhamvelocity.py => effect4331.py} (100%)
 rename eos/effects/{subsystembonusminmatarcore2maxtargetingrange.py => effect4342.py} (100%)
 rename eos/effects/{subsystembonusamarrcore2maxtargetingrange.py => effect4343.py} (100%)
 rename eos/effects/{subsystembonusgallenteoffensive3turrettracking.py => effect4347.py} (100%)
 rename eos/effects/{subsystembonusminmataroffensive3turrettracking.py => effect4351.py} (100%)
 rename eos/effects/{ecmrangebonusmoduleeffect.py => effect4358.py} (100%)
 rename eos/effects/{subsystembonusamarroffensivemissilelauncherrof.py => effect4360.py} (100%)
 rename eos/effects/{subsystembonusamarroffensive2missiledamage.py => effect4362.py} (100%)
 rename eos/effects/{shipbonusmediumhybriddmgcc2.py => effect4366.py} (100%)
 rename eos/effects/{subsystembonuswarpbubbleimmune.py => effect4369.py} (100%)
 rename eos/effects/{caldarishipewfalloffrangecc2.py => effect4370.py} (100%)
 rename eos/effects/{caldarishipewfalloffrangecb3.py => effect4372.py} (100%)
 rename eos/effects/{subsystembonusamarroffensivecommandbursts.py => effect4373.py} (100%)
 rename eos/effects/{shipbonustorpedovelocitygf2.py => effect4377.py} (100%)
 rename eos/effects/{shipbonustorpedovelocitymf2.py => effect4378.py} (100%)
 rename eos/effects/{shipbonustorpedovelocity2af.py => effect4379.py} (100%)
 rename eos/effects/{shipbonustorpedovelocitycf2.py => effect4380.py} (100%)
 rename eos/effects/{elitereconbonusheavymissilevelocity.py => effect4384.py} (100%)
 rename eos/effects/{elitereconbonusheavyassaultmissilevelocity.py => effect4385.py} (100%)
 rename eos/effects/{shipbonuselitecover2torpedothermaldamage.py => effect4393.py} (100%)
 rename eos/effects/{shipbonuselitecover2torpedoemdamage.py => effect4394.py} (100%)
 rename eos/effects/{shipbonuselitecover2torpedoexplosivedamage.py => effect4395.py} (100%)
 rename eos/effects/{shipbonuselitecover2torpedokineticdamage.py => effect4396.py} (100%)
 rename eos/effects/{shipbonusgftorpedoexplosionvelocity.py => effect4397.py} (100%)
 rename eos/effects/{shipbonusmf1torpedoexplosionvelocity.py => effect4398.py} (100%)
 rename eos/effects/{shipbonuscf1torpedoexplosionvelocity.py => effect4399.py} (100%)
 rename eos/effects/{shipbonusaf1torpedoexplosionvelocity.py => effect4400.py} (100%)
 rename eos/effects/{shipbonusgf1torpedoflighttime.py => effect4413.py} (100%)
 rename eos/effects/{shipbonusmf1torpedoflighttime.py => effect4415.py} (100%)
 rename eos/effects/{shipbonuscf1torpedoflighttime.py => effect4416.py} (100%)
 rename eos/effects/{shipbonusaf1torpedoflighttime.py => effect4417.py} (100%)
 rename eos/effects/{scanradarstrengthmodifiereffect.py => effect4451.py} (100%)
 rename eos/effects/{scanladarstrengthmodifiereffect.py => effect4452.py} (100%)
 rename eos/effects/{scangravimetricstrengthmodifiereffect.py => effect4453.py} (100%)
 rename eos/effects/{scanmagnetometricstrengthmodifiereffect.py => effect4454.py} (100%)
 rename eos/effects/{federationsetbonus3.py => effect4456.py} (100%)
 rename eos/effects/{imperialsetbonus3.py => effect4457.py} (100%)
 rename eos/effects/{republicsetbonus3.py => effect4458.py} (100%)
 rename eos/effects/{caldarisetbonus3.py => effect4459.py} (100%)
 rename eos/effects/{shieldmanagementshieldcapacitybonuspostpercentcapacitylocationshipgroupshield.py => effect446.py} (100%)
 rename eos/effects/{imperialsetlgbonus.py => effect4460.py} (100%)
 rename eos/effects/{federationsetlgbonus.py => effect4461.py} (100%)
 rename eos/effects/{caldarisetlgbonus.py => effect4462.py} (100%)
 rename eos/effects/{republicsetlgbonus.py => effect4463.py} (100%)
 rename eos/effects/{shipprojectilerofmf.py => effect4464.py} (100%)
 rename eos/effects/{shipbonusstasismf2.py => effect4471.py} (100%)
 rename eos/effects/{shipprojectiledmgmc.py => effect4472.py} (100%)
 rename eos/effects/{shipvelocitybonusatc1.py => effect4473.py} (100%)
 rename eos/effects/{shipmtmaxrangebonusatc.py => effect4474.py} (100%)
 rename eos/effects/{shipmtfalloffbonusatc.py => effect4475.py} (100%)
 rename eos/effects/{shipmtfalloffbonusatf.py => effect4476.py} (100%)
 rename eos/effects/{shipmtmaxrangebonusatf.py => effect4477.py} (100%)
 rename eos/effects/{shipbonusafterburnercapneedatf.py => effect4478.py} (100%)
 rename eos/effects/{shipbonussurveyprobeexplosiondelayskillsurveycovertops3.py => effect4479.py} (100%)
 rename eos/effects/{shipetoptimalrange2af.py => effect4482.py} (100%)
 rename eos/effects/{shippturretfalloffbonusgb.py => effect4484.py} (100%)
 rename eos/effects/{shipbonusstasiswebspeedfactormb.py => effect4485.py} (100%)
 rename eos/effects/{superweaponamarr.py => effect4489.py} (100%)
 rename eos/effects/{superweaponcaldari.py => effect4490.py} (100%)
 rename eos/effects/{superweapongallente.py => effect4491.py} (100%)
 rename eos/effects/{superweaponminmatar.py => effect4492.py} (100%)
 rename eos/effects/{shipstasiswebstrengthbonusmc2.py => effect4510.py} (100%)
 rename eos/effects/{shippturretfalloffbonusgc.py => effect4512.py} (100%)
 rename eos/effects/{shipstasiswebstrengthbonusmf2.py => effect4513.py} (100%)
 rename eos/effects/{shipfalloffbonusmf.py => effect4515.py} (100%)
 rename eos/effects/{shiphturretfalloffbonusgc.py => effect4516.py} (100%)
 rename eos/effects/{gunneryfalloffbonusonline.py => effect4527.py} (100%)
 rename eos/effects/{capitallauncherskillcruisecitadelemdamage1.py => effect4555.py} (100%)
 rename eos/effects/{capitallauncherskillcruisecitadelexplosivedamage1.py => effect4556.py} (100%)
 rename eos/effects/{capitallauncherskillcruisecitadelkineticdamage1.py => effect4557.py} (100%)
 rename eos/effects/{capitallauncherskillcruisecitadelthermaldamage1.py => effect4558.py} (100%)
 rename eos/effects/{gunnerymaxrangefallofftrackingspeedbonus.py => effect4559.py} (100%)
 rename eos/effects/{industrialcoreeffect2.py => effect4575.py} (100%)
 rename eos/effects/{elitebonuslogisticstrackinglinkfalloffbonus1.py => effect4576.py} (100%)
 rename eos/effects/{elitebonuslogisticstrackinglinkfalloffbonus2.py => effect4577.py} (100%)
 rename eos/effects/{dronerigstasiswebspeedfactorbonus.py => effect4579.py} (100%)
 rename eos/effects/{shipbonusdronedamagegf2.py => effect4619.py} (100%)
 rename eos/effects/{shipbonuswarpscramblermaxrangegf2.py => effect4620.py} (100%)
 rename eos/effects/{shipbonusheatdamageatf1.py => effect4621.py} (100%)
 rename eos/effects/{shipbonussmallhybridmaxrangeatf2.py => effect4622.py} (100%)
 rename eos/effects/{shipbonussmallhybridtrackingspeedatf2.py => effect4623.py} (100%)
 rename eos/effects/{shipbonushybridtrackingatc2.py => effect4624.py} (100%)
 rename eos/effects/{shipbonushybridfalloffatc2.py => effect4625.py} (100%)
 rename eos/effects/{shipbonuswarpscramblermaxrangegc2.py => effect4626.py} (100%)
 rename eos/effects/{elitebonusmarauderscruiseandtorpedodamagerole1.py => effect4635.py} (100%)
 rename eos/effects/{shipbonusaoevelocitycruiseandtorpedocb2.py => effect4636.py} (100%)
 rename eos/effects/{shipcruiseandtorpedovelocitybonuscb3.py => effect4637.py} (100%)
 rename eos/effects/{shiparmoremandexpandkinandthmresistanceac2.py => effect4640.py} (100%)
 rename eos/effects/{shipheavyassaultmissileemandexpandkinandthmdmgac1.py => effect4643.py} (100%)
 rename eos/effects/{elitebonusheavygunshipheavyandheavyassaultandassaultmissilelauncherrof.py => effect4645.py} (100%)
 rename eos/effects/{elitebonusblackopsecmgravandladarandmagnetometricandradarstrength1.py => effect4648.py} (100%)
 rename eos/effects/{shipcruiseandsiegelauncherrofbonus2cb.py => effect4649.py} (100%)
 rename eos/effects/{shipbonusnoctissalvagecycle.py => effect4667.py} (100%)
 rename eos/effects/{shipbonusnoctistractorcycle.py => effect4668.py} (100%)
 rename eos/effects/{shipbonusnoctistractorvelocity.py => effect4669.py} (100%)
 rename eos/effects/{shipbonusnoctistractorrange.py => effect4670.py} (100%)
 rename eos/effects/{offensivedefensivereduction.py => effect4728.py} (100%)
 rename eos/effects/{subsystembonuscaldaripropulsionwarpcapacitor.py => effect4760.py} (100%)
 rename eos/effects/{shipenergyneutralizertransferamountbonusaf2.py => effect4775.py} (100%)
 rename eos/effects/{shipbonussmallenergyweaponoptimalrangeatf2.py => effect4782.py} (100%)
 rename eos/effects/{shipbonussmallenergyturretdamageatf1.py => effect4789.py} (100%)
 rename eos/effects/{shipbonusmissilelauncherheavyrofatc1.py => effect4793.py} (100%)
 rename eos/effects/{shipbonusmissilelauncherassaultrofatc1.py => effect4794.py} (100%)
 rename eos/effects/{shipbonusmissilelauncherheavyassaultrofatc1.py => effect4795.py} (100%)
 rename eos/effects/{elitebonusblackopsecmburstgravandladarandmagnetoandradar.py => effect4799.py} (100%)
 rename eos/effects/{powerbooster.py => effect48.py} (100%)
 rename eos/effects/{dataminingskillboostaccessdifficultybonusabsolutepercent.py => effect4804.py} (100%)
 rename eos/effects/{ecmgravimetricstrengthbonuspercent.py => effect4809.py} (100%)
 rename eos/effects/{ecmladarstrengthbonuspercent.py => effect4810.py} (100%)
 rename eos/effects/{ecmmagnetometricstrengthbonuspercent.py => effect4811.py} (100%)
 rename eos/effects/{ecmradarstrengthbonuspercent.py => effect4812.py} (100%)
 rename eos/effects/{jumpportalconsumptionbonuspercentskill.py => effect4814.py} (100%)
 rename eos/effects/{salvagermoduledurationreduction.py => effect4817.py} (100%)
 rename eos/effects/{bclargeenergyturretpowerneedbonus.py => effect4820.py} (100%)
 rename eos/effects/{bclargehybridturretpowerneedbonus.py => effect4821.py} (100%)
 rename eos/effects/{bclargeprojectileturretpowerneedbonus.py => effect4822.py} (100%)
 rename eos/effects/{bclargeenergyturretcpuneedbonus.py => effect4823.py} (100%)
 rename eos/effects/{bclargehybridturretcpuneedbonus.py => effect4824.py} (100%)
 rename eos/effects/{bclargeprojectileturretcpuneedbonus.py => effect4825.py} (100%)
 rename eos/effects/{bclargeenergyturretcapacitorneedbonus.py => effect4826.py} (100%)
 rename eos/effects/{bclargehybridturretcapacitorneedbonus.py => effect4827.py} (100%)
 rename eos/effects/{energysystemsoperationcaprechargebonuspostpercentrechargeratelocationshipgroupcapacitor.py => effect485.py} (100%)
 rename eos/effects/{shieldoperationrechargeratebonuspostpercentrechargeratelocationshipgroupshield.py => effect486.py} (100%)
 rename eos/effects/{setbonuschristmaspowergrid.py => effect4867.py} (100%)
 rename eos/effects/{setbonuschristmascapacitorcapacity.py => effect4868.py} (100%)
 rename eos/effects/{setbonuschristmascpuoutput.py => effect4869.py} (100%)
 rename eos/effects/{setbonuschristmascapacitorrecharge2.py => effect4871.py} (100%)
 rename eos/effects/{shipbonusdronehitpointsgf2.py => effect4896.py} (100%)
 rename eos/effects/{shipbonusdronearmorhitpointsgf2.py => effect4897.py} (100%)
 rename eos/effects/{shipbonusdroneshieldhitpointsgf2.py => effect4898.py} (100%)
 rename eos/effects/{engineeringpowerengineeringoutputbonuspostpercentpoweroutputlocationshipgrouppowercore.py => effect490.py} (100%)
 rename eos/effects/{shipmissilespeedbonusaf.py => effect4901.py} (100%)
 rename eos/effects/{mwdsignatureradiusrolebonus.py => effect4902.py} (100%)
 rename eos/effects/{systemdamagefighters.py => effect4906.py} (100%)
 rename eos/effects/{modifyshieldrechargeratepassive.py => effect4911.py} (100%)
 rename eos/effects/{microjumpdrive.py => effect4921.py} (100%)
 rename eos/effects/{skillmjddurationbonus.py => effect4923.py} (100%)
 rename eos/effects/{adaptivearmorhardener.py => effect4928.py} (100%)
 rename eos/effects/{shiparmorrepairinggf2.py => effect4934.py} (100%)
 rename eos/effects/{fueledshieldboosting.py => effect4936.py} (100%)
 rename eos/effects/{warpdriveoperationwarpcapacitorneedbonuspostpercentwarpcapacitorneedlocationshipgrouppropulsion.py => effect494.py} (100%)
 rename eos/effects/{shiphybriddamagebonuscf2.py => effect4941.py} (100%)
 rename eos/effects/{targetbreaker.py => effect4942.py} (100%)
 rename eos/effects/{skilltargetbreakerdurationbonus2.py => effect4945.py} (100%)
 rename eos/effects/{skilltargetbreakercapneedbonus2.py => effect4946.py} (100%)
 rename eos/effects/{shipbonusshieldboostermb1a.py => effect4950.py} (100%)
 rename eos/effects/{shieldboostamplifierpassivebooster.py => effect4951.py} (100%)
 rename eos/effects/{systemshieldrepairamountshieldskills.py => effect4961.py} (100%)
 rename eos/effects/{shieldboosterdurationbonusshieldskills.py => effect4967.py} (100%)
 rename eos/effects/{boostershieldboostamountpenaltyshieldskills.py => effect4970.py} (100%)
 rename eos/effects/{elitebonusassaultshiplightmissilerof.py => effect4972.py} (100%)
 rename eos/effects/{elitebonusassaultshiprocketrof.py => effect4973.py} (100%)
 rename eos/effects/{elitebonusmaraudershieldbonus2a.py => effect4974.py} (100%)
 rename eos/effects/{shipbonusmissilekineticlatf2.py => effect4975.py} (100%)
 rename eos/effects/{skillreactivearmorhardenerdurationbonus.py => effect4976.py} (100%)
 rename eos/effects/{missileskillaoecloudsizebonusallincludingcapitals.py => effect4989.py} (100%)
 rename eos/effects/{shipenergytcapneedbonusrookie.py => effect4990.py} (100%)
 rename eos/effects/{shipsetdmgbonusrookie.py => effect4991.py} (100%)
 rename eos/effects/{shiparmoremresistancerookie.py => effect4994.py} (100%)
 rename eos/effects/{shiparmorexresistancerookie.py => effect4995.py} (100%)
 rename eos/effects/{shiparmorknresistancerookie.py => effect4996.py} (100%)
 rename eos/effects/{shiparmorthresistancerookie.py => effect4997.py} (100%)
 rename eos/effects/{shiphybridrangebonusrookie.py => effect4999.py} (100%)
 rename eos/effects/{modifyshieldrechargerate.py => effect50.py} (100%)
 rename eos/effects/{shipmissilekineticdamagerookie.py => effect5000.py} (100%)
 rename eos/effects/{shipshieldemresistancerookie.py => effect5008.py} (100%)
 rename eos/effects/{shipshieldexplosiveresistancerookie.py => effect5009.py} (100%)
 rename eos/effects/{shipshieldkineticresistancerookie.py => effect5011.py} (100%)
 rename eos/effects/{shipshieldthermalresistancerookie.py => effect5012.py} (100%)
 rename eos/effects/{shipshtdmgbonusrookie.py => effect5013.py} (100%)
 rename eos/effects/{shipbonusdronedamagemultiplierrookie.py => effect5014.py} (100%)
 rename eos/effects/{shipbonusewremotesensordampenermaxtargetrangebonusrookie.py => effect5015.py} (100%)
 rename eos/effects/{shipbonusewremotesensordampenerscanresolutionbonusrookie.py => effect5016.py} (100%)
 rename eos/effects/{shiparmorrepairingrookie.py => effect5017.py} (100%)
 rename eos/effects/{shipvelocitybonusrookie.py => effect5018.py} (100%)
 rename eos/effects/{minmatarshipewtargetpainterrookie.py => effect5019.py} (100%)
 rename eos/effects/{shipsptdmgbonusrookie.py => effect5020.py} (100%)
 rename eos/effects/{shipshieldboostrookie.py => effect5021.py} (100%)
 rename eos/effects/{shipecmscanstrengthbonusrookie.py => effect5028.py} (100%)
 rename eos/effects/{shipbonusdroneminingamountrole.py => effect5029.py} (100%)
 rename eos/effects/{shipbonusminingdroneamountpercentrookie.py => effect5030.py} (100%)
 rename eos/effects/{shipbonusdronehitpointsrookie.py => effect5035.py} (100%)
 rename eos/effects/{shipbonussalvagecycleaf.py => effect5036.py} (100%)
 rename eos/effects/{scoutdroneoperationdronerangebonusmodadddronecontroldistancechar.py => effect504.py} (100%)
 rename eos/effects/{shipbonussalvagecyclecf.py => effect5045.py} (100%)
 rename eos/effects/{shipbonussalvagecyclegf.py => effect5048.py} (100%)
 rename eos/effects/{shipbonussalvagecyclemf.py => effect5051.py} (100%)
 rename eos/effects/{iceharvesterdurationmultiplier.py => effect5055.py} (100%)
 rename eos/effects/{miningyieldmultiplypassive.py => effect5058.py} (100%)
 rename eos/effects/{shipbonusiceharvesterdurationore3.py => effect5059.py} (100%)
 rename eos/effects/{fuelconservationcapneedbonuspostpercentcapacitorneedlocationshipmodulesrequiringafterburner.py => effect506.py} (100%)
 rename eos/effects/{shipbonustargetpainteroptimalmf1.py => effect5066.py} (100%)
 rename eos/effects/{shipbonusoreholdore2.py => effect5067.py} (100%)
 rename eos/effects/{shipbonusshieldcapacityore2.py => effect5068.py} (100%)
 rename eos/effects/{mercoxitcrystalbonus.py => effect5069.py} (100%)
 rename eos/effects/{longrangetargetingmaxtargetrangebonuspostpercentmaxtargetrangelocationshipgroupelectronic.py => effect507.py} (100%)
 rename eos/effects/{shipmissilekineticdamagecf2.py => effect5079.py} (100%)
 rename eos/effects/{shippdmgbonusmf.py => effect508.py} (100%)
 rename eos/effects/{shipmissilevelocitycf.py => effect5080.py} (100%)
 rename eos/effects/{maxtargetingrangebonuspostpercentpassive.py => effect5081.py} (100%)
 rename eos/effects/{shipbonusdronehitpointsgf.py => effect5087.py} (100%)
 rename eos/effects/{shipshieldboostmf.py => effect5090.py} (100%)
 rename eos/effects/{modifypowerrechargerate.py => effect51.py} (100%)
 rename eos/effects/{shipbonusshieldtransfercapneedcf.py => effect5103.py} (100%)
 rename eos/effects/{shipbonusshieldtransferboostamountcf2.py => effect5104.py} (100%)
 rename eos/effects/{shipbonusshieldtransfercapneedmf.py => effect5105.py} (100%)
 rename eos/effects/{shipbonusshieldtransferboostamountmf2.py => effect5106.py} (100%)
 rename eos/effects/{shipbonusremotearmorrepaircapneedgf.py => effect5107.py} (100%)
 rename eos/effects/{shipbonusremotearmorrepairamountgf2.py => effect5108.py} (100%)
 rename eos/effects/{shipbonusremotearmorrepaircapneedaf.py => effect5109.py} (100%)
 rename eos/effects/{shipenergytcapneedbonusaf.py => effect511.py} (100%)
 rename eos/effects/{shipbonusremotearmorrepairamount2af.py => effect5110.py} (100%)
 rename eos/effects/{shipbonusdronetrackinggf.py => effect5111.py} (100%)
 rename eos/effects/{shipbonusscanprobestrength2af.py => effect5119.py} (100%)
 rename eos/effects/{shipshtdmgbonusgf.py => effect512.py} (100%)
 rename eos/effects/{energytransferarraytransferamountbonus.py => effect5121.py} (100%)
 rename eos/effects/{shipbonusshieldtransfercapneedmc1.py => effect5122.py} (100%)
 rename eos/effects/{shipbonusremotearmorrepaircapneedac1.py => effect5123.py} (100%)
 rename eos/effects/{shipbonusremotearmorrepairamountac2.py => effect5124.py} (100%)
 rename eos/effects/{shipbonusremotearmorrepairamountgc2.py => effect5125.py} (100%)
 rename eos/effects/{shipbonusshieldtransferboostamountcc2.py => effect5126.py} (100%)
 rename eos/effects/{shipbonusshieldtransferboostamountmc2.py => effect5127.py} (100%)
 rename eos/effects/{shipbonusewremotesensordampeneroptimalbonusgc1.py => effect5128.py} (100%)
 rename eos/effects/{minmatarshipewtargetpaintermc1.py => effect5129.py} (100%)
 rename eos/effects/{shipmissilerofcc.py => effect5131.py} (100%)
 rename eos/effects/{shippturretfalloffbonusmc2.py => effect5132.py} (100%)
 rename eos/effects/{shiphtdamagebonuscc.py => effect5133.py} (100%)
 rename eos/effects/{shipmetcdamagebonusac.py => effect5136.py} (100%)
 rename eos/effects/{shipminingbonusorefrig1.py => effect5139.py} (100%)
 rename eos/effects/{shipsetdmgbonusaf.py => effect514.py} (100%)
 rename eos/effects/{gchyieldmultiplypassive.py => effect5142.py} (100%)
 rename eos/effects/{shipmissilevelocitypiratefactionrocket.py => effect5153.py} (100%)
 rename eos/effects/{shipgchyieldbonusorefrig2.py => effect5156.py} (100%)
 rename eos/effects/{shiptcapneedbonusac.py => effect516.py} (100%)
 rename eos/effects/{skillreactivearmorhardenercapneedbonus.py => effect5162.py} (100%)
 rename eos/effects/{shipbonusdronemwdboostrole.py => effect5165.py} (100%)
 rename eos/effects/{dronesalvagebonus.py => effect5168.py} (100%)
 rename eos/effects/{sensorcompensationsensorstrengthbonusgravimetric.py => effect5180.py} (100%)
 rename eos/effects/{sensorcompensationsensorstrengthbonusladar.py => effect5181.py} (100%)
 rename eos/effects/{sensorcompensationsensorstrengthbonusmagnetometric.py => effect5182.py} (100%)
 rename eos/effects/{sensorcompensationsensorstrengthbonusradar.py => effect5183.py} (100%)
 rename eos/effects/{shipenergyvampireamountbonusfixedaf2.py => effect5185.py} (100%)
 rename eos/effects/{shipbonusewremotesensordampenerfalloffbonusgc1.py => effect5187.py} (100%)
 rename eos/effects/{trackingspeedbonuseffecthybrids.py => effect5188.py} (100%)
 rename eos/effects/{trackingspeedbonuseffectlasers.py => effect5189.py} (100%)
 rename eos/effects/{trackingspeedbonuseffectprojectiles.py => effect5190.py} (100%)
 rename eos/effects/{armorupgradesmasspenaltyreductionbonus.py => effect5201.py} (100%)
 rename eos/effects/{shipsettrackingbonusrookie.py => effect5205.py} (100%)
 rename eos/effects/{shipsetoptimalbonusrookie.py => effect5206.py} (100%)
 rename eos/effects/{shipnostransferamountbonusrookie.py => effect5207.py} (100%)
 rename eos/effects/{shipneutdestabilizationamountbonusrookie.py => effect5208.py} (100%)
 rename eos/effects/{shipwebvelocitybonusrookie.py => effect5209.py} (100%)
 rename eos/effects/{shiphrangebonuscc.py => effect521.py} (100%)
 rename eos/effects/{shipdronemwdspeedbonusrookie.py => effect5212.py} (100%)
 rename eos/effects/{shiprocketmaxvelocitybonusrookie.py => effect5213.py} (100%)
 rename eos/effects/{shiplightmissilemaxvelocitybonusrookie.py => effect5214.py} (100%)
 rename eos/effects/{shipshttrackingspeedbonusrookie.py => effect5215.py} (100%)
 rename eos/effects/{shipshtfalloffbonusrookie.py => effect5216.py} (100%)
 rename eos/effects/{shipspttrackingspeedbonusrookie.py => effect5217.py} (100%)
 rename eos/effects/{shipsptfalloffbonusrookie.py => effect5218.py} (100%)
 rename eos/effects/{shipsptoptimalrangebonusrookie.py => effect5219.py} (100%)
 rename eos/effects/{shipprojectiledmgpiratecruiser.py => effect5220.py} (100%)
 rename eos/effects/{shipheavyassaultmissileemdmgpiratecruiser.py => effect5221.py} (100%)
 rename eos/effects/{shipheavyassaultmissilekindmgpiratecruiser.py => effect5222.py} (100%)
 rename eos/effects/{shipheavyassaultmissilethermdmgpiratecruiser.py => effect5223.py} (100%)
 rename eos/effects/{shipheavyassaultmissileexpdmgpiratecruiser.py => effect5224.py} (100%)
 rename eos/effects/{shipheavymissileemdmgpiratecruiser.py => effect5225.py} (100%)
 rename eos/effects/{shipheavymissileexpdmgpiratecruiser.py => effect5226.py} (100%)
 rename eos/effects/{shipheavymissilekindmgpiratecruiser.py => effect5227.py} (100%)
 rename eos/effects/{shipheavymissilethermdmgpiratecruiser.py => effect5228.py} (100%)
 rename eos/effects/{shipscanprobestrengthbonuspiratecruiser.py => effect5229.py} (100%)
 rename eos/effects/{modifyactiveshieldresonancepostpercent.py => effect5230.py} (100%)
 rename eos/effects/{modifyactivearmorresonancepostpercent.py => effect5231.py} (100%)
 rename eos/effects/{shipsmallmissileexpdmgcf2.py => effect5234.py} (100%)
 rename eos/effects/{shipsmallmissilekindmgcf2.py => effect5237.py} (100%)
 rename eos/effects/{shipsmallmissilethermdmgcf2.py => effect5240.py} (100%)
 rename eos/effects/{shipsmallmissileemdmgcf2.py => effect5243.py} (100%)
 rename eos/effects/{reconshipcloakcpubonus1.py => effect5259.py} (100%)
 rename eos/effects/{covertopscloakcpupercentbonus1.py => effect5260.py} (100%)
 rename eos/effects/{covertcloakcpuaddition.py => effect5261.py} (100%)
 rename eos/effects/{covertopscloakcpupenalty.py => effect5262.py} (100%)
 rename eos/effects/{covertcynocpupenalty.py => effect5263.py} (100%)
 rename eos/effects/{warfarelinkcpuaddition.py => effect5264.py} (100%)
 rename eos/effects/{warfarelinkcpupenalty.py => effect5265.py} (100%)
 rename eos/effects/{blockaderunnercloakcpupercentbonus.py => effect5266.py} (100%)
 rename eos/effects/{drawbackrepairsystemspgneed.py => effect5267.py} (100%)
 rename eos/effects/{drawbackcapreppgneed.py => effect5268.py} (100%)
 rename eos/effects/{shipvelocitybonusmi.py => effect527.py} (100%)
 rename eos/effects/{fueledarmorrepair.py => effect5275.py} (100%)
 rename eos/effects/{shipcargobonusai.py => effect529.py} (100%)
 rename eos/effects/{shiplasercapneed2ad1.py => effect5293.py} (100%)
 rename eos/effects/{shiplasertracking2ad2.py => effect5294.py} (100%)
 rename eos/effects/{shipbonusdronedamagemultiplierad1.py => effect5295.py} (100%)
 rename eos/effects/{shipbonusdronehitpointsad1.py => effect5300.py} (100%)
 rename eos/effects/{shiphybridrange1cd1.py => effect5303.py} (100%)
 rename eos/effects/{shiphybridtrackingcd2.py => effect5304.py} (100%)
 rename eos/effects/{shipbonusfrigatesizedmissilekineticdamagecd1.py => effect5305.py} (100%)
 rename eos/effects/{shiprocketkineticdmgcd1.py => effect5306.py} (100%)
 rename eos/effects/{shipbonusaoevelocityrocketscd2.py => effect5307.py} (100%)
 rename eos/effects/{shipbonusaoevelocitystandardmissilescd2.py => effect5308.py} (100%)
 rename eos/effects/{shiphybridfalloff1gd1.py => effect5309.py} (100%)
 rename eos/effects/{shiphybridtracking1gd2.py => effect5310.py} (100%)
 rename eos/effects/{shipbonusdronedamagemultipliergd1.py => effect5311.py} (100%)
 rename eos/effects/{shipbonusdronehitpointsgd1.py => effect5316.py} (100%)
 rename eos/effects/{shipprojectiledamagemd1.py => effect5317.py} (100%)
 rename eos/effects/{shipprojectiletracking1md2.py => effect5318.py} (100%)
 rename eos/effects/{shipbonusfrigatesizedlightmissileexplosivedamagemd1.py => effect5319.py} (100%)
 rename eos/effects/{shiprocketexplosivedmgmd1.py => effect5320.py} (100%)
 rename eos/effects/{shipbonusmwdsignatureradiusmd2.py => effect5321.py} (100%)
 rename eos/effects/{shiparmoremresistance1abc1.py => effect5322.py} (100%)
 rename eos/effects/{shiparmorexplosiveresistance1abc1.py => effect5323.py} (100%)
 rename eos/effects/{shiparmorkineticresistance1abc1.py => effect5324.py} (100%)
 rename eos/effects/{shiparmorthermresistance1abc1.py => effect5325.py} (100%)
 rename eos/effects/{shipbonusdronedamagemultiplierabc2.py => effect5326.py} (100%)
 rename eos/effects/{shipbonusdronehitpointsabc2.py => effect5331.py} (100%)
 rename eos/effects/{shiplasercapabc1.py => effect5332.py} (100%)
 rename eos/effects/{shiplaserdamagebonusabc2.py => effect5333.py} (100%)
 rename eos/effects/{shiphybridoptimal1cbc1.py => effect5334.py} (100%)
 rename eos/effects/{shipshieldemresistance1cbc2.py => effect5335.py} (100%)
 rename eos/effects/{shipshieldexplosiveresistance1cbc2.py => effect5336.py} (100%)
 rename eos/effects/{shipshieldkineticresistance1cbc2.py => effect5337.py} (100%)
 rename eos/effects/{shipshieldthermalresistance1cbc2.py => effect5338.py} (100%)
 rename eos/effects/{shipbonusheavyassaultmissilekineticdamagecbc1.py => effect5339.py} (100%)
 rename eos/effects/{shipbonusheavymissilekineticdamagecbc1.py => effect5340.py} (100%)
 rename eos/effects/{shiphybriddmg1gbc1.py => effect5341.py} (100%)
 rename eos/effects/{shiparmorrepairing1gbc2.py => effect5342.py} (100%)
 rename eos/effects/{shipbonusdronedamagemultipliergbc1.py => effect5343.py} (100%)
 rename eos/effects/{shipbonusdronehitpointsgbc1.py => effect5348.py} (100%)
 rename eos/effects/{shipbonusheavymissilelauncherrofmbc2.py => effect5349.py} (100%)
 rename eos/effects/{shipbonusheavyassaultmissilelauncherrofmbc2.py => effect5350.py} (100%)
 rename eos/effects/{shipshieldboost1mbc1.py => effect5351.py} (100%)
 rename eos/effects/{shipbonusprojectiledamagembc1.py => effect5352.py} (100%)
 rename eos/effects/{shipprojectilerof1mbc2.py => effect5353.py} (100%)
 rename eos/effects/{shiplargelasercapabc1.py => effect5354.py} (100%)
 rename eos/effects/{shiplargelaserdamagebonusabc2.py => effect5355.py} (100%)
 rename eos/effects/{shiphybridrangebonuscbc1.py => effect5356.py} (100%)
 rename eos/effects/{shiphybriddamagebonuscbc2.py => effect5357.py} (100%)
 rename eos/effects/{shiplargehybridtrackingbonusgbc1.py => effect5358.py} (100%)
 rename eos/effects/{shiphybriddamagebonusgbc2.py => effect5359.py} (100%)
 rename eos/effects/{cpumultiplierpostmulcpuoutputship.py => effect536.py} (100%)
 rename eos/effects/{shipprojectilerofbonusmbc1.py => effect5360.py} (100%)
 rename eos/effects/{shipprojectilefalloffbonusmbc2.py => effect5361.py} (100%)
 rename eos/effects/{armorallrepairsystemsamountbonuspassive.py => effect5364.py} (100%)
 rename eos/effects/{elitebonusviolatorsrepairsystemsarmordamageamount2.py => effect5365.py} (100%)
 rename eos/effects/{shipbonusrepairsystemsbonusatc2.py => effect5366.py} (100%)
 rename eos/effects/{shipbonusrepairsystemsarmorrepairamountgb2.py => effect5367.py} (100%)
 rename eos/effects/{shipheavymissileaoecloudsizecbc1.py => effect5378.py} (100%)
 rename eos/effects/{shipheavyassaultmissileaoecloudsizecbc1.py => effect5379.py} (100%)
 rename eos/effects/{shiphybridtrackinggbc2.py => effect5380.py} (100%)
 rename eos/effects/{shipenergytrackingabc1.py => effect5381.py} (100%)
 rename eos/effects/{shipbonusmetoptimalac2.py => effect5382.py} (100%)
 rename eos/effects/{shipmissileemdamagecc.py => effect5383.py} (100%)
 rename eos/effects/{shipmissilethermdamagecc.py => effect5384.py} (100%)
 rename eos/effects/{shipmissileexpdamagecc.py => effect5385.py} (100%)
 rename eos/effects/{shipmissilekindamagecc2.py => effect5386.py} (100%)
 rename eos/effects/{shipheavyassaultmissileaoecloudsizecc2.py => effect5387.py} (100%)
 rename eos/effects/{shipheavymissileaoecloudsizecc2.py => effect5388.py} (100%)
 rename eos/effects/{shipbonusdronetrackinggc.py => effect5389.py} (100%)
 rename eos/effects/{shipbonusdronemwdboostgc.py => effect5390.py} (100%)
 rename eos/effects/{basemaxscandeviationmodifiermoduleonline2none.py => effect5397.py} (100%)
 rename eos/effects/{systemscandurationmodulemodifier.py => effect5398.py} (100%)
 rename eos/effects/{basesensorstrengthmodifiermodule.py => effect5399.py} (100%)
 rename eos/effects/{shipmissileheavyassaultvelocityabc2.py => effect5402.py} (100%)
 rename eos/effects/{shipmissileheavyvelocityabc2.py => effect5403.py} (100%)
 rename eos/effects/{shiplasercap1abc2.py => effect5410.py} (100%)
 rename eos/effects/{shipmissilevelocitycd1.py => effect5411.py} (100%)
 rename eos/effects/{shipbonusdronedamagemultiplierab.py => effect5417.py} (100%)
 rename eos/effects/{shipbonusdronearmorhitpointsab.py => effect5418.py} (100%)
 rename eos/effects/{shipbonusdroneshieldhitpointsab.py => effect5419.py} (100%)
 rename eos/effects/{shipcapneedbonusab.py => effect542.py} (100%)
 rename eos/effects/{shipbonusdronestructurehitpointsab.py => effect5420.py} (100%)
 rename eos/effects/{shiplargehybridturretrofgb.py => effect5424.py} (100%)
 rename eos/effects/{shipbonusdronetrackinggb.py => effect5427.py} (100%)
 rename eos/effects/{shipbonusdroneoptimalrangegb.py => effect5428.py} (100%)
 rename eos/effects/{shipbonusmissileaoevelocitymb2.py => effect5429.py} (100%)
 rename eos/effects/{shipbonusaoevelocitycruisemissilesmb2.py => effect5430.py} (100%)
 rename eos/effects/{shipbonuslargeenergyturrettrackingab.py => effect5431.py} (100%)
 rename eos/effects/{hackingskillvirusbonus.py => effect5433.py} (100%)
 rename eos/effects/{archaeologyskillvirusbonus.py => effect5437.py} (100%)
 rename eos/effects/{systemstandardmissilekineticdamage.py => effect5440.py} (100%)
 rename eos/effects/{shiptorpedoaoecloudsize1cb.py => effect5444.py} (100%)
 rename eos/effects/{shipcruisemissileaoecloudsize1cb.py => effect5445.py} (100%)
 rename eos/effects/{shipcruisemissilerofcb.py => effect5456.py} (100%)
 rename eos/effects/{shiptorpedorofcb.py => effect5457.py} (100%)
 rename eos/effects/{hackingvirusstrengthbonus.py => effect5459.py} (100%)
 rename eos/effects/{minigamevirusstrengthbonus.py => effect5460.py} (100%)
 rename eos/effects/{shieldoperationrechargeratebonuspostpercentonline.py => effect5461.py} (100%)
 rename eos/effects/{shipbonusagilityci2.py => effect5468.py} (100%)
 rename eos/effects/{shipbonusagilitymi2.py => effect5469.py} (100%)
 rename eos/effects/{shipbonusagilitygi2.py => effect5470.py} (100%)
 rename eos/effects/{shipbonusagilityai2.py => effect5471.py} (100%)
 rename eos/effects/{shipbonusorecapacitygi2.py => effect5476.py} (100%)
 rename eos/effects/{shipbonusammobaymi2.py => effect5477.py} (100%)
 rename eos/effects/{shipbonuspicommoditiesholdgi2.py => effect5478.py} (100%)
 rename eos/effects/{shipbonusmineralbaygi2.py => effect5479.py} (100%)
 rename eos/effects/{setbonuschristmasbonusvelocity.py => effect5480.py} (100%)
 rename eos/effects/{setbonuschristmasagilitybonus.py => effect5482.py} (100%)
 rename eos/effects/{setbonuschristmasshieldcapacitybonus.py => effect5483.py} (100%)
 rename eos/effects/{setbonuschristmasarmorhpbonus2.py => effect5484.py} (100%)
 rename eos/effects/{shipsptoptimalbonusmf.py => effect5485.py} (100%)
 rename eos/effects/{shipbonusprojectiledamagembc2.py => effect5486.py} (100%)
 rename eos/effects/{shipptdmgbonusmb.py => effect549.py} (100%)
 rename eos/effects/{elitebonuscommandshiphamrofcs1.py => effect5496.py} (100%)
 rename eos/effects/{elitebonuscommandshiphmrofcs1.py => effect5497.py} (100%)
 rename eos/effects/{elitebonuscommandshipsheavyassaultmissileexplosionvelocitycs2.py => effect5498.py} (100%)
 rename eos/effects/{elitebonuscommandshipsheavyassaultmissileexplosionradiuscs2.py => effect5499.py} (100%)
 rename eos/effects/{targethostiles.py => effect55.py} (100%)
 rename eos/effects/{shiphtdmgbonusgb.py => effect550.py} (100%)
 rename eos/effects/{elitebonuscommandshipsheavymissileexplosionradiuscs2.py => effect5500.py} (100%)
 rename eos/effects/{elitebonuscommandshipmediumhybriddamagecs2.py => effect5501.py} (100%)
 rename eos/effects/{elitebonuscommandshipmediumhybridtrackingcs1.py => effect5502.py} (100%)
 rename eos/effects/{elitebonuscommandshipheavydronetrackingcs2.py => effect5503.py} (100%)
 rename eos/effects/{elitebonuscommandshipheavydronevelocitycs2.py => effect5504.py} (100%)
 rename eos/effects/{elitebonuscommandshipmediumhybridrofcs1.py => effect5505.py} (100%)
 rename eos/effects/{elitebonuscommandshipheavyassaultmissiledamagecs2.py => effect5514.py} (100%)
 rename eos/effects/{elitebonuscommandshipheavymissiledamagecs2.py => effect5521.py} (100%)
 rename eos/effects/{shiphttrackingbonusgb.py => effect553.py} (100%)
 rename eos/effects/{shipbonushmlkineticdamageac.py => effect5539.py} (100%)
 rename eos/effects/{shipbonushmlemdamageac.py => effect5540.py} (100%)
 rename eos/effects/{shipbonushmlthermdamageac.py => effect5541.py} (100%)
 rename eos/effects/{shipbonushmlexplodamageac.py => effect5542.py} (100%)
 rename eos/effects/{shipbonushmlvelocityelitebonusheavygunship1.py => effect5552.py} (100%)
 rename eos/effects/{shipbonushamvelocityelitebonusheavygunship1.py => effect5553.py} (100%)
 rename eos/effects/{shipbonusarmorrepamountgc2.py => effect5554.py} (100%)
 rename eos/effects/{shipbonusheavydronespeedgc.py => effect5555.py} (100%)
 rename eos/effects/{shipbonusheavydronetrackinggc.py => effect5556.py} (100%)
 rename eos/effects/{shipbonussentrydroneoptimalrangeelitebonusheavygunship2.py => effect5557.py} (100%)
 rename eos/effects/{shipbonussentrydronetrackingelitebonusheavygunship2.py => effect5558.py} (100%)
 rename eos/effects/{shipbonusshieldboostamountmc2.py => effect5559.py} (100%)
 rename eos/effects/{rolebonusmaraudermjdrreactivationdelaybonus.py => effect5560.py} (100%)
 rename eos/effects/{subsystembonuscaldarioffensivecommandbursts.py => effect5564.py} (100%)
 rename eos/effects/{subsystembonusgallenteoffensivecommandbursts.py => effect5568.py} (100%)
 rename eos/effects/{subsystembonusminmataroffensivecommandbursts.py => effect5570.py} (100%)
 rename eos/effects/{elitebonuscommandshiparmoredcs3.py => effect5572.py} (100%)
 rename eos/effects/{elitebonuscommandshipsiegecs3.py => effect5573.py} (100%)
 rename eos/effects/{elitebonuscommandshipskirmishcs3.py => effect5574.py} (100%)
 rename eos/effects/{elitebonuscommandshipinformationcs3.py => effect5575.py} (100%)
 rename eos/effects/{poweroutputmultiply.py => effect56.py} (100%)
 rename eos/effects/{capacitoremissionsystemskill.py => effect5607.py} (100%)
 rename eos/effects/{shipbonuslargeenergyturretmaxrangeab.py => effect5610.py} (100%)
 rename eos/effects/{shipbonushtfalloffgb2.py => effect5611.py} (100%)
 rename eos/effects/{shipbonusrhmlrof2cb.py => effect5618.py} (100%)
 rename eos/effects/{shipbonusrhmlrofcb.py => effect5619.py} (100%)
 rename eos/effects/{shiphtdmgbonusfixedgc.py => effect562.py} (100%)
 rename eos/effects/{shipbonusrhmlrofmb.py => effect5620.py} (100%)
 rename eos/effects/{shipbonuscruiserofmb.py => effect5621.py} (100%)
 rename eos/effects/{shipbonustorpedorofmb.py => effect5622.py} (100%)
 rename eos/effects/{shipbonuscruisemissileemdmgmb.py => effect5628.py} (100%)
 rename eos/effects/{shipbonuscruisemissilethermdmgmb.py => effect5629.py} (100%)
 rename eos/effects/{shipbonuscruisemissilekineticdmgmb.py => effect5630.py} (100%)
 rename eos/effects/{shipbonuscruisemissileexplodmgmb.py => effect5631.py} (100%)
 rename eos/effects/{shipbonustorpedomissileexplodmgmb.py => effect5632.py} (100%)
 rename eos/effects/{shipbonustorpedomissileemdmgmb.py => effect5633.py} (100%)
 rename eos/effects/{shipbonustorpedomissilethermdmgmb.py => effect5634.py} (100%)
 rename eos/effects/{shipbonustorpedomissilekineticdmgmb.py => effect5635.py} (100%)
 rename eos/effects/{shipbonusheavymissileemdmgmb.py => effect5636.py} (100%)
 rename eos/effects/{shipbonusheavymissilethermdmgmb.py => effect5637.py} (100%)
 rename eos/effects/{shipbonusheavymissilekineticdmgmb.py => effect5638.py} (100%)
 rename eos/effects/{shipbonusheavymissileexplodmgmb.py => effect5639.py} (100%)
 rename eos/effects/{shipbonusmissilevelocitycc2.py => effect5644.py} (100%)
 rename eos/effects/{covertopscloakcpupercentrolebonus.py => effect5647.py} (100%)
 rename eos/effects/{shiparmorresistanceaf1.py => effect5650.py} (100%)
 rename eos/effects/{interceptor2shieldresist.py => effect5657.py} (100%)
 rename eos/effects/{interceptor2projectiledamage.py => effect5673.py} (100%)
 rename eos/effects/{shipbonussmallmissileexplosionradiuscd2.py => effect5676.py} (100%)
 rename eos/effects/{shipbonusmissilevelocityad2.py => effect5688.py} (100%)
 rename eos/effects/{elitebonusinterdictorsarmorresist1.py => effect5695.py} (100%)
 rename eos/effects/{shieldcapacitymultiply.py => effect57.py} (100%)
 rename eos/effects/{implantsetwarpspeed.py => effect5717.py} (100%)
 rename eos/effects/{shipbonusmetoptimalrangepiratefaction.py => effect5721.py} (100%)
 rename eos/effects/{shiphybridoptimalgd1.py => effect5722.py} (100%)
 rename eos/effects/{elitebonusinterdictorsmwdsigradius2.py => effect5723.py} (100%)
 rename eos/effects/{shipshtoptimalbonusgf.py => effect5724.py} (100%)
 rename eos/effects/{shipbonusremoterepairamountpiratefaction.py => effect5725.py} (100%)
 rename eos/effects/{shipbonusletoptimalrangepiratefaction.py => effect5726.py} (100%)
 rename eos/effects/{elitebonusmaraudersheavymissiledamageexprole1.py => effect5733.py} (100%)
 rename eos/effects/{elitebonusmaraudersheavymissiledamagekinrole1.py => effect5734.py} (100%)
 rename eos/effects/{elitebonusmaraudersheavymissiledamageemrole1.py => effect5735.py} (100%)
 rename eos/effects/{elitebonusmaraudersheavymissiledamagethermrole1.py => effect5736.py} (100%)
 rename eos/effects/{shipscanprobestrengthbonuspiratefaction.py => effect5737.py} (100%)
 rename eos/effects/{shipbonusremoterepairrangepiratefaction2.py => effect5738.py} (100%)
 rename eos/effects/{overloadselftrackingmodulebonus.py => effect5754.py} (100%)
 rename eos/effects/{overloadselfsensormodulebonus.py => effect5757.py} (100%)
 rename eos/effects/{overloadselfpainterbonus.py => effect5758.py} (100%)
 rename eos/effects/{repairdronehullbonusbonus.py => effect5769.py} (100%)
 rename eos/effects/{shipmissilerofmf2.py => effect5778.py} (100%)
 rename eos/effects/{shipbonussptfalloffmf2.py => effect5779.py} (100%)
 rename eos/effects/{ewskilltrackingdisruptionrangedisruptionbonus.py => effect5793.py} (100%)
 rename eos/effects/{capacitorcapacitymultiply.py => effect58.py} (100%)
 rename eos/effects/{shipbonusafterburnerspeedfactor2cb.py => effect5802.py} (100%)
 rename eos/effects/{shipbonussentrydronedamagemultiplierpiratefaction.py => effect5803.py} (100%)
 rename eos/effects/{shipbonusheavydronedamagemultiplierpiratefaction.py => effect5804.py} (100%)
 rename eos/effects/{shipbonussentrydronehppiratefaction.py => effect5805.py} (100%)
 rename eos/effects/{shipbonussentrydronearmorhppiratefaction.py => effect5806.py} (100%)
 rename eos/effects/{shipbonussentrydroneshieldhppiratefaction.py => effect5807.py} (100%)
 rename eos/effects/{shipbonusheavydroneshieldhppiratefaction.py => effect5808.py} (100%)
 rename eos/effects/{shipbonusheavydronearmorhppiratefaction.py => effect5809.py} (100%)
 rename eos/effects/{weaponupgradescpuneedbonuspostpercentcpulocationshipmodulesrequiringgunnery.py => effect581.py} (100%)
 rename eos/effects/{shipbonusheavydronehppiratefaction.py => effect5810.py} (100%)
 rename eos/effects/{shipbonuskineticmissiledamagegb2.py => effect5811.py} (100%)
 rename eos/effects/{shipbonusthermalmissiledamagegb2.py => effect5812.py} (100%)
 rename eos/effects/{shipbonusafterburnerspeedfactorcf2.py => effect5813.py} (100%)
 rename eos/effects/{shipbonuskineticmissiledamagegf.py => effect5814.py} (100%)
 rename eos/effects/{shipbonusthermalmissiledamagegf.py => effect5815.py} (100%)
 rename eos/effects/{shipbonuslightdronedamagemultiplierpiratefaction.py => effect5816.py} (100%)
 rename eos/effects/{shipbonuslightdronehppiratefaction.py => effect5817.py} (100%)
 rename eos/effects/{shipbonuslightdronearmorhppiratefaction.py => effect5818.py} (100%)
 rename eos/effects/{shipbonuslightdroneshieldhppiratefaction.py => effect5819.py} (100%)
 rename eos/effects/{rapidfiringrofbonuspostpercentspeedlocationshipmodulesrequiringgunnery.py => effect582.py} (100%)
 rename eos/effects/{shipbonusafterburnerspeedfactorcc2.py => effect5820.py} (100%)
 rename eos/effects/{shipbonusmediumdronedamagemultiplierpiratefaction.py => effect5821.py} (100%)
 rename eos/effects/{shipbonusmediumdronehppiratefaction.py => effect5822.py} (100%)
 rename eos/effects/{shipbonusmediumdronearmorhppiratefaction.py => effect5823.py} (100%)
 rename eos/effects/{shipbonusmediumdroneshieldhppiratefaction.py => effect5824.py} (100%)
 rename eos/effects/{shipbonuskineticmissiledamagegc2.py => effect5825.py} (100%)
 rename eos/effects/{shipbonusthermalmissiledamagegc2.py => effect5826.py} (100%)
 rename eos/effects/{shipbonustdoptimalbonusaf1.py => effect5827.py} (100%)
 rename eos/effects/{shipbonusminingdurationore3.py => effect5829.py} (100%)
 rename eos/effects/{shipbonusminingiceharvestingrangeore2.py => effect5832.py} (100%)
 rename eos/effects/{elitebargeshieldresistance1.py => effect5839.py} (100%)
 rename eos/effects/{surgicalstrikedamagemultiplierbonuspostpercentdamagemultiplierlocationshipmodulesrequiringgunnery.py => effect584.py} (100%)
 rename eos/effects/{elitebargebonusminingdurationbarge2.py => effect5840.py} (100%)
 rename eos/effects/{elitebonusexpeditionmining1.py => effect5852.py} (100%)
 rename eos/effects/{elitebonusexpeditionsigradius2.py => effect5853.py} (100%)
 rename eos/effects/{shipmissileemdamagecb.py => effect5862.py} (100%)
 rename eos/effects/{shipmissilekindamagecb.py => effect5863.py} (100%)
 rename eos/effects/{shipmissilethermdamagecb.py => effect5864.py} (100%)
 rename eos/effects/{shipmissileexplodamagecb.py => effect5865.py} (100%)
 rename eos/effects/{shipbonuswarpscramblemaxrangegb.py => effect5866.py} (100%)
 rename eos/effects/{shipbonusmissileexplosiondelaypiratefaction2.py => effect5867.py} (100%)
 rename eos/effects/{drawbackcargocapacity.py => effect5868.py} (100%)
 rename eos/effects/{eliteindustrialwarpspeedbonus1.py => effect5869.py} (100%)
 rename eos/effects/{surgicalstrikedamagemultiplierbonuspostpercentdamagemultiplierlocationshipgroupenergyweapon.py => effect587.py} (100%)
 rename eos/effects/{shipbonusshieldboostci2.py => effect5870.py} (100%)
 rename eos/effects/{shipbonusshieldboostmi2.py => effect5871.py} (100%)
 rename eos/effects/{shipbonusarmorrepairai2.py => effect5872.py} (100%)
 rename eos/effects/{shipbonusarmorrepairgi2.py => effect5873.py} (100%)
 rename eos/effects/{eliteindustrialfleetcapacity1.py => effect5874.py} (100%)
 rename eos/effects/{surgicalstrikedamagemultiplierbonuspostpercentdamagemultiplierlocationshipgroupprojectileweapon.py => effect588.py} (100%)
 rename eos/effects/{eliteindustrialshieldresists2.py => effect5881.py} (100%)
 rename eos/effects/{eliteindustrialarmorresists2.py => effect5888.py} (100%)
 rename eos/effects/{eliteindustrialabheatbonus.py => effect5889.py} (100%)
 rename eos/effects/{surgicalstrikedamagemultiplierbonuspostpercentdamagemultiplierlocationshipgrouphybridweapon.py => effect589.py} (100%)
 rename eos/effects/{eliteindustrialmwdheatbonus.py => effect5890.py} (100%)
 rename eos/effects/{eliteindustrialarmorhardenerheatbonus.py => effect5891.py} (100%)
 rename eos/effects/{eliteindustrialreactivearmorhardenerheatbonus.py => effect5892.py} (100%)
 rename eos/effects/{eliteindustrialshieldhardenerheatbonus.py => effect5893.py} (100%)
 rename eos/effects/{eliteindustrialshieldboosterheatbonus.py => effect5896.py} (100%)
 rename eos/effects/{eliteindustrialarmorrepairheatbonus.py => effect5899.py} (100%)
 rename eos/effects/{cargocapacitymultiply.py => effect59.py} (100%)
 rename eos/effects/{energypulseweaponsdurationbonuspostpercentdurationlocationshipmodulesrequiringenergypulseweapons.py => effect590.py} (100%)
 rename eos/effects/{warpspeedaddition.py => effect5900.py} (100%)
 rename eos/effects/{rolebonusbulkheadcpu.py => effect5901.py} (100%)
 rename eos/effects/{onlinejumpdriveconsumptionamountbonuspercentage.py => effect5911.py} (100%)
 rename eos/effects/{systemremotecaptransmitteramount.py => effect5912.py} (100%)
 rename eos/effects/{systemarmorhp.py => effect5913.py} (100%)
 rename eos/effects/{systemenergyneutmultiplier.py => effect5914.py} (100%)
 rename eos/effects/{systemenergyvampiremultiplier.py => effect5915.py} (100%)
 rename eos/effects/{systemdamageexplosivebombs.py => effect5916.py} (100%)
 rename eos/effects/{systemdamagekineticbombs.py => effect5917.py} (100%)
 rename eos/effects/{systemdamagethermalbombs.py => effect5918.py} (100%)
 rename eos/effects/{systemdamageembombs.py => effect5919.py} (100%)
 rename eos/effects/{systemaoecloudsize.py => effect5920.py} (100%)
 rename eos/effects/{systemtargetpaintermultiplier.py => effect5921.py} (100%)
 rename eos/effects/{systemwebifierstrengthmultiplier.py => effect5922.py} (100%)
 rename eos/effects/{systemneutbombs.py => effect5923.py} (100%)
 rename eos/effects/{systemgravimetricecmbomb.py => effect5924.py} (100%)
 rename eos/effects/{systemladarecmbomb.py => effect5925.py} (100%)
 rename eos/effects/{systemmagnetrometricecmbomb.py => effect5926.py} (100%)
 rename eos/effects/{systemradarecmbomb.py => effect5927.py} (100%)
 rename eos/effects/{systemdronetracking.py => effect5929.py} (100%)
 rename eos/effects/{warpscrambleblockmwdwithnpceffect.py => effect5934.py} (100%)
 rename eos/effects/{shipbonussmallmissileexplosionradiuscf2.py => effect5938.py} (100%)
 rename eos/effects/{shiprocketrofbonusaf2.py => effect5939.py} (100%)
 rename eos/effects/{elitebonusinterdictorsshtrof1.py => effect5940.py} (100%)
 rename eos/effects/{shipmissilelauncherrofad1fixed.py => effect5944.py} (100%)
 rename eos/effects/{cloakingprototype.py => effect5945.py} (100%)
 rename eos/effects/{drawbackwarpspeed.py => effect5951.py} (100%)
 rename eos/effects/{shipmetdamagebonusac2.py => effect5956.py} (100%)
 rename eos/effects/{elitebonusheavyinterdictorsmetoptimal.py => effect5957.py} (100%)
 rename eos/effects/{shiphybridtrackinggc.py => effect5958.py} (100%)
 rename eos/effects/{elitebonusheavyinterdictorshybridoptimal1.py => effect5959.py} (100%)
 rename eos/effects/{ammoinfluencerange.py => effect596.py} (100%)
 rename eos/effects/{ammospeedmultiplier.py => effect598.py} (100%)
 rename eos/effects/{ammofallofmultiplier.py => effect599.py} (100%)
 rename eos/effects/{resistancekillerhullall.py => effect5994.py} (100%)
 rename eos/effects/{resistancekillershieldarmorall.py => effect5995.py} (100%)
 rename eos/effects/{freightersmacapacitybonuso1.py => effect5998.py} (100%)
 rename eos/effects/{structurehpmultiply.py => effect60.py} (100%)
 rename eos/effects/{ammotrackingmultiplier.py => effect600.py} (100%)
 rename eos/effects/{freighteragilitybonus2o2.py => effect6001.py} (100%)
 rename eos/effects/{shipsetdamageamarrtacticaldestroyer1.py => effect6006.py} (100%)
 rename eos/effects/{shipsetcapneedamarrtacticaldestroyer2.py => effect6007.py} (100%)
 rename eos/effects/{shipheatdamageamarrtacticaldestroyer3.py => effect6008.py} (100%)
 rename eos/effects/{probelaunchercpupercentrolebonust3.py => effect6009.py} (100%)
 rename eos/effects/{shipmodemaxtargetrangepostdiv.py => effect6010.py} (100%)
 rename eos/effects/{shipmodesetoptimalrangepostdiv.py => effect6011.py} (100%)
 rename eos/effects/{shipmodescanstrengthpostdiv.py => effect6012.py} (100%)
 rename eos/effects/{modesigradiuspostdiv.py => effect6014.py} (100%)
 rename eos/effects/{modearmorresonancepostdiv.py => effect6015.py} (100%)
 rename eos/effects/{modeagilitypostdiv.py => effect6016.py} (100%)
 rename eos/effects/{modevelocitypostdiv.py => effect6017.py} (100%)
 rename eos/effects/{shippturretspeedbonusmc.py => effect602.py} (100%)
 rename eos/effects/{shipbonusenergyneutoptimalrs3.py => effect6020.py} (100%)
 rename eos/effects/{shipbonusenergynosoptimalrs3.py => effect6021.py} (100%)
 rename eos/effects/{elitereconbonusmhtoptimalrange1.py => effect6025.py} (100%)
 rename eos/effects/{elitereconbonusmptdamage1.py => effect6027.py} (100%)
 rename eos/effects/{remotecapacitortransmitterpowerneedbonuseffect.py => effect6032.py} (100%)
 rename eos/effects/{shipheatdamageminmatartacticaldestroyer3.py => effect6036.py} (100%)
 rename eos/effects/{shipsptdamageminmatartacticaldestroyer1.py => effect6037.py} (100%)
 rename eos/effects/{shipsptoptimalminmatartacticaldestroyer2.py => effect6038.py} (100%)
 rename eos/effects/{shipmodespttrackingpostdiv.py => effect6039.py} (100%)
 rename eos/effects/{shipptspeedbonusmb2.py => effect604.py} (100%)
 rename eos/effects/{modemwdsigradiuspostdiv.py => effect6040.py} (100%)
 rename eos/effects/{modeshieldresonancepostdiv.py => effect6041.py} (100%)
 rename eos/effects/{shipbonussentrydamagemultipliergc3.py => effect6045.py} (100%)
 rename eos/effects/{shipbonussentryhpgc3.py => effect6046.py} (100%)
 rename eos/effects/{shipbonussentryarmorhpgc3.py => effect6047.py} (100%)
 rename eos/effects/{shipbonussentryshieldhpgc3.py => effect6048.py} (100%)
 rename eos/effects/{shipbonuslightdronedamagemultipliergc2.py => effect6051.py} (100%)
 rename eos/effects/{shipbonusmediumdronedamagemultipliergc2.py => effect6052.py} (100%)
 rename eos/effects/{shipbonusheavydronedamagemultipliergc2.py => effect6053.py} (100%)
 rename eos/effects/{shipbonusheavydronehpgc2.py => effect6054.py} (100%)
 rename eos/effects/{shipbonusheavydronearmorhpgc2.py => effect6055.py} (100%)
 rename eos/effects/{shipbonusheavydroneshieldhpgc2.py => effect6056.py} (100%)
 rename eos/effects/{shipbonusmediumdroneshieldhpgc2.py => effect6057.py} (100%)
 rename eos/effects/{shipbonusmediumdronearmorhpgc2.py => effect6058.py} (100%)
 rename eos/effects/{shipbonusmediumdronehpgc2.py => effect6059.py} (100%)
 rename eos/effects/{shipbonuslightdronehpgc2.py => effect6060.py} (100%)
 rename eos/effects/{shipbonuslightdronearmorhpgc2.py => effect6061.py} (100%)
 rename eos/effects/{shipbonuslightdroneshieldhpgc2.py => effect6062.py} (100%)
 rename eos/effects/{entosislink.py => effect6063.py} (100%)
 rename eos/effects/{cloaking.py => effect607.py} (100%)
 rename eos/effects/{shipmodemissilevelocitypostdiv.py => effect6076.py} (100%)
 rename eos/effects/{shipheatdamagecaldaritacticaldestroyer3.py => effect6077.py} (100%)
 rename eos/effects/{shipsmallmissiledmgpiratefaction.py => effect6083.py} (100%)
 rename eos/effects/{shipmissilerofcaldaritacticaldestroyer1.py => effect6085.py} (100%)
 rename eos/effects/{shipbonusheavyassaultmissilealldamagemc2.py => effect6088.py} (100%)
 rename eos/effects/{shipbonusheavymissilealldamagemc2.py => effect6093.py} (100%)
 rename eos/effects/{shipbonuslightmissilealldamagemc2.py => effect6096.py} (100%)
 rename eos/effects/{shipmissilereloadtimecaldaritacticaldestroyer2.py => effect6098.py} (100%)
 rename eos/effects/{agilitybonus.py => effect61.py} (100%)
 rename eos/effects/{entosisdurationmultiply.py => effect6104.py} (100%)
 rename eos/effects/{missilevelocitybonusonline.py => effect6110.py} (100%)
 rename eos/effects/{missileexplosiondelaybonusonline.py => effect6111.py} (100%)
 rename eos/effects/{missileaoecloudsizebonusonline.py => effect6112.py} (100%)
 rename eos/effects/{missileaoevelocitybonusonline.py => effect6113.py} (100%)
 rename eos/effects/{scriptmissileguidancecomputeraoecloudsizebonusbonus.py => effect6128.py} (100%)
 rename eos/effects/{scriptmissileguidancecomputeraoevelocitybonusbonus.py => effect6129.py} (100%)
 rename eos/effects/{scriptmissileguidancecomputermissilevelocitybonusbonus.py => effect6130.py} (100%)
 rename eos/effects/{scriptmissileguidancecomputerexplosiondelaybonusbonus.py => effect6131.py} (100%)
 rename eos/effects/{missileguidancecomputerbonus4.py => effect6135.py} (100%)
 rename eos/effects/{overloadselfmissileguidancebonus5.py => effect6144.py} (100%)
 rename eos/effects/{shipheatdamagegallentetacticaldestroyer3.py => effect6148.py} (100%)
 rename eos/effects/{shipshtrofgallentetacticaldestroyer1.py => effect6149.py} (100%)
 rename eos/effects/{shipshttrackinggallentetacticaldestroyer2.py => effect6150.py} (100%)
 rename eos/effects/{modehullresonancepostdiv.py => effect6151.py} (100%)
 rename eos/effects/{shipmodeshtoptimalrangepostdiv.py => effect6152.py} (100%)
 rename eos/effects/{modemwdcappostdiv.py => effect6153.py} (100%)
 rename eos/effects/{modemwdboostpostdiv.py => effect6154.py} (100%)
 rename eos/effects/{modearmorrepdurationpostdiv.py => effect6155.py} (100%)
 rename eos/effects/{passivespeedlimit.py => effect6163.py} (100%)
 rename eos/effects/{systemmaxvelocitypercentage.py => effect6164.py} (100%)
 rename eos/effects/{shipbonuswdfgnullpenalties.py => effect6166.py} (100%)
 rename eos/effects/{entosiscpupenalty.py => effect6170.py} (100%)
 rename eos/effects/{entosiscpuaddition.py => effect6171.py} (100%)
 rename eos/effects/{battlecruisermetrange.py => effect6172.py} (100%)
 rename eos/effects/{battlecruisermhtrange.py => effect6173.py} (100%)
 rename eos/effects/{battlecruisermptrange.py => effect6174.py} (100%)
 rename eos/effects/{battlecruisermissilerange.py => effect6175.py} (100%)
 rename eos/effects/{battlecruiserdronespeed.py => effect6176.py} (100%)
 rename eos/effects/{shiphybriddmg1cbc2.py => effect6177.py} (100%)
 rename eos/effects/{shipbonusprojectiletrackingmbc2.py => effect6178.py} (100%)
 rename eos/effects/{shipmoduleremotecapacitortransmitter.py => effect6184.py} (100%)
 rename eos/effects/{shipmoduleremotehullrepairer.py => effect6185.py} (100%)
 rename eos/effects/{shipmoduleremoteshieldbooster.py => effect6186.py} (100%)
 rename eos/effects/{energyneutralizerfalloff.py => effect6187.py} (100%)
 rename eos/effects/{shipmoduleremotearmorrepairer.py => effect6188.py} (100%)
 rename eos/effects/{expeditionfrigateshieldresistance1.py => effect6195.py} (100%)
 rename eos/effects/{expeditionfrigatebonusiceharvestingcycletime2.py => effect6196.py} (100%)
 rename eos/effects/{energynosferatufalloff.py => effect6197.py} (100%)
 rename eos/effects/{doomsdayslash.py => effect6201.py} (100%)
 rename eos/effects/{microjumpportaldrive.py => effect6208.py} (100%)
 rename eos/effects/{rolebonuscdlinkspgreduction.py => effect6214.py} (100%)
 rename eos/effects/{structureenergyneutralizerfalloff.py => effect6216.py} (100%)
 rename eos/effects/{structurewarpscrambleblockmwdwithnpceffect.py => effect6222.py} (100%)
 rename eos/effects/{miningdroneoperationminingamountbonuspostpercentminingdroneamountpercentchar.py => effect623.py} (100%)
 rename eos/effects/{shipbonusenergyneutoptimalrs1.py => effect6230.py} (100%)
 rename eos/effects/{shipbonusenergyneutfalloffrs2.py => effect6232.py} (100%)
 rename eos/effects/{shipbonusenergyneutfalloffrs3.py => effect6233.py} (100%)
 rename eos/effects/{shipbonusenergynosoptimalrs1.py => effect6234.py} (100%)
 rename eos/effects/{shipbonusenergynosfalloffrs2.py => effect6237.py} (100%)
 rename eos/effects/{shipbonusenergynosfalloffrs3.py => effect6238.py} (100%)
 rename eos/effects/{miningfrigatebonusiceharvestingcycletime2.py => effect6239.py} (100%)
 rename eos/effects/{shipbonusenergyneutfalloffad1.py => effect6241.py} (100%)
 rename eos/effects/{shipbonusenergyneutoptimalad2.py => effect6242.py} (100%)
 rename eos/effects/{shipbonusenergynosoptimalad2.py => effect6245.py} (100%)
 rename eos/effects/{shipbonusenergynosfalloffad1.py => effect6246.py} (100%)
 rename eos/effects/{shipbonusenergyneutoptimalab.py => effect6253.py} (100%)
 rename eos/effects/{shipbonusenergyneutfalloffab2.py => effect6256.py} (100%)
 rename eos/effects/{shipbonusenergynosoptimalab.py => effect6257.py} (100%)
 rename eos/effects/{shipbonusenergynosfalloffab2.py => effect6260.py} (100%)
 rename eos/effects/{shipbonusenergyneutoptimaleaf1.py => effect6267.py} (100%)
 rename eos/effects/{powerincrease.py => effect627.py} (100%)
 rename eos/effects/{shipbonusenergyneutfalloffeaf3.py => effect6272.py} (100%)
 rename eos/effects/{shipbonusenergynosoptimaleaf1.py => effect6273.py} (100%)
 rename eos/effects/{shipbonusenergynosfalloffeaf3.py => effect6278.py} (100%)
 rename eos/effects/{shipbonusenergyneutoptimalaf2.py => effect6281.py} (100%)
 rename eos/effects/{shipbonusenergyneutfalloffaf3.py => effect6285.py} (100%)
 rename eos/effects/{shipbonusenergynosoptimalaf2.py => effect6287.py} (100%)
 rename eos/effects/{shipbonusenergynosfalloffaf3.py => effect6291.py} (100%)
 rename eos/effects/{shipbonusenergyneutoptimalac1.py => effect6294.py} (100%)
 rename eos/effects/{shipbonusenergyneutfalloffac3.py => effect6299.py} (100%)
 rename eos/effects/{armorhpmultiply.py => effect63.py} (100%)
 rename eos/effects/{shipbonusenergynosoptimalac1.py => effect6300.py} (100%)
 rename eos/effects/{shipbonusnosoptimalfalloffac2.py => effect6301.py} (100%)
 rename eos/effects/{shipbonusenergynosfalloffac3.py => effect6305.py} (100%)
 rename eos/effects/{shipbonusthermmissiledmgmd1.py => effect6307.py} (100%)
 rename eos/effects/{shipbonusemmissiledmgmd1.py => effect6308.py} (100%)
 rename eos/effects/{shipbonuskineticmissiledmgmd1.py => effect6309.py} (100%)
 rename eos/effects/{shipbonusexplosivemissiledmgmd1.py => effect6310.py} (100%)
 rename eos/effects/{elitebonuscommanddestroyerskirmish1.py => effect6315.py} (100%)
 rename eos/effects/{elitebonuscommanddestroyershield1.py => effect6316.py} (100%)
 rename eos/effects/{elitebonuscommanddestroyermjfgspool2.py => effect6317.py} (100%)
 rename eos/effects/{shipbonusemshieldresistancemd2.py => effect6318.py} (100%)
 rename eos/effects/{shipbonuskineticshieldresistancemd2.py => effect6319.py} (100%)
 rename eos/effects/{shipbonusthermalshieldresistancemd2.py => effect6320.py} (100%)
 rename eos/effects/{shipbonusexplosiveshieldresistancemd2.py => effect6321.py} (100%)
 rename eos/effects/{scriptscangravimetricstrengthbonusbonus.py => effect6322.py} (100%)
 rename eos/effects/{scriptscanladarstrengthbonusbonus.py => effect6323.py} (100%)
 rename eos/effects/{scriptscanmagnetometricstrengthbonusbonus.py => effect6324.py} (100%)
 rename eos/effects/{scriptscanradarstrengthbonusbonus.py => effect6325.py} (100%)
 rename eos/effects/{shipbonusthermalmissiledamagecd1.py => effect6326.py} (100%)
 rename eos/effects/{shipbonusemmissiledamagecd1.py => effect6327.py} (100%)
 rename eos/effects/{shipbonuskineticmissiledamagecd1.py => effect6328.py} (100%)
 rename eos/effects/{shipbonusexplosivemissiledamagecd1.py => effect6329.py} (100%)
 rename eos/effects/{shipbonusshieldemresistancecd2.py => effect6330.py} (100%)
 rename eos/effects/{shipbonusshieldthermalresistancecd2.py => effect6331.py} (100%)
 rename eos/effects/{shipbonusshieldkineticresistancecd2.py => effect6332.py} (100%)
 rename eos/effects/{shipbonusshieldexplosiveresistancecd2.py => effect6333.py} (100%)
 rename eos/effects/{elitebonuscommanddestroyerinfo1.py => effect6334.py} (100%)
 rename eos/effects/{shipbonuskineticarmorresistancead2.py => effect6335.py} (100%)
 rename eos/effects/{shipbonusthermalarmorresistancead2.py => effect6336.py} (100%)
 rename eos/effects/{shipbonusemarmorresistancead2.py => effect6337.py} (100%)
 rename eos/effects/{shipbonusexplosivearmorresistancead2.py => effect6338.py} (100%)
 rename eos/effects/{elitebonuscommanddestroyerarmored1.py => effect6339.py} (100%)
 rename eos/effects/{shipbonuskineticarmorresistancegd2.py => effect6340.py} (100%)
 rename eos/effects/{shipbonusemarmorresistancegd2.py => effect6341.py} (100%)
 rename eos/effects/{shipbonusthermalarmorresistancegd2.py => effect6342.py} (100%)
 rename eos/effects/{shipbonusexplosivearmorresistancegd2.py => effect6343.py} (100%)
 rename eos/effects/{shipsmallmissilekindmgcf3.py => effect6350.py} (100%)
 rename eos/effects/{shipmissilekindamagecc3.py => effect6351.py} (100%)
 rename eos/effects/{rolebonuswdrange.py => effect6352.py} (100%)
 rename eos/effects/{rolebonuswdcapcpu.py => effect6353.py} (100%)
 rename eos/effects/{shipbonusewweapondisruptionstrengthaf2.py => effect6354.py} (100%)
 rename eos/effects/{rolebonusecmcapcpu.py => effect6355.py} (100%)
 rename eos/effects/{rolebonusecmrange.py => effect6356.py} (100%)
 rename eos/effects/{shipbonusjustscramblerrangegf2.py => effect6357.py} (100%)
 rename eos/effects/{rolebonusjustscramblerstrength.py => effect6358.py} (100%)
 rename eos/effects/{shipbonusaoevelocityrocketsmf.py => effect6359.py} (100%)
 rename eos/effects/{shiprocketemthermkindmgmf2.py => effect6360.py} (100%)
 rename eos/effects/{shiprocketexpdmgmf3.py => effect6361.py} (100%)
 rename eos/effects/{rolebonusstasisrange.py => effect6362.py} (100%)
 rename eos/effects/{shieldtransporterfalloffbonus.py => effect6368.py} (100%)
 rename eos/effects/{shipshieldtransferfalloffmc2.py => effect6369.py} (100%)
 rename eos/effects/{shipshieldtransferfalloffcc1.py => effect6370.py} (100%)
 rename eos/effects/{shipremotearmorfalloffgc1.py => effect6371.py} (100%)
 rename eos/effects/{shipremotearmorfalloffac2.py => effect6372.py} (100%)
 rename eos/effects/{armorrepairprojectorfalloffbonus.py => effect6373.py} (100%)
 rename eos/effects/{dronehullrepairbonuseffect.py => effect6374.py} (100%)
 rename eos/effects/{elitebonuslogifrigarmorrepspeedcap1.py => effect6377.py} (100%)
 rename eos/effects/{elitebonuslogifrigshieldrepspeedcap1.py => effect6378.py} (100%)
 rename eos/effects/{elitebonuslogifrigarmorhp2.py => effect6379.py} (100%)
 rename eos/effects/{elitebonuslogifrigshieldhp2.py => effect6380.py} (100%)
 rename eos/effects/{elitebonuslogifrigsignature2.py => effect6381.py} (100%)
 rename eos/effects/{overloadselfmissileguidancemodulebonus.py => effect6384.py} (100%)
 rename eos/effects/{ignorecloakvelocitypenalty.py => effect6385.py} (100%)
 rename eos/effects/{ewskillguidancedisruptionbonus.py => effect6386.py} (100%)
 rename eos/effects/{shipbonusewweapondisruptionstrengthac1.py => effect6395.py} (100%)
 rename eos/effects/{skillstructuremissiledamagebonus.py => effect6396.py} (100%)
 rename eos/effects/{skillstructureelectronicsystemscapneedbonus.py => effect6400.py} (100%)
 rename eos/effects/{skillstructureengineeringsystemscapneedbonus.py => effect6401.py} (100%)
 rename eos/effects/{structurerigaoevelocitybonussingletargetmissiles.py => effect6402.py} (100%)
 rename eos/effects/{structurerigvelocitybonussingletargetmissiles.py => effect6403.py} (100%)
 rename eos/effects/{structurerigneutralizermaxrangefalloffeffectiveness.py => effect6404.py} (100%)
 rename eos/effects/{structurerigneutralizercapacitorneed.py => effect6405.py} (100%)
 rename eos/effects/{structurerigewmaxrangefalloff.py => effect6406.py} (100%)
 rename eos/effects/{structurerigewcapacitorneed.py => effect6407.py} (100%)
 rename eos/effects/{structurerigmaxtargets.py => effect6408.py} (100%)
 rename eos/effects/{structurerigsensorresolution.py => effect6409.py} (100%)
 rename eos/effects/{structurerigexplosionradiusbonusaoemissiles.py => effect6410.py} (100%)
 rename eos/effects/{structurerigvelocitybonusaoemissiles.py => effect6411.py} (100%)
 rename eos/effects/{structurerigpdbmaxrange.py => effect6412.py} (100%)
 rename eos/effects/{structurerigpdbcapacitorneed.py => effect6413.py} (100%)
 rename eos/effects/{structurerigdoomsdaydamageloss.py => effect6417.py} (100%)
 rename eos/effects/{remotesensordampfalloff.py => effect6422.py} (100%)
 rename eos/effects/{shipmoduleguidancedisruptor.py => effect6423.py} (100%)
 rename eos/effects/{shipmoduletrackingdisruptor.py => effect6424.py} (100%)
 rename eos/effects/{remotetargetpaintfalloff.py => effect6425.py} (100%)
 rename eos/effects/{remotewebifierfalloff.py => effect6426.py} (100%)
 rename eos/effects/{remotesensorboostfalloff.py => effect6427.py} (100%)
 rename eos/effects/{shipmoduleremotetrackingcomputer.py => effect6428.py} (100%)
 rename eos/effects/{fighterabilitymissiles.py => effect6431.py} (100%)
 rename eos/effects/{fighterabilityenergyneutralizer.py => effect6434.py} (100%)
 rename eos/effects/{fighterabilitystasiswebifier.py => effect6435.py} (100%)
 rename eos/effects/{fighterabilitywarpdisruption.py => effect6436.py} (100%)
 rename eos/effects/{fighterabilityecm.py => effect6437.py} (100%)
 rename eos/effects/{fighterabilityevasivemaneuvers.py => effect6439.py} (100%)
 rename eos/effects/{fighterabilitymicrowarpdrive.py => effect6441.py} (100%)
 rename eos/effects/{pointdefense.py => effect6443.py} (100%)
 rename eos/effects/{lightningweapon.py => effect6447.py} (100%)
 rename eos/effects/{structuremissileguidanceenhancer.py => effect6448.py} (100%)
 rename eos/effects/{structureballisticcontrolsystem.py => effect6449.py} (100%)
 rename eos/effects/{fighterabilityattackm.py => effect6465.py} (100%)
 rename eos/effects/{remoteecmfalloff.py => effect6470.py} (100%)
 rename eos/effects/{doomsdaybeamdot.py => effect6472.py} (100%)
 rename eos/effects/{doomsdayconedot.py => effect6473.py} (100%)
 rename eos/effects/{doomsdayhog.py => effect6474.py} (100%)
 rename eos/effects/{structurerigdoomsdaytargetamountbonus.py => effect6475.py} (100%)
 rename eos/effects/{doomsdayaoeweb.py => effect6476.py} (100%)
 rename eos/effects/{doomsdayaoeneut.py => effect6477.py} (100%)
 rename eos/effects/{doomsdayaoepaint.py => effect6478.py} (100%)
 rename eos/effects/{doomsdayaoetrack.py => effect6479.py} (100%)
 rename eos/effects/{doomsdayaoedamp.py => effect6481.py} (100%)
 rename eos/effects/{doomsdayaoebubble.py => effect6482.py} (100%)
 rename eos/effects/{emergencyhullenergizer.py => effect6484.py} (100%)
 rename eos/effects/{fighterabilitylaunchbomb.py => effect6485.py} (100%)
 rename eos/effects/{modifyenergywarfareresistance.py => effect6487.py} (100%)
 rename eos/effects/{scriptsensorboostersensorstrengthbonusbonus.py => effect6488.py} (100%)
 rename eos/effects/{shipbonusdreadnoughta1damagebonus.py => effect6501.py} (100%)
 rename eos/effects/{shipbonusdreadnoughta2armorresists.py => effect6502.py} (100%)
 rename eos/effects/{shipbonusdreadnoughta3capneed.py => effect6503.py} (100%)
 rename eos/effects/{shipbonusdreadnoughtc1damagebonus.py => effect6504.py} (100%)
 rename eos/effects/{shipbonusdreadnoughtc2shieldresists.py => effect6505.py} (100%)
 rename eos/effects/{shipbonusdreadnoughtg1damagebonus.py => effect6506.py} (100%)
 rename eos/effects/{shipbonusdreadnoughtg2rofbonus.py => effect6507.py} (100%)
 rename eos/effects/{shipbonusdreadnoughtg3repairtime.py => effect6508.py} (100%)
 rename eos/effects/{shipbonusdreadnoughtm1damagebonus.py => effect6509.py} (100%)
 rename eos/effects/{shipbonusdreadnoughtm2rofbonus.py => effect6510.py} (100%)
 rename eos/effects/{shipbonusdreadnoughtm3repairtime.py => effect6511.py} (100%)
 rename eos/effects/{doomsdayaoeecm.py => effect6513.py} (100%)
 rename eos/effects/{shipbonusforceauxiliarya1remoterepairandcapamount.py => effect6526.py} (100%)
 rename eos/effects/{shipbonusforceauxiliarya2armorresists.py => effect6527.py} (100%)
 rename eos/effects/{shipbonusforceauxiliarya4warfarelinksbonus.py => effect6533.py} (100%)
 rename eos/effects/{shipbonusforceauxiliarym4warfarelinksbonus.py => effect6534.py} (100%)
 rename eos/effects/{shipbonusforceauxiliaryg4warfarelinksbonus.py => effect6535.py} (100%)
 rename eos/effects/{shipbonusforceauxiliaryc4warfarelinksbonus.py => effect6536.py} (100%)
 rename eos/effects/{shipbonusrole1commandburstcpubonus.py => effect6537.py} (100%)
 rename eos/effects/{shipbonusforceauxiliaryc1remoteboostandcapamount.py => effect6545.py} (100%)
 rename eos/effects/{shipbonusforceauxiliaryc2shieldresists.py => effect6546.py} (100%)
 rename eos/effects/{shipbonusforceauxiliaryg1remotecycletime.py => effect6548.py} (100%)
 rename eos/effects/{shipbonusforceauxiliaryg2localrepairamount.py => effect6549.py} (100%)
 rename eos/effects/{shipbonusforceauxiliarym1remoteduration.py => effect6551.py} (100%)
 rename eos/effects/{shipbonusforceauxiliarym2localboostamount.py => effect6552.py} (100%)
 rename eos/effects/{modulebonusdronenavigationcomputer.py => effect6555.py} (100%)
 rename eos/effects/{modulebonusdronedamageamplifier.py => effect6556.py} (100%)
 rename eos/effects/{modulebonusomnidirectionaltrackinglink.py => effect6557.py} (100%)
 rename eos/effects/{modulebonusomnidirectionaltrackinglinkoverload.py => effect6558.py} (100%)
 rename eos/effects/{modulebonusomnidirectionaltrackingenhancer.py => effect6559.py} (100%)
 rename eos/effects/{skillbonusfighters.py => effect6560.py} (100%)
 rename eos/effects/{skillbonuslightfighters.py => effect6561.py} (100%)
 rename eos/effects/{skillbonussupportfightersshield.py => effect6562.py} (100%)
 rename eos/effects/{skillbonusheavyfighters.py => effect6563.py} (100%)
 rename eos/effects/{citadelrigbonus.py => effect6565.py} (100%)
 rename eos/effects/{modulebonusfightersupportunit.py => effect6566.py} (100%)
 rename eos/effects/{modulebonusnetworkedsensorarray.py => effect6567.py} (100%)
 rename eos/effects/{agilitymultipliereffect.py => effect657.py} (100%)
 rename eos/effects/{skillbonusfighterhangarmanagement.py => effect6570.py} (100%)
 rename eos/effects/{skillbonuscapitalautocannonspecialization.py => effect6571.py} (100%)
 rename eos/effects/{skillbonuscapitalartilleryspecialization.py => effect6572.py} (100%)
 rename eos/effects/{skillbonuscapitalblasterspecialization.py => effect6573.py} (100%)
 rename eos/effects/{skillbonuscapitalrailgunspecialization.py => effect6574.py} (100%)
 rename eos/effects/{skillbonuscapitalpulselaserspecialization.py => effect6575.py} (100%)
 rename eos/effects/{skillbonuscapitalbeamlaserspecialization.py => effect6576.py} (100%)
 rename eos/effects/{skillbonusxlcruisemissilespecialization.py => effect6577.py} (100%)
 rename eos/effects/{skillbonusxltorpedospecialization.py => effect6578.py} (100%)
 rename eos/effects/{shipbonusrole2logisticdronerepamountbonus.py => effect6580.py} (100%)
 rename eos/effects/{modulebonustriagemodule.py => effect6581.py} (100%)
 rename eos/effects/{modulebonussiegemodule.py => effect6582.py} (100%)
 rename eos/effects/{shipbonussupercarriera3warpstrength.py => effect6591.py} (100%)
 rename eos/effects/{shipbonussupercarrierc3warpstrength.py => effect6592.py} (100%)
 rename eos/effects/{shipbonussupercarrierg3warpstrength.py => effect6593.py} (100%)
 rename eos/effects/{shipbonussupercarrierm3warpstrength.py => effect6594.py} (100%)
 rename eos/effects/{shipbonuscarriera4warfarelinksbonus.py => effect6595.py} (100%)
 rename eos/effects/{shipbonuscarrierc4warfarelinksbonus.py => effect6596.py} (100%)
 rename eos/effects/{shipbonuscarrierg4warfarelinksbonus.py => effect6597.py} (100%)
 rename eos/effects/{shipbonuscarrierm4warfarelinksbonus.py => effect6598.py} (100%)
 rename eos/effects/{shipbonuscarriera1armorresists.py => effect6599.py} (100%)
 rename eos/effects/{missileemdmgbonus.py => effect660.py} (100%)
 rename eos/effects/{shipbonuscarrierc1shieldresists.py => effect6600.py} (100%)
 rename eos/effects/{shipbonuscarrierg1fighterdamage.py => effect6601.py} (100%)
 rename eos/effects/{shipbonuscarrierm1fighterdamage.py => effect6602.py} (100%)
 rename eos/effects/{shipbonussupercarriera1fighterdamage.py => effect6603.py} (100%)
 rename eos/effects/{shipbonussupercarrierc1fighterdamage.py => effect6604.py} (100%)
 rename eos/effects/{shipbonussupercarrierg1fighterdamage.py => effect6605.py} (100%)
 rename eos/effects/{shipbonussupercarrierm1fighterdamage.py => effect6606.py} (100%)
 rename eos/effects/{shipbonussupercarriera5warfarelinksbonus.py => effect6607.py} (100%)
 rename eos/effects/{shipbonussupercarrierc5warfarelinksbonus.py => effect6608.py} (100%)
 rename eos/effects/{shipbonussupercarrierg5warfarelinksbonus.py => effect6609.py} (100%)
 rename eos/effects/{missileexplosivedmgbonus.py => effect661.py} (100%)
 rename eos/effects/{shipbonussupercarrierm5warfarelinksbonus.py => effect6610.py} (100%)
 rename eos/effects/{shipbonussupercarrierc2afterburnerbonus.py => effect6611.py} (100%)
 rename eos/effects/{shipbonussupercarriera2fighterapplicationbonus.py => effect6612.py} (100%)
 rename eos/effects/{shipbonussupercarrierrole1numwarfarelinks.py => effect6613.py} (100%)
 rename eos/effects/{shipbonussupercarrierrole2armorshieldmodulebonus.py => effect6614.py} (100%)
 rename eos/effects/{shipbonussupercarriera4burstprojectorbonus.py => effect6615.py} (100%)
 rename eos/effects/{shipbonussupercarrierc4burstprojectorbonus.py => effect6616.py} (100%)
 rename eos/effects/{shipbonussupercarrierg4burstprojectorbonus.py => effect6617.py} (100%)
 rename eos/effects/{shipbonussupercarrierm4burstprojectorbonus.py => effect6618.py} (100%)
 rename eos/effects/{shipbonuscarrierrole1numwarfarelinks.py => effect6619.py} (100%)
 rename eos/effects/{missilethermaldmgbonus.py => effect662.py} (100%)
 rename eos/effects/{shipbonusdreadnoughtc3reloadbonus.py => effect6620.py} (100%)
 rename eos/effects/{shipbonussupercarriera2armorresists.py => effect6621.py} (100%)
 rename eos/effects/{shipbonussupercarrierc2shieldresists.py => effect6622.py} (100%)
 rename eos/effects/{shipbonussupercarrierg2fighterhitpoints.py => effect6623.py} (100%)
 rename eos/effects/{shipbonussupercarrierm2fightervelocity.py => effect6624.py} (100%)
 rename eos/effects/{shipbonuscarriera2supportfighterbonus.py => effect6625.py} (100%)
 rename eos/effects/{shipbonuscarrierc2supportfighterbonus.py => effect6626.py} (100%)
 rename eos/effects/{shipbonuscarrierg2supportfighterbonus.py => effect6627.py} (100%)
 rename eos/effects/{shipbonuscarrierm2supportfighterbonus.py => effect6628.py} (100%)
 rename eos/effects/{scriptresistancebonusbonus.py => effect6629.py} (100%)
 rename eos/effects/{shipbonustitana1damagebonus.py => effect6634.py} (100%)
 rename eos/effects/{shipbonustitanc1kindamagebonus.py => effect6635.py} (100%)
 rename eos/effects/{shipbonustitang1damagebonus.py => effect6636.py} (100%)
 rename eos/effects/{shipbonustitanm1damagebonus.py => effect6637.py} (100%)
 rename eos/effects/{shipbonustitanc2rofbonus.py => effect6638.py} (100%)
 rename eos/effects/{shipbonussupercarriera4fighterapplicationbonus.py => effect6639.py} (100%)
 rename eos/effects/{shipbonusrole1numwarfarelinks.py => effect6640.py} (100%)
 rename eos/effects/{shipbonusrole2armorplatesshieldextendersbonus.py => effect6641.py} (100%)
 rename eos/effects/{skillbonusdoomsdayrapidfiring.py => effect6642.py} (100%)
 rename eos/effects/{shipbonustitana3warpstrength.py => effect6647.py} (100%)
 rename eos/effects/{shipbonustitanc3warpstrength.py => effect6648.py} (100%)
 rename eos/effects/{shipbonustitang3warpstrength.py => effect6649.py} (100%)
 rename eos/effects/{shipbonustitanm3warpstrength.py => effect6650.py} (100%)
 rename eos/effects/{shipmoduleancillaryremotearmorrepairer.py => effect6651.py} (100%)
 rename eos/effects/{shipmoduleancillaryremoteshieldbooster.py => effect6652.py} (100%)
 rename eos/effects/{shipbonustitana2capneed.py => effect6653.py} (100%)
 rename eos/effects/{shipbonustitang2rofbonus.py => effect6654.py} (100%)
 rename eos/effects/{shipbonustitanm2rofbonus.py => effect6655.py} (100%)
 rename eos/effects/{shipbonusrole3xltorpdeovelocitybonus.py => effect6656.py} (100%)
 rename eos/effects/{shipbonustitanc5alldamagebonus.py => effect6657.py} (100%)
 rename eos/effects/{modulebonusbastionmodule.py => effect6658.py} (100%)
 rename eos/effects/{shipbonuscarrierm3fightervelocity.py => effect6661.py} (100%)
 rename eos/effects/{shipbonuscarrierg3fighterhitpoints.py => effect6662.py} (100%)
 rename eos/effects/{skillbonusdroneinterfacing.py => effect6663.py} (100%)
 rename eos/effects/{skillbonusdronesharpshooting.py => effect6664.py} (100%)
 rename eos/effects/{skillbonusdronedurability.py => effect6665.py} (100%)
 rename eos/effects/{skillbonusdronenavigation.py => effect6667.py} (100%)
 rename eos/effects/{modulebonuscapitaldronedurabilityenhancer.py => effect6669.py} (100%)
 rename eos/effects/{modulebonuscapitaldronescopechip.py => effect6670.py} (100%)
 rename eos/effects/{modulebonuscapitaldronespeedaugmentor.py => effect6671.py} (100%)
 rename eos/effects/{skillstructuredoomsdaydurationbonus.py => effect6679.py} (100%)
 rename eos/effects/{missilekineticdmgbonus2.py => effect668.py} (100%)
 rename eos/effects/{shipbonusrole3numwarfarelinks.py => effect6681.py} (100%)
 rename eos/effects/{structuremoduleeffectstasiswebifier.py => effect6682.py} (100%)
 rename eos/effects/{structuremoduleeffecttargetpainter.py => effect6683.py} (100%)
 rename eos/effects/{structuremoduleeffectremotesensordampener.py => effect6684.py} (100%)
 rename eos/effects/{structuremoduleeffectecm.py => effect6685.py} (100%)
 rename eos/effects/{structuremoduleeffectweapondisruption.py => effect6686.py} (100%)
 rename eos/effects/{npcentityremotearmorrepairer.py => effect6687.py} (100%)
 rename eos/effects/{npcentityremoteshieldbooster.py => effect6688.py} (100%)
 rename eos/effects/{npcentityremotehullrepairer.py => effect6689.py} (100%)
 rename eos/effects/{remotewebifierentity.py => effect6690.py} (100%)
 rename eos/effects/{entityenergyneutralizerfalloff.py => effect6691.py} (100%)
 rename eos/effects/{remotetargetpaintentity.py => effect6692.py} (100%)
 rename eos/effects/{remotesensordampentity.py => effect6693.py} (100%)
 rename eos/effects/{npcentityweapondisruptor.py => effect6694.py} (100%)
 rename eos/effects/{entityecmfalloff.py => effect6695.py} (100%)
 rename eos/effects/{rigdrawbackreductionarmor.py => effect6697.py} (100%)
 rename eos/effects/{rigdrawbackreductionastronautics.py => effect6698.py} (100%)
 rename eos/effects/{rigdrawbackreductiondrones.py => effect6699.py} (100%)
 rename eos/effects/{mininglaser.py => effect67.py} (100%)
 rename eos/effects/{antiwarpscramblingpassive.py => effect670.py} (100%)
 rename eos/effects/{rigdrawbackreductionelectronic.py => effect6700.py} (100%)
 rename eos/effects/{rigdrawbackreductionprojectile.py => effect6701.py} (100%)
 rename eos/effects/{rigdrawbackreductionenergyweapon.py => effect6702.py} (100%)
 rename eos/effects/{rigdrawbackreductionhybrid.py => effect6703.py} (100%)
 rename eos/effects/{rigdrawbackreductionlauncher.py => effect6704.py} (100%)
 rename eos/effects/{rigdrawbackreductionshield.py => effect6705.py} (100%)
 rename eos/effects/{setbonusasklepian.py => effect6706.py} (100%)
 rename eos/effects/{armorrepairamountbonussubcap.py => effect6708.py} (100%)
 rename eos/effects/{shipbonusrole1capitalhybriddamagebonus.py => effect6709.py} (100%)
 rename eos/effects/{shipbonusdreadnoughtm1webstrengthbonus.py => effect6710.py} (100%)
 rename eos/effects/{shipbonusrole3capitalhybriddamagebonus.py => effect6711.py} (100%)
 rename eos/effects/{shipbonustitanm1webstrengthbonus.py => effect6712.py} (100%)
 rename eos/effects/{shipbonussupercarrierm1burstprojectorwebbonus.py => effect6713.py} (100%)
 rename eos/effects/{ecmburstjammer.py => effect6714.py} (100%)
 rename eos/effects/{rolebonusiceoreminingdurationcap.py => effect6717.py} (100%)
 rename eos/effects/{shipbonusdronerepairmc1.py => effect6720.py} (100%)
 rename eos/effects/{elitebonuslogisticremotearmorrepairoptimalfalloff1.py => effect6721.py} (100%)
 rename eos/effects/{rolebonusremotearmorrepairoptimalfalloff.py => effect6722.py} (100%)
 rename eos/effects/{shipbonuscloakcpumc2.py => effect6723.py} (100%)
 rename eos/effects/{elitebonuslogisticremotearmorrepairduration3.py => effect6724.py} (100%)
 rename eos/effects/{shipbonussetfalloffaf2.py => effect6725.py} (100%)
 rename eos/effects/{shipbonuscloakcpumf1.py => effect6726.py} (100%)
 rename eos/effects/{elitebonuscoveropsnosneutfalloff1.py => effect6727.py} (100%)
 rename eos/effects/{modulebonusmicrowarpdrive.py => effect6730.py} (100%)
 rename eos/effects/{modulebonusafterburner.py => effect6731.py} (100%)
 rename eos/effects/{modulebonuswarfarelinkarmor.py => effect6732.py} (100%)
 rename eos/effects/{modulebonuswarfarelinkshield.py => effect6733.py} (100%)
 rename eos/effects/{modulebonuswarfarelinkskirmish.py => effect6734.py} (100%)
 rename eos/effects/{modulebonuswarfarelinkinfo.py => effect6735.py} (100%)
 rename eos/effects/{modulebonuswarfarelinkmining.py => effect6736.py} (100%)
 rename eos/effects/{chargebonuswarfarecharge.py => effect6737.py} (100%)
 rename eos/effects/{weaponupgradescpuneedbonuspostpercentcpulocationshipmodulesrequiringenergypulseweapons.py => effect675.py} (100%)
 rename eos/effects/{moduletitaneffectgenerator.py => effect6753.py} (100%)
 rename eos/effects/{miningdronespecbonus.py => effect6762.py} (100%)
 rename eos/effects/{iceharvestingdroneoperationdurationbonus.py => effect6763.py} (100%)
 rename eos/effects/{iceharvestingdronespecbonus.py => effect6764.py} (100%)
 rename eos/effects/{spatialphenomenagenerationdurationbonus.py => effect6765.py} (100%)
 rename eos/effects/{commandprocessoreffect.py => effect6766.py} (100%)
 rename eos/effects/{commandburstaoebonus.py => effect6769.py} (100%)
 rename eos/effects/{weaponupgradescpuneedbonuspostpercentcpulocationshipmodulesrequiringmissilelauncheroperation.py => effect677.py} (100%)
 rename eos/effects/{armoredcommanddurationbonus.py => effect6770.py} (100%)
 rename eos/effects/{shieldcommanddurationbonus.py => effect6771.py} (100%)
 rename eos/effects/{informationcommanddurationbonus.py => effect6772.py} (100%)
 rename eos/effects/{skirmishcommanddurationbonus.py => effect6773.py} (100%)
 rename eos/effects/{miningforemandurationbonus.py => effect6774.py} (100%)
 rename eos/effects/{armoredcommandstrengthbonus.py => effect6776.py} (100%)
 rename eos/effects/{shieldcommandstrengthbonus.py => effect6777.py} (100%)
 rename eos/effects/{informationcommandstrengthbonus.py => effect6778.py} (100%)
 rename eos/effects/{skirmishcommandstrengthbonus.py => effect6779.py} (100%)
 rename eos/effects/{miningforemanstrengthbonus.py => effect6780.py} (100%)
 rename eos/effects/{commandburstreloadtimebonus.py => effect6782.py} (100%)
 rename eos/effects/{commandburstaoerolebonus.py => effect6783.py} (100%)
 rename eos/effects/{shieldcommandburstbonusics3.py => effect6786.py} (100%)
 rename eos/effects/{shipbonusdronehpdamageminingics4.py => effect6787.py} (100%)
 rename eos/effects/{shipbonusdroneiceharvestingics5.py => effect6788.py} (100%)
 rename eos/effects/{industrialbonusdronedamage.py => effect6789.py} (100%)
 rename eos/effects/{shipbonusdroneiceharvestingrole.py => effect6790.py} (100%)
 rename eos/effects/{shipbonusdronehpdamageminingorecapital4.py => effect6792.py} (100%)
 rename eos/effects/{miningforemanburstbonusorecapital2.py => effect6793.py} (100%)
 rename eos/effects/{shieldcommandburstbonusorecapital3.py => effect6794.py} (100%)
 rename eos/effects/{shipbonusdroneiceharvestingorecapital5.py => effect6795.py} (100%)
 rename eos/effects/{shipmodeshtdamagepostdiv.py => effect6796.py} (100%)
 rename eos/effects/{shipmodesptdamagepostdiv.py => effect6797.py} (100%)
 rename eos/effects/{shipmodesetdamagepostdiv.py => effect6798.py} (100%)
 rename eos/effects/{shipmodesmallmissiledamagepostdiv.py => effect6799.py} (100%)
 rename eos/effects/{modedamptdresistspostdiv.py => effect6800.py} (100%)
 rename eos/effects/{modemwdandabboostpostdiv.py => effect6801.py} (100%)
 rename eos/effects/{invulnerabilitycoredurationbonus.py => effect6807.py} (100%)
 rename eos/effects/{skillmultiplierdefendermissilevelocity.py => effect6844.py} (100%)
 rename eos/effects/{shipbonuscommanddestroyerrole1defenderbonus.py => effect6845.py} (100%)
 rename eos/effects/{shipbonusrole3capitalenergydamagebonus.py => effect6851.py} (100%)
 rename eos/effects/{shipbonustitanm1webrangebonus.py => effect6852.py} (100%)
 rename eos/effects/{shipbonustitana1energywarfareamountbonus.py => effect6853.py} (100%)
 rename eos/effects/{shipbonusdreadnoughta1energywarfareamountbonus.py => effect6855.py} (100%)
 rename eos/effects/{shipbonusdreadnoughtm1webrangebonus.py => effect6856.py} (100%)
 rename eos/effects/{shipbonusforceauxiliarya1nosferaturangebonus.py => effect6857.py} (100%)
 rename eos/effects/{shipbonusforceauxiliarya1nosferatudrainamount.py => effect6858.py} (100%)
 rename eos/effects/{shipbonusrole4nosferatucpubonus.py => effect6859.py} (100%)
 rename eos/effects/{shipbonusrole5remotearmorrepairpowergridbonus.py => effect6860.py} (100%)
 rename eos/effects/{shipbonusrole5capitalremotearmorrepairpowergridbonus.py => effect6861.py} (100%)
 rename eos/effects/{shipbonusforceauxiliarym1remotearmorrepairduration.py => effect6862.py} (100%)
 rename eos/effects/{elitebonuscoveropswarpvelocity1.py => effect6865.py} (100%)
 rename eos/effects/{shipbonussmallmissileflighttimecf1.py => effect6866.py} (100%)
 rename eos/effects/{shipbonussptrofmf.py => effect6867.py} (100%)
 rename eos/effects/{concordsecstatustankbonus.py => effect6871.py} (100%)
 rename eos/effects/{elitereconstasiswebbonus1.py => effect6872.py} (100%)
 rename eos/effects/{elitebonusreconwarpvelocity3.py => effect6873.py} (100%)
 rename eos/effects/{shipbonusmedmissileflighttimecc2.py => effect6874.py} (100%)
 rename eos/effects/{elitebonusblackopswarpvelocity1.py => effect6877.py} (100%)
 rename eos/effects/{elitebonusblackopsscramblerrange4.py => effect6878.py} (100%)
 rename eos/effects/{elitebonusblackopswebrange3.py => effect6879.py} (100%)
 rename eos/effects/{shipbonuslauncherrof2cb.py => effect6880.py} (100%)
 rename eos/effects/{shipbonuslargemissileflighttimecb1.py => effect6881.py} (100%)
 rename eos/effects/{shipbonusforceauxiliarym2localrepairamount.py => effect6883.py} (100%)
 rename eos/effects/{subsystemenergyneutfittingreduction.py => effect6894.py} (100%)
 rename eos/effects/{subsystemmetfittingreduction.py => effect6895.py} (100%)
 rename eos/effects/{subsystemmhtfittingreduction.py => effect6896.py} (100%)
 rename eos/effects/{subsystemmptfittingreduction.py => effect6897.py} (100%)
 rename eos/effects/{subsystemmrarfittingreduction.py => effect6898.py} (100%)
 rename eos/effects/{subsystemmrsbfittingreduction.py => effect6899.py} (100%)
 rename eos/effects/{subsystemmmissilefittingreduction.py => effect6900.py} (100%)
 rename eos/effects/{shipbonusstrategiccruisercaldarinaniterepairtime2.py => effect6908.py} (100%)
 rename eos/effects/{shipbonusstrategiccruiseramarrnaniterepairtime2.py => effect6909.py} (100%)
 rename eos/effects/{shipbonusstrategiccruisergallentenaniterepairtime2.py => effect6910.py} (100%)
 rename eos/effects/{shipbonusstrategiccruiserminmatarnaniterepairtime2.py => effect6911.py} (100%)
 rename eos/effects/{structurehpbonusaddpassive.py => effect6920.py} (100%)
 rename eos/effects/{subsystembonusamarrdefensive2scanprobestrength.py => effect6921.py} (100%)
 rename eos/effects/{subsystembonusminmataroffensive1hmlhamvelo.py => effect6923.py} (100%)
 rename eos/effects/{subsystembonusminmataroffensive3missileexpvelo.py => effect6924.py} (100%)
 rename eos/effects/{subsystembonusgallenteoffensive2dronevelotracking.py => effect6925.py} (100%)
 rename eos/effects/{subsystembonusamarrpropulsionwarpcapacitor.py => effect6926.py} (100%)
 rename eos/effects/{subsystembonusminmatarpropulsionwarpcapacitor.py => effect6927.py} (100%)
 rename eos/effects/{subsystembonuscaldaripropulsion2propmodheatbenefit.py => effect6928.py} (100%)
 rename eos/effects/{subsystembonusgallentepropulsion2propmodheatbenefit.py => effect6929.py} (100%)
 rename eos/effects/{subsystembonusamarrcore2energyresistance.py => effect6930.py} (100%)
 rename eos/effects/{subsystembonusminmatarcore2energyresistance.py => effect6931.py} (100%)
 rename eos/effects/{subsystembonusgallentecore2energyresistance.py => effect6932.py} (100%)
 rename eos/effects/{subsystembonuscaldaricore2energyresistance.py => effect6933.py} (100%)
 rename eos/effects/{shipmaxlockedtargetsbonusaddpassive.py => effect6934.py} (100%)
 rename eos/effects/{subsystembonusamarrcore3energywarheatbonus.py => effect6935.py} (100%)
 rename eos/effects/{subsystembonusminmatarcore3stasiswebheatbonus.py => effect6936.py} (100%)
 rename eos/effects/{subsystembonusgallentecore3warpscramheatbonus.py => effect6937.py} (100%)
 rename eos/effects/{subsystembonuscaldaricore3ecmheatbonus.py => effect6938.py} (100%)
 rename eos/effects/{subsystembonusamarrdefensive2hardenerheat.py => effect6939.py} (100%)
 rename eos/effects/{subsystembonusgallentedefensive2hardenerheat.py => effect6940.py} (100%)
 rename eos/effects/{subsystembonuscaldaridefensive2hardenerheat.py => effect6941.py} (100%)
 rename eos/effects/{subsystembonusminmatardefensive2hardenerheat.py => effect6942.py} (100%)
 rename eos/effects/{subsystembonusamarrdefensive3armorrepheat.py => effect6943.py} (100%)
 rename eos/effects/{subsystembonusgallentedefensive3armorrepheat.py => effect6944.py} (100%)
 rename eos/effects/{subsystembonuscaldaridefensive3shieldboostheat.py => effect6945.py} (100%)
 rename eos/effects/{subsystembonusminmatardefensive3localrepheat.py => effect6946.py} (100%)
 rename eos/effects/{subsystembonuscaldaridefensive2scanprobestrength.py => effect6947.py} (100%)
 rename eos/effects/{subsystembonusgallentedefensive2scanprobestrength.py => effect6949.py} (100%)
 rename eos/effects/{subsystembonusminmatardefensive2scanprobestrength.py => effect6951.py} (100%)
 rename eos/effects/{mediumremoterepfittingadjustment.py => effect6953.py} (100%)
 rename eos/effects/{subsystembonuscommandburstfittingreduction.py => effect6954.py} (100%)
 rename eos/effects/{subsystemremoteshieldboostfalloffbonus.py => effect6955.py} (100%)
 rename eos/effects/{subsystemremotearmorrepaireroptimalbonus.py => effect6956.py} (100%)
 rename eos/effects/{subsystemremotearmorrepairerfalloffbonus.py => effect6957.py} (100%)
 rename eos/effects/{subsystembonusamarroffensive3remotearmorrepairheat.py => effect6958.py} (100%)
 rename eos/effects/{subsystembonusgallenteoffensive3remotearmorrepairheat.py => effect6959.py} (100%)
 rename eos/effects/{subsystembonuscaldarioffensive3remoteshieldboosterheat.py => effect6960.py} (100%)
 rename eos/effects/{subsystembonusminmataroffensive3remoterepheat.py => effect6961.py} (100%)
 rename eos/effects/{subsystembonusamarrpropulsion2warpspeed.py => effect6962.py} (100%)
 rename eos/effects/{subsystembonusminmatarpropulsion2warpspeed.py => effect6963.py} (100%)
 rename eos/effects/{subsystembonusgallentepropulsionwarpspeed.py => effect6964.py} (100%)
 rename eos/effects/{shipbonustitang1kinthermdamagebonus.py => effect6981.py} (100%)
 rename eos/effects/{shipbonustitang2emexplosivedamagebonus.py => effect6982.py} (100%)
 rename eos/effects/{shipbonustitanc1shieldresists.py => effect6983.py} (100%)
 rename eos/effects/{shipbonusrole4fighterdamageandhitpoints.py => effect6984.py} (100%)
 rename eos/effects/{shipbonusdreadnoughtg1kinthermdamagebonus.py => effect6985.py} (100%)
 rename eos/effects/{shipbonusforceauxiliaryg1remoteshieldboostamount.py => effect6986.py} (100%)
 rename eos/effects/{shipbonusrole2logisticdronerepamountandhitpointbonus.py => effect6987.py} (100%)
 rename eos/effects/{signatureanalysisscanresolutionbonuspostpercentscanresolutionship.py => effect699.py} (100%)
 rename eos/effects/{rolebonusmhtdamage1.py => effect6992.py} (100%)
 rename eos/effects/{rolebonus2boosterpenaltyreduction.py => effect6993.py} (100%)
 rename eos/effects/{elitereconbonusmhtdamage1.py => effect6994.py} (100%)
 rename eos/effects/{targetabcattack.py => effect6995.py} (100%)
 rename eos/effects/{elitereconbonusarmorrepamount3.py => effect6996.py} (100%)
 rename eos/effects/{elitecovertopsbonusarmorrepamount4.py => effect6997.py} (100%)
 rename eos/effects/{covertopsstealthbombersiegemissilelaunchercpuneedbonus.py => effect6999.py} (100%)
 rename eos/effects/{shipbonusshtfalloffgf1.py => effect7000.py} (100%)
 rename eos/effects/{rolebonustorprof1.py => effect7001.py} (100%)
 rename eos/effects/{rolebonusbomblauncherpwgcpu3.py => effect7002.py} (100%)
 rename eos/effects/{elitebonuscovertopsshtdamage3.py => effect7003.py} (100%)
 rename eos/effects/{structurefullpowerstatehitpointmodifier.py => effect7008.py} (100%)
 rename eos/effects/{servicemodulefullpowerhitpointpostassign.py => effect7009.py} (100%)
 rename eos/effects/{modulebonusassaultdamagecontrol.py => effect7012.py} (100%)
 rename eos/effects/{elitebonusgunshipkineticmissiledamage1.py => effect7013.py} (100%)
 rename eos/effects/{elitebonusgunshipthermalmissiledamage1.py => effect7014.py} (100%)
 rename eos/effects/{elitebonusgunshipemmissiledamage1.py => effect7015.py} (100%)
 rename eos/effects/{elitebonusgunshipexplosivemissiledamage1.py => effect7016.py} (100%)
 rename eos/effects/{elitebonusgunshipexplosionvelocity2.py => effect7017.py} (100%)
 rename eos/effects/{shipsetrofaf.py => effect7018.py} (100%)
 rename eos/effects/{remotewebifiermaxrangebonus.py => effect7020.py} (100%)
 rename eos/effects/{structurerigmaxtargetrange.py => effect7021.py} (100%)
 rename eos/effects/{shipbonusdronetrackingelitegunship2.py => effect7024.py} (100%)
 rename eos/effects/{scriptstandupwarpscram.py => effect7026.py} (100%)
 rename eos/effects/{structurecapacitorcapacitybonus.py => effect7027.py} (100%)
 rename eos/effects/{structuremodifypowerrechargerate.py => effect7028.py} (100%)
 rename eos/effects/{structurearmorhpbonus.py => effect7029.py} (100%)
 rename eos/effects/{structureaoerofrolebonus.py => effect7030.py} (100%)
 rename eos/effects/{shipbonusheavymissilekineticdamagecbc2.py => effect7031.py} (100%)
 rename eos/effects/{shipbonusheavymissilethermaldamagecbc2.py => effect7032.py} (100%)
 rename eos/effects/{shipbonusheavymissileemdamagecbc2.py => effect7033.py} (100%)
 rename eos/effects/{shipbonusheavymissileexplosivedamagecbc2.py => effect7034.py} (100%)
 rename eos/effects/{shipbonusheavyassaultmissileexplosivedamagecbc2.py => effect7035.py} (100%)
 rename eos/effects/{shipbonusheavyassaultmissileemdamagecbc2.py => effect7036.py} (100%)
 rename eos/effects/{shipbonusheavyassaultmissilethermaldamagecbc2.py => effect7037.py} (100%)
 rename eos/effects/{shipbonusheavyassaultmissilekineticdamagecbc2.py => effect7038.py} (100%)
 rename eos/effects/{structurehiddenmissiledamagemultiplier.py => effect7039.py} (100%)
 rename eos/effects/{structurehiddenarmorhpmultiplier.py => effect7040.py} (100%)
 rename eos/effects/{shiparmorhitpointsac1.py => effect7042.py} (100%)
 rename eos/effects/{shipshieldhitpointscc1.py => effect7043.py} (100%)
 rename eos/effects/{shipagilitybonusgc1.py => effect7044.py} (100%)
 rename eos/effects/{shipsignatureradiusmc1.py => effect7045.py} (100%)
 rename eos/effects/{elitebonusflagcruiserallresistances1.py => effect7046.py} (100%)
 rename eos/effects/{rolebonusflagcruisermodulefittingreduction.py => effect7047.py} (100%)
 rename eos/effects/{aoebeaconbioluminescencecloud.py => effect7050.py} (100%)
 rename eos/effects/{aoebeaconcausticcloud.py => effect7051.py} (100%)
 rename eos/effects/{rolebonusflagcruisertargetpaintermodifications.py => effect7052.py} (100%)
 rename eos/effects/{shiplargeweaponsdamagebonus.py => effect7055.py} (100%)
 rename eos/effects/{aoebeaconfilamentcloud.py => effect7058.py} (100%)
 rename eos/effects/{weathercaustictoxin.py => effect7059.py} (100%)
 rename eos/effects/{covertopswarpresistance.py => effect706.py} (100%)
 rename eos/effects/{weatherdarkness.py => effect7060.py} (100%)
 rename eos/effects/{weatherelectricstorm.py => effect7061.py} (100%)
 rename eos/effects/{weatherinfernal.py => effect7062.py} (100%)
 rename eos/effects/{weatherxenongas.py => effect7063.py} (100%)
 rename eos/effects/{weatherbasic.py => effect7064.py} (100%)
 rename eos/effects/{smallprecursorturretdmgbonusrequiredskill.py => effect7071.py} (100%)
 rename eos/effects/{mediumprecursorturretdmgbonusrequiredskill.py => effect7072.py} (100%)
 rename eos/effects/{largeprecursorturretdmgbonusrequiredskill.py => effect7073.py} (100%)
 rename eos/effects/{smalldisintegratorskilldmgbonus.py => effect7074.py} (100%)
 rename eos/effects/{mediumdisintegratorskilldmgbonus.py => effect7075.py} (100%)
 rename eos/effects/{largedisintegratorskilldmgbonus.py => effect7076.py} (100%)
 rename eos/effects/{disintegratorweapondamagemultiply.py => effect7077.py} (100%)
 rename eos/effects/{disintegratorweaponspeedmultiply.py => effect7078.py} (100%)
 rename eos/effects/{shippcbsspeedbonuspcbs1.py => effect7079.py} (100%)
 rename eos/effects/{shippcbsdmgbonuspcbs2.py => effect7080.py} (100%)
 rename eos/effects/{shipbonuspctdamagepc1.py => effect7085.py} (100%)
 rename eos/effects/{shipbonuspcttrackingpc2.py => effect7086.py} (100%)
 rename eos/effects/{shipbonuspctoptimalpf2.py => effect7087.py} (100%)
 rename eos/effects/{shipbonuspctdamagepf1.py => effect7088.py} (100%)
 rename eos/effects/{shipbonusnosneutcapneedrolebonus2.py => effect7091.py} (100%)
 rename eos/effects/{shipbonusremoterepcapneedrolebonus2.py => effect7092.py} (100%)
 rename eos/effects/{shipbonussmartbombcapneedrolebonus2.py => effect7093.py} (100%)
 rename eos/effects/{shipbonusremoterepmaxrangerolebonus1.py => effect7094.py} (100%)
 rename eos/effects/{surgicalstrikedamagemultiplierbonuspostpercentdamagemultiplierlocationshipgroupprecursorturret.py => effect7097.py} (100%)
 rename eos/effects/{systemsmallprecursorturretdamage.py => effect7111.py} (100%)
 rename eos/effects/{shipbonusneutcapneedrolebonus2.py => effect7112.py} (100%)
 rename eos/effects/{elitebonusreconscanprobestrength2.py => effect7116.py} (100%)
 rename eos/effects/{rolebonuswarpspeed.py => effect7117.py} (100%)
 rename eos/effects/{elitebonuscovertops3pctdamagepercycle.py => effect7118.py} (100%)
 rename eos/effects/{elitebonusreconship3pctdamagepercycle.py => effect7119.py} (100%)
 rename eos/effects/{massentanglereffect5.py => effect7142.py} (100%)
 rename eos/effects/{shipbonuspd1disintegratordamage.py => effect7154.py} (100%)
 rename eos/effects/{shipbonuspbc1disintegratordamage.py => effect7155.py} (100%)
 rename eos/effects/{smalldisintegratormaxrangebonus.py => effect7156.py} (100%)
 rename eos/effects/{shipbonuspd2disintegratormaxrange.py => effect7157.py} (100%)
 rename eos/effects/{shiparmorkineticresistancepbc2.py => effect7158.py} (100%)
 rename eos/effects/{shiparmorthermalresistancepbc2.py => effect7159.py} (100%)
 rename eos/effects/{shiparmoremresistancepbc2.py => effect7160.py} (100%)
 rename eos/effects/{shiparmorexplosiveresistancepbc2.py => effect7161.py} (100%)
 rename eos/effects/{shiproledisintegratormaxrangecbc.py => effect7162.py} (100%)
 rename eos/effects/{shipmoduleremotearmormutadaptiverepairer.py => effect7166.py} (100%)
 rename eos/effects/{shipbonusremotecapacitortransferrangerole1.py => effect7167.py} (100%)
 rename eos/effects/{shipbonusmutadaptiveremoterepairrangerole3.py => effect7168.py} (100%)
 rename eos/effects/{shipbonusmutadaptiverepamountpc1.py => effect7169.py} (100%)
 rename eos/effects/{shipbonusmutadaptiverepcapneedpc2.py => effect7170.py} (100%)
 rename eos/effects/{shipbonusmutadaptiveremotereprangepc1.py => effect7171.py} (100%)
 rename eos/effects/{shipbonusmutadaptiveremoterepcapneedelitebonuslogisitics1.py => effect7172.py} (100%)
 rename eos/effects/{shipbonusmutadaptiveremoterepamountelitebonuslogisitics2.py => effect7173.py} (100%)
 rename eos/effects/{skillbonusdroneinterfacingnotfighters.py => effect7176.py} (100%)
 rename eos/effects/{skillbonusdronedurabilitynotfighters.py => effect7177.py} (100%)
 rename eos/effects/{stripminerdurationmultiplier.py => effect7179.py} (100%)
 rename eos/effects/{miningdurationmultiplieronline.py => effect7180.py} (100%)
 rename eos/effects/{implantwarpscramblerangebonus.py => effect7183.py} (100%)
 rename eos/effects/{shipbonuscargo2gi.py => effect726.py} (100%)
 rename eos/effects/{shipbonuscargoci.py => effect727.py} (100%)
 rename eos/effects/{shipbonuscargomi.py => effect728.py} (100%)
 rename eos/effects/{shipbonusvelocitygi.py => effect729.py} (100%)
 rename eos/effects/{shipbonusvelocityci.py => effect730.py} (100%)
 rename eos/effects/{shipvelocitybonusai.py => effect732.py} (100%)
 rename eos/effects/{shipbonuscapcapab.py => effect736.py} (100%)
 rename eos/effects/{surveyscanspeedbonuspostpercentdurationlocationshipmodulesrequiringelectronics.py => effect744.py} (100%)
 rename eos/effects/{shiphybriddamagebonuscf.py => effect754.py} (100%)
 rename eos/effects/{shipetdamageaf.py => effect757.py} (100%)
 rename eos/effects/{shipbonussmallmissilerofcf2.py => effect760.py} (100%)
 rename eos/effects/{missiledmgbonus.py => effect763.py} (100%)
 rename eos/effects/{missilebombardmentmaxflighttimebonuspostpercentexplosiondelayownercharmodulesrequiringmissilelauncheroperation.py => effect784.py} (100%)
 rename eos/effects/{ammoinfluencecapneed.py => effect804.py} (100%)
 rename eos/effects/{skillfreightbonus.py => effect836.py} (100%)
 rename eos/effects/{cloakingtargetingdelaybonuspostpercentcloakingtargetingdelaybonusforshipmodulesrequiringcloaking.py => effect848.py} (100%)
 rename eos/effects/{cloakingscanresolutionmultiplier.py => effect854.py} (100%)
 rename eos/effects/{warpskillspeed.py => effect856.py} (100%)
 rename eos/effects/{shipprojectileoptimalbonusemf2.py => effect874.py} (100%)
 rename eos/effects/{shiphybridrangebonuscf2.py => effect882.py} (100%)
 rename eos/effects/{shipetspeedbonusab2.py => effect887.py} (100%)
 rename eos/effects/{missilelauncherspeedmultiplier.py => effect889.py} (100%)
 rename eos/effects/{projectileweaponspeedmultiply.py => effect89.py} (100%)
 rename eos/effects/{shipcruisemissilevelocitybonuscb3.py => effect891.py} (100%)
 rename eos/effects/{shiptorpedosvelocitybonuscb3.py => effect892.py} (100%)
 rename eos/effects/{covertopscpubonus1.py => effect896.py} (100%)
 rename eos/effects/{shipmissilekineticdamagecf.py => effect898.py} (100%)
 rename eos/effects/{shipmissilekineticdamagecc.py => effect899.py} (100%)
 rename eos/effects/{shipdronescoutthermaldamagegf2.py => effect900.py} (100%)
 rename eos/effects/{shiplaserrofac2.py => effect907.py} (100%)
 rename eos/effects/{shiparmorhpac2.py => effect909.py} (100%)
 rename eos/effects/{energyweapondamagemultiply.py => effect91.py} (100%)
 rename eos/effects/{shipmissilelauncherrofcc2.py => effect912.py} (100%)
 rename eos/effects/{shipdronesmaxgc2.py => effect918.py} (100%)
 rename eos/effects/{shiphybridtrackinggc2.py => effect919.py} (100%)
 rename eos/effects/{projectileweapondamagemultiply.py => effect92.py} (100%)
 rename eos/effects/{hybridweapondamagemultiply.py => effect93.py} (100%)
 rename eos/effects/{energyweaponspeedmultiply.py => effect95.py} (100%)
 rename eos/effects/{shiparmoremresistanceac2.py => effect958.py} (100%)
 rename eos/effects/{shiparmorexplosiveresistanceac2.py => effect959.py} (100%)
 rename eos/effects/{hybridweaponspeedmultiply.py => effect96.py} (100%)
 rename eos/effects/{shiparmorkineticresistanceac2.py => effect960.py} (100%)
 rename eos/effects/{shiparmorthermalresistanceac2.py => effect961.py} (100%)
 rename eos/effects/{shipprojectiledmgmc2.py => effect968.py} (100%)
 rename eos/effects/{cloakingwarpsafe.py => effect980.py} (100%)
 rename eos/effects/{elitebonusgunshiphybridoptimal1.py => effect989.py} (100%)
 rename eos/effects/{elitebonusgunshiplaseroptimal1.py => effect991.py} (100%)
 rename eos/effects/{elitebonusgunshiphybridtracking2.py => effect996.py} (100%)
 rename eos/effects/{elitebonusgunshipprojectilefalloff2.py => effect998.py} (100%)
 rename eos/effects/{elitebonusgunshipshieldboost2.py => effect999.py} (100%)

diff --git a/eos/effects/targetattack.py b/eos/effects/effect10.py
similarity index 100%
rename from eos/effects/targetattack.py
rename to eos/effects/effect10.py
diff --git a/eos/effects/elitebonusgunshipcaprecharge2.py b/eos/effects/effect1001.py
similarity index 100%
rename from eos/effects/elitebonusgunshipcaprecharge2.py
rename to eos/effects/effect1001.py
diff --git a/eos/effects/selft2smalllaserpulsedamagebonus.py b/eos/effects/effect1003.py
similarity index 100%
rename from eos/effects/selft2smalllaserpulsedamagebonus.py
rename to eos/effects/effect1003.py
diff --git a/eos/effects/selft2smalllaserbeamdamagebonus.py b/eos/effects/effect1004.py
similarity index 100%
rename from eos/effects/selft2smalllaserbeamdamagebonus.py
rename to eos/effects/effect1004.py
diff --git a/eos/effects/selft2smallhybridblasterdamagebonus.py b/eos/effects/effect1005.py
similarity index 100%
rename from eos/effects/selft2smallhybridblasterdamagebonus.py
rename to eos/effects/effect1005.py
diff --git a/eos/effects/selft2smallhybridraildamagebonus.py b/eos/effects/effect1006.py
similarity index 100%
rename from eos/effects/selft2smallhybridraildamagebonus.py
rename to eos/effects/effect1006.py
diff --git a/eos/effects/selft2smallprojectileacdamagebonus.py b/eos/effects/effect1007.py
similarity index 100%
rename from eos/effects/selft2smallprojectileacdamagebonus.py
rename to eos/effects/effect1007.py
diff --git a/eos/effects/selft2smallprojectileartydamagebonus.py b/eos/effects/effect1008.py
similarity index 100%
rename from eos/effects/selft2smallprojectileartydamagebonus.py
rename to eos/effects/effect1008.py
diff --git a/eos/effects/selft2mediumlaserpulsedamagebonus.py b/eos/effects/effect1009.py
similarity index 100%
rename from eos/effects/selft2mediumlaserpulsedamagebonus.py
rename to eos/effects/effect1009.py
diff --git a/eos/effects/usemissiles.py b/eos/effects/effect101.py
similarity index 100%
rename from eos/effects/usemissiles.py
rename to eos/effects/effect101.py
diff --git a/eos/effects/selft2mediumlaserbeamdamagebonus.py b/eos/effects/effect1010.py
similarity index 100%
rename from eos/effects/selft2mediumlaserbeamdamagebonus.py
rename to eos/effects/effect1010.py
diff --git a/eos/effects/selft2mediumhybridblasterdamagebonus.py b/eos/effects/effect1011.py
similarity index 100%
rename from eos/effects/selft2mediumhybridblasterdamagebonus.py
rename to eos/effects/effect1011.py
diff --git a/eos/effects/selft2mediumhybridraildamagebonus.py b/eos/effects/effect1012.py
similarity index 100%
rename from eos/effects/selft2mediumhybridraildamagebonus.py
rename to eos/effects/effect1012.py
diff --git a/eos/effects/selft2mediumprojectileacdamagebonus.py b/eos/effects/effect1013.py
similarity index 100%
rename from eos/effects/selft2mediumprojectileacdamagebonus.py
rename to eos/effects/effect1013.py
diff --git a/eos/effects/selft2mediumprojectileartydamagebonus.py b/eos/effects/effect1014.py
similarity index 100%
rename from eos/effects/selft2mediumprojectileartydamagebonus.py
rename to eos/effects/effect1014.py
diff --git a/eos/effects/selft2largelaserpulsedamagebonus.py b/eos/effects/effect1015.py
similarity index 100%
rename from eos/effects/selft2largelaserpulsedamagebonus.py
rename to eos/effects/effect1015.py
diff --git a/eos/effects/selft2largelaserbeamdamagebonus.py b/eos/effects/effect1016.py
similarity index 100%
rename from eos/effects/selft2largelaserbeamdamagebonus.py
rename to eos/effects/effect1016.py
diff --git a/eos/effects/selft2largehybridblasterdamagebonus.py b/eos/effects/effect1017.py
similarity index 100%
rename from eos/effects/selft2largehybridblasterdamagebonus.py
rename to eos/effects/effect1017.py
diff --git a/eos/effects/selft2largehybridraildamagebonus.py b/eos/effects/effect1018.py
similarity index 100%
rename from eos/effects/selft2largehybridraildamagebonus.py
rename to eos/effects/effect1018.py
diff --git a/eos/effects/selft2largeprojectileacdamagebonus.py b/eos/effects/effect1019.py
similarity index 100%
rename from eos/effects/selft2largeprojectileacdamagebonus.py
rename to eos/effects/effect1019.py
diff --git a/eos/effects/selft2largeprojectileartydamagebonus.py b/eos/effects/effect1020.py
similarity index 100%
rename from eos/effects/selft2largeprojectileartydamagebonus.py
rename to eos/effects/effect1020.py
diff --git a/eos/effects/elitebonusgunshiphybriddmg2.py b/eos/effects/effect1021.py
similarity index 100%
rename from eos/effects/elitebonusgunshiphybriddmg2.py
rename to eos/effects/effect1021.py
diff --git a/eos/effects/shipmissileheavyvelocitybonuscc2.py b/eos/effects/effect1024.py
similarity index 100%
rename from eos/effects/shipmissileheavyvelocitybonuscc2.py
rename to eos/effects/effect1024.py
diff --git a/eos/effects/shipmissilelightvelocitybonuscc2.py b/eos/effects/effect1025.py
similarity index 100%
rename from eos/effects/shipmissilelightvelocitybonuscc2.py
rename to eos/effects/effect1025.py
diff --git a/eos/effects/remotearmorsystemscapneedbonuspostpercentcapacitorneedlocationshipmodulesrequiringremotearmorsystems.py b/eos/effects/effect1030.py
similarity index 100%
rename from eos/effects/remotearmorsystemscapneedbonuspostpercentcapacitorneedlocationshipmodulesrequiringremotearmorsystems.py
rename to eos/effects/effect1030.py
diff --git a/eos/effects/elitebonuslogisticremotearmorrepaircapneed1.py b/eos/effects/effect1033.py
similarity index 100%
rename from eos/effects/elitebonuslogisticremotearmorrepaircapneed1.py
rename to eos/effects/effect1033.py
diff --git a/eos/effects/elitebonuslogisticremotearmorrepaircapneed2.py b/eos/effects/effect1034.py
similarity index 100%
rename from eos/effects/elitebonuslogisticremotearmorrepaircapneed2.py
rename to eos/effects/effect1034.py
diff --git a/eos/effects/elitebonuslogisticshieldtransfercapneed2.py b/eos/effects/effect1035.py
similarity index 100%
rename from eos/effects/elitebonuslogisticshieldtransfercapneed2.py
rename to eos/effects/effect1035.py
diff --git a/eos/effects/elitebonuslogisticshieldtransfercapneed1.py b/eos/effects/effect1036.py
similarity index 100%
rename from eos/effects/elitebonuslogisticshieldtransfercapneed1.py
rename to eos/effects/effect1036.py
diff --git a/eos/effects/shipremotearmorrangegc1.py b/eos/effects/effect1046.py
similarity index 100%
rename from eos/effects/shipremotearmorrangegc1.py
rename to eos/effects/effect1046.py
diff --git a/eos/effects/shipremotearmorrangeac2.py b/eos/effects/effect1047.py
similarity index 100%
rename from eos/effects/shipremotearmorrangeac2.py
rename to eos/effects/effect1047.py
diff --git a/eos/effects/shipshieldtransferrangecc1.py b/eos/effects/effect1048.py
similarity index 100%
rename from eos/effects/shipshieldtransferrangecc1.py
rename to eos/effects/effect1048.py
diff --git a/eos/effects/shipshieldtransferrangemc2.py b/eos/effects/effect1049.py
similarity index 100%
rename from eos/effects/shipshieldtransferrangemc2.py
rename to eos/effects/effect1049.py
diff --git a/eos/effects/elitebonusheavygunshiphybridoptimal1.py b/eos/effects/effect1056.py
similarity index 100%
rename from eos/effects/elitebonusheavygunshiphybridoptimal1.py
rename to eos/effects/effect1056.py
diff --git a/eos/effects/elitebonusheavygunshipprojectileoptimal1.py b/eos/effects/effect1057.py
similarity index 100%
rename from eos/effects/elitebonusheavygunshipprojectileoptimal1.py
rename to eos/effects/effect1057.py
diff --git a/eos/effects/elitebonusheavygunshiplaseroptimal1.py b/eos/effects/effect1058.py
similarity index 100%
rename from eos/effects/elitebonusheavygunshiplaseroptimal1.py
rename to eos/effects/effect1058.py
diff --git a/eos/effects/elitebonusheavygunshipprojectilefalloff1.py b/eos/effects/effect1060.py
similarity index 100%
rename from eos/effects/elitebonusheavygunshipprojectilefalloff1.py
rename to eos/effects/effect1060.py
diff --git a/eos/effects/elitebonusheavygunshiphybriddmg2.py b/eos/effects/effect1061.py
similarity index 100%
rename from eos/effects/elitebonusheavygunshiphybriddmg2.py
rename to eos/effects/effect1061.py
diff --git a/eos/effects/elitebonusheavygunshiplaserdmg2.py b/eos/effects/effect1062.py
similarity index 100%
rename from eos/effects/elitebonusheavygunshiplaserdmg2.py
rename to eos/effects/effect1062.py
diff --git a/eos/effects/elitebonusheavygunshipprojectiletracking2.py b/eos/effects/effect1063.py
similarity index 100%
rename from eos/effects/elitebonusheavygunshipprojectiletracking2.py
rename to eos/effects/effect1063.py
diff --git a/eos/effects/elitebonusheavygunshiphybridfalloff1.py b/eos/effects/effect1080.py
similarity index 100%
rename from eos/effects/elitebonusheavygunshiphybridfalloff1.py
rename to eos/effects/effect1080.py
diff --git a/eos/effects/elitebonusheavygunshipheavymissileflighttime1.py b/eos/effects/effect1081.py
similarity index 100%
rename from eos/effects/elitebonusheavygunshipheavymissileflighttime1.py
rename to eos/effects/effect1081.py
diff --git a/eos/effects/elitebonusheavygunshiplightmissileflighttime1.py b/eos/effects/effect1082.py
similarity index 100%
rename from eos/effects/elitebonusheavygunshiplightmissileflighttime1.py
rename to eos/effects/effect1082.py
diff --git a/eos/effects/elitebonusheavygunshipdronecontrolrange1.py b/eos/effects/effect1084.py
similarity index 100%
rename from eos/effects/elitebonusheavygunshipdronecontrolrange1.py
rename to eos/effects/effect1084.py
diff --git a/eos/effects/elitebonusheavygunshipprojectiledmg2.py b/eos/effects/effect1087.py
similarity index 100%
rename from eos/effects/elitebonusheavygunshipprojectiledmg2.py
rename to eos/effects/effect1087.py
diff --git a/eos/effects/shipprojectiletrackingmf2.py b/eos/effects/effect1099.py
similarity index 100%
rename from eos/effects/shipprojectiletrackingmf2.py
rename to eos/effects/effect1099.py
diff --git a/eos/effects/accerationcontrolskillabmwdspeedboost.py b/eos/effects/effect1176.py
similarity index 100%
rename from eos/effects/accerationcontrolskillabmwdspeedboost.py
rename to eos/effects/effect1176.py
diff --git a/eos/effects/elitebonusgunshiplaserdamage2.py b/eos/effects/effect1179.py
similarity index 100%
rename from eos/effects/elitebonusgunshiplaserdamage2.py
rename to eos/effects/effect1179.py
diff --git a/eos/effects/electronicattributemodifyonline.py b/eos/effects/effect118.py
similarity index 100%
rename from eos/effects/electronicattributemodifyonline.py
rename to eos/effects/effect118.py
diff --git a/eos/effects/elitebonuslogisticenergytransfercapneed1.py b/eos/effects/effect1181.py
similarity index 100%
rename from eos/effects/elitebonuslogisticenergytransfercapneed1.py
rename to eos/effects/effect1181.py
diff --git a/eos/effects/shipenergytransferrange1.py b/eos/effects/effect1182.py
similarity index 100%
rename from eos/effects/shipenergytransferrange1.py
rename to eos/effects/effect1182.py
diff --git a/eos/effects/elitebonuslogisticenergytransfercapneed2.py b/eos/effects/effect1183.py
similarity index 100%
rename from eos/effects/elitebonuslogisticenergytransfercapneed2.py
rename to eos/effects/effect1183.py
diff --git a/eos/effects/shipenergytransferrange2.py b/eos/effects/effect1184.py
similarity index 100%
rename from eos/effects/shipenergytransferrange2.py
rename to eos/effects/effect1184.py
diff --git a/eos/effects/structurestealthemitterarraysigdecrease.py b/eos/effects/effect1185.py
similarity index 100%
rename from eos/effects/structurestealthemitterarraysigdecrease.py
rename to eos/effects/effect1185.py
diff --git a/eos/effects/iceharvestcycletimemodulesrequiringiceharvesting.py b/eos/effects/effect1190.py
similarity index 100%
rename from eos/effects/iceharvestcycletimemodulesrequiringiceharvesting.py
rename to eos/effects/effect1190.py
diff --git a/eos/effects/mininginfomultiplier.py b/eos/effects/effect1200.py
similarity index 100%
rename from eos/effects/mininginfomultiplier.py
rename to eos/effects/effect1200.py
diff --git a/eos/effects/crystalminingamountinfo2.py b/eos/effects/effect1212.py
similarity index 100%
rename from eos/effects/crystalminingamountinfo2.py
rename to eos/effects/effect1212.py
diff --git a/eos/effects/shipenergydrainamountaf1.py b/eos/effects/effect1215.py
similarity index 100%
rename from eos/effects/shipenergydrainamountaf1.py
rename to eos/effects/effect1215.py
diff --git a/eos/effects/shipbonuspiratesmallhybriddmg.py b/eos/effects/effect1218.py
similarity index 100%
rename from eos/effects/shipbonuspiratesmallhybriddmg.py
rename to eos/effects/effect1218.py
diff --git a/eos/effects/shipenergyvampiretransferamountbonusab.py b/eos/effects/effect1219.py
similarity index 100%
rename from eos/effects/shipenergyvampiretransferamountbonusab.py
rename to eos/effects/effect1219.py
diff --git a/eos/effects/shipenergyvampiretransferamountbonusac.py b/eos/effects/effect1220.py
similarity index 100%
rename from eos/effects/shipenergyvampiretransferamountbonusac.py
rename to eos/effects/effect1220.py
diff --git a/eos/effects/shipstasiswebrangebonusmb.py b/eos/effects/effect1221.py
similarity index 100%
rename from eos/effects/shipstasiswebrangebonusmb.py
rename to eos/effects/effect1221.py
diff --git a/eos/effects/shipstasiswebrangebonusmc2.py b/eos/effects/effect1222.py
similarity index 100%
rename from eos/effects/shipstasiswebrangebonusmc2.py
rename to eos/effects/effect1222.py
diff --git a/eos/effects/shipprojectiletrackinggf.py b/eos/effects/effect1228.py
similarity index 100%
rename from eos/effects/shipprojectiletrackinggf.py
rename to eos/effects/effect1228.py
diff --git a/eos/effects/shipmissilevelocitypiratefactionfrigate.py b/eos/effects/effect1230.py
similarity index 100%
rename from eos/effects/shipmissilevelocitypiratefactionfrigate.py
rename to eos/effects/effect1230.py
diff --git a/eos/effects/shipprojectilerofpiratecruiser.py b/eos/effects/effect1232.py
similarity index 100%
rename from eos/effects/shipprojectilerofpiratecruiser.py
rename to eos/effects/effect1232.py
diff --git a/eos/effects/shiphybriddmgpiratecruiser.py b/eos/effects/effect1233.py
similarity index 100%
rename from eos/effects/shiphybriddmgpiratecruiser.py
rename to eos/effects/effect1233.py
diff --git a/eos/effects/shipmissilevelocitypiratefactionlight.py b/eos/effects/effect1234.py
similarity index 100%
rename from eos/effects/shipmissilevelocitypiratefactionlight.py
rename to eos/effects/effect1234.py
diff --git a/eos/effects/shipprojectilerofpiratebattleship.py b/eos/effects/effect1239.py
similarity index 100%
rename from eos/effects/shipprojectilerofpiratebattleship.py
rename to eos/effects/effect1239.py
diff --git a/eos/effects/shiphybriddmgpiratebattleship.py b/eos/effects/effect1240.py
similarity index 100%
rename from eos/effects/shiphybriddmgpiratebattleship.py
rename to eos/effects/effect1240.py
diff --git a/eos/effects/setbonusbloodraider.py b/eos/effects/effect1255.py
similarity index 100%
rename from eos/effects/setbonusbloodraider.py
rename to eos/effects/effect1255.py
diff --git a/eos/effects/setbonusbloodraidernosferatu.py b/eos/effects/effect1256.py
similarity index 100%
rename from eos/effects/setbonusbloodraidernosferatu.py
rename to eos/effects/effect1256.py
diff --git a/eos/effects/setbonusserpentis.py b/eos/effects/effect1261.py
similarity index 100%
rename from eos/effects/setbonusserpentis.py
rename to eos/effects/effect1261.py
diff --git a/eos/effects/interceptor2hybridtracking.py b/eos/effects/effect1264.py
similarity index 100%
rename from eos/effects/interceptor2hybridtracking.py
rename to eos/effects/effect1264.py
diff --git a/eos/effects/interceptor2lasertracking.py b/eos/effects/effect1268.py
similarity index 100%
rename from eos/effects/interceptor2lasertracking.py
rename to eos/effects/effect1268.py
diff --git a/eos/effects/structuralanalysiseffect.py b/eos/effects/effect1281.py
similarity index 100%
rename from eos/effects/structuralanalysiseffect.py
rename to eos/effects/effect1281.py
diff --git a/eos/effects/ewskillscanstrengthbonus.py b/eos/effects/effect1318.py
similarity index 100%
rename from eos/effects/ewskillscanstrengthbonus.py
rename to eos/effects/effect1318.py
diff --git a/eos/effects/ewskillrsdcapneedbonusskilllevel.py b/eos/effects/effect1360.py
similarity index 100%
rename from eos/effects/ewskillrsdcapneedbonusskilllevel.py
rename to eos/effects/effect1360.py
diff --git a/eos/effects/ewskilltdcapneedbonusskilllevel.py b/eos/effects/effect1361.py
similarity index 100%
rename from eos/effects/ewskilltdcapneedbonusskilllevel.py
rename to eos/effects/effect1361.py
diff --git a/eos/effects/ewskilltpcapneedbonusskilllevel.py b/eos/effects/effect1370.py
similarity index 100%
rename from eos/effects/ewskilltpcapneedbonusskilllevel.py
rename to eos/effects/effect1370.py
diff --git a/eos/effects/ewskillewcapneedskilllevel.py b/eos/effects/effect1372.py
similarity index 100%
rename from eos/effects/ewskillewcapneedskilllevel.py
rename to eos/effects/effect1372.py
diff --git a/eos/effects/shieldboostamplifierpassive.py b/eos/effects/effect1395.py
similarity index 100%
rename from eos/effects/shieldboostamplifierpassive.py
rename to eos/effects/effect1395.py
diff --git a/eos/effects/setbonusguristas.py b/eos/effects/effect1397.py
similarity index 100%
rename from eos/effects/setbonusguristas.py
rename to eos/effects/effect1397.py
diff --git a/eos/effects/systemscandurationskillastrometrics.py b/eos/effects/effect1409.py
similarity index 100%
rename from eos/effects/systemscandurationskillastrometrics.py
rename to eos/effects/effect1409.py
diff --git a/eos/effects/propulsionskillcapneedbonusskilllevel.py b/eos/effects/effect1410.py
similarity index 100%
rename from eos/effects/propulsionskillcapneedbonusskilllevel.py
rename to eos/effects/effect1410.py
diff --git a/eos/effects/shipbonushybridoptimalcb.py b/eos/effects/effect1412.py
similarity index 100%
rename from eos/effects/shipbonushybridoptimalcb.py
rename to eos/effects/effect1412.py
diff --git a/eos/effects/caldarishipewstrengthcb.py b/eos/effects/effect1434.py
similarity index 100%
rename from eos/effects/caldarishipewstrengthcb.py
rename to eos/effects/effect1434.py
diff --git a/eos/effects/caldarishipewoptimalrangecb3.py b/eos/effects/effect1441.py
similarity index 100%
rename from eos/effects/caldarishipewoptimalrangecb3.py
rename to eos/effects/effect1441.py
diff --git a/eos/effects/caldarishipewoptimalrangecc2.py b/eos/effects/effect1442.py
similarity index 100%
rename from eos/effects/caldarishipewoptimalrangecc2.py
rename to eos/effects/effect1442.py
diff --git a/eos/effects/caldarishipewcapacitorneedcc.py b/eos/effects/effect1443.py
similarity index 100%
rename from eos/effects/caldarishipewcapacitorneedcc.py
rename to eos/effects/effect1443.py
diff --git a/eos/effects/ewskillrsdmaxrangebonus.py b/eos/effects/effect1445.py
similarity index 100%
rename from eos/effects/ewskillrsdmaxrangebonus.py
rename to eos/effects/effect1445.py
diff --git a/eos/effects/ewskilltpmaxrangebonus.py b/eos/effects/effect1446.py
similarity index 100%
rename from eos/effects/ewskilltpmaxrangebonus.py
rename to eos/effects/effect1446.py
diff --git a/eos/effects/ewskilltdmaxrangebonus.py b/eos/effects/effect1448.py
similarity index 100%
rename from eos/effects/ewskilltdmaxrangebonus.py
rename to eos/effects/effect1448.py
diff --git a/eos/effects/ewskillrsdfalloffbonus.py b/eos/effects/effect1449.py
similarity index 100%
rename from eos/effects/ewskillrsdfalloffbonus.py
rename to eos/effects/effect1449.py
diff --git a/eos/effects/ewskilltpfalloffbonus.py b/eos/effects/effect1450.py
similarity index 100%
rename from eos/effects/ewskilltpfalloffbonus.py
rename to eos/effects/effect1450.py
diff --git a/eos/effects/ewskilltdfalloffbonus.py b/eos/effects/effect1451.py
similarity index 100%
rename from eos/effects/ewskilltdfalloffbonus.py
rename to eos/effects/effect1451.py
diff --git a/eos/effects/ewskillewmaxrangebonus.py b/eos/effects/effect1452.py
similarity index 100%
rename from eos/effects/ewskillewmaxrangebonus.py
rename to eos/effects/effect1452.py
diff --git a/eos/effects/ewskillewfalloffbonus.py b/eos/effects/effect1453.py
similarity index 100%
rename from eos/effects/ewskillewfalloffbonus.py
rename to eos/effects/effect1453.py
diff --git a/eos/effects/missileskillaoecloudsizebonus.py b/eos/effects/effect1472.py
similarity index 100%
rename from eos/effects/missileskillaoecloudsizebonus.py
rename to eos/effects/effect1472.py
diff --git a/eos/effects/shieldoperationskillboostcapacitorneedbonus.py b/eos/effects/effect1500.py
similarity index 100%
rename from eos/effects/shieldoperationskillboostcapacitorneedbonus.py
rename to eos/effects/effect1500.py
diff --git a/eos/effects/ewskilltargetpaintingstrengthbonus.py b/eos/effects/effect1550.py
similarity index 100%
rename from eos/effects/ewskilltargetpaintingstrengthbonus.py
rename to eos/effects/effect1550.py
diff --git a/eos/effects/minmatarshipewtargetpaintermf2.py b/eos/effects/effect1551.py
similarity index 100%
rename from eos/effects/minmatarshipewtargetpaintermf2.py
rename to eos/effects/effect1551.py
diff --git a/eos/effects/largehybridturretdamagemultiplierbonuspostpercentdamagemultiplierlocationshipmodulesrequiringlargehybridturret.py b/eos/effects/effect157.py
similarity index 100%
rename from eos/effects/largehybridturretdamagemultiplierbonuspostpercentdamagemultiplierlocationshipmodulesrequiringlargehybridturret.py
rename to eos/effects/effect157.py
diff --git a/eos/effects/angelsetbonus.py b/eos/effects/effect1577.py
similarity index 100%
rename from eos/effects/angelsetbonus.py
rename to eos/effects/effect1577.py
diff --git a/eos/effects/setbonussansha.py b/eos/effects/effect1579.py
similarity index 100%
rename from eos/effects/setbonussansha.py
rename to eos/effects/effect1579.py
diff --git a/eos/effects/jumpdriveskillsrangebonus.py b/eos/effects/effect1581.py
similarity index 100%
rename from eos/effects/jumpdriveskillsrangebonus.py
rename to eos/effects/effect1581.py
diff --git a/eos/effects/capitalturretskilllaserdamage.py b/eos/effects/effect1585.py
similarity index 100%
rename from eos/effects/capitalturretskilllaserdamage.py
rename to eos/effects/effect1585.py
diff --git a/eos/effects/capitalturretskillprojectiledamage.py b/eos/effects/effect1586.py
similarity index 100%
rename from eos/effects/capitalturretskillprojectiledamage.py
rename to eos/effects/effect1586.py
diff --git a/eos/effects/capitalturretskillhybriddamage.py b/eos/effects/effect1587.py
similarity index 100%
rename from eos/effects/capitalturretskillhybriddamage.py
rename to eos/effects/effect1587.py
diff --git a/eos/effects/capitallauncherskillcitadelkineticdamage.py b/eos/effects/effect1588.py
similarity index 100%
rename from eos/effects/capitallauncherskillcitadelkineticdamage.py
rename to eos/effects/effect1588.py
diff --git a/eos/effects/mediumenergyturretdamagemultiplierbonuspostpercentdamagemultiplierlocationshipmodulesrequiringmediumenergyturret.py b/eos/effects/effect159.py
similarity index 100%
rename from eos/effects/mediumenergyturretdamagemultiplierbonuspostpercentdamagemultiplierlocationshipmodulesrequiringmediumenergyturret.py
rename to eos/effects/effect159.py
diff --git a/eos/effects/missileskillaoevelocitybonus.py b/eos/effects/effect1590.py
similarity index 100%
rename from eos/effects/missileskillaoevelocitybonus.py
rename to eos/effects/effect1590.py
diff --git a/eos/effects/capitallauncherskillcitadelemdamage.py b/eos/effects/effect1592.py
similarity index 100%
rename from eos/effects/capitallauncherskillcitadelemdamage.py
rename to eos/effects/effect1592.py
diff --git a/eos/effects/capitallauncherskillcitadelexplosivedamage.py b/eos/effects/effect1593.py
similarity index 100%
rename from eos/effects/capitallauncherskillcitadelexplosivedamage.py
rename to eos/effects/effect1593.py
diff --git a/eos/effects/capitallauncherskillcitadelthermaldamage.py b/eos/effects/effect1594.py
similarity index 100%
rename from eos/effects/capitallauncherskillcitadelthermaldamage.py
rename to eos/effects/effect1594.py
diff --git a/eos/effects/missileskillwarheadupgradesemdamagebonus.py b/eos/effects/effect1595.py
similarity index 100%
rename from eos/effects/missileskillwarheadupgradesemdamagebonus.py
rename to eos/effects/effect1595.py
diff --git a/eos/effects/missileskillwarheadupgradesexplosivedamagebonus.py b/eos/effects/effect1596.py
similarity index 100%
rename from eos/effects/missileskillwarheadupgradesexplosivedamagebonus.py
rename to eos/effects/effect1596.py
diff --git a/eos/effects/missileskillwarheadupgradeskineticdamagebonus.py b/eos/effects/effect1597.py
similarity index 100%
rename from eos/effects/missileskillwarheadupgradeskineticdamagebonus.py
rename to eos/effects/effect1597.py
diff --git a/eos/effects/mediumhybridturretdamagemultiplierbonuspostpercentdamagemultiplierlocationshipmodulesrequiringmediumhybridturret.py b/eos/effects/effect160.py
similarity index 100%
rename from eos/effects/mediumhybridturretdamagemultiplierbonuspostpercentdamagemultiplierlocationshipmodulesrequiringmediumhybridturret.py
rename to eos/effects/effect160.py
diff --git a/eos/effects/mediumprojectileturretdamagemultiplierbonuspostpercentdamagemultiplierlocationshipmodulesrequiringmediumprojectileturret.py b/eos/effects/effect161.py
similarity index 100%
rename from eos/effects/mediumprojectileturretdamagemultiplierbonuspostpercentdamagemultiplierlocationshipmodulesrequiringmediumprojectileturret.py
rename to eos/effects/effect161.py
diff --git a/eos/effects/shipadvancedspaceshipcommandagilitybonus.py b/eos/effects/effect1615.py
similarity index 100%
rename from eos/effects/shipadvancedspaceshipcommandagilitybonus.py
rename to eos/effects/effect1615.py
diff --git a/eos/effects/skillcapitalshipsadvancedagility.py b/eos/effects/effect1616.py
similarity index 100%
rename from eos/effects/skillcapitalshipsadvancedagility.py
rename to eos/effects/effect1616.py
diff --git a/eos/effects/shipcapitalagilitybonus.py b/eos/effects/effect1617.py
similarity index 100%
rename from eos/effects/shipcapitalagilitybonus.py
rename to eos/effects/effect1617.py
diff --git a/eos/effects/largeenergyturretdamagemultiplierbonuspostpercentdamagemultiplierlocationshipmodulesrequiringlargeenergyturret.py b/eos/effects/effect162.py
similarity index 100%
rename from eos/effects/largeenergyturretdamagemultiplierbonuspostpercentdamagemultiplierlocationshipmodulesrequiringlargeenergyturret.py
rename to eos/effects/effect162.py
diff --git a/eos/effects/capitalshieldoperationskillcapacitorneedbonus.py b/eos/effects/effect1634.py
similarity index 100%
rename from eos/effects/capitalshieldoperationskillcapacitorneedbonus.py
rename to eos/effects/effect1634.py
diff --git a/eos/effects/capitalrepairsystemsskilldurationbonus.py b/eos/effects/effect1635.py
similarity index 100%
rename from eos/effects/capitalrepairsystemsskilldurationbonus.py
rename to eos/effects/effect1635.py
diff --git a/eos/effects/skilladvancedweaponupgradespowerneedbonus.py b/eos/effects/effect1638.py
similarity index 100%
rename from eos/effects/skilladvancedweaponupgradespowerneedbonus.py
rename to eos/effects/effect1638.py
diff --git a/eos/effects/armoredcommandmindlink.py b/eos/effects/effect1643.py
similarity index 100%
rename from eos/effects/armoredcommandmindlink.py
rename to eos/effects/effect1643.py
diff --git a/eos/effects/skirmishcommandmindlink.py b/eos/effects/effect1644.py
similarity index 100%
rename from eos/effects/skirmishcommandmindlink.py
rename to eos/effects/effect1644.py
diff --git a/eos/effects/shieldcommandmindlink.py b/eos/effects/effect1645.py
similarity index 100%
rename from eos/effects/shieldcommandmindlink.py
rename to eos/effects/effect1645.py
diff --git a/eos/effects/informationcommandmindlink.py b/eos/effects/effect1646.py
similarity index 100%
rename from eos/effects/informationcommandmindlink.py
rename to eos/effects/effect1646.py
diff --git a/eos/effects/skillsiegemoduleconsumptionquantitybonus.py b/eos/effects/effect1650.py
similarity index 100%
rename from eos/effects/skillsiegemoduleconsumptionquantitybonus.py
rename to eos/effects/effect1650.py
diff --git a/eos/effects/missileskillwarheadupgradesthermaldamagebonus.py b/eos/effects/effect1657.py
similarity index 100%
rename from eos/effects/missileskillwarheadupgradesthermaldamagebonus.py
rename to eos/effects/effect1657.py
diff --git a/eos/effects/freightercargobonusa2.py b/eos/effects/effect1668.py
similarity index 100%
rename from eos/effects/freightercargobonusa2.py
rename to eos/effects/effect1668.py
diff --git a/eos/effects/freightercargobonusc2.py b/eos/effects/effect1669.py
similarity index 100%
rename from eos/effects/freightercargobonusc2.py
rename to eos/effects/effect1669.py
diff --git a/eos/effects/freightercargobonusg2.py b/eos/effects/effect1670.py
similarity index 100%
rename from eos/effects/freightercargobonusg2.py
rename to eos/effects/effect1670.py
diff --git a/eos/effects/freightercargobonusm2.py b/eos/effects/effect1671.py
similarity index 100%
rename from eos/effects/freightercargobonusm2.py
rename to eos/effects/effect1671.py
diff --git a/eos/effects/freightermaxvelocitybonusa1.py b/eos/effects/effect1672.py
similarity index 100%
rename from eos/effects/freightermaxvelocitybonusa1.py
rename to eos/effects/effect1672.py
diff --git a/eos/effects/freightermaxvelocitybonusc1.py b/eos/effects/effect1673.py
similarity index 100%
rename from eos/effects/freightermaxvelocitybonusc1.py
rename to eos/effects/effect1673.py
diff --git a/eos/effects/freightermaxvelocitybonusg1.py b/eos/effects/effect1674.py
similarity index 100%
rename from eos/effects/freightermaxvelocitybonusg1.py
rename to eos/effects/effect1674.py
diff --git a/eos/effects/freightermaxvelocitybonusm1.py b/eos/effects/effect1675.py
similarity index 100%
rename from eos/effects/freightermaxvelocitybonusm1.py
rename to eos/effects/effect1675.py
diff --git a/eos/effects/mining.py b/eos/effects/effect17.py
similarity index 100%
rename from eos/effects/mining.py
rename to eos/effects/effect17.py
diff --git a/eos/effects/smallenergyturretdamagemultiplierbonuspostpercentdamagemultiplierlocationshipmodulesrequiringsmallenergyturret.py b/eos/effects/effect172.py
similarity index 100%
rename from eos/effects/smallenergyturretdamagemultiplierbonuspostpercentdamagemultiplierlocationshipmodulesrequiringsmallenergyturret.py
rename to eos/effects/effect172.py
diff --git a/eos/effects/shieldboostamplifier.py b/eos/effects/effect1720.py
similarity index 100%
rename from eos/effects/shieldboostamplifier.py
rename to eos/effects/effect1720.py
diff --git a/eos/effects/jumpdriveskillscapacitorneedbonus.py b/eos/effects/effect1722.py
similarity index 100%
rename from eos/effects/jumpdriveskillscapacitorneedbonus.py
rename to eos/effects/effect1722.py
diff --git a/eos/effects/smallhybridturretdamagemultiplierbonuspostpercentdamagemultiplierlocationshipmodulesrequiringsmallhybridturret.py b/eos/effects/effect173.py
similarity index 100%
rename from eos/effects/smallhybridturretdamagemultiplierbonuspostpercentdamagemultiplierlocationshipmodulesrequiringsmallhybridturret.py
rename to eos/effects/effect173.py
diff --git a/eos/effects/dronedmgbonus.py b/eos/effects/effect1730.py
similarity index 100%
rename from eos/effects/dronedmgbonus.py
rename to eos/effects/effect1730.py
diff --git a/eos/effects/dohacking.py b/eos/effects/effect1738.py
similarity index 100%
rename from eos/effects/dohacking.py
rename to eos/effects/effect1738.py
diff --git a/eos/effects/smallprojectileturretdamagemultiplierbonuspostpercentdamagemultiplierlocationshipmodulesrequiringsmallprojectileturret.py b/eos/effects/effect174.py
similarity index 100%
rename from eos/effects/smallprojectileturretdamagemultiplierbonuspostpercentdamagemultiplierlocationshipmodulesrequiringsmallprojectileturret.py
rename to eos/effects/effect174.py
diff --git a/eos/effects/missileskillrapidlauncherrof.py b/eos/effects/effect1763.py
similarity index 100%
rename from eos/effects/missileskillrapidlauncherrof.py
rename to eos/effects/effect1763.py
diff --git a/eos/effects/missileskillmissileprojectilevelocitybonus.py b/eos/effects/effect1764.py
similarity index 100%
rename from eos/effects/missileskillmissileprojectilevelocitybonus.py
rename to eos/effects/effect1764.py
diff --git a/eos/effects/shipbonusshtfalloffgf2.py b/eos/effects/effect1773.py
similarity index 100%
rename from eos/effects/shipbonusshtfalloffgf2.py
rename to eos/effects/effect1773.py
diff --git a/eos/effects/shiparmoremresistanceaf1.py b/eos/effects/effect1804.py
similarity index 100%
rename from eos/effects/shiparmoremresistanceaf1.py
rename to eos/effects/effect1804.py
diff --git a/eos/effects/shiparmorthresistanceaf1.py b/eos/effects/effect1805.py
similarity index 100%
rename from eos/effects/shiparmorthresistanceaf1.py
rename to eos/effects/effect1805.py
diff --git a/eos/effects/shiparmorknresistanceaf1.py b/eos/effects/effect1806.py
similarity index 100%
rename from eos/effects/shiparmorknresistanceaf1.py
rename to eos/effects/effect1806.py
diff --git a/eos/effects/shiparmorexresistanceaf1.py b/eos/effects/effect1807.py
similarity index 100%
rename from eos/effects/shiparmorexresistanceaf1.py
rename to eos/effects/effect1807.py
diff --git a/eos/effects/shipshieldemresistancecc2.py b/eos/effects/effect1812.py
similarity index 100%
rename from eos/effects/shipshieldemresistancecc2.py
rename to eos/effects/effect1812.py
diff --git a/eos/effects/shipshieldthermalresistancecc2.py b/eos/effects/effect1813.py
similarity index 100%
rename from eos/effects/shipshieldthermalresistancecc2.py
rename to eos/effects/effect1813.py
diff --git a/eos/effects/shipshieldkineticresistancecc2.py b/eos/effects/effect1814.py
similarity index 100%
rename from eos/effects/shipshieldkineticresistancecc2.py
rename to eos/effects/effect1814.py
diff --git a/eos/effects/shipshieldexplosiveresistancecc2.py b/eos/effects/effect1815.py
similarity index 100%
rename from eos/effects/shipshieldexplosiveresistancecc2.py
rename to eos/effects/effect1815.py
diff --git a/eos/effects/shipshieldemresistancecf2.py b/eos/effects/effect1816.py
similarity index 100%
rename from eos/effects/shipshieldemresistancecf2.py
rename to eos/effects/effect1816.py
diff --git a/eos/effects/shipshieldthermalresistancecf2.py b/eos/effects/effect1817.py
similarity index 100%
rename from eos/effects/shipshieldthermalresistancecf2.py
rename to eos/effects/effect1817.py
diff --git a/eos/effects/shipshieldkineticresistancecf2.py b/eos/effects/effect1819.py
similarity index 100%
rename from eos/effects/shipshieldkineticresistancecf2.py
rename to eos/effects/effect1819.py
diff --git a/eos/effects/shipshieldexplosiveresistancecf2.py b/eos/effects/effect1820.py
similarity index 100%
rename from eos/effects/shipshieldexplosiveresistancecf2.py
rename to eos/effects/effect1820.py
diff --git a/eos/effects/miningforemanmindlink.py b/eos/effects/effect1848.py
similarity index 100%
rename from eos/effects/miningforemanmindlink.py
rename to eos/effects/effect1848.py
diff --git a/eos/effects/selfrof.py b/eos/effects/effect1851.py
similarity index 100%
rename from eos/effects/selfrof.py
rename to eos/effects/effect1851.py
diff --git a/eos/effects/shipmissileemdamagecf2.py b/eos/effects/effect1862.py
similarity index 100%
rename from eos/effects/shipmissileemdamagecf2.py
rename to eos/effects/effect1862.py
diff --git a/eos/effects/shipmissilethermaldamagecf2.py b/eos/effects/effect1863.py
similarity index 100%
rename from eos/effects/shipmissilethermaldamagecf2.py
rename to eos/effects/effect1863.py
diff --git a/eos/effects/shipmissileexplosivedamagecf2.py b/eos/effects/effect1864.py
similarity index 100%
rename from eos/effects/shipmissileexplosivedamagecf2.py
rename to eos/effects/effect1864.py
diff --git a/eos/effects/miningyieldmultiplypercent.py b/eos/effects/effect1882.py
similarity index 100%
rename from eos/effects/miningyieldmultiplypercent.py
rename to eos/effects/effect1882.py
diff --git a/eos/effects/shipcruiselauncherrofbonus2cb.py b/eos/effects/effect1885.py
similarity index 100%
rename from eos/effects/shipcruiselauncherrofbonus2cb.py
rename to eos/effects/effect1885.py
diff --git a/eos/effects/shipsiegelauncherrofbonus2cb.py b/eos/effects/effect1886.py
similarity index 100%
rename from eos/effects/shipsiegelauncherrofbonus2cb.py
rename to eos/effects/effect1886.py
diff --git a/eos/effects/elitebargebonusiceharvestingcycletimebarge3.py b/eos/effects/effect1896.py
similarity index 100%
rename from eos/effects/elitebargebonusiceharvestingcycletimebarge3.py
rename to eos/effects/effect1896.py
diff --git a/eos/effects/elitebonusvampiredrainamount2.py b/eos/effects/effect1910.py
similarity index 100%
rename from eos/effects/elitebonusvampiredrainamount2.py
rename to eos/effects/effect1910.py
diff --git a/eos/effects/elitereconbonusgravimetricstrength2.py b/eos/effects/effect1911.py
similarity index 100%
rename from eos/effects/elitereconbonusgravimetricstrength2.py
rename to eos/effects/effect1911.py
diff --git a/eos/effects/elitereconbonusmagnetometricstrength2.py b/eos/effects/effect1912.py
similarity index 100%
rename from eos/effects/elitereconbonusmagnetometricstrength2.py
rename to eos/effects/effect1912.py
diff --git a/eos/effects/elitereconbonusradarstrength2.py b/eos/effects/effect1913.py
similarity index 100%
rename from eos/effects/elitereconbonusradarstrength2.py
rename to eos/effects/effect1913.py
diff --git a/eos/effects/elitereconbonusladarstrength2.py b/eos/effects/effect1914.py
similarity index 100%
rename from eos/effects/elitereconbonusladarstrength2.py
rename to eos/effects/effect1914.py
diff --git a/eos/effects/elitereconstasiswebbonus2.py b/eos/effects/effect1921.py
similarity index 100%
rename from eos/effects/elitereconstasiswebbonus2.py
rename to eos/effects/effect1921.py
diff --git a/eos/effects/elitereconscramblerrangebonus2.py b/eos/effects/effect1922.py
similarity index 100%
rename from eos/effects/elitereconscramblerrangebonus2.py
rename to eos/effects/effect1922.py
diff --git a/eos/effects/armorreinforcermassadd.py b/eos/effects/effect1959.py
similarity index 100%
rename from eos/effects/armorreinforcermassadd.py
rename to eos/effects/effect1959.py
diff --git a/eos/effects/shipbonusshieldtransfercapneed1.py b/eos/effects/effect1964.py
similarity index 100%
rename from eos/effects/shipbonusshieldtransfercapneed1.py
rename to eos/effects/effect1964.py
diff --git a/eos/effects/shipbonusremotearmorrepaircapneedgc1.py b/eos/effects/effect1969.py
similarity index 100%
rename from eos/effects/shipbonusremotearmorrepaircapneedgc1.py
rename to eos/effects/effect1969.py
diff --git a/eos/effects/caldarishipewcapacitorneedcf2.py b/eos/effects/effect1996.py
similarity index 100%
rename from eos/effects/caldarishipewcapacitorneedcf2.py
rename to eos/effects/effect1996.py
diff --git a/eos/effects/dronerangebonusadd.py b/eos/effects/effect2000.py
similarity index 100%
rename from eos/effects/dronerangebonusadd.py
rename to eos/effects/effect2000.py
diff --git a/eos/effects/cynosuraldurationbonus.py b/eos/effects/effect2008.py
similarity index 100%
rename from eos/effects/cynosuraldurationbonus.py
rename to eos/effects/effect2008.py
diff --git a/eos/effects/dronemaxvelocitybonus.py b/eos/effects/effect2013.py
similarity index 100%
rename from eos/effects/dronemaxvelocitybonus.py
rename to eos/effects/effect2013.py
diff --git a/eos/effects/dronemaxrangebonus.py b/eos/effects/effect2014.py
similarity index 100%
rename from eos/effects/dronemaxrangebonus.py
rename to eos/effects/effect2014.py
diff --git a/eos/effects/dronedurabilityshieldcapbonus.py b/eos/effects/effect2015.py
similarity index 100%
rename from eos/effects/dronedurabilityshieldcapbonus.py
rename to eos/effects/effect2015.py
diff --git a/eos/effects/dronedurabilityarmorhpbonus.py b/eos/effects/effect2016.py
similarity index 100%
rename from eos/effects/dronedurabilityarmorhpbonus.py
rename to eos/effects/effect2016.py
diff --git a/eos/effects/dronedurabilityhpbonus.py b/eos/effects/effect2017.py
similarity index 100%
rename from eos/effects/dronedurabilityhpbonus.py
rename to eos/effects/effect2017.py
diff --git a/eos/effects/repairdroneshieldbonusbonus.py b/eos/effects/effect2019.py
similarity index 100%
rename from eos/effects/repairdroneshieldbonusbonus.py
rename to eos/effects/effect2019.py
diff --git a/eos/effects/repairdronearmordamageamountbonus.py b/eos/effects/effect2020.py
similarity index 100%
rename from eos/effects/repairdronearmordamageamountbonus.py
rename to eos/effects/effect2020.py
diff --git a/eos/effects/addtosignatureradius2.py b/eos/effects/effect2029.py
similarity index 100%
rename from eos/effects/addtosignatureradius2.py
rename to eos/effects/effect2029.py
diff --git a/eos/effects/modifyarmorresonancepostpercent.py b/eos/effects/effect2041.py
similarity index 100%
rename from eos/effects/modifyarmorresonancepostpercent.py
rename to eos/effects/effect2041.py
diff --git a/eos/effects/modifyshieldresonancepostpercent.py b/eos/effects/effect2052.py
similarity index 100%
rename from eos/effects/modifyshieldresonancepostpercent.py
rename to eos/effects/effect2052.py
diff --git a/eos/effects/emshieldcompensationhardeningbonusgroupshieldamp.py b/eos/effects/effect2053.py
similarity index 100%
rename from eos/effects/emshieldcompensationhardeningbonusgroupshieldamp.py
rename to eos/effects/effect2053.py
diff --git a/eos/effects/explosiveshieldcompensationhardeningbonusgroupshieldamp.py b/eos/effects/effect2054.py
similarity index 100%
rename from eos/effects/explosiveshieldcompensationhardeningbonusgroupshieldamp.py
rename to eos/effects/effect2054.py
diff --git a/eos/effects/kineticshieldcompensationhardeningbonusgroupshieldamp.py b/eos/effects/effect2055.py
similarity index 100%
rename from eos/effects/kineticshieldcompensationhardeningbonusgroupshieldamp.py
rename to eos/effects/effect2055.py
diff --git a/eos/effects/thermalshieldcompensationhardeningbonusgroupshieldamp.py b/eos/effects/effect2056.py
similarity index 100%
rename from eos/effects/thermalshieldcompensationhardeningbonusgroupshieldamp.py
rename to eos/effects/effect2056.py
diff --git a/eos/effects/shieldcapacitybonusonline.py b/eos/effects/effect21.py
similarity index 100%
rename from eos/effects/shieldcapacitybonusonline.py
rename to eos/effects/effect21.py
diff --git a/eos/effects/emarmorcompensationhardeningbonusgrouparmorcoating.py b/eos/effects/effect2105.py
similarity index 100%
rename from eos/effects/emarmorcompensationhardeningbonusgrouparmorcoating.py
rename to eos/effects/effect2105.py
diff --git a/eos/effects/explosivearmorcompensationhardeningbonusgrouparmorcoating.py b/eos/effects/effect2106.py
similarity index 100%
rename from eos/effects/explosivearmorcompensationhardeningbonusgrouparmorcoating.py
rename to eos/effects/effect2106.py
diff --git a/eos/effects/kineticarmorcompensationhardeningbonusgrouparmorcoating.py b/eos/effects/effect2107.py
similarity index 100%
rename from eos/effects/kineticarmorcompensationhardeningbonusgrouparmorcoating.py
rename to eos/effects/effect2107.py
diff --git a/eos/effects/thermicarmorcompensationhardeningbonusgrouparmorcoating.py b/eos/effects/effect2108.py
similarity index 100%
rename from eos/effects/thermicarmorcompensationhardeningbonusgrouparmorcoating.py
rename to eos/effects/effect2108.py
diff --git a/eos/effects/emarmorcompensationhardeningbonusgroupenergized.py b/eos/effects/effect2109.py
similarity index 100%
rename from eos/effects/emarmorcompensationhardeningbonusgroupenergized.py
rename to eos/effects/effect2109.py
diff --git a/eos/effects/explosivearmorcompensationhardeningbonusgroupenergized.py b/eos/effects/effect2110.py
similarity index 100%
rename from eos/effects/explosivearmorcompensationhardeningbonusgroupenergized.py
rename to eos/effects/effect2110.py
diff --git a/eos/effects/kineticarmorcompensationhardeningbonusgroupenergized.py b/eos/effects/effect2111.py
similarity index 100%
rename from eos/effects/kineticarmorcompensationhardeningbonusgroupenergized.py
rename to eos/effects/effect2111.py
diff --git a/eos/effects/thermicarmorcompensationhardeningbonusgroupenergized.py b/eos/effects/effect2112.py
similarity index 100%
rename from eos/effects/thermicarmorcompensationhardeningbonusgroupenergized.py
rename to eos/effects/effect2112.py
diff --git a/eos/effects/sensorupgradescpuneedbonuspostpercentcpulocationshipmodulesrequiringsensorupgrades.py b/eos/effects/effect212.py
similarity index 100%
rename from eos/effects/sensorupgradescpuneedbonuspostpercentcpulocationshipmodulesrequiringsensorupgrades.py
rename to eos/effects/effect212.py
diff --git a/eos/effects/smallhybridmaxrangebonus.py b/eos/effects/effect2130.py
similarity index 100%
rename from eos/effects/smallhybridmaxrangebonus.py
rename to eos/effects/effect2130.py
diff --git a/eos/effects/smallenergymaxrangebonus.py b/eos/effects/effect2131.py
similarity index 100%
rename from eos/effects/smallenergymaxrangebonus.py
rename to eos/effects/effect2131.py
diff --git a/eos/effects/smallprojectilemaxrangebonus.py b/eos/effects/effect2132.py
similarity index 100%
rename from eos/effects/smallprojectilemaxrangebonus.py
rename to eos/effects/effect2132.py
diff --git a/eos/effects/energytransferarraymaxrangebonus.py b/eos/effects/effect2133.py
similarity index 100%
rename from eos/effects/energytransferarraymaxrangebonus.py
rename to eos/effects/effect2133.py
diff --git a/eos/effects/shieldtransportermaxrangebonus.py b/eos/effects/effect2134.py
similarity index 100%
rename from eos/effects/shieldtransportermaxrangebonus.py
rename to eos/effects/effect2134.py
diff --git a/eos/effects/armorrepairprojectormaxrangebonus.py b/eos/effects/effect2135.py
similarity index 100%
rename from eos/effects/armorrepairprojectormaxrangebonus.py
rename to eos/effects/effect2135.py
diff --git a/eos/effects/targetingmaxtargetbonusmodaddmaxlockedtargetslocationchar.py b/eos/effects/effect214.py
similarity index 100%
rename from eos/effects/targetingmaxtargetbonusmodaddmaxlockedtargetslocationchar.py
rename to eos/effects/effect214.py
diff --git a/eos/effects/minmatarshipewtargetpaintermc2.py b/eos/effects/effect2143.py
similarity index 100%
rename from eos/effects/minmatarshipewtargetpaintermc2.py
rename to eos/effects/effect2143.py
diff --git a/eos/effects/elitebonuscommandshipprojectiledamagecs1.py b/eos/effects/effect2155.py
similarity index 100%
rename from eos/effects/elitebonuscommandshipprojectiledamagecs1.py
rename to eos/effects/effect2155.py
diff --git a/eos/effects/elitebonuscommandshipprojectilefalloffcs2.py b/eos/effects/effect2156.py
similarity index 100%
rename from eos/effects/elitebonuscommandshipprojectilefalloffcs2.py
rename to eos/effects/effect2156.py
diff --git a/eos/effects/elitebonuscommandshiplaserdamagecs1.py b/eos/effects/effect2157.py
similarity index 100%
rename from eos/effects/elitebonuscommandshiplaserdamagecs1.py
rename to eos/effects/effect2157.py
diff --git a/eos/effects/elitebonuscommandshiplaserrofcs2.py b/eos/effects/effect2158.py
similarity index 100%
rename from eos/effects/elitebonuscommandshiplaserrofcs2.py
rename to eos/effects/effect2158.py
diff --git a/eos/effects/elitebonuscommandshiphybridfalloffcs2.py b/eos/effects/effect2160.py
similarity index 100%
rename from eos/effects/elitebonuscommandshiphybridfalloffcs2.py
rename to eos/effects/effect2160.py
diff --git a/eos/effects/elitebonuscommandshiphybridoptimalcs1.py b/eos/effects/effect2161.py
similarity index 100%
rename from eos/effects/elitebonuscommandshiphybridoptimalcs1.py
rename to eos/effects/effect2161.py
diff --git a/eos/effects/shipbonusdronehitpointsgc2.py b/eos/effects/effect2179.py
similarity index 100%
rename from eos/effects/shipbonusdronehitpointsgc2.py
rename to eos/effects/effect2179.py
diff --git a/eos/effects/shipbonusdronehitpointsfixedac2.py b/eos/effects/effect2181.py
similarity index 100%
rename from eos/effects/shipbonusdronehitpointsfixedac2.py
rename to eos/effects/effect2181.py
diff --git a/eos/effects/shipbonusdronehitpointsgb2.py b/eos/effects/effect2186.py
similarity index 100%
rename from eos/effects/shipbonusdronehitpointsgb2.py
rename to eos/effects/effect2186.py
diff --git a/eos/effects/shipbonusdronedamagemultipliergb2.py b/eos/effects/effect2187.py
similarity index 100%
rename from eos/effects/shipbonusdronedamagemultipliergb2.py
rename to eos/effects/effect2187.py
diff --git a/eos/effects/shipbonusdronedamagemultipliergc2.py b/eos/effects/effect2188.py
similarity index 100%
rename from eos/effects/shipbonusdronedamagemultipliergc2.py
rename to eos/effects/effect2188.py
diff --git a/eos/effects/shipbonusdronedamagemultiplierac2.py b/eos/effects/effect2189.py
similarity index 100%
rename from eos/effects/shipbonusdronedamagemultiplierac2.py
rename to eos/effects/effect2189.py
diff --git a/eos/effects/elitebonusinterdictorsmissilekineticdamage1.py b/eos/effects/effect2200.py
similarity index 100%
rename from eos/effects/elitebonusinterdictorsmissilekineticdamage1.py
rename to eos/effects/effect2200.py
diff --git a/eos/effects/elitebonusinterdictorsprojectilefalloff1.py b/eos/effects/effect2201.py
similarity index 100%
rename from eos/effects/elitebonusinterdictorsprojectilefalloff1.py
rename to eos/effects/effect2201.py
diff --git a/eos/effects/shipbonuspiratefrigateprojdamage.py b/eos/effects/effect2215.py
similarity index 100%
rename from eos/effects/shipbonuspiratefrigateprojdamage.py
rename to eos/effects/effect2215.py
diff --git a/eos/effects/navigationvelocitybonuspostpercentmaxvelocitylocationship.py b/eos/effects/effect223.py
similarity index 100%
rename from eos/effects/navigationvelocitybonuspostpercentmaxvelocitylocationship.py
rename to eos/effects/effect223.py
diff --git a/eos/effects/scanstrengthbonuspercentonline.py b/eos/effects/effect2232.py
similarity index 100%
rename from eos/effects/scanstrengthbonuspercentonline.py
rename to eos/effects/effect2232.py
diff --git a/eos/effects/shipbonusdroneminingamountac2.py b/eos/effects/effect2249.py
similarity index 100%
rename from eos/effects/shipbonusdroneminingamountac2.py
rename to eos/effects/effect2249.py
diff --git a/eos/effects/shipbonusdroneminingamountgc2.py b/eos/effects/effect2250.py
similarity index 100%
rename from eos/effects/shipbonusdroneminingamountgc2.py
rename to eos/effects/effect2250.py
diff --git a/eos/effects/commandshipmultirelayeffect.py b/eos/effects/effect2251.py
similarity index 100%
rename from eos/effects/commandshipmultirelayeffect.py
rename to eos/effects/effect2251.py
diff --git a/eos/effects/covertopsandreconopscloakmoduledelaybonus.py b/eos/effects/effect2252.py
similarity index 100%
rename from eos/effects/covertopsandreconopscloakmoduledelaybonus.py
rename to eos/effects/effect2252.py
diff --git a/eos/effects/covertopsstealthbombertargettingdelaybonus.py b/eos/effects/effect2253.py
similarity index 100%
rename from eos/effects/covertopsstealthbombertargettingdelaybonus.py
rename to eos/effects/effect2253.py
diff --git a/eos/effects/tractorbeamcan.py b/eos/effects/effect2255.py
similarity index 100%
rename from eos/effects/tractorbeamcan.py
rename to eos/effects/effect2255.py
diff --git a/eos/effects/accerationcontrolcapneedbonuspostpercentcapacitorneedlocationshipgroupafterburner.py b/eos/effects/effect227.py
similarity index 100%
rename from eos/effects/accerationcontrolcapneedbonuspostpercentcapacitorneedlocationshipgroupafterburner.py
rename to eos/effects/effect227.py
diff --git a/eos/effects/scanstrengthbonuspercentpassive.py b/eos/effects/effect2298.py
similarity index 100%
rename from eos/effects/scanstrengthbonuspercentpassive.py
rename to eos/effects/effect2298.py
diff --git a/eos/effects/afterburnerdurationbonuspostpercentdurationlocationshipmodulesrequiringafterburner.py b/eos/effects/effect230.py
similarity index 100%
rename from eos/effects/afterburnerdurationbonuspostpercentdurationlocationshipmodulesrequiringafterburner.py
rename to eos/effects/effect230.py
diff --git a/eos/effects/damagecontrol.py b/eos/effects/effect2302.py
similarity index 100%
rename from eos/effects/damagecontrol.py
rename to eos/effects/effect2302.py
diff --git a/eos/effects/elitereconbonusenergyneutamount2.py b/eos/effects/effect2305.py
similarity index 100%
rename from eos/effects/elitereconbonusenergyneutamount2.py
rename to eos/effects/effect2305.py
diff --git a/eos/effects/warpdriveoperationwarpcapacitorneedbonuspostpercentwarpcapacitorneedlocationship.py b/eos/effects/effect235.py
similarity index 100%
rename from eos/effects/warpdriveoperationwarpcapacitorneedbonuspostpercentwarpcapacitorneedlocationship.py
rename to eos/effects/effect235.py
diff --git a/eos/effects/capitalremotearmorrepairercapneedbonusskill.py b/eos/effects/effect2354.py
similarity index 100%
rename from eos/effects/capitalremotearmorrepairercapneedbonusskill.py
rename to eos/effects/effect2354.py
diff --git a/eos/effects/capitalremoteshieldtransfercapneedbonusskill.py b/eos/effects/effect2355.py
similarity index 100%
rename from eos/effects/capitalremoteshieldtransfercapneedbonusskill.py
rename to eos/effects/effect2355.py
diff --git a/eos/effects/capitalremoteenergytransfercapneedbonusskill.py b/eos/effects/effect2356.py
similarity index 100%
rename from eos/effects/capitalremoteenergytransfercapneedbonusskill.py
rename to eos/effects/effect2356.py
diff --git a/eos/effects/skillsuperweapondmgbonus.py b/eos/effects/effect2402.py
similarity index 100%
rename from eos/effects/skillsuperweapondmgbonus.py
rename to eos/effects/effect2402.py
diff --git a/eos/effects/accerationcontrolspeedfbonuspostpercentspeedfactorlocationshipgroupafterburner.py b/eos/effects/effect242.py
similarity index 100%
rename from eos/effects/accerationcontrolspeedfbonuspostpercentspeedfactorlocationshipgroupafterburner.py
rename to eos/effects/effect242.py
diff --git a/eos/effects/implantvelocitybonus.py b/eos/effects/effect2422.py
similarity index 100%
rename from eos/effects/implantvelocitybonus.py
rename to eos/effects/effect2422.py
diff --git a/eos/effects/energymanagementcapacitorbonuspostpercentcapacitylocationshipgroupcapacitorcapacitybonus.py b/eos/effects/effect2432.py
similarity index 100%
rename from eos/effects/energymanagementcapacitorbonuspostpercentcapacitylocationshipgroupcapacitorcapacitybonus.py
rename to eos/effects/effect2432.py
diff --git a/eos/effects/highspeedmanuveringcapacitorneedmultiplierpostpercentcapacitorneedlocationshipmodulesrequiringhighspeedmanuvering.py b/eos/effects/effect244.py
similarity index 100%
rename from eos/effects/highspeedmanuveringcapacitorneedmultiplierpostpercentcapacitorneedlocationshipmodulesrequiringhighspeedmanuvering.py
rename to eos/effects/effect244.py
diff --git a/eos/effects/minercpuusagemultiplypercent2.py b/eos/effects/effect2444.py
similarity index 100%
rename from eos/effects/minercpuusagemultiplypercent2.py
rename to eos/effects/effect2444.py
diff --git a/eos/effects/iceminercpuusagepercent.py b/eos/effects/effect2445.py
similarity index 100%
rename from eos/effects/iceminercpuusagepercent.py
rename to eos/effects/effect2445.py
diff --git a/eos/effects/miningupgradecpupenaltyreductionmodulesrequiringminingupgradepercent.py b/eos/effects/effect2456.py
similarity index 100%
rename from eos/effects/miningupgradecpupenaltyreductionmodulesrequiringminingupgradepercent.py
rename to eos/effects/effect2456.py
diff --git a/eos/effects/shipbonusarmorresistab.py b/eos/effects/effect2465.py
similarity index 100%
rename from eos/effects/shipbonusarmorresistab.py
rename to eos/effects/effect2465.py
diff --git a/eos/effects/iceharvestcycletimemodulesrequiringiceharvestingonline.py b/eos/effects/effect2479.py
similarity index 100%
rename from eos/effects/iceharvestcycletimemodulesrequiringiceharvestingonline.py
rename to eos/effects/effect2479.py
diff --git a/eos/effects/implantarmorhpbonus2.py b/eos/effects/effect2485.py
similarity index 100%
rename from eos/effects/implantarmorhpbonus2.py
rename to eos/effects/effect2485.py
diff --git a/eos/effects/implantvelocitybonus2.py b/eos/effects/effect2488.py
similarity index 100%
rename from eos/effects/implantvelocitybonus2.py
rename to eos/effects/effect2488.py
diff --git a/eos/effects/shipbonusremotetrackingcomputerfalloffmc.py b/eos/effects/effect2489.py
similarity index 100%
rename from eos/effects/shipbonusremotetrackingcomputerfalloffmc.py
rename to eos/effects/effect2489.py
diff --git a/eos/effects/shipbonusremotetrackingcomputerfalloffgc2.py b/eos/effects/effect2490.py
similarity index 100%
rename from eos/effects/shipbonusremotetrackingcomputerfalloffgc2.py
rename to eos/effects/effect2490.py
diff --git a/eos/effects/ewskillecmburstrangebonus.py b/eos/effects/effect2491.py
similarity index 100%
rename from eos/effects/ewskillecmburstrangebonus.py
rename to eos/effects/effect2491.py
diff --git a/eos/effects/ewskillecmburstcapneedbonus.py b/eos/effects/effect2492.py
similarity index 100%
rename from eos/effects/ewskillecmburstcapneedbonus.py
rename to eos/effects/effect2492.py
diff --git a/eos/effects/capacitorcapacitybonus.py b/eos/effects/effect25.py
similarity index 100%
rename from eos/effects/capacitorcapacitybonus.py
rename to eos/effects/effect25.py
diff --git a/eos/effects/shiphttrackingbonusgb2.py b/eos/effects/effect2503.py
similarity index 100%
rename from eos/effects/shiphttrackingbonusgb2.py
rename to eos/effects/effect2503.py
diff --git a/eos/effects/shipbonushybridtrackinggf2.py b/eos/effects/effect2504.py
similarity index 100%
rename from eos/effects/shipbonushybridtrackinggf2.py
rename to eos/effects/effect2504.py
diff --git a/eos/effects/elitebonusassaultshipmissilevelocity1.py b/eos/effects/effect2561.py
similarity index 100%
rename from eos/effects/elitebonusassaultshipmissilevelocity1.py
rename to eos/effects/effect2561.py
diff --git a/eos/effects/modifyboostereffectchancewithboosterchancebonuspostpercent.py b/eos/effects/effect2589.py
similarity index 100%
rename from eos/effects/modifyboostereffectchancewithboosterchancebonuspostpercent.py
rename to eos/effects/effect2589.py
diff --git a/eos/effects/structurerepair.py b/eos/effects/effect26.py
similarity index 100%
rename from eos/effects/structurerepair.py
rename to eos/effects/effect26.py
diff --git a/eos/effects/shipbonusemshieldresistancecb2.py b/eos/effects/effect2602.py
similarity index 100%
rename from eos/effects/shipbonusemshieldresistancecb2.py
rename to eos/effects/effect2602.py
diff --git a/eos/effects/shipbonusexplosiveshieldresistancecb2.py b/eos/effects/effect2603.py
similarity index 100%
rename from eos/effects/shipbonusexplosiveshieldresistancecb2.py
rename to eos/effects/effect2603.py
diff --git a/eos/effects/shipbonuskineticshieldresistancecb2.py b/eos/effects/effect2604.py
similarity index 100%
rename from eos/effects/shipbonuskineticshieldresistancecb2.py
rename to eos/effects/effect2604.py
diff --git a/eos/effects/shipbonusthermicshieldresistancecb2.py b/eos/effects/effect2605.py
similarity index 100%
rename from eos/effects/shipbonusthermicshieldresistancecb2.py
rename to eos/effects/effect2605.py
diff --git a/eos/effects/elitebonusgunshipprojectiledamage1.py b/eos/effects/effect2611.py
similarity index 100%
rename from eos/effects/elitebonusgunshipprojectiledamage1.py
rename to eos/effects/effect2611.py
diff --git a/eos/effects/increasesignatureradiusonline.py b/eos/effects/effect2644.py
similarity index 100%
rename from eos/effects/increasesignatureradiusonline.py
rename to eos/effects/effect2644.py
diff --git a/eos/effects/scanresolutionmultiplieronline.py b/eos/effects/effect2645.py
similarity index 100%
rename from eos/effects/scanresolutionmultiplieronline.py
rename to eos/effects/effect2645.py
diff --git a/eos/effects/maxtargetrangebonus.py b/eos/effects/effect2646.py
similarity index 100%
rename from eos/effects/maxtargetrangebonus.py
rename to eos/effects/effect2646.py
diff --git a/eos/effects/elitebonusheavygunshipheavymissilelaunhcerrof2.py b/eos/effects/effect2647.py
similarity index 100%
rename from eos/effects/elitebonusheavygunshipheavymissilelaunhcerrof2.py
rename to eos/effects/effect2647.py
diff --git a/eos/effects/elitebonusheavygunshipheavyassaultmissilelaunhcerrof2.py b/eos/effects/effect2648.py
similarity index 100%
rename from eos/effects/elitebonusheavygunshipheavyassaultmissilelaunhcerrof2.py
rename to eos/effects/effect2648.py
diff --git a/eos/effects/elitebonusheavygunshipassaultmissilelaunhcerrof2.py b/eos/effects/effect2649.py
similarity index 100%
rename from eos/effects/elitebonusheavygunshipassaultmissilelaunhcerrof2.py
rename to eos/effects/effect2649.py
diff --git a/eos/effects/sensorboosteractivepercentage.py b/eos/effects/effect2670.py
similarity index 100%
rename from eos/effects/sensorboosteractivepercentage.py
rename to eos/effects/effect2670.py
diff --git a/eos/effects/capneedbonuseffectlasers.py b/eos/effects/effect2688.py
similarity index 100%
rename from eos/effects/capneedbonuseffectlasers.py
rename to eos/effects/effect2688.py
diff --git a/eos/effects/capneedbonuseffecthybrids.py b/eos/effects/effect2689.py
similarity index 100%
rename from eos/effects/capneedbonuseffecthybrids.py
rename to eos/effects/effect2689.py
diff --git a/eos/effects/cpuneedbonuseffectlasers.py b/eos/effects/effect2690.py
similarity index 100%
rename from eos/effects/cpuneedbonuseffectlasers.py
rename to eos/effects/effect2690.py
diff --git a/eos/effects/cpuneedbonuseffecthybrid.py b/eos/effects/effect2691.py
similarity index 100%
rename from eos/effects/cpuneedbonuseffecthybrid.py
rename to eos/effects/effect2691.py
diff --git a/eos/effects/falloffbonuseffectlasers.py b/eos/effects/effect2693.py
similarity index 100%
rename from eos/effects/falloffbonuseffectlasers.py
rename to eos/effects/effect2693.py
diff --git a/eos/effects/falloffbonuseffecthybrids.py b/eos/effects/effect2694.py
similarity index 100%
rename from eos/effects/falloffbonuseffecthybrids.py
rename to eos/effects/effect2694.py
diff --git a/eos/effects/falloffbonuseffectprojectiles.py b/eos/effects/effect2695.py
similarity index 100%
rename from eos/effects/falloffbonuseffectprojectiles.py
rename to eos/effects/effect2695.py
diff --git a/eos/effects/maxrangebonuseffectlasers.py b/eos/effects/effect2696.py
similarity index 100%
rename from eos/effects/maxrangebonuseffectlasers.py
rename to eos/effects/effect2696.py
diff --git a/eos/effects/maxrangebonuseffecthybrids.py b/eos/effects/effect2697.py
similarity index 100%
rename from eos/effects/maxrangebonuseffecthybrids.py
rename to eos/effects/effect2697.py
diff --git a/eos/effects/maxrangebonuseffectprojectiles.py b/eos/effects/effect2698.py
similarity index 100%
rename from eos/effects/maxrangebonuseffectprojectiles.py
rename to eos/effects/effect2698.py
diff --git a/eos/effects/armorrepair.py b/eos/effects/effect27.py
similarity index 100%
rename from eos/effects/armorrepair.py
rename to eos/effects/effect27.py
diff --git a/eos/effects/drawbackpowerneedlasers.py b/eos/effects/effect2706.py
similarity index 100%
rename from eos/effects/drawbackpowerneedlasers.py
rename to eos/effects/effect2706.py
diff --git a/eos/effects/drawbackpowerneedhybrids.py b/eos/effects/effect2707.py
similarity index 100%
rename from eos/effects/drawbackpowerneedhybrids.py
rename to eos/effects/effect2707.py
diff --git a/eos/effects/drawbackpowerneedprojectiles.py b/eos/effects/effect2708.py
similarity index 100%
rename from eos/effects/drawbackpowerneedprojectiles.py
rename to eos/effects/effect2708.py
diff --git a/eos/effects/hullupgradesarmorhpbonuspostpercenthplocationship.py b/eos/effects/effect271.py
similarity index 100%
rename from eos/effects/hullupgradesarmorhpbonuspostpercenthplocationship.py
rename to eos/effects/effect271.py
diff --git a/eos/effects/drawbackarmorhp.py b/eos/effects/effect2712.py
similarity index 100%
rename from eos/effects/drawbackarmorhp.py
rename to eos/effects/effect2712.py
diff --git a/eos/effects/drawbackcpuoutput.py b/eos/effects/effect2713.py
similarity index 100%
rename from eos/effects/drawbackcpuoutput.py
rename to eos/effects/effect2713.py
diff --git a/eos/effects/drawbackcpuneedlaunchers.py b/eos/effects/effect2714.py
similarity index 100%
rename from eos/effects/drawbackcpuneedlaunchers.py
rename to eos/effects/effect2714.py
diff --git a/eos/effects/drawbacksigrad.py b/eos/effects/effect2716.py
similarity index 100%
rename from eos/effects/drawbacksigrad.py
rename to eos/effects/effect2716.py
diff --git a/eos/effects/drawbackmaxvelocity.py b/eos/effects/effect2717.py
similarity index 100%
rename from eos/effects/drawbackmaxvelocity.py
rename to eos/effects/effect2717.py
diff --git a/eos/effects/drawbackshieldcapacity.py b/eos/effects/effect2718.py
similarity index 100%
rename from eos/effects/drawbackshieldcapacity.py
rename to eos/effects/effect2718.py
diff --git a/eos/effects/repairsystemsdurationbonuspostpercentdurationlocationshipmodulesrequiringrepairsystems.py b/eos/effects/effect272.py
similarity index 100%
rename from eos/effects/repairsystemsdurationbonuspostpercentdurationlocationshipmodulesrequiringrepairsystems.py
rename to eos/effects/effect272.py
diff --git a/eos/effects/miningclouds.py b/eos/effects/effect2726.py
similarity index 100%
rename from eos/effects/miningclouds.py
rename to eos/effects/effect2726.py
diff --git a/eos/effects/gascloudharvestingmaxgroupskilllevel.py b/eos/effects/effect2727.py
similarity index 100%
rename from eos/effects/gascloudharvestingmaxgroupskilllevel.py
rename to eos/effects/effect2727.py
diff --git a/eos/effects/shieldupgradespowerneedbonuspostpercentpowerlocationshipmodulesrequiringshieldupgrades.py b/eos/effects/effect273.py
similarity index 100%
rename from eos/effects/shieldupgradespowerneedbonuspostpercentpowerlocationshipmodulesrequiringshieldupgrades.py
rename to eos/effects/effect273.py
diff --git a/eos/effects/shipecmscanstrengthbonuscf.py b/eos/effects/effect2734.py
similarity index 100%
rename from eos/effects/shipecmscanstrengthbonuscf.py
rename to eos/effects/effect2734.py
diff --git a/eos/effects/boosterarmorhppenalty.py b/eos/effects/effect2735.py
similarity index 100%
rename from eos/effects/boosterarmorhppenalty.py
rename to eos/effects/effect2735.py
diff --git a/eos/effects/boosterarmorrepairamountpenalty.py b/eos/effects/effect2736.py
similarity index 100%
rename from eos/effects/boosterarmorrepairamountpenalty.py
rename to eos/effects/effect2736.py
diff --git a/eos/effects/boostershieldcapacitypenalty.py b/eos/effects/effect2737.py
similarity index 100%
rename from eos/effects/boostershieldcapacitypenalty.py
rename to eos/effects/effect2737.py
diff --git a/eos/effects/boosterturretoptimalrangepenalty.py b/eos/effects/effect2739.py
similarity index 100%
rename from eos/effects/boosterturretoptimalrangepenalty.py
rename to eos/effects/effect2739.py
diff --git a/eos/effects/boosterturretfalloffpenalty.py b/eos/effects/effect2741.py
similarity index 100%
rename from eos/effects/boosterturretfalloffpenalty.py
rename to eos/effects/effect2741.py
diff --git a/eos/effects/boostercapacitorcapacitypenalty.py b/eos/effects/effect2745.py
similarity index 100%
rename from eos/effects/boostercapacitorcapacitypenalty.py
rename to eos/effects/effect2745.py
diff --git a/eos/effects/boostermaxvelocitypenalty.py b/eos/effects/effect2746.py
similarity index 100%
rename from eos/effects/boostermaxvelocitypenalty.py
rename to eos/effects/effect2746.py
diff --git a/eos/effects/boosterturrettrackingpenalty.py b/eos/effects/effect2747.py
similarity index 100%
rename from eos/effects/boosterturrettrackingpenalty.py
rename to eos/effects/effect2747.py
diff --git a/eos/effects/boostermissilevelocitypenalty.py b/eos/effects/effect2748.py
similarity index 100%
rename from eos/effects/boostermissilevelocitypenalty.py
rename to eos/effects/effect2748.py
diff --git a/eos/effects/boostermissileexplosionvelocitypenalty.py b/eos/effects/effect2749.py
similarity index 100%
rename from eos/effects/boostermissileexplosionvelocitypenalty.py
rename to eos/effects/effect2749.py
diff --git a/eos/effects/shipbonusecmstrengthbonuscc.py b/eos/effects/effect2756.py
similarity index 100%
rename from eos/effects/shipbonusecmstrengthbonuscc.py
rename to eos/effects/effect2756.py
diff --git a/eos/effects/salvaging.py b/eos/effects/effect2757.py
similarity index 100%
rename from eos/effects/salvaging.py
rename to eos/effects/effect2757.py
diff --git a/eos/effects/boostermodifyboosterarmorpenalties.py b/eos/effects/effect2760.py
similarity index 100%
rename from eos/effects/boostermodifyboosterarmorpenalties.py
rename to eos/effects/effect2760.py
diff --git a/eos/effects/boostermodifyboostershieldpenalty.py b/eos/effects/effect2763.py
similarity index 100%
rename from eos/effects/boostermodifyboostershieldpenalty.py
rename to eos/effects/effect2763.py
diff --git a/eos/effects/boostermodifyboostermaxvelocityandcapacitorpenalty.py b/eos/effects/effect2766.py
similarity index 100%
rename from eos/effects/boostermodifyboostermaxvelocityandcapacitorpenalty.py
rename to eos/effects/effect2766.py
diff --git a/eos/effects/tacticalshieldmanipulationskillboostuniformitybonus.py b/eos/effects/effect277.py
similarity index 100%
rename from eos/effects/tacticalshieldmanipulationskillboostuniformitybonus.py
rename to eos/effects/effect277.py
diff --git a/eos/effects/boostermodifyboostermissilepenalty.py b/eos/effects/effect2776.py
similarity index 100%
rename from eos/effects/boostermodifyboostermissilepenalty.py
rename to eos/effects/effect2776.py
diff --git a/eos/effects/boostermodifyboosterturretpenalty.py b/eos/effects/effect2778.py
similarity index 100%
rename from eos/effects/boostermodifyboosterturretpenalty.py
rename to eos/effects/effect2778.py
diff --git a/eos/effects/shieldemmisionsystemscapneedbonuspostpercentcapacitorneedlocationshipmodulesrequiringshieldemmisionsystems.py b/eos/effects/effect279.py
similarity index 100%
rename from eos/effects/shieldemmisionsystemscapneedbonuspostpercentcapacitorneedlocationshipmodulesrequiringshieldemmisionsystems.py
rename to eos/effects/effect279.py
diff --git a/eos/effects/boostermissileexplosioncloudpenaltyfixed.py b/eos/effects/effect2791.py
similarity index 100%
rename from eos/effects/boostermissileexplosioncloudpenaltyfixed.py
rename to eos/effects/effect2791.py
diff --git a/eos/effects/modifyarmorresonancepostpercentpassive.py b/eos/effects/effect2792.py
similarity index 100%
rename from eos/effects/modifyarmorresonancepostpercentpassive.py
rename to eos/effects/effect2792.py
diff --git a/eos/effects/salvagingaccessdifficultybonuseffectpassive.py b/eos/effects/effect2794.py
similarity index 100%
rename from eos/effects/salvagingaccessdifficultybonuseffectpassive.py
rename to eos/effects/effect2794.py
diff --git a/eos/effects/modifyshieldresonancepostpercentpassive.py b/eos/effects/effect2795.py
similarity index 100%
rename from eos/effects/modifyshieldresonancepostpercentpassive.py
rename to eos/effects/effect2795.py
diff --git a/eos/effects/massreductionbonuspassive.py b/eos/effects/effect2796.py
similarity index 100%
rename from eos/effects/massreductionbonuspassive.py
rename to eos/effects/effect2796.py
diff --git a/eos/effects/projectileweaponspeedmultiplypassive.py b/eos/effects/effect2797.py
similarity index 100%
rename from eos/effects/projectileweaponspeedmultiplypassive.py
rename to eos/effects/effect2797.py
diff --git a/eos/effects/projectileweapondamagemultiplypassive.py b/eos/effects/effect2798.py
similarity index 100%
rename from eos/effects/projectileweapondamagemultiplypassive.py
rename to eos/effects/effect2798.py
diff --git a/eos/effects/missilelauncherspeedmultiplierpassive.py b/eos/effects/effect2799.py
similarity index 100%
rename from eos/effects/missilelauncherspeedmultiplierpassive.py
rename to eos/effects/effect2799.py
diff --git a/eos/effects/energyweaponspeedmultiplypassive.py b/eos/effects/effect2801.py
similarity index 100%
rename from eos/effects/energyweaponspeedmultiplypassive.py
rename to eos/effects/effect2801.py
diff --git a/eos/effects/hybridweapondamagemultiplypassive.py b/eos/effects/effect2802.py
similarity index 100%
rename from eos/effects/hybridweapondamagemultiplypassive.py
rename to eos/effects/effect2802.py
diff --git a/eos/effects/energyweapondamagemultiplypassive.py b/eos/effects/effect2803.py
similarity index 100%
rename from eos/effects/energyweapondamagemultiplypassive.py
rename to eos/effects/effect2803.py
diff --git a/eos/effects/hybridweaponspeedmultiplypassive.py b/eos/effects/effect2804.py
similarity index 100%
rename from eos/effects/hybridweaponspeedmultiplypassive.py
rename to eos/effects/effect2804.py
diff --git a/eos/effects/shipbonuslargeenergyweapondamageab2.py b/eos/effects/effect2805.py
similarity index 100%
rename from eos/effects/shipbonuslargeenergyweapondamageab2.py
rename to eos/effects/effect2805.py
diff --git a/eos/effects/shipmissileassaultmissilevelocitybonuscc2.py b/eos/effects/effect2809.py
similarity index 100%
rename from eos/effects/shipmissileassaultmissilevelocitybonuscc2.py
rename to eos/effects/effect2809.py
diff --git a/eos/effects/elitebonusheavygunshipassaultmissileflighttime1.py b/eos/effects/effect2810.py
similarity index 100%
rename from eos/effects/elitebonusheavygunshipassaultmissileflighttime1.py
rename to eos/effects/effect2810.py
diff --git a/eos/effects/caldarishipecmburstoptimalrangecb3.py b/eos/effects/effect2812.py
similarity index 100%
rename from eos/effects/caldarishipecmburstoptimalrangecb3.py
rename to eos/effects/effect2812.py
diff --git a/eos/effects/armorhpbonusadd.py b/eos/effects/effect2837.py
similarity index 100%
rename from eos/effects/armorhpbonusadd.py
rename to eos/effects/effect2837.py
diff --git a/eos/effects/trackingspeedbonuspassiverequiringgunnerytrackingspeedbonus.py b/eos/effects/effect2847.py
similarity index 100%
rename from eos/effects/trackingspeedbonuspassiverequiringgunnerytrackingspeedbonus.py
rename to eos/effects/effect2847.py
diff --git a/eos/effects/accessdifficultybonusmodifierrequiringarchaelogy.py b/eos/effects/effect2848.py
similarity index 100%
rename from eos/effects/accessdifficultybonusmodifierrequiringarchaelogy.py
rename to eos/effects/effect2848.py
diff --git a/eos/effects/accessdifficultybonusmodifierrequiringhacking.py b/eos/effects/effect2849.py
similarity index 100%
rename from eos/effects/accessdifficultybonusmodifierrequiringhacking.py
rename to eos/effects/effect2849.py
diff --git a/eos/effects/durationbonusforgroupafterburner.py b/eos/effects/effect2850.py
similarity index 100%
rename from eos/effects/durationbonusforgroupafterburner.py
rename to eos/effects/effect2850.py
diff --git a/eos/effects/missiledmgbonuspassive.py b/eos/effects/effect2851.py
similarity index 100%
rename from eos/effects/missiledmgbonuspassive.py
rename to eos/effects/effect2851.py
diff --git a/eos/effects/cloakingtargetingdelaybonuslrsmcloakingpassive.py b/eos/effects/effect2853.py
similarity index 100%
rename from eos/effects/cloakingtargetingdelaybonuslrsmcloakingpassive.py
rename to eos/effects/effect2853.py
diff --git a/eos/effects/cynosuralgeneration.py b/eos/effects/effect2857.py
similarity index 100%
rename from eos/effects/cynosuralgeneration.py
rename to eos/effects/effect2857.py
diff --git a/eos/effects/velocitybonusonline.py b/eos/effects/effect2865.py
similarity index 100%
rename from eos/effects/velocitybonusonline.py
rename to eos/effects/effect2865.py
diff --git a/eos/effects/biologytimebonusfixed.py b/eos/effects/effect2866.py
similarity index 100%
rename from eos/effects/biologytimebonusfixed.py
rename to eos/effects/effect2866.py
diff --git a/eos/effects/sentrydronedamagebonus.py b/eos/effects/effect2867.py
similarity index 100%
rename from eos/effects/sentrydronedamagebonus.py
rename to eos/effects/effect2867.py
diff --git a/eos/effects/armordamageamountbonuscapitalarmorrepairers.py b/eos/effects/effect2868.py
similarity index 100%
rename from eos/effects/armordamageamountbonuscapitalarmorrepairers.py
rename to eos/effects/effect2868.py
diff --git a/eos/effects/controlledburstscapneedbonuspostpercentcapacitorneedlocationshipmodulesrequiringgunnery.py b/eos/effects/effect287.py
similarity index 100%
rename from eos/effects/controlledburstscapneedbonuspostpercentcapacitorneedlocationshipmodulesrequiringgunnery.py
rename to eos/effects/effect287.py
diff --git a/eos/effects/missilevelocitybonusdefender.py b/eos/effects/effect2872.py
similarity index 100%
rename from eos/effects/missilevelocitybonusdefender.py
rename to eos/effects/effect2872.py
diff --git a/eos/effects/missileemdmgbonuscruise3.py b/eos/effects/effect2881.py
similarity index 100%
rename from eos/effects/missileemdmgbonuscruise3.py
rename to eos/effects/effect2881.py
diff --git a/eos/effects/missileexplosivedmgbonuscruise3.py b/eos/effects/effect2882.py
similarity index 100%
rename from eos/effects/missileexplosivedmgbonuscruise3.py
rename to eos/effects/effect2882.py
diff --git a/eos/effects/missilekineticdmgbonuscruise3.py b/eos/effects/effect2883.py
similarity index 100%
rename from eos/effects/missilekineticdmgbonuscruise3.py
rename to eos/effects/effect2883.py
diff --git a/eos/effects/missilethermaldmgbonuscruise3.py b/eos/effects/effect2884.py
similarity index 100%
rename from eos/effects/missilethermaldmgbonuscruise3.py
rename to eos/effects/effect2884.py
diff --git a/eos/effects/gasharvestingcycletimemodulesrequiringgascloudharvesting.py b/eos/effects/effect2885.py
similarity index 100%
rename from eos/effects/gasharvestingcycletimemodulesrequiringgascloudharvesting.py
rename to eos/effects/effect2885.py
diff --git a/eos/effects/missileemdmgbonusrocket.py b/eos/effects/effect2887.py
similarity index 100%
rename from eos/effects/missileemdmgbonusrocket.py
rename to eos/effects/effect2887.py
diff --git a/eos/effects/missileexplosivedmgbonusrocket.py b/eos/effects/effect2888.py
similarity index 100%
rename from eos/effects/missileexplosivedmgbonusrocket.py
rename to eos/effects/effect2888.py
diff --git a/eos/effects/missilekineticdmgbonusrocket.py b/eos/effects/effect2889.py
similarity index 100%
rename from eos/effects/missilekineticdmgbonusrocket.py
rename to eos/effects/effect2889.py
diff --git a/eos/effects/missilethermaldmgbonusrocket.py b/eos/effects/effect2890.py
similarity index 100%
rename from eos/effects/missilethermaldmgbonusrocket.py
rename to eos/effects/effect2890.py
diff --git a/eos/effects/missileemdmgbonusstandard.py b/eos/effects/effect2891.py
similarity index 100%
rename from eos/effects/missileemdmgbonusstandard.py
rename to eos/effects/effect2891.py
diff --git a/eos/effects/missileexplosivedmgbonusstandard.py b/eos/effects/effect2892.py
similarity index 100%
rename from eos/effects/missileexplosivedmgbonusstandard.py
rename to eos/effects/effect2892.py
diff --git a/eos/effects/missilekineticdmgbonusstandard.py b/eos/effects/effect2893.py
similarity index 100%
rename from eos/effects/missilekineticdmgbonusstandard.py
rename to eos/effects/effect2893.py
diff --git a/eos/effects/missilethermaldmgbonusstandard.py b/eos/effects/effect2894.py
similarity index 100%
rename from eos/effects/missilethermaldmgbonusstandard.py
rename to eos/effects/effect2894.py
diff --git a/eos/effects/missileemdmgbonusheavy.py b/eos/effects/effect2899.py
similarity index 100%
rename from eos/effects/missileemdmgbonusheavy.py
rename to eos/effects/effect2899.py
diff --git a/eos/effects/sharpshooterrangeskillbonuspostpercentmaxrangelocationshipmodulesrequiringgunnery.py b/eos/effects/effect290.py
similarity index 100%
rename from eos/effects/sharpshooterrangeskillbonuspostpercentmaxrangelocationshipmodulesrequiringgunnery.py
rename to eos/effects/effect290.py
diff --git a/eos/effects/missileexplosivedmgbonusheavy.py b/eos/effects/effect2900.py
similarity index 100%
rename from eos/effects/missileexplosivedmgbonusheavy.py
rename to eos/effects/effect2900.py
diff --git a/eos/effects/missilekineticdmgbonusheavy.py b/eos/effects/effect2901.py
similarity index 100%
rename from eos/effects/missilekineticdmgbonusheavy.py
rename to eos/effects/effect2901.py
diff --git a/eos/effects/missilethermaldmgbonusheavy.py b/eos/effects/effect2902.py
similarity index 100%
rename from eos/effects/missilethermaldmgbonusheavy.py
rename to eos/effects/effect2902.py
diff --git a/eos/effects/missileemdmgbonusham.py b/eos/effects/effect2903.py
similarity index 100%
rename from eos/effects/missileemdmgbonusham.py
rename to eos/effects/effect2903.py
diff --git a/eos/effects/missileexplosivedmgbonusham.py b/eos/effects/effect2904.py
similarity index 100%
rename from eos/effects/missileexplosivedmgbonusham.py
rename to eos/effects/effect2904.py
diff --git a/eos/effects/missilekineticdmgbonusham.py b/eos/effects/effect2905.py
similarity index 100%
rename from eos/effects/missilekineticdmgbonusham.py
rename to eos/effects/effect2905.py
diff --git a/eos/effects/missilethermaldmgbonusham.py b/eos/effects/effect2906.py
similarity index 100%
rename from eos/effects/missilethermaldmgbonusham.py
rename to eos/effects/effect2906.py
diff --git a/eos/effects/missileemdmgbonustorpedo.py b/eos/effects/effect2907.py
similarity index 100%
rename from eos/effects/missileemdmgbonustorpedo.py
rename to eos/effects/effect2907.py
diff --git a/eos/effects/missileexplosivedmgbonustorpedo.py b/eos/effects/effect2908.py
similarity index 100%
rename from eos/effects/missileexplosivedmgbonustorpedo.py
rename to eos/effects/effect2908.py
diff --git a/eos/effects/missilekineticdmgbonustorpedo.py b/eos/effects/effect2909.py
similarity index 100%
rename from eos/effects/missilekineticdmgbonustorpedo.py
rename to eos/effects/effect2909.py
diff --git a/eos/effects/missilethermaldmgbonustorpedo.py b/eos/effects/effect2910.py
similarity index 100%
rename from eos/effects/missilethermaldmgbonustorpedo.py
rename to eos/effects/effect2910.py
diff --git a/eos/effects/dataminermoduledurationreduction.py b/eos/effects/effect2911.py
similarity index 100%
rename from eos/effects/dataminermoduledurationreduction.py
rename to eos/effects/effect2911.py
diff --git a/eos/effects/skilltriagemoduleconsumptionquantitybonus.py b/eos/effects/effect2967.py
similarity index 100%
rename from eos/effects/skilltriagemoduleconsumptionquantitybonus.py
rename to eos/effects/effect2967.py
diff --git a/eos/effects/skillremotehullrepairsystemscapneedbonus.py b/eos/effects/effect2977.py
similarity index 100%
rename from eos/effects/skillremotehullrepairsystemscapneedbonus.py
rename to eos/effects/effect2977.py
diff --git a/eos/effects/surgicalstrikefalloffbonuspostpercentfallofflocationshipmodulesrequiringgunnery.py b/eos/effects/effect298.py
similarity index 100%
rename from eos/effects/surgicalstrikefalloffbonuspostpercentfallofflocationshipmodulesrequiringgunnery.py
rename to eos/effects/effect298.py
diff --git a/eos/effects/skillcapitalremotehullrepairsystemscapneedbonus.py b/eos/effects/effect2980.py
similarity index 100%
rename from eos/effects/skillcapitalremotehullrepairsystemscapneedbonus.py
rename to eos/effects/effect2980.py
diff --git a/eos/effects/skillremoteecmdurationbonus.py b/eos/effects/effect2982.py
similarity index 100%
rename from eos/effects/skillremoteecmdurationbonus.py
rename to eos/effects/effect2982.py
diff --git a/eos/effects/overloadrofbonus.py b/eos/effects/effect3001.py
similarity index 100%
rename from eos/effects/overloadrofbonus.py
rename to eos/effects/effect3001.py
diff --git a/eos/effects/overloadselfdurationbonus.py b/eos/effects/effect3002.py
similarity index 100%
rename from eos/effects/overloadselfdurationbonus.py
rename to eos/effects/effect3002.py
diff --git a/eos/effects/elitebonuscoveropsbombexplosivedmg1.py b/eos/effects/effect3024.py
similarity index 100%
rename from eos/effects/elitebonuscoveropsbombexplosivedmg1.py
rename to eos/effects/effect3024.py
diff --git a/eos/effects/overloadselfdamagebonus.py b/eos/effects/effect3025.py
similarity index 100%
rename from eos/effects/overloadselfdamagebonus.py
rename to eos/effects/effect3025.py
diff --git a/eos/effects/elitebonuscoveropsbombkineticdmg1.py b/eos/effects/effect3026.py
similarity index 100%
rename from eos/effects/elitebonuscoveropsbombkineticdmg1.py
rename to eos/effects/effect3026.py
diff --git a/eos/effects/elitebonuscoveropsbombthermaldmg1.py b/eos/effects/effect3027.py
similarity index 100%
rename from eos/effects/elitebonuscoveropsbombthermaldmg1.py
rename to eos/effects/effect3027.py
diff --git a/eos/effects/elitebonuscoveropsbombemdmg1.py b/eos/effects/effect3028.py
similarity index 100%
rename from eos/effects/elitebonuscoveropsbombemdmg1.py
rename to eos/effects/effect3028.py
diff --git a/eos/effects/overloadselfemhardeningbonus.py b/eos/effects/effect3029.py
similarity index 100%
rename from eos/effects/overloadselfemhardeningbonus.py
rename to eos/effects/effect3029.py
diff --git a/eos/effects/overloadselfthermalhardeningbonus.py b/eos/effects/effect3030.py
similarity index 100%
rename from eos/effects/overloadselfthermalhardeningbonus.py
rename to eos/effects/effect3030.py
diff --git a/eos/effects/overloadselfexplosivehardeningbonus.py b/eos/effects/effect3031.py
similarity index 100%
rename from eos/effects/overloadselfexplosivehardeningbonus.py
rename to eos/effects/effect3031.py
diff --git a/eos/effects/overloadselfkinetichardeningbonus.py b/eos/effects/effect3032.py
similarity index 100%
rename from eos/effects/overloadselfkinetichardeningbonus.py
rename to eos/effects/effect3032.py
diff --git a/eos/effects/overloadselfhardeninginvulnerabilitybonus.py b/eos/effects/effect3035.py
similarity index 100%
rename from eos/effects/overloadselfhardeninginvulnerabilitybonus.py
rename to eos/effects/effect3035.py
diff --git a/eos/effects/skillbombdeploymentmodulereactivationdelaybonus.py b/eos/effects/effect3036.py
similarity index 100%
rename from eos/effects/skillbombdeploymentmodulereactivationdelaybonus.py
rename to eos/effects/effect3036.py
diff --git a/eos/effects/modifymaxvelocityofshippassive.py b/eos/effects/effect3046.py
similarity index 100%
rename from eos/effects/modifymaxvelocityofshippassive.py
rename to eos/effects/effect3046.py
diff --git a/eos/effects/structurehpmultiplypassive.py b/eos/effects/effect3047.py
similarity index 100%
rename from eos/effects/structurehpmultiplypassive.py
rename to eos/effects/effect3047.py
diff --git a/eos/effects/heatdamagebonus.py b/eos/effects/effect3061.py
similarity index 100%
rename from eos/effects/heatdamagebonus.py
rename to eos/effects/effect3061.py
diff --git a/eos/effects/dronesskillboostmaxactivedronebonus.py b/eos/effects/effect315.py
similarity index 100%
rename from eos/effects/dronesskillboostmaxactivedronebonus.py
rename to eos/effects/effect315.py
diff --git a/eos/effects/shieldtransportcpuneedbonuseffect.py b/eos/effects/effect3169.py
similarity index 100%
rename from eos/effects/shieldtransportcpuneedbonuseffect.py
rename to eos/effects/effect3169.py
diff --git a/eos/effects/dronearmordamagebonuseffect.py b/eos/effects/effect3172.py
similarity index 100%
rename from eos/effects/dronearmordamagebonuseffect.py
rename to eos/effects/effect3172.py
diff --git a/eos/effects/droneshieldbonusbonuseffect.py b/eos/effects/effect3173.py
similarity index 100%
rename from eos/effects/droneshieldbonusbonuseffect.py
rename to eos/effects/effect3173.py
diff --git a/eos/effects/overloadselfrangebonus.py b/eos/effects/effect3174.py
similarity index 100%
rename from eos/effects/overloadselfrangebonus.py
rename to eos/effects/effect3174.py
diff --git a/eos/effects/overloadselfspeedbonus.py b/eos/effects/effect3175.py
similarity index 100%
rename from eos/effects/overloadselfspeedbonus.py
rename to eos/effects/effect3175.py
diff --git a/eos/effects/overloadselfecmstrenghtbonus.py b/eos/effects/effect3182.py
similarity index 100%
rename from eos/effects/overloadselfecmstrenghtbonus.py
rename to eos/effects/effect3182.py
diff --git a/eos/effects/thermodynamicsskilldamagebonus.py b/eos/effects/effect3196.py
similarity index 100%
rename from eos/effects/thermodynamicsskilldamagebonus.py
rename to eos/effects/effect3196.py
diff --git a/eos/effects/overloadselfarmordamageamountdurationbonus.py b/eos/effects/effect3200.py
similarity index 100%
rename from eos/effects/overloadselfarmordamageamountdurationbonus.py
rename to eos/effects/effect3200.py
diff --git a/eos/effects/overloadselfshieldbonusdurationbonus.py b/eos/effects/effect3201.py
similarity index 100%
rename from eos/effects/overloadselfshieldbonusdurationbonus.py
rename to eos/effects/effect3201.py
diff --git a/eos/effects/missileskillfofaoecloudsizebonus.py b/eos/effects/effect3212.py
similarity index 100%
rename from eos/effects/missileskillfofaoecloudsizebonus.py
rename to eos/effects/effect3212.py
diff --git a/eos/effects/shiprocketexplosivedmgaf.py b/eos/effects/effect3234.py
similarity index 100%
rename from eos/effects/shiprocketexplosivedmgaf.py
rename to eos/effects/effect3234.py
diff --git a/eos/effects/shiprocketkineticdmgaf.py b/eos/effects/effect3235.py
similarity index 100%
rename from eos/effects/shiprocketkineticdmgaf.py
rename to eos/effects/effect3235.py
diff --git a/eos/effects/shiprocketthermaldmgaf.py b/eos/effects/effect3236.py
similarity index 100%
rename from eos/effects/shiprocketthermaldmgaf.py
rename to eos/effects/effect3236.py
diff --git a/eos/effects/shiprocketemdmgaf.py b/eos/effects/effect3237.py
similarity index 100%
rename from eos/effects/shiprocketemdmgaf.py
rename to eos/effects/effect3237.py
diff --git a/eos/effects/elitebonusgunshiparmoremresistance1.py b/eos/effects/effect3241.py
similarity index 100%
rename from eos/effects/elitebonusgunshiparmoremresistance1.py
rename to eos/effects/effect3241.py
diff --git a/eos/effects/elitebonusgunshiparmorthermalresistance1.py b/eos/effects/effect3242.py
similarity index 100%
rename from eos/effects/elitebonusgunshiparmorthermalresistance1.py
rename to eos/effects/effect3242.py
diff --git a/eos/effects/elitebonusgunshiparmorkineticresistance1.py b/eos/effects/effect3243.py
similarity index 100%
rename from eos/effects/elitebonusgunshiparmorkineticresistance1.py
rename to eos/effects/effect3243.py
diff --git a/eos/effects/elitebonusgunshiparmorexplosiveresistance1.py b/eos/effects/effect3244.py
similarity index 100%
rename from eos/effects/elitebonusgunshiparmorexplosiveresistance1.py
rename to eos/effects/effect3244.py
diff --git a/eos/effects/shipcaprecharge2af.py b/eos/effects/effect3249.py
similarity index 100%
rename from eos/effects/shipcaprecharge2af.py
rename to eos/effects/effect3249.py
diff --git a/eos/effects/skillindustrialreconfigurationconsumptionquantitybonus.py b/eos/effects/effect3264.py
similarity index 100%
rename from eos/effects/skillindustrialreconfigurationconsumptionquantitybonus.py
rename to eos/effects/effect3264.py
diff --git a/eos/effects/shipconsumptionquantitybonusindustrialreconfigurationorecapital1.py b/eos/effects/effect3267.py
similarity index 100%
rename from eos/effects/shipconsumptionquantitybonusindustrialreconfigurationorecapital1.py
rename to eos/effects/effect3267.py
diff --git a/eos/effects/shipenergyneutralizertransferamountbonusab.py b/eos/effects/effect3297.py
similarity index 100%
rename from eos/effects/shipenergyneutralizertransferamountbonusab.py
rename to eos/effects/effect3297.py
diff --git a/eos/effects/shipenergyneutralizertransferamountbonusac.py b/eos/effects/effect3298.py
similarity index 100%
rename from eos/effects/shipenergyneutralizertransferamountbonusac.py
rename to eos/effects/effect3298.py
diff --git a/eos/effects/shipenergyneutralizertransferamountbonusaf.py b/eos/effects/effect3299.py
similarity index 100%
rename from eos/effects/shipenergyneutralizertransferamountbonusaf.py
rename to eos/effects/effect3299.py
diff --git a/eos/effects/clonevatmaxjumpclonebonusskillnew.py b/eos/effects/effect3313.py
similarity index 100%
rename from eos/effects/clonevatmaxjumpclonebonusskillnew.py
rename to eos/effects/effect3313.py
diff --git a/eos/effects/elitebonuscommandshiparmorhp1.py b/eos/effects/effect3331.py
similarity index 100%
rename from eos/effects/elitebonuscommandshiparmorhp1.py
rename to eos/effects/effect3331.py
diff --git a/eos/effects/shiparmoremresistancemc2.py b/eos/effects/effect3335.py
similarity index 100%
rename from eos/effects/shiparmoremresistancemc2.py
rename to eos/effects/effect3335.py
diff --git a/eos/effects/shiparmorexplosiveresistancemc2.py b/eos/effects/effect3336.py
similarity index 100%
rename from eos/effects/shiparmorexplosiveresistancemc2.py
rename to eos/effects/effect3336.py
diff --git a/eos/effects/shiparmorkineticresistancemc2.py b/eos/effects/effect3339.py
similarity index 100%
rename from eos/effects/shiparmorkineticresistancemc2.py
rename to eos/effects/effect3339.py
diff --git a/eos/effects/shiparmorthermalresistancemc2.py b/eos/effects/effect3340.py
similarity index 100%
rename from eos/effects/shiparmorthermalresistancemc2.py
rename to eos/effects/effect3340.py
diff --git a/eos/effects/elitebonusheavyinterdictorsprojectilefalloff1.py b/eos/effects/effect3343.py
similarity index 100%
rename from eos/effects/elitebonusheavyinterdictorsprojectilefalloff1.py
rename to eos/effects/effect3343.py
diff --git a/eos/effects/elitebonusheavyinterdictorheavymissilevelocitybonus1.py b/eos/effects/effect3355.py
similarity index 100%
rename from eos/effects/elitebonusheavyinterdictorheavymissilevelocitybonus1.py
rename to eos/effects/effect3355.py
diff --git a/eos/effects/elitebonusheavyinterdictorheavyassaultmissilevelocitybonus.py b/eos/effects/effect3356.py
similarity index 100%
rename from eos/effects/elitebonusheavyinterdictorheavyassaultmissilevelocitybonus.py
rename to eos/effects/effect3356.py
diff --git a/eos/effects/elitebonusheavyinterdictorlightmissilevelocitybonus.py b/eos/effects/effect3357.py
similarity index 100%
rename from eos/effects/elitebonusheavyinterdictorlightmissilevelocitybonus.py
rename to eos/effects/effect3357.py
diff --git a/eos/effects/shipremotesensordampenercapneedgf.py b/eos/effects/effect3366.py
similarity index 100%
rename from eos/effects/shipremotesensordampenercapneedgf.py
rename to eos/effects/effect3366.py
diff --git a/eos/effects/elitebonuselectronicattackshipwarpscramblermaxrange1.py b/eos/effects/effect3367.py
similarity index 100%
rename from eos/effects/elitebonuselectronicattackshipwarpscramblermaxrange1.py
rename to eos/effects/effect3367.py
diff --git a/eos/effects/elitebonuselectronicattackshipecmoptimalrange1.py b/eos/effects/effect3369.py
similarity index 100%
rename from eos/effects/elitebonuselectronicattackshipecmoptimalrange1.py
rename to eos/effects/effect3369.py
diff --git a/eos/effects/elitebonuselectronicattackshipstasiswebmaxrange1.py b/eos/effects/effect3370.py
similarity index 100%
rename from eos/effects/elitebonuselectronicattackshipstasiswebmaxrange1.py
rename to eos/effects/effect3370.py
diff --git a/eos/effects/elitebonuselectronicattackshipwarpscramblercapneed2.py b/eos/effects/effect3371.py
similarity index 100%
rename from eos/effects/elitebonuselectronicattackshipwarpscramblercapneed2.py
rename to eos/effects/effect3371.py
diff --git a/eos/effects/elitebonuselectronicattackshipsignatureradius2.py b/eos/effects/effect3374.py
similarity index 100%
rename from eos/effects/elitebonuselectronicattackshipsignatureradius2.py
rename to eos/effects/effect3374.py
diff --git a/eos/effects/implanthardwiringabcapacitorneed.py b/eos/effects/effect3379.py
similarity index 100%
rename from eos/effects/implanthardwiringabcapacitorneed.py
rename to eos/effects/effect3379.py
diff --git a/eos/effects/warpdisruptsphere.py b/eos/effects/effect3380.py
similarity index 100%
rename from eos/effects/warpdisruptsphere.py
rename to eos/effects/effect3380.py
diff --git a/eos/effects/elitebonusblackopslargeenergyturrettracking1.py b/eos/effects/effect3392.py
similarity index 100%
rename from eos/effects/elitebonusblackopslargeenergyturrettracking1.py
rename to eos/effects/effect3392.py
diff --git a/eos/effects/projectilefired.py b/eos/effects/effect34.py
similarity index 100%
rename from eos/effects/projectilefired.py
rename to eos/effects/effect34.py
diff --git a/eos/effects/elitebonusblackopscloakvelocity2.py b/eos/effects/effect3403.py
similarity index 100%
rename from eos/effects/elitebonusblackopscloakvelocity2.py
rename to eos/effects/effect3403.py
diff --git a/eos/effects/elitebonusblackopsmaxvelocity1.py b/eos/effects/effect3406.py
similarity index 100%
rename from eos/effects/elitebonusblackopsmaxvelocity1.py
rename to eos/effects/effect3406.py
diff --git a/eos/effects/elitebonusviolatorslargeenergyturretdamagerole1.py b/eos/effects/effect3415.py
similarity index 100%
rename from eos/effects/elitebonusviolatorslargeenergyturretdamagerole1.py
rename to eos/effects/effect3415.py
diff --git a/eos/effects/elitebonusviolatorslargehybridturretdamagerole1.py b/eos/effects/effect3416.py
similarity index 100%
rename from eos/effects/elitebonusviolatorslargehybridturretdamagerole1.py
rename to eos/effects/effect3416.py
diff --git a/eos/effects/elitebonusviolatorslargeprojectileturretdamagerole1.py b/eos/effects/effect3417.py
similarity index 100%
rename from eos/effects/elitebonusviolatorslargeprojectileturretdamagerole1.py
rename to eos/effects/effect3417.py
diff --git a/eos/effects/elitebonusviolatorslargehybridturrettracking1.py b/eos/effects/effect3424.py
similarity index 100%
rename from eos/effects/elitebonusviolatorslargehybridturrettracking1.py
rename to eos/effects/effect3424.py
diff --git a/eos/effects/elitebonusviolatorslargeprojectileturrettracking1.py b/eos/effects/effect3425.py
similarity index 100%
rename from eos/effects/elitebonusviolatorslargeprojectileturrettracking1.py
rename to eos/effects/effect3425.py
diff --git a/eos/effects/elitebonusviolatorstractorbeammaxrangerole2.py b/eos/effects/effect3427.py
similarity index 100%
rename from eos/effects/elitebonusviolatorstractorbeammaxrangerole2.py
rename to eos/effects/effect3427.py
diff --git a/eos/effects/elitebonusviolatorsewtargetpainting1.py b/eos/effects/effect3439.py
similarity index 100%
rename from eos/effects/elitebonusviolatorsewtargetpainting1.py
rename to eos/effects/effect3439.py
diff --git a/eos/effects/shipbonusptfalloffmb1.py b/eos/effects/effect3447.py
similarity index 100%
rename from eos/effects/shipbonusptfalloffmb1.py
rename to eos/effects/effect3447.py
diff --git a/eos/effects/elitebonuselectronicattackshiprechargerate2.py b/eos/effects/effect3466.py
similarity index 100%
rename from eos/effects/elitebonuselectronicattackshiprechargerate2.py
rename to eos/effects/effect3466.py
diff --git a/eos/effects/elitebonuselectronicattackshipcapacitorcapacity2.py b/eos/effects/effect3467.py
similarity index 100%
rename from eos/effects/elitebonuselectronicattackshipcapacitorcapacity2.py
rename to eos/effects/effect3467.py
diff --git a/eos/effects/elitebonusheavyinterdictorswarpdisruptfieldgeneratorwarpscramblerange2.py b/eos/effects/effect3468.py
similarity index 100%
rename from eos/effects/elitebonusheavyinterdictorswarpdisruptfieldgeneratorwarpscramblerange2.py
rename to eos/effects/effect3468.py
diff --git a/eos/effects/elitebonusviolatorstractorbeammaxtractorvelocityrole3.py b/eos/effects/effect3473.py
similarity index 100%
rename from eos/effects/elitebonusviolatorstractorbeammaxtractorvelocityrole3.py
rename to eos/effects/effect3473.py
diff --git a/eos/effects/shiplaserdamagepiratebattleship.py b/eos/effects/effect3478.py
similarity index 100%
rename from eos/effects/shiplaserdamagepiratebattleship.py
rename to eos/effects/effect3478.py
diff --git a/eos/effects/shiptrackingbonusab.py b/eos/effects/effect3480.py
similarity index 100%
rename from eos/effects/shiptrackingbonusab.py
rename to eos/effects/effect3480.py
diff --git a/eos/effects/shipbonusmediumenergyturretdamagepiratefaction.py b/eos/effects/effect3483.py
similarity index 100%
rename from eos/effects/shipbonusmediumenergyturretdamagepiratefaction.py
rename to eos/effects/effect3483.py
diff --git a/eos/effects/shipbonusmediumenergyturrettrackingac2.py b/eos/effects/effect3484.py
similarity index 100%
rename from eos/effects/shipbonusmediumenergyturrettrackingac2.py
rename to eos/effects/effect3484.py
diff --git a/eos/effects/shipbonussmallenergyturretdamagepiratefaction.py b/eos/effects/effect3487.py
similarity index 100%
rename from eos/effects/shipbonussmallenergyturretdamagepiratefaction.py
rename to eos/effects/effect3487.py
diff --git a/eos/effects/shipbonussmallenergyturrettracking2af.py b/eos/effects/effect3489.py
similarity index 100%
rename from eos/effects/shipbonussmallenergyturrettracking2af.py
rename to eos/effects/effect3489.py
diff --git a/eos/effects/rorqualcargoscanrangebonus.py b/eos/effects/effect3493.py
similarity index 100%
rename from eos/effects/rorqualcargoscanrangebonus.py
rename to eos/effects/effect3493.py
diff --git a/eos/effects/rorqualsurveyscannerrangebonus.py b/eos/effects/effect3494.py
similarity index 100%
rename from eos/effects/rorqualsurveyscannerrangebonus.py
rename to eos/effects/effect3494.py
diff --git a/eos/effects/shipcappropulsionjamming.py b/eos/effects/effect3495.py
similarity index 100%
rename from eos/effects/shipcappropulsionjamming.py
rename to eos/effects/effect3495.py
diff --git a/eos/effects/setbonusthukker.py b/eos/effects/effect3496.py
similarity index 100%
rename from eos/effects/setbonusthukker.py
rename to eos/effects/effect3496.py
diff --git a/eos/effects/setbonussisters.py b/eos/effects/effect3498.py
similarity index 100%
rename from eos/effects/setbonussisters.py
rename to eos/effects/effect3498.py
diff --git a/eos/effects/setbonussyndicate.py b/eos/effects/effect3499.py
similarity index 100%
rename from eos/effects/setbonussyndicate.py
rename to eos/effects/effect3499.py
diff --git a/eos/effects/setbonusmordus.py b/eos/effects/effect3513.py
similarity index 100%
rename from eos/effects/setbonusmordus.py
rename to eos/effects/effect3513.py
diff --git a/eos/effects/interceptor2warpscramblerange.py b/eos/effects/effect3514.py
similarity index 100%
rename from eos/effects/interceptor2warpscramblerange.py
rename to eos/effects/effect3514.py
diff --git a/eos/effects/weaponupgradescpuneedbonuspostpercentcpulocationshipmodulesrequiringbomblauncher.py b/eos/effects/effect3519.py
similarity index 100%
rename from eos/effects/weaponupgradescpuneedbonuspostpercentcpulocationshipmodulesrequiringbomblauncher.py
rename to eos/effects/effect3519.py
diff --git a/eos/effects/skilladvancedweaponupgradespowerneedbonusbomblaunchers.py b/eos/effects/effect3520.py
similarity index 100%
rename from eos/effects/skilladvancedweaponupgradespowerneedbonusbomblaunchers.py
rename to eos/effects/effect3520.py
diff --git a/eos/effects/cynosuraltheoryconsumptionbonus.py b/eos/effects/effect3526.py
similarity index 100%
rename from eos/effects/cynosuraltheoryconsumptionbonus.py
rename to eos/effects/effect3526.py
diff --git a/eos/effects/elitebonusblackopsagiliy1.py b/eos/effects/effect3530.py
similarity index 100%
rename from eos/effects/elitebonusblackopsagiliy1.py
rename to eos/effects/effect3530.py
diff --git a/eos/effects/skilljumpdriveconsumptionamountbonuspercentage.py b/eos/effects/effect3532.py
similarity index 100%
rename from eos/effects/skilljumpdriveconsumptionamountbonuspercentage.py
rename to eos/effects/effect3532.py
diff --git a/eos/effects/ewskilltrackingdisruptiontrackingspeedbonus.py b/eos/effects/effect3561.py
similarity index 100%
rename from eos/effects/ewskilltrackingdisruptiontrackingspeedbonus.py
rename to eos/effects/effect3561.py
diff --git a/eos/effects/elitebonuslogisticstrackinglinkmaxrangebonus1.py b/eos/effects/effect3568.py
similarity index 100%
rename from eos/effects/elitebonuslogisticstrackinglinkmaxrangebonus1.py
rename to eos/effects/effect3568.py
diff --git a/eos/effects/elitebonuslogisticstrackinglinkmaxrangebonus2.py b/eos/effects/effect3569.py
similarity index 100%
rename from eos/effects/elitebonuslogisticstrackinglinkmaxrangebonus2.py
rename to eos/effects/effect3569.py
diff --git a/eos/effects/elitebonuslogisticstrackinglinktrackingspeedbonus2.py b/eos/effects/effect3570.py
similarity index 100%
rename from eos/effects/elitebonuslogisticstrackinglinktrackingspeedbonus2.py
rename to eos/effects/effect3570.py
diff --git a/eos/effects/elitebonuslogisticstrackinglinktrackingspeedbonus1.py b/eos/effects/effect3571.py
similarity index 100%
rename from eos/effects/elitebonuslogisticstrackinglinktrackingspeedbonus1.py
rename to eos/effects/effect3571.py
diff --git a/eos/effects/ewskillsignalsuppressionscanresolutionbonus.py b/eos/effects/effect3586.py
similarity index 100%
rename from eos/effects/ewskillsignalsuppressionscanresolutionbonus.py
rename to eos/effects/effect3586.py
diff --git a/eos/effects/shipbonusewremotesensordampenermaxtargetrangebonusgc2.py b/eos/effects/effect3587.py
similarity index 100%
rename from eos/effects/shipbonusewremotesensordampenermaxtargetrangebonusgc2.py
rename to eos/effects/effect3587.py
diff --git a/eos/effects/shipbonusewremotesensordampenermaxtargetrangebonusgf2.py b/eos/effects/effect3588.py
similarity index 100%
rename from eos/effects/shipbonusewremotesensordampenermaxtargetrangebonusgf2.py
rename to eos/effects/effect3588.py
diff --git a/eos/effects/shipbonusewremotesensordampenerscanresolutionbonusgf2.py b/eos/effects/effect3589.py
similarity index 100%
rename from eos/effects/shipbonusewremotesensordampenerscanresolutionbonusgf2.py
rename to eos/effects/effect3589.py
diff --git a/eos/effects/shipbonusewremotesensordampenerscanresolutionbonusgc2.py b/eos/effects/effect3590.py
similarity index 100%
rename from eos/effects/shipbonusewremotesensordampenerscanresolutionbonusgc2.py
rename to eos/effects/effect3590.py
diff --git a/eos/effects/ewskillsignalsuppressionmaxtargetrangebonus.py b/eos/effects/effect3591.py
similarity index 100%
rename from eos/effects/ewskillsignalsuppressionmaxtargetrangebonus.py
rename to eos/effects/effect3591.py
diff --git a/eos/effects/elitebonusjumpfreighterhullhp1.py b/eos/effects/effect3592.py
similarity index 100%
rename from eos/effects/elitebonusjumpfreighterhullhp1.py
rename to eos/effects/effect3592.py
diff --git a/eos/effects/elitebonusjumpfreighterjumpdriveconsumptionamount2.py b/eos/effects/effect3593.py
similarity index 100%
rename from eos/effects/elitebonusjumpfreighterjumpdriveconsumptionamount2.py
rename to eos/effects/effect3593.py
diff --git a/eos/effects/scriptsensorboosterscanresolutionbonusbonus.py b/eos/effects/effect3597.py
similarity index 100%
rename from eos/effects/scriptsensorboosterscanresolutionbonusbonus.py
rename to eos/effects/effect3597.py
diff --git a/eos/effects/scriptsensorboostermaxtargetrangebonusbonus.py b/eos/effects/effect3598.py
similarity index 100%
rename from eos/effects/scriptsensorboostermaxtargetrangebonusbonus.py
rename to eos/effects/effect3598.py
diff --git a/eos/effects/scripttrackingcomputertrackingspeedbonusbonus.py b/eos/effects/effect3599.py
similarity index 100%
rename from eos/effects/scripttrackingcomputertrackingspeedbonusbonus.py
rename to eos/effects/effect3599.py
diff --git a/eos/effects/scripttrackingcomputermaxrangebonusbonus.py b/eos/effects/effect3600.py
similarity index 100%
rename from eos/effects/scripttrackingcomputermaxrangebonusbonus.py
rename to eos/effects/effect3600.py
diff --git a/eos/effects/scriptwarpdisruptionfieldgeneratorsetdisallowinempirespace.py b/eos/effects/effect3601.py
similarity index 100%
rename from eos/effects/scriptwarpdisruptionfieldgeneratorsetdisallowinempirespace.py
rename to eos/effects/effect3601.py
diff --git a/eos/effects/scriptdurationbonus.py b/eos/effects/effect3602.py
similarity index 100%
rename from eos/effects/scriptdurationbonus.py
rename to eos/effects/effect3602.py
diff --git a/eos/effects/scriptsignatureradiusbonusbonus.py b/eos/effects/effect3617.py
similarity index 100%
rename from eos/effects/scriptsignatureradiusbonusbonus.py
rename to eos/effects/effect3617.py
diff --git a/eos/effects/scriptmassbonuspercentagebonus.py b/eos/effects/effect3618.py
similarity index 100%
rename from eos/effects/scriptmassbonuspercentagebonus.py
rename to eos/effects/effect3618.py
diff --git a/eos/effects/scriptspeedboostfactorbonusbonus.py b/eos/effects/effect3619.py
similarity index 100%
rename from eos/effects/scriptspeedboostfactorbonusbonus.py
rename to eos/effects/effect3619.py
diff --git a/eos/effects/scriptspeedfactorbonusbonus.py b/eos/effects/effect3620.py
similarity index 100%
rename from eos/effects/scriptspeedfactorbonusbonus.py
rename to eos/effects/effect3620.py
diff --git a/eos/effects/scriptwarpscramblerangebonus.py b/eos/effects/effect3648.py
similarity index 100%
rename from eos/effects/scriptwarpscramblerangebonus.py
rename to eos/effects/effect3648.py
diff --git a/eos/effects/elitebonusviolatorslargeenergyturretdamage1.py b/eos/effects/effect3649.py
similarity index 100%
rename from eos/effects/elitebonusviolatorslargeenergyturretdamage1.py
rename to eos/effects/effect3649.py
diff --git a/eos/effects/ewgrouprsdmaxrangebonus.py b/eos/effects/effect3650.py
similarity index 100%
rename from eos/effects/ewgrouprsdmaxrangebonus.py
rename to eos/effects/effect3650.py
diff --git a/eos/effects/ewgrouptpmaxrangebonus.py b/eos/effects/effect3651.py
similarity index 100%
rename from eos/effects/ewgrouptpmaxrangebonus.py
rename to eos/effects/effect3651.py
diff --git a/eos/effects/ewgrouptdmaxrangebonus.py b/eos/effects/effect3652.py
similarity index 100%
rename from eos/effects/ewgrouptdmaxrangebonus.py
rename to eos/effects/effect3652.py
diff --git a/eos/effects/ewgroupecmburstmaxrangebonus.py b/eos/effects/effect3653.py
similarity index 100%
rename from eos/effects/ewgroupecmburstmaxrangebonus.py
rename to eos/effects/effect3653.py
diff --git a/eos/effects/gunnerymaxrangebonusonline.py b/eos/effects/effect3655.py
similarity index 100%
rename from eos/effects/gunnerymaxrangebonusonline.py
rename to eos/effects/effect3655.py
diff --git a/eos/effects/gunnerytrackingspeedbonusonline.py b/eos/effects/effect3656.py
similarity index 100%
rename from eos/effects/gunnerytrackingspeedbonusonline.py
rename to eos/effects/effect3656.py
diff --git a/eos/effects/shipscanresolutionbonusonline.py b/eos/effects/effect3657.py
similarity index 100%
rename from eos/effects/shipscanresolutionbonusonline.py
rename to eos/effects/effect3657.py
diff --git a/eos/effects/shipmaxtargetrangebonusonline.py b/eos/effects/effect3659.py
similarity index 100%
rename from eos/effects/shipmaxtargetrangebonusonline.py
rename to eos/effects/effect3659.py
diff --git a/eos/effects/shipmaxlockedtargetsbonusaddonline.py b/eos/effects/effect3660.py
similarity index 100%
rename from eos/effects/shipmaxlockedtargetsbonusaddonline.py
rename to eos/effects/effect3660.py
diff --git a/eos/effects/mininglaserrangebonus.py b/eos/effects/effect3668.py
similarity index 100%
rename from eos/effects/mininglaserrangebonus.py
rename to eos/effects/effect3668.py
diff --git a/eos/effects/frequencymininglasermaxrangebonus.py b/eos/effects/effect3669.py
similarity index 100%
rename from eos/effects/frequencymininglasermaxrangebonus.py
rename to eos/effects/effect3669.py
diff --git a/eos/effects/stripminermaxrangebonus.py b/eos/effects/effect3670.py
similarity index 100%
rename from eos/effects/stripminermaxrangebonus.py
rename to eos/effects/effect3670.py
diff --git a/eos/effects/gasharvestermaxrangebonus.py b/eos/effects/effect3671.py
similarity index 100%
rename from eos/effects/gasharvestermaxrangebonus.py
rename to eos/effects/effect3671.py
diff --git a/eos/effects/setbonusore.py b/eos/effects/effect3672.py
similarity index 100%
rename from eos/effects/setbonusore.py
rename to eos/effects/effect3672.py
diff --git a/eos/effects/shipbonuslargeenergyturretmaxrangeab2.py b/eos/effects/effect3677.py
similarity index 100%
rename from eos/effects/shipbonuslargeenergyturretmaxrangeab2.py
rename to eos/effects/effect3677.py
diff --git a/eos/effects/elitebonusjumpfreightershieldhp1.py b/eos/effects/effect3678.py
similarity index 100%
rename from eos/effects/elitebonusjumpfreightershieldhp1.py
rename to eos/effects/effect3678.py
diff --git a/eos/effects/elitebonusjumpfreighterarmorhp1.py b/eos/effects/effect3679.py
similarity index 100%
rename from eos/effects/elitebonusjumpfreighterarmorhp1.py
rename to eos/effects/effect3679.py
diff --git a/eos/effects/freighteragilitybonusc1.py b/eos/effects/effect3680.py
similarity index 100%
rename from eos/effects/freighteragilitybonusc1.py
rename to eos/effects/effect3680.py
diff --git a/eos/effects/freighteragilitybonusm1.py b/eos/effects/effect3681.py
similarity index 100%
rename from eos/effects/freighteragilitybonusm1.py
rename to eos/effects/effect3681.py
diff --git a/eos/effects/freighteragilitybonusg1.py b/eos/effects/effect3682.py
similarity index 100%
rename from eos/effects/freighteragilitybonusg1.py
rename to eos/effects/effect3682.py
diff --git a/eos/effects/freighteragilitybonusa1.py b/eos/effects/effect3683.py
similarity index 100%
rename from eos/effects/freighteragilitybonusa1.py
rename to eos/effects/effect3683.py
diff --git a/eos/effects/scripttrackingcomputerfalloffbonusbonus.py b/eos/effects/effect3686.py
similarity index 100%
rename from eos/effects/scripttrackingcomputerfalloffbonusbonus.py
rename to eos/effects/effect3686.py
diff --git a/eos/effects/shipmissilelauncherspeedbonusmc2.py b/eos/effects/effect3703.py
similarity index 100%
rename from eos/effects/shipmissilelauncherspeedbonusmc2.py
rename to eos/effects/effect3703.py
diff --git a/eos/effects/shiphybridturretrofbonusgc2.py b/eos/effects/effect3705.py
similarity index 100%
rename from eos/effects/shiphybridturretrofbonusgc2.py
rename to eos/effects/effect3705.py
diff --git a/eos/effects/shipbonusprojectiletrackingmc2.py b/eos/effects/effect3706.py
similarity index 100%
rename from eos/effects/shipbonusprojectiletrackingmc2.py
rename to eos/effects/effect3706.py
diff --git a/eos/effects/agilitymultipliereffectpassive.py b/eos/effects/effect3726.py
similarity index 100%
rename from eos/effects/agilitymultipliereffectpassive.py
rename to eos/effects/effect3726.py
diff --git a/eos/effects/velocitybonuspassive.py b/eos/effects/effect3727.py
similarity index 100%
rename from eos/effects/velocitybonuspassive.py
rename to eos/effects/effect3727.py
diff --git a/eos/effects/zcolinorcatractorrangebonus.py b/eos/effects/effect3739.py
similarity index 100%
rename from eos/effects/zcolinorcatractorrangebonus.py
rename to eos/effects/effect3739.py
diff --git a/eos/effects/zcolinorcatractorvelocitybonus.py b/eos/effects/effect3740.py
similarity index 100%
rename from eos/effects/zcolinorcatractorvelocitybonus.py
rename to eos/effects/effect3740.py
diff --git a/eos/effects/cargoandoreholdcapacitybonusics1.py b/eos/effects/effect3742.py
similarity index 100%
rename from eos/effects/cargoandoreholdcapacitybonusics1.py
rename to eos/effects/effect3742.py
diff --git a/eos/effects/miningforemanburstbonusics2.py b/eos/effects/effect3744.py
similarity index 100%
rename from eos/effects/miningforemanburstbonusics2.py
rename to eos/effects/effect3744.py
diff --git a/eos/effects/zcolinorcasurveyscannerbonus.py b/eos/effects/effect3745.py
similarity index 100%
rename from eos/effects/zcolinorcasurveyscannerbonus.py
rename to eos/effects/effect3745.py
diff --git a/eos/effects/covertopsstealthbombersiegemissilelauncherpowerneedbonus.py b/eos/effects/effect3765.py
similarity index 100%
rename from eos/effects/covertopsstealthbombersiegemissilelauncherpowerneedbonus.py
rename to eos/effects/effect3765.py
diff --git a/eos/effects/interceptormwdsignatureradiusbonus.py b/eos/effects/effect3766.py
similarity index 100%
rename from eos/effects/interceptormwdsignatureradiusbonus.py
rename to eos/effects/effect3766.py
diff --git a/eos/effects/elitebonuscommandshipsheavymissileexplosionvelocitycs2.py b/eos/effects/effect3767.py
similarity index 100%
rename from eos/effects/elitebonuscommandshipsheavymissileexplosionvelocitycs2.py
rename to eos/effects/effect3767.py
diff --git a/eos/effects/armorhpbonusaddpassive.py b/eos/effects/effect3771.py
similarity index 100%
rename from eos/effects/armorhpbonusaddpassive.py
rename to eos/effects/effect3771.py
diff --git a/eos/effects/hardpointmodifiereffect.py b/eos/effects/effect3773.py
similarity index 100%
rename from eos/effects/hardpointmodifiereffect.py
rename to eos/effects/effect3773.py
diff --git a/eos/effects/slotmodifier.py b/eos/effects/effect3774.py
similarity index 100%
rename from eos/effects/slotmodifier.py
rename to eos/effects/effect3774.py
diff --git a/eos/effects/poweroutputaddpassive.py b/eos/effects/effect3782.py
similarity index 100%
rename from eos/effects/poweroutputaddpassive.py
rename to eos/effects/effect3782.py
diff --git a/eos/effects/cpuoutputaddcpuoutputpassive.py b/eos/effects/effect3783.py
similarity index 100%
rename from eos/effects/cpuoutputaddcpuoutputpassive.py
rename to eos/effects/effect3783.py
diff --git a/eos/effects/dronebandwidthaddpassive.py b/eos/effects/effect3797.py
similarity index 100%
rename from eos/effects/dronebandwidthaddpassive.py
rename to eos/effects/effect3797.py
diff --git a/eos/effects/dronecapacityadddronecapacitypassive.py b/eos/effects/effect3799.py
similarity index 100%
rename from eos/effects/dronecapacityadddronecapacitypassive.py
rename to eos/effects/effect3799.py
diff --git a/eos/effects/empwave.py b/eos/effects/effect38.py
similarity index 100%
rename from eos/effects/empwave.py
rename to eos/effects/effect38.py
diff --git a/eos/effects/maxtargetrangeaddpassive.py b/eos/effects/effect3807.py
similarity index 100%
rename from eos/effects/maxtargetrangeaddpassive.py
rename to eos/effects/effect3807.py
diff --git a/eos/effects/signatureradiusaddpassive.py b/eos/effects/effect3808.py
similarity index 100%
rename from eos/effects/signatureradiusaddpassive.py
rename to eos/effects/effect3808.py
diff --git a/eos/effects/capacityaddpassive.py b/eos/effects/effect3810.py
similarity index 100%
rename from eos/effects/capacityaddpassive.py
rename to eos/effects/effect3810.py
diff --git a/eos/effects/capacitorcapacityaddpassive.py b/eos/effects/effect3811.py
similarity index 100%
rename from eos/effects/capacitorcapacityaddpassive.py
rename to eos/effects/effect3811.py
diff --git a/eos/effects/shieldcapacityaddpassive.py b/eos/effects/effect3831.py
similarity index 100%
rename from eos/effects/shieldcapacityaddpassive.py
rename to eos/effects/effect3831.py
diff --git a/eos/effects/subsystembonusamarrpropulsionmaxvelocity.py b/eos/effects/effect3857.py
similarity index 100%
rename from eos/effects/subsystembonusamarrpropulsionmaxvelocity.py
rename to eos/effects/effect3857.py
diff --git a/eos/effects/subsystembonuscaldaripropulsionmaxvelocity.py b/eos/effects/effect3859.py
similarity index 100%
rename from eos/effects/subsystembonuscaldaripropulsionmaxvelocity.py
rename to eos/effects/effect3859.py
diff --git a/eos/effects/subsystembonusminmatarpropulsionmaxvelocity.py b/eos/effects/effect3860.py
similarity index 100%
rename from eos/effects/subsystembonusminmatarpropulsionmaxvelocity.py
rename to eos/effects/effect3860.py
diff --git a/eos/effects/subsystembonusminmatarpropulsionafterburnerspeedfactor.py b/eos/effects/effect3861.py
similarity index 100%
rename from eos/effects/subsystembonusminmatarpropulsionafterburnerspeedfactor.py
rename to eos/effects/effect3861.py
diff --git a/eos/effects/subsystembonuscaldaripropulsionafterburnerspeedfactor.py b/eos/effects/effect3863.py
similarity index 100%
rename from eos/effects/subsystembonuscaldaripropulsionafterburnerspeedfactor.py
rename to eos/effects/effect3863.py
diff --git a/eos/effects/subsystembonusamarrpropulsionafterburnerspeedfactor.py b/eos/effects/effect3864.py
similarity index 100%
rename from eos/effects/subsystembonusamarrpropulsionafterburnerspeedfactor.py
rename to eos/effects/effect3864.py
diff --git a/eos/effects/subsystembonusamarrpropulsion2agility.py b/eos/effects/effect3865.py
similarity index 100%
rename from eos/effects/subsystembonusamarrpropulsion2agility.py
rename to eos/effects/effect3865.py
diff --git a/eos/effects/subsystembonuscaldaripropulsion2agility.py b/eos/effects/effect3866.py
similarity index 100%
rename from eos/effects/subsystembonuscaldaripropulsion2agility.py
rename to eos/effects/effect3866.py
diff --git a/eos/effects/subsystembonusgallentepropulsion2agility.py b/eos/effects/effect3867.py
similarity index 100%
rename from eos/effects/subsystembonusgallentepropulsion2agility.py
rename to eos/effects/effect3867.py
diff --git a/eos/effects/subsystembonusminmatarpropulsion2agility.py b/eos/effects/effect3868.py
similarity index 100%
rename from eos/effects/subsystembonusminmatarpropulsion2agility.py
rename to eos/effects/effect3868.py
diff --git a/eos/effects/subsystembonusminmatarpropulsion2mwdpenalty.py b/eos/effects/effect3869.py
similarity index 100%
rename from eos/effects/subsystembonusminmatarpropulsion2mwdpenalty.py
rename to eos/effects/effect3869.py
diff --git a/eos/effects/subsystembonusamarrpropulsion2mwdpenalty.py b/eos/effects/effect3872.py
similarity index 100%
rename from eos/effects/subsystembonusamarrpropulsion2mwdpenalty.py
rename to eos/effects/effect3872.py
diff --git a/eos/effects/subsystembonusgallentepropulsionabmwdcapneed.py b/eos/effects/effect3875.py
similarity index 100%
rename from eos/effects/subsystembonusgallentepropulsionabmwdcapneed.py
rename to eos/effects/effect3875.py
diff --git a/eos/effects/subsystembonusminmatarcorescanstrengthladar.py b/eos/effects/effect3893.py
similarity index 100%
rename from eos/effects/subsystembonusminmatarcorescanstrengthladar.py
rename to eos/effects/effect3893.py
diff --git a/eos/effects/subsystembonusgallentecorescanstrengthmagnetometric.py b/eos/effects/effect3895.py
similarity index 100%
rename from eos/effects/subsystembonusgallentecorescanstrengthmagnetometric.py
rename to eos/effects/effect3895.py
diff --git a/eos/effects/subsystembonuscaldaricorescanstrengthgravimetric.py b/eos/effects/effect3897.py
similarity index 100%
rename from eos/effects/subsystembonuscaldaricorescanstrengthgravimetric.py
rename to eos/effects/effect3897.py
diff --git a/eos/effects/warpdisrupt.py b/eos/effects/effect39.py
similarity index 100%
rename from eos/effects/warpdisrupt.py
rename to eos/effects/effect39.py
diff --git a/eos/effects/subsystembonusamarrcorescanstrengthradar.py b/eos/effects/effect3900.py
similarity index 100%
rename from eos/effects/subsystembonusamarrcorescanstrengthradar.py
rename to eos/effects/effect3900.py
diff --git a/eos/effects/astrogeologyminingamountbonuspostpercentminingamountlocationshipmodulesrequiringmining.py b/eos/effects/effect391.py
similarity index 100%
rename from eos/effects/astrogeologyminingamountbonuspostpercentminingamountlocationshipmodulesrequiringmining.py
rename to eos/effects/effect391.py
diff --git a/eos/effects/mechanichullhpbonuspostpercenthpship.py b/eos/effects/effect392.py
similarity index 100%
rename from eos/effects/mechanichullhpbonuspostpercenthpship.py
rename to eos/effects/effect392.py
diff --git a/eos/effects/navigationvelocitybonuspostpercentmaxvelocityship.py b/eos/effects/effect394.py
similarity index 100%
rename from eos/effects/navigationvelocitybonuspostpercentmaxvelocityship.py
rename to eos/effects/effect394.py
diff --git a/eos/effects/evasivemaneuveringagilitybonuspostpercentagilityship.py b/eos/effects/effect395.py
similarity index 100%
rename from eos/effects/evasivemaneuveringagilitybonuspostpercentagilityship.py
rename to eos/effects/effect395.py
diff --git a/eos/effects/subsystembonusamarrdefensivearmorrepairamount.py b/eos/effects/effect3959.py
similarity index 100%
rename from eos/effects/subsystembonusamarrdefensivearmorrepairamount.py
rename to eos/effects/effect3959.py
diff --git a/eos/effects/energygridupgradescpuneedbonuspostpercentcpulocationshipmodulesrequiringenergygridupgrades.py b/eos/effects/effect396.py
similarity index 100%
rename from eos/effects/energygridupgradescpuneedbonuspostpercentcpulocationshipmodulesrequiringenergygridupgrades.py
rename to eos/effects/effect396.py
diff --git a/eos/effects/subsystembonusgallentedefensivearmorrepairamount.py b/eos/effects/effect3961.py
similarity index 100%
rename from eos/effects/subsystembonusgallentedefensivearmorrepairamount.py
rename to eos/effects/effect3961.py
diff --git a/eos/effects/subsystembonusminmatardefensiveshieldarmorrepairamount.py b/eos/effects/effect3962.py
similarity index 100%
rename from eos/effects/subsystembonusminmatardefensiveshieldarmorrepairamount.py
rename to eos/effects/effect3962.py
diff --git a/eos/effects/subsystembonuscaldaridefensiveshieldboostamount.py b/eos/effects/effect3964.py
similarity index 100%
rename from eos/effects/subsystembonuscaldaridefensiveshieldboostamount.py
rename to eos/effects/effect3964.py
diff --git a/eos/effects/electronicscpuoutputbonuspostpercentcpuoutputlocationshipgroupcomputer.py b/eos/effects/effect397.py
similarity index 100%
rename from eos/effects/electronicscpuoutputbonuspostpercentcpuoutputlocationshipgroupcomputer.py
rename to eos/effects/effect397.py
diff --git a/eos/effects/subsystembonuscaldaridefensiveshieldhp.py b/eos/effects/effect3976.py
similarity index 100%
rename from eos/effects/subsystembonuscaldaridefensiveshieldhp.py
rename to eos/effects/effect3976.py
diff --git a/eos/effects/subsystembonusminmatardefensiveshieldarmorhp.py b/eos/effects/effect3979.py
similarity index 100%
rename from eos/effects/subsystembonusminmatardefensiveshieldarmorhp.py
rename to eos/effects/effect3979.py
diff --git a/eos/effects/subsystembonusgallentedefensivearmorhp.py b/eos/effects/effect3980.py
similarity index 100%
rename from eos/effects/subsystembonusgallentedefensivearmorhp.py
rename to eos/effects/effect3980.py
diff --git a/eos/effects/subsystembonusamarrdefensivearmorhp.py b/eos/effects/effect3982.py
similarity index 100%
rename from eos/effects/subsystembonusamarrdefensivearmorhp.py
rename to eos/effects/effect3982.py
diff --git a/eos/effects/systemshieldhp.py b/eos/effects/effect3992.py
similarity index 100%
rename from eos/effects/systemshieldhp.py
rename to eos/effects/effect3992.py
diff --git a/eos/effects/systemtargetingrange.py b/eos/effects/effect3993.py
similarity index 100%
rename from eos/effects/systemtargetingrange.py
rename to eos/effects/effect3993.py
diff --git a/eos/effects/systemsignatureradius.py b/eos/effects/effect3995.py
similarity index 100%
rename from eos/effects/systemsignatureradius.py
rename to eos/effects/effect3995.py
diff --git a/eos/effects/systemarmoremresistance.py b/eos/effects/effect3996.py
similarity index 100%
rename from eos/effects/systemarmoremresistance.py
rename to eos/effects/effect3996.py
diff --git a/eos/effects/systemarmorexplosiveresistance.py b/eos/effects/effect3997.py
similarity index 100%
rename from eos/effects/systemarmorexplosiveresistance.py
rename to eos/effects/effect3997.py
diff --git a/eos/effects/systemarmorkineticresistance.py b/eos/effects/effect3998.py
similarity index 100%
rename from eos/effects/systemarmorkineticresistance.py
rename to eos/effects/effect3998.py
diff --git a/eos/effects/systemarmorthermalresistance.py b/eos/effects/effect3999.py
similarity index 100%
rename from eos/effects/systemarmorthermalresistance.py
rename to eos/effects/effect3999.py
diff --git a/eos/effects/shieldboosting.py b/eos/effects/effect4.py
similarity index 100%
rename from eos/effects/shieldboosting.py
rename to eos/effects/effect4.py
diff --git a/eos/effects/systemmissilevelocity.py b/eos/effects/effect4002.py
similarity index 100%
rename from eos/effects/systemmissilevelocity.py
rename to eos/effects/effect4002.py
diff --git a/eos/effects/systemmaxvelocity.py b/eos/effects/effect4003.py
similarity index 100%
rename from eos/effects/systemmaxvelocity.py
rename to eos/effects/effect4003.py
diff --git a/eos/effects/systemdamagemultipliergunnery.py b/eos/effects/effect4016.py
similarity index 100%
rename from eos/effects/systemdamagemultipliergunnery.py
rename to eos/effects/effect4016.py
diff --git a/eos/effects/systemdamagethermalmissiles.py b/eos/effects/effect4017.py
similarity index 100%
rename from eos/effects/systemdamagethermalmissiles.py
rename to eos/effects/effect4017.py
diff --git a/eos/effects/systemdamageemmissiles.py b/eos/effects/effect4018.py
similarity index 100%
rename from eos/effects/systemdamageemmissiles.py
rename to eos/effects/effect4018.py
diff --git a/eos/effects/systemdamageexplosivemissiles.py b/eos/effects/effect4019.py
similarity index 100%
rename from eos/effects/systemdamageexplosivemissiles.py
rename to eos/effects/effect4019.py
diff --git a/eos/effects/systemdamagekineticmissiles.py b/eos/effects/effect4020.py
similarity index 100%
rename from eos/effects/systemdamagekineticmissiles.py
rename to eos/effects/effect4020.py
diff --git a/eos/effects/systemdamagedrones.py b/eos/effects/effect4021.py
similarity index 100%
rename from eos/effects/systemdamagedrones.py
rename to eos/effects/effect4021.py
diff --git a/eos/effects/systemtracking.py b/eos/effects/effect4022.py
similarity index 100%
rename from eos/effects/systemtracking.py
rename to eos/effects/effect4022.py
diff --git a/eos/effects/systemaoevelocity.py b/eos/effects/effect4023.py
similarity index 100%
rename from eos/effects/systemaoevelocity.py
rename to eos/effects/effect4023.py
diff --git a/eos/effects/systemheatdamage.py b/eos/effects/effect4033.py
similarity index 100%
rename from eos/effects/systemheatdamage.py
rename to eos/effects/effect4033.py
diff --git a/eos/effects/systemoverloadarmor.py b/eos/effects/effect4034.py
similarity index 100%
rename from eos/effects/systemoverloadarmor.py
rename to eos/effects/effect4034.py
diff --git a/eos/effects/systemoverloaddamagemodifier.py b/eos/effects/effect4035.py
similarity index 100%
rename from eos/effects/systemoverloaddamagemodifier.py
rename to eos/effects/effect4035.py
diff --git a/eos/effects/systemoverloaddurationbonus.py b/eos/effects/effect4036.py
similarity index 100%
rename from eos/effects/systemoverloaddurationbonus.py
rename to eos/effects/effect4036.py
diff --git a/eos/effects/systemoverloadeccmstrength.py b/eos/effects/effect4037.py
similarity index 100%
rename from eos/effects/systemoverloadeccmstrength.py
rename to eos/effects/effect4037.py
diff --git a/eos/effects/systemoverloadecmstrength.py b/eos/effects/effect4038.py
similarity index 100%
rename from eos/effects/systemoverloadecmstrength.py
rename to eos/effects/effect4038.py
diff --git a/eos/effects/systemoverloadhardening.py b/eos/effects/effect4039.py
similarity index 100%
rename from eos/effects/systemoverloadhardening.py
rename to eos/effects/effect4039.py
diff --git a/eos/effects/systemoverloadrange.py b/eos/effects/effect4040.py
similarity index 100%
rename from eos/effects/systemoverloadrange.py
rename to eos/effects/effect4040.py
diff --git a/eos/effects/systemoverloadrof.py b/eos/effects/effect4041.py
similarity index 100%
rename from eos/effects/systemoverloadrof.py
rename to eos/effects/effect4041.py
diff --git a/eos/effects/systemoverloadselfduration.py b/eos/effects/effect4042.py
similarity index 100%
rename from eos/effects/systemoverloadselfduration.py
rename to eos/effects/effect4042.py
diff --git a/eos/effects/systemoverloadshieldbonus.py b/eos/effects/effect4043.py
similarity index 100%
rename from eos/effects/systemoverloadshieldbonus.py
rename to eos/effects/effect4043.py
diff --git a/eos/effects/systemoverloadspeedfactor.py b/eos/effects/effect4044.py
similarity index 100%
rename from eos/effects/systemoverloadspeedfactor.py
rename to eos/effects/effect4044.py
diff --git a/eos/effects/systemsmartbombrange.py b/eos/effects/effect4045.py
similarity index 100%
rename from eos/effects/systemsmartbombrange.py
rename to eos/effects/effect4045.py
diff --git a/eos/effects/systemsmartbombemdamage.py b/eos/effects/effect4046.py
similarity index 100%
rename from eos/effects/systemsmartbombemdamage.py
rename to eos/effects/effect4046.py
diff --git a/eos/effects/systemsmartbombthermaldamage.py b/eos/effects/effect4047.py
similarity index 100%
rename from eos/effects/systemsmartbombthermaldamage.py
rename to eos/effects/effect4047.py
diff --git a/eos/effects/systemsmartbombkineticdamage.py b/eos/effects/effect4048.py
similarity index 100%
rename from eos/effects/systemsmartbombkineticdamage.py
rename to eos/effects/effect4048.py
diff --git a/eos/effects/systemsmartbombexplosivedamage.py b/eos/effects/effect4049.py
similarity index 100%
rename from eos/effects/systemsmartbombexplosivedamage.py
rename to eos/effects/effect4049.py
diff --git a/eos/effects/systemsmallenergydamage.py b/eos/effects/effect4054.py
similarity index 100%
rename from eos/effects/systemsmallenergydamage.py
rename to eos/effects/effect4054.py
diff --git a/eos/effects/systemsmallprojectiledamage.py b/eos/effects/effect4055.py
similarity index 100%
rename from eos/effects/systemsmallprojectiledamage.py
rename to eos/effects/effect4055.py
diff --git a/eos/effects/systemsmallhybriddamage.py b/eos/effects/effect4056.py
similarity index 100%
rename from eos/effects/systemsmallhybriddamage.py
rename to eos/effects/effect4056.py
diff --git a/eos/effects/systemrocketemdamage.py b/eos/effects/effect4057.py
similarity index 100%
rename from eos/effects/systemrocketemdamage.py
rename to eos/effects/effect4057.py
diff --git a/eos/effects/systemrocketexplosivedamage.py b/eos/effects/effect4058.py
similarity index 100%
rename from eos/effects/systemrocketexplosivedamage.py
rename to eos/effects/effect4058.py
diff --git a/eos/effects/systemrocketkineticdamage.py b/eos/effects/effect4059.py
similarity index 100%
rename from eos/effects/systemrocketkineticdamage.py
rename to eos/effects/effect4059.py
diff --git a/eos/effects/systemrocketthermaldamage.py b/eos/effects/effect4060.py
similarity index 100%
rename from eos/effects/systemrocketthermaldamage.py
rename to eos/effects/effect4060.py
diff --git a/eos/effects/systemstandardmissilethermaldamage.py b/eos/effects/effect4061.py
similarity index 100%
rename from eos/effects/systemstandardmissilethermaldamage.py
rename to eos/effects/effect4061.py
diff --git a/eos/effects/systemstandardmissileemdamage.py b/eos/effects/effect4062.py
similarity index 100%
rename from eos/effects/systemstandardmissileemdamage.py
rename to eos/effects/effect4062.py
diff --git a/eos/effects/systemstandardmissileexplosivedamage.py b/eos/effects/effect4063.py
similarity index 100%
rename from eos/effects/systemstandardmissileexplosivedamage.py
rename to eos/effects/effect4063.py
diff --git a/eos/effects/largeprojectileturretdamagemultiplierbonuspostpercentdamagemultiplierlocationshipmodulesrequiringlargeprojectileturret.py b/eos/effects/effect408.py
similarity index 100%
rename from eos/effects/largeprojectileturretdamagemultiplierbonuspostpercentdamagemultiplierlocationshipmodulesrequiringlargeprojectileturret.py
rename to eos/effects/effect408.py
diff --git a/eos/effects/systemarmorrepairamount.py b/eos/effects/effect4086.py
similarity index 100%
rename from eos/effects/systemarmorrepairamount.py
rename to eos/effects/effect4086.py
diff --git a/eos/effects/systemarmorremoterepairamount.py b/eos/effects/effect4088.py
similarity index 100%
rename from eos/effects/systemarmorremoterepairamount.py
rename to eos/effects/effect4088.py
diff --git a/eos/effects/systemshieldremoterepairamount.py b/eos/effects/effect4089.py
similarity index 100%
rename from eos/effects/systemshieldremoterepairamount.py
rename to eos/effects/effect4089.py
diff --git a/eos/effects/systemcapacitorcapacity.py b/eos/effects/effect4090.py
similarity index 100%
rename from eos/effects/systemcapacitorcapacity.py
rename to eos/effects/effect4090.py
diff --git a/eos/effects/systemcapacitorrecharge.py b/eos/effects/effect4091.py
similarity index 100%
rename from eos/effects/systemcapacitorrecharge.py
rename to eos/effects/effect4091.py
diff --git a/eos/effects/subsystembonusamarroffensiveenergyweapondamagemultiplier.py b/eos/effects/effect4093.py
similarity index 100%
rename from eos/effects/subsystembonusamarroffensiveenergyweapondamagemultiplier.py
rename to eos/effects/effect4093.py
diff --git a/eos/effects/subsystembonuscaldarioffensivehybridweaponmaxrange.py b/eos/effects/effect4104.py
similarity index 100%
rename from eos/effects/subsystembonuscaldarioffensivehybridweaponmaxrange.py
rename to eos/effects/effect4104.py
diff --git a/eos/effects/subsystembonusgallenteoffensivehybridweaponfalloff.py b/eos/effects/effect4106.py
similarity index 100%
rename from eos/effects/subsystembonusgallenteoffensivehybridweaponfalloff.py
rename to eos/effects/effect4106.py
diff --git a/eos/effects/subsystembonusminmataroffensiveprojectileweaponfalloff.py b/eos/effects/effect4114.py
similarity index 100%
rename from eos/effects/subsystembonusminmataroffensiveprojectileweaponfalloff.py
rename to eos/effects/effect4114.py
diff --git a/eos/effects/subsystembonusminmataroffensiveprojectileweaponmaxrange.py b/eos/effects/effect4115.py
similarity index 100%
rename from eos/effects/subsystembonusminmataroffensiveprojectileweaponmaxrange.py
rename to eos/effects/effect4115.py
diff --git a/eos/effects/subsystembonuscaldarioffensive1launcherrof.py b/eos/effects/effect4122.py
similarity index 100%
rename from eos/effects/subsystembonuscaldarioffensive1launcherrof.py
rename to eos/effects/effect4122.py
diff --git a/eos/effects/systemshieldemresistance.py b/eos/effects/effect4135.py
similarity index 100%
rename from eos/effects/systemshieldemresistance.py
rename to eos/effects/effect4135.py
diff --git a/eos/effects/systemshieldexplosiveresistance.py b/eos/effects/effect4136.py
similarity index 100%
rename from eos/effects/systemshieldexplosiveresistance.py
rename to eos/effects/effect4136.py
diff --git a/eos/effects/systemshieldkineticresistance.py b/eos/effects/effect4137.py
similarity index 100%
rename from eos/effects/systemshieldkineticresistance.py
rename to eos/effects/effect4137.py
diff --git a/eos/effects/systemshieldthermalresistance.py b/eos/effects/effect4138.py
similarity index 100%
rename from eos/effects/systemshieldthermalresistance.py
rename to eos/effects/effect4138.py
diff --git a/eos/effects/gunneryturretspeebonuspostpercentspeedlocationshipmodulesrequiringgunnery.py b/eos/effects/effect414.py
similarity index 100%
rename from eos/effects/gunneryturretspeebonuspostpercentspeedlocationshipmodulesrequiringgunnery.py
rename to eos/effects/effect414.py
diff --git a/eos/effects/subsystembonusamarrengineeringheatdamagereduction.py b/eos/effects/effect4152.py
similarity index 100%
rename from eos/effects/subsystembonusamarrengineeringheatdamagereduction.py
rename to eos/effects/effect4152.py
diff --git a/eos/effects/subsystembonuscaldariengineeringheatdamagereduction.py b/eos/effects/effect4153.py
similarity index 100%
rename from eos/effects/subsystembonuscaldariengineeringheatdamagereduction.py
rename to eos/effects/effect4153.py
diff --git a/eos/effects/subsystembonusgallenteengineeringheatdamagereduction.py b/eos/effects/effect4154.py
similarity index 100%
rename from eos/effects/subsystembonusgallenteengineeringheatdamagereduction.py
rename to eos/effects/effect4154.py
diff --git a/eos/effects/subsystembonusminmatarengineeringheatdamagereduction.py b/eos/effects/effect4155.py
similarity index 100%
rename from eos/effects/subsystembonusminmatarengineeringheatdamagereduction.py
rename to eos/effects/effect4155.py
diff --git a/eos/effects/subsystembonuscaldaricorecapacitorcapacity.py b/eos/effects/effect4158.py
similarity index 100%
rename from eos/effects/subsystembonuscaldaricorecapacitorcapacity.py
rename to eos/effects/effect4158.py
diff --git a/eos/effects/subsystembonusamarrcorecapacitorcapacity.py b/eos/effects/effect4159.py
similarity index 100%
rename from eos/effects/subsystembonusamarrcorecapacitorcapacity.py
rename to eos/effects/effect4159.py
diff --git a/eos/effects/basemaxscandeviationmodifierrequiringastrometrics.py b/eos/effects/effect4161.py
similarity index 100%
rename from eos/effects/basemaxscandeviationmodifierrequiringastrometrics.py
rename to eos/effects/effect4161.py
diff --git a/eos/effects/basesensorstrengthmodifierrequiringastrometrics.py b/eos/effects/effect4162.py
similarity index 100%
rename from eos/effects/basesensorstrengthmodifierrequiringastrometrics.py
rename to eos/effects/effect4162.py
diff --git a/eos/effects/shipbonusscanprobestrengthcf.py b/eos/effects/effect4165.py
similarity index 100%
rename from eos/effects/shipbonusscanprobestrengthcf.py
rename to eos/effects/effect4165.py
diff --git a/eos/effects/shipbonusscanprobestrengthmf.py b/eos/effects/effect4166.py
similarity index 100%
rename from eos/effects/shipbonusscanprobestrengthmf.py
rename to eos/effects/effect4166.py
diff --git a/eos/effects/shipbonusscanprobestrengthgf.py b/eos/effects/effect4167.py
similarity index 100%
rename from eos/effects/shipbonusscanprobestrengthgf.py
rename to eos/effects/effect4167.py
diff --git a/eos/effects/elitebonuscoveropsscanprobestrength2.py b/eos/effects/effect4168.py
similarity index 100%
rename from eos/effects/elitebonuscoveropsscanprobestrength2.py
rename to eos/effects/effect4168.py
diff --git a/eos/effects/shipbonusstrategiccruiseramarrheatdamage.py b/eos/effects/effect4187.py
similarity index 100%
rename from eos/effects/shipbonusstrategiccruiseramarrheatdamage.py
rename to eos/effects/effect4187.py
diff --git a/eos/effects/shipbonusstrategiccruisercaldariheatdamage.py b/eos/effects/effect4188.py
similarity index 100%
rename from eos/effects/shipbonusstrategiccruisercaldariheatdamage.py
rename to eos/effects/effect4188.py
diff --git a/eos/effects/shipbonusstrategiccruisergallenteheatdamage.py b/eos/effects/effect4189.py
similarity index 100%
rename from eos/effects/shipbonusstrategiccruisergallenteheatdamage.py
rename to eos/effects/effect4189.py
diff --git a/eos/effects/shipbonusstrategiccruiserminmatarheatdamage.py b/eos/effects/effect4190.py
similarity index 100%
rename from eos/effects/shipbonusstrategiccruiserminmatarheatdamage.py
rename to eos/effects/effect4190.py
diff --git a/eos/effects/subsystembonusamarroffensive2energyweaponcapacitorneed.py b/eos/effects/effect4215.py
similarity index 100%
rename from eos/effects/subsystembonusamarroffensive2energyweaponcapacitorneed.py
rename to eos/effects/effect4215.py
diff --git a/eos/effects/subsystembonusamarrcore2energyvampireamount.py b/eos/effects/effect4216.py
similarity index 100%
rename from eos/effects/subsystembonusamarrcore2energyvampireamount.py
rename to eos/effects/effect4216.py
diff --git a/eos/effects/subsystembonusamarrcore2energydestabilizeramount.py b/eos/effects/effect4217.py
similarity index 100%
rename from eos/effects/subsystembonusamarrcore2energydestabilizeramount.py
rename to eos/effects/effect4217.py
diff --git a/eos/effects/subsystembonuscaldarioffensive2missilelauncherkineticdamage.py b/eos/effects/effect4248.py
similarity index 100%
rename from eos/effects/subsystembonuscaldarioffensive2missilelauncherkineticdamage.py
rename to eos/effects/effect4248.py
diff --git a/eos/effects/subsystembonusgallenteoffensivedronedamagehp.py b/eos/effects/effect4250.py
similarity index 100%
rename from eos/effects/subsystembonusgallenteoffensivedronedamagehp.py
rename to eos/effects/effect4250.py
diff --git a/eos/effects/subsystembonusminmataroffensive2projectileweapondamagemultiplier.py b/eos/effects/effect4251.py
similarity index 100%
rename from eos/effects/subsystembonusminmataroffensive2projectileweapondamagemultiplier.py
rename to eos/effects/effect4251.py
diff --git a/eos/effects/subsystembonusminmataroffensive2missilelauncherrof.py b/eos/effects/effect4256.py
similarity index 100%
rename from eos/effects/subsystembonusminmataroffensive2missilelauncherrof.py
rename to eos/effects/effect4256.py
diff --git a/eos/effects/subsystembonusminmatarcorecapacitorrecharge.py b/eos/effects/effect4264.py
similarity index 100%
rename from eos/effects/subsystembonusminmatarcorecapacitorrecharge.py
rename to eos/effects/effect4264.py
diff --git a/eos/effects/subsystembonusgallentecorecapacitorrecharge.py b/eos/effects/effect4265.py
similarity index 100%
rename from eos/effects/subsystembonusgallentecorecapacitorrecharge.py
rename to eos/effects/effect4265.py
diff --git a/eos/effects/subsystembonusamarrcore3scanresolution.py b/eos/effects/effect4269.py
similarity index 100%
rename from eos/effects/subsystembonusamarrcore3scanresolution.py
rename to eos/effects/effect4269.py
diff --git a/eos/effects/subsystembonusminmatarcore3scanresolution.py b/eos/effects/effect4270.py
similarity index 100%
rename from eos/effects/subsystembonusminmatarcore3scanresolution.py
rename to eos/effects/effect4270.py
diff --git a/eos/effects/subsystembonuscaldaricore2maxtargetingrange.py b/eos/effects/effect4271.py
similarity index 100%
rename from eos/effects/subsystembonuscaldaricore2maxtargetingrange.py
rename to eos/effects/effect4271.py
diff --git a/eos/effects/subsystembonusgallentecore2maxtargetingrange.py b/eos/effects/effect4272.py
similarity index 100%
rename from eos/effects/subsystembonusgallentecore2maxtargetingrange.py
rename to eos/effects/effect4272.py
diff --git a/eos/effects/subsystembonusgallentecore2warpscramblerange.py b/eos/effects/effect4273.py
similarity index 100%
rename from eos/effects/subsystembonusgallentecore2warpscramblerange.py
rename to eos/effects/effect4273.py
diff --git a/eos/effects/subsystembonusminmatarcore2stasiswebifierrange.py b/eos/effects/effect4274.py
similarity index 100%
rename from eos/effects/subsystembonusminmatarcore2stasiswebifierrange.py
rename to eos/effects/effect4274.py
diff --git a/eos/effects/subsystembonuscaldaripropulsion2warpspeed.py b/eos/effects/effect4275.py
similarity index 100%
rename from eos/effects/subsystembonuscaldaripropulsion2warpspeed.py
rename to eos/effects/effect4275.py
diff --git a/eos/effects/subsystembonusgallentepropulsionwarpcapacitor.py b/eos/effects/effect4277.py
similarity index 100%
rename from eos/effects/subsystembonusgallentepropulsionwarpcapacitor.py
rename to eos/effects/effect4277.py
diff --git a/eos/effects/subsystembonusgallentepropulsion2warpspeed.py b/eos/effects/effect4278.py
similarity index 100%
rename from eos/effects/subsystembonusgallentepropulsion2warpspeed.py
rename to eos/effects/effect4278.py
diff --git a/eos/effects/systemagility.py b/eos/effects/effect4280.py
similarity index 100%
rename from eos/effects/systemagility.py
rename to eos/effects/effect4280.py
diff --git a/eos/effects/subsystembonusgallenteoffensive2hybridweapondamagemultiplier.py b/eos/effects/effect4282.py
similarity index 100%
rename from eos/effects/subsystembonusgallenteoffensive2hybridweapondamagemultiplier.py
rename to eos/effects/effect4282.py
diff --git a/eos/effects/subsystembonuscaldarioffensive2hybridweapondamagemultiplier.py b/eos/effects/effect4283.py
similarity index 100%
rename from eos/effects/subsystembonuscaldarioffensive2hybridweapondamagemultiplier.py
rename to eos/effects/effect4283.py
diff --git a/eos/effects/subsystembonusamarroffensive2remotearmorrepaircapuse.py b/eos/effects/effect4286.py
similarity index 100%
rename from eos/effects/subsystembonusamarroffensive2remotearmorrepaircapuse.py
rename to eos/effects/effect4286.py
diff --git a/eos/effects/subsystembonusgallenteoffensive2remotearmorrepaircapuse.py b/eos/effects/effect4288.py
similarity index 100%
rename from eos/effects/subsystembonusgallenteoffensive2remotearmorrepaircapuse.py
rename to eos/effects/effect4288.py
diff --git a/eos/effects/subsystembonusminmataroffensive2remoterepcapuse.py b/eos/effects/effect4290.py
similarity index 100%
rename from eos/effects/subsystembonusminmataroffensive2remoterepcapuse.py
rename to eos/effects/effect4290.py
diff --git a/eos/effects/subsystembonuscaldarioffensive2remoteshieldboostercapuse.py b/eos/effects/effect4292.py
similarity index 100%
rename from eos/effects/subsystembonuscaldarioffensive2remoteshieldboostercapuse.py
rename to eos/effects/effect4292.py
diff --git a/eos/effects/subsystembonuscaldaricore2ecmstrengthrange.py b/eos/effects/effect4321.py
similarity index 100%
rename from eos/effects/subsystembonuscaldaricore2ecmstrengthrange.py
rename to eos/effects/effect4321.py
diff --git a/eos/effects/subsystembonusamarroffensive3dronedamagehp.py b/eos/effects/effect4327.py
similarity index 100%
rename from eos/effects/subsystembonusamarroffensive3dronedamagehp.py
rename to eos/effects/effect4327.py
diff --git a/eos/effects/subsystembonusamarroffensive3energyweaponmaxrange.py b/eos/effects/effect4330.py
similarity index 100%
rename from eos/effects/subsystembonusamarroffensive3energyweaponmaxrange.py
rename to eos/effects/effect4330.py
diff --git a/eos/effects/subsystembonuscaldarioffensive3hmlhamvelocity.py b/eos/effects/effect4331.py
similarity index 100%
rename from eos/effects/subsystembonuscaldarioffensive3hmlhamvelocity.py
rename to eos/effects/effect4331.py
diff --git a/eos/effects/subsystembonusminmatarcore2maxtargetingrange.py b/eos/effects/effect4342.py
similarity index 100%
rename from eos/effects/subsystembonusminmatarcore2maxtargetingrange.py
rename to eos/effects/effect4342.py
diff --git a/eos/effects/subsystembonusamarrcore2maxtargetingrange.py b/eos/effects/effect4343.py
similarity index 100%
rename from eos/effects/subsystembonusamarrcore2maxtargetingrange.py
rename to eos/effects/effect4343.py
diff --git a/eos/effects/subsystembonusgallenteoffensive3turrettracking.py b/eos/effects/effect4347.py
similarity index 100%
rename from eos/effects/subsystembonusgallenteoffensive3turrettracking.py
rename to eos/effects/effect4347.py
diff --git a/eos/effects/subsystembonusminmataroffensive3turrettracking.py b/eos/effects/effect4351.py
similarity index 100%
rename from eos/effects/subsystembonusminmataroffensive3turrettracking.py
rename to eos/effects/effect4351.py
diff --git a/eos/effects/ecmrangebonusmoduleeffect.py b/eos/effects/effect4358.py
similarity index 100%
rename from eos/effects/ecmrangebonusmoduleeffect.py
rename to eos/effects/effect4358.py
diff --git a/eos/effects/subsystembonusamarroffensivemissilelauncherrof.py b/eos/effects/effect4360.py
similarity index 100%
rename from eos/effects/subsystembonusamarroffensivemissilelauncherrof.py
rename to eos/effects/effect4360.py
diff --git a/eos/effects/subsystembonusamarroffensive2missiledamage.py b/eos/effects/effect4362.py
similarity index 100%
rename from eos/effects/subsystembonusamarroffensive2missiledamage.py
rename to eos/effects/effect4362.py
diff --git a/eos/effects/shipbonusmediumhybriddmgcc2.py b/eos/effects/effect4366.py
similarity index 100%
rename from eos/effects/shipbonusmediumhybriddmgcc2.py
rename to eos/effects/effect4366.py
diff --git a/eos/effects/subsystembonuswarpbubbleimmune.py b/eos/effects/effect4369.py
similarity index 100%
rename from eos/effects/subsystembonuswarpbubbleimmune.py
rename to eos/effects/effect4369.py
diff --git a/eos/effects/caldarishipewfalloffrangecc2.py b/eos/effects/effect4370.py
similarity index 100%
rename from eos/effects/caldarishipewfalloffrangecc2.py
rename to eos/effects/effect4370.py
diff --git a/eos/effects/caldarishipewfalloffrangecb3.py b/eos/effects/effect4372.py
similarity index 100%
rename from eos/effects/caldarishipewfalloffrangecb3.py
rename to eos/effects/effect4372.py
diff --git a/eos/effects/subsystembonusamarroffensivecommandbursts.py b/eos/effects/effect4373.py
similarity index 100%
rename from eos/effects/subsystembonusamarroffensivecommandbursts.py
rename to eos/effects/effect4373.py
diff --git a/eos/effects/shipbonustorpedovelocitygf2.py b/eos/effects/effect4377.py
similarity index 100%
rename from eos/effects/shipbonustorpedovelocitygf2.py
rename to eos/effects/effect4377.py
diff --git a/eos/effects/shipbonustorpedovelocitymf2.py b/eos/effects/effect4378.py
similarity index 100%
rename from eos/effects/shipbonustorpedovelocitymf2.py
rename to eos/effects/effect4378.py
diff --git a/eos/effects/shipbonustorpedovelocity2af.py b/eos/effects/effect4379.py
similarity index 100%
rename from eos/effects/shipbonustorpedovelocity2af.py
rename to eos/effects/effect4379.py
diff --git a/eos/effects/shipbonustorpedovelocitycf2.py b/eos/effects/effect4380.py
similarity index 100%
rename from eos/effects/shipbonustorpedovelocitycf2.py
rename to eos/effects/effect4380.py
diff --git a/eos/effects/elitereconbonusheavymissilevelocity.py b/eos/effects/effect4384.py
similarity index 100%
rename from eos/effects/elitereconbonusheavymissilevelocity.py
rename to eos/effects/effect4384.py
diff --git a/eos/effects/elitereconbonusheavyassaultmissilevelocity.py b/eos/effects/effect4385.py
similarity index 100%
rename from eos/effects/elitereconbonusheavyassaultmissilevelocity.py
rename to eos/effects/effect4385.py
diff --git a/eos/effects/shipbonuselitecover2torpedothermaldamage.py b/eos/effects/effect4393.py
similarity index 100%
rename from eos/effects/shipbonuselitecover2torpedothermaldamage.py
rename to eos/effects/effect4393.py
diff --git a/eos/effects/shipbonuselitecover2torpedoemdamage.py b/eos/effects/effect4394.py
similarity index 100%
rename from eos/effects/shipbonuselitecover2torpedoemdamage.py
rename to eos/effects/effect4394.py
diff --git a/eos/effects/shipbonuselitecover2torpedoexplosivedamage.py b/eos/effects/effect4395.py
similarity index 100%
rename from eos/effects/shipbonuselitecover2torpedoexplosivedamage.py
rename to eos/effects/effect4395.py
diff --git a/eos/effects/shipbonuselitecover2torpedokineticdamage.py b/eos/effects/effect4396.py
similarity index 100%
rename from eos/effects/shipbonuselitecover2torpedokineticdamage.py
rename to eos/effects/effect4396.py
diff --git a/eos/effects/shipbonusgftorpedoexplosionvelocity.py b/eos/effects/effect4397.py
similarity index 100%
rename from eos/effects/shipbonusgftorpedoexplosionvelocity.py
rename to eos/effects/effect4397.py
diff --git a/eos/effects/shipbonusmf1torpedoexplosionvelocity.py b/eos/effects/effect4398.py
similarity index 100%
rename from eos/effects/shipbonusmf1torpedoexplosionvelocity.py
rename to eos/effects/effect4398.py
diff --git a/eos/effects/shipbonuscf1torpedoexplosionvelocity.py b/eos/effects/effect4399.py
similarity index 100%
rename from eos/effects/shipbonuscf1torpedoexplosionvelocity.py
rename to eos/effects/effect4399.py
diff --git a/eos/effects/shipbonusaf1torpedoexplosionvelocity.py b/eos/effects/effect4400.py
similarity index 100%
rename from eos/effects/shipbonusaf1torpedoexplosionvelocity.py
rename to eos/effects/effect4400.py
diff --git a/eos/effects/shipbonusgf1torpedoflighttime.py b/eos/effects/effect4413.py
similarity index 100%
rename from eos/effects/shipbonusgf1torpedoflighttime.py
rename to eos/effects/effect4413.py
diff --git a/eos/effects/shipbonusmf1torpedoflighttime.py b/eos/effects/effect4415.py
similarity index 100%
rename from eos/effects/shipbonusmf1torpedoflighttime.py
rename to eos/effects/effect4415.py
diff --git a/eos/effects/shipbonuscf1torpedoflighttime.py b/eos/effects/effect4416.py
similarity index 100%
rename from eos/effects/shipbonuscf1torpedoflighttime.py
rename to eos/effects/effect4416.py
diff --git a/eos/effects/shipbonusaf1torpedoflighttime.py b/eos/effects/effect4417.py
similarity index 100%
rename from eos/effects/shipbonusaf1torpedoflighttime.py
rename to eos/effects/effect4417.py
diff --git a/eos/effects/scanradarstrengthmodifiereffect.py b/eos/effects/effect4451.py
similarity index 100%
rename from eos/effects/scanradarstrengthmodifiereffect.py
rename to eos/effects/effect4451.py
diff --git a/eos/effects/scanladarstrengthmodifiereffect.py b/eos/effects/effect4452.py
similarity index 100%
rename from eos/effects/scanladarstrengthmodifiereffect.py
rename to eos/effects/effect4452.py
diff --git a/eos/effects/scangravimetricstrengthmodifiereffect.py b/eos/effects/effect4453.py
similarity index 100%
rename from eos/effects/scangravimetricstrengthmodifiereffect.py
rename to eos/effects/effect4453.py
diff --git a/eos/effects/scanmagnetometricstrengthmodifiereffect.py b/eos/effects/effect4454.py
similarity index 100%
rename from eos/effects/scanmagnetometricstrengthmodifiereffect.py
rename to eos/effects/effect4454.py
diff --git a/eos/effects/federationsetbonus3.py b/eos/effects/effect4456.py
similarity index 100%
rename from eos/effects/federationsetbonus3.py
rename to eos/effects/effect4456.py
diff --git a/eos/effects/imperialsetbonus3.py b/eos/effects/effect4457.py
similarity index 100%
rename from eos/effects/imperialsetbonus3.py
rename to eos/effects/effect4457.py
diff --git a/eos/effects/republicsetbonus3.py b/eos/effects/effect4458.py
similarity index 100%
rename from eos/effects/republicsetbonus3.py
rename to eos/effects/effect4458.py
diff --git a/eos/effects/caldarisetbonus3.py b/eos/effects/effect4459.py
similarity index 100%
rename from eos/effects/caldarisetbonus3.py
rename to eos/effects/effect4459.py
diff --git a/eos/effects/shieldmanagementshieldcapacitybonuspostpercentcapacitylocationshipgroupshield.py b/eos/effects/effect446.py
similarity index 100%
rename from eos/effects/shieldmanagementshieldcapacitybonuspostpercentcapacitylocationshipgroupshield.py
rename to eos/effects/effect446.py
diff --git a/eos/effects/imperialsetlgbonus.py b/eos/effects/effect4460.py
similarity index 100%
rename from eos/effects/imperialsetlgbonus.py
rename to eos/effects/effect4460.py
diff --git a/eos/effects/federationsetlgbonus.py b/eos/effects/effect4461.py
similarity index 100%
rename from eos/effects/federationsetlgbonus.py
rename to eos/effects/effect4461.py
diff --git a/eos/effects/caldarisetlgbonus.py b/eos/effects/effect4462.py
similarity index 100%
rename from eos/effects/caldarisetlgbonus.py
rename to eos/effects/effect4462.py
diff --git a/eos/effects/republicsetlgbonus.py b/eos/effects/effect4463.py
similarity index 100%
rename from eos/effects/republicsetlgbonus.py
rename to eos/effects/effect4463.py
diff --git a/eos/effects/shipprojectilerofmf.py b/eos/effects/effect4464.py
similarity index 100%
rename from eos/effects/shipprojectilerofmf.py
rename to eos/effects/effect4464.py
diff --git a/eos/effects/shipbonusstasismf2.py b/eos/effects/effect4471.py
similarity index 100%
rename from eos/effects/shipbonusstasismf2.py
rename to eos/effects/effect4471.py
diff --git a/eos/effects/shipprojectiledmgmc.py b/eos/effects/effect4472.py
similarity index 100%
rename from eos/effects/shipprojectiledmgmc.py
rename to eos/effects/effect4472.py
diff --git a/eos/effects/shipvelocitybonusatc1.py b/eos/effects/effect4473.py
similarity index 100%
rename from eos/effects/shipvelocitybonusatc1.py
rename to eos/effects/effect4473.py
diff --git a/eos/effects/shipmtmaxrangebonusatc.py b/eos/effects/effect4474.py
similarity index 100%
rename from eos/effects/shipmtmaxrangebonusatc.py
rename to eos/effects/effect4474.py
diff --git a/eos/effects/shipmtfalloffbonusatc.py b/eos/effects/effect4475.py
similarity index 100%
rename from eos/effects/shipmtfalloffbonusatc.py
rename to eos/effects/effect4475.py
diff --git a/eos/effects/shipmtfalloffbonusatf.py b/eos/effects/effect4476.py
similarity index 100%
rename from eos/effects/shipmtfalloffbonusatf.py
rename to eos/effects/effect4476.py
diff --git a/eos/effects/shipmtmaxrangebonusatf.py b/eos/effects/effect4477.py
similarity index 100%
rename from eos/effects/shipmtmaxrangebonusatf.py
rename to eos/effects/effect4477.py
diff --git a/eos/effects/shipbonusafterburnercapneedatf.py b/eos/effects/effect4478.py
similarity index 100%
rename from eos/effects/shipbonusafterburnercapneedatf.py
rename to eos/effects/effect4478.py
diff --git a/eos/effects/shipbonussurveyprobeexplosiondelayskillsurveycovertops3.py b/eos/effects/effect4479.py
similarity index 100%
rename from eos/effects/shipbonussurveyprobeexplosiondelayskillsurveycovertops3.py
rename to eos/effects/effect4479.py
diff --git a/eos/effects/shipetoptimalrange2af.py b/eos/effects/effect4482.py
similarity index 100%
rename from eos/effects/shipetoptimalrange2af.py
rename to eos/effects/effect4482.py
diff --git a/eos/effects/shippturretfalloffbonusgb.py b/eos/effects/effect4484.py
similarity index 100%
rename from eos/effects/shippturretfalloffbonusgb.py
rename to eos/effects/effect4484.py
diff --git a/eos/effects/shipbonusstasiswebspeedfactormb.py b/eos/effects/effect4485.py
similarity index 100%
rename from eos/effects/shipbonusstasiswebspeedfactormb.py
rename to eos/effects/effect4485.py
diff --git a/eos/effects/superweaponamarr.py b/eos/effects/effect4489.py
similarity index 100%
rename from eos/effects/superweaponamarr.py
rename to eos/effects/effect4489.py
diff --git a/eos/effects/superweaponcaldari.py b/eos/effects/effect4490.py
similarity index 100%
rename from eos/effects/superweaponcaldari.py
rename to eos/effects/effect4490.py
diff --git a/eos/effects/superweapongallente.py b/eos/effects/effect4491.py
similarity index 100%
rename from eos/effects/superweapongallente.py
rename to eos/effects/effect4491.py
diff --git a/eos/effects/superweaponminmatar.py b/eos/effects/effect4492.py
similarity index 100%
rename from eos/effects/superweaponminmatar.py
rename to eos/effects/effect4492.py
diff --git a/eos/effects/shipstasiswebstrengthbonusmc2.py b/eos/effects/effect4510.py
similarity index 100%
rename from eos/effects/shipstasiswebstrengthbonusmc2.py
rename to eos/effects/effect4510.py
diff --git a/eos/effects/shippturretfalloffbonusgc.py b/eos/effects/effect4512.py
similarity index 100%
rename from eos/effects/shippturretfalloffbonusgc.py
rename to eos/effects/effect4512.py
diff --git a/eos/effects/shipstasiswebstrengthbonusmf2.py b/eos/effects/effect4513.py
similarity index 100%
rename from eos/effects/shipstasiswebstrengthbonusmf2.py
rename to eos/effects/effect4513.py
diff --git a/eos/effects/shipfalloffbonusmf.py b/eos/effects/effect4515.py
similarity index 100%
rename from eos/effects/shipfalloffbonusmf.py
rename to eos/effects/effect4515.py
diff --git a/eos/effects/shiphturretfalloffbonusgc.py b/eos/effects/effect4516.py
similarity index 100%
rename from eos/effects/shiphturretfalloffbonusgc.py
rename to eos/effects/effect4516.py
diff --git a/eos/effects/gunneryfalloffbonusonline.py b/eos/effects/effect4527.py
similarity index 100%
rename from eos/effects/gunneryfalloffbonusonline.py
rename to eos/effects/effect4527.py
diff --git a/eos/effects/capitallauncherskillcruisecitadelemdamage1.py b/eos/effects/effect4555.py
similarity index 100%
rename from eos/effects/capitallauncherskillcruisecitadelemdamage1.py
rename to eos/effects/effect4555.py
diff --git a/eos/effects/capitallauncherskillcruisecitadelexplosivedamage1.py b/eos/effects/effect4556.py
similarity index 100%
rename from eos/effects/capitallauncherskillcruisecitadelexplosivedamage1.py
rename to eos/effects/effect4556.py
diff --git a/eos/effects/capitallauncherskillcruisecitadelkineticdamage1.py b/eos/effects/effect4557.py
similarity index 100%
rename from eos/effects/capitallauncherskillcruisecitadelkineticdamage1.py
rename to eos/effects/effect4557.py
diff --git a/eos/effects/capitallauncherskillcruisecitadelthermaldamage1.py b/eos/effects/effect4558.py
similarity index 100%
rename from eos/effects/capitallauncherskillcruisecitadelthermaldamage1.py
rename to eos/effects/effect4558.py
diff --git a/eos/effects/gunnerymaxrangefallofftrackingspeedbonus.py b/eos/effects/effect4559.py
similarity index 100%
rename from eos/effects/gunnerymaxrangefallofftrackingspeedbonus.py
rename to eos/effects/effect4559.py
diff --git a/eos/effects/industrialcoreeffect2.py b/eos/effects/effect4575.py
similarity index 100%
rename from eos/effects/industrialcoreeffect2.py
rename to eos/effects/effect4575.py
diff --git a/eos/effects/elitebonuslogisticstrackinglinkfalloffbonus1.py b/eos/effects/effect4576.py
similarity index 100%
rename from eos/effects/elitebonuslogisticstrackinglinkfalloffbonus1.py
rename to eos/effects/effect4576.py
diff --git a/eos/effects/elitebonuslogisticstrackinglinkfalloffbonus2.py b/eos/effects/effect4577.py
similarity index 100%
rename from eos/effects/elitebonuslogisticstrackinglinkfalloffbonus2.py
rename to eos/effects/effect4577.py
diff --git a/eos/effects/dronerigstasiswebspeedfactorbonus.py b/eos/effects/effect4579.py
similarity index 100%
rename from eos/effects/dronerigstasiswebspeedfactorbonus.py
rename to eos/effects/effect4579.py
diff --git a/eos/effects/shipbonusdronedamagegf2.py b/eos/effects/effect4619.py
similarity index 100%
rename from eos/effects/shipbonusdronedamagegf2.py
rename to eos/effects/effect4619.py
diff --git a/eos/effects/shipbonuswarpscramblermaxrangegf2.py b/eos/effects/effect4620.py
similarity index 100%
rename from eos/effects/shipbonuswarpscramblermaxrangegf2.py
rename to eos/effects/effect4620.py
diff --git a/eos/effects/shipbonusheatdamageatf1.py b/eos/effects/effect4621.py
similarity index 100%
rename from eos/effects/shipbonusheatdamageatf1.py
rename to eos/effects/effect4621.py
diff --git a/eos/effects/shipbonussmallhybridmaxrangeatf2.py b/eos/effects/effect4622.py
similarity index 100%
rename from eos/effects/shipbonussmallhybridmaxrangeatf2.py
rename to eos/effects/effect4622.py
diff --git a/eos/effects/shipbonussmallhybridtrackingspeedatf2.py b/eos/effects/effect4623.py
similarity index 100%
rename from eos/effects/shipbonussmallhybridtrackingspeedatf2.py
rename to eos/effects/effect4623.py
diff --git a/eos/effects/shipbonushybridtrackingatc2.py b/eos/effects/effect4624.py
similarity index 100%
rename from eos/effects/shipbonushybridtrackingatc2.py
rename to eos/effects/effect4624.py
diff --git a/eos/effects/shipbonushybridfalloffatc2.py b/eos/effects/effect4625.py
similarity index 100%
rename from eos/effects/shipbonushybridfalloffatc2.py
rename to eos/effects/effect4625.py
diff --git a/eos/effects/shipbonuswarpscramblermaxrangegc2.py b/eos/effects/effect4626.py
similarity index 100%
rename from eos/effects/shipbonuswarpscramblermaxrangegc2.py
rename to eos/effects/effect4626.py
diff --git a/eos/effects/elitebonusmarauderscruiseandtorpedodamagerole1.py b/eos/effects/effect4635.py
similarity index 100%
rename from eos/effects/elitebonusmarauderscruiseandtorpedodamagerole1.py
rename to eos/effects/effect4635.py
diff --git a/eos/effects/shipbonusaoevelocitycruiseandtorpedocb2.py b/eos/effects/effect4636.py
similarity index 100%
rename from eos/effects/shipbonusaoevelocitycruiseandtorpedocb2.py
rename to eos/effects/effect4636.py
diff --git a/eos/effects/shipcruiseandtorpedovelocitybonuscb3.py b/eos/effects/effect4637.py
similarity index 100%
rename from eos/effects/shipcruiseandtorpedovelocitybonuscb3.py
rename to eos/effects/effect4637.py
diff --git a/eos/effects/shiparmoremandexpandkinandthmresistanceac2.py b/eos/effects/effect4640.py
similarity index 100%
rename from eos/effects/shiparmoremandexpandkinandthmresistanceac2.py
rename to eos/effects/effect4640.py
diff --git a/eos/effects/shipheavyassaultmissileemandexpandkinandthmdmgac1.py b/eos/effects/effect4643.py
similarity index 100%
rename from eos/effects/shipheavyassaultmissileemandexpandkinandthmdmgac1.py
rename to eos/effects/effect4643.py
diff --git a/eos/effects/elitebonusheavygunshipheavyandheavyassaultandassaultmissilelauncherrof.py b/eos/effects/effect4645.py
similarity index 100%
rename from eos/effects/elitebonusheavygunshipheavyandheavyassaultandassaultmissilelauncherrof.py
rename to eos/effects/effect4645.py
diff --git a/eos/effects/elitebonusblackopsecmgravandladarandmagnetometricandradarstrength1.py b/eos/effects/effect4648.py
similarity index 100%
rename from eos/effects/elitebonusblackopsecmgravandladarandmagnetometricandradarstrength1.py
rename to eos/effects/effect4648.py
diff --git a/eos/effects/shipcruiseandsiegelauncherrofbonus2cb.py b/eos/effects/effect4649.py
similarity index 100%
rename from eos/effects/shipcruiseandsiegelauncherrofbonus2cb.py
rename to eos/effects/effect4649.py
diff --git a/eos/effects/shipbonusnoctissalvagecycle.py b/eos/effects/effect4667.py
similarity index 100%
rename from eos/effects/shipbonusnoctissalvagecycle.py
rename to eos/effects/effect4667.py
diff --git a/eos/effects/shipbonusnoctistractorcycle.py b/eos/effects/effect4668.py
similarity index 100%
rename from eos/effects/shipbonusnoctistractorcycle.py
rename to eos/effects/effect4668.py
diff --git a/eos/effects/shipbonusnoctistractorvelocity.py b/eos/effects/effect4669.py
similarity index 100%
rename from eos/effects/shipbonusnoctistractorvelocity.py
rename to eos/effects/effect4669.py
diff --git a/eos/effects/shipbonusnoctistractorrange.py b/eos/effects/effect4670.py
similarity index 100%
rename from eos/effects/shipbonusnoctistractorrange.py
rename to eos/effects/effect4670.py
diff --git a/eos/effects/offensivedefensivereduction.py b/eos/effects/effect4728.py
similarity index 100%
rename from eos/effects/offensivedefensivereduction.py
rename to eos/effects/effect4728.py
diff --git a/eos/effects/subsystembonuscaldaripropulsionwarpcapacitor.py b/eos/effects/effect4760.py
similarity index 100%
rename from eos/effects/subsystembonuscaldaripropulsionwarpcapacitor.py
rename to eos/effects/effect4760.py
diff --git a/eos/effects/shipenergyneutralizertransferamountbonusaf2.py b/eos/effects/effect4775.py
similarity index 100%
rename from eos/effects/shipenergyneutralizertransferamountbonusaf2.py
rename to eos/effects/effect4775.py
diff --git a/eos/effects/shipbonussmallenergyweaponoptimalrangeatf2.py b/eos/effects/effect4782.py
similarity index 100%
rename from eos/effects/shipbonussmallenergyweaponoptimalrangeatf2.py
rename to eos/effects/effect4782.py
diff --git a/eos/effects/shipbonussmallenergyturretdamageatf1.py b/eos/effects/effect4789.py
similarity index 100%
rename from eos/effects/shipbonussmallenergyturretdamageatf1.py
rename to eos/effects/effect4789.py
diff --git a/eos/effects/shipbonusmissilelauncherheavyrofatc1.py b/eos/effects/effect4793.py
similarity index 100%
rename from eos/effects/shipbonusmissilelauncherheavyrofatc1.py
rename to eos/effects/effect4793.py
diff --git a/eos/effects/shipbonusmissilelauncherassaultrofatc1.py b/eos/effects/effect4794.py
similarity index 100%
rename from eos/effects/shipbonusmissilelauncherassaultrofatc1.py
rename to eos/effects/effect4794.py
diff --git a/eos/effects/shipbonusmissilelauncherheavyassaultrofatc1.py b/eos/effects/effect4795.py
similarity index 100%
rename from eos/effects/shipbonusmissilelauncherheavyassaultrofatc1.py
rename to eos/effects/effect4795.py
diff --git a/eos/effects/elitebonusblackopsecmburstgravandladarandmagnetoandradar.py b/eos/effects/effect4799.py
similarity index 100%
rename from eos/effects/elitebonusblackopsecmburstgravandladarandmagnetoandradar.py
rename to eos/effects/effect4799.py
diff --git a/eos/effects/powerbooster.py b/eos/effects/effect48.py
similarity index 100%
rename from eos/effects/powerbooster.py
rename to eos/effects/effect48.py
diff --git a/eos/effects/dataminingskillboostaccessdifficultybonusabsolutepercent.py b/eos/effects/effect4804.py
similarity index 100%
rename from eos/effects/dataminingskillboostaccessdifficultybonusabsolutepercent.py
rename to eos/effects/effect4804.py
diff --git a/eos/effects/ecmgravimetricstrengthbonuspercent.py b/eos/effects/effect4809.py
similarity index 100%
rename from eos/effects/ecmgravimetricstrengthbonuspercent.py
rename to eos/effects/effect4809.py
diff --git a/eos/effects/ecmladarstrengthbonuspercent.py b/eos/effects/effect4810.py
similarity index 100%
rename from eos/effects/ecmladarstrengthbonuspercent.py
rename to eos/effects/effect4810.py
diff --git a/eos/effects/ecmmagnetometricstrengthbonuspercent.py b/eos/effects/effect4811.py
similarity index 100%
rename from eos/effects/ecmmagnetometricstrengthbonuspercent.py
rename to eos/effects/effect4811.py
diff --git a/eos/effects/ecmradarstrengthbonuspercent.py b/eos/effects/effect4812.py
similarity index 100%
rename from eos/effects/ecmradarstrengthbonuspercent.py
rename to eos/effects/effect4812.py
diff --git a/eos/effects/jumpportalconsumptionbonuspercentskill.py b/eos/effects/effect4814.py
similarity index 100%
rename from eos/effects/jumpportalconsumptionbonuspercentskill.py
rename to eos/effects/effect4814.py
diff --git a/eos/effects/salvagermoduledurationreduction.py b/eos/effects/effect4817.py
similarity index 100%
rename from eos/effects/salvagermoduledurationreduction.py
rename to eos/effects/effect4817.py
diff --git a/eos/effects/bclargeenergyturretpowerneedbonus.py b/eos/effects/effect4820.py
similarity index 100%
rename from eos/effects/bclargeenergyturretpowerneedbonus.py
rename to eos/effects/effect4820.py
diff --git a/eos/effects/bclargehybridturretpowerneedbonus.py b/eos/effects/effect4821.py
similarity index 100%
rename from eos/effects/bclargehybridturretpowerneedbonus.py
rename to eos/effects/effect4821.py
diff --git a/eos/effects/bclargeprojectileturretpowerneedbonus.py b/eos/effects/effect4822.py
similarity index 100%
rename from eos/effects/bclargeprojectileturretpowerneedbonus.py
rename to eos/effects/effect4822.py
diff --git a/eos/effects/bclargeenergyturretcpuneedbonus.py b/eos/effects/effect4823.py
similarity index 100%
rename from eos/effects/bclargeenergyturretcpuneedbonus.py
rename to eos/effects/effect4823.py
diff --git a/eos/effects/bclargehybridturretcpuneedbonus.py b/eos/effects/effect4824.py
similarity index 100%
rename from eos/effects/bclargehybridturretcpuneedbonus.py
rename to eos/effects/effect4824.py
diff --git a/eos/effects/bclargeprojectileturretcpuneedbonus.py b/eos/effects/effect4825.py
similarity index 100%
rename from eos/effects/bclargeprojectileturretcpuneedbonus.py
rename to eos/effects/effect4825.py
diff --git a/eos/effects/bclargeenergyturretcapacitorneedbonus.py b/eos/effects/effect4826.py
similarity index 100%
rename from eos/effects/bclargeenergyturretcapacitorneedbonus.py
rename to eos/effects/effect4826.py
diff --git a/eos/effects/bclargehybridturretcapacitorneedbonus.py b/eos/effects/effect4827.py
similarity index 100%
rename from eos/effects/bclargehybridturretcapacitorneedbonus.py
rename to eos/effects/effect4827.py
diff --git a/eos/effects/energysystemsoperationcaprechargebonuspostpercentrechargeratelocationshipgroupcapacitor.py b/eos/effects/effect485.py
similarity index 100%
rename from eos/effects/energysystemsoperationcaprechargebonuspostpercentrechargeratelocationshipgroupcapacitor.py
rename to eos/effects/effect485.py
diff --git a/eos/effects/shieldoperationrechargeratebonuspostpercentrechargeratelocationshipgroupshield.py b/eos/effects/effect486.py
similarity index 100%
rename from eos/effects/shieldoperationrechargeratebonuspostpercentrechargeratelocationshipgroupshield.py
rename to eos/effects/effect486.py
diff --git a/eos/effects/setbonuschristmaspowergrid.py b/eos/effects/effect4867.py
similarity index 100%
rename from eos/effects/setbonuschristmaspowergrid.py
rename to eos/effects/effect4867.py
diff --git a/eos/effects/setbonuschristmascapacitorcapacity.py b/eos/effects/effect4868.py
similarity index 100%
rename from eos/effects/setbonuschristmascapacitorcapacity.py
rename to eos/effects/effect4868.py
diff --git a/eos/effects/setbonuschristmascpuoutput.py b/eos/effects/effect4869.py
similarity index 100%
rename from eos/effects/setbonuschristmascpuoutput.py
rename to eos/effects/effect4869.py
diff --git a/eos/effects/setbonuschristmascapacitorrecharge2.py b/eos/effects/effect4871.py
similarity index 100%
rename from eos/effects/setbonuschristmascapacitorrecharge2.py
rename to eos/effects/effect4871.py
diff --git a/eos/effects/shipbonusdronehitpointsgf2.py b/eos/effects/effect4896.py
similarity index 100%
rename from eos/effects/shipbonusdronehitpointsgf2.py
rename to eos/effects/effect4896.py
diff --git a/eos/effects/shipbonusdronearmorhitpointsgf2.py b/eos/effects/effect4897.py
similarity index 100%
rename from eos/effects/shipbonusdronearmorhitpointsgf2.py
rename to eos/effects/effect4897.py
diff --git a/eos/effects/shipbonusdroneshieldhitpointsgf2.py b/eos/effects/effect4898.py
similarity index 100%
rename from eos/effects/shipbonusdroneshieldhitpointsgf2.py
rename to eos/effects/effect4898.py
diff --git a/eos/effects/engineeringpowerengineeringoutputbonuspostpercentpoweroutputlocationshipgrouppowercore.py b/eos/effects/effect490.py
similarity index 100%
rename from eos/effects/engineeringpowerengineeringoutputbonuspostpercentpoweroutputlocationshipgrouppowercore.py
rename to eos/effects/effect490.py
diff --git a/eos/effects/shipmissilespeedbonusaf.py b/eos/effects/effect4901.py
similarity index 100%
rename from eos/effects/shipmissilespeedbonusaf.py
rename to eos/effects/effect4901.py
diff --git a/eos/effects/mwdsignatureradiusrolebonus.py b/eos/effects/effect4902.py
similarity index 100%
rename from eos/effects/mwdsignatureradiusrolebonus.py
rename to eos/effects/effect4902.py
diff --git a/eos/effects/systemdamagefighters.py b/eos/effects/effect4906.py
similarity index 100%
rename from eos/effects/systemdamagefighters.py
rename to eos/effects/effect4906.py
diff --git a/eos/effects/modifyshieldrechargeratepassive.py b/eos/effects/effect4911.py
similarity index 100%
rename from eos/effects/modifyshieldrechargeratepassive.py
rename to eos/effects/effect4911.py
diff --git a/eos/effects/microjumpdrive.py b/eos/effects/effect4921.py
similarity index 100%
rename from eos/effects/microjumpdrive.py
rename to eos/effects/effect4921.py
diff --git a/eos/effects/skillmjddurationbonus.py b/eos/effects/effect4923.py
similarity index 100%
rename from eos/effects/skillmjddurationbonus.py
rename to eos/effects/effect4923.py
diff --git a/eos/effects/adaptivearmorhardener.py b/eos/effects/effect4928.py
similarity index 100%
rename from eos/effects/adaptivearmorhardener.py
rename to eos/effects/effect4928.py
diff --git a/eos/effects/shiparmorrepairinggf2.py b/eos/effects/effect4934.py
similarity index 100%
rename from eos/effects/shiparmorrepairinggf2.py
rename to eos/effects/effect4934.py
diff --git a/eos/effects/fueledshieldboosting.py b/eos/effects/effect4936.py
similarity index 100%
rename from eos/effects/fueledshieldboosting.py
rename to eos/effects/effect4936.py
diff --git a/eos/effects/warpdriveoperationwarpcapacitorneedbonuspostpercentwarpcapacitorneedlocationshipgrouppropulsion.py b/eos/effects/effect494.py
similarity index 100%
rename from eos/effects/warpdriveoperationwarpcapacitorneedbonuspostpercentwarpcapacitorneedlocationshipgrouppropulsion.py
rename to eos/effects/effect494.py
diff --git a/eos/effects/shiphybriddamagebonuscf2.py b/eos/effects/effect4941.py
similarity index 100%
rename from eos/effects/shiphybriddamagebonuscf2.py
rename to eos/effects/effect4941.py
diff --git a/eos/effects/targetbreaker.py b/eos/effects/effect4942.py
similarity index 100%
rename from eos/effects/targetbreaker.py
rename to eos/effects/effect4942.py
diff --git a/eos/effects/skilltargetbreakerdurationbonus2.py b/eos/effects/effect4945.py
similarity index 100%
rename from eos/effects/skilltargetbreakerdurationbonus2.py
rename to eos/effects/effect4945.py
diff --git a/eos/effects/skilltargetbreakercapneedbonus2.py b/eos/effects/effect4946.py
similarity index 100%
rename from eos/effects/skilltargetbreakercapneedbonus2.py
rename to eos/effects/effect4946.py
diff --git a/eos/effects/shipbonusshieldboostermb1a.py b/eos/effects/effect4950.py
similarity index 100%
rename from eos/effects/shipbonusshieldboostermb1a.py
rename to eos/effects/effect4950.py
diff --git a/eos/effects/shieldboostamplifierpassivebooster.py b/eos/effects/effect4951.py
similarity index 100%
rename from eos/effects/shieldboostamplifierpassivebooster.py
rename to eos/effects/effect4951.py
diff --git a/eos/effects/systemshieldrepairamountshieldskills.py b/eos/effects/effect4961.py
similarity index 100%
rename from eos/effects/systemshieldrepairamountshieldskills.py
rename to eos/effects/effect4961.py
diff --git a/eos/effects/shieldboosterdurationbonusshieldskills.py b/eos/effects/effect4967.py
similarity index 100%
rename from eos/effects/shieldboosterdurationbonusshieldskills.py
rename to eos/effects/effect4967.py
diff --git a/eos/effects/boostershieldboostamountpenaltyshieldskills.py b/eos/effects/effect4970.py
similarity index 100%
rename from eos/effects/boostershieldboostamountpenaltyshieldskills.py
rename to eos/effects/effect4970.py
diff --git a/eos/effects/elitebonusassaultshiplightmissilerof.py b/eos/effects/effect4972.py
similarity index 100%
rename from eos/effects/elitebonusassaultshiplightmissilerof.py
rename to eos/effects/effect4972.py
diff --git a/eos/effects/elitebonusassaultshiprocketrof.py b/eos/effects/effect4973.py
similarity index 100%
rename from eos/effects/elitebonusassaultshiprocketrof.py
rename to eos/effects/effect4973.py
diff --git a/eos/effects/elitebonusmaraudershieldbonus2a.py b/eos/effects/effect4974.py
similarity index 100%
rename from eos/effects/elitebonusmaraudershieldbonus2a.py
rename to eos/effects/effect4974.py
diff --git a/eos/effects/shipbonusmissilekineticlatf2.py b/eos/effects/effect4975.py
similarity index 100%
rename from eos/effects/shipbonusmissilekineticlatf2.py
rename to eos/effects/effect4975.py
diff --git a/eos/effects/skillreactivearmorhardenerdurationbonus.py b/eos/effects/effect4976.py
similarity index 100%
rename from eos/effects/skillreactivearmorhardenerdurationbonus.py
rename to eos/effects/effect4976.py
diff --git a/eos/effects/missileskillaoecloudsizebonusallincludingcapitals.py b/eos/effects/effect4989.py
similarity index 100%
rename from eos/effects/missileskillaoecloudsizebonusallincludingcapitals.py
rename to eos/effects/effect4989.py
diff --git a/eos/effects/shipenergytcapneedbonusrookie.py b/eos/effects/effect4990.py
similarity index 100%
rename from eos/effects/shipenergytcapneedbonusrookie.py
rename to eos/effects/effect4990.py
diff --git a/eos/effects/shipsetdmgbonusrookie.py b/eos/effects/effect4991.py
similarity index 100%
rename from eos/effects/shipsetdmgbonusrookie.py
rename to eos/effects/effect4991.py
diff --git a/eos/effects/shiparmoremresistancerookie.py b/eos/effects/effect4994.py
similarity index 100%
rename from eos/effects/shiparmoremresistancerookie.py
rename to eos/effects/effect4994.py
diff --git a/eos/effects/shiparmorexresistancerookie.py b/eos/effects/effect4995.py
similarity index 100%
rename from eos/effects/shiparmorexresistancerookie.py
rename to eos/effects/effect4995.py
diff --git a/eos/effects/shiparmorknresistancerookie.py b/eos/effects/effect4996.py
similarity index 100%
rename from eos/effects/shiparmorknresistancerookie.py
rename to eos/effects/effect4996.py
diff --git a/eos/effects/shiparmorthresistancerookie.py b/eos/effects/effect4997.py
similarity index 100%
rename from eos/effects/shiparmorthresistancerookie.py
rename to eos/effects/effect4997.py
diff --git a/eos/effects/shiphybridrangebonusrookie.py b/eos/effects/effect4999.py
similarity index 100%
rename from eos/effects/shiphybridrangebonusrookie.py
rename to eos/effects/effect4999.py
diff --git a/eos/effects/modifyshieldrechargerate.py b/eos/effects/effect50.py
similarity index 100%
rename from eos/effects/modifyshieldrechargerate.py
rename to eos/effects/effect50.py
diff --git a/eos/effects/shipmissilekineticdamagerookie.py b/eos/effects/effect5000.py
similarity index 100%
rename from eos/effects/shipmissilekineticdamagerookie.py
rename to eos/effects/effect5000.py
diff --git a/eos/effects/shipshieldemresistancerookie.py b/eos/effects/effect5008.py
similarity index 100%
rename from eos/effects/shipshieldemresistancerookie.py
rename to eos/effects/effect5008.py
diff --git a/eos/effects/shipshieldexplosiveresistancerookie.py b/eos/effects/effect5009.py
similarity index 100%
rename from eos/effects/shipshieldexplosiveresistancerookie.py
rename to eos/effects/effect5009.py
diff --git a/eos/effects/shipshieldkineticresistancerookie.py b/eos/effects/effect5011.py
similarity index 100%
rename from eos/effects/shipshieldkineticresistancerookie.py
rename to eos/effects/effect5011.py
diff --git a/eos/effects/shipshieldthermalresistancerookie.py b/eos/effects/effect5012.py
similarity index 100%
rename from eos/effects/shipshieldthermalresistancerookie.py
rename to eos/effects/effect5012.py
diff --git a/eos/effects/shipshtdmgbonusrookie.py b/eos/effects/effect5013.py
similarity index 100%
rename from eos/effects/shipshtdmgbonusrookie.py
rename to eos/effects/effect5013.py
diff --git a/eos/effects/shipbonusdronedamagemultiplierrookie.py b/eos/effects/effect5014.py
similarity index 100%
rename from eos/effects/shipbonusdronedamagemultiplierrookie.py
rename to eos/effects/effect5014.py
diff --git a/eos/effects/shipbonusewremotesensordampenermaxtargetrangebonusrookie.py b/eos/effects/effect5015.py
similarity index 100%
rename from eos/effects/shipbonusewremotesensordampenermaxtargetrangebonusrookie.py
rename to eos/effects/effect5015.py
diff --git a/eos/effects/shipbonusewremotesensordampenerscanresolutionbonusrookie.py b/eos/effects/effect5016.py
similarity index 100%
rename from eos/effects/shipbonusewremotesensordampenerscanresolutionbonusrookie.py
rename to eos/effects/effect5016.py
diff --git a/eos/effects/shiparmorrepairingrookie.py b/eos/effects/effect5017.py
similarity index 100%
rename from eos/effects/shiparmorrepairingrookie.py
rename to eos/effects/effect5017.py
diff --git a/eos/effects/shipvelocitybonusrookie.py b/eos/effects/effect5018.py
similarity index 100%
rename from eos/effects/shipvelocitybonusrookie.py
rename to eos/effects/effect5018.py
diff --git a/eos/effects/minmatarshipewtargetpainterrookie.py b/eos/effects/effect5019.py
similarity index 100%
rename from eos/effects/minmatarshipewtargetpainterrookie.py
rename to eos/effects/effect5019.py
diff --git a/eos/effects/shipsptdmgbonusrookie.py b/eos/effects/effect5020.py
similarity index 100%
rename from eos/effects/shipsptdmgbonusrookie.py
rename to eos/effects/effect5020.py
diff --git a/eos/effects/shipshieldboostrookie.py b/eos/effects/effect5021.py
similarity index 100%
rename from eos/effects/shipshieldboostrookie.py
rename to eos/effects/effect5021.py
diff --git a/eos/effects/shipecmscanstrengthbonusrookie.py b/eos/effects/effect5028.py
similarity index 100%
rename from eos/effects/shipecmscanstrengthbonusrookie.py
rename to eos/effects/effect5028.py
diff --git a/eos/effects/shipbonusdroneminingamountrole.py b/eos/effects/effect5029.py
similarity index 100%
rename from eos/effects/shipbonusdroneminingamountrole.py
rename to eos/effects/effect5029.py
diff --git a/eos/effects/shipbonusminingdroneamountpercentrookie.py b/eos/effects/effect5030.py
similarity index 100%
rename from eos/effects/shipbonusminingdroneamountpercentrookie.py
rename to eos/effects/effect5030.py
diff --git a/eos/effects/shipbonusdronehitpointsrookie.py b/eos/effects/effect5035.py
similarity index 100%
rename from eos/effects/shipbonusdronehitpointsrookie.py
rename to eos/effects/effect5035.py
diff --git a/eos/effects/shipbonussalvagecycleaf.py b/eos/effects/effect5036.py
similarity index 100%
rename from eos/effects/shipbonussalvagecycleaf.py
rename to eos/effects/effect5036.py
diff --git a/eos/effects/scoutdroneoperationdronerangebonusmodadddronecontroldistancechar.py b/eos/effects/effect504.py
similarity index 100%
rename from eos/effects/scoutdroneoperationdronerangebonusmodadddronecontroldistancechar.py
rename to eos/effects/effect504.py
diff --git a/eos/effects/shipbonussalvagecyclecf.py b/eos/effects/effect5045.py
similarity index 100%
rename from eos/effects/shipbonussalvagecyclecf.py
rename to eos/effects/effect5045.py
diff --git a/eos/effects/shipbonussalvagecyclegf.py b/eos/effects/effect5048.py
similarity index 100%
rename from eos/effects/shipbonussalvagecyclegf.py
rename to eos/effects/effect5048.py
diff --git a/eos/effects/shipbonussalvagecyclemf.py b/eos/effects/effect5051.py
similarity index 100%
rename from eos/effects/shipbonussalvagecyclemf.py
rename to eos/effects/effect5051.py
diff --git a/eos/effects/iceharvesterdurationmultiplier.py b/eos/effects/effect5055.py
similarity index 100%
rename from eos/effects/iceharvesterdurationmultiplier.py
rename to eos/effects/effect5055.py
diff --git a/eos/effects/miningyieldmultiplypassive.py b/eos/effects/effect5058.py
similarity index 100%
rename from eos/effects/miningyieldmultiplypassive.py
rename to eos/effects/effect5058.py
diff --git a/eos/effects/shipbonusiceharvesterdurationore3.py b/eos/effects/effect5059.py
similarity index 100%
rename from eos/effects/shipbonusiceharvesterdurationore3.py
rename to eos/effects/effect5059.py
diff --git a/eos/effects/fuelconservationcapneedbonuspostpercentcapacitorneedlocationshipmodulesrequiringafterburner.py b/eos/effects/effect506.py
similarity index 100%
rename from eos/effects/fuelconservationcapneedbonuspostpercentcapacitorneedlocationshipmodulesrequiringafterburner.py
rename to eos/effects/effect506.py
diff --git a/eos/effects/shipbonustargetpainteroptimalmf1.py b/eos/effects/effect5066.py
similarity index 100%
rename from eos/effects/shipbonustargetpainteroptimalmf1.py
rename to eos/effects/effect5066.py
diff --git a/eos/effects/shipbonusoreholdore2.py b/eos/effects/effect5067.py
similarity index 100%
rename from eos/effects/shipbonusoreholdore2.py
rename to eos/effects/effect5067.py
diff --git a/eos/effects/shipbonusshieldcapacityore2.py b/eos/effects/effect5068.py
similarity index 100%
rename from eos/effects/shipbonusshieldcapacityore2.py
rename to eos/effects/effect5068.py
diff --git a/eos/effects/mercoxitcrystalbonus.py b/eos/effects/effect5069.py
similarity index 100%
rename from eos/effects/mercoxitcrystalbonus.py
rename to eos/effects/effect5069.py
diff --git a/eos/effects/longrangetargetingmaxtargetrangebonuspostpercentmaxtargetrangelocationshipgroupelectronic.py b/eos/effects/effect507.py
similarity index 100%
rename from eos/effects/longrangetargetingmaxtargetrangebonuspostpercentmaxtargetrangelocationshipgroupelectronic.py
rename to eos/effects/effect507.py
diff --git a/eos/effects/shipmissilekineticdamagecf2.py b/eos/effects/effect5079.py
similarity index 100%
rename from eos/effects/shipmissilekineticdamagecf2.py
rename to eos/effects/effect5079.py
diff --git a/eos/effects/shippdmgbonusmf.py b/eos/effects/effect508.py
similarity index 100%
rename from eos/effects/shippdmgbonusmf.py
rename to eos/effects/effect508.py
diff --git a/eos/effects/shipmissilevelocitycf.py b/eos/effects/effect5080.py
similarity index 100%
rename from eos/effects/shipmissilevelocitycf.py
rename to eos/effects/effect5080.py
diff --git a/eos/effects/maxtargetingrangebonuspostpercentpassive.py b/eos/effects/effect5081.py
similarity index 100%
rename from eos/effects/maxtargetingrangebonuspostpercentpassive.py
rename to eos/effects/effect5081.py
diff --git a/eos/effects/shipbonusdronehitpointsgf.py b/eos/effects/effect5087.py
similarity index 100%
rename from eos/effects/shipbonusdronehitpointsgf.py
rename to eos/effects/effect5087.py
diff --git a/eos/effects/shipshieldboostmf.py b/eos/effects/effect5090.py
similarity index 100%
rename from eos/effects/shipshieldboostmf.py
rename to eos/effects/effect5090.py
diff --git a/eos/effects/modifypowerrechargerate.py b/eos/effects/effect51.py
similarity index 100%
rename from eos/effects/modifypowerrechargerate.py
rename to eos/effects/effect51.py
diff --git a/eos/effects/shipbonusshieldtransfercapneedcf.py b/eos/effects/effect5103.py
similarity index 100%
rename from eos/effects/shipbonusshieldtransfercapneedcf.py
rename to eos/effects/effect5103.py
diff --git a/eos/effects/shipbonusshieldtransferboostamountcf2.py b/eos/effects/effect5104.py
similarity index 100%
rename from eos/effects/shipbonusshieldtransferboostamountcf2.py
rename to eos/effects/effect5104.py
diff --git a/eos/effects/shipbonusshieldtransfercapneedmf.py b/eos/effects/effect5105.py
similarity index 100%
rename from eos/effects/shipbonusshieldtransfercapneedmf.py
rename to eos/effects/effect5105.py
diff --git a/eos/effects/shipbonusshieldtransferboostamountmf2.py b/eos/effects/effect5106.py
similarity index 100%
rename from eos/effects/shipbonusshieldtransferboostamountmf2.py
rename to eos/effects/effect5106.py
diff --git a/eos/effects/shipbonusremotearmorrepaircapneedgf.py b/eos/effects/effect5107.py
similarity index 100%
rename from eos/effects/shipbonusremotearmorrepaircapneedgf.py
rename to eos/effects/effect5107.py
diff --git a/eos/effects/shipbonusremotearmorrepairamountgf2.py b/eos/effects/effect5108.py
similarity index 100%
rename from eos/effects/shipbonusremotearmorrepairamountgf2.py
rename to eos/effects/effect5108.py
diff --git a/eos/effects/shipbonusremotearmorrepaircapneedaf.py b/eos/effects/effect5109.py
similarity index 100%
rename from eos/effects/shipbonusremotearmorrepaircapneedaf.py
rename to eos/effects/effect5109.py
diff --git a/eos/effects/shipenergytcapneedbonusaf.py b/eos/effects/effect511.py
similarity index 100%
rename from eos/effects/shipenergytcapneedbonusaf.py
rename to eos/effects/effect511.py
diff --git a/eos/effects/shipbonusremotearmorrepairamount2af.py b/eos/effects/effect5110.py
similarity index 100%
rename from eos/effects/shipbonusremotearmorrepairamount2af.py
rename to eos/effects/effect5110.py
diff --git a/eos/effects/shipbonusdronetrackinggf.py b/eos/effects/effect5111.py
similarity index 100%
rename from eos/effects/shipbonusdronetrackinggf.py
rename to eos/effects/effect5111.py
diff --git a/eos/effects/shipbonusscanprobestrength2af.py b/eos/effects/effect5119.py
similarity index 100%
rename from eos/effects/shipbonusscanprobestrength2af.py
rename to eos/effects/effect5119.py
diff --git a/eos/effects/shipshtdmgbonusgf.py b/eos/effects/effect512.py
similarity index 100%
rename from eos/effects/shipshtdmgbonusgf.py
rename to eos/effects/effect512.py
diff --git a/eos/effects/energytransferarraytransferamountbonus.py b/eos/effects/effect5121.py
similarity index 100%
rename from eos/effects/energytransferarraytransferamountbonus.py
rename to eos/effects/effect5121.py
diff --git a/eos/effects/shipbonusshieldtransfercapneedmc1.py b/eos/effects/effect5122.py
similarity index 100%
rename from eos/effects/shipbonusshieldtransfercapneedmc1.py
rename to eos/effects/effect5122.py
diff --git a/eos/effects/shipbonusremotearmorrepaircapneedac1.py b/eos/effects/effect5123.py
similarity index 100%
rename from eos/effects/shipbonusremotearmorrepaircapneedac1.py
rename to eos/effects/effect5123.py
diff --git a/eos/effects/shipbonusremotearmorrepairamountac2.py b/eos/effects/effect5124.py
similarity index 100%
rename from eos/effects/shipbonusremotearmorrepairamountac2.py
rename to eos/effects/effect5124.py
diff --git a/eos/effects/shipbonusremotearmorrepairamountgc2.py b/eos/effects/effect5125.py
similarity index 100%
rename from eos/effects/shipbonusremotearmorrepairamountgc2.py
rename to eos/effects/effect5125.py
diff --git a/eos/effects/shipbonusshieldtransferboostamountcc2.py b/eos/effects/effect5126.py
similarity index 100%
rename from eos/effects/shipbonusshieldtransferboostamountcc2.py
rename to eos/effects/effect5126.py
diff --git a/eos/effects/shipbonusshieldtransferboostamountmc2.py b/eos/effects/effect5127.py
similarity index 100%
rename from eos/effects/shipbonusshieldtransferboostamountmc2.py
rename to eos/effects/effect5127.py
diff --git a/eos/effects/shipbonusewremotesensordampeneroptimalbonusgc1.py b/eos/effects/effect5128.py
similarity index 100%
rename from eos/effects/shipbonusewremotesensordampeneroptimalbonusgc1.py
rename to eos/effects/effect5128.py
diff --git a/eos/effects/minmatarshipewtargetpaintermc1.py b/eos/effects/effect5129.py
similarity index 100%
rename from eos/effects/minmatarshipewtargetpaintermc1.py
rename to eos/effects/effect5129.py
diff --git a/eos/effects/shipmissilerofcc.py b/eos/effects/effect5131.py
similarity index 100%
rename from eos/effects/shipmissilerofcc.py
rename to eos/effects/effect5131.py
diff --git a/eos/effects/shippturretfalloffbonusmc2.py b/eos/effects/effect5132.py
similarity index 100%
rename from eos/effects/shippturretfalloffbonusmc2.py
rename to eos/effects/effect5132.py
diff --git a/eos/effects/shiphtdamagebonuscc.py b/eos/effects/effect5133.py
similarity index 100%
rename from eos/effects/shiphtdamagebonuscc.py
rename to eos/effects/effect5133.py
diff --git a/eos/effects/shipmetcdamagebonusac.py b/eos/effects/effect5136.py
similarity index 100%
rename from eos/effects/shipmetcdamagebonusac.py
rename to eos/effects/effect5136.py
diff --git a/eos/effects/shipminingbonusorefrig1.py b/eos/effects/effect5139.py
similarity index 100%
rename from eos/effects/shipminingbonusorefrig1.py
rename to eos/effects/effect5139.py
diff --git a/eos/effects/shipsetdmgbonusaf.py b/eos/effects/effect514.py
similarity index 100%
rename from eos/effects/shipsetdmgbonusaf.py
rename to eos/effects/effect514.py
diff --git a/eos/effects/gchyieldmultiplypassive.py b/eos/effects/effect5142.py
similarity index 100%
rename from eos/effects/gchyieldmultiplypassive.py
rename to eos/effects/effect5142.py
diff --git a/eos/effects/shipmissilevelocitypiratefactionrocket.py b/eos/effects/effect5153.py
similarity index 100%
rename from eos/effects/shipmissilevelocitypiratefactionrocket.py
rename to eos/effects/effect5153.py
diff --git a/eos/effects/shipgchyieldbonusorefrig2.py b/eos/effects/effect5156.py
similarity index 100%
rename from eos/effects/shipgchyieldbonusorefrig2.py
rename to eos/effects/effect5156.py
diff --git a/eos/effects/shiptcapneedbonusac.py b/eos/effects/effect516.py
similarity index 100%
rename from eos/effects/shiptcapneedbonusac.py
rename to eos/effects/effect516.py
diff --git a/eos/effects/skillreactivearmorhardenercapneedbonus.py b/eos/effects/effect5162.py
similarity index 100%
rename from eos/effects/skillreactivearmorhardenercapneedbonus.py
rename to eos/effects/effect5162.py
diff --git a/eos/effects/shipbonusdronemwdboostrole.py b/eos/effects/effect5165.py
similarity index 100%
rename from eos/effects/shipbonusdronemwdboostrole.py
rename to eos/effects/effect5165.py
diff --git a/eos/effects/dronesalvagebonus.py b/eos/effects/effect5168.py
similarity index 100%
rename from eos/effects/dronesalvagebonus.py
rename to eos/effects/effect5168.py
diff --git a/eos/effects/sensorcompensationsensorstrengthbonusgravimetric.py b/eos/effects/effect5180.py
similarity index 100%
rename from eos/effects/sensorcompensationsensorstrengthbonusgravimetric.py
rename to eos/effects/effect5180.py
diff --git a/eos/effects/sensorcompensationsensorstrengthbonusladar.py b/eos/effects/effect5181.py
similarity index 100%
rename from eos/effects/sensorcompensationsensorstrengthbonusladar.py
rename to eos/effects/effect5181.py
diff --git a/eos/effects/sensorcompensationsensorstrengthbonusmagnetometric.py b/eos/effects/effect5182.py
similarity index 100%
rename from eos/effects/sensorcompensationsensorstrengthbonusmagnetometric.py
rename to eos/effects/effect5182.py
diff --git a/eos/effects/sensorcompensationsensorstrengthbonusradar.py b/eos/effects/effect5183.py
similarity index 100%
rename from eos/effects/sensorcompensationsensorstrengthbonusradar.py
rename to eos/effects/effect5183.py
diff --git a/eos/effects/shipenergyvampireamountbonusfixedaf2.py b/eos/effects/effect5185.py
similarity index 100%
rename from eos/effects/shipenergyvampireamountbonusfixedaf2.py
rename to eos/effects/effect5185.py
diff --git a/eos/effects/shipbonusewremotesensordampenerfalloffbonusgc1.py b/eos/effects/effect5187.py
similarity index 100%
rename from eos/effects/shipbonusewremotesensordampenerfalloffbonusgc1.py
rename to eos/effects/effect5187.py
diff --git a/eos/effects/trackingspeedbonuseffecthybrids.py b/eos/effects/effect5188.py
similarity index 100%
rename from eos/effects/trackingspeedbonuseffecthybrids.py
rename to eos/effects/effect5188.py
diff --git a/eos/effects/trackingspeedbonuseffectlasers.py b/eos/effects/effect5189.py
similarity index 100%
rename from eos/effects/trackingspeedbonuseffectlasers.py
rename to eos/effects/effect5189.py
diff --git a/eos/effects/trackingspeedbonuseffectprojectiles.py b/eos/effects/effect5190.py
similarity index 100%
rename from eos/effects/trackingspeedbonuseffectprojectiles.py
rename to eos/effects/effect5190.py
diff --git a/eos/effects/armorupgradesmasspenaltyreductionbonus.py b/eos/effects/effect5201.py
similarity index 100%
rename from eos/effects/armorupgradesmasspenaltyreductionbonus.py
rename to eos/effects/effect5201.py
diff --git a/eos/effects/shipsettrackingbonusrookie.py b/eos/effects/effect5205.py
similarity index 100%
rename from eos/effects/shipsettrackingbonusrookie.py
rename to eos/effects/effect5205.py
diff --git a/eos/effects/shipsetoptimalbonusrookie.py b/eos/effects/effect5206.py
similarity index 100%
rename from eos/effects/shipsetoptimalbonusrookie.py
rename to eos/effects/effect5206.py
diff --git a/eos/effects/shipnostransferamountbonusrookie.py b/eos/effects/effect5207.py
similarity index 100%
rename from eos/effects/shipnostransferamountbonusrookie.py
rename to eos/effects/effect5207.py
diff --git a/eos/effects/shipneutdestabilizationamountbonusrookie.py b/eos/effects/effect5208.py
similarity index 100%
rename from eos/effects/shipneutdestabilizationamountbonusrookie.py
rename to eos/effects/effect5208.py
diff --git a/eos/effects/shipwebvelocitybonusrookie.py b/eos/effects/effect5209.py
similarity index 100%
rename from eos/effects/shipwebvelocitybonusrookie.py
rename to eos/effects/effect5209.py
diff --git a/eos/effects/shiphrangebonuscc.py b/eos/effects/effect521.py
similarity index 100%
rename from eos/effects/shiphrangebonuscc.py
rename to eos/effects/effect521.py
diff --git a/eos/effects/shipdronemwdspeedbonusrookie.py b/eos/effects/effect5212.py
similarity index 100%
rename from eos/effects/shipdronemwdspeedbonusrookie.py
rename to eos/effects/effect5212.py
diff --git a/eos/effects/shiprocketmaxvelocitybonusrookie.py b/eos/effects/effect5213.py
similarity index 100%
rename from eos/effects/shiprocketmaxvelocitybonusrookie.py
rename to eos/effects/effect5213.py
diff --git a/eos/effects/shiplightmissilemaxvelocitybonusrookie.py b/eos/effects/effect5214.py
similarity index 100%
rename from eos/effects/shiplightmissilemaxvelocitybonusrookie.py
rename to eos/effects/effect5214.py
diff --git a/eos/effects/shipshttrackingspeedbonusrookie.py b/eos/effects/effect5215.py
similarity index 100%
rename from eos/effects/shipshttrackingspeedbonusrookie.py
rename to eos/effects/effect5215.py
diff --git a/eos/effects/shipshtfalloffbonusrookie.py b/eos/effects/effect5216.py
similarity index 100%
rename from eos/effects/shipshtfalloffbonusrookie.py
rename to eos/effects/effect5216.py
diff --git a/eos/effects/shipspttrackingspeedbonusrookie.py b/eos/effects/effect5217.py
similarity index 100%
rename from eos/effects/shipspttrackingspeedbonusrookie.py
rename to eos/effects/effect5217.py
diff --git a/eos/effects/shipsptfalloffbonusrookie.py b/eos/effects/effect5218.py
similarity index 100%
rename from eos/effects/shipsptfalloffbonusrookie.py
rename to eos/effects/effect5218.py
diff --git a/eos/effects/shipsptoptimalrangebonusrookie.py b/eos/effects/effect5219.py
similarity index 100%
rename from eos/effects/shipsptoptimalrangebonusrookie.py
rename to eos/effects/effect5219.py
diff --git a/eos/effects/shipprojectiledmgpiratecruiser.py b/eos/effects/effect5220.py
similarity index 100%
rename from eos/effects/shipprojectiledmgpiratecruiser.py
rename to eos/effects/effect5220.py
diff --git a/eos/effects/shipheavyassaultmissileemdmgpiratecruiser.py b/eos/effects/effect5221.py
similarity index 100%
rename from eos/effects/shipheavyassaultmissileemdmgpiratecruiser.py
rename to eos/effects/effect5221.py
diff --git a/eos/effects/shipheavyassaultmissilekindmgpiratecruiser.py b/eos/effects/effect5222.py
similarity index 100%
rename from eos/effects/shipheavyassaultmissilekindmgpiratecruiser.py
rename to eos/effects/effect5222.py
diff --git a/eos/effects/shipheavyassaultmissilethermdmgpiratecruiser.py b/eos/effects/effect5223.py
similarity index 100%
rename from eos/effects/shipheavyassaultmissilethermdmgpiratecruiser.py
rename to eos/effects/effect5223.py
diff --git a/eos/effects/shipheavyassaultmissileexpdmgpiratecruiser.py b/eos/effects/effect5224.py
similarity index 100%
rename from eos/effects/shipheavyassaultmissileexpdmgpiratecruiser.py
rename to eos/effects/effect5224.py
diff --git a/eos/effects/shipheavymissileemdmgpiratecruiser.py b/eos/effects/effect5225.py
similarity index 100%
rename from eos/effects/shipheavymissileemdmgpiratecruiser.py
rename to eos/effects/effect5225.py
diff --git a/eos/effects/shipheavymissileexpdmgpiratecruiser.py b/eos/effects/effect5226.py
similarity index 100%
rename from eos/effects/shipheavymissileexpdmgpiratecruiser.py
rename to eos/effects/effect5226.py
diff --git a/eos/effects/shipheavymissilekindmgpiratecruiser.py b/eos/effects/effect5227.py
similarity index 100%
rename from eos/effects/shipheavymissilekindmgpiratecruiser.py
rename to eos/effects/effect5227.py
diff --git a/eos/effects/shipheavymissilethermdmgpiratecruiser.py b/eos/effects/effect5228.py
similarity index 100%
rename from eos/effects/shipheavymissilethermdmgpiratecruiser.py
rename to eos/effects/effect5228.py
diff --git a/eos/effects/shipscanprobestrengthbonuspiratecruiser.py b/eos/effects/effect5229.py
similarity index 100%
rename from eos/effects/shipscanprobestrengthbonuspiratecruiser.py
rename to eos/effects/effect5229.py
diff --git a/eos/effects/modifyactiveshieldresonancepostpercent.py b/eos/effects/effect5230.py
similarity index 100%
rename from eos/effects/modifyactiveshieldresonancepostpercent.py
rename to eos/effects/effect5230.py
diff --git a/eos/effects/modifyactivearmorresonancepostpercent.py b/eos/effects/effect5231.py
similarity index 100%
rename from eos/effects/modifyactivearmorresonancepostpercent.py
rename to eos/effects/effect5231.py
diff --git a/eos/effects/shipsmallmissileexpdmgcf2.py b/eos/effects/effect5234.py
similarity index 100%
rename from eos/effects/shipsmallmissileexpdmgcf2.py
rename to eos/effects/effect5234.py
diff --git a/eos/effects/shipsmallmissilekindmgcf2.py b/eos/effects/effect5237.py
similarity index 100%
rename from eos/effects/shipsmallmissilekindmgcf2.py
rename to eos/effects/effect5237.py
diff --git a/eos/effects/shipsmallmissilethermdmgcf2.py b/eos/effects/effect5240.py
similarity index 100%
rename from eos/effects/shipsmallmissilethermdmgcf2.py
rename to eos/effects/effect5240.py
diff --git a/eos/effects/shipsmallmissileemdmgcf2.py b/eos/effects/effect5243.py
similarity index 100%
rename from eos/effects/shipsmallmissileemdmgcf2.py
rename to eos/effects/effect5243.py
diff --git a/eos/effects/reconshipcloakcpubonus1.py b/eos/effects/effect5259.py
similarity index 100%
rename from eos/effects/reconshipcloakcpubonus1.py
rename to eos/effects/effect5259.py
diff --git a/eos/effects/covertopscloakcpupercentbonus1.py b/eos/effects/effect5260.py
similarity index 100%
rename from eos/effects/covertopscloakcpupercentbonus1.py
rename to eos/effects/effect5260.py
diff --git a/eos/effects/covertcloakcpuaddition.py b/eos/effects/effect5261.py
similarity index 100%
rename from eos/effects/covertcloakcpuaddition.py
rename to eos/effects/effect5261.py
diff --git a/eos/effects/covertopscloakcpupenalty.py b/eos/effects/effect5262.py
similarity index 100%
rename from eos/effects/covertopscloakcpupenalty.py
rename to eos/effects/effect5262.py
diff --git a/eos/effects/covertcynocpupenalty.py b/eos/effects/effect5263.py
similarity index 100%
rename from eos/effects/covertcynocpupenalty.py
rename to eos/effects/effect5263.py
diff --git a/eos/effects/warfarelinkcpuaddition.py b/eos/effects/effect5264.py
similarity index 100%
rename from eos/effects/warfarelinkcpuaddition.py
rename to eos/effects/effect5264.py
diff --git a/eos/effects/warfarelinkcpupenalty.py b/eos/effects/effect5265.py
similarity index 100%
rename from eos/effects/warfarelinkcpupenalty.py
rename to eos/effects/effect5265.py
diff --git a/eos/effects/blockaderunnercloakcpupercentbonus.py b/eos/effects/effect5266.py
similarity index 100%
rename from eos/effects/blockaderunnercloakcpupercentbonus.py
rename to eos/effects/effect5266.py
diff --git a/eos/effects/drawbackrepairsystemspgneed.py b/eos/effects/effect5267.py
similarity index 100%
rename from eos/effects/drawbackrepairsystemspgneed.py
rename to eos/effects/effect5267.py
diff --git a/eos/effects/drawbackcapreppgneed.py b/eos/effects/effect5268.py
similarity index 100%
rename from eos/effects/drawbackcapreppgneed.py
rename to eos/effects/effect5268.py
diff --git a/eos/effects/shipvelocitybonusmi.py b/eos/effects/effect527.py
similarity index 100%
rename from eos/effects/shipvelocitybonusmi.py
rename to eos/effects/effect527.py
diff --git a/eos/effects/fueledarmorrepair.py b/eos/effects/effect5275.py
similarity index 100%
rename from eos/effects/fueledarmorrepair.py
rename to eos/effects/effect5275.py
diff --git a/eos/effects/shipcargobonusai.py b/eos/effects/effect529.py
similarity index 100%
rename from eos/effects/shipcargobonusai.py
rename to eos/effects/effect529.py
diff --git a/eos/effects/shiplasercapneed2ad1.py b/eos/effects/effect5293.py
similarity index 100%
rename from eos/effects/shiplasercapneed2ad1.py
rename to eos/effects/effect5293.py
diff --git a/eos/effects/shiplasertracking2ad2.py b/eos/effects/effect5294.py
similarity index 100%
rename from eos/effects/shiplasertracking2ad2.py
rename to eos/effects/effect5294.py
diff --git a/eos/effects/shipbonusdronedamagemultiplierad1.py b/eos/effects/effect5295.py
similarity index 100%
rename from eos/effects/shipbonusdronedamagemultiplierad1.py
rename to eos/effects/effect5295.py
diff --git a/eos/effects/shipbonusdronehitpointsad1.py b/eos/effects/effect5300.py
similarity index 100%
rename from eos/effects/shipbonusdronehitpointsad1.py
rename to eos/effects/effect5300.py
diff --git a/eos/effects/shiphybridrange1cd1.py b/eos/effects/effect5303.py
similarity index 100%
rename from eos/effects/shiphybridrange1cd1.py
rename to eos/effects/effect5303.py
diff --git a/eos/effects/shiphybridtrackingcd2.py b/eos/effects/effect5304.py
similarity index 100%
rename from eos/effects/shiphybridtrackingcd2.py
rename to eos/effects/effect5304.py
diff --git a/eos/effects/shipbonusfrigatesizedmissilekineticdamagecd1.py b/eos/effects/effect5305.py
similarity index 100%
rename from eos/effects/shipbonusfrigatesizedmissilekineticdamagecd1.py
rename to eos/effects/effect5305.py
diff --git a/eos/effects/shiprocketkineticdmgcd1.py b/eos/effects/effect5306.py
similarity index 100%
rename from eos/effects/shiprocketkineticdmgcd1.py
rename to eos/effects/effect5306.py
diff --git a/eos/effects/shipbonusaoevelocityrocketscd2.py b/eos/effects/effect5307.py
similarity index 100%
rename from eos/effects/shipbonusaoevelocityrocketscd2.py
rename to eos/effects/effect5307.py
diff --git a/eos/effects/shipbonusaoevelocitystandardmissilescd2.py b/eos/effects/effect5308.py
similarity index 100%
rename from eos/effects/shipbonusaoevelocitystandardmissilescd2.py
rename to eos/effects/effect5308.py
diff --git a/eos/effects/shiphybridfalloff1gd1.py b/eos/effects/effect5309.py
similarity index 100%
rename from eos/effects/shiphybridfalloff1gd1.py
rename to eos/effects/effect5309.py
diff --git a/eos/effects/shiphybridtracking1gd2.py b/eos/effects/effect5310.py
similarity index 100%
rename from eos/effects/shiphybridtracking1gd2.py
rename to eos/effects/effect5310.py
diff --git a/eos/effects/shipbonusdronedamagemultipliergd1.py b/eos/effects/effect5311.py
similarity index 100%
rename from eos/effects/shipbonusdronedamagemultipliergd1.py
rename to eos/effects/effect5311.py
diff --git a/eos/effects/shipbonusdronehitpointsgd1.py b/eos/effects/effect5316.py
similarity index 100%
rename from eos/effects/shipbonusdronehitpointsgd1.py
rename to eos/effects/effect5316.py
diff --git a/eos/effects/shipprojectiledamagemd1.py b/eos/effects/effect5317.py
similarity index 100%
rename from eos/effects/shipprojectiledamagemd1.py
rename to eos/effects/effect5317.py
diff --git a/eos/effects/shipprojectiletracking1md2.py b/eos/effects/effect5318.py
similarity index 100%
rename from eos/effects/shipprojectiletracking1md2.py
rename to eos/effects/effect5318.py
diff --git a/eos/effects/shipbonusfrigatesizedlightmissileexplosivedamagemd1.py b/eos/effects/effect5319.py
similarity index 100%
rename from eos/effects/shipbonusfrigatesizedlightmissileexplosivedamagemd1.py
rename to eos/effects/effect5319.py
diff --git a/eos/effects/shiprocketexplosivedmgmd1.py b/eos/effects/effect5320.py
similarity index 100%
rename from eos/effects/shiprocketexplosivedmgmd1.py
rename to eos/effects/effect5320.py
diff --git a/eos/effects/shipbonusmwdsignatureradiusmd2.py b/eos/effects/effect5321.py
similarity index 100%
rename from eos/effects/shipbonusmwdsignatureradiusmd2.py
rename to eos/effects/effect5321.py
diff --git a/eos/effects/shiparmoremresistance1abc1.py b/eos/effects/effect5322.py
similarity index 100%
rename from eos/effects/shiparmoremresistance1abc1.py
rename to eos/effects/effect5322.py
diff --git a/eos/effects/shiparmorexplosiveresistance1abc1.py b/eos/effects/effect5323.py
similarity index 100%
rename from eos/effects/shiparmorexplosiveresistance1abc1.py
rename to eos/effects/effect5323.py
diff --git a/eos/effects/shiparmorkineticresistance1abc1.py b/eos/effects/effect5324.py
similarity index 100%
rename from eos/effects/shiparmorkineticresistance1abc1.py
rename to eos/effects/effect5324.py
diff --git a/eos/effects/shiparmorthermresistance1abc1.py b/eos/effects/effect5325.py
similarity index 100%
rename from eos/effects/shiparmorthermresistance1abc1.py
rename to eos/effects/effect5325.py
diff --git a/eos/effects/shipbonusdronedamagemultiplierabc2.py b/eos/effects/effect5326.py
similarity index 100%
rename from eos/effects/shipbonusdronedamagemultiplierabc2.py
rename to eos/effects/effect5326.py
diff --git a/eos/effects/shipbonusdronehitpointsabc2.py b/eos/effects/effect5331.py
similarity index 100%
rename from eos/effects/shipbonusdronehitpointsabc2.py
rename to eos/effects/effect5331.py
diff --git a/eos/effects/shiplasercapabc1.py b/eos/effects/effect5332.py
similarity index 100%
rename from eos/effects/shiplasercapabc1.py
rename to eos/effects/effect5332.py
diff --git a/eos/effects/shiplaserdamagebonusabc2.py b/eos/effects/effect5333.py
similarity index 100%
rename from eos/effects/shiplaserdamagebonusabc2.py
rename to eos/effects/effect5333.py
diff --git a/eos/effects/shiphybridoptimal1cbc1.py b/eos/effects/effect5334.py
similarity index 100%
rename from eos/effects/shiphybridoptimal1cbc1.py
rename to eos/effects/effect5334.py
diff --git a/eos/effects/shipshieldemresistance1cbc2.py b/eos/effects/effect5335.py
similarity index 100%
rename from eos/effects/shipshieldemresistance1cbc2.py
rename to eos/effects/effect5335.py
diff --git a/eos/effects/shipshieldexplosiveresistance1cbc2.py b/eos/effects/effect5336.py
similarity index 100%
rename from eos/effects/shipshieldexplosiveresistance1cbc2.py
rename to eos/effects/effect5336.py
diff --git a/eos/effects/shipshieldkineticresistance1cbc2.py b/eos/effects/effect5337.py
similarity index 100%
rename from eos/effects/shipshieldkineticresistance1cbc2.py
rename to eos/effects/effect5337.py
diff --git a/eos/effects/shipshieldthermalresistance1cbc2.py b/eos/effects/effect5338.py
similarity index 100%
rename from eos/effects/shipshieldthermalresistance1cbc2.py
rename to eos/effects/effect5338.py
diff --git a/eos/effects/shipbonusheavyassaultmissilekineticdamagecbc1.py b/eos/effects/effect5339.py
similarity index 100%
rename from eos/effects/shipbonusheavyassaultmissilekineticdamagecbc1.py
rename to eos/effects/effect5339.py
diff --git a/eos/effects/shipbonusheavymissilekineticdamagecbc1.py b/eos/effects/effect5340.py
similarity index 100%
rename from eos/effects/shipbonusheavymissilekineticdamagecbc1.py
rename to eos/effects/effect5340.py
diff --git a/eos/effects/shiphybriddmg1gbc1.py b/eos/effects/effect5341.py
similarity index 100%
rename from eos/effects/shiphybriddmg1gbc1.py
rename to eos/effects/effect5341.py
diff --git a/eos/effects/shiparmorrepairing1gbc2.py b/eos/effects/effect5342.py
similarity index 100%
rename from eos/effects/shiparmorrepairing1gbc2.py
rename to eos/effects/effect5342.py
diff --git a/eos/effects/shipbonusdronedamagemultipliergbc1.py b/eos/effects/effect5343.py
similarity index 100%
rename from eos/effects/shipbonusdronedamagemultipliergbc1.py
rename to eos/effects/effect5343.py
diff --git a/eos/effects/shipbonusdronehitpointsgbc1.py b/eos/effects/effect5348.py
similarity index 100%
rename from eos/effects/shipbonusdronehitpointsgbc1.py
rename to eos/effects/effect5348.py
diff --git a/eos/effects/shipbonusheavymissilelauncherrofmbc2.py b/eos/effects/effect5349.py
similarity index 100%
rename from eos/effects/shipbonusheavymissilelauncherrofmbc2.py
rename to eos/effects/effect5349.py
diff --git a/eos/effects/shipbonusheavyassaultmissilelauncherrofmbc2.py b/eos/effects/effect5350.py
similarity index 100%
rename from eos/effects/shipbonusheavyassaultmissilelauncherrofmbc2.py
rename to eos/effects/effect5350.py
diff --git a/eos/effects/shipshieldboost1mbc1.py b/eos/effects/effect5351.py
similarity index 100%
rename from eos/effects/shipshieldboost1mbc1.py
rename to eos/effects/effect5351.py
diff --git a/eos/effects/shipbonusprojectiledamagembc1.py b/eos/effects/effect5352.py
similarity index 100%
rename from eos/effects/shipbonusprojectiledamagembc1.py
rename to eos/effects/effect5352.py
diff --git a/eos/effects/shipprojectilerof1mbc2.py b/eos/effects/effect5353.py
similarity index 100%
rename from eos/effects/shipprojectilerof1mbc2.py
rename to eos/effects/effect5353.py
diff --git a/eos/effects/shiplargelasercapabc1.py b/eos/effects/effect5354.py
similarity index 100%
rename from eos/effects/shiplargelasercapabc1.py
rename to eos/effects/effect5354.py
diff --git a/eos/effects/shiplargelaserdamagebonusabc2.py b/eos/effects/effect5355.py
similarity index 100%
rename from eos/effects/shiplargelaserdamagebonusabc2.py
rename to eos/effects/effect5355.py
diff --git a/eos/effects/shiphybridrangebonuscbc1.py b/eos/effects/effect5356.py
similarity index 100%
rename from eos/effects/shiphybridrangebonuscbc1.py
rename to eos/effects/effect5356.py
diff --git a/eos/effects/shiphybriddamagebonuscbc2.py b/eos/effects/effect5357.py
similarity index 100%
rename from eos/effects/shiphybriddamagebonuscbc2.py
rename to eos/effects/effect5357.py
diff --git a/eos/effects/shiplargehybridtrackingbonusgbc1.py b/eos/effects/effect5358.py
similarity index 100%
rename from eos/effects/shiplargehybridtrackingbonusgbc1.py
rename to eos/effects/effect5358.py
diff --git a/eos/effects/shiphybriddamagebonusgbc2.py b/eos/effects/effect5359.py
similarity index 100%
rename from eos/effects/shiphybriddamagebonusgbc2.py
rename to eos/effects/effect5359.py
diff --git a/eos/effects/cpumultiplierpostmulcpuoutputship.py b/eos/effects/effect536.py
similarity index 100%
rename from eos/effects/cpumultiplierpostmulcpuoutputship.py
rename to eos/effects/effect536.py
diff --git a/eos/effects/shipprojectilerofbonusmbc1.py b/eos/effects/effect5360.py
similarity index 100%
rename from eos/effects/shipprojectilerofbonusmbc1.py
rename to eos/effects/effect5360.py
diff --git a/eos/effects/shipprojectilefalloffbonusmbc2.py b/eos/effects/effect5361.py
similarity index 100%
rename from eos/effects/shipprojectilefalloffbonusmbc2.py
rename to eos/effects/effect5361.py
diff --git a/eos/effects/armorallrepairsystemsamountbonuspassive.py b/eos/effects/effect5364.py
similarity index 100%
rename from eos/effects/armorallrepairsystemsamountbonuspassive.py
rename to eos/effects/effect5364.py
diff --git a/eos/effects/elitebonusviolatorsrepairsystemsarmordamageamount2.py b/eos/effects/effect5365.py
similarity index 100%
rename from eos/effects/elitebonusviolatorsrepairsystemsarmordamageamount2.py
rename to eos/effects/effect5365.py
diff --git a/eos/effects/shipbonusrepairsystemsbonusatc2.py b/eos/effects/effect5366.py
similarity index 100%
rename from eos/effects/shipbonusrepairsystemsbonusatc2.py
rename to eos/effects/effect5366.py
diff --git a/eos/effects/shipbonusrepairsystemsarmorrepairamountgb2.py b/eos/effects/effect5367.py
similarity index 100%
rename from eos/effects/shipbonusrepairsystemsarmorrepairamountgb2.py
rename to eos/effects/effect5367.py
diff --git a/eos/effects/shipheavymissileaoecloudsizecbc1.py b/eos/effects/effect5378.py
similarity index 100%
rename from eos/effects/shipheavymissileaoecloudsizecbc1.py
rename to eos/effects/effect5378.py
diff --git a/eos/effects/shipheavyassaultmissileaoecloudsizecbc1.py b/eos/effects/effect5379.py
similarity index 100%
rename from eos/effects/shipheavyassaultmissileaoecloudsizecbc1.py
rename to eos/effects/effect5379.py
diff --git a/eos/effects/shiphybridtrackinggbc2.py b/eos/effects/effect5380.py
similarity index 100%
rename from eos/effects/shiphybridtrackinggbc2.py
rename to eos/effects/effect5380.py
diff --git a/eos/effects/shipenergytrackingabc1.py b/eos/effects/effect5381.py
similarity index 100%
rename from eos/effects/shipenergytrackingabc1.py
rename to eos/effects/effect5381.py
diff --git a/eos/effects/shipbonusmetoptimalac2.py b/eos/effects/effect5382.py
similarity index 100%
rename from eos/effects/shipbonusmetoptimalac2.py
rename to eos/effects/effect5382.py
diff --git a/eos/effects/shipmissileemdamagecc.py b/eos/effects/effect5383.py
similarity index 100%
rename from eos/effects/shipmissileemdamagecc.py
rename to eos/effects/effect5383.py
diff --git a/eos/effects/shipmissilethermdamagecc.py b/eos/effects/effect5384.py
similarity index 100%
rename from eos/effects/shipmissilethermdamagecc.py
rename to eos/effects/effect5384.py
diff --git a/eos/effects/shipmissileexpdamagecc.py b/eos/effects/effect5385.py
similarity index 100%
rename from eos/effects/shipmissileexpdamagecc.py
rename to eos/effects/effect5385.py
diff --git a/eos/effects/shipmissilekindamagecc2.py b/eos/effects/effect5386.py
similarity index 100%
rename from eos/effects/shipmissilekindamagecc2.py
rename to eos/effects/effect5386.py
diff --git a/eos/effects/shipheavyassaultmissileaoecloudsizecc2.py b/eos/effects/effect5387.py
similarity index 100%
rename from eos/effects/shipheavyassaultmissileaoecloudsizecc2.py
rename to eos/effects/effect5387.py
diff --git a/eos/effects/shipheavymissileaoecloudsizecc2.py b/eos/effects/effect5388.py
similarity index 100%
rename from eos/effects/shipheavymissileaoecloudsizecc2.py
rename to eos/effects/effect5388.py
diff --git a/eos/effects/shipbonusdronetrackinggc.py b/eos/effects/effect5389.py
similarity index 100%
rename from eos/effects/shipbonusdronetrackinggc.py
rename to eos/effects/effect5389.py
diff --git a/eos/effects/shipbonusdronemwdboostgc.py b/eos/effects/effect5390.py
similarity index 100%
rename from eos/effects/shipbonusdronemwdboostgc.py
rename to eos/effects/effect5390.py
diff --git a/eos/effects/basemaxscandeviationmodifiermoduleonline2none.py b/eos/effects/effect5397.py
similarity index 100%
rename from eos/effects/basemaxscandeviationmodifiermoduleonline2none.py
rename to eos/effects/effect5397.py
diff --git a/eos/effects/systemscandurationmodulemodifier.py b/eos/effects/effect5398.py
similarity index 100%
rename from eos/effects/systemscandurationmodulemodifier.py
rename to eos/effects/effect5398.py
diff --git a/eos/effects/basesensorstrengthmodifiermodule.py b/eos/effects/effect5399.py
similarity index 100%
rename from eos/effects/basesensorstrengthmodifiermodule.py
rename to eos/effects/effect5399.py
diff --git a/eos/effects/shipmissileheavyassaultvelocityabc2.py b/eos/effects/effect5402.py
similarity index 100%
rename from eos/effects/shipmissileheavyassaultvelocityabc2.py
rename to eos/effects/effect5402.py
diff --git a/eos/effects/shipmissileheavyvelocityabc2.py b/eos/effects/effect5403.py
similarity index 100%
rename from eos/effects/shipmissileheavyvelocityabc2.py
rename to eos/effects/effect5403.py
diff --git a/eos/effects/shiplasercap1abc2.py b/eos/effects/effect5410.py
similarity index 100%
rename from eos/effects/shiplasercap1abc2.py
rename to eos/effects/effect5410.py
diff --git a/eos/effects/shipmissilevelocitycd1.py b/eos/effects/effect5411.py
similarity index 100%
rename from eos/effects/shipmissilevelocitycd1.py
rename to eos/effects/effect5411.py
diff --git a/eos/effects/shipbonusdronedamagemultiplierab.py b/eos/effects/effect5417.py
similarity index 100%
rename from eos/effects/shipbonusdronedamagemultiplierab.py
rename to eos/effects/effect5417.py
diff --git a/eos/effects/shipbonusdronearmorhitpointsab.py b/eos/effects/effect5418.py
similarity index 100%
rename from eos/effects/shipbonusdronearmorhitpointsab.py
rename to eos/effects/effect5418.py
diff --git a/eos/effects/shipbonusdroneshieldhitpointsab.py b/eos/effects/effect5419.py
similarity index 100%
rename from eos/effects/shipbonusdroneshieldhitpointsab.py
rename to eos/effects/effect5419.py
diff --git a/eos/effects/shipcapneedbonusab.py b/eos/effects/effect542.py
similarity index 100%
rename from eos/effects/shipcapneedbonusab.py
rename to eos/effects/effect542.py
diff --git a/eos/effects/shipbonusdronestructurehitpointsab.py b/eos/effects/effect5420.py
similarity index 100%
rename from eos/effects/shipbonusdronestructurehitpointsab.py
rename to eos/effects/effect5420.py
diff --git a/eos/effects/shiplargehybridturretrofgb.py b/eos/effects/effect5424.py
similarity index 100%
rename from eos/effects/shiplargehybridturretrofgb.py
rename to eos/effects/effect5424.py
diff --git a/eos/effects/shipbonusdronetrackinggb.py b/eos/effects/effect5427.py
similarity index 100%
rename from eos/effects/shipbonusdronetrackinggb.py
rename to eos/effects/effect5427.py
diff --git a/eos/effects/shipbonusdroneoptimalrangegb.py b/eos/effects/effect5428.py
similarity index 100%
rename from eos/effects/shipbonusdroneoptimalrangegb.py
rename to eos/effects/effect5428.py
diff --git a/eos/effects/shipbonusmissileaoevelocitymb2.py b/eos/effects/effect5429.py
similarity index 100%
rename from eos/effects/shipbonusmissileaoevelocitymb2.py
rename to eos/effects/effect5429.py
diff --git a/eos/effects/shipbonusaoevelocitycruisemissilesmb2.py b/eos/effects/effect5430.py
similarity index 100%
rename from eos/effects/shipbonusaoevelocitycruisemissilesmb2.py
rename to eos/effects/effect5430.py
diff --git a/eos/effects/shipbonuslargeenergyturrettrackingab.py b/eos/effects/effect5431.py
similarity index 100%
rename from eos/effects/shipbonuslargeenergyturrettrackingab.py
rename to eos/effects/effect5431.py
diff --git a/eos/effects/hackingskillvirusbonus.py b/eos/effects/effect5433.py
similarity index 100%
rename from eos/effects/hackingskillvirusbonus.py
rename to eos/effects/effect5433.py
diff --git a/eos/effects/archaeologyskillvirusbonus.py b/eos/effects/effect5437.py
similarity index 100%
rename from eos/effects/archaeologyskillvirusbonus.py
rename to eos/effects/effect5437.py
diff --git a/eos/effects/systemstandardmissilekineticdamage.py b/eos/effects/effect5440.py
similarity index 100%
rename from eos/effects/systemstandardmissilekineticdamage.py
rename to eos/effects/effect5440.py
diff --git a/eos/effects/shiptorpedoaoecloudsize1cb.py b/eos/effects/effect5444.py
similarity index 100%
rename from eos/effects/shiptorpedoaoecloudsize1cb.py
rename to eos/effects/effect5444.py
diff --git a/eos/effects/shipcruisemissileaoecloudsize1cb.py b/eos/effects/effect5445.py
similarity index 100%
rename from eos/effects/shipcruisemissileaoecloudsize1cb.py
rename to eos/effects/effect5445.py
diff --git a/eos/effects/shipcruisemissilerofcb.py b/eos/effects/effect5456.py
similarity index 100%
rename from eos/effects/shipcruisemissilerofcb.py
rename to eos/effects/effect5456.py
diff --git a/eos/effects/shiptorpedorofcb.py b/eos/effects/effect5457.py
similarity index 100%
rename from eos/effects/shiptorpedorofcb.py
rename to eos/effects/effect5457.py
diff --git a/eos/effects/hackingvirusstrengthbonus.py b/eos/effects/effect5459.py
similarity index 100%
rename from eos/effects/hackingvirusstrengthbonus.py
rename to eos/effects/effect5459.py
diff --git a/eos/effects/minigamevirusstrengthbonus.py b/eos/effects/effect5460.py
similarity index 100%
rename from eos/effects/minigamevirusstrengthbonus.py
rename to eos/effects/effect5460.py
diff --git a/eos/effects/shieldoperationrechargeratebonuspostpercentonline.py b/eos/effects/effect5461.py
similarity index 100%
rename from eos/effects/shieldoperationrechargeratebonuspostpercentonline.py
rename to eos/effects/effect5461.py
diff --git a/eos/effects/shipbonusagilityci2.py b/eos/effects/effect5468.py
similarity index 100%
rename from eos/effects/shipbonusagilityci2.py
rename to eos/effects/effect5468.py
diff --git a/eos/effects/shipbonusagilitymi2.py b/eos/effects/effect5469.py
similarity index 100%
rename from eos/effects/shipbonusagilitymi2.py
rename to eos/effects/effect5469.py
diff --git a/eos/effects/shipbonusagilitygi2.py b/eos/effects/effect5470.py
similarity index 100%
rename from eos/effects/shipbonusagilitygi2.py
rename to eos/effects/effect5470.py
diff --git a/eos/effects/shipbonusagilityai2.py b/eos/effects/effect5471.py
similarity index 100%
rename from eos/effects/shipbonusagilityai2.py
rename to eos/effects/effect5471.py
diff --git a/eos/effects/shipbonusorecapacitygi2.py b/eos/effects/effect5476.py
similarity index 100%
rename from eos/effects/shipbonusorecapacitygi2.py
rename to eos/effects/effect5476.py
diff --git a/eos/effects/shipbonusammobaymi2.py b/eos/effects/effect5477.py
similarity index 100%
rename from eos/effects/shipbonusammobaymi2.py
rename to eos/effects/effect5477.py
diff --git a/eos/effects/shipbonuspicommoditiesholdgi2.py b/eos/effects/effect5478.py
similarity index 100%
rename from eos/effects/shipbonuspicommoditiesholdgi2.py
rename to eos/effects/effect5478.py
diff --git a/eos/effects/shipbonusmineralbaygi2.py b/eos/effects/effect5479.py
similarity index 100%
rename from eos/effects/shipbonusmineralbaygi2.py
rename to eos/effects/effect5479.py
diff --git a/eos/effects/setbonuschristmasbonusvelocity.py b/eos/effects/effect5480.py
similarity index 100%
rename from eos/effects/setbonuschristmasbonusvelocity.py
rename to eos/effects/effect5480.py
diff --git a/eos/effects/setbonuschristmasagilitybonus.py b/eos/effects/effect5482.py
similarity index 100%
rename from eos/effects/setbonuschristmasagilitybonus.py
rename to eos/effects/effect5482.py
diff --git a/eos/effects/setbonuschristmasshieldcapacitybonus.py b/eos/effects/effect5483.py
similarity index 100%
rename from eos/effects/setbonuschristmasshieldcapacitybonus.py
rename to eos/effects/effect5483.py
diff --git a/eos/effects/setbonuschristmasarmorhpbonus2.py b/eos/effects/effect5484.py
similarity index 100%
rename from eos/effects/setbonuschristmasarmorhpbonus2.py
rename to eos/effects/effect5484.py
diff --git a/eos/effects/shipsptoptimalbonusmf.py b/eos/effects/effect5485.py
similarity index 100%
rename from eos/effects/shipsptoptimalbonusmf.py
rename to eos/effects/effect5485.py
diff --git a/eos/effects/shipbonusprojectiledamagembc2.py b/eos/effects/effect5486.py
similarity index 100%
rename from eos/effects/shipbonusprojectiledamagembc2.py
rename to eos/effects/effect5486.py
diff --git a/eos/effects/shipptdmgbonusmb.py b/eos/effects/effect549.py
similarity index 100%
rename from eos/effects/shipptdmgbonusmb.py
rename to eos/effects/effect549.py
diff --git a/eos/effects/elitebonuscommandshiphamrofcs1.py b/eos/effects/effect5496.py
similarity index 100%
rename from eos/effects/elitebonuscommandshiphamrofcs1.py
rename to eos/effects/effect5496.py
diff --git a/eos/effects/elitebonuscommandshiphmrofcs1.py b/eos/effects/effect5497.py
similarity index 100%
rename from eos/effects/elitebonuscommandshiphmrofcs1.py
rename to eos/effects/effect5497.py
diff --git a/eos/effects/elitebonuscommandshipsheavyassaultmissileexplosionvelocitycs2.py b/eos/effects/effect5498.py
similarity index 100%
rename from eos/effects/elitebonuscommandshipsheavyassaultmissileexplosionvelocitycs2.py
rename to eos/effects/effect5498.py
diff --git a/eos/effects/elitebonuscommandshipsheavyassaultmissileexplosionradiuscs2.py b/eos/effects/effect5499.py
similarity index 100%
rename from eos/effects/elitebonuscommandshipsheavyassaultmissileexplosionradiuscs2.py
rename to eos/effects/effect5499.py
diff --git a/eos/effects/targethostiles.py b/eos/effects/effect55.py
similarity index 100%
rename from eos/effects/targethostiles.py
rename to eos/effects/effect55.py
diff --git a/eos/effects/shiphtdmgbonusgb.py b/eos/effects/effect550.py
similarity index 100%
rename from eos/effects/shiphtdmgbonusgb.py
rename to eos/effects/effect550.py
diff --git a/eos/effects/elitebonuscommandshipsheavymissileexplosionradiuscs2.py b/eos/effects/effect5500.py
similarity index 100%
rename from eos/effects/elitebonuscommandshipsheavymissileexplosionradiuscs2.py
rename to eos/effects/effect5500.py
diff --git a/eos/effects/elitebonuscommandshipmediumhybriddamagecs2.py b/eos/effects/effect5501.py
similarity index 100%
rename from eos/effects/elitebonuscommandshipmediumhybriddamagecs2.py
rename to eos/effects/effect5501.py
diff --git a/eos/effects/elitebonuscommandshipmediumhybridtrackingcs1.py b/eos/effects/effect5502.py
similarity index 100%
rename from eos/effects/elitebonuscommandshipmediumhybridtrackingcs1.py
rename to eos/effects/effect5502.py
diff --git a/eos/effects/elitebonuscommandshipheavydronetrackingcs2.py b/eos/effects/effect5503.py
similarity index 100%
rename from eos/effects/elitebonuscommandshipheavydronetrackingcs2.py
rename to eos/effects/effect5503.py
diff --git a/eos/effects/elitebonuscommandshipheavydronevelocitycs2.py b/eos/effects/effect5504.py
similarity index 100%
rename from eos/effects/elitebonuscommandshipheavydronevelocitycs2.py
rename to eos/effects/effect5504.py
diff --git a/eos/effects/elitebonuscommandshipmediumhybridrofcs1.py b/eos/effects/effect5505.py
similarity index 100%
rename from eos/effects/elitebonuscommandshipmediumhybridrofcs1.py
rename to eos/effects/effect5505.py
diff --git a/eos/effects/elitebonuscommandshipheavyassaultmissiledamagecs2.py b/eos/effects/effect5514.py
similarity index 100%
rename from eos/effects/elitebonuscommandshipheavyassaultmissiledamagecs2.py
rename to eos/effects/effect5514.py
diff --git a/eos/effects/elitebonuscommandshipheavymissiledamagecs2.py b/eos/effects/effect5521.py
similarity index 100%
rename from eos/effects/elitebonuscommandshipheavymissiledamagecs2.py
rename to eos/effects/effect5521.py
diff --git a/eos/effects/shiphttrackingbonusgb.py b/eos/effects/effect553.py
similarity index 100%
rename from eos/effects/shiphttrackingbonusgb.py
rename to eos/effects/effect553.py
diff --git a/eos/effects/shipbonushmlkineticdamageac.py b/eos/effects/effect5539.py
similarity index 100%
rename from eos/effects/shipbonushmlkineticdamageac.py
rename to eos/effects/effect5539.py
diff --git a/eos/effects/shipbonushmlemdamageac.py b/eos/effects/effect5540.py
similarity index 100%
rename from eos/effects/shipbonushmlemdamageac.py
rename to eos/effects/effect5540.py
diff --git a/eos/effects/shipbonushmlthermdamageac.py b/eos/effects/effect5541.py
similarity index 100%
rename from eos/effects/shipbonushmlthermdamageac.py
rename to eos/effects/effect5541.py
diff --git a/eos/effects/shipbonushmlexplodamageac.py b/eos/effects/effect5542.py
similarity index 100%
rename from eos/effects/shipbonushmlexplodamageac.py
rename to eos/effects/effect5542.py
diff --git a/eos/effects/shipbonushmlvelocityelitebonusheavygunship1.py b/eos/effects/effect5552.py
similarity index 100%
rename from eos/effects/shipbonushmlvelocityelitebonusheavygunship1.py
rename to eos/effects/effect5552.py
diff --git a/eos/effects/shipbonushamvelocityelitebonusheavygunship1.py b/eos/effects/effect5553.py
similarity index 100%
rename from eos/effects/shipbonushamvelocityelitebonusheavygunship1.py
rename to eos/effects/effect5553.py
diff --git a/eos/effects/shipbonusarmorrepamountgc2.py b/eos/effects/effect5554.py
similarity index 100%
rename from eos/effects/shipbonusarmorrepamountgc2.py
rename to eos/effects/effect5554.py
diff --git a/eos/effects/shipbonusheavydronespeedgc.py b/eos/effects/effect5555.py
similarity index 100%
rename from eos/effects/shipbonusheavydronespeedgc.py
rename to eos/effects/effect5555.py
diff --git a/eos/effects/shipbonusheavydronetrackinggc.py b/eos/effects/effect5556.py
similarity index 100%
rename from eos/effects/shipbonusheavydronetrackinggc.py
rename to eos/effects/effect5556.py
diff --git a/eos/effects/shipbonussentrydroneoptimalrangeelitebonusheavygunship2.py b/eos/effects/effect5557.py
similarity index 100%
rename from eos/effects/shipbonussentrydroneoptimalrangeelitebonusheavygunship2.py
rename to eos/effects/effect5557.py
diff --git a/eos/effects/shipbonussentrydronetrackingelitebonusheavygunship2.py b/eos/effects/effect5558.py
similarity index 100%
rename from eos/effects/shipbonussentrydronetrackingelitebonusheavygunship2.py
rename to eos/effects/effect5558.py
diff --git a/eos/effects/shipbonusshieldboostamountmc2.py b/eos/effects/effect5559.py
similarity index 100%
rename from eos/effects/shipbonusshieldboostamountmc2.py
rename to eos/effects/effect5559.py
diff --git a/eos/effects/rolebonusmaraudermjdrreactivationdelaybonus.py b/eos/effects/effect5560.py
similarity index 100%
rename from eos/effects/rolebonusmaraudermjdrreactivationdelaybonus.py
rename to eos/effects/effect5560.py
diff --git a/eos/effects/subsystembonuscaldarioffensivecommandbursts.py b/eos/effects/effect5564.py
similarity index 100%
rename from eos/effects/subsystembonuscaldarioffensivecommandbursts.py
rename to eos/effects/effect5564.py
diff --git a/eos/effects/subsystembonusgallenteoffensivecommandbursts.py b/eos/effects/effect5568.py
similarity index 100%
rename from eos/effects/subsystembonusgallenteoffensivecommandbursts.py
rename to eos/effects/effect5568.py
diff --git a/eos/effects/subsystembonusminmataroffensivecommandbursts.py b/eos/effects/effect5570.py
similarity index 100%
rename from eos/effects/subsystembonusminmataroffensivecommandbursts.py
rename to eos/effects/effect5570.py
diff --git a/eos/effects/elitebonuscommandshiparmoredcs3.py b/eos/effects/effect5572.py
similarity index 100%
rename from eos/effects/elitebonuscommandshiparmoredcs3.py
rename to eos/effects/effect5572.py
diff --git a/eos/effects/elitebonuscommandshipsiegecs3.py b/eos/effects/effect5573.py
similarity index 100%
rename from eos/effects/elitebonuscommandshipsiegecs3.py
rename to eos/effects/effect5573.py
diff --git a/eos/effects/elitebonuscommandshipskirmishcs3.py b/eos/effects/effect5574.py
similarity index 100%
rename from eos/effects/elitebonuscommandshipskirmishcs3.py
rename to eos/effects/effect5574.py
diff --git a/eos/effects/elitebonuscommandshipinformationcs3.py b/eos/effects/effect5575.py
similarity index 100%
rename from eos/effects/elitebonuscommandshipinformationcs3.py
rename to eos/effects/effect5575.py
diff --git a/eos/effects/poweroutputmultiply.py b/eos/effects/effect56.py
similarity index 100%
rename from eos/effects/poweroutputmultiply.py
rename to eos/effects/effect56.py
diff --git a/eos/effects/capacitoremissionsystemskill.py b/eos/effects/effect5607.py
similarity index 100%
rename from eos/effects/capacitoremissionsystemskill.py
rename to eos/effects/effect5607.py
diff --git a/eos/effects/shipbonuslargeenergyturretmaxrangeab.py b/eos/effects/effect5610.py
similarity index 100%
rename from eos/effects/shipbonuslargeenergyturretmaxrangeab.py
rename to eos/effects/effect5610.py
diff --git a/eos/effects/shipbonushtfalloffgb2.py b/eos/effects/effect5611.py
similarity index 100%
rename from eos/effects/shipbonushtfalloffgb2.py
rename to eos/effects/effect5611.py
diff --git a/eos/effects/shipbonusrhmlrof2cb.py b/eos/effects/effect5618.py
similarity index 100%
rename from eos/effects/shipbonusrhmlrof2cb.py
rename to eos/effects/effect5618.py
diff --git a/eos/effects/shipbonusrhmlrofcb.py b/eos/effects/effect5619.py
similarity index 100%
rename from eos/effects/shipbonusrhmlrofcb.py
rename to eos/effects/effect5619.py
diff --git a/eos/effects/shiphtdmgbonusfixedgc.py b/eos/effects/effect562.py
similarity index 100%
rename from eos/effects/shiphtdmgbonusfixedgc.py
rename to eos/effects/effect562.py
diff --git a/eos/effects/shipbonusrhmlrofmb.py b/eos/effects/effect5620.py
similarity index 100%
rename from eos/effects/shipbonusrhmlrofmb.py
rename to eos/effects/effect5620.py
diff --git a/eos/effects/shipbonuscruiserofmb.py b/eos/effects/effect5621.py
similarity index 100%
rename from eos/effects/shipbonuscruiserofmb.py
rename to eos/effects/effect5621.py
diff --git a/eos/effects/shipbonustorpedorofmb.py b/eos/effects/effect5622.py
similarity index 100%
rename from eos/effects/shipbonustorpedorofmb.py
rename to eos/effects/effect5622.py
diff --git a/eos/effects/shipbonuscruisemissileemdmgmb.py b/eos/effects/effect5628.py
similarity index 100%
rename from eos/effects/shipbonuscruisemissileemdmgmb.py
rename to eos/effects/effect5628.py
diff --git a/eos/effects/shipbonuscruisemissilethermdmgmb.py b/eos/effects/effect5629.py
similarity index 100%
rename from eos/effects/shipbonuscruisemissilethermdmgmb.py
rename to eos/effects/effect5629.py
diff --git a/eos/effects/shipbonuscruisemissilekineticdmgmb.py b/eos/effects/effect5630.py
similarity index 100%
rename from eos/effects/shipbonuscruisemissilekineticdmgmb.py
rename to eos/effects/effect5630.py
diff --git a/eos/effects/shipbonuscruisemissileexplodmgmb.py b/eos/effects/effect5631.py
similarity index 100%
rename from eos/effects/shipbonuscruisemissileexplodmgmb.py
rename to eos/effects/effect5631.py
diff --git a/eos/effects/shipbonustorpedomissileexplodmgmb.py b/eos/effects/effect5632.py
similarity index 100%
rename from eos/effects/shipbonustorpedomissileexplodmgmb.py
rename to eos/effects/effect5632.py
diff --git a/eos/effects/shipbonustorpedomissileemdmgmb.py b/eos/effects/effect5633.py
similarity index 100%
rename from eos/effects/shipbonustorpedomissileemdmgmb.py
rename to eos/effects/effect5633.py
diff --git a/eos/effects/shipbonustorpedomissilethermdmgmb.py b/eos/effects/effect5634.py
similarity index 100%
rename from eos/effects/shipbonustorpedomissilethermdmgmb.py
rename to eos/effects/effect5634.py
diff --git a/eos/effects/shipbonustorpedomissilekineticdmgmb.py b/eos/effects/effect5635.py
similarity index 100%
rename from eos/effects/shipbonustorpedomissilekineticdmgmb.py
rename to eos/effects/effect5635.py
diff --git a/eos/effects/shipbonusheavymissileemdmgmb.py b/eos/effects/effect5636.py
similarity index 100%
rename from eos/effects/shipbonusheavymissileemdmgmb.py
rename to eos/effects/effect5636.py
diff --git a/eos/effects/shipbonusheavymissilethermdmgmb.py b/eos/effects/effect5637.py
similarity index 100%
rename from eos/effects/shipbonusheavymissilethermdmgmb.py
rename to eos/effects/effect5637.py
diff --git a/eos/effects/shipbonusheavymissilekineticdmgmb.py b/eos/effects/effect5638.py
similarity index 100%
rename from eos/effects/shipbonusheavymissilekineticdmgmb.py
rename to eos/effects/effect5638.py
diff --git a/eos/effects/shipbonusheavymissileexplodmgmb.py b/eos/effects/effect5639.py
similarity index 100%
rename from eos/effects/shipbonusheavymissileexplodmgmb.py
rename to eos/effects/effect5639.py
diff --git a/eos/effects/shipbonusmissilevelocitycc2.py b/eos/effects/effect5644.py
similarity index 100%
rename from eos/effects/shipbonusmissilevelocitycc2.py
rename to eos/effects/effect5644.py
diff --git a/eos/effects/covertopscloakcpupercentrolebonus.py b/eos/effects/effect5647.py
similarity index 100%
rename from eos/effects/covertopscloakcpupercentrolebonus.py
rename to eos/effects/effect5647.py
diff --git a/eos/effects/shiparmorresistanceaf1.py b/eos/effects/effect5650.py
similarity index 100%
rename from eos/effects/shiparmorresistanceaf1.py
rename to eos/effects/effect5650.py
diff --git a/eos/effects/interceptor2shieldresist.py b/eos/effects/effect5657.py
similarity index 100%
rename from eos/effects/interceptor2shieldresist.py
rename to eos/effects/effect5657.py
diff --git a/eos/effects/interceptor2projectiledamage.py b/eos/effects/effect5673.py
similarity index 100%
rename from eos/effects/interceptor2projectiledamage.py
rename to eos/effects/effect5673.py
diff --git a/eos/effects/shipbonussmallmissileexplosionradiuscd2.py b/eos/effects/effect5676.py
similarity index 100%
rename from eos/effects/shipbonussmallmissileexplosionradiuscd2.py
rename to eos/effects/effect5676.py
diff --git a/eos/effects/shipbonusmissilevelocityad2.py b/eos/effects/effect5688.py
similarity index 100%
rename from eos/effects/shipbonusmissilevelocityad2.py
rename to eos/effects/effect5688.py
diff --git a/eos/effects/elitebonusinterdictorsarmorresist1.py b/eos/effects/effect5695.py
similarity index 100%
rename from eos/effects/elitebonusinterdictorsarmorresist1.py
rename to eos/effects/effect5695.py
diff --git a/eos/effects/shieldcapacitymultiply.py b/eos/effects/effect57.py
similarity index 100%
rename from eos/effects/shieldcapacitymultiply.py
rename to eos/effects/effect57.py
diff --git a/eos/effects/implantsetwarpspeed.py b/eos/effects/effect5717.py
similarity index 100%
rename from eos/effects/implantsetwarpspeed.py
rename to eos/effects/effect5717.py
diff --git a/eos/effects/shipbonusmetoptimalrangepiratefaction.py b/eos/effects/effect5721.py
similarity index 100%
rename from eos/effects/shipbonusmetoptimalrangepiratefaction.py
rename to eos/effects/effect5721.py
diff --git a/eos/effects/shiphybridoptimalgd1.py b/eos/effects/effect5722.py
similarity index 100%
rename from eos/effects/shiphybridoptimalgd1.py
rename to eos/effects/effect5722.py
diff --git a/eos/effects/elitebonusinterdictorsmwdsigradius2.py b/eos/effects/effect5723.py
similarity index 100%
rename from eos/effects/elitebonusinterdictorsmwdsigradius2.py
rename to eos/effects/effect5723.py
diff --git a/eos/effects/shipshtoptimalbonusgf.py b/eos/effects/effect5724.py
similarity index 100%
rename from eos/effects/shipshtoptimalbonusgf.py
rename to eos/effects/effect5724.py
diff --git a/eos/effects/shipbonusremoterepairamountpiratefaction.py b/eos/effects/effect5725.py
similarity index 100%
rename from eos/effects/shipbonusremoterepairamountpiratefaction.py
rename to eos/effects/effect5725.py
diff --git a/eos/effects/shipbonusletoptimalrangepiratefaction.py b/eos/effects/effect5726.py
similarity index 100%
rename from eos/effects/shipbonusletoptimalrangepiratefaction.py
rename to eos/effects/effect5726.py
diff --git a/eos/effects/elitebonusmaraudersheavymissiledamageexprole1.py b/eos/effects/effect5733.py
similarity index 100%
rename from eos/effects/elitebonusmaraudersheavymissiledamageexprole1.py
rename to eos/effects/effect5733.py
diff --git a/eos/effects/elitebonusmaraudersheavymissiledamagekinrole1.py b/eos/effects/effect5734.py
similarity index 100%
rename from eos/effects/elitebonusmaraudersheavymissiledamagekinrole1.py
rename to eos/effects/effect5734.py
diff --git a/eos/effects/elitebonusmaraudersheavymissiledamageemrole1.py b/eos/effects/effect5735.py
similarity index 100%
rename from eos/effects/elitebonusmaraudersheavymissiledamageemrole1.py
rename to eos/effects/effect5735.py
diff --git a/eos/effects/elitebonusmaraudersheavymissiledamagethermrole1.py b/eos/effects/effect5736.py
similarity index 100%
rename from eos/effects/elitebonusmaraudersheavymissiledamagethermrole1.py
rename to eos/effects/effect5736.py
diff --git a/eos/effects/shipscanprobestrengthbonuspiratefaction.py b/eos/effects/effect5737.py
similarity index 100%
rename from eos/effects/shipscanprobestrengthbonuspiratefaction.py
rename to eos/effects/effect5737.py
diff --git a/eos/effects/shipbonusremoterepairrangepiratefaction2.py b/eos/effects/effect5738.py
similarity index 100%
rename from eos/effects/shipbonusremoterepairrangepiratefaction2.py
rename to eos/effects/effect5738.py
diff --git a/eos/effects/overloadselftrackingmodulebonus.py b/eos/effects/effect5754.py
similarity index 100%
rename from eos/effects/overloadselftrackingmodulebonus.py
rename to eos/effects/effect5754.py
diff --git a/eos/effects/overloadselfsensormodulebonus.py b/eos/effects/effect5757.py
similarity index 100%
rename from eos/effects/overloadselfsensormodulebonus.py
rename to eos/effects/effect5757.py
diff --git a/eos/effects/overloadselfpainterbonus.py b/eos/effects/effect5758.py
similarity index 100%
rename from eos/effects/overloadselfpainterbonus.py
rename to eos/effects/effect5758.py
diff --git a/eos/effects/repairdronehullbonusbonus.py b/eos/effects/effect5769.py
similarity index 100%
rename from eos/effects/repairdronehullbonusbonus.py
rename to eos/effects/effect5769.py
diff --git a/eos/effects/shipmissilerofmf2.py b/eos/effects/effect5778.py
similarity index 100%
rename from eos/effects/shipmissilerofmf2.py
rename to eos/effects/effect5778.py
diff --git a/eos/effects/shipbonussptfalloffmf2.py b/eos/effects/effect5779.py
similarity index 100%
rename from eos/effects/shipbonussptfalloffmf2.py
rename to eos/effects/effect5779.py
diff --git a/eos/effects/ewskilltrackingdisruptionrangedisruptionbonus.py b/eos/effects/effect5793.py
similarity index 100%
rename from eos/effects/ewskilltrackingdisruptionrangedisruptionbonus.py
rename to eos/effects/effect5793.py
diff --git a/eos/effects/capacitorcapacitymultiply.py b/eos/effects/effect58.py
similarity index 100%
rename from eos/effects/capacitorcapacitymultiply.py
rename to eos/effects/effect58.py
diff --git a/eos/effects/shipbonusafterburnerspeedfactor2cb.py b/eos/effects/effect5802.py
similarity index 100%
rename from eos/effects/shipbonusafterburnerspeedfactor2cb.py
rename to eos/effects/effect5802.py
diff --git a/eos/effects/shipbonussentrydronedamagemultiplierpiratefaction.py b/eos/effects/effect5803.py
similarity index 100%
rename from eos/effects/shipbonussentrydronedamagemultiplierpiratefaction.py
rename to eos/effects/effect5803.py
diff --git a/eos/effects/shipbonusheavydronedamagemultiplierpiratefaction.py b/eos/effects/effect5804.py
similarity index 100%
rename from eos/effects/shipbonusheavydronedamagemultiplierpiratefaction.py
rename to eos/effects/effect5804.py
diff --git a/eos/effects/shipbonussentrydronehppiratefaction.py b/eos/effects/effect5805.py
similarity index 100%
rename from eos/effects/shipbonussentrydronehppiratefaction.py
rename to eos/effects/effect5805.py
diff --git a/eos/effects/shipbonussentrydronearmorhppiratefaction.py b/eos/effects/effect5806.py
similarity index 100%
rename from eos/effects/shipbonussentrydronearmorhppiratefaction.py
rename to eos/effects/effect5806.py
diff --git a/eos/effects/shipbonussentrydroneshieldhppiratefaction.py b/eos/effects/effect5807.py
similarity index 100%
rename from eos/effects/shipbonussentrydroneshieldhppiratefaction.py
rename to eos/effects/effect5807.py
diff --git a/eos/effects/shipbonusheavydroneshieldhppiratefaction.py b/eos/effects/effect5808.py
similarity index 100%
rename from eos/effects/shipbonusheavydroneshieldhppiratefaction.py
rename to eos/effects/effect5808.py
diff --git a/eos/effects/shipbonusheavydronearmorhppiratefaction.py b/eos/effects/effect5809.py
similarity index 100%
rename from eos/effects/shipbonusheavydronearmorhppiratefaction.py
rename to eos/effects/effect5809.py
diff --git a/eos/effects/weaponupgradescpuneedbonuspostpercentcpulocationshipmodulesrequiringgunnery.py b/eos/effects/effect581.py
similarity index 100%
rename from eos/effects/weaponupgradescpuneedbonuspostpercentcpulocationshipmodulesrequiringgunnery.py
rename to eos/effects/effect581.py
diff --git a/eos/effects/shipbonusheavydronehppiratefaction.py b/eos/effects/effect5810.py
similarity index 100%
rename from eos/effects/shipbonusheavydronehppiratefaction.py
rename to eos/effects/effect5810.py
diff --git a/eos/effects/shipbonuskineticmissiledamagegb2.py b/eos/effects/effect5811.py
similarity index 100%
rename from eos/effects/shipbonuskineticmissiledamagegb2.py
rename to eos/effects/effect5811.py
diff --git a/eos/effects/shipbonusthermalmissiledamagegb2.py b/eos/effects/effect5812.py
similarity index 100%
rename from eos/effects/shipbonusthermalmissiledamagegb2.py
rename to eos/effects/effect5812.py
diff --git a/eos/effects/shipbonusafterburnerspeedfactorcf2.py b/eos/effects/effect5813.py
similarity index 100%
rename from eos/effects/shipbonusafterburnerspeedfactorcf2.py
rename to eos/effects/effect5813.py
diff --git a/eos/effects/shipbonuskineticmissiledamagegf.py b/eos/effects/effect5814.py
similarity index 100%
rename from eos/effects/shipbonuskineticmissiledamagegf.py
rename to eos/effects/effect5814.py
diff --git a/eos/effects/shipbonusthermalmissiledamagegf.py b/eos/effects/effect5815.py
similarity index 100%
rename from eos/effects/shipbonusthermalmissiledamagegf.py
rename to eos/effects/effect5815.py
diff --git a/eos/effects/shipbonuslightdronedamagemultiplierpiratefaction.py b/eos/effects/effect5816.py
similarity index 100%
rename from eos/effects/shipbonuslightdronedamagemultiplierpiratefaction.py
rename to eos/effects/effect5816.py
diff --git a/eos/effects/shipbonuslightdronehppiratefaction.py b/eos/effects/effect5817.py
similarity index 100%
rename from eos/effects/shipbonuslightdronehppiratefaction.py
rename to eos/effects/effect5817.py
diff --git a/eos/effects/shipbonuslightdronearmorhppiratefaction.py b/eos/effects/effect5818.py
similarity index 100%
rename from eos/effects/shipbonuslightdronearmorhppiratefaction.py
rename to eos/effects/effect5818.py
diff --git a/eos/effects/shipbonuslightdroneshieldhppiratefaction.py b/eos/effects/effect5819.py
similarity index 100%
rename from eos/effects/shipbonuslightdroneshieldhppiratefaction.py
rename to eos/effects/effect5819.py
diff --git a/eos/effects/rapidfiringrofbonuspostpercentspeedlocationshipmodulesrequiringgunnery.py b/eos/effects/effect582.py
similarity index 100%
rename from eos/effects/rapidfiringrofbonuspostpercentspeedlocationshipmodulesrequiringgunnery.py
rename to eos/effects/effect582.py
diff --git a/eos/effects/shipbonusafterburnerspeedfactorcc2.py b/eos/effects/effect5820.py
similarity index 100%
rename from eos/effects/shipbonusafterburnerspeedfactorcc2.py
rename to eos/effects/effect5820.py
diff --git a/eos/effects/shipbonusmediumdronedamagemultiplierpiratefaction.py b/eos/effects/effect5821.py
similarity index 100%
rename from eos/effects/shipbonusmediumdronedamagemultiplierpiratefaction.py
rename to eos/effects/effect5821.py
diff --git a/eos/effects/shipbonusmediumdronehppiratefaction.py b/eos/effects/effect5822.py
similarity index 100%
rename from eos/effects/shipbonusmediumdronehppiratefaction.py
rename to eos/effects/effect5822.py
diff --git a/eos/effects/shipbonusmediumdronearmorhppiratefaction.py b/eos/effects/effect5823.py
similarity index 100%
rename from eos/effects/shipbonusmediumdronearmorhppiratefaction.py
rename to eos/effects/effect5823.py
diff --git a/eos/effects/shipbonusmediumdroneshieldhppiratefaction.py b/eos/effects/effect5824.py
similarity index 100%
rename from eos/effects/shipbonusmediumdroneshieldhppiratefaction.py
rename to eos/effects/effect5824.py
diff --git a/eos/effects/shipbonuskineticmissiledamagegc2.py b/eos/effects/effect5825.py
similarity index 100%
rename from eos/effects/shipbonuskineticmissiledamagegc2.py
rename to eos/effects/effect5825.py
diff --git a/eos/effects/shipbonusthermalmissiledamagegc2.py b/eos/effects/effect5826.py
similarity index 100%
rename from eos/effects/shipbonusthermalmissiledamagegc2.py
rename to eos/effects/effect5826.py
diff --git a/eos/effects/shipbonustdoptimalbonusaf1.py b/eos/effects/effect5827.py
similarity index 100%
rename from eos/effects/shipbonustdoptimalbonusaf1.py
rename to eos/effects/effect5827.py
diff --git a/eos/effects/shipbonusminingdurationore3.py b/eos/effects/effect5829.py
similarity index 100%
rename from eos/effects/shipbonusminingdurationore3.py
rename to eos/effects/effect5829.py
diff --git a/eos/effects/shipbonusminingiceharvestingrangeore2.py b/eos/effects/effect5832.py
similarity index 100%
rename from eos/effects/shipbonusminingiceharvestingrangeore2.py
rename to eos/effects/effect5832.py
diff --git a/eos/effects/elitebargeshieldresistance1.py b/eos/effects/effect5839.py
similarity index 100%
rename from eos/effects/elitebargeshieldresistance1.py
rename to eos/effects/effect5839.py
diff --git a/eos/effects/surgicalstrikedamagemultiplierbonuspostpercentdamagemultiplierlocationshipmodulesrequiringgunnery.py b/eos/effects/effect584.py
similarity index 100%
rename from eos/effects/surgicalstrikedamagemultiplierbonuspostpercentdamagemultiplierlocationshipmodulesrequiringgunnery.py
rename to eos/effects/effect584.py
diff --git a/eos/effects/elitebargebonusminingdurationbarge2.py b/eos/effects/effect5840.py
similarity index 100%
rename from eos/effects/elitebargebonusminingdurationbarge2.py
rename to eos/effects/effect5840.py
diff --git a/eos/effects/elitebonusexpeditionmining1.py b/eos/effects/effect5852.py
similarity index 100%
rename from eos/effects/elitebonusexpeditionmining1.py
rename to eos/effects/effect5852.py
diff --git a/eos/effects/elitebonusexpeditionsigradius2.py b/eos/effects/effect5853.py
similarity index 100%
rename from eos/effects/elitebonusexpeditionsigradius2.py
rename to eos/effects/effect5853.py
diff --git a/eos/effects/shipmissileemdamagecb.py b/eos/effects/effect5862.py
similarity index 100%
rename from eos/effects/shipmissileemdamagecb.py
rename to eos/effects/effect5862.py
diff --git a/eos/effects/shipmissilekindamagecb.py b/eos/effects/effect5863.py
similarity index 100%
rename from eos/effects/shipmissilekindamagecb.py
rename to eos/effects/effect5863.py
diff --git a/eos/effects/shipmissilethermdamagecb.py b/eos/effects/effect5864.py
similarity index 100%
rename from eos/effects/shipmissilethermdamagecb.py
rename to eos/effects/effect5864.py
diff --git a/eos/effects/shipmissileexplodamagecb.py b/eos/effects/effect5865.py
similarity index 100%
rename from eos/effects/shipmissileexplodamagecb.py
rename to eos/effects/effect5865.py
diff --git a/eos/effects/shipbonuswarpscramblemaxrangegb.py b/eos/effects/effect5866.py
similarity index 100%
rename from eos/effects/shipbonuswarpscramblemaxrangegb.py
rename to eos/effects/effect5866.py
diff --git a/eos/effects/shipbonusmissileexplosiondelaypiratefaction2.py b/eos/effects/effect5867.py
similarity index 100%
rename from eos/effects/shipbonusmissileexplosiondelaypiratefaction2.py
rename to eos/effects/effect5867.py
diff --git a/eos/effects/drawbackcargocapacity.py b/eos/effects/effect5868.py
similarity index 100%
rename from eos/effects/drawbackcargocapacity.py
rename to eos/effects/effect5868.py
diff --git a/eos/effects/eliteindustrialwarpspeedbonus1.py b/eos/effects/effect5869.py
similarity index 100%
rename from eos/effects/eliteindustrialwarpspeedbonus1.py
rename to eos/effects/effect5869.py
diff --git a/eos/effects/surgicalstrikedamagemultiplierbonuspostpercentdamagemultiplierlocationshipgroupenergyweapon.py b/eos/effects/effect587.py
similarity index 100%
rename from eos/effects/surgicalstrikedamagemultiplierbonuspostpercentdamagemultiplierlocationshipgroupenergyweapon.py
rename to eos/effects/effect587.py
diff --git a/eos/effects/shipbonusshieldboostci2.py b/eos/effects/effect5870.py
similarity index 100%
rename from eos/effects/shipbonusshieldboostci2.py
rename to eos/effects/effect5870.py
diff --git a/eos/effects/shipbonusshieldboostmi2.py b/eos/effects/effect5871.py
similarity index 100%
rename from eos/effects/shipbonusshieldboostmi2.py
rename to eos/effects/effect5871.py
diff --git a/eos/effects/shipbonusarmorrepairai2.py b/eos/effects/effect5872.py
similarity index 100%
rename from eos/effects/shipbonusarmorrepairai2.py
rename to eos/effects/effect5872.py
diff --git a/eos/effects/shipbonusarmorrepairgi2.py b/eos/effects/effect5873.py
similarity index 100%
rename from eos/effects/shipbonusarmorrepairgi2.py
rename to eos/effects/effect5873.py
diff --git a/eos/effects/eliteindustrialfleetcapacity1.py b/eos/effects/effect5874.py
similarity index 100%
rename from eos/effects/eliteindustrialfleetcapacity1.py
rename to eos/effects/effect5874.py
diff --git a/eos/effects/surgicalstrikedamagemultiplierbonuspostpercentdamagemultiplierlocationshipgroupprojectileweapon.py b/eos/effects/effect588.py
similarity index 100%
rename from eos/effects/surgicalstrikedamagemultiplierbonuspostpercentdamagemultiplierlocationshipgroupprojectileweapon.py
rename to eos/effects/effect588.py
diff --git a/eos/effects/eliteindustrialshieldresists2.py b/eos/effects/effect5881.py
similarity index 100%
rename from eos/effects/eliteindustrialshieldresists2.py
rename to eos/effects/effect5881.py
diff --git a/eos/effects/eliteindustrialarmorresists2.py b/eos/effects/effect5888.py
similarity index 100%
rename from eos/effects/eliteindustrialarmorresists2.py
rename to eos/effects/effect5888.py
diff --git a/eos/effects/eliteindustrialabheatbonus.py b/eos/effects/effect5889.py
similarity index 100%
rename from eos/effects/eliteindustrialabheatbonus.py
rename to eos/effects/effect5889.py
diff --git a/eos/effects/surgicalstrikedamagemultiplierbonuspostpercentdamagemultiplierlocationshipgrouphybridweapon.py b/eos/effects/effect589.py
similarity index 100%
rename from eos/effects/surgicalstrikedamagemultiplierbonuspostpercentdamagemultiplierlocationshipgrouphybridweapon.py
rename to eos/effects/effect589.py
diff --git a/eos/effects/eliteindustrialmwdheatbonus.py b/eos/effects/effect5890.py
similarity index 100%
rename from eos/effects/eliteindustrialmwdheatbonus.py
rename to eos/effects/effect5890.py
diff --git a/eos/effects/eliteindustrialarmorhardenerheatbonus.py b/eos/effects/effect5891.py
similarity index 100%
rename from eos/effects/eliteindustrialarmorhardenerheatbonus.py
rename to eos/effects/effect5891.py
diff --git a/eos/effects/eliteindustrialreactivearmorhardenerheatbonus.py b/eos/effects/effect5892.py
similarity index 100%
rename from eos/effects/eliteindustrialreactivearmorhardenerheatbonus.py
rename to eos/effects/effect5892.py
diff --git a/eos/effects/eliteindustrialshieldhardenerheatbonus.py b/eos/effects/effect5893.py
similarity index 100%
rename from eos/effects/eliteindustrialshieldhardenerheatbonus.py
rename to eos/effects/effect5893.py
diff --git a/eos/effects/eliteindustrialshieldboosterheatbonus.py b/eos/effects/effect5896.py
similarity index 100%
rename from eos/effects/eliteindustrialshieldboosterheatbonus.py
rename to eos/effects/effect5896.py
diff --git a/eos/effects/eliteindustrialarmorrepairheatbonus.py b/eos/effects/effect5899.py
similarity index 100%
rename from eos/effects/eliteindustrialarmorrepairheatbonus.py
rename to eos/effects/effect5899.py
diff --git a/eos/effects/cargocapacitymultiply.py b/eos/effects/effect59.py
similarity index 100%
rename from eos/effects/cargocapacitymultiply.py
rename to eos/effects/effect59.py
diff --git a/eos/effects/energypulseweaponsdurationbonuspostpercentdurationlocationshipmodulesrequiringenergypulseweapons.py b/eos/effects/effect590.py
similarity index 100%
rename from eos/effects/energypulseweaponsdurationbonuspostpercentdurationlocationshipmodulesrequiringenergypulseweapons.py
rename to eos/effects/effect590.py
diff --git a/eos/effects/warpspeedaddition.py b/eos/effects/effect5900.py
similarity index 100%
rename from eos/effects/warpspeedaddition.py
rename to eos/effects/effect5900.py
diff --git a/eos/effects/rolebonusbulkheadcpu.py b/eos/effects/effect5901.py
similarity index 100%
rename from eos/effects/rolebonusbulkheadcpu.py
rename to eos/effects/effect5901.py
diff --git a/eos/effects/onlinejumpdriveconsumptionamountbonuspercentage.py b/eos/effects/effect5911.py
similarity index 100%
rename from eos/effects/onlinejumpdriveconsumptionamountbonuspercentage.py
rename to eos/effects/effect5911.py
diff --git a/eos/effects/systemremotecaptransmitteramount.py b/eos/effects/effect5912.py
similarity index 100%
rename from eos/effects/systemremotecaptransmitteramount.py
rename to eos/effects/effect5912.py
diff --git a/eos/effects/systemarmorhp.py b/eos/effects/effect5913.py
similarity index 100%
rename from eos/effects/systemarmorhp.py
rename to eos/effects/effect5913.py
diff --git a/eos/effects/systemenergyneutmultiplier.py b/eos/effects/effect5914.py
similarity index 100%
rename from eos/effects/systemenergyneutmultiplier.py
rename to eos/effects/effect5914.py
diff --git a/eos/effects/systemenergyvampiremultiplier.py b/eos/effects/effect5915.py
similarity index 100%
rename from eos/effects/systemenergyvampiremultiplier.py
rename to eos/effects/effect5915.py
diff --git a/eos/effects/systemdamageexplosivebombs.py b/eos/effects/effect5916.py
similarity index 100%
rename from eos/effects/systemdamageexplosivebombs.py
rename to eos/effects/effect5916.py
diff --git a/eos/effects/systemdamagekineticbombs.py b/eos/effects/effect5917.py
similarity index 100%
rename from eos/effects/systemdamagekineticbombs.py
rename to eos/effects/effect5917.py
diff --git a/eos/effects/systemdamagethermalbombs.py b/eos/effects/effect5918.py
similarity index 100%
rename from eos/effects/systemdamagethermalbombs.py
rename to eos/effects/effect5918.py
diff --git a/eos/effects/systemdamageembombs.py b/eos/effects/effect5919.py
similarity index 100%
rename from eos/effects/systemdamageembombs.py
rename to eos/effects/effect5919.py
diff --git a/eos/effects/systemaoecloudsize.py b/eos/effects/effect5920.py
similarity index 100%
rename from eos/effects/systemaoecloudsize.py
rename to eos/effects/effect5920.py
diff --git a/eos/effects/systemtargetpaintermultiplier.py b/eos/effects/effect5921.py
similarity index 100%
rename from eos/effects/systemtargetpaintermultiplier.py
rename to eos/effects/effect5921.py
diff --git a/eos/effects/systemwebifierstrengthmultiplier.py b/eos/effects/effect5922.py
similarity index 100%
rename from eos/effects/systemwebifierstrengthmultiplier.py
rename to eos/effects/effect5922.py
diff --git a/eos/effects/systemneutbombs.py b/eos/effects/effect5923.py
similarity index 100%
rename from eos/effects/systemneutbombs.py
rename to eos/effects/effect5923.py
diff --git a/eos/effects/systemgravimetricecmbomb.py b/eos/effects/effect5924.py
similarity index 100%
rename from eos/effects/systemgravimetricecmbomb.py
rename to eos/effects/effect5924.py
diff --git a/eos/effects/systemladarecmbomb.py b/eos/effects/effect5925.py
similarity index 100%
rename from eos/effects/systemladarecmbomb.py
rename to eos/effects/effect5925.py
diff --git a/eos/effects/systemmagnetrometricecmbomb.py b/eos/effects/effect5926.py
similarity index 100%
rename from eos/effects/systemmagnetrometricecmbomb.py
rename to eos/effects/effect5926.py
diff --git a/eos/effects/systemradarecmbomb.py b/eos/effects/effect5927.py
similarity index 100%
rename from eos/effects/systemradarecmbomb.py
rename to eos/effects/effect5927.py
diff --git a/eos/effects/systemdronetracking.py b/eos/effects/effect5929.py
similarity index 100%
rename from eos/effects/systemdronetracking.py
rename to eos/effects/effect5929.py
diff --git a/eos/effects/warpscrambleblockmwdwithnpceffect.py b/eos/effects/effect5934.py
similarity index 100%
rename from eos/effects/warpscrambleblockmwdwithnpceffect.py
rename to eos/effects/effect5934.py
diff --git a/eos/effects/shipbonussmallmissileexplosionradiuscf2.py b/eos/effects/effect5938.py
similarity index 100%
rename from eos/effects/shipbonussmallmissileexplosionradiuscf2.py
rename to eos/effects/effect5938.py
diff --git a/eos/effects/shiprocketrofbonusaf2.py b/eos/effects/effect5939.py
similarity index 100%
rename from eos/effects/shiprocketrofbonusaf2.py
rename to eos/effects/effect5939.py
diff --git a/eos/effects/elitebonusinterdictorsshtrof1.py b/eos/effects/effect5940.py
similarity index 100%
rename from eos/effects/elitebonusinterdictorsshtrof1.py
rename to eos/effects/effect5940.py
diff --git a/eos/effects/shipmissilelauncherrofad1fixed.py b/eos/effects/effect5944.py
similarity index 100%
rename from eos/effects/shipmissilelauncherrofad1fixed.py
rename to eos/effects/effect5944.py
diff --git a/eos/effects/cloakingprototype.py b/eos/effects/effect5945.py
similarity index 100%
rename from eos/effects/cloakingprototype.py
rename to eos/effects/effect5945.py
diff --git a/eos/effects/drawbackwarpspeed.py b/eos/effects/effect5951.py
similarity index 100%
rename from eos/effects/drawbackwarpspeed.py
rename to eos/effects/effect5951.py
diff --git a/eos/effects/shipmetdamagebonusac2.py b/eos/effects/effect5956.py
similarity index 100%
rename from eos/effects/shipmetdamagebonusac2.py
rename to eos/effects/effect5956.py
diff --git a/eos/effects/elitebonusheavyinterdictorsmetoptimal.py b/eos/effects/effect5957.py
similarity index 100%
rename from eos/effects/elitebonusheavyinterdictorsmetoptimal.py
rename to eos/effects/effect5957.py
diff --git a/eos/effects/shiphybridtrackinggc.py b/eos/effects/effect5958.py
similarity index 100%
rename from eos/effects/shiphybridtrackinggc.py
rename to eos/effects/effect5958.py
diff --git a/eos/effects/elitebonusheavyinterdictorshybridoptimal1.py b/eos/effects/effect5959.py
similarity index 100%
rename from eos/effects/elitebonusheavyinterdictorshybridoptimal1.py
rename to eos/effects/effect5959.py
diff --git a/eos/effects/ammoinfluencerange.py b/eos/effects/effect596.py
similarity index 100%
rename from eos/effects/ammoinfluencerange.py
rename to eos/effects/effect596.py
diff --git a/eos/effects/ammospeedmultiplier.py b/eos/effects/effect598.py
similarity index 100%
rename from eos/effects/ammospeedmultiplier.py
rename to eos/effects/effect598.py
diff --git a/eos/effects/ammofallofmultiplier.py b/eos/effects/effect599.py
similarity index 100%
rename from eos/effects/ammofallofmultiplier.py
rename to eos/effects/effect599.py
diff --git a/eos/effects/resistancekillerhullall.py b/eos/effects/effect5994.py
similarity index 100%
rename from eos/effects/resistancekillerhullall.py
rename to eos/effects/effect5994.py
diff --git a/eos/effects/resistancekillershieldarmorall.py b/eos/effects/effect5995.py
similarity index 100%
rename from eos/effects/resistancekillershieldarmorall.py
rename to eos/effects/effect5995.py
diff --git a/eos/effects/freightersmacapacitybonuso1.py b/eos/effects/effect5998.py
similarity index 100%
rename from eos/effects/freightersmacapacitybonuso1.py
rename to eos/effects/effect5998.py
diff --git a/eos/effects/structurehpmultiply.py b/eos/effects/effect60.py
similarity index 100%
rename from eos/effects/structurehpmultiply.py
rename to eos/effects/effect60.py
diff --git a/eos/effects/ammotrackingmultiplier.py b/eos/effects/effect600.py
similarity index 100%
rename from eos/effects/ammotrackingmultiplier.py
rename to eos/effects/effect600.py
diff --git a/eos/effects/freighteragilitybonus2o2.py b/eos/effects/effect6001.py
similarity index 100%
rename from eos/effects/freighteragilitybonus2o2.py
rename to eos/effects/effect6001.py
diff --git a/eos/effects/shipsetdamageamarrtacticaldestroyer1.py b/eos/effects/effect6006.py
similarity index 100%
rename from eos/effects/shipsetdamageamarrtacticaldestroyer1.py
rename to eos/effects/effect6006.py
diff --git a/eos/effects/shipsetcapneedamarrtacticaldestroyer2.py b/eos/effects/effect6007.py
similarity index 100%
rename from eos/effects/shipsetcapneedamarrtacticaldestroyer2.py
rename to eos/effects/effect6007.py
diff --git a/eos/effects/shipheatdamageamarrtacticaldestroyer3.py b/eos/effects/effect6008.py
similarity index 100%
rename from eos/effects/shipheatdamageamarrtacticaldestroyer3.py
rename to eos/effects/effect6008.py
diff --git a/eos/effects/probelaunchercpupercentrolebonust3.py b/eos/effects/effect6009.py
similarity index 100%
rename from eos/effects/probelaunchercpupercentrolebonust3.py
rename to eos/effects/effect6009.py
diff --git a/eos/effects/shipmodemaxtargetrangepostdiv.py b/eos/effects/effect6010.py
similarity index 100%
rename from eos/effects/shipmodemaxtargetrangepostdiv.py
rename to eos/effects/effect6010.py
diff --git a/eos/effects/shipmodesetoptimalrangepostdiv.py b/eos/effects/effect6011.py
similarity index 100%
rename from eos/effects/shipmodesetoptimalrangepostdiv.py
rename to eos/effects/effect6011.py
diff --git a/eos/effects/shipmodescanstrengthpostdiv.py b/eos/effects/effect6012.py
similarity index 100%
rename from eos/effects/shipmodescanstrengthpostdiv.py
rename to eos/effects/effect6012.py
diff --git a/eos/effects/modesigradiuspostdiv.py b/eos/effects/effect6014.py
similarity index 100%
rename from eos/effects/modesigradiuspostdiv.py
rename to eos/effects/effect6014.py
diff --git a/eos/effects/modearmorresonancepostdiv.py b/eos/effects/effect6015.py
similarity index 100%
rename from eos/effects/modearmorresonancepostdiv.py
rename to eos/effects/effect6015.py
diff --git a/eos/effects/modeagilitypostdiv.py b/eos/effects/effect6016.py
similarity index 100%
rename from eos/effects/modeagilitypostdiv.py
rename to eos/effects/effect6016.py
diff --git a/eos/effects/modevelocitypostdiv.py b/eos/effects/effect6017.py
similarity index 100%
rename from eos/effects/modevelocitypostdiv.py
rename to eos/effects/effect6017.py
diff --git a/eos/effects/shippturretspeedbonusmc.py b/eos/effects/effect602.py
similarity index 100%
rename from eos/effects/shippturretspeedbonusmc.py
rename to eos/effects/effect602.py
diff --git a/eos/effects/shipbonusenergyneutoptimalrs3.py b/eos/effects/effect6020.py
similarity index 100%
rename from eos/effects/shipbonusenergyneutoptimalrs3.py
rename to eos/effects/effect6020.py
diff --git a/eos/effects/shipbonusenergynosoptimalrs3.py b/eos/effects/effect6021.py
similarity index 100%
rename from eos/effects/shipbonusenergynosoptimalrs3.py
rename to eos/effects/effect6021.py
diff --git a/eos/effects/elitereconbonusmhtoptimalrange1.py b/eos/effects/effect6025.py
similarity index 100%
rename from eos/effects/elitereconbonusmhtoptimalrange1.py
rename to eos/effects/effect6025.py
diff --git a/eos/effects/elitereconbonusmptdamage1.py b/eos/effects/effect6027.py
similarity index 100%
rename from eos/effects/elitereconbonusmptdamage1.py
rename to eos/effects/effect6027.py
diff --git a/eos/effects/remotecapacitortransmitterpowerneedbonuseffect.py b/eos/effects/effect6032.py
similarity index 100%
rename from eos/effects/remotecapacitortransmitterpowerneedbonuseffect.py
rename to eos/effects/effect6032.py
diff --git a/eos/effects/shipheatdamageminmatartacticaldestroyer3.py b/eos/effects/effect6036.py
similarity index 100%
rename from eos/effects/shipheatdamageminmatartacticaldestroyer3.py
rename to eos/effects/effect6036.py
diff --git a/eos/effects/shipsptdamageminmatartacticaldestroyer1.py b/eos/effects/effect6037.py
similarity index 100%
rename from eos/effects/shipsptdamageminmatartacticaldestroyer1.py
rename to eos/effects/effect6037.py
diff --git a/eos/effects/shipsptoptimalminmatartacticaldestroyer2.py b/eos/effects/effect6038.py
similarity index 100%
rename from eos/effects/shipsptoptimalminmatartacticaldestroyer2.py
rename to eos/effects/effect6038.py
diff --git a/eos/effects/shipmodespttrackingpostdiv.py b/eos/effects/effect6039.py
similarity index 100%
rename from eos/effects/shipmodespttrackingpostdiv.py
rename to eos/effects/effect6039.py
diff --git a/eos/effects/shipptspeedbonusmb2.py b/eos/effects/effect604.py
similarity index 100%
rename from eos/effects/shipptspeedbonusmb2.py
rename to eos/effects/effect604.py
diff --git a/eos/effects/modemwdsigradiuspostdiv.py b/eos/effects/effect6040.py
similarity index 100%
rename from eos/effects/modemwdsigradiuspostdiv.py
rename to eos/effects/effect6040.py
diff --git a/eos/effects/modeshieldresonancepostdiv.py b/eos/effects/effect6041.py
similarity index 100%
rename from eos/effects/modeshieldresonancepostdiv.py
rename to eos/effects/effect6041.py
diff --git a/eos/effects/shipbonussentrydamagemultipliergc3.py b/eos/effects/effect6045.py
similarity index 100%
rename from eos/effects/shipbonussentrydamagemultipliergc3.py
rename to eos/effects/effect6045.py
diff --git a/eos/effects/shipbonussentryhpgc3.py b/eos/effects/effect6046.py
similarity index 100%
rename from eos/effects/shipbonussentryhpgc3.py
rename to eos/effects/effect6046.py
diff --git a/eos/effects/shipbonussentryarmorhpgc3.py b/eos/effects/effect6047.py
similarity index 100%
rename from eos/effects/shipbonussentryarmorhpgc3.py
rename to eos/effects/effect6047.py
diff --git a/eos/effects/shipbonussentryshieldhpgc3.py b/eos/effects/effect6048.py
similarity index 100%
rename from eos/effects/shipbonussentryshieldhpgc3.py
rename to eos/effects/effect6048.py
diff --git a/eos/effects/shipbonuslightdronedamagemultipliergc2.py b/eos/effects/effect6051.py
similarity index 100%
rename from eos/effects/shipbonuslightdronedamagemultipliergc2.py
rename to eos/effects/effect6051.py
diff --git a/eos/effects/shipbonusmediumdronedamagemultipliergc2.py b/eos/effects/effect6052.py
similarity index 100%
rename from eos/effects/shipbonusmediumdronedamagemultipliergc2.py
rename to eos/effects/effect6052.py
diff --git a/eos/effects/shipbonusheavydronedamagemultipliergc2.py b/eos/effects/effect6053.py
similarity index 100%
rename from eos/effects/shipbonusheavydronedamagemultipliergc2.py
rename to eos/effects/effect6053.py
diff --git a/eos/effects/shipbonusheavydronehpgc2.py b/eos/effects/effect6054.py
similarity index 100%
rename from eos/effects/shipbonusheavydronehpgc2.py
rename to eos/effects/effect6054.py
diff --git a/eos/effects/shipbonusheavydronearmorhpgc2.py b/eos/effects/effect6055.py
similarity index 100%
rename from eos/effects/shipbonusheavydronearmorhpgc2.py
rename to eos/effects/effect6055.py
diff --git a/eos/effects/shipbonusheavydroneshieldhpgc2.py b/eos/effects/effect6056.py
similarity index 100%
rename from eos/effects/shipbonusheavydroneshieldhpgc2.py
rename to eos/effects/effect6056.py
diff --git a/eos/effects/shipbonusmediumdroneshieldhpgc2.py b/eos/effects/effect6057.py
similarity index 100%
rename from eos/effects/shipbonusmediumdroneshieldhpgc2.py
rename to eos/effects/effect6057.py
diff --git a/eos/effects/shipbonusmediumdronearmorhpgc2.py b/eos/effects/effect6058.py
similarity index 100%
rename from eos/effects/shipbonusmediumdronearmorhpgc2.py
rename to eos/effects/effect6058.py
diff --git a/eos/effects/shipbonusmediumdronehpgc2.py b/eos/effects/effect6059.py
similarity index 100%
rename from eos/effects/shipbonusmediumdronehpgc2.py
rename to eos/effects/effect6059.py
diff --git a/eos/effects/shipbonuslightdronehpgc2.py b/eos/effects/effect6060.py
similarity index 100%
rename from eos/effects/shipbonuslightdronehpgc2.py
rename to eos/effects/effect6060.py
diff --git a/eos/effects/shipbonuslightdronearmorhpgc2.py b/eos/effects/effect6061.py
similarity index 100%
rename from eos/effects/shipbonuslightdronearmorhpgc2.py
rename to eos/effects/effect6061.py
diff --git a/eos/effects/shipbonuslightdroneshieldhpgc2.py b/eos/effects/effect6062.py
similarity index 100%
rename from eos/effects/shipbonuslightdroneshieldhpgc2.py
rename to eos/effects/effect6062.py
diff --git a/eos/effects/entosislink.py b/eos/effects/effect6063.py
similarity index 100%
rename from eos/effects/entosislink.py
rename to eos/effects/effect6063.py
diff --git a/eos/effects/cloaking.py b/eos/effects/effect607.py
similarity index 100%
rename from eos/effects/cloaking.py
rename to eos/effects/effect607.py
diff --git a/eos/effects/shipmodemissilevelocitypostdiv.py b/eos/effects/effect6076.py
similarity index 100%
rename from eos/effects/shipmodemissilevelocitypostdiv.py
rename to eos/effects/effect6076.py
diff --git a/eos/effects/shipheatdamagecaldaritacticaldestroyer3.py b/eos/effects/effect6077.py
similarity index 100%
rename from eos/effects/shipheatdamagecaldaritacticaldestroyer3.py
rename to eos/effects/effect6077.py
diff --git a/eos/effects/shipsmallmissiledmgpiratefaction.py b/eos/effects/effect6083.py
similarity index 100%
rename from eos/effects/shipsmallmissiledmgpiratefaction.py
rename to eos/effects/effect6083.py
diff --git a/eos/effects/shipmissilerofcaldaritacticaldestroyer1.py b/eos/effects/effect6085.py
similarity index 100%
rename from eos/effects/shipmissilerofcaldaritacticaldestroyer1.py
rename to eos/effects/effect6085.py
diff --git a/eos/effects/shipbonusheavyassaultmissilealldamagemc2.py b/eos/effects/effect6088.py
similarity index 100%
rename from eos/effects/shipbonusheavyassaultmissilealldamagemc2.py
rename to eos/effects/effect6088.py
diff --git a/eos/effects/shipbonusheavymissilealldamagemc2.py b/eos/effects/effect6093.py
similarity index 100%
rename from eos/effects/shipbonusheavymissilealldamagemc2.py
rename to eos/effects/effect6093.py
diff --git a/eos/effects/shipbonuslightmissilealldamagemc2.py b/eos/effects/effect6096.py
similarity index 100%
rename from eos/effects/shipbonuslightmissilealldamagemc2.py
rename to eos/effects/effect6096.py
diff --git a/eos/effects/shipmissilereloadtimecaldaritacticaldestroyer2.py b/eos/effects/effect6098.py
similarity index 100%
rename from eos/effects/shipmissilereloadtimecaldaritacticaldestroyer2.py
rename to eos/effects/effect6098.py
diff --git a/eos/effects/agilitybonus.py b/eos/effects/effect61.py
similarity index 100%
rename from eos/effects/agilitybonus.py
rename to eos/effects/effect61.py
diff --git a/eos/effects/entosisdurationmultiply.py b/eos/effects/effect6104.py
similarity index 100%
rename from eos/effects/entosisdurationmultiply.py
rename to eos/effects/effect6104.py
diff --git a/eos/effects/missilevelocitybonusonline.py b/eos/effects/effect6110.py
similarity index 100%
rename from eos/effects/missilevelocitybonusonline.py
rename to eos/effects/effect6110.py
diff --git a/eos/effects/missileexplosiondelaybonusonline.py b/eos/effects/effect6111.py
similarity index 100%
rename from eos/effects/missileexplosiondelaybonusonline.py
rename to eos/effects/effect6111.py
diff --git a/eos/effects/missileaoecloudsizebonusonline.py b/eos/effects/effect6112.py
similarity index 100%
rename from eos/effects/missileaoecloudsizebonusonline.py
rename to eos/effects/effect6112.py
diff --git a/eos/effects/missileaoevelocitybonusonline.py b/eos/effects/effect6113.py
similarity index 100%
rename from eos/effects/missileaoevelocitybonusonline.py
rename to eos/effects/effect6113.py
diff --git a/eos/effects/scriptmissileguidancecomputeraoecloudsizebonusbonus.py b/eos/effects/effect6128.py
similarity index 100%
rename from eos/effects/scriptmissileguidancecomputeraoecloudsizebonusbonus.py
rename to eos/effects/effect6128.py
diff --git a/eos/effects/scriptmissileguidancecomputeraoevelocitybonusbonus.py b/eos/effects/effect6129.py
similarity index 100%
rename from eos/effects/scriptmissileguidancecomputeraoevelocitybonusbonus.py
rename to eos/effects/effect6129.py
diff --git a/eos/effects/scriptmissileguidancecomputermissilevelocitybonusbonus.py b/eos/effects/effect6130.py
similarity index 100%
rename from eos/effects/scriptmissileguidancecomputermissilevelocitybonusbonus.py
rename to eos/effects/effect6130.py
diff --git a/eos/effects/scriptmissileguidancecomputerexplosiondelaybonusbonus.py b/eos/effects/effect6131.py
similarity index 100%
rename from eos/effects/scriptmissileguidancecomputerexplosiondelaybonusbonus.py
rename to eos/effects/effect6131.py
diff --git a/eos/effects/missileguidancecomputerbonus4.py b/eos/effects/effect6135.py
similarity index 100%
rename from eos/effects/missileguidancecomputerbonus4.py
rename to eos/effects/effect6135.py
diff --git a/eos/effects/overloadselfmissileguidancebonus5.py b/eos/effects/effect6144.py
similarity index 100%
rename from eos/effects/overloadselfmissileguidancebonus5.py
rename to eos/effects/effect6144.py
diff --git a/eos/effects/shipheatdamagegallentetacticaldestroyer3.py b/eos/effects/effect6148.py
similarity index 100%
rename from eos/effects/shipheatdamagegallentetacticaldestroyer3.py
rename to eos/effects/effect6148.py
diff --git a/eos/effects/shipshtrofgallentetacticaldestroyer1.py b/eos/effects/effect6149.py
similarity index 100%
rename from eos/effects/shipshtrofgallentetacticaldestroyer1.py
rename to eos/effects/effect6149.py
diff --git a/eos/effects/shipshttrackinggallentetacticaldestroyer2.py b/eos/effects/effect6150.py
similarity index 100%
rename from eos/effects/shipshttrackinggallentetacticaldestroyer2.py
rename to eos/effects/effect6150.py
diff --git a/eos/effects/modehullresonancepostdiv.py b/eos/effects/effect6151.py
similarity index 100%
rename from eos/effects/modehullresonancepostdiv.py
rename to eos/effects/effect6151.py
diff --git a/eos/effects/shipmodeshtoptimalrangepostdiv.py b/eos/effects/effect6152.py
similarity index 100%
rename from eos/effects/shipmodeshtoptimalrangepostdiv.py
rename to eos/effects/effect6152.py
diff --git a/eos/effects/modemwdcappostdiv.py b/eos/effects/effect6153.py
similarity index 100%
rename from eos/effects/modemwdcappostdiv.py
rename to eos/effects/effect6153.py
diff --git a/eos/effects/modemwdboostpostdiv.py b/eos/effects/effect6154.py
similarity index 100%
rename from eos/effects/modemwdboostpostdiv.py
rename to eos/effects/effect6154.py
diff --git a/eos/effects/modearmorrepdurationpostdiv.py b/eos/effects/effect6155.py
similarity index 100%
rename from eos/effects/modearmorrepdurationpostdiv.py
rename to eos/effects/effect6155.py
diff --git a/eos/effects/passivespeedlimit.py b/eos/effects/effect6163.py
similarity index 100%
rename from eos/effects/passivespeedlimit.py
rename to eos/effects/effect6163.py
diff --git a/eos/effects/systemmaxvelocitypercentage.py b/eos/effects/effect6164.py
similarity index 100%
rename from eos/effects/systemmaxvelocitypercentage.py
rename to eos/effects/effect6164.py
diff --git a/eos/effects/shipbonuswdfgnullpenalties.py b/eos/effects/effect6166.py
similarity index 100%
rename from eos/effects/shipbonuswdfgnullpenalties.py
rename to eos/effects/effect6166.py
diff --git a/eos/effects/entosiscpupenalty.py b/eos/effects/effect6170.py
similarity index 100%
rename from eos/effects/entosiscpupenalty.py
rename to eos/effects/effect6170.py
diff --git a/eos/effects/entosiscpuaddition.py b/eos/effects/effect6171.py
similarity index 100%
rename from eos/effects/entosiscpuaddition.py
rename to eos/effects/effect6171.py
diff --git a/eos/effects/battlecruisermetrange.py b/eos/effects/effect6172.py
similarity index 100%
rename from eos/effects/battlecruisermetrange.py
rename to eos/effects/effect6172.py
diff --git a/eos/effects/battlecruisermhtrange.py b/eos/effects/effect6173.py
similarity index 100%
rename from eos/effects/battlecruisermhtrange.py
rename to eos/effects/effect6173.py
diff --git a/eos/effects/battlecruisermptrange.py b/eos/effects/effect6174.py
similarity index 100%
rename from eos/effects/battlecruisermptrange.py
rename to eos/effects/effect6174.py
diff --git a/eos/effects/battlecruisermissilerange.py b/eos/effects/effect6175.py
similarity index 100%
rename from eos/effects/battlecruisermissilerange.py
rename to eos/effects/effect6175.py
diff --git a/eos/effects/battlecruiserdronespeed.py b/eos/effects/effect6176.py
similarity index 100%
rename from eos/effects/battlecruiserdronespeed.py
rename to eos/effects/effect6176.py
diff --git a/eos/effects/shiphybriddmg1cbc2.py b/eos/effects/effect6177.py
similarity index 100%
rename from eos/effects/shiphybriddmg1cbc2.py
rename to eos/effects/effect6177.py
diff --git a/eos/effects/shipbonusprojectiletrackingmbc2.py b/eos/effects/effect6178.py
similarity index 100%
rename from eos/effects/shipbonusprojectiletrackingmbc2.py
rename to eos/effects/effect6178.py
diff --git a/eos/effects/shipmoduleremotecapacitortransmitter.py b/eos/effects/effect6184.py
similarity index 100%
rename from eos/effects/shipmoduleremotecapacitortransmitter.py
rename to eos/effects/effect6184.py
diff --git a/eos/effects/shipmoduleremotehullrepairer.py b/eos/effects/effect6185.py
similarity index 100%
rename from eos/effects/shipmoduleremotehullrepairer.py
rename to eos/effects/effect6185.py
diff --git a/eos/effects/shipmoduleremoteshieldbooster.py b/eos/effects/effect6186.py
similarity index 100%
rename from eos/effects/shipmoduleremoteshieldbooster.py
rename to eos/effects/effect6186.py
diff --git a/eos/effects/energyneutralizerfalloff.py b/eos/effects/effect6187.py
similarity index 100%
rename from eos/effects/energyneutralizerfalloff.py
rename to eos/effects/effect6187.py
diff --git a/eos/effects/shipmoduleremotearmorrepairer.py b/eos/effects/effect6188.py
similarity index 100%
rename from eos/effects/shipmoduleremotearmorrepairer.py
rename to eos/effects/effect6188.py
diff --git a/eos/effects/expeditionfrigateshieldresistance1.py b/eos/effects/effect6195.py
similarity index 100%
rename from eos/effects/expeditionfrigateshieldresistance1.py
rename to eos/effects/effect6195.py
diff --git a/eos/effects/expeditionfrigatebonusiceharvestingcycletime2.py b/eos/effects/effect6196.py
similarity index 100%
rename from eos/effects/expeditionfrigatebonusiceharvestingcycletime2.py
rename to eos/effects/effect6196.py
diff --git a/eos/effects/energynosferatufalloff.py b/eos/effects/effect6197.py
similarity index 100%
rename from eos/effects/energynosferatufalloff.py
rename to eos/effects/effect6197.py
diff --git a/eos/effects/doomsdayslash.py b/eos/effects/effect6201.py
similarity index 100%
rename from eos/effects/doomsdayslash.py
rename to eos/effects/effect6201.py
diff --git a/eos/effects/microjumpportaldrive.py b/eos/effects/effect6208.py
similarity index 100%
rename from eos/effects/microjumpportaldrive.py
rename to eos/effects/effect6208.py
diff --git a/eos/effects/rolebonuscdlinkspgreduction.py b/eos/effects/effect6214.py
similarity index 100%
rename from eos/effects/rolebonuscdlinkspgreduction.py
rename to eos/effects/effect6214.py
diff --git a/eos/effects/structureenergyneutralizerfalloff.py b/eos/effects/effect6216.py
similarity index 100%
rename from eos/effects/structureenergyneutralizerfalloff.py
rename to eos/effects/effect6216.py
diff --git a/eos/effects/structurewarpscrambleblockmwdwithnpceffect.py b/eos/effects/effect6222.py
similarity index 100%
rename from eos/effects/structurewarpscrambleblockmwdwithnpceffect.py
rename to eos/effects/effect6222.py
diff --git a/eos/effects/miningdroneoperationminingamountbonuspostpercentminingdroneamountpercentchar.py b/eos/effects/effect623.py
similarity index 100%
rename from eos/effects/miningdroneoperationminingamountbonuspostpercentminingdroneamountpercentchar.py
rename to eos/effects/effect623.py
diff --git a/eos/effects/shipbonusenergyneutoptimalrs1.py b/eos/effects/effect6230.py
similarity index 100%
rename from eos/effects/shipbonusenergyneutoptimalrs1.py
rename to eos/effects/effect6230.py
diff --git a/eos/effects/shipbonusenergyneutfalloffrs2.py b/eos/effects/effect6232.py
similarity index 100%
rename from eos/effects/shipbonusenergyneutfalloffrs2.py
rename to eos/effects/effect6232.py
diff --git a/eos/effects/shipbonusenergyneutfalloffrs3.py b/eos/effects/effect6233.py
similarity index 100%
rename from eos/effects/shipbonusenergyneutfalloffrs3.py
rename to eos/effects/effect6233.py
diff --git a/eos/effects/shipbonusenergynosoptimalrs1.py b/eos/effects/effect6234.py
similarity index 100%
rename from eos/effects/shipbonusenergynosoptimalrs1.py
rename to eos/effects/effect6234.py
diff --git a/eos/effects/shipbonusenergynosfalloffrs2.py b/eos/effects/effect6237.py
similarity index 100%
rename from eos/effects/shipbonusenergynosfalloffrs2.py
rename to eos/effects/effect6237.py
diff --git a/eos/effects/shipbonusenergynosfalloffrs3.py b/eos/effects/effect6238.py
similarity index 100%
rename from eos/effects/shipbonusenergynosfalloffrs3.py
rename to eos/effects/effect6238.py
diff --git a/eos/effects/miningfrigatebonusiceharvestingcycletime2.py b/eos/effects/effect6239.py
similarity index 100%
rename from eos/effects/miningfrigatebonusiceharvestingcycletime2.py
rename to eos/effects/effect6239.py
diff --git a/eos/effects/shipbonusenergyneutfalloffad1.py b/eos/effects/effect6241.py
similarity index 100%
rename from eos/effects/shipbonusenergyneutfalloffad1.py
rename to eos/effects/effect6241.py
diff --git a/eos/effects/shipbonusenergyneutoptimalad2.py b/eos/effects/effect6242.py
similarity index 100%
rename from eos/effects/shipbonusenergyneutoptimalad2.py
rename to eos/effects/effect6242.py
diff --git a/eos/effects/shipbonusenergynosoptimalad2.py b/eos/effects/effect6245.py
similarity index 100%
rename from eos/effects/shipbonusenergynosoptimalad2.py
rename to eos/effects/effect6245.py
diff --git a/eos/effects/shipbonusenergynosfalloffad1.py b/eos/effects/effect6246.py
similarity index 100%
rename from eos/effects/shipbonusenergynosfalloffad1.py
rename to eos/effects/effect6246.py
diff --git a/eos/effects/shipbonusenergyneutoptimalab.py b/eos/effects/effect6253.py
similarity index 100%
rename from eos/effects/shipbonusenergyneutoptimalab.py
rename to eos/effects/effect6253.py
diff --git a/eos/effects/shipbonusenergyneutfalloffab2.py b/eos/effects/effect6256.py
similarity index 100%
rename from eos/effects/shipbonusenergyneutfalloffab2.py
rename to eos/effects/effect6256.py
diff --git a/eos/effects/shipbonusenergynosoptimalab.py b/eos/effects/effect6257.py
similarity index 100%
rename from eos/effects/shipbonusenergynosoptimalab.py
rename to eos/effects/effect6257.py
diff --git a/eos/effects/shipbonusenergynosfalloffab2.py b/eos/effects/effect6260.py
similarity index 100%
rename from eos/effects/shipbonusenergynosfalloffab2.py
rename to eos/effects/effect6260.py
diff --git a/eos/effects/shipbonusenergyneutoptimaleaf1.py b/eos/effects/effect6267.py
similarity index 100%
rename from eos/effects/shipbonusenergyneutoptimaleaf1.py
rename to eos/effects/effect6267.py
diff --git a/eos/effects/powerincrease.py b/eos/effects/effect627.py
similarity index 100%
rename from eos/effects/powerincrease.py
rename to eos/effects/effect627.py
diff --git a/eos/effects/shipbonusenergyneutfalloffeaf3.py b/eos/effects/effect6272.py
similarity index 100%
rename from eos/effects/shipbonusenergyneutfalloffeaf3.py
rename to eos/effects/effect6272.py
diff --git a/eos/effects/shipbonusenergynosoptimaleaf1.py b/eos/effects/effect6273.py
similarity index 100%
rename from eos/effects/shipbonusenergynosoptimaleaf1.py
rename to eos/effects/effect6273.py
diff --git a/eos/effects/shipbonusenergynosfalloffeaf3.py b/eos/effects/effect6278.py
similarity index 100%
rename from eos/effects/shipbonusenergynosfalloffeaf3.py
rename to eos/effects/effect6278.py
diff --git a/eos/effects/shipbonusenergyneutoptimalaf2.py b/eos/effects/effect6281.py
similarity index 100%
rename from eos/effects/shipbonusenergyneutoptimalaf2.py
rename to eos/effects/effect6281.py
diff --git a/eos/effects/shipbonusenergyneutfalloffaf3.py b/eos/effects/effect6285.py
similarity index 100%
rename from eos/effects/shipbonusenergyneutfalloffaf3.py
rename to eos/effects/effect6285.py
diff --git a/eos/effects/shipbonusenergynosoptimalaf2.py b/eos/effects/effect6287.py
similarity index 100%
rename from eos/effects/shipbonusenergynosoptimalaf2.py
rename to eos/effects/effect6287.py
diff --git a/eos/effects/shipbonusenergynosfalloffaf3.py b/eos/effects/effect6291.py
similarity index 100%
rename from eos/effects/shipbonusenergynosfalloffaf3.py
rename to eos/effects/effect6291.py
diff --git a/eos/effects/shipbonusenergyneutoptimalac1.py b/eos/effects/effect6294.py
similarity index 100%
rename from eos/effects/shipbonusenergyneutoptimalac1.py
rename to eos/effects/effect6294.py
diff --git a/eos/effects/shipbonusenergyneutfalloffac3.py b/eos/effects/effect6299.py
similarity index 100%
rename from eos/effects/shipbonusenergyneutfalloffac3.py
rename to eos/effects/effect6299.py
diff --git a/eos/effects/armorhpmultiply.py b/eos/effects/effect63.py
similarity index 100%
rename from eos/effects/armorhpmultiply.py
rename to eos/effects/effect63.py
diff --git a/eos/effects/shipbonusenergynosoptimalac1.py b/eos/effects/effect6300.py
similarity index 100%
rename from eos/effects/shipbonusenergynosoptimalac1.py
rename to eos/effects/effect6300.py
diff --git a/eos/effects/shipbonusnosoptimalfalloffac2.py b/eos/effects/effect6301.py
similarity index 100%
rename from eos/effects/shipbonusnosoptimalfalloffac2.py
rename to eos/effects/effect6301.py
diff --git a/eos/effects/shipbonusenergynosfalloffac3.py b/eos/effects/effect6305.py
similarity index 100%
rename from eos/effects/shipbonusenergynosfalloffac3.py
rename to eos/effects/effect6305.py
diff --git a/eos/effects/shipbonusthermmissiledmgmd1.py b/eos/effects/effect6307.py
similarity index 100%
rename from eos/effects/shipbonusthermmissiledmgmd1.py
rename to eos/effects/effect6307.py
diff --git a/eos/effects/shipbonusemmissiledmgmd1.py b/eos/effects/effect6308.py
similarity index 100%
rename from eos/effects/shipbonusemmissiledmgmd1.py
rename to eos/effects/effect6308.py
diff --git a/eos/effects/shipbonuskineticmissiledmgmd1.py b/eos/effects/effect6309.py
similarity index 100%
rename from eos/effects/shipbonuskineticmissiledmgmd1.py
rename to eos/effects/effect6309.py
diff --git a/eos/effects/shipbonusexplosivemissiledmgmd1.py b/eos/effects/effect6310.py
similarity index 100%
rename from eos/effects/shipbonusexplosivemissiledmgmd1.py
rename to eos/effects/effect6310.py
diff --git a/eos/effects/elitebonuscommanddestroyerskirmish1.py b/eos/effects/effect6315.py
similarity index 100%
rename from eos/effects/elitebonuscommanddestroyerskirmish1.py
rename to eos/effects/effect6315.py
diff --git a/eos/effects/elitebonuscommanddestroyershield1.py b/eos/effects/effect6316.py
similarity index 100%
rename from eos/effects/elitebonuscommanddestroyershield1.py
rename to eos/effects/effect6316.py
diff --git a/eos/effects/elitebonuscommanddestroyermjfgspool2.py b/eos/effects/effect6317.py
similarity index 100%
rename from eos/effects/elitebonuscommanddestroyermjfgspool2.py
rename to eos/effects/effect6317.py
diff --git a/eos/effects/shipbonusemshieldresistancemd2.py b/eos/effects/effect6318.py
similarity index 100%
rename from eos/effects/shipbonusemshieldresistancemd2.py
rename to eos/effects/effect6318.py
diff --git a/eos/effects/shipbonuskineticshieldresistancemd2.py b/eos/effects/effect6319.py
similarity index 100%
rename from eos/effects/shipbonuskineticshieldresistancemd2.py
rename to eos/effects/effect6319.py
diff --git a/eos/effects/shipbonusthermalshieldresistancemd2.py b/eos/effects/effect6320.py
similarity index 100%
rename from eos/effects/shipbonusthermalshieldresistancemd2.py
rename to eos/effects/effect6320.py
diff --git a/eos/effects/shipbonusexplosiveshieldresistancemd2.py b/eos/effects/effect6321.py
similarity index 100%
rename from eos/effects/shipbonusexplosiveshieldresistancemd2.py
rename to eos/effects/effect6321.py
diff --git a/eos/effects/scriptscangravimetricstrengthbonusbonus.py b/eos/effects/effect6322.py
similarity index 100%
rename from eos/effects/scriptscangravimetricstrengthbonusbonus.py
rename to eos/effects/effect6322.py
diff --git a/eos/effects/scriptscanladarstrengthbonusbonus.py b/eos/effects/effect6323.py
similarity index 100%
rename from eos/effects/scriptscanladarstrengthbonusbonus.py
rename to eos/effects/effect6323.py
diff --git a/eos/effects/scriptscanmagnetometricstrengthbonusbonus.py b/eos/effects/effect6324.py
similarity index 100%
rename from eos/effects/scriptscanmagnetometricstrengthbonusbonus.py
rename to eos/effects/effect6324.py
diff --git a/eos/effects/scriptscanradarstrengthbonusbonus.py b/eos/effects/effect6325.py
similarity index 100%
rename from eos/effects/scriptscanradarstrengthbonusbonus.py
rename to eos/effects/effect6325.py
diff --git a/eos/effects/shipbonusthermalmissiledamagecd1.py b/eos/effects/effect6326.py
similarity index 100%
rename from eos/effects/shipbonusthermalmissiledamagecd1.py
rename to eos/effects/effect6326.py
diff --git a/eos/effects/shipbonusemmissiledamagecd1.py b/eos/effects/effect6327.py
similarity index 100%
rename from eos/effects/shipbonusemmissiledamagecd1.py
rename to eos/effects/effect6327.py
diff --git a/eos/effects/shipbonuskineticmissiledamagecd1.py b/eos/effects/effect6328.py
similarity index 100%
rename from eos/effects/shipbonuskineticmissiledamagecd1.py
rename to eos/effects/effect6328.py
diff --git a/eos/effects/shipbonusexplosivemissiledamagecd1.py b/eos/effects/effect6329.py
similarity index 100%
rename from eos/effects/shipbonusexplosivemissiledamagecd1.py
rename to eos/effects/effect6329.py
diff --git a/eos/effects/shipbonusshieldemresistancecd2.py b/eos/effects/effect6330.py
similarity index 100%
rename from eos/effects/shipbonusshieldemresistancecd2.py
rename to eos/effects/effect6330.py
diff --git a/eos/effects/shipbonusshieldthermalresistancecd2.py b/eos/effects/effect6331.py
similarity index 100%
rename from eos/effects/shipbonusshieldthermalresistancecd2.py
rename to eos/effects/effect6331.py
diff --git a/eos/effects/shipbonusshieldkineticresistancecd2.py b/eos/effects/effect6332.py
similarity index 100%
rename from eos/effects/shipbonusshieldkineticresistancecd2.py
rename to eos/effects/effect6332.py
diff --git a/eos/effects/shipbonusshieldexplosiveresistancecd2.py b/eos/effects/effect6333.py
similarity index 100%
rename from eos/effects/shipbonusshieldexplosiveresistancecd2.py
rename to eos/effects/effect6333.py
diff --git a/eos/effects/elitebonuscommanddestroyerinfo1.py b/eos/effects/effect6334.py
similarity index 100%
rename from eos/effects/elitebonuscommanddestroyerinfo1.py
rename to eos/effects/effect6334.py
diff --git a/eos/effects/shipbonuskineticarmorresistancead2.py b/eos/effects/effect6335.py
similarity index 100%
rename from eos/effects/shipbonuskineticarmorresistancead2.py
rename to eos/effects/effect6335.py
diff --git a/eos/effects/shipbonusthermalarmorresistancead2.py b/eos/effects/effect6336.py
similarity index 100%
rename from eos/effects/shipbonusthermalarmorresistancead2.py
rename to eos/effects/effect6336.py
diff --git a/eos/effects/shipbonusemarmorresistancead2.py b/eos/effects/effect6337.py
similarity index 100%
rename from eos/effects/shipbonusemarmorresistancead2.py
rename to eos/effects/effect6337.py
diff --git a/eos/effects/shipbonusexplosivearmorresistancead2.py b/eos/effects/effect6338.py
similarity index 100%
rename from eos/effects/shipbonusexplosivearmorresistancead2.py
rename to eos/effects/effect6338.py
diff --git a/eos/effects/elitebonuscommanddestroyerarmored1.py b/eos/effects/effect6339.py
similarity index 100%
rename from eos/effects/elitebonuscommanddestroyerarmored1.py
rename to eos/effects/effect6339.py
diff --git a/eos/effects/shipbonuskineticarmorresistancegd2.py b/eos/effects/effect6340.py
similarity index 100%
rename from eos/effects/shipbonuskineticarmorresistancegd2.py
rename to eos/effects/effect6340.py
diff --git a/eos/effects/shipbonusemarmorresistancegd2.py b/eos/effects/effect6341.py
similarity index 100%
rename from eos/effects/shipbonusemarmorresistancegd2.py
rename to eos/effects/effect6341.py
diff --git a/eos/effects/shipbonusthermalarmorresistancegd2.py b/eos/effects/effect6342.py
similarity index 100%
rename from eos/effects/shipbonusthermalarmorresistancegd2.py
rename to eos/effects/effect6342.py
diff --git a/eos/effects/shipbonusexplosivearmorresistancegd2.py b/eos/effects/effect6343.py
similarity index 100%
rename from eos/effects/shipbonusexplosivearmorresistancegd2.py
rename to eos/effects/effect6343.py
diff --git a/eos/effects/shipsmallmissilekindmgcf3.py b/eos/effects/effect6350.py
similarity index 100%
rename from eos/effects/shipsmallmissilekindmgcf3.py
rename to eos/effects/effect6350.py
diff --git a/eos/effects/shipmissilekindamagecc3.py b/eos/effects/effect6351.py
similarity index 100%
rename from eos/effects/shipmissilekindamagecc3.py
rename to eos/effects/effect6351.py
diff --git a/eos/effects/rolebonuswdrange.py b/eos/effects/effect6352.py
similarity index 100%
rename from eos/effects/rolebonuswdrange.py
rename to eos/effects/effect6352.py
diff --git a/eos/effects/rolebonuswdcapcpu.py b/eos/effects/effect6353.py
similarity index 100%
rename from eos/effects/rolebonuswdcapcpu.py
rename to eos/effects/effect6353.py
diff --git a/eos/effects/shipbonusewweapondisruptionstrengthaf2.py b/eos/effects/effect6354.py
similarity index 100%
rename from eos/effects/shipbonusewweapondisruptionstrengthaf2.py
rename to eos/effects/effect6354.py
diff --git a/eos/effects/rolebonusecmcapcpu.py b/eos/effects/effect6355.py
similarity index 100%
rename from eos/effects/rolebonusecmcapcpu.py
rename to eos/effects/effect6355.py
diff --git a/eos/effects/rolebonusecmrange.py b/eos/effects/effect6356.py
similarity index 100%
rename from eos/effects/rolebonusecmrange.py
rename to eos/effects/effect6356.py
diff --git a/eos/effects/shipbonusjustscramblerrangegf2.py b/eos/effects/effect6357.py
similarity index 100%
rename from eos/effects/shipbonusjustscramblerrangegf2.py
rename to eos/effects/effect6357.py
diff --git a/eos/effects/rolebonusjustscramblerstrength.py b/eos/effects/effect6358.py
similarity index 100%
rename from eos/effects/rolebonusjustscramblerstrength.py
rename to eos/effects/effect6358.py
diff --git a/eos/effects/shipbonusaoevelocityrocketsmf.py b/eos/effects/effect6359.py
similarity index 100%
rename from eos/effects/shipbonusaoevelocityrocketsmf.py
rename to eos/effects/effect6359.py
diff --git a/eos/effects/shiprocketemthermkindmgmf2.py b/eos/effects/effect6360.py
similarity index 100%
rename from eos/effects/shiprocketemthermkindmgmf2.py
rename to eos/effects/effect6360.py
diff --git a/eos/effects/shiprocketexpdmgmf3.py b/eos/effects/effect6361.py
similarity index 100%
rename from eos/effects/shiprocketexpdmgmf3.py
rename to eos/effects/effect6361.py
diff --git a/eos/effects/rolebonusstasisrange.py b/eos/effects/effect6362.py
similarity index 100%
rename from eos/effects/rolebonusstasisrange.py
rename to eos/effects/effect6362.py
diff --git a/eos/effects/shieldtransporterfalloffbonus.py b/eos/effects/effect6368.py
similarity index 100%
rename from eos/effects/shieldtransporterfalloffbonus.py
rename to eos/effects/effect6368.py
diff --git a/eos/effects/shipshieldtransferfalloffmc2.py b/eos/effects/effect6369.py
similarity index 100%
rename from eos/effects/shipshieldtransferfalloffmc2.py
rename to eos/effects/effect6369.py
diff --git a/eos/effects/shipshieldtransferfalloffcc1.py b/eos/effects/effect6370.py
similarity index 100%
rename from eos/effects/shipshieldtransferfalloffcc1.py
rename to eos/effects/effect6370.py
diff --git a/eos/effects/shipremotearmorfalloffgc1.py b/eos/effects/effect6371.py
similarity index 100%
rename from eos/effects/shipremotearmorfalloffgc1.py
rename to eos/effects/effect6371.py
diff --git a/eos/effects/shipremotearmorfalloffac2.py b/eos/effects/effect6372.py
similarity index 100%
rename from eos/effects/shipremotearmorfalloffac2.py
rename to eos/effects/effect6372.py
diff --git a/eos/effects/armorrepairprojectorfalloffbonus.py b/eos/effects/effect6373.py
similarity index 100%
rename from eos/effects/armorrepairprojectorfalloffbonus.py
rename to eos/effects/effect6373.py
diff --git a/eos/effects/dronehullrepairbonuseffect.py b/eos/effects/effect6374.py
similarity index 100%
rename from eos/effects/dronehullrepairbonuseffect.py
rename to eos/effects/effect6374.py
diff --git a/eos/effects/elitebonuslogifrigarmorrepspeedcap1.py b/eos/effects/effect6377.py
similarity index 100%
rename from eos/effects/elitebonuslogifrigarmorrepspeedcap1.py
rename to eos/effects/effect6377.py
diff --git a/eos/effects/elitebonuslogifrigshieldrepspeedcap1.py b/eos/effects/effect6378.py
similarity index 100%
rename from eos/effects/elitebonuslogifrigshieldrepspeedcap1.py
rename to eos/effects/effect6378.py
diff --git a/eos/effects/elitebonuslogifrigarmorhp2.py b/eos/effects/effect6379.py
similarity index 100%
rename from eos/effects/elitebonuslogifrigarmorhp2.py
rename to eos/effects/effect6379.py
diff --git a/eos/effects/elitebonuslogifrigshieldhp2.py b/eos/effects/effect6380.py
similarity index 100%
rename from eos/effects/elitebonuslogifrigshieldhp2.py
rename to eos/effects/effect6380.py
diff --git a/eos/effects/elitebonuslogifrigsignature2.py b/eos/effects/effect6381.py
similarity index 100%
rename from eos/effects/elitebonuslogifrigsignature2.py
rename to eos/effects/effect6381.py
diff --git a/eos/effects/overloadselfmissileguidancemodulebonus.py b/eos/effects/effect6384.py
similarity index 100%
rename from eos/effects/overloadselfmissileguidancemodulebonus.py
rename to eos/effects/effect6384.py
diff --git a/eos/effects/ignorecloakvelocitypenalty.py b/eos/effects/effect6385.py
similarity index 100%
rename from eos/effects/ignorecloakvelocitypenalty.py
rename to eos/effects/effect6385.py
diff --git a/eos/effects/ewskillguidancedisruptionbonus.py b/eos/effects/effect6386.py
similarity index 100%
rename from eos/effects/ewskillguidancedisruptionbonus.py
rename to eos/effects/effect6386.py
diff --git a/eos/effects/shipbonusewweapondisruptionstrengthac1.py b/eos/effects/effect6395.py
similarity index 100%
rename from eos/effects/shipbonusewweapondisruptionstrengthac1.py
rename to eos/effects/effect6395.py
diff --git a/eos/effects/skillstructuremissiledamagebonus.py b/eos/effects/effect6396.py
similarity index 100%
rename from eos/effects/skillstructuremissiledamagebonus.py
rename to eos/effects/effect6396.py
diff --git a/eos/effects/skillstructureelectronicsystemscapneedbonus.py b/eos/effects/effect6400.py
similarity index 100%
rename from eos/effects/skillstructureelectronicsystemscapneedbonus.py
rename to eos/effects/effect6400.py
diff --git a/eos/effects/skillstructureengineeringsystemscapneedbonus.py b/eos/effects/effect6401.py
similarity index 100%
rename from eos/effects/skillstructureengineeringsystemscapneedbonus.py
rename to eos/effects/effect6401.py
diff --git a/eos/effects/structurerigaoevelocitybonussingletargetmissiles.py b/eos/effects/effect6402.py
similarity index 100%
rename from eos/effects/structurerigaoevelocitybonussingletargetmissiles.py
rename to eos/effects/effect6402.py
diff --git a/eos/effects/structurerigvelocitybonussingletargetmissiles.py b/eos/effects/effect6403.py
similarity index 100%
rename from eos/effects/structurerigvelocitybonussingletargetmissiles.py
rename to eos/effects/effect6403.py
diff --git a/eos/effects/structurerigneutralizermaxrangefalloffeffectiveness.py b/eos/effects/effect6404.py
similarity index 100%
rename from eos/effects/structurerigneutralizermaxrangefalloffeffectiveness.py
rename to eos/effects/effect6404.py
diff --git a/eos/effects/structurerigneutralizercapacitorneed.py b/eos/effects/effect6405.py
similarity index 100%
rename from eos/effects/structurerigneutralizercapacitorneed.py
rename to eos/effects/effect6405.py
diff --git a/eos/effects/structurerigewmaxrangefalloff.py b/eos/effects/effect6406.py
similarity index 100%
rename from eos/effects/structurerigewmaxrangefalloff.py
rename to eos/effects/effect6406.py
diff --git a/eos/effects/structurerigewcapacitorneed.py b/eos/effects/effect6407.py
similarity index 100%
rename from eos/effects/structurerigewcapacitorneed.py
rename to eos/effects/effect6407.py
diff --git a/eos/effects/structurerigmaxtargets.py b/eos/effects/effect6408.py
similarity index 100%
rename from eos/effects/structurerigmaxtargets.py
rename to eos/effects/effect6408.py
diff --git a/eos/effects/structurerigsensorresolution.py b/eos/effects/effect6409.py
similarity index 100%
rename from eos/effects/structurerigsensorresolution.py
rename to eos/effects/effect6409.py
diff --git a/eos/effects/structurerigexplosionradiusbonusaoemissiles.py b/eos/effects/effect6410.py
similarity index 100%
rename from eos/effects/structurerigexplosionradiusbonusaoemissiles.py
rename to eos/effects/effect6410.py
diff --git a/eos/effects/structurerigvelocitybonusaoemissiles.py b/eos/effects/effect6411.py
similarity index 100%
rename from eos/effects/structurerigvelocitybonusaoemissiles.py
rename to eos/effects/effect6411.py
diff --git a/eos/effects/structurerigpdbmaxrange.py b/eos/effects/effect6412.py
similarity index 100%
rename from eos/effects/structurerigpdbmaxrange.py
rename to eos/effects/effect6412.py
diff --git a/eos/effects/structurerigpdbcapacitorneed.py b/eos/effects/effect6413.py
similarity index 100%
rename from eos/effects/structurerigpdbcapacitorneed.py
rename to eos/effects/effect6413.py
diff --git a/eos/effects/structurerigdoomsdaydamageloss.py b/eos/effects/effect6417.py
similarity index 100%
rename from eos/effects/structurerigdoomsdaydamageloss.py
rename to eos/effects/effect6417.py
diff --git a/eos/effects/remotesensordampfalloff.py b/eos/effects/effect6422.py
similarity index 100%
rename from eos/effects/remotesensordampfalloff.py
rename to eos/effects/effect6422.py
diff --git a/eos/effects/shipmoduleguidancedisruptor.py b/eos/effects/effect6423.py
similarity index 100%
rename from eos/effects/shipmoduleguidancedisruptor.py
rename to eos/effects/effect6423.py
diff --git a/eos/effects/shipmoduletrackingdisruptor.py b/eos/effects/effect6424.py
similarity index 100%
rename from eos/effects/shipmoduletrackingdisruptor.py
rename to eos/effects/effect6424.py
diff --git a/eos/effects/remotetargetpaintfalloff.py b/eos/effects/effect6425.py
similarity index 100%
rename from eos/effects/remotetargetpaintfalloff.py
rename to eos/effects/effect6425.py
diff --git a/eos/effects/remotewebifierfalloff.py b/eos/effects/effect6426.py
similarity index 100%
rename from eos/effects/remotewebifierfalloff.py
rename to eos/effects/effect6426.py
diff --git a/eos/effects/remotesensorboostfalloff.py b/eos/effects/effect6427.py
similarity index 100%
rename from eos/effects/remotesensorboostfalloff.py
rename to eos/effects/effect6427.py
diff --git a/eos/effects/shipmoduleremotetrackingcomputer.py b/eos/effects/effect6428.py
similarity index 100%
rename from eos/effects/shipmoduleremotetrackingcomputer.py
rename to eos/effects/effect6428.py
diff --git a/eos/effects/fighterabilitymissiles.py b/eos/effects/effect6431.py
similarity index 100%
rename from eos/effects/fighterabilitymissiles.py
rename to eos/effects/effect6431.py
diff --git a/eos/effects/fighterabilityenergyneutralizer.py b/eos/effects/effect6434.py
similarity index 100%
rename from eos/effects/fighterabilityenergyneutralizer.py
rename to eos/effects/effect6434.py
diff --git a/eos/effects/fighterabilitystasiswebifier.py b/eos/effects/effect6435.py
similarity index 100%
rename from eos/effects/fighterabilitystasiswebifier.py
rename to eos/effects/effect6435.py
diff --git a/eos/effects/fighterabilitywarpdisruption.py b/eos/effects/effect6436.py
similarity index 100%
rename from eos/effects/fighterabilitywarpdisruption.py
rename to eos/effects/effect6436.py
diff --git a/eos/effects/fighterabilityecm.py b/eos/effects/effect6437.py
similarity index 100%
rename from eos/effects/fighterabilityecm.py
rename to eos/effects/effect6437.py
diff --git a/eos/effects/fighterabilityevasivemaneuvers.py b/eos/effects/effect6439.py
similarity index 100%
rename from eos/effects/fighterabilityevasivemaneuvers.py
rename to eos/effects/effect6439.py
diff --git a/eos/effects/fighterabilitymicrowarpdrive.py b/eos/effects/effect6441.py
similarity index 100%
rename from eos/effects/fighterabilitymicrowarpdrive.py
rename to eos/effects/effect6441.py
diff --git a/eos/effects/pointdefense.py b/eos/effects/effect6443.py
similarity index 100%
rename from eos/effects/pointdefense.py
rename to eos/effects/effect6443.py
diff --git a/eos/effects/lightningweapon.py b/eos/effects/effect6447.py
similarity index 100%
rename from eos/effects/lightningweapon.py
rename to eos/effects/effect6447.py
diff --git a/eos/effects/structuremissileguidanceenhancer.py b/eos/effects/effect6448.py
similarity index 100%
rename from eos/effects/structuremissileguidanceenhancer.py
rename to eos/effects/effect6448.py
diff --git a/eos/effects/structureballisticcontrolsystem.py b/eos/effects/effect6449.py
similarity index 100%
rename from eos/effects/structureballisticcontrolsystem.py
rename to eos/effects/effect6449.py
diff --git a/eos/effects/fighterabilityattackm.py b/eos/effects/effect6465.py
similarity index 100%
rename from eos/effects/fighterabilityattackm.py
rename to eos/effects/effect6465.py
diff --git a/eos/effects/remoteecmfalloff.py b/eos/effects/effect6470.py
similarity index 100%
rename from eos/effects/remoteecmfalloff.py
rename to eos/effects/effect6470.py
diff --git a/eos/effects/doomsdaybeamdot.py b/eos/effects/effect6472.py
similarity index 100%
rename from eos/effects/doomsdaybeamdot.py
rename to eos/effects/effect6472.py
diff --git a/eos/effects/doomsdayconedot.py b/eos/effects/effect6473.py
similarity index 100%
rename from eos/effects/doomsdayconedot.py
rename to eos/effects/effect6473.py
diff --git a/eos/effects/doomsdayhog.py b/eos/effects/effect6474.py
similarity index 100%
rename from eos/effects/doomsdayhog.py
rename to eos/effects/effect6474.py
diff --git a/eos/effects/structurerigdoomsdaytargetamountbonus.py b/eos/effects/effect6475.py
similarity index 100%
rename from eos/effects/structurerigdoomsdaytargetamountbonus.py
rename to eos/effects/effect6475.py
diff --git a/eos/effects/doomsdayaoeweb.py b/eos/effects/effect6476.py
similarity index 100%
rename from eos/effects/doomsdayaoeweb.py
rename to eos/effects/effect6476.py
diff --git a/eos/effects/doomsdayaoeneut.py b/eos/effects/effect6477.py
similarity index 100%
rename from eos/effects/doomsdayaoeneut.py
rename to eos/effects/effect6477.py
diff --git a/eos/effects/doomsdayaoepaint.py b/eos/effects/effect6478.py
similarity index 100%
rename from eos/effects/doomsdayaoepaint.py
rename to eos/effects/effect6478.py
diff --git a/eos/effects/doomsdayaoetrack.py b/eos/effects/effect6479.py
similarity index 100%
rename from eos/effects/doomsdayaoetrack.py
rename to eos/effects/effect6479.py
diff --git a/eos/effects/doomsdayaoedamp.py b/eos/effects/effect6481.py
similarity index 100%
rename from eos/effects/doomsdayaoedamp.py
rename to eos/effects/effect6481.py
diff --git a/eos/effects/doomsdayaoebubble.py b/eos/effects/effect6482.py
similarity index 100%
rename from eos/effects/doomsdayaoebubble.py
rename to eos/effects/effect6482.py
diff --git a/eos/effects/emergencyhullenergizer.py b/eos/effects/effect6484.py
similarity index 100%
rename from eos/effects/emergencyhullenergizer.py
rename to eos/effects/effect6484.py
diff --git a/eos/effects/fighterabilitylaunchbomb.py b/eos/effects/effect6485.py
similarity index 100%
rename from eos/effects/fighterabilitylaunchbomb.py
rename to eos/effects/effect6485.py
diff --git a/eos/effects/modifyenergywarfareresistance.py b/eos/effects/effect6487.py
similarity index 100%
rename from eos/effects/modifyenergywarfareresistance.py
rename to eos/effects/effect6487.py
diff --git a/eos/effects/scriptsensorboostersensorstrengthbonusbonus.py b/eos/effects/effect6488.py
similarity index 100%
rename from eos/effects/scriptsensorboostersensorstrengthbonusbonus.py
rename to eos/effects/effect6488.py
diff --git a/eos/effects/shipbonusdreadnoughta1damagebonus.py b/eos/effects/effect6501.py
similarity index 100%
rename from eos/effects/shipbonusdreadnoughta1damagebonus.py
rename to eos/effects/effect6501.py
diff --git a/eos/effects/shipbonusdreadnoughta2armorresists.py b/eos/effects/effect6502.py
similarity index 100%
rename from eos/effects/shipbonusdreadnoughta2armorresists.py
rename to eos/effects/effect6502.py
diff --git a/eos/effects/shipbonusdreadnoughta3capneed.py b/eos/effects/effect6503.py
similarity index 100%
rename from eos/effects/shipbonusdreadnoughta3capneed.py
rename to eos/effects/effect6503.py
diff --git a/eos/effects/shipbonusdreadnoughtc1damagebonus.py b/eos/effects/effect6504.py
similarity index 100%
rename from eos/effects/shipbonusdreadnoughtc1damagebonus.py
rename to eos/effects/effect6504.py
diff --git a/eos/effects/shipbonusdreadnoughtc2shieldresists.py b/eos/effects/effect6505.py
similarity index 100%
rename from eos/effects/shipbonusdreadnoughtc2shieldresists.py
rename to eos/effects/effect6505.py
diff --git a/eos/effects/shipbonusdreadnoughtg1damagebonus.py b/eos/effects/effect6506.py
similarity index 100%
rename from eos/effects/shipbonusdreadnoughtg1damagebonus.py
rename to eos/effects/effect6506.py
diff --git a/eos/effects/shipbonusdreadnoughtg2rofbonus.py b/eos/effects/effect6507.py
similarity index 100%
rename from eos/effects/shipbonusdreadnoughtg2rofbonus.py
rename to eos/effects/effect6507.py
diff --git a/eos/effects/shipbonusdreadnoughtg3repairtime.py b/eos/effects/effect6508.py
similarity index 100%
rename from eos/effects/shipbonusdreadnoughtg3repairtime.py
rename to eos/effects/effect6508.py
diff --git a/eos/effects/shipbonusdreadnoughtm1damagebonus.py b/eos/effects/effect6509.py
similarity index 100%
rename from eos/effects/shipbonusdreadnoughtm1damagebonus.py
rename to eos/effects/effect6509.py
diff --git a/eos/effects/shipbonusdreadnoughtm2rofbonus.py b/eos/effects/effect6510.py
similarity index 100%
rename from eos/effects/shipbonusdreadnoughtm2rofbonus.py
rename to eos/effects/effect6510.py
diff --git a/eos/effects/shipbonusdreadnoughtm3repairtime.py b/eos/effects/effect6511.py
similarity index 100%
rename from eos/effects/shipbonusdreadnoughtm3repairtime.py
rename to eos/effects/effect6511.py
diff --git a/eos/effects/doomsdayaoeecm.py b/eos/effects/effect6513.py
similarity index 100%
rename from eos/effects/doomsdayaoeecm.py
rename to eos/effects/effect6513.py
diff --git a/eos/effects/shipbonusforceauxiliarya1remoterepairandcapamount.py b/eos/effects/effect6526.py
similarity index 100%
rename from eos/effects/shipbonusforceauxiliarya1remoterepairandcapamount.py
rename to eos/effects/effect6526.py
diff --git a/eos/effects/shipbonusforceauxiliarya2armorresists.py b/eos/effects/effect6527.py
similarity index 100%
rename from eos/effects/shipbonusforceauxiliarya2armorresists.py
rename to eos/effects/effect6527.py
diff --git a/eos/effects/shipbonusforceauxiliarya4warfarelinksbonus.py b/eos/effects/effect6533.py
similarity index 100%
rename from eos/effects/shipbonusforceauxiliarya4warfarelinksbonus.py
rename to eos/effects/effect6533.py
diff --git a/eos/effects/shipbonusforceauxiliarym4warfarelinksbonus.py b/eos/effects/effect6534.py
similarity index 100%
rename from eos/effects/shipbonusforceauxiliarym4warfarelinksbonus.py
rename to eos/effects/effect6534.py
diff --git a/eos/effects/shipbonusforceauxiliaryg4warfarelinksbonus.py b/eos/effects/effect6535.py
similarity index 100%
rename from eos/effects/shipbonusforceauxiliaryg4warfarelinksbonus.py
rename to eos/effects/effect6535.py
diff --git a/eos/effects/shipbonusforceauxiliaryc4warfarelinksbonus.py b/eos/effects/effect6536.py
similarity index 100%
rename from eos/effects/shipbonusforceauxiliaryc4warfarelinksbonus.py
rename to eos/effects/effect6536.py
diff --git a/eos/effects/shipbonusrole1commandburstcpubonus.py b/eos/effects/effect6537.py
similarity index 100%
rename from eos/effects/shipbonusrole1commandburstcpubonus.py
rename to eos/effects/effect6537.py
diff --git a/eos/effects/shipbonusforceauxiliaryc1remoteboostandcapamount.py b/eos/effects/effect6545.py
similarity index 100%
rename from eos/effects/shipbonusforceauxiliaryc1remoteboostandcapamount.py
rename to eos/effects/effect6545.py
diff --git a/eos/effects/shipbonusforceauxiliaryc2shieldresists.py b/eos/effects/effect6546.py
similarity index 100%
rename from eos/effects/shipbonusforceauxiliaryc2shieldresists.py
rename to eos/effects/effect6546.py
diff --git a/eos/effects/shipbonusforceauxiliaryg1remotecycletime.py b/eos/effects/effect6548.py
similarity index 100%
rename from eos/effects/shipbonusforceauxiliaryg1remotecycletime.py
rename to eos/effects/effect6548.py
diff --git a/eos/effects/shipbonusforceauxiliaryg2localrepairamount.py b/eos/effects/effect6549.py
similarity index 100%
rename from eos/effects/shipbonusforceauxiliaryg2localrepairamount.py
rename to eos/effects/effect6549.py
diff --git a/eos/effects/shipbonusforceauxiliarym1remoteduration.py b/eos/effects/effect6551.py
similarity index 100%
rename from eos/effects/shipbonusforceauxiliarym1remoteduration.py
rename to eos/effects/effect6551.py
diff --git a/eos/effects/shipbonusforceauxiliarym2localboostamount.py b/eos/effects/effect6552.py
similarity index 100%
rename from eos/effects/shipbonusforceauxiliarym2localboostamount.py
rename to eos/effects/effect6552.py
diff --git a/eos/effects/modulebonusdronenavigationcomputer.py b/eos/effects/effect6555.py
similarity index 100%
rename from eos/effects/modulebonusdronenavigationcomputer.py
rename to eos/effects/effect6555.py
diff --git a/eos/effects/modulebonusdronedamageamplifier.py b/eos/effects/effect6556.py
similarity index 100%
rename from eos/effects/modulebonusdronedamageamplifier.py
rename to eos/effects/effect6556.py
diff --git a/eos/effects/modulebonusomnidirectionaltrackinglink.py b/eos/effects/effect6557.py
similarity index 100%
rename from eos/effects/modulebonusomnidirectionaltrackinglink.py
rename to eos/effects/effect6557.py
diff --git a/eos/effects/modulebonusomnidirectionaltrackinglinkoverload.py b/eos/effects/effect6558.py
similarity index 100%
rename from eos/effects/modulebonusomnidirectionaltrackinglinkoverload.py
rename to eos/effects/effect6558.py
diff --git a/eos/effects/modulebonusomnidirectionaltrackingenhancer.py b/eos/effects/effect6559.py
similarity index 100%
rename from eos/effects/modulebonusomnidirectionaltrackingenhancer.py
rename to eos/effects/effect6559.py
diff --git a/eos/effects/skillbonusfighters.py b/eos/effects/effect6560.py
similarity index 100%
rename from eos/effects/skillbonusfighters.py
rename to eos/effects/effect6560.py
diff --git a/eos/effects/skillbonuslightfighters.py b/eos/effects/effect6561.py
similarity index 100%
rename from eos/effects/skillbonuslightfighters.py
rename to eos/effects/effect6561.py
diff --git a/eos/effects/skillbonussupportfightersshield.py b/eos/effects/effect6562.py
similarity index 100%
rename from eos/effects/skillbonussupportfightersshield.py
rename to eos/effects/effect6562.py
diff --git a/eos/effects/skillbonusheavyfighters.py b/eos/effects/effect6563.py
similarity index 100%
rename from eos/effects/skillbonusheavyfighters.py
rename to eos/effects/effect6563.py
diff --git a/eos/effects/citadelrigbonus.py b/eos/effects/effect6565.py
similarity index 100%
rename from eos/effects/citadelrigbonus.py
rename to eos/effects/effect6565.py
diff --git a/eos/effects/modulebonusfightersupportunit.py b/eos/effects/effect6566.py
similarity index 100%
rename from eos/effects/modulebonusfightersupportunit.py
rename to eos/effects/effect6566.py
diff --git a/eos/effects/modulebonusnetworkedsensorarray.py b/eos/effects/effect6567.py
similarity index 100%
rename from eos/effects/modulebonusnetworkedsensorarray.py
rename to eos/effects/effect6567.py
diff --git a/eos/effects/agilitymultipliereffect.py b/eos/effects/effect657.py
similarity index 100%
rename from eos/effects/agilitymultipliereffect.py
rename to eos/effects/effect657.py
diff --git a/eos/effects/skillbonusfighterhangarmanagement.py b/eos/effects/effect6570.py
similarity index 100%
rename from eos/effects/skillbonusfighterhangarmanagement.py
rename to eos/effects/effect6570.py
diff --git a/eos/effects/skillbonuscapitalautocannonspecialization.py b/eos/effects/effect6571.py
similarity index 100%
rename from eos/effects/skillbonuscapitalautocannonspecialization.py
rename to eos/effects/effect6571.py
diff --git a/eos/effects/skillbonuscapitalartilleryspecialization.py b/eos/effects/effect6572.py
similarity index 100%
rename from eos/effects/skillbonuscapitalartilleryspecialization.py
rename to eos/effects/effect6572.py
diff --git a/eos/effects/skillbonuscapitalblasterspecialization.py b/eos/effects/effect6573.py
similarity index 100%
rename from eos/effects/skillbonuscapitalblasterspecialization.py
rename to eos/effects/effect6573.py
diff --git a/eos/effects/skillbonuscapitalrailgunspecialization.py b/eos/effects/effect6574.py
similarity index 100%
rename from eos/effects/skillbonuscapitalrailgunspecialization.py
rename to eos/effects/effect6574.py
diff --git a/eos/effects/skillbonuscapitalpulselaserspecialization.py b/eos/effects/effect6575.py
similarity index 100%
rename from eos/effects/skillbonuscapitalpulselaserspecialization.py
rename to eos/effects/effect6575.py
diff --git a/eos/effects/skillbonuscapitalbeamlaserspecialization.py b/eos/effects/effect6576.py
similarity index 100%
rename from eos/effects/skillbonuscapitalbeamlaserspecialization.py
rename to eos/effects/effect6576.py
diff --git a/eos/effects/skillbonusxlcruisemissilespecialization.py b/eos/effects/effect6577.py
similarity index 100%
rename from eos/effects/skillbonusxlcruisemissilespecialization.py
rename to eos/effects/effect6577.py
diff --git a/eos/effects/skillbonusxltorpedospecialization.py b/eos/effects/effect6578.py
similarity index 100%
rename from eos/effects/skillbonusxltorpedospecialization.py
rename to eos/effects/effect6578.py
diff --git a/eos/effects/shipbonusrole2logisticdronerepamountbonus.py b/eos/effects/effect6580.py
similarity index 100%
rename from eos/effects/shipbonusrole2logisticdronerepamountbonus.py
rename to eos/effects/effect6580.py
diff --git a/eos/effects/modulebonustriagemodule.py b/eos/effects/effect6581.py
similarity index 100%
rename from eos/effects/modulebonustriagemodule.py
rename to eos/effects/effect6581.py
diff --git a/eos/effects/modulebonussiegemodule.py b/eos/effects/effect6582.py
similarity index 100%
rename from eos/effects/modulebonussiegemodule.py
rename to eos/effects/effect6582.py
diff --git a/eos/effects/shipbonussupercarriera3warpstrength.py b/eos/effects/effect6591.py
similarity index 100%
rename from eos/effects/shipbonussupercarriera3warpstrength.py
rename to eos/effects/effect6591.py
diff --git a/eos/effects/shipbonussupercarrierc3warpstrength.py b/eos/effects/effect6592.py
similarity index 100%
rename from eos/effects/shipbonussupercarrierc3warpstrength.py
rename to eos/effects/effect6592.py
diff --git a/eos/effects/shipbonussupercarrierg3warpstrength.py b/eos/effects/effect6593.py
similarity index 100%
rename from eos/effects/shipbonussupercarrierg3warpstrength.py
rename to eos/effects/effect6593.py
diff --git a/eos/effects/shipbonussupercarrierm3warpstrength.py b/eos/effects/effect6594.py
similarity index 100%
rename from eos/effects/shipbonussupercarrierm3warpstrength.py
rename to eos/effects/effect6594.py
diff --git a/eos/effects/shipbonuscarriera4warfarelinksbonus.py b/eos/effects/effect6595.py
similarity index 100%
rename from eos/effects/shipbonuscarriera4warfarelinksbonus.py
rename to eos/effects/effect6595.py
diff --git a/eos/effects/shipbonuscarrierc4warfarelinksbonus.py b/eos/effects/effect6596.py
similarity index 100%
rename from eos/effects/shipbonuscarrierc4warfarelinksbonus.py
rename to eos/effects/effect6596.py
diff --git a/eos/effects/shipbonuscarrierg4warfarelinksbonus.py b/eos/effects/effect6597.py
similarity index 100%
rename from eos/effects/shipbonuscarrierg4warfarelinksbonus.py
rename to eos/effects/effect6597.py
diff --git a/eos/effects/shipbonuscarrierm4warfarelinksbonus.py b/eos/effects/effect6598.py
similarity index 100%
rename from eos/effects/shipbonuscarrierm4warfarelinksbonus.py
rename to eos/effects/effect6598.py
diff --git a/eos/effects/shipbonuscarriera1armorresists.py b/eos/effects/effect6599.py
similarity index 100%
rename from eos/effects/shipbonuscarriera1armorresists.py
rename to eos/effects/effect6599.py
diff --git a/eos/effects/missileemdmgbonus.py b/eos/effects/effect660.py
similarity index 100%
rename from eos/effects/missileemdmgbonus.py
rename to eos/effects/effect660.py
diff --git a/eos/effects/shipbonuscarrierc1shieldresists.py b/eos/effects/effect6600.py
similarity index 100%
rename from eos/effects/shipbonuscarrierc1shieldresists.py
rename to eos/effects/effect6600.py
diff --git a/eos/effects/shipbonuscarrierg1fighterdamage.py b/eos/effects/effect6601.py
similarity index 100%
rename from eos/effects/shipbonuscarrierg1fighterdamage.py
rename to eos/effects/effect6601.py
diff --git a/eos/effects/shipbonuscarrierm1fighterdamage.py b/eos/effects/effect6602.py
similarity index 100%
rename from eos/effects/shipbonuscarrierm1fighterdamage.py
rename to eos/effects/effect6602.py
diff --git a/eos/effects/shipbonussupercarriera1fighterdamage.py b/eos/effects/effect6603.py
similarity index 100%
rename from eos/effects/shipbonussupercarriera1fighterdamage.py
rename to eos/effects/effect6603.py
diff --git a/eos/effects/shipbonussupercarrierc1fighterdamage.py b/eos/effects/effect6604.py
similarity index 100%
rename from eos/effects/shipbonussupercarrierc1fighterdamage.py
rename to eos/effects/effect6604.py
diff --git a/eos/effects/shipbonussupercarrierg1fighterdamage.py b/eos/effects/effect6605.py
similarity index 100%
rename from eos/effects/shipbonussupercarrierg1fighterdamage.py
rename to eos/effects/effect6605.py
diff --git a/eos/effects/shipbonussupercarrierm1fighterdamage.py b/eos/effects/effect6606.py
similarity index 100%
rename from eos/effects/shipbonussupercarrierm1fighterdamage.py
rename to eos/effects/effect6606.py
diff --git a/eos/effects/shipbonussupercarriera5warfarelinksbonus.py b/eos/effects/effect6607.py
similarity index 100%
rename from eos/effects/shipbonussupercarriera5warfarelinksbonus.py
rename to eos/effects/effect6607.py
diff --git a/eos/effects/shipbonussupercarrierc5warfarelinksbonus.py b/eos/effects/effect6608.py
similarity index 100%
rename from eos/effects/shipbonussupercarrierc5warfarelinksbonus.py
rename to eos/effects/effect6608.py
diff --git a/eos/effects/shipbonussupercarrierg5warfarelinksbonus.py b/eos/effects/effect6609.py
similarity index 100%
rename from eos/effects/shipbonussupercarrierg5warfarelinksbonus.py
rename to eos/effects/effect6609.py
diff --git a/eos/effects/missileexplosivedmgbonus.py b/eos/effects/effect661.py
similarity index 100%
rename from eos/effects/missileexplosivedmgbonus.py
rename to eos/effects/effect661.py
diff --git a/eos/effects/shipbonussupercarrierm5warfarelinksbonus.py b/eos/effects/effect6610.py
similarity index 100%
rename from eos/effects/shipbonussupercarrierm5warfarelinksbonus.py
rename to eos/effects/effect6610.py
diff --git a/eos/effects/shipbonussupercarrierc2afterburnerbonus.py b/eos/effects/effect6611.py
similarity index 100%
rename from eos/effects/shipbonussupercarrierc2afterburnerbonus.py
rename to eos/effects/effect6611.py
diff --git a/eos/effects/shipbonussupercarriera2fighterapplicationbonus.py b/eos/effects/effect6612.py
similarity index 100%
rename from eos/effects/shipbonussupercarriera2fighterapplicationbonus.py
rename to eos/effects/effect6612.py
diff --git a/eos/effects/shipbonussupercarrierrole1numwarfarelinks.py b/eos/effects/effect6613.py
similarity index 100%
rename from eos/effects/shipbonussupercarrierrole1numwarfarelinks.py
rename to eos/effects/effect6613.py
diff --git a/eos/effects/shipbonussupercarrierrole2armorshieldmodulebonus.py b/eos/effects/effect6614.py
similarity index 100%
rename from eos/effects/shipbonussupercarrierrole2armorshieldmodulebonus.py
rename to eos/effects/effect6614.py
diff --git a/eos/effects/shipbonussupercarriera4burstprojectorbonus.py b/eos/effects/effect6615.py
similarity index 100%
rename from eos/effects/shipbonussupercarriera4burstprojectorbonus.py
rename to eos/effects/effect6615.py
diff --git a/eos/effects/shipbonussupercarrierc4burstprojectorbonus.py b/eos/effects/effect6616.py
similarity index 100%
rename from eos/effects/shipbonussupercarrierc4burstprojectorbonus.py
rename to eos/effects/effect6616.py
diff --git a/eos/effects/shipbonussupercarrierg4burstprojectorbonus.py b/eos/effects/effect6617.py
similarity index 100%
rename from eos/effects/shipbonussupercarrierg4burstprojectorbonus.py
rename to eos/effects/effect6617.py
diff --git a/eos/effects/shipbonussupercarrierm4burstprojectorbonus.py b/eos/effects/effect6618.py
similarity index 100%
rename from eos/effects/shipbonussupercarrierm4burstprojectorbonus.py
rename to eos/effects/effect6618.py
diff --git a/eos/effects/shipbonuscarrierrole1numwarfarelinks.py b/eos/effects/effect6619.py
similarity index 100%
rename from eos/effects/shipbonuscarrierrole1numwarfarelinks.py
rename to eos/effects/effect6619.py
diff --git a/eos/effects/missilethermaldmgbonus.py b/eos/effects/effect662.py
similarity index 100%
rename from eos/effects/missilethermaldmgbonus.py
rename to eos/effects/effect662.py
diff --git a/eos/effects/shipbonusdreadnoughtc3reloadbonus.py b/eos/effects/effect6620.py
similarity index 100%
rename from eos/effects/shipbonusdreadnoughtc3reloadbonus.py
rename to eos/effects/effect6620.py
diff --git a/eos/effects/shipbonussupercarriera2armorresists.py b/eos/effects/effect6621.py
similarity index 100%
rename from eos/effects/shipbonussupercarriera2armorresists.py
rename to eos/effects/effect6621.py
diff --git a/eos/effects/shipbonussupercarrierc2shieldresists.py b/eos/effects/effect6622.py
similarity index 100%
rename from eos/effects/shipbonussupercarrierc2shieldresists.py
rename to eos/effects/effect6622.py
diff --git a/eos/effects/shipbonussupercarrierg2fighterhitpoints.py b/eos/effects/effect6623.py
similarity index 100%
rename from eos/effects/shipbonussupercarrierg2fighterhitpoints.py
rename to eos/effects/effect6623.py
diff --git a/eos/effects/shipbonussupercarrierm2fightervelocity.py b/eos/effects/effect6624.py
similarity index 100%
rename from eos/effects/shipbonussupercarrierm2fightervelocity.py
rename to eos/effects/effect6624.py
diff --git a/eos/effects/shipbonuscarriera2supportfighterbonus.py b/eos/effects/effect6625.py
similarity index 100%
rename from eos/effects/shipbonuscarriera2supportfighterbonus.py
rename to eos/effects/effect6625.py
diff --git a/eos/effects/shipbonuscarrierc2supportfighterbonus.py b/eos/effects/effect6626.py
similarity index 100%
rename from eos/effects/shipbonuscarrierc2supportfighterbonus.py
rename to eos/effects/effect6626.py
diff --git a/eos/effects/shipbonuscarrierg2supportfighterbonus.py b/eos/effects/effect6627.py
similarity index 100%
rename from eos/effects/shipbonuscarrierg2supportfighterbonus.py
rename to eos/effects/effect6627.py
diff --git a/eos/effects/shipbonuscarrierm2supportfighterbonus.py b/eos/effects/effect6628.py
similarity index 100%
rename from eos/effects/shipbonuscarrierm2supportfighterbonus.py
rename to eos/effects/effect6628.py
diff --git a/eos/effects/scriptresistancebonusbonus.py b/eos/effects/effect6629.py
similarity index 100%
rename from eos/effects/scriptresistancebonusbonus.py
rename to eos/effects/effect6629.py
diff --git a/eos/effects/shipbonustitana1damagebonus.py b/eos/effects/effect6634.py
similarity index 100%
rename from eos/effects/shipbonustitana1damagebonus.py
rename to eos/effects/effect6634.py
diff --git a/eos/effects/shipbonustitanc1kindamagebonus.py b/eos/effects/effect6635.py
similarity index 100%
rename from eos/effects/shipbonustitanc1kindamagebonus.py
rename to eos/effects/effect6635.py
diff --git a/eos/effects/shipbonustitang1damagebonus.py b/eos/effects/effect6636.py
similarity index 100%
rename from eos/effects/shipbonustitang1damagebonus.py
rename to eos/effects/effect6636.py
diff --git a/eos/effects/shipbonustitanm1damagebonus.py b/eos/effects/effect6637.py
similarity index 100%
rename from eos/effects/shipbonustitanm1damagebonus.py
rename to eos/effects/effect6637.py
diff --git a/eos/effects/shipbonustitanc2rofbonus.py b/eos/effects/effect6638.py
similarity index 100%
rename from eos/effects/shipbonustitanc2rofbonus.py
rename to eos/effects/effect6638.py
diff --git a/eos/effects/shipbonussupercarriera4fighterapplicationbonus.py b/eos/effects/effect6639.py
similarity index 100%
rename from eos/effects/shipbonussupercarriera4fighterapplicationbonus.py
rename to eos/effects/effect6639.py
diff --git a/eos/effects/shipbonusrole1numwarfarelinks.py b/eos/effects/effect6640.py
similarity index 100%
rename from eos/effects/shipbonusrole1numwarfarelinks.py
rename to eos/effects/effect6640.py
diff --git a/eos/effects/shipbonusrole2armorplatesshieldextendersbonus.py b/eos/effects/effect6641.py
similarity index 100%
rename from eos/effects/shipbonusrole2armorplatesshieldextendersbonus.py
rename to eos/effects/effect6641.py
diff --git a/eos/effects/skillbonusdoomsdayrapidfiring.py b/eos/effects/effect6642.py
similarity index 100%
rename from eos/effects/skillbonusdoomsdayrapidfiring.py
rename to eos/effects/effect6642.py
diff --git a/eos/effects/shipbonustitana3warpstrength.py b/eos/effects/effect6647.py
similarity index 100%
rename from eos/effects/shipbonustitana3warpstrength.py
rename to eos/effects/effect6647.py
diff --git a/eos/effects/shipbonustitanc3warpstrength.py b/eos/effects/effect6648.py
similarity index 100%
rename from eos/effects/shipbonustitanc3warpstrength.py
rename to eos/effects/effect6648.py
diff --git a/eos/effects/shipbonustitang3warpstrength.py b/eos/effects/effect6649.py
similarity index 100%
rename from eos/effects/shipbonustitang3warpstrength.py
rename to eos/effects/effect6649.py
diff --git a/eos/effects/shipbonustitanm3warpstrength.py b/eos/effects/effect6650.py
similarity index 100%
rename from eos/effects/shipbonustitanm3warpstrength.py
rename to eos/effects/effect6650.py
diff --git a/eos/effects/shipmoduleancillaryremotearmorrepairer.py b/eos/effects/effect6651.py
similarity index 100%
rename from eos/effects/shipmoduleancillaryremotearmorrepairer.py
rename to eos/effects/effect6651.py
diff --git a/eos/effects/shipmoduleancillaryremoteshieldbooster.py b/eos/effects/effect6652.py
similarity index 100%
rename from eos/effects/shipmoduleancillaryremoteshieldbooster.py
rename to eos/effects/effect6652.py
diff --git a/eos/effects/shipbonustitana2capneed.py b/eos/effects/effect6653.py
similarity index 100%
rename from eos/effects/shipbonustitana2capneed.py
rename to eos/effects/effect6653.py
diff --git a/eos/effects/shipbonustitang2rofbonus.py b/eos/effects/effect6654.py
similarity index 100%
rename from eos/effects/shipbonustitang2rofbonus.py
rename to eos/effects/effect6654.py
diff --git a/eos/effects/shipbonustitanm2rofbonus.py b/eos/effects/effect6655.py
similarity index 100%
rename from eos/effects/shipbonustitanm2rofbonus.py
rename to eos/effects/effect6655.py
diff --git a/eos/effects/shipbonusrole3xltorpdeovelocitybonus.py b/eos/effects/effect6656.py
similarity index 100%
rename from eos/effects/shipbonusrole3xltorpdeovelocitybonus.py
rename to eos/effects/effect6656.py
diff --git a/eos/effects/shipbonustitanc5alldamagebonus.py b/eos/effects/effect6657.py
similarity index 100%
rename from eos/effects/shipbonustitanc5alldamagebonus.py
rename to eos/effects/effect6657.py
diff --git a/eos/effects/modulebonusbastionmodule.py b/eos/effects/effect6658.py
similarity index 100%
rename from eos/effects/modulebonusbastionmodule.py
rename to eos/effects/effect6658.py
diff --git a/eos/effects/shipbonuscarrierm3fightervelocity.py b/eos/effects/effect6661.py
similarity index 100%
rename from eos/effects/shipbonuscarrierm3fightervelocity.py
rename to eos/effects/effect6661.py
diff --git a/eos/effects/shipbonuscarrierg3fighterhitpoints.py b/eos/effects/effect6662.py
similarity index 100%
rename from eos/effects/shipbonuscarrierg3fighterhitpoints.py
rename to eos/effects/effect6662.py
diff --git a/eos/effects/skillbonusdroneinterfacing.py b/eos/effects/effect6663.py
similarity index 100%
rename from eos/effects/skillbonusdroneinterfacing.py
rename to eos/effects/effect6663.py
diff --git a/eos/effects/skillbonusdronesharpshooting.py b/eos/effects/effect6664.py
similarity index 100%
rename from eos/effects/skillbonusdronesharpshooting.py
rename to eos/effects/effect6664.py
diff --git a/eos/effects/skillbonusdronedurability.py b/eos/effects/effect6665.py
similarity index 100%
rename from eos/effects/skillbonusdronedurability.py
rename to eos/effects/effect6665.py
diff --git a/eos/effects/skillbonusdronenavigation.py b/eos/effects/effect6667.py
similarity index 100%
rename from eos/effects/skillbonusdronenavigation.py
rename to eos/effects/effect6667.py
diff --git a/eos/effects/modulebonuscapitaldronedurabilityenhancer.py b/eos/effects/effect6669.py
similarity index 100%
rename from eos/effects/modulebonuscapitaldronedurabilityenhancer.py
rename to eos/effects/effect6669.py
diff --git a/eos/effects/modulebonuscapitaldronescopechip.py b/eos/effects/effect6670.py
similarity index 100%
rename from eos/effects/modulebonuscapitaldronescopechip.py
rename to eos/effects/effect6670.py
diff --git a/eos/effects/modulebonuscapitaldronespeedaugmentor.py b/eos/effects/effect6671.py
similarity index 100%
rename from eos/effects/modulebonuscapitaldronespeedaugmentor.py
rename to eos/effects/effect6671.py
diff --git a/eos/effects/skillstructuredoomsdaydurationbonus.py b/eos/effects/effect6679.py
similarity index 100%
rename from eos/effects/skillstructuredoomsdaydurationbonus.py
rename to eos/effects/effect6679.py
diff --git a/eos/effects/missilekineticdmgbonus2.py b/eos/effects/effect668.py
similarity index 100%
rename from eos/effects/missilekineticdmgbonus2.py
rename to eos/effects/effect668.py
diff --git a/eos/effects/shipbonusrole3numwarfarelinks.py b/eos/effects/effect6681.py
similarity index 100%
rename from eos/effects/shipbonusrole3numwarfarelinks.py
rename to eos/effects/effect6681.py
diff --git a/eos/effects/structuremoduleeffectstasiswebifier.py b/eos/effects/effect6682.py
similarity index 100%
rename from eos/effects/structuremoduleeffectstasiswebifier.py
rename to eos/effects/effect6682.py
diff --git a/eos/effects/structuremoduleeffecttargetpainter.py b/eos/effects/effect6683.py
similarity index 100%
rename from eos/effects/structuremoduleeffecttargetpainter.py
rename to eos/effects/effect6683.py
diff --git a/eos/effects/structuremoduleeffectremotesensordampener.py b/eos/effects/effect6684.py
similarity index 100%
rename from eos/effects/structuremoduleeffectremotesensordampener.py
rename to eos/effects/effect6684.py
diff --git a/eos/effects/structuremoduleeffectecm.py b/eos/effects/effect6685.py
similarity index 100%
rename from eos/effects/structuremoduleeffectecm.py
rename to eos/effects/effect6685.py
diff --git a/eos/effects/structuremoduleeffectweapondisruption.py b/eos/effects/effect6686.py
similarity index 100%
rename from eos/effects/structuremoduleeffectweapondisruption.py
rename to eos/effects/effect6686.py
diff --git a/eos/effects/npcentityremotearmorrepairer.py b/eos/effects/effect6687.py
similarity index 100%
rename from eos/effects/npcentityremotearmorrepairer.py
rename to eos/effects/effect6687.py
diff --git a/eos/effects/npcentityremoteshieldbooster.py b/eos/effects/effect6688.py
similarity index 100%
rename from eos/effects/npcentityremoteshieldbooster.py
rename to eos/effects/effect6688.py
diff --git a/eos/effects/npcentityremotehullrepairer.py b/eos/effects/effect6689.py
similarity index 100%
rename from eos/effects/npcentityremotehullrepairer.py
rename to eos/effects/effect6689.py
diff --git a/eos/effects/remotewebifierentity.py b/eos/effects/effect6690.py
similarity index 100%
rename from eos/effects/remotewebifierentity.py
rename to eos/effects/effect6690.py
diff --git a/eos/effects/entityenergyneutralizerfalloff.py b/eos/effects/effect6691.py
similarity index 100%
rename from eos/effects/entityenergyneutralizerfalloff.py
rename to eos/effects/effect6691.py
diff --git a/eos/effects/remotetargetpaintentity.py b/eos/effects/effect6692.py
similarity index 100%
rename from eos/effects/remotetargetpaintentity.py
rename to eos/effects/effect6692.py
diff --git a/eos/effects/remotesensordampentity.py b/eos/effects/effect6693.py
similarity index 100%
rename from eos/effects/remotesensordampentity.py
rename to eos/effects/effect6693.py
diff --git a/eos/effects/npcentityweapondisruptor.py b/eos/effects/effect6694.py
similarity index 100%
rename from eos/effects/npcentityweapondisruptor.py
rename to eos/effects/effect6694.py
diff --git a/eos/effects/entityecmfalloff.py b/eos/effects/effect6695.py
similarity index 100%
rename from eos/effects/entityecmfalloff.py
rename to eos/effects/effect6695.py
diff --git a/eos/effects/rigdrawbackreductionarmor.py b/eos/effects/effect6697.py
similarity index 100%
rename from eos/effects/rigdrawbackreductionarmor.py
rename to eos/effects/effect6697.py
diff --git a/eos/effects/rigdrawbackreductionastronautics.py b/eos/effects/effect6698.py
similarity index 100%
rename from eos/effects/rigdrawbackreductionastronautics.py
rename to eos/effects/effect6698.py
diff --git a/eos/effects/rigdrawbackreductiondrones.py b/eos/effects/effect6699.py
similarity index 100%
rename from eos/effects/rigdrawbackreductiondrones.py
rename to eos/effects/effect6699.py
diff --git a/eos/effects/mininglaser.py b/eos/effects/effect67.py
similarity index 100%
rename from eos/effects/mininglaser.py
rename to eos/effects/effect67.py
diff --git a/eos/effects/antiwarpscramblingpassive.py b/eos/effects/effect670.py
similarity index 100%
rename from eos/effects/antiwarpscramblingpassive.py
rename to eos/effects/effect670.py
diff --git a/eos/effects/rigdrawbackreductionelectronic.py b/eos/effects/effect6700.py
similarity index 100%
rename from eos/effects/rigdrawbackreductionelectronic.py
rename to eos/effects/effect6700.py
diff --git a/eos/effects/rigdrawbackreductionprojectile.py b/eos/effects/effect6701.py
similarity index 100%
rename from eos/effects/rigdrawbackreductionprojectile.py
rename to eos/effects/effect6701.py
diff --git a/eos/effects/rigdrawbackreductionenergyweapon.py b/eos/effects/effect6702.py
similarity index 100%
rename from eos/effects/rigdrawbackreductionenergyweapon.py
rename to eos/effects/effect6702.py
diff --git a/eos/effects/rigdrawbackreductionhybrid.py b/eos/effects/effect6703.py
similarity index 100%
rename from eos/effects/rigdrawbackreductionhybrid.py
rename to eos/effects/effect6703.py
diff --git a/eos/effects/rigdrawbackreductionlauncher.py b/eos/effects/effect6704.py
similarity index 100%
rename from eos/effects/rigdrawbackreductionlauncher.py
rename to eos/effects/effect6704.py
diff --git a/eos/effects/rigdrawbackreductionshield.py b/eos/effects/effect6705.py
similarity index 100%
rename from eos/effects/rigdrawbackreductionshield.py
rename to eos/effects/effect6705.py
diff --git a/eos/effects/setbonusasklepian.py b/eos/effects/effect6706.py
similarity index 100%
rename from eos/effects/setbonusasklepian.py
rename to eos/effects/effect6706.py
diff --git a/eos/effects/armorrepairamountbonussubcap.py b/eos/effects/effect6708.py
similarity index 100%
rename from eos/effects/armorrepairamountbonussubcap.py
rename to eos/effects/effect6708.py
diff --git a/eos/effects/shipbonusrole1capitalhybriddamagebonus.py b/eos/effects/effect6709.py
similarity index 100%
rename from eos/effects/shipbonusrole1capitalhybriddamagebonus.py
rename to eos/effects/effect6709.py
diff --git a/eos/effects/shipbonusdreadnoughtm1webstrengthbonus.py b/eos/effects/effect6710.py
similarity index 100%
rename from eos/effects/shipbonusdreadnoughtm1webstrengthbonus.py
rename to eos/effects/effect6710.py
diff --git a/eos/effects/shipbonusrole3capitalhybriddamagebonus.py b/eos/effects/effect6711.py
similarity index 100%
rename from eos/effects/shipbonusrole3capitalhybriddamagebonus.py
rename to eos/effects/effect6711.py
diff --git a/eos/effects/shipbonustitanm1webstrengthbonus.py b/eos/effects/effect6712.py
similarity index 100%
rename from eos/effects/shipbonustitanm1webstrengthbonus.py
rename to eos/effects/effect6712.py
diff --git a/eos/effects/shipbonussupercarrierm1burstprojectorwebbonus.py b/eos/effects/effect6713.py
similarity index 100%
rename from eos/effects/shipbonussupercarrierm1burstprojectorwebbonus.py
rename to eos/effects/effect6713.py
diff --git a/eos/effects/ecmburstjammer.py b/eos/effects/effect6714.py
similarity index 100%
rename from eos/effects/ecmburstjammer.py
rename to eos/effects/effect6714.py
diff --git a/eos/effects/rolebonusiceoreminingdurationcap.py b/eos/effects/effect6717.py
similarity index 100%
rename from eos/effects/rolebonusiceoreminingdurationcap.py
rename to eos/effects/effect6717.py
diff --git a/eos/effects/shipbonusdronerepairmc1.py b/eos/effects/effect6720.py
similarity index 100%
rename from eos/effects/shipbonusdronerepairmc1.py
rename to eos/effects/effect6720.py
diff --git a/eos/effects/elitebonuslogisticremotearmorrepairoptimalfalloff1.py b/eos/effects/effect6721.py
similarity index 100%
rename from eos/effects/elitebonuslogisticremotearmorrepairoptimalfalloff1.py
rename to eos/effects/effect6721.py
diff --git a/eos/effects/rolebonusremotearmorrepairoptimalfalloff.py b/eos/effects/effect6722.py
similarity index 100%
rename from eos/effects/rolebonusremotearmorrepairoptimalfalloff.py
rename to eos/effects/effect6722.py
diff --git a/eos/effects/shipbonuscloakcpumc2.py b/eos/effects/effect6723.py
similarity index 100%
rename from eos/effects/shipbonuscloakcpumc2.py
rename to eos/effects/effect6723.py
diff --git a/eos/effects/elitebonuslogisticremotearmorrepairduration3.py b/eos/effects/effect6724.py
similarity index 100%
rename from eos/effects/elitebonuslogisticremotearmorrepairduration3.py
rename to eos/effects/effect6724.py
diff --git a/eos/effects/shipbonussetfalloffaf2.py b/eos/effects/effect6725.py
similarity index 100%
rename from eos/effects/shipbonussetfalloffaf2.py
rename to eos/effects/effect6725.py
diff --git a/eos/effects/shipbonuscloakcpumf1.py b/eos/effects/effect6726.py
similarity index 100%
rename from eos/effects/shipbonuscloakcpumf1.py
rename to eos/effects/effect6726.py
diff --git a/eos/effects/elitebonuscoveropsnosneutfalloff1.py b/eos/effects/effect6727.py
similarity index 100%
rename from eos/effects/elitebonuscoveropsnosneutfalloff1.py
rename to eos/effects/effect6727.py
diff --git a/eos/effects/modulebonusmicrowarpdrive.py b/eos/effects/effect6730.py
similarity index 100%
rename from eos/effects/modulebonusmicrowarpdrive.py
rename to eos/effects/effect6730.py
diff --git a/eos/effects/modulebonusafterburner.py b/eos/effects/effect6731.py
similarity index 100%
rename from eos/effects/modulebonusafterburner.py
rename to eos/effects/effect6731.py
diff --git a/eos/effects/modulebonuswarfarelinkarmor.py b/eos/effects/effect6732.py
similarity index 100%
rename from eos/effects/modulebonuswarfarelinkarmor.py
rename to eos/effects/effect6732.py
diff --git a/eos/effects/modulebonuswarfarelinkshield.py b/eos/effects/effect6733.py
similarity index 100%
rename from eos/effects/modulebonuswarfarelinkshield.py
rename to eos/effects/effect6733.py
diff --git a/eos/effects/modulebonuswarfarelinkskirmish.py b/eos/effects/effect6734.py
similarity index 100%
rename from eos/effects/modulebonuswarfarelinkskirmish.py
rename to eos/effects/effect6734.py
diff --git a/eos/effects/modulebonuswarfarelinkinfo.py b/eos/effects/effect6735.py
similarity index 100%
rename from eos/effects/modulebonuswarfarelinkinfo.py
rename to eos/effects/effect6735.py
diff --git a/eos/effects/modulebonuswarfarelinkmining.py b/eos/effects/effect6736.py
similarity index 100%
rename from eos/effects/modulebonuswarfarelinkmining.py
rename to eos/effects/effect6736.py
diff --git a/eos/effects/chargebonuswarfarecharge.py b/eos/effects/effect6737.py
similarity index 100%
rename from eos/effects/chargebonuswarfarecharge.py
rename to eos/effects/effect6737.py
diff --git a/eos/effects/weaponupgradescpuneedbonuspostpercentcpulocationshipmodulesrequiringenergypulseweapons.py b/eos/effects/effect675.py
similarity index 100%
rename from eos/effects/weaponupgradescpuneedbonuspostpercentcpulocationshipmodulesrequiringenergypulseweapons.py
rename to eos/effects/effect675.py
diff --git a/eos/effects/moduletitaneffectgenerator.py b/eos/effects/effect6753.py
similarity index 100%
rename from eos/effects/moduletitaneffectgenerator.py
rename to eos/effects/effect6753.py
diff --git a/eos/effects/miningdronespecbonus.py b/eos/effects/effect6762.py
similarity index 100%
rename from eos/effects/miningdronespecbonus.py
rename to eos/effects/effect6762.py
diff --git a/eos/effects/iceharvestingdroneoperationdurationbonus.py b/eos/effects/effect6763.py
similarity index 100%
rename from eos/effects/iceharvestingdroneoperationdurationbonus.py
rename to eos/effects/effect6763.py
diff --git a/eos/effects/iceharvestingdronespecbonus.py b/eos/effects/effect6764.py
similarity index 100%
rename from eos/effects/iceharvestingdronespecbonus.py
rename to eos/effects/effect6764.py
diff --git a/eos/effects/spatialphenomenagenerationdurationbonus.py b/eos/effects/effect6765.py
similarity index 100%
rename from eos/effects/spatialphenomenagenerationdurationbonus.py
rename to eos/effects/effect6765.py
diff --git a/eos/effects/commandprocessoreffect.py b/eos/effects/effect6766.py
similarity index 100%
rename from eos/effects/commandprocessoreffect.py
rename to eos/effects/effect6766.py
diff --git a/eos/effects/commandburstaoebonus.py b/eos/effects/effect6769.py
similarity index 100%
rename from eos/effects/commandburstaoebonus.py
rename to eos/effects/effect6769.py
diff --git a/eos/effects/weaponupgradescpuneedbonuspostpercentcpulocationshipmodulesrequiringmissilelauncheroperation.py b/eos/effects/effect677.py
similarity index 100%
rename from eos/effects/weaponupgradescpuneedbonuspostpercentcpulocationshipmodulesrequiringmissilelauncheroperation.py
rename to eos/effects/effect677.py
diff --git a/eos/effects/armoredcommanddurationbonus.py b/eos/effects/effect6770.py
similarity index 100%
rename from eos/effects/armoredcommanddurationbonus.py
rename to eos/effects/effect6770.py
diff --git a/eos/effects/shieldcommanddurationbonus.py b/eos/effects/effect6771.py
similarity index 100%
rename from eos/effects/shieldcommanddurationbonus.py
rename to eos/effects/effect6771.py
diff --git a/eos/effects/informationcommanddurationbonus.py b/eos/effects/effect6772.py
similarity index 100%
rename from eos/effects/informationcommanddurationbonus.py
rename to eos/effects/effect6772.py
diff --git a/eos/effects/skirmishcommanddurationbonus.py b/eos/effects/effect6773.py
similarity index 100%
rename from eos/effects/skirmishcommanddurationbonus.py
rename to eos/effects/effect6773.py
diff --git a/eos/effects/miningforemandurationbonus.py b/eos/effects/effect6774.py
similarity index 100%
rename from eos/effects/miningforemandurationbonus.py
rename to eos/effects/effect6774.py
diff --git a/eos/effects/armoredcommandstrengthbonus.py b/eos/effects/effect6776.py
similarity index 100%
rename from eos/effects/armoredcommandstrengthbonus.py
rename to eos/effects/effect6776.py
diff --git a/eos/effects/shieldcommandstrengthbonus.py b/eos/effects/effect6777.py
similarity index 100%
rename from eos/effects/shieldcommandstrengthbonus.py
rename to eos/effects/effect6777.py
diff --git a/eos/effects/informationcommandstrengthbonus.py b/eos/effects/effect6778.py
similarity index 100%
rename from eos/effects/informationcommandstrengthbonus.py
rename to eos/effects/effect6778.py
diff --git a/eos/effects/skirmishcommandstrengthbonus.py b/eos/effects/effect6779.py
similarity index 100%
rename from eos/effects/skirmishcommandstrengthbonus.py
rename to eos/effects/effect6779.py
diff --git a/eos/effects/miningforemanstrengthbonus.py b/eos/effects/effect6780.py
similarity index 100%
rename from eos/effects/miningforemanstrengthbonus.py
rename to eos/effects/effect6780.py
diff --git a/eos/effects/commandburstreloadtimebonus.py b/eos/effects/effect6782.py
similarity index 100%
rename from eos/effects/commandburstreloadtimebonus.py
rename to eos/effects/effect6782.py
diff --git a/eos/effects/commandburstaoerolebonus.py b/eos/effects/effect6783.py
similarity index 100%
rename from eos/effects/commandburstaoerolebonus.py
rename to eos/effects/effect6783.py
diff --git a/eos/effects/shieldcommandburstbonusics3.py b/eos/effects/effect6786.py
similarity index 100%
rename from eos/effects/shieldcommandburstbonusics3.py
rename to eos/effects/effect6786.py
diff --git a/eos/effects/shipbonusdronehpdamageminingics4.py b/eos/effects/effect6787.py
similarity index 100%
rename from eos/effects/shipbonusdronehpdamageminingics4.py
rename to eos/effects/effect6787.py
diff --git a/eos/effects/shipbonusdroneiceharvestingics5.py b/eos/effects/effect6788.py
similarity index 100%
rename from eos/effects/shipbonusdroneiceharvestingics5.py
rename to eos/effects/effect6788.py
diff --git a/eos/effects/industrialbonusdronedamage.py b/eos/effects/effect6789.py
similarity index 100%
rename from eos/effects/industrialbonusdronedamage.py
rename to eos/effects/effect6789.py
diff --git a/eos/effects/shipbonusdroneiceharvestingrole.py b/eos/effects/effect6790.py
similarity index 100%
rename from eos/effects/shipbonusdroneiceharvestingrole.py
rename to eos/effects/effect6790.py
diff --git a/eos/effects/shipbonusdronehpdamageminingorecapital4.py b/eos/effects/effect6792.py
similarity index 100%
rename from eos/effects/shipbonusdronehpdamageminingorecapital4.py
rename to eos/effects/effect6792.py
diff --git a/eos/effects/miningforemanburstbonusorecapital2.py b/eos/effects/effect6793.py
similarity index 100%
rename from eos/effects/miningforemanburstbonusorecapital2.py
rename to eos/effects/effect6793.py
diff --git a/eos/effects/shieldcommandburstbonusorecapital3.py b/eos/effects/effect6794.py
similarity index 100%
rename from eos/effects/shieldcommandburstbonusorecapital3.py
rename to eos/effects/effect6794.py
diff --git a/eos/effects/shipbonusdroneiceharvestingorecapital5.py b/eos/effects/effect6795.py
similarity index 100%
rename from eos/effects/shipbonusdroneiceharvestingorecapital5.py
rename to eos/effects/effect6795.py
diff --git a/eos/effects/shipmodeshtdamagepostdiv.py b/eos/effects/effect6796.py
similarity index 100%
rename from eos/effects/shipmodeshtdamagepostdiv.py
rename to eos/effects/effect6796.py
diff --git a/eos/effects/shipmodesptdamagepostdiv.py b/eos/effects/effect6797.py
similarity index 100%
rename from eos/effects/shipmodesptdamagepostdiv.py
rename to eos/effects/effect6797.py
diff --git a/eos/effects/shipmodesetdamagepostdiv.py b/eos/effects/effect6798.py
similarity index 100%
rename from eos/effects/shipmodesetdamagepostdiv.py
rename to eos/effects/effect6798.py
diff --git a/eos/effects/shipmodesmallmissiledamagepostdiv.py b/eos/effects/effect6799.py
similarity index 100%
rename from eos/effects/shipmodesmallmissiledamagepostdiv.py
rename to eos/effects/effect6799.py
diff --git a/eos/effects/modedamptdresistspostdiv.py b/eos/effects/effect6800.py
similarity index 100%
rename from eos/effects/modedamptdresistspostdiv.py
rename to eos/effects/effect6800.py
diff --git a/eos/effects/modemwdandabboostpostdiv.py b/eos/effects/effect6801.py
similarity index 100%
rename from eos/effects/modemwdandabboostpostdiv.py
rename to eos/effects/effect6801.py
diff --git a/eos/effects/invulnerabilitycoredurationbonus.py b/eos/effects/effect6807.py
similarity index 100%
rename from eos/effects/invulnerabilitycoredurationbonus.py
rename to eos/effects/effect6807.py
diff --git a/eos/effects/skillmultiplierdefendermissilevelocity.py b/eos/effects/effect6844.py
similarity index 100%
rename from eos/effects/skillmultiplierdefendermissilevelocity.py
rename to eos/effects/effect6844.py
diff --git a/eos/effects/shipbonuscommanddestroyerrole1defenderbonus.py b/eos/effects/effect6845.py
similarity index 100%
rename from eos/effects/shipbonuscommanddestroyerrole1defenderbonus.py
rename to eos/effects/effect6845.py
diff --git a/eos/effects/shipbonusrole3capitalenergydamagebonus.py b/eos/effects/effect6851.py
similarity index 100%
rename from eos/effects/shipbonusrole3capitalenergydamagebonus.py
rename to eos/effects/effect6851.py
diff --git a/eos/effects/shipbonustitanm1webrangebonus.py b/eos/effects/effect6852.py
similarity index 100%
rename from eos/effects/shipbonustitanm1webrangebonus.py
rename to eos/effects/effect6852.py
diff --git a/eos/effects/shipbonustitana1energywarfareamountbonus.py b/eos/effects/effect6853.py
similarity index 100%
rename from eos/effects/shipbonustitana1energywarfareamountbonus.py
rename to eos/effects/effect6853.py
diff --git a/eos/effects/shipbonusdreadnoughta1energywarfareamountbonus.py b/eos/effects/effect6855.py
similarity index 100%
rename from eos/effects/shipbonusdreadnoughta1energywarfareamountbonus.py
rename to eos/effects/effect6855.py
diff --git a/eos/effects/shipbonusdreadnoughtm1webrangebonus.py b/eos/effects/effect6856.py
similarity index 100%
rename from eos/effects/shipbonusdreadnoughtm1webrangebonus.py
rename to eos/effects/effect6856.py
diff --git a/eos/effects/shipbonusforceauxiliarya1nosferaturangebonus.py b/eos/effects/effect6857.py
similarity index 100%
rename from eos/effects/shipbonusforceauxiliarya1nosferaturangebonus.py
rename to eos/effects/effect6857.py
diff --git a/eos/effects/shipbonusforceauxiliarya1nosferatudrainamount.py b/eos/effects/effect6858.py
similarity index 100%
rename from eos/effects/shipbonusforceauxiliarya1nosferatudrainamount.py
rename to eos/effects/effect6858.py
diff --git a/eos/effects/shipbonusrole4nosferatucpubonus.py b/eos/effects/effect6859.py
similarity index 100%
rename from eos/effects/shipbonusrole4nosferatucpubonus.py
rename to eos/effects/effect6859.py
diff --git a/eos/effects/shipbonusrole5remotearmorrepairpowergridbonus.py b/eos/effects/effect6860.py
similarity index 100%
rename from eos/effects/shipbonusrole5remotearmorrepairpowergridbonus.py
rename to eos/effects/effect6860.py
diff --git a/eos/effects/shipbonusrole5capitalremotearmorrepairpowergridbonus.py b/eos/effects/effect6861.py
similarity index 100%
rename from eos/effects/shipbonusrole5capitalremotearmorrepairpowergridbonus.py
rename to eos/effects/effect6861.py
diff --git a/eos/effects/shipbonusforceauxiliarym1remotearmorrepairduration.py b/eos/effects/effect6862.py
similarity index 100%
rename from eos/effects/shipbonusforceauxiliarym1remotearmorrepairduration.py
rename to eos/effects/effect6862.py
diff --git a/eos/effects/elitebonuscoveropswarpvelocity1.py b/eos/effects/effect6865.py
similarity index 100%
rename from eos/effects/elitebonuscoveropswarpvelocity1.py
rename to eos/effects/effect6865.py
diff --git a/eos/effects/shipbonussmallmissileflighttimecf1.py b/eos/effects/effect6866.py
similarity index 100%
rename from eos/effects/shipbonussmallmissileflighttimecf1.py
rename to eos/effects/effect6866.py
diff --git a/eos/effects/shipbonussptrofmf.py b/eos/effects/effect6867.py
similarity index 100%
rename from eos/effects/shipbonussptrofmf.py
rename to eos/effects/effect6867.py
diff --git a/eos/effects/concordsecstatustankbonus.py b/eos/effects/effect6871.py
similarity index 100%
rename from eos/effects/concordsecstatustankbonus.py
rename to eos/effects/effect6871.py
diff --git a/eos/effects/elitereconstasiswebbonus1.py b/eos/effects/effect6872.py
similarity index 100%
rename from eos/effects/elitereconstasiswebbonus1.py
rename to eos/effects/effect6872.py
diff --git a/eos/effects/elitebonusreconwarpvelocity3.py b/eos/effects/effect6873.py
similarity index 100%
rename from eos/effects/elitebonusreconwarpvelocity3.py
rename to eos/effects/effect6873.py
diff --git a/eos/effects/shipbonusmedmissileflighttimecc2.py b/eos/effects/effect6874.py
similarity index 100%
rename from eos/effects/shipbonusmedmissileflighttimecc2.py
rename to eos/effects/effect6874.py
diff --git a/eos/effects/elitebonusblackopswarpvelocity1.py b/eos/effects/effect6877.py
similarity index 100%
rename from eos/effects/elitebonusblackopswarpvelocity1.py
rename to eos/effects/effect6877.py
diff --git a/eos/effects/elitebonusblackopsscramblerrange4.py b/eos/effects/effect6878.py
similarity index 100%
rename from eos/effects/elitebonusblackopsscramblerrange4.py
rename to eos/effects/effect6878.py
diff --git a/eos/effects/elitebonusblackopswebrange3.py b/eos/effects/effect6879.py
similarity index 100%
rename from eos/effects/elitebonusblackopswebrange3.py
rename to eos/effects/effect6879.py
diff --git a/eos/effects/shipbonuslauncherrof2cb.py b/eos/effects/effect6880.py
similarity index 100%
rename from eos/effects/shipbonuslauncherrof2cb.py
rename to eos/effects/effect6880.py
diff --git a/eos/effects/shipbonuslargemissileflighttimecb1.py b/eos/effects/effect6881.py
similarity index 100%
rename from eos/effects/shipbonuslargemissileflighttimecb1.py
rename to eos/effects/effect6881.py
diff --git a/eos/effects/shipbonusforceauxiliarym2localrepairamount.py b/eos/effects/effect6883.py
similarity index 100%
rename from eos/effects/shipbonusforceauxiliarym2localrepairamount.py
rename to eos/effects/effect6883.py
diff --git a/eos/effects/subsystemenergyneutfittingreduction.py b/eos/effects/effect6894.py
similarity index 100%
rename from eos/effects/subsystemenergyneutfittingreduction.py
rename to eos/effects/effect6894.py
diff --git a/eos/effects/subsystemmetfittingreduction.py b/eos/effects/effect6895.py
similarity index 100%
rename from eos/effects/subsystemmetfittingreduction.py
rename to eos/effects/effect6895.py
diff --git a/eos/effects/subsystemmhtfittingreduction.py b/eos/effects/effect6896.py
similarity index 100%
rename from eos/effects/subsystemmhtfittingreduction.py
rename to eos/effects/effect6896.py
diff --git a/eos/effects/subsystemmptfittingreduction.py b/eos/effects/effect6897.py
similarity index 100%
rename from eos/effects/subsystemmptfittingreduction.py
rename to eos/effects/effect6897.py
diff --git a/eos/effects/subsystemmrarfittingreduction.py b/eos/effects/effect6898.py
similarity index 100%
rename from eos/effects/subsystemmrarfittingreduction.py
rename to eos/effects/effect6898.py
diff --git a/eos/effects/subsystemmrsbfittingreduction.py b/eos/effects/effect6899.py
similarity index 100%
rename from eos/effects/subsystemmrsbfittingreduction.py
rename to eos/effects/effect6899.py
diff --git a/eos/effects/subsystemmmissilefittingreduction.py b/eos/effects/effect6900.py
similarity index 100%
rename from eos/effects/subsystemmmissilefittingreduction.py
rename to eos/effects/effect6900.py
diff --git a/eos/effects/shipbonusstrategiccruisercaldarinaniterepairtime2.py b/eos/effects/effect6908.py
similarity index 100%
rename from eos/effects/shipbonusstrategiccruisercaldarinaniterepairtime2.py
rename to eos/effects/effect6908.py
diff --git a/eos/effects/shipbonusstrategiccruiseramarrnaniterepairtime2.py b/eos/effects/effect6909.py
similarity index 100%
rename from eos/effects/shipbonusstrategiccruiseramarrnaniterepairtime2.py
rename to eos/effects/effect6909.py
diff --git a/eos/effects/shipbonusstrategiccruisergallentenaniterepairtime2.py b/eos/effects/effect6910.py
similarity index 100%
rename from eos/effects/shipbonusstrategiccruisergallentenaniterepairtime2.py
rename to eos/effects/effect6910.py
diff --git a/eos/effects/shipbonusstrategiccruiserminmatarnaniterepairtime2.py b/eos/effects/effect6911.py
similarity index 100%
rename from eos/effects/shipbonusstrategiccruiserminmatarnaniterepairtime2.py
rename to eos/effects/effect6911.py
diff --git a/eos/effects/structurehpbonusaddpassive.py b/eos/effects/effect6920.py
similarity index 100%
rename from eos/effects/structurehpbonusaddpassive.py
rename to eos/effects/effect6920.py
diff --git a/eos/effects/subsystembonusamarrdefensive2scanprobestrength.py b/eos/effects/effect6921.py
similarity index 100%
rename from eos/effects/subsystembonusamarrdefensive2scanprobestrength.py
rename to eos/effects/effect6921.py
diff --git a/eos/effects/subsystembonusminmataroffensive1hmlhamvelo.py b/eos/effects/effect6923.py
similarity index 100%
rename from eos/effects/subsystembonusminmataroffensive1hmlhamvelo.py
rename to eos/effects/effect6923.py
diff --git a/eos/effects/subsystembonusminmataroffensive3missileexpvelo.py b/eos/effects/effect6924.py
similarity index 100%
rename from eos/effects/subsystembonusminmataroffensive3missileexpvelo.py
rename to eos/effects/effect6924.py
diff --git a/eos/effects/subsystembonusgallenteoffensive2dronevelotracking.py b/eos/effects/effect6925.py
similarity index 100%
rename from eos/effects/subsystembonusgallenteoffensive2dronevelotracking.py
rename to eos/effects/effect6925.py
diff --git a/eos/effects/subsystembonusamarrpropulsionwarpcapacitor.py b/eos/effects/effect6926.py
similarity index 100%
rename from eos/effects/subsystembonusamarrpropulsionwarpcapacitor.py
rename to eos/effects/effect6926.py
diff --git a/eos/effects/subsystembonusminmatarpropulsionwarpcapacitor.py b/eos/effects/effect6927.py
similarity index 100%
rename from eos/effects/subsystembonusminmatarpropulsionwarpcapacitor.py
rename to eos/effects/effect6927.py
diff --git a/eos/effects/subsystembonuscaldaripropulsion2propmodheatbenefit.py b/eos/effects/effect6928.py
similarity index 100%
rename from eos/effects/subsystembonuscaldaripropulsion2propmodheatbenefit.py
rename to eos/effects/effect6928.py
diff --git a/eos/effects/subsystembonusgallentepropulsion2propmodheatbenefit.py b/eos/effects/effect6929.py
similarity index 100%
rename from eos/effects/subsystembonusgallentepropulsion2propmodheatbenefit.py
rename to eos/effects/effect6929.py
diff --git a/eos/effects/subsystembonusamarrcore2energyresistance.py b/eos/effects/effect6930.py
similarity index 100%
rename from eos/effects/subsystembonusamarrcore2energyresistance.py
rename to eos/effects/effect6930.py
diff --git a/eos/effects/subsystembonusminmatarcore2energyresistance.py b/eos/effects/effect6931.py
similarity index 100%
rename from eos/effects/subsystembonusminmatarcore2energyresistance.py
rename to eos/effects/effect6931.py
diff --git a/eos/effects/subsystembonusgallentecore2energyresistance.py b/eos/effects/effect6932.py
similarity index 100%
rename from eos/effects/subsystembonusgallentecore2energyresistance.py
rename to eos/effects/effect6932.py
diff --git a/eos/effects/subsystembonuscaldaricore2energyresistance.py b/eos/effects/effect6933.py
similarity index 100%
rename from eos/effects/subsystembonuscaldaricore2energyresistance.py
rename to eos/effects/effect6933.py
diff --git a/eos/effects/shipmaxlockedtargetsbonusaddpassive.py b/eos/effects/effect6934.py
similarity index 100%
rename from eos/effects/shipmaxlockedtargetsbonusaddpassive.py
rename to eos/effects/effect6934.py
diff --git a/eos/effects/subsystembonusamarrcore3energywarheatbonus.py b/eos/effects/effect6935.py
similarity index 100%
rename from eos/effects/subsystembonusamarrcore3energywarheatbonus.py
rename to eos/effects/effect6935.py
diff --git a/eos/effects/subsystembonusminmatarcore3stasiswebheatbonus.py b/eos/effects/effect6936.py
similarity index 100%
rename from eos/effects/subsystembonusminmatarcore3stasiswebheatbonus.py
rename to eos/effects/effect6936.py
diff --git a/eos/effects/subsystembonusgallentecore3warpscramheatbonus.py b/eos/effects/effect6937.py
similarity index 100%
rename from eos/effects/subsystembonusgallentecore3warpscramheatbonus.py
rename to eos/effects/effect6937.py
diff --git a/eos/effects/subsystembonuscaldaricore3ecmheatbonus.py b/eos/effects/effect6938.py
similarity index 100%
rename from eos/effects/subsystembonuscaldaricore3ecmheatbonus.py
rename to eos/effects/effect6938.py
diff --git a/eos/effects/subsystembonusamarrdefensive2hardenerheat.py b/eos/effects/effect6939.py
similarity index 100%
rename from eos/effects/subsystembonusamarrdefensive2hardenerheat.py
rename to eos/effects/effect6939.py
diff --git a/eos/effects/subsystembonusgallentedefensive2hardenerheat.py b/eos/effects/effect6940.py
similarity index 100%
rename from eos/effects/subsystembonusgallentedefensive2hardenerheat.py
rename to eos/effects/effect6940.py
diff --git a/eos/effects/subsystembonuscaldaridefensive2hardenerheat.py b/eos/effects/effect6941.py
similarity index 100%
rename from eos/effects/subsystembonuscaldaridefensive2hardenerheat.py
rename to eos/effects/effect6941.py
diff --git a/eos/effects/subsystembonusminmatardefensive2hardenerheat.py b/eos/effects/effect6942.py
similarity index 100%
rename from eos/effects/subsystembonusminmatardefensive2hardenerheat.py
rename to eos/effects/effect6942.py
diff --git a/eos/effects/subsystembonusamarrdefensive3armorrepheat.py b/eos/effects/effect6943.py
similarity index 100%
rename from eos/effects/subsystembonusamarrdefensive3armorrepheat.py
rename to eos/effects/effect6943.py
diff --git a/eos/effects/subsystembonusgallentedefensive3armorrepheat.py b/eos/effects/effect6944.py
similarity index 100%
rename from eos/effects/subsystembonusgallentedefensive3armorrepheat.py
rename to eos/effects/effect6944.py
diff --git a/eos/effects/subsystembonuscaldaridefensive3shieldboostheat.py b/eos/effects/effect6945.py
similarity index 100%
rename from eos/effects/subsystembonuscaldaridefensive3shieldboostheat.py
rename to eos/effects/effect6945.py
diff --git a/eos/effects/subsystembonusminmatardefensive3localrepheat.py b/eos/effects/effect6946.py
similarity index 100%
rename from eos/effects/subsystembonusminmatardefensive3localrepheat.py
rename to eos/effects/effect6946.py
diff --git a/eos/effects/subsystembonuscaldaridefensive2scanprobestrength.py b/eos/effects/effect6947.py
similarity index 100%
rename from eos/effects/subsystembonuscaldaridefensive2scanprobestrength.py
rename to eos/effects/effect6947.py
diff --git a/eos/effects/subsystembonusgallentedefensive2scanprobestrength.py b/eos/effects/effect6949.py
similarity index 100%
rename from eos/effects/subsystembonusgallentedefensive2scanprobestrength.py
rename to eos/effects/effect6949.py
diff --git a/eos/effects/subsystembonusminmatardefensive2scanprobestrength.py b/eos/effects/effect6951.py
similarity index 100%
rename from eos/effects/subsystembonusminmatardefensive2scanprobestrength.py
rename to eos/effects/effect6951.py
diff --git a/eos/effects/mediumremoterepfittingadjustment.py b/eos/effects/effect6953.py
similarity index 100%
rename from eos/effects/mediumremoterepfittingadjustment.py
rename to eos/effects/effect6953.py
diff --git a/eos/effects/subsystembonuscommandburstfittingreduction.py b/eos/effects/effect6954.py
similarity index 100%
rename from eos/effects/subsystembonuscommandburstfittingreduction.py
rename to eos/effects/effect6954.py
diff --git a/eos/effects/subsystemremoteshieldboostfalloffbonus.py b/eos/effects/effect6955.py
similarity index 100%
rename from eos/effects/subsystemremoteshieldboostfalloffbonus.py
rename to eos/effects/effect6955.py
diff --git a/eos/effects/subsystemremotearmorrepaireroptimalbonus.py b/eos/effects/effect6956.py
similarity index 100%
rename from eos/effects/subsystemremotearmorrepaireroptimalbonus.py
rename to eos/effects/effect6956.py
diff --git a/eos/effects/subsystemremotearmorrepairerfalloffbonus.py b/eos/effects/effect6957.py
similarity index 100%
rename from eos/effects/subsystemremotearmorrepairerfalloffbonus.py
rename to eos/effects/effect6957.py
diff --git a/eos/effects/subsystembonusamarroffensive3remotearmorrepairheat.py b/eos/effects/effect6958.py
similarity index 100%
rename from eos/effects/subsystembonusamarroffensive3remotearmorrepairheat.py
rename to eos/effects/effect6958.py
diff --git a/eos/effects/subsystembonusgallenteoffensive3remotearmorrepairheat.py b/eos/effects/effect6959.py
similarity index 100%
rename from eos/effects/subsystembonusgallenteoffensive3remotearmorrepairheat.py
rename to eos/effects/effect6959.py
diff --git a/eos/effects/subsystembonuscaldarioffensive3remoteshieldboosterheat.py b/eos/effects/effect6960.py
similarity index 100%
rename from eos/effects/subsystembonuscaldarioffensive3remoteshieldboosterheat.py
rename to eos/effects/effect6960.py
diff --git a/eos/effects/subsystembonusminmataroffensive3remoterepheat.py b/eos/effects/effect6961.py
similarity index 100%
rename from eos/effects/subsystembonusminmataroffensive3remoterepheat.py
rename to eos/effects/effect6961.py
diff --git a/eos/effects/subsystembonusamarrpropulsion2warpspeed.py b/eos/effects/effect6962.py
similarity index 100%
rename from eos/effects/subsystembonusamarrpropulsion2warpspeed.py
rename to eos/effects/effect6962.py
diff --git a/eos/effects/subsystembonusminmatarpropulsion2warpspeed.py b/eos/effects/effect6963.py
similarity index 100%
rename from eos/effects/subsystembonusminmatarpropulsion2warpspeed.py
rename to eos/effects/effect6963.py
diff --git a/eos/effects/subsystembonusgallentepropulsionwarpspeed.py b/eos/effects/effect6964.py
similarity index 100%
rename from eos/effects/subsystembonusgallentepropulsionwarpspeed.py
rename to eos/effects/effect6964.py
diff --git a/eos/effects/shipbonustitang1kinthermdamagebonus.py b/eos/effects/effect6981.py
similarity index 100%
rename from eos/effects/shipbonustitang1kinthermdamagebonus.py
rename to eos/effects/effect6981.py
diff --git a/eos/effects/shipbonustitang2emexplosivedamagebonus.py b/eos/effects/effect6982.py
similarity index 100%
rename from eos/effects/shipbonustitang2emexplosivedamagebonus.py
rename to eos/effects/effect6982.py
diff --git a/eos/effects/shipbonustitanc1shieldresists.py b/eos/effects/effect6983.py
similarity index 100%
rename from eos/effects/shipbonustitanc1shieldresists.py
rename to eos/effects/effect6983.py
diff --git a/eos/effects/shipbonusrole4fighterdamageandhitpoints.py b/eos/effects/effect6984.py
similarity index 100%
rename from eos/effects/shipbonusrole4fighterdamageandhitpoints.py
rename to eos/effects/effect6984.py
diff --git a/eos/effects/shipbonusdreadnoughtg1kinthermdamagebonus.py b/eos/effects/effect6985.py
similarity index 100%
rename from eos/effects/shipbonusdreadnoughtg1kinthermdamagebonus.py
rename to eos/effects/effect6985.py
diff --git a/eos/effects/shipbonusforceauxiliaryg1remoteshieldboostamount.py b/eos/effects/effect6986.py
similarity index 100%
rename from eos/effects/shipbonusforceauxiliaryg1remoteshieldboostamount.py
rename to eos/effects/effect6986.py
diff --git a/eos/effects/shipbonusrole2logisticdronerepamountandhitpointbonus.py b/eos/effects/effect6987.py
similarity index 100%
rename from eos/effects/shipbonusrole2logisticdronerepamountandhitpointbonus.py
rename to eos/effects/effect6987.py
diff --git a/eos/effects/signatureanalysisscanresolutionbonuspostpercentscanresolutionship.py b/eos/effects/effect699.py
similarity index 100%
rename from eos/effects/signatureanalysisscanresolutionbonuspostpercentscanresolutionship.py
rename to eos/effects/effect699.py
diff --git a/eos/effects/rolebonusmhtdamage1.py b/eos/effects/effect6992.py
similarity index 100%
rename from eos/effects/rolebonusmhtdamage1.py
rename to eos/effects/effect6992.py
diff --git a/eos/effects/rolebonus2boosterpenaltyreduction.py b/eos/effects/effect6993.py
similarity index 100%
rename from eos/effects/rolebonus2boosterpenaltyreduction.py
rename to eos/effects/effect6993.py
diff --git a/eos/effects/elitereconbonusmhtdamage1.py b/eos/effects/effect6994.py
similarity index 100%
rename from eos/effects/elitereconbonusmhtdamage1.py
rename to eos/effects/effect6994.py
diff --git a/eos/effects/targetabcattack.py b/eos/effects/effect6995.py
similarity index 100%
rename from eos/effects/targetabcattack.py
rename to eos/effects/effect6995.py
diff --git a/eos/effects/elitereconbonusarmorrepamount3.py b/eos/effects/effect6996.py
similarity index 100%
rename from eos/effects/elitereconbonusarmorrepamount3.py
rename to eos/effects/effect6996.py
diff --git a/eos/effects/elitecovertopsbonusarmorrepamount4.py b/eos/effects/effect6997.py
similarity index 100%
rename from eos/effects/elitecovertopsbonusarmorrepamount4.py
rename to eos/effects/effect6997.py
diff --git a/eos/effects/covertopsstealthbombersiegemissilelaunchercpuneedbonus.py b/eos/effects/effect6999.py
similarity index 100%
rename from eos/effects/covertopsstealthbombersiegemissilelaunchercpuneedbonus.py
rename to eos/effects/effect6999.py
diff --git a/eos/effects/shipbonusshtfalloffgf1.py b/eos/effects/effect7000.py
similarity index 100%
rename from eos/effects/shipbonusshtfalloffgf1.py
rename to eos/effects/effect7000.py
diff --git a/eos/effects/rolebonustorprof1.py b/eos/effects/effect7001.py
similarity index 100%
rename from eos/effects/rolebonustorprof1.py
rename to eos/effects/effect7001.py
diff --git a/eos/effects/rolebonusbomblauncherpwgcpu3.py b/eos/effects/effect7002.py
similarity index 100%
rename from eos/effects/rolebonusbomblauncherpwgcpu3.py
rename to eos/effects/effect7002.py
diff --git a/eos/effects/elitebonuscovertopsshtdamage3.py b/eos/effects/effect7003.py
similarity index 100%
rename from eos/effects/elitebonuscovertopsshtdamage3.py
rename to eos/effects/effect7003.py
diff --git a/eos/effects/structurefullpowerstatehitpointmodifier.py b/eos/effects/effect7008.py
similarity index 100%
rename from eos/effects/structurefullpowerstatehitpointmodifier.py
rename to eos/effects/effect7008.py
diff --git a/eos/effects/servicemodulefullpowerhitpointpostassign.py b/eos/effects/effect7009.py
similarity index 100%
rename from eos/effects/servicemodulefullpowerhitpointpostassign.py
rename to eos/effects/effect7009.py
diff --git a/eos/effects/modulebonusassaultdamagecontrol.py b/eos/effects/effect7012.py
similarity index 100%
rename from eos/effects/modulebonusassaultdamagecontrol.py
rename to eos/effects/effect7012.py
diff --git a/eos/effects/elitebonusgunshipkineticmissiledamage1.py b/eos/effects/effect7013.py
similarity index 100%
rename from eos/effects/elitebonusgunshipkineticmissiledamage1.py
rename to eos/effects/effect7013.py
diff --git a/eos/effects/elitebonusgunshipthermalmissiledamage1.py b/eos/effects/effect7014.py
similarity index 100%
rename from eos/effects/elitebonusgunshipthermalmissiledamage1.py
rename to eos/effects/effect7014.py
diff --git a/eos/effects/elitebonusgunshipemmissiledamage1.py b/eos/effects/effect7015.py
similarity index 100%
rename from eos/effects/elitebonusgunshipemmissiledamage1.py
rename to eos/effects/effect7015.py
diff --git a/eos/effects/elitebonusgunshipexplosivemissiledamage1.py b/eos/effects/effect7016.py
similarity index 100%
rename from eos/effects/elitebonusgunshipexplosivemissiledamage1.py
rename to eos/effects/effect7016.py
diff --git a/eos/effects/elitebonusgunshipexplosionvelocity2.py b/eos/effects/effect7017.py
similarity index 100%
rename from eos/effects/elitebonusgunshipexplosionvelocity2.py
rename to eos/effects/effect7017.py
diff --git a/eos/effects/shipsetrofaf.py b/eos/effects/effect7018.py
similarity index 100%
rename from eos/effects/shipsetrofaf.py
rename to eos/effects/effect7018.py
diff --git a/eos/effects/remotewebifiermaxrangebonus.py b/eos/effects/effect7020.py
similarity index 100%
rename from eos/effects/remotewebifiermaxrangebonus.py
rename to eos/effects/effect7020.py
diff --git a/eos/effects/structurerigmaxtargetrange.py b/eos/effects/effect7021.py
similarity index 100%
rename from eos/effects/structurerigmaxtargetrange.py
rename to eos/effects/effect7021.py
diff --git a/eos/effects/shipbonusdronetrackingelitegunship2.py b/eos/effects/effect7024.py
similarity index 100%
rename from eos/effects/shipbonusdronetrackingelitegunship2.py
rename to eos/effects/effect7024.py
diff --git a/eos/effects/scriptstandupwarpscram.py b/eos/effects/effect7026.py
similarity index 100%
rename from eos/effects/scriptstandupwarpscram.py
rename to eos/effects/effect7026.py
diff --git a/eos/effects/structurecapacitorcapacitybonus.py b/eos/effects/effect7027.py
similarity index 100%
rename from eos/effects/structurecapacitorcapacitybonus.py
rename to eos/effects/effect7027.py
diff --git a/eos/effects/structuremodifypowerrechargerate.py b/eos/effects/effect7028.py
similarity index 100%
rename from eos/effects/structuremodifypowerrechargerate.py
rename to eos/effects/effect7028.py
diff --git a/eos/effects/structurearmorhpbonus.py b/eos/effects/effect7029.py
similarity index 100%
rename from eos/effects/structurearmorhpbonus.py
rename to eos/effects/effect7029.py
diff --git a/eos/effects/structureaoerofrolebonus.py b/eos/effects/effect7030.py
similarity index 100%
rename from eos/effects/structureaoerofrolebonus.py
rename to eos/effects/effect7030.py
diff --git a/eos/effects/shipbonusheavymissilekineticdamagecbc2.py b/eos/effects/effect7031.py
similarity index 100%
rename from eos/effects/shipbonusheavymissilekineticdamagecbc2.py
rename to eos/effects/effect7031.py
diff --git a/eos/effects/shipbonusheavymissilethermaldamagecbc2.py b/eos/effects/effect7032.py
similarity index 100%
rename from eos/effects/shipbonusheavymissilethermaldamagecbc2.py
rename to eos/effects/effect7032.py
diff --git a/eos/effects/shipbonusheavymissileemdamagecbc2.py b/eos/effects/effect7033.py
similarity index 100%
rename from eos/effects/shipbonusheavymissileemdamagecbc2.py
rename to eos/effects/effect7033.py
diff --git a/eos/effects/shipbonusheavymissileexplosivedamagecbc2.py b/eos/effects/effect7034.py
similarity index 100%
rename from eos/effects/shipbonusheavymissileexplosivedamagecbc2.py
rename to eos/effects/effect7034.py
diff --git a/eos/effects/shipbonusheavyassaultmissileexplosivedamagecbc2.py b/eos/effects/effect7035.py
similarity index 100%
rename from eos/effects/shipbonusheavyassaultmissileexplosivedamagecbc2.py
rename to eos/effects/effect7035.py
diff --git a/eos/effects/shipbonusheavyassaultmissileemdamagecbc2.py b/eos/effects/effect7036.py
similarity index 100%
rename from eos/effects/shipbonusheavyassaultmissileemdamagecbc2.py
rename to eos/effects/effect7036.py
diff --git a/eos/effects/shipbonusheavyassaultmissilethermaldamagecbc2.py b/eos/effects/effect7037.py
similarity index 100%
rename from eos/effects/shipbonusheavyassaultmissilethermaldamagecbc2.py
rename to eos/effects/effect7037.py
diff --git a/eos/effects/shipbonusheavyassaultmissilekineticdamagecbc2.py b/eos/effects/effect7038.py
similarity index 100%
rename from eos/effects/shipbonusheavyassaultmissilekineticdamagecbc2.py
rename to eos/effects/effect7038.py
diff --git a/eos/effects/structurehiddenmissiledamagemultiplier.py b/eos/effects/effect7039.py
similarity index 100%
rename from eos/effects/structurehiddenmissiledamagemultiplier.py
rename to eos/effects/effect7039.py
diff --git a/eos/effects/structurehiddenarmorhpmultiplier.py b/eos/effects/effect7040.py
similarity index 100%
rename from eos/effects/structurehiddenarmorhpmultiplier.py
rename to eos/effects/effect7040.py
diff --git a/eos/effects/shiparmorhitpointsac1.py b/eos/effects/effect7042.py
similarity index 100%
rename from eos/effects/shiparmorhitpointsac1.py
rename to eos/effects/effect7042.py
diff --git a/eos/effects/shipshieldhitpointscc1.py b/eos/effects/effect7043.py
similarity index 100%
rename from eos/effects/shipshieldhitpointscc1.py
rename to eos/effects/effect7043.py
diff --git a/eos/effects/shipagilitybonusgc1.py b/eos/effects/effect7044.py
similarity index 100%
rename from eos/effects/shipagilitybonusgc1.py
rename to eos/effects/effect7044.py
diff --git a/eos/effects/shipsignatureradiusmc1.py b/eos/effects/effect7045.py
similarity index 100%
rename from eos/effects/shipsignatureradiusmc1.py
rename to eos/effects/effect7045.py
diff --git a/eos/effects/elitebonusflagcruiserallresistances1.py b/eos/effects/effect7046.py
similarity index 100%
rename from eos/effects/elitebonusflagcruiserallresistances1.py
rename to eos/effects/effect7046.py
diff --git a/eos/effects/rolebonusflagcruisermodulefittingreduction.py b/eos/effects/effect7047.py
similarity index 100%
rename from eos/effects/rolebonusflagcruisermodulefittingreduction.py
rename to eos/effects/effect7047.py
diff --git a/eos/effects/aoebeaconbioluminescencecloud.py b/eos/effects/effect7050.py
similarity index 100%
rename from eos/effects/aoebeaconbioluminescencecloud.py
rename to eos/effects/effect7050.py
diff --git a/eos/effects/aoebeaconcausticcloud.py b/eos/effects/effect7051.py
similarity index 100%
rename from eos/effects/aoebeaconcausticcloud.py
rename to eos/effects/effect7051.py
diff --git a/eos/effects/rolebonusflagcruisertargetpaintermodifications.py b/eos/effects/effect7052.py
similarity index 100%
rename from eos/effects/rolebonusflagcruisertargetpaintermodifications.py
rename to eos/effects/effect7052.py
diff --git a/eos/effects/shiplargeweaponsdamagebonus.py b/eos/effects/effect7055.py
similarity index 100%
rename from eos/effects/shiplargeweaponsdamagebonus.py
rename to eos/effects/effect7055.py
diff --git a/eos/effects/aoebeaconfilamentcloud.py b/eos/effects/effect7058.py
similarity index 100%
rename from eos/effects/aoebeaconfilamentcloud.py
rename to eos/effects/effect7058.py
diff --git a/eos/effects/weathercaustictoxin.py b/eos/effects/effect7059.py
similarity index 100%
rename from eos/effects/weathercaustictoxin.py
rename to eos/effects/effect7059.py
diff --git a/eos/effects/covertopswarpresistance.py b/eos/effects/effect706.py
similarity index 100%
rename from eos/effects/covertopswarpresistance.py
rename to eos/effects/effect706.py
diff --git a/eos/effects/weatherdarkness.py b/eos/effects/effect7060.py
similarity index 100%
rename from eos/effects/weatherdarkness.py
rename to eos/effects/effect7060.py
diff --git a/eos/effects/weatherelectricstorm.py b/eos/effects/effect7061.py
similarity index 100%
rename from eos/effects/weatherelectricstorm.py
rename to eos/effects/effect7061.py
diff --git a/eos/effects/weatherinfernal.py b/eos/effects/effect7062.py
similarity index 100%
rename from eos/effects/weatherinfernal.py
rename to eos/effects/effect7062.py
diff --git a/eos/effects/weatherxenongas.py b/eos/effects/effect7063.py
similarity index 100%
rename from eos/effects/weatherxenongas.py
rename to eos/effects/effect7063.py
diff --git a/eos/effects/weatherbasic.py b/eos/effects/effect7064.py
similarity index 100%
rename from eos/effects/weatherbasic.py
rename to eos/effects/effect7064.py
diff --git a/eos/effects/smallprecursorturretdmgbonusrequiredskill.py b/eos/effects/effect7071.py
similarity index 100%
rename from eos/effects/smallprecursorturretdmgbonusrequiredskill.py
rename to eos/effects/effect7071.py
diff --git a/eos/effects/mediumprecursorturretdmgbonusrequiredskill.py b/eos/effects/effect7072.py
similarity index 100%
rename from eos/effects/mediumprecursorturretdmgbonusrequiredskill.py
rename to eos/effects/effect7072.py
diff --git a/eos/effects/largeprecursorturretdmgbonusrequiredskill.py b/eos/effects/effect7073.py
similarity index 100%
rename from eos/effects/largeprecursorturretdmgbonusrequiredskill.py
rename to eos/effects/effect7073.py
diff --git a/eos/effects/smalldisintegratorskilldmgbonus.py b/eos/effects/effect7074.py
similarity index 100%
rename from eos/effects/smalldisintegratorskilldmgbonus.py
rename to eos/effects/effect7074.py
diff --git a/eos/effects/mediumdisintegratorskilldmgbonus.py b/eos/effects/effect7075.py
similarity index 100%
rename from eos/effects/mediumdisintegratorskilldmgbonus.py
rename to eos/effects/effect7075.py
diff --git a/eos/effects/largedisintegratorskilldmgbonus.py b/eos/effects/effect7076.py
similarity index 100%
rename from eos/effects/largedisintegratorskilldmgbonus.py
rename to eos/effects/effect7076.py
diff --git a/eos/effects/disintegratorweapondamagemultiply.py b/eos/effects/effect7077.py
similarity index 100%
rename from eos/effects/disintegratorweapondamagemultiply.py
rename to eos/effects/effect7077.py
diff --git a/eos/effects/disintegratorweaponspeedmultiply.py b/eos/effects/effect7078.py
similarity index 100%
rename from eos/effects/disintegratorweaponspeedmultiply.py
rename to eos/effects/effect7078.py
diff --git a/eos/effects/shippcbsspeedbonuspcbs1.py b/eos/effects/effect7079.py
similarity index 100%
rename from eos/effects/shippcbsspeedbonuspcbs1.py
rename to eos/effects/effect7079.py
diff --git a/eos/effects/shippcbsdmgbonuspcbs2.py b/eos/effects/effect7080.py
similarity index 100%
rename from eos/effects/shippcbsdmgbonuspcbs2.py
rename to eos/effects/effect7080.py
diff --git a/eos/effects/shipbonuspctdamagepc1.py b/eos/effects/effect7085.py
similarity index 100%
rename from eos/effects/shipbonuspctdamagepc1.py
rename to eos/effects/effect7085.py
diff --git a/eos/effects/shipbonuspcttrackingpc2.py b/eos/effects/effect7086.py
similarity index 100%
rename from eos/effects/shipbonuspcttrackingpc2.py
rename to eos/effects/effect7086.py
diff --git a/eos/effects/shipbonuspctoptimalpf2.py b/eos/effects/effect7087.py
similarity index 100%
rename from eos/effects/shipbonuspctoptimalpf2.py
rename to eos/effects/effect7087.py
diff --git a/eos/effects/shipbonuspctdamagepf1.py b/eos/effects/effect7088.py
similarity index 100%
rename from eos/effects/shipbonuspctdamagepf1.py
rename to eos/effects/effect7088.py
diff --git a/eos/effects/shipbonusnosneutcapneedrolebonus2.py b/eos/effects/effect7091.py
similarity index 100%
rename from eos/effects/shipbonusnosneutcapneedrolebonus2.py
rename to eos/effects/effect7091.py
diff --git a/eos/effects/shipbonusremoterepcapneedrolebonus2.py b/eos/effects/effect7092.py
similarity index 100%
rename from eos/effects/shipbonusremoterepcapneedrolebonus2.py
rename to eos/effects/effect7092.py
diff --git a/eos/effects/shipbonussmartbombcapneedrolebonus2.py b/eos/effects/effect7093.py
similarity index 100%
rename from eos/effects/shipbonussmartbombcapneedrolebonus2.py
rename to eos/effects/effect7093.py
diff --git a/eos/effects/shipbonusremoterepmaxrangerolebonus1.py b/eos/effects/effect7094.py
similarity index 100%
rename from eos/effects/shipbonusremoterepmaxrangerolebonus1.py
rename to eos/effects/effect7094.py
diff --git a/eos/effects/surgicalstrikedamagemultiplierbonuspostpercentdamagemultiplierlocationshipgroupprecursorturret.py b/eos/effects/effect7097.py
similarity index 100%
rename from eos/effects/surgicalstrikedamagemultiplierbonuspostpercentdamagemultiplierlocationshipgroupprecursorturret.py
rename to eos/effects/effect7097.py
diff --git a/eos/effects/systemsmallprecursorturretdamage.py b/eos/effects/effect7111.py
similarity index 100%
rename from eos/effects/systemsmallprecursorturretdamage.py
rename to eos/effects/effect7111.py
diff --git a/eos/effects/shipbonusneutcapneedrolebonus2.py b/eos/effects/effect7112.py
similarity index 100%
rename from eos/effects/shipbonusneutcapneedrolebonus2.py
rename to eos/effects/effect7112.py
diff --git a/eos/effects/elitebonusreconscanprobestrength2.py b/eos/effects/effect7116.py
similarity index 100%
rename from eos/effects/elitebonusreconscanprobestrength2.py
rename to eos/effects/effect7116.py
diff --git a/eos/effects/rolebonuswarpspeed.py b/eos/effects/effect7117.py
similarity index 100%
rename from eos/effects/rolebonuswarpspeed.py
rename to eos/effects/effect7117.py
diff --git a/eos/effects/elitebonuscovertops3pctdamagepercycle.py b/eos/effects/effect7118.py
similarity index 100%
rename from eos/effects/elitebonuscovertops3pctdamagepercycle.py
rename to eos/effects/effect7118.py
diff --git a/eos/effects/elitebonusreconship3pctdamagepercycle.py b/eos/effects/effect7119.py
similarity index 100%
rename from eos/effects/elitebonusreconship3pctdamagepercycle.py
rename to eos/effects/effect7119.py
diff --git a/eos/effects/massentanglereffect5.py b/eos/effects/effect7142.py
similarity index 100%
rename from eos/effects/massentanglereffect5.py
rename to eos/effects/effect7142.py
diff --git a/eos/effects/shipbonuspd1disintegratordamage.py b/eos/effects/effect7154.py
similarity index 100%
rename from eos/effects/shipbonuspd1disintegratordamage.py
rename to eos/effects/effect7154.py
diff --git a/eos/effects/shipbonuspbc1disintegratordamage.py b/eos/effects/effect7155.py
similarity index 100%
rename from eos/effects/shipbonuspbc1disintegratordamage.py
rename to eos/effects/effect7155.py
diff --git a/eos/effects/smalldisintegratormaxrangebonus.py b/eos/effects/effect7156.py
similarity index 100%
rename from eos/effects/smalldisintegratormaxrangebonus.py
rename to eos/effects/effect7156.py
diff --git a/eos/effects/shipbonuspd2disintegratormaxrange.py b/eos/effects/effect7157.py
similarity index 100%
rename from eos/effects/shipbonuspd2disintegratormaxrange.py
rename to eos/effects/effect7157.py
diff --git a/eos/effects/shiparmorkineticresistancepbc2.py b/eos/effects/effect7158.py
similarity index 100%
rename from eos/effects/shiparmorkineticresistancepbc2.py
rename to eos/effects/effect7158.py
diff --git a/eos/effects/shiparmorthermalresistancepbc2.py b/eos/effects/effect7159.py
similarity index 100%
rename from eos/effects/shiparmorthermalresistancepbc2.py
rename to eos/effects/effect7159.py
diff --git a/eos/effects/shiparmoremresistancepbc2.py b/eos/effects/effect7160.py
similarity index 100%
rename from eos/effects/shiparmoremresistancepbc2.py
rename to eos/effects/effect7160.py
diff --git a/eos/effects/shiparmorexplosiveresistancepbc2.py b/eos/effects/effect7161.py
similarity index 100%
rename from eos/effects/shiparmorexplosiveresistancepbc2.py
rename to eos/effects/effect7161.py
diff --git a/eos/effects/shiproledisintegratormaxrangecbc.py b/eos/effects/effect7162.py
similarity index 100%
rename from eos/effects/shiproledisintegratormaxrangecbc.py
rename to eos/effects/effect7162.py
diff --git a/eos/effects/shipmoduleremotearmormutadaptiverepairer.py b/eos/effects/effect7166.py
similarity index 100%
rename from eos/effects/shipmoduleremotearmormutadaptiverepairer.py
rename to eos/effects/effect7166.py
diff --git a/eos/effects/shipbonusremotecapacitortransferrangerole1.py b/eos/effects/effect7167.py
similarity index 100%
rename from eos/effects/shipbonusremotecapacitortransferrangerole1.py
rename to eos/effects/effect7167.py
diff --git a/eos/effects/shipbonusmutadaptiveremoterepairrangerole3.py b/eos/effects/effect7168.py
similarity index 100%
rename from eos/effects/shipbonusmutadaptiveremoterepairrangerole3.py
rename to eos/effects/effect7168.py
diff --git a/eos/effects/shipbonusmutadaptiverepamountpc1.py b/eos/effects/effect7169.py
similarity index 100%
rename from eos/effects/shipbonusmutadaptiverepamountpc1.py
rename to eos/effects/effect7169.py
diff --git a/eos/effects/shipbonusmutadaptiverepcapneedpc2.py b/eos/effects/effect7170.py
similarity index 100%
rename from eos/effects/shipbonusmutadaptiverepcapneedpc2.py
rename to eos/effects/effect7170.py
diff --git a/eos/effects/shipbonusmutadaptiveremotereprangepc1.py b/eos/effects/effect7171.py
similarity index 100%
rename from eos/effects/shipbonusmutadaptiveremotereprangepc1.py
rename to eos/effects/effect7171.py
diff --git a/eos/effects/shipbonusmutadaptiveremoterepcapneedelitebonuslogisitics1.py b/eos/effects/effect7172.py
similarity index 100%
rename from eos/effects/shipbonusmutadaptiveremoterepcapneedelitebonuslogisitics1.py
rename to eos/effects/effect7172.py
diff --git a/eos/effects/shipbonusmutadaptiveremoterepamountelitebonuslogisitics2.py b/eos/effects/effect7173.py
similarity index 100%
rename from eos/effects/shipbonusmutadaptiveremoterepamountelitebonuslogisitics2.py
rename to eos/effects/effect7173.py
diff --git a/eos/effects/skillbonusdroneinterfacingnotfighters.py b/eos/effects/effect7176.py
similarity index 100%
rename from eos/effects/skillbonusdroneinterfacingnotfighters.py
rename to eos/effects/effect7176.py
diff --git a/eos/effects/skillbonusdronedurabilitynotfighters.py b/eos/effects/effect7177.py
similarity index 100%
rename from eos/effects/skillbonusdronedurabilitynotfighters.py
rename to eos/effects/effect7177.py
diff --git a/eos/effects/stripminerdurationmultiplier.py b/eos/effects/effect7179.py
similarity index 100%
rename from eos/effects/stripminerdurationmultiplier.py
rename to eos/effects/effect7179.py
diff --git a/eos/effects/miningdurationmultiplieronline.py b/eos/effects/effect7180.py
similarity index 100%
rename from eos/effects/miningdurationmultiplieronline.py
rename to eos/effects/effect7180.py
diff --git a/eos/effects/implantwarpscramblerangebonus.py b/eos/effects/effect7183.py
similarity index 100%
rename from eos/effects/implantwarpscramblerangebonus.py
rename to eos/effects/effect7183.py
diff --git a/eos/effects/shipbonuscargo2gi.py b/eos/effects/effect726.py
similarity index 100%
rename from eos/effects/shipbonuscargo2gi.py
rename to eos/effects/effect726.py
diff --git a/eos/effects/shipbonuscargoci.py b/eos/effects/effect727.py
similarity index 100%
rename from eos/effects/shipbonuscargoci.py
rename to eos/effects/effect727.py
diff --git a/eos/effects/shipbonuscargomi.py b/eos/effects/effect728.py
similarity index 100%
rename from eos/effects/shipbonuscargomi.py
rename to eos/effects/effect728.py
diff --git a/eos/effects/shipbonusvelocitygi.py b/eos/effects/effect729.py
similarity index 100%
rename from eos/effects/shipbonusvelocitygi.py
rename to eos/effects/effect729.py
diff --git a/eos/effects/shipbonusvelocityci.py b/eos/effects/effect730.py
similarity index 100%
rename from eos/effects/shipbonusvelocityci.py
rename to eos/effects/effect730.py
diff --git a/eos/effects/shipvelocitybonusai.py b/eos/effects/effect732.py
similarity index 100%
rename from eos/effects/shipvelocitybonusai.py
rename to eos/effects/effect732.py
diff --git a/eos/effects/shipbonuscapcapab.py b/eos/effects/effect736.py
similarity index 100%
rename from eos/effects/shipbonuscapcapab.py
rename to eos/effects/effect736.py
diff --git a/eos/effects/surveyscanspeedbonuspostpercentdurationlocationshipmodulesrequiringelectronics.py b/eos/effects/effect744.py
similarity index 100%
rename from eos/effects/surveyscanspeedbonuspostpercentdurationlocationshipmodulesrequiringelectronics.py
rename to eos/effects/effect744.py
diff --git a/eos/effects/shiphybriddamagebonuscf.py b/eos/effects/effect754.py
similarity index 100%
rename from eos/effects/shiphybriddamagebonuscf.py
rename to eos/effects/effect754.py
diff --git a/eos/effects/shipetdamageaf.py b/eos/effects/effect757.py
similarity index 100%
rename from eos/effects/shipetdamageaf.py
rename to eos/effects/effect757.py
diff --git a/eos/effects/shipbonussmallmissilerofcf2.py b/eos/effects/effect760.py
similarity index 100%
rename from eos/effects/shipbonussmallmissilerofcf2.py
rename to eos/effects/effect760.py
diff --git a/eos/effects/missiledmgbonus.py b/eos/effects/effect763.py
similarity index 100%
rename from eos/effects/missiledmgbonus.py
rename to eos/effects/effect763.py
diff --git a/eos/effects/missilebombardmentmaxflighttimebonuspostpercentexplosiondelayownercharmodulesrequiringmissilelauncheroperation.py b/eos/effects/effect784.py
similarity index 100%
rename from eos/effects/missilebombardmentmaxflighttimebonuspostpercentexplosiondelayownercharmodulesrequiringmissilelauncheroperation.py
rename to eos/effects/effect784.py
diff --git a/eos/effects/ammoinfluencecapneed.py b/eos/effects/effect804.py
similarity index 100%
rename from eos/effects/ammoinfluencecapneed.py
rename to eos/effects/effect804.py
diff --git a/eos/effects/skillfreightbonus.py b/eos/effects/effect836.py
similarity index 100%
rename from eos/effects/skillfreightbonus.py
rename to eos/effects/effect836.py
diff --git a/eos/effects/cloakingtargetingdelaybonuspostpercentcloakingtargetingdelaybonusforshipmodulesrequiringcloaking.py b/eos/effects/effect848.py
similarity index 100%
rename from eos/effects/cloakingtargetingdelaybonuspostpercentcloakingtargetingdelaybonusforshipmodulesrequiringcloaking.py
rename to eos/effects/effect848.py
diff --git a/eos/effects/cloakingscanresolutionmultiplier.py b/eos/effects/effect854.py
similarity index 100%
rename from eos/effects/cloakingscanresolutionmultiplier.py
rename to eos/effects/effect854.py
diff --git a/eos/effects/warpskillspeed.py b/eos/effects/effect856.py
similarity index 100%
rename from eos/effects/warpskillspeed.py
rename to eos/effects/effect856.py
diff --git a/eos/effects/shipprojectileoptimalbonusemf2.py b/eos/effects/effect874.py
similarity index 100%
rename from eos/effects/shipprojectileoptimalbonusemf2.py
rename to eos/effects/effect874.py
diff --git a/eos/effects/shiphybridrangebonuscf2.py b/eos/effects/effect882.py
similarity index 100%
rename from eos/effects/shiphybridrangebonuscf2.py
rename to eos/effects/effect882.py
diff --git a/eos/effects/shipetspeedbonusab2.py b/eos/effects/effect887.py
similarity index 100%
rename from eos/effects/shipetspeedbonusab2.py
rename to eos/effects/effect887.py
diff --git a/eos/effects/missilelauncherspeedmultiplier.py b/eos/effects/effect889.py
similarity index 100%
rename from eos/effects/missilelauncherspeedmultiplier.py
rename to eos/effects/effect889.py
diff --git a/eos/effects/projectileweaponspeedmultiply.py b/eos/effects/effect89.py
similarity index 100%
rename from eos/effects/projectileweaponspeedmultiply.py
rename to eos/effects/effect89.py
diff --git a/eos/effects/shipcruisemissilevelocitybonuscb3.py b/eos/effects/effect891.py
similarity index 100%
rename from eos/effects/shipcruisemissilevelocitybonuscb3.py
rename to eos/effects/effect891.py
diff --git a/eos/effects/shiptorpedosvelocitybonuscb3.py b/eos/effects/effect892.py
similarity index 100%
rename from eos/effects/shiptorpedosvelocitybonuscb3.py
rename to eos/effects/effect892.py
diff --git a/eos/effects/covertopscpubonus1.py b/eos/effects/effect896.py
similarity index 100%
rename from eos/effects/covertopscpubonus1.py
rename to eos/effects/effect896.py
diff --git a/eos/effects/shipmissilekineticdamagecf.py b/eos/effects/effect898.py
similarity index 100%
rename from eos/effects/shipmissilekineticdamagecf.py
rename to eos/effects/effect898.py
diff --git a/eos/effects/shipmissilekineticdamagecc.py b/eos/effects/effect899.py
similarity index 100%
rename from eos/effects/shipmissilekineticdamagecc.py
rename to eos/effects/effect899.py
diff --git a/eos/effects/shipdronescoutthermaldamagegf2.py b/eos/effects/effect900.py
similarity index 100%
rename from eos/effects/shipdronescoutthermaldamagegf2.py
rename to eos/effects/effect900.py
diff --git a/eos/effects/shiplaserrofac2.py b/eos/effects/effect907.py
similarity index 100%
rename from eos/effects/shiplaserrofac2.py
rename to eos/effects/effect907.py
diff --git a/eos/effects/shiparmorhpac2.py b/eos/effects/effect909.py
similarity index 100%
rename from eos/effects/shiparmorhpac2.py
rename to eos/effects/effect909.py
diff --git a/eos/effects/energyweapondamagemultiply.py b/eos/effects/effect91.py
similarity index 100%
rename from eos/effects/energyweapondamagemultiply.py
rename to eos/effects/effect91.py
diff --git a/eos/effects/shipmissilelauncherrofcc2.py b/eos/effects/effect912.py
similarity index 100%
rename from eos/effects/shipmissilelauncherrofcc2.py
rename to eos/effects/effect912.py
diff --git a/eos/effects/shipdronesmaxgc2.py b/eos/effects/effect918.py
similarity index 100%
rename from eos/effects/shipdronesmaxgc2.py
rename to eos/effects/effect918.py
diff --git a/eos/effects/shiphybridtrackinggc2.py b/eos/effects/effect919.py
similarity index 100%
rename from eos/effects/shiphybridtrackinggc2.py
rename to eos/effects/effect919.py
diff --git a/eos/effects/projectileweapondamagemultiply.py b/eos/effects/effect92.py
similarity index 100%
rename from eos/effects/projectileweapondamagemultiply.py
rename to eos/effects/effect92.py
diff --git a/eos/effects/hybridweapondamagemultiply.py b/eos/effects/effect93.py
similarity index 100%
rename from eos/effects/hybridweapondamagemultiply.py
rename to eos/effects/effect93.py
diff --git a/eos/effects/energyweaponspeedmultiply.py b/eos/effects/effect95.py
similarity index 100%
rename from eos/effects/energyweaponspeedmultiply.py
rename to eos/effects/effect95.py
diff --git a/eos/effects/shiparmoremresistanceac2.py b/eos/effects/effect958.py
similarity index 100%
rename from eos/effects/shiparmoremresistanceac2.py
rename to eos/effects/effect958.py
diff --git a/eos/effects/shiparmorexplosiveresistanceac2.py b/eos/effects/effect959.py
similarity index 100%
rename from eos/effects/shiparmorexplosiveresistanceac2.py
rename to eos/effects/effect959.py
diff --git a/eos/effects/hybridweaponspeedmultiply.py b/eos/effects/effect96.py
similarity index 100%
rename from eos/effects/hybridweaponspeedmultiply.py
rename to eos/effects/effect96.py
diff --git a/eos/effects/shiparmorkineticresistanceac2.py b/eos/effects/effect960.py
similarity index 100%
rename from eos/effects/shiparmorkineticresistanceac2.py
rename to eos/effects/effect960.py
diff --git a/eos/effects/shiparmorthermalresistanceac2.py b/eos/effects/effect961.py
similarity index 100%
rename from eos/effects/shiparmorthermalresistanceac2.py
rename to eos/effects/effect961.py
diff --git a/eos/effects/shipprojectiledmgmc2.py b/eos/effects/effect968.py
similarity index 100%
rename from eos/effects/shipprojectiledmgmc2.py
rename to eos/effects/effect968.py
diff --git a/eos/effects/cloakingwarpsafe.py b/eos/effects/effect980.py
similarity index 100%
rename from eos/effects/cloakingwarpsafe.py
rename to eos/effects/effect980.py
diff --git a/eos/effects/elitebonusgunshiphybridoptimal1.py b/eos/effects/effect989.py
similarity index 100%
rename from eos/effects/elitebonusgunshiphybridoptimal1.py
rename to eos/effects/effect989.py
diff --git a/eos/effects/elitebonusgunshiplaseroptimal1.py b/eos/effects/effect991.py
similarity index 100%
rename from eos/effects/elitebonusgunshiplaseroptimal1.py
rename to eos/effects/effect991.py
diff --git a/eos/effects/elitebonusgunshiphybridtracking2.py b/eos/effects/effect996.py
similarity index 100%
rename from eos/effects/elitebonusgunshiphybridtracking2.py
rename to eos/effects/effect996.py
diff --git a/eos/effects/elitebonusgunshipprojectilefalloff2.py b/eos/effects/effect998.py
similarity index 100%
rename from eos/effects/elitebonusgunshipprojectilefalloff2.py
rename to eos/effects/effect998.py
diff --git a/eos/effects/elitebonusgunshipshieldboost2.py b/eos/effects/effect999.py
similarity index 100%
rename from eos/effects/elitebonusgunshipshieldboost2.py
rename to eos/effects/effect999.py
diff --git a/eos/gamedata.py b/eos/gamedata.py
index 658a8c82b..41e700e48 100644
--- a/eos/gamedata.py
+++ b/eos/gamedata.py
@@ -32,6 +32,11 @@ from logbook import Logger
 
 pyfalog = Logger(__name__)
 
+try:
+    import eos.effects.all as all_effects_module
+except ImportError:
+    all_effects_module = None
+
 
 class Effect(EqBase):
     """
@@ -44,8 +49,6 @@ class Effect(EqBase):
     @ivar description: The description of this effect, this is usualy pretty useless
     @ivar published: Wether this effect is published or not, unpublished effects are typicaly unused.
     """
-    # Filter to change names of effects to valid python method names
-    nameFilter = re.compile("[^A-Za-z0-9]")
 
     @reconstructor
     def init(self):
@@ -54,7 +57,7 @@ class Effect(EqBase):
         """
         self.__generated = False
         self.__effectModule = None
-        self.handlerName = re.sub(self.nameFilter, "", self.name).lower()
+        self.handlerName = "effect{}".format(self.ID)
 
     @property
     def handler(self):
@@ -158,25 +161,25 @@ class Effect(EqBase):
         if it doesn't, set dummy values and add a dummy handler
         """
         try:
-            import eos.effects.all as all
-            func = getattr(all, self.handlerName)
-            self.__effectModule = effectModule = func()
-            self.__handler = effectModule.get("handler", effectDummy)
-            self.__runTime = effectModule.get("runTime", "normal")
-            self.__activeByDefault = effectModule.get("activeByDefault", True)
-            t = effectModule.get("type", None)
+            if all_effects_module:
+                func = getattr(all_effects_module, self.handlerName)
+                self.__effectModule = effectModule = func()
+                self.__handler = effectModule.get("handler", effectDummy)
+                self.__runTime = effectModule.get("runTime", "normal")
+                self.__activeByDefault = effectModule.get("activeByDefault", True)
+                t = effectModule.get("type", None)
 
-            t = t if isinstance(t, tuple) or t is None else (t,)
-            self.__type = t
-        # except ImportError as e:
-        #     self.__effectModule = effectModule = importlib.import_module('eos.effects.' + self.handlerName)
-        #     self.__handler = getattr(effectModule, "handler", effectDummy)
-        #     self.__runTime = getattr(effectModule, "runTime", "normal")
-        #     self.__activeByDefault = getattr(effectModule, "activeByDefault", True)
-        #     t = getattr(effectModule, "type", None)
-        #
-        #     t = t if isinstance(t, tuple) or t is None else (t,)
-        #     self.__type = t
+                t = t if isinstance(t, tuple) or t is None else (t,)
+                self.__type = t
+            else:
+                self.__effectModule = effectModule = importlib.import_module('eos.effects.' + self.handlerName)
+                self.__handler = getattr(effectModule, "handler", effectDummy)
+                self.__runTime = getattr(effectModule, "runTime", "normal")
+                self.__activeByDefault = getattr(effectModule, "activeByDefault", True)
+                t = getattr(effectModule, "type", None)
+
+                t = t if isinstance(t, tuple) or t is None else (t,)
+                self.__type = t
         except ImportError as e:
             # Effect probably doesn't exist, so create a dummy effect and flag it with a warning.
             self.__handler = effectDummy

From fff07078dc472a5a0503e0ac204a6f33ad0720f6 Mon Sep 17 00:00:00 2001
From: Ryan Holmes <holmes.ryan.90@gmail.com>
Date: Sat, 16 Mar 2019 14:36:35 -0400
Subject: [PATCH 07/32] add eos config option for all effects

---
 eos/config.py   | 2 ++
 eos/gamedata.py | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/eos/config.py b/eos/config.py
index c6c53f748..2f7807a36 100644
--- a/eos/config.py
+++ b/eos/config.py
@@ -15,6 +15,8 @@ gamedata_date = ""
 gamedata_connectionstring = 'sqlite:///' + realpath(join(dirname(abspath(__file__)), "..", "eve.db"))
 pyfalog.debug("Gamedata connection string: {0}", gamedata_connectionstring)
 
+use_all_effect_module = True
+
 if istravis is True or hasattr(sys, '_called_from_test'):
     # Running in Travis. Run saveddata database in memory.
     saveddata_connectionstring = 'sqlite:///:memory:'
diff --git a/eos/gamedata.py b/eos/gamedata.py
index 41e700e48..e07d43aa9 100644
--- a/eos/gamedata.py
+++ b/eos/gamedata.py
@@ -20,7 +20,7 @@
 import re
 
 from sqlalchemy.orm import reconstructor
-
+import eos.config as config
 import eos.db
 from .eqBase import EqBase
 from eos.saveddata.price import Price as types_Price
@@ -161,7 +161,7 @@ class Effect(EqBase):
         if it doesn't, set dummy values and add a dummy handler
         """
         try:
-            if all_effects_module:
+            if all_effects_module and config.use_all_effect_module:
                 func = getattr(all_effects_module, self.handlerName)
                 self.__effectModule = effectModule = func()
                 self.__handler = effectModule.get("handler", effectDummy)

From 1a992a90ad10ffadf0f8829a89ba3fb016f79816 Mon Sep 17 00:00:00 2001
From: Ryan Holmes <holmes.ryan.90@gmail.com>
Date: Sat, 16 Mar 2019 19:11:27 -0400
Subject: [PATCH 08/32] Add logging

---
 eos/gamedata.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/eos/gamedata.py b/eos/gamedata.py
index e07d43aa9..ffe3bf608 100644
--- a/eos/gamedata.py
+++ b/eos/gamedata.py
@@ -162,6 +162,7 @@ class Effect(EqBase):
         """
         try:
             if all_effects_module and config.use_all_effect_module:
+                pyfalog.debug("Loading {0} from all module".format(self.handlerName))
                 func = getattr(all_effects_module, self.handlerName)
                 self.__effectModule = effectModule = func()
                 self.__handler = effectModule.get("handler", effectDummy)
@@ -172,6 +173,7 @@ class Effect(EqBase):
                 t = t if isinstance(t, tuple) or t is None else (t,)
                 self.__type = t
             else:
+                pyfalog.debug("Loading {0} from effect file".format(self.handlerName))
                 self.__effectModule = effectModule = importlib.import_module('eos.effects.' + self.handlerName)
                 self.__handler = getattr(effectModule, "handler", effectDummy)
                 self.__runTime = getattr(effectModule, "runTime", "normal")

From 1603201166986c8feca4d35b084e6c38f220788d Mon Sep 17 00:00:00 2001
From: Ryan Holmes <holmes.ryan.90@gmail.com>
Date: Thu, 21 Mar 2019 19:47:31 -0400
Subject: [PATCH 09/32] Add "Can fit" grouping

---
 gui/builtinItemStatsViews/attributeGrouping.py |  8 ++++++++
 gui/builtinItemStatsViews/itemAttributes.py    | 14 +++++++++++---
 service/const.py                               |  1 +
 3 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/gui/builtinItemStatsViews/attributeGrouping.py b/gui/builtinItemStatsViews/attributeGrouping.py
index c93e97010..6780c176c 100644
--- a/gui/builtinItemStatsViews/attributeGrouping.py
+++ b/gui/builtinItemStatsViews/attributeGrouping.py
@@ -207,8 +207,15 @@ AttrGroupDict = {
             "fighterSquadronOrbitRange",
         ]
     },
+    GuiAttrGroup.SHIP_GROUP           : {
+        "label" : "Can Fit To",
+        "attributes": []
+    },
 }
 
+AttrGroupDict[GuiAttrGroup.SHIP_GROUP]["attributes"].extend([("canFitShipGroup{:02d}".format(i+1), "Group") for i in range(20)])
+AttrGroupDict[GuiAttrGroup.SHIP_GROUP]["attributes"].extend([("canFitShipType{:01d}".format(i+1), "Ship") for i in range(20)])
+
 Group1 = [
     GuiAttrGroup.FITTING,
     GuiAttrGroup.STRUCTURE,
@@ -222,6 +229,7 @@ Group1 = [
     GuiAttrGroup.ON_DEATH,
     GuiAttrGroup.JUMP_SYSTEMS,
     GuiAttrGroup.PROPULSIONS,
+    GuiAttrGroup.SHIP_GROUP
 ]
 
 CategoryGroups = {
diff --git a/gui/builtinItemStatsViews/itemAttributes.py b/gui/builtinItemStatsViews/itemAttributes.py
index 20065b6b0..558762d70 100644
--- a/gui/builtinItemStatsViews/itemAttributes.py
+++ b/gui/builtinItemStatsViews/itemAttributes.py
@@ -173,9 +173,15 @@ class ItemParams(wx.Panel):
         self.paramList.AssignImageList(self.imageList)
 
     def AddAttribute(self, parent, attr):
+        display = None
+
+        if isinstance(attr, tuple):
+            display = attr[1]
+            attr = attr[0]
+
         if attr in self.attrValues and attr not in self.processed_attribs:
 
-            data = self.GetData(attr)
+            data = self.GetData(attr, display)
             if data is None:
                 return
 
@@ -203,7 +209,7 @@ class ItemParams(wx.Panel):
         misc_parent = root
 
         # We must first deet4ermine if it's categorey already has defined groupings set for it. Otherwise, we default to just using the fitting group
-        order = CategoryGroups.get(self.item.category.categoryName, [GuiAttrGroup.FITTING])
+        order = CategoryGroups.get(self.item.category.categoryName, [GuiAttrGroup.FITTING, GuiAttrGroup.SHIP_GROUP])
         # start building out the tree
         for data in [AttrGroupDict[o] for o in order]:
             heading = data.get("label")
@@ -257,6 +263,8 @@ class ItemParams(wx.Panel):
             self.paramList.SetColumnWidth(i, wx.LIST_AUTOSIZE)
 
     def GetData(self, attr):
+
+    def GetData(self, attr, displayOveride = None):
         info = self.attrInfo.get(attr)
         att = self.attrValues[attr]
 
@@ -275,7 +283,7 @@ class ItemParams(wx.Panel):
             return None
 
         if info and info.displayName and self.toggleView == AttributeView.NORMAL:
-            attrName = info.displayName
+            attrName = displayOveride or info.displayName
         else:
             attrName = attr
 
diff --git a/service/const.py b/service/const.py
index 1f83b38a9..d09d809f6 100644
--- a/service/const.py
+++ b/service/const.py
@@ -101,3 +101,4 @@ class GuiAttrGroup(IntEnum):
     JUMP_SYSTEMS = auto()
     PROPULSIONS = auto()
     FIGHTERS = auto()
+    SHIP_GROUP = auto()
\ No newline at end of file

From 7fd545aad4a351cb55951b5c508303337218d10a Mon Sep 17 00:00:00 2001
From: Ryan Holmes <holmes.ryan.90@gmail.com>
Date: Thu, 21 Mar 2019 19:57:27 -0400
Subject: [PATCH 10/32] add rollup to macos build

---
 .travis.yml               | 1 +
 dist_assets/mac/pyfa.spec | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 9140c2f10..2aae5823c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,6 +12,7 @@ before_install:
   - bash scripts/setup-osx.sh
 install:
   - export PYFA_VERSION="$(python3 scripts/dump_version.py)"
+  - python3 ./scripts/effect_rollup.py
   - bash scripts/package-osx.sh
 before_deploy:
   - export RELEASE_PKG_FILE=$(ls *.deb)
diff --git a/dist_assets/mac/pyfa.spec b/dist_assets/mac/pyfa.spec
index 1e1f35711..a461774de 100644
--- a/dist_assets/mac/pyfa.spec
+++ b/dist_assets/mac/pyfa.spec
@@ -35,7 +35,7 @@ import_these = [
 icon = os.path.join(os.getcwd(), "dist_assets", "mac", "pyfa.icns")
 
 # Walk directories that do dynamic importing
-paths = ('eos/effects', 'eos/db/migrations', 'service/conversions')
+paths = ('eos/db/migrations', 'service/conversions')
 for root, folders, files in chain.from_iterable(os.walk(path) for path in paths):
     for file_ in files:
         if file_.endswith(".py") and not file_.startswith("_"):

From d922bf8913dc9181ea199a332940e4006299bf86 Mon Sep 17 00:00:00 2001
From: Ryan Holmes <holmes.ryan.90@gmail.com>
Date: Thu, 21 Mar 2019 20:30:37 -0400
Subject: [PATCH 11/32] fix bad resets

---
 gui/builtinItemStatsViews/itemAttributes.py | 2 --
 1 file changed, 2 deletions(-)

diff --git a/gui/builtinItemStatsViews/itemAttributes.py b/gui/builtinItemStatsViews/itemAttributes.py
index 558762d70..324e64c22 100644
--- a/gui/builtinItemStatsViews/itemAttributes.py
+++ b/gui/builtinItemStatsViews/itemAttributes.py
@@ -262,8 +262,6 @@ class ItemParams(wx.Panel):
         for i in range(self.paramList.GetMainWindow().GetColumnCount()):
             self.paramList.SetColumnWidth(i, wx.LIST_AUTOSIZE)
 
-    def GetData(self, attr):
-
     def GetData(self, attr, displayOveride = None):
         info = self.attrInfo.get(attr)
         att = self.attrValues[attr]

From aacb95df7c8be448d3149802c0232c298f1bb4ff Mon Sep 17 00:00:00 2001
From: Ryan Holmes <holmes.ryan.90@gmail.com>
Date: Thu, 21 Mar 2019 21:23:30 -0400
Subject: [PATCH 12/32] more info in logging

---
 eos/gamedata.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/eos/gamedata.py b/eos/gamedata.py
index ffe3bf608..40fbefe2f 100644
--- a/eos/gamedata.py
+++ b/eos/gamedata.py
@@ -162,7 +162,7 @@ class Effect(EqBase):
         """
         try:
             if all_effects_module and config.use_all_effect_module:
-                pyfalog.debug("Loading {0} from all module".format(self.handlerName))
+                pyfalog.debug("Loading {0} ({1}) from all module".format(self.handlerName, self.name))
                 func = getattr(all_effects_module, self.handlerName)
                 self.__effectModule = effectModule = func()
                 self.__handler = effectModule.get("handler", effectDummy)
@@ -173,7 +173,7 @@ class Effect(EqBase):
                 t = t if isinstance(t, tuple) or t is None else (t,)
                 self.__type = t
             else:
-                pyfalog.debug("Loading {0} from effect file".format(self.handlerName))
+                pyfalog.debug("Loading {0} ({1}) from effect file".format(self.handlerName, self.name))
                 self.__effectModule = effectModule = importlib.import_module('eos.effects.' + self.handlerName)
                 self.__handler = getattr(effectModule, "handler", effectDummy)
                 self.__runTime = getattr(effectModule, "runTime", "normal")

From 0024bc551435c42d456f7343ad0bcbe73c7e434f Mon Sep 17 00:00:00 2001
From: DarkPhoenix <phoenix@mail.ru>
Date: Fri, 22 Mar 2019 12:56:15 +0300
Subject: [PATCH 13/32] Rename effect

---
 .../{structurecombatrigsecuritymodification.py => effect6672.py}  | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename eos/effects/{structurecombatrigsecuritymodification.py => effect6672.py} (100%)

diff --git a/eos/effects/structurecombatrigsecuritymodification.py b/eos/effects/effect6672.py
similarity index 100%
rename from eos/effects/structurecombatrigsecuritymodification.py
rename to eos/effects/effect6672.py

From 4cfcfedc142c6f16745d5747db4efbf24eda42bf Mon Sep 17 00:00:00 2001
From: DarkPhoenix <phoenix@mail.ru>
Date: Fri, 22 Mar 2019 15:30:14 +0300
Subject: [PATCH 14/32] Change the way effects are stored even in source

---
 .appveyor.yml             |     6 +-
 .gitignore                |     1 -
 .travis.yml               |     1 -
 eos/config.py             |     2 -
 eos/effects.py            | 22824 ++++++++++++++++++++++++++++++++++++
 eos/effects/__init__.py   |    19 -
 eos/effects/effect10.py   |    11 -
 eos/effects/effect1001.py |     9 -
 eos/effects/effect1003.py |    10 -
 eos/effects/effect1004.py |    10 -
 eos/effects/effect1005.py |    10 -
 eos/effects/effect1006.py |    10 -
 eos/effects/effect1007.py |    10 -
 eos/effects/effect1008.py |    10 -
 eos/effects/effect1009.py |    10 -
 eos/effects/effect101.py  |    32 -
 eos/effects/effect1010.py |    10 -
 eos/effects/effect1011.py |    10 -
 eos/effects/effect1012.py |    10 -
 eos/effects/effect1013.py |    10 -
 eos/effects/effect1014.py |    10 -
 eos/effects/effect1015.py |    10 -
 eos/effects/effect1016.py |    10 -
 eos/effects/effect1017.py |    10 -
 eos/effects/effect1018.py |    10 -
 eos/effects/effect1019.py |    10 -
 eos/effects/effect1020.py |    10 -
 eos/effects/effect1021.py |    11 -
 eos/effects/effect1024.py |    11 -
 eos/effects/effect1025.py |    11 -
 eos/effects/effect1030.py |    13 -
 eos/effects/effect1033.py |    10 -
 eos/effects/effect1034.py |    11 -
 eos/effects/effect1035.py |    10 -
 eos/effects/effect1036.py |    11 -
 eos/effects/effect1046.py |    10 -
 eos/effects/effect1047.py |    10 -
 eos/effects/effect1048.py |    11 -
 eos/effects/effect1049.py |    10 -
 eos/effects/effect1056.py |    11 -
 eos/effects/effect1057.py |    11 -
 eos/effects/effect1058.py |    11 -
 eos/effects/effect1060.py |    11 -
 eos/effects/effect1061.py |    12 -
 eos/effects/effect1062.py |    11 -
 eos/effects/effect1063.py |    11 -
 eos/effects/effect1080.py |    11 -
 eos/effects/effect1081.py |    11 -
 eos/effects/effect1082.py |    11 -
 eos/effects/effect1084.py |    10 -
 eos/effects/effect1087.py |    11 -
 eos/effects/effect1099.py |    12 -
 eos/effects/effect1176.py |    12 -
 eos/effects/effect1179.py |    11 -
 eos/effects/effect118.py  |     9 -
 eos/effects/effect1181.py |    11 -
 eos/effects/effect1182.py |    10 -
 eos/effects/effect1183.py |    12 -
 eos/effects/effect1184.py |    11 -
 eos/effects/effect1185.py |    10 -
 eos/effects/effect1190.py |    13 -
 eos/effects/effect1200.py |    12 -
 eos/effects/effect1212.py |     9 -
 eos/effects/effect1215.py |    12 -
 eos/effects/effect1218.py |    12 -
 eos/effects/effect1219.py |    11 -
 eos/effects/effect1220.py |    12 -
 eos/effects/effect1221.py |    10 -
 eos/effects/effect1222.py |    10 -
 eos/effects/effect1228.py |    11 -
 eos/effects/effect1230.py |    12 -
 eos/effects/effect1232.py |    11 -
 eos/effects/effect1233.py |    11 -
 eos/effects/effect1234.py |    11 -
 eos/effects/effect1239.py |    10 -
 eos/effects/effect1240.py |    10 -
 eos/effects/effect1255.py |    11 -
 eos/effects/effect1256.py |    10 -
 eos/effects/effect1261.py |    11 -
 eos/effects/effect1264.py |    11 -
 eos/effects/effect1268.py |    11 -
 eos/effects/effect1281.py |    14 -
 eos/effects/effect1318.py |    16 -
 eos/effects/effect1360.py |    12 -
 eos/effects/effect1361.py |    12 -
 eos/effects/effect1370.py |    12 -
 eos/effects/effect1372.py |    13 -
 eos/effects/effect1395.py |    10 -
 eos/effects/effect1397.py |    11 -
 eos/effects/effect1409.py |    13 -
 eos/effects/effect1410.py |    14 -
 eos/effects/effect1412.py |    10 -
 eos/effects/effect1434.py |    13 -
 eos/effects/effect1441.py |    10 -
 eos/effects/effect1442.py |    10 -
 eos/effects/effect1443.py |    12 -
 eos/effects/effect1445.py |    13 -
 eos/effects/effect1446.py |    13 -
 eos/effects/effect1448.py |    13 -
 eos/effects/effect1449.py |    10 -
 eos/effects/effect1450.py |    10 -
 eos/effects/effect1451.py |    10 -
 eos/effects/effect1452.py |    14 -
 eos/effects/effect1453.py |    10 -
 eos/effects/effect1472.py |    15 -
 eos/effects/effect1500.py |    12 -
 eos/effects/effect1550.py |    11 -
 eos/effects/effect1551.py |    12 -
 eos/effects/effect157.py  |    12 -
 eos/effects/effect1577.py |    14 -
 eos/effects/effect1579.py |    12 -
 eos/effects/effect1581.py |     9 -
 eos/effects/effect1585.py |    10 -
 eos/effects/effect1586.py |    10 -
 eos/effects/effect1587.py |    10 -
 eos/effects/effect1588.py |    12 -
 eos/effects/effect159.py  |    12 -
 eos/effects/effect1590.py |    15 -
 eos/effects/effect1592.py |    12 -
 eos/effects/effect1593.py |    12 -
 eos/effects/effect1594.py |    12 -
 eos/effects/effect1595.py |    12 -
 eos/effects/effect1596.py |    12 -
 eos/effects/effect1597.py |    12 -
 eos/effects/effect160.py  |    12 -
 eos/effects/effect161.py  |    12 -
 eos/effects/effect1615.py |    11 -
 eos/effects/effect1616.py |    10 -
 eos/effects/effect1617.py |     9 -
 eos/effects/effect162.py  |    13 -
 eos/effects/effect1634.py |    12 -
 eos/effects/effect1635.py |    13 -
 eos/effects/effect1638.py |    11 -
 eos/effects/effect1643.py |    20 -
 eos/effects/effect1644.py |    20 -
 eos/effects/effect1645.py |    18 -
 eos/effects/effect1646.py |    20 -
 eos/effects/effect1650.py |    11 -
 eos/effects/effect1657.py |    12 -
 eos/effects/effect1668.py |     9 -
 eos/effects/effect1669.py |     9 -
 eos/effects/effect1670.py |     9 -
 eos/effects/effect1671.py |     9 -
 eos/effects/effect1672.py |     9 -
 eos/effects/effect1673.py |     9 -
 eos/effects/effect1674.py |     9 -
 eos/effects/effect1675.py |     9 -
 eos/effects/effect17.py   |    15 -
 eos/effects/effect172.py  |    12 -
 eos/effects/effect1720.py |    13 -
 eos/effects/effect1722.py |    10 -
 eos/effects/effect173.py  |    12 -
 eos/effects/effect1730.py |    10 -
 eos/effects/effect1738.py |     9 -
 eos/effects/effect174.py  |    12 -
 eos/effects/effect1763.py |    15 -
 eos/effects/effect1764.py |    15 -
 eos/effects/effect1773.py |    11 -
 eos/effects/effect1804.py |    11 -
 eos/effects/effect1805.py |    12 -
 eos/effects/effect1806.py |    12 -
 eos/effects/effect1807.py |    12 -
 eos/effects/effect1812.py |     9 -
 eos/effects/effect1813.py |    10 -
 eos/effects/effect1814.py |    10 -
 eos/effects/effect1815.py |    10 -
 eos/effects/effect1816.py |    11 -
 eos/effects/effect1817.py |    12 -
 eos/effects/effect1819.py |    12 -
 eos/effects/effect1820.py |    12 -
 eos/effects/effect1848.py |    19 -
 eos/effects/effect1851.py |    12 -
 eos/effects/effect1862.py |    10 -
 eos/effects/effect1863.py |    10 -
 eos/effects/effect1864.py |    11 -
 eos/effects/effect1882.py |    11 -
 eos/effects/effect1885.py |    11 -
 eos/effects/effect1886.py |    11 -
 eos/effects/effect1896.py |    10 -
 eos/effects/effect1910.py |    12 -
 eos/effects/effect1911.py |    13 -
 eos/effects/effect1912.py |    13 -
 eos/effects/effect1913.py |    13 -
 eos/effects/effect1914.py |    13 -
 eos/effects/effect1921.py |    13 -
 eos/effects/effect1922.py |    12 -
 eos/effects/effect1959.py |     9 -
 eos/effects/effect1964.py |    10 -
 eos/effects/effect1969.py |    10 -
 eos/effects/effect1996.py |    11 -
 eos/effects/effect2000.py |    10 -
 eos/effects/effect2008.py |    10 -
 eos/effects/effect2013.py |    13 -
 eos/effects/effect2014.py |    14 -
 eos/effects/effect2015.py |    10 -
 eos/effects/effect2016.py |    10 -
 eos/effects/effect2017.py |    11 -
 eos/effects/effect2019.py |    12 -
 eos/effects/effect2020.py |    13 -
 eos/effects/effect2029.py |    10 -
 eos/effects/effect2041.py |    13 -
 eos/effects/effect2052.py |    12 -
 eos/effects/effect2053.py |    10 -
 eos/effects/effect2054.py |    11 -
 eos/effects/effect2055.py |    11 -
 eos/effects/effect2056.py |    11 -
 eos/effects/effect21.py   |    10 -
 eos/effects/effect2105.py |    10 -
 eos/effects/effect2106.py |    11 -
 eos/effects/effect2107.py |    11 -
 eos/effects/effect2108.py |    11 -
 eos/effects/effect2109.py |    10 -
 eos/effects/effect2110.py |    11 -
 eos/effects/effect2111.py |    11 -
 eos/effects/effect2112.py |    11 -
 eos/effects/effect212.py  |    13 -
 eos/effects/effect2130.py |    11 -
 eos/effects/effect2131.py |    12 -
 eos/effects/effect2132.py |    10 -
 eos/effects/effect2133.py |    11 -
 eos/effects/effect2134.py |    15 -
 eos/effects/effect2135.py |    16 -
 eos/effects/effect214.py  |    10 -
 eos/effects/effect2143.py |    11 -
 eos/effects/effect2155.py |    11 -
 eos/effects/effect2156.py |    10 -
 eos/effects/effect2157.py |    11 -
 eos/effects/effect2158.py |    10 -
 eos/effects/effect2160.py |    10 -
 eos/effects/effect2161.py |    11 -
 eos/effects/effect2179.py |    13 -
 eos/effects/effect2181.py |    11 -
 eos/effects/effect2186.py |    12 -
 eos/effects/effect2187.py |    12 -
 eos/effects/effect2188.py |    12 -
 eos/effects/effect2189.py |    10 -
 eos/effects/effect2200.py |    11 -
 eos/effects/effect2201.py |    10 -
 eos/effects/effect2215.py |    13 -
 eos/effects/effect223.py  |    10 -
 eos/effects/effect2232.py |    12 -
 eos/effects/effect2249.py |    10 -
 eos/effects/effect2250.py |    11 -
 eos/effects/effect2251.py |    14 -
 eos/effects/effect2252.py |    20 -
 eos/effects/effect2253.py |    17 -
 eos/effects/effect2255.py |    10 -
 eos/effects/effect227.py  |    10 -
 eos/effects/effect2298.py |    13 -
 eos/effects/effect230.py  |    13 -
 eos/effects/effect2302.py |    15 -
 eos/effects/effect2305.py |    12 -
 eos/effects/effect235.py  |     9 -
 eos/effects/effect2354.py |    12 -
 eos/effects/effect2355.py |    11 -
 eos/effects/effect2356.py |    10 -
 eos/effects/effect2402.py |    14 -
 eos/effects/effect242.py  |    10 -
 eos/effects/effect2422.py |    11 -
 eos/effects/effect2432.py |    15 -
 eos/effects/effect244.py  |    12 -
 eos/effects/effect2444.py |    11 -
 eos/effects/effect2445.py |    10 -
 eos/effects/effect2456.py |    13 -
 eos/effects/effect2465.py |    12 -
 eos/effects/effect2479.py |    11 -
 eos/effects/effect2485.py |    12 -
 eos/effects/effect2488.py |     9 -
 eos/effects/effect2489.py |    11 -
 eos/effects/effect2490.py |    11 -
 eos/effects/effect2491.py |    13 -
 eos/effects/effect2492.py |    13 -
 eos/effects/effect25.py   |     9 -
 eos/effects/effect2503.py |    12 -
 eos/effects/effect2504.py |    13 -
 eos/effects/effect2561.py |    11 -
 eos/effects/effect2589.py |    14 -
 eos/effects/effect26.py   |    12 -
 eos/effects/effect2602.py |    12 -
 eos/effects/effect2603.py |    12 -
 eos/effects/effect2604.py |    12 -
 eos/effects/effect2605.py |    12 -
 eos/effects/effect2611.py |    11 -
 eos/effects/effect2644.py |     9 -
 eos/effects/effect2645.py |    11 -
 eos/effects/effect2646.py |    10 -
 eos/effects/effect2647.py |    11 -
 eos/effects/effect2648.py |    11 -
 eos/effects/effect2649.py |    11 -
 eos/effects/effect2670.py |    19 -
 eos/effects/effect2688.py |    10 -
 eos/effects/effect2689.py |    10 -
 eos/effects/effect2690.py |    10 -
 eos/effects/effect2691.py |    10 -
 eos/effects/effect2693.py |    11 -
 eos/effects/effect2694.py |    11 -
 eos/effects/effect2695.py |    11 -
 eos/effects/effect2696.py |    11 -
 eos/effects/effect2697.py |    11 -
 eos/effects/effect2698.py |    11 -
 eos/effects/effect27.py   |    15 -
 eos/effects/effect2706.py |    10 -
 eos/effects/effect2707.py |    10 -
 eos/effects/effect2708.py |    10 -
 eos/effects/effect271.py  |    14 -
 eos/effects/effect2712.py |     9 -
 eos/effects/effect2713.py |     9 -
 eos/effects/effect2714.py |    10 -
 eos/effects/effect2716.py |    10 -
 eos/effects/effect2717.py |    11 -
 eos/effects/effect2718.py |    11 -
 eos/effects/effect272.py  |    14 -
 eos/effects/effect2726.py |     9 -
 eos/effects/effect2727.py |    10 -
 eos/effects/effect273.py  |    13 -
 eos/effects/effect2734.py |    12 -
 eos/effects/effect2735.py |    15 -
 eos/effects/effect2736.py |    18 -
 eos/effects/effect2737.py |    15 -
 eos/effects/effect2739.py |    18 -
 eos/effects/effect2741.py |    17 -
 eos/effects/effect2745.py |    16 -
 eos/effects/effect2746.py |    16 -
 eos/effects/effect2747.py |    17 -
 eos/effects/effect2748.py |    17 -
 eos/effects/effect2749.py |    16 -
 eos/effects/effect2756.py |    12 -
 eos/effects/effect2757.py |     9 -
 eos/effects/effect2760.py |    16 -
 eos/effects/effect2763.py |    17 -
 eos/effects/effect2766.py |    15 -
 eos/effects/effect277.py  |     9 -
 eos/effects/effect2776.py |    15 -
 eos/effects/effect2778.py |    15 -
 eos/effects/effect279.py  |    12 -
 eos/effects/effect2791.py |    17 -
 eos/effects/effect2792.py |    12 -
 eos/effects/effect2794.py |    12 -
 eos/effects/effect2795.py |    12 -
 eos/effects/effect2796.py |     9 -
 eos/effects/effect2797.py |    11 -
 eos/effects/effect2798.py |    11 -
 eos/effects/effect2799.py |    11 -
 eos/effects/effect2801.py |    11 -
 eos/effects/effect2802.py |    11 -
 eos/effects/effect2803.py |    11 -
 eos/effects/effect2804.py |    11 -
 eos/effects/effect2805.py |    12 -
 eos/effects/effect2809.py |    11 -
 eos/effects/effect2810.py |    11 -
 eos/effects/effect2812.py |    10 -
 eos/effects/effect2837.py |     9 -
 eos/effects/effect2847.py |    15 -
 eos/effects/effect2848.py |    13 -
 eos/effects/effect2849.py |    14 -
 eos/effects/effect2850.py |    10 -
 eos/effects/effect2851.py |    13 -
 eos/effects/effect2853.py |    10 -
 eos/effects/effect2857.py |     9 -
 eos/effects/effect2865.py |    12 -
 eos/effects/effect2866.py |    12 -
 eos/effects/effect2867.py |    11 -
 eos/effects/effect2868.py |    11 -
 eos/effects/effect287.py  |    12 -
 eos/effects/effect2872.py |    10 -
 eos/effects/effect2881.py |    10 -
 eos/effects/effect2882.py |    10 -
 eos/effects/effect2883.py |    10 -
 eos/effects/effect2884.py |    10 -
 eos/effects/effect2885.py |    10 -
 eos/effects/effect2887.py |    10 -
 eos/effects/effect2888.py |    10 -
 eos/effects/effect2889.py |    10 -
 eos/effects/effect2890.py |    10 -
 eos/effects/effect2891.py |    10 -
 eos/effects/effect2892.py |    10 -
 eos/effects/effect2893.py |    10 -
 eos/effects/effect2894.py |    10 -
 eos/effects/effect2899.py |    10 -
 eos/effects/effect290.py  |    13 -
 eos/effects/effect2900.py |    10 -
 eos/effects/effect2901.py |    10 -
 eos/effects/effect2902.py |    10 -
 eos/effects/effect2903.py |    10 -
 eos/effects/effect2904.py |    10 -
 eos/effects/effect2905.py |    10 -
 eos/effects/effect2906.py |    10 -
 eos/effects/effect2907.py |    10 -
 eos/effects/effect2908.py |    10 -
 eos/effects/effect2909.py |    10 -
 eos/effects/effect2910.py |    10 -
 eos/effects/effect2911.py |    10 -
 eos/effects/effect2967.py |    11 -
 eos/effects/effect2977.py |    10 -
 eos/effects/effect298.py  |    13 -
 eos/effects/effect2980.py |    10 -
 eos/effects/effect2982.py |    33 -
 eos/effects/effect3001.py |    11 -
 eos/effects/effect3002.py |    21 -
 eos/effects/effect3024.py |    12 -
 eos/effects/effect3025.py |    12 -
 eos/effects/effect3026.py |    11 -
 eos/effects/effect3027.py |    12 -
 eos/effects/effect3028.py |    10 -
 eos/effects/effect3029.py |    11 -
 eos/effects/effect3030.py |    11 -
 eos/effects/effect3031.py |    11 -
 eos/effects/effect3032.py |    11 -
 eos/effects/effect3035.py |    12 -
 eos/effects/effect3036.py |    10 -
 eos/effects/effect3046.py |     9 -
 eos/effects/effect3047.py |     9 -
 eos/effects/effect3061.py |    10 -
 eos/effects/effect315.py  |    10 -
 eos/effects/effect3169.py |    10 -
 eos/effects/effect3172.py |    14 -
 eos/effects/effect3173.py |    14 -
 eos/effects/effect3174.py |    12 -
 eos/effects/effect3175.py |    10 -
 eos/effects/effect3182.py |    14 -
 eos/effects/effect3196.py |    10 -
 eos/effects/effect3200.py |    12 -
 eos/effects/effect3201.py |    11 -
 eos/effects/effect3212.py |    11 -
 eos/effects/effect3234.py |    11 -
 eos/effects/effect3235.py |    11 -
 eos/effects/effect3236.py |    11 -
 eos/effects/effect3237.py |    11 -
 eos/effects/effect3241.py |    10 -
 eos/effects/effect3242.py |    10 -
 eos/effects/effect3243.py |    10 -
 eos/effects/effect3244.py |    10 -
 eos/effects/effect3249.py |     9 -
 eos/effects/effect3264.py |    11 -
 eos/effects/effect3267.py |    11 -
 eos/effects/effect3297.py |    11 -
 eos/effects/effect3298.py |    12 -
 eos/effects/effect3299.py |    13 -
 eos/effects/effect3313.py |     9 -
 eos/effects/effect3331.py |     9 -
 eos/effects/effect3335.py |     9 -
 eos/effects/effect3336.py |    10 -
 eos/effects/effect3339.py |    10 -
 eos/effects/effect3340.py |    10 -
 eos/effects/effect3343.py |    11 -
 eos/effects/effect3355.py |    11 -
 eos/effects/effect3356.py |    11 -
 eos/effects/effect3357.py |    11 -
 eos/effects/effect3366.py |    11 -
 eos/effects/effect3367.py |    11 -
 eos/effects/effect3369.py |    11 -
 eos/effects/effect3370.py |    11 -
 eos/effects/effect3371.py |    11 -
 eos/effects/effect3374.py |    10 -
 eos/effects/effect3379.py |    10 -
 eos/effects/effect3380.py |    35 -
 eos/effects/effect3392.py |    10 -
 eos/effects/effect34.py   |    15 -
 eos/effects/effect3403.py |    10 -
 eos/effects/effect3406.py |     9 -
 eos/effects/effect3415.py |    10 -
 eos/effects/effect3416.py |    10 -
 eos/effects/effect3417.py |    10 -
 eos/effects/effect3424.py |    10 -
 eos/effects/effect3425.py |    10 -
 eos/effects/effect3427.py |    10 -
 eos/effects/effect3439.py |    11 -
 eos/effects/effect3447.py |    11 -
 eos/effects/effect3466.py |    10 -
 eos/effects/effect3467.py |    10 -
 eos/effects/effect3468.py |    11 -
 eos/effects/effect3473.py |    10 -
 eos/effects/effect3478.py |    11 -
 eos/effects/effect3480.py |    10 -
 eos/effects/effect3483.py |    13 -
 eos/effects/effect3484.py |    11 -
 eos/effects/effect3487.py |    15 -
 eos/effects/effect3489.py |    11 -
 eos/effects/effect3493.py |    10 -
 eos/effects/effect3494.py |    10 -
 eos/effects/effect3495.py |    15 -
 eos/effects/effect3496.py |    11 -
 eos/effects/effect3498.py |    11 -
 eos/effects/effect3499.py |    12 -
 eos/effects/effect3513.py |    11 -
 eos/effects/effect3514.py |    10 -
 eos/effects/effect3519.py |    10 -
 eos/effects/effect3520.py |    10 -
 eos/effects/effect3526.py |    13 -
 eos/effects/effect3530.py |     9 -
 eos/effects/effect3532.py |    10 -
 eos/effects/effect3561.py |    13 -
 eos/effects/effect3568.py |    11 -
 eos/effects/effect3569.py |    11 -
 eos/effects/effect3570.py |    11 -
 eos/effects/effect3571.py |    11 -
 eos/effects/effect3586.py |    15 -
 eos/effects/effect3587.py |    11 -
 eos/effects/effect3588.py |    12 -
 eos/effects/effect3589.py |    12 -
 eos/effects/effect3590.py |    11 -
 eos/effects/effect3591.py |    13 -
 eos/effects/effect3592.py |     9 -
 eos/effects/effect3593.py |    10 -
 eos/effects/effect3597.py |    10 -
 eos/effects/effect3598.py |    10 -
 eos/effects/effect3599.py |    10 -
 eos/effects/effect3600.py |    10 -
 eos/effects/effect3601.py |     9 -
 eos/effects/effect3602.py |     9 -
 eos/effects/effect3617.py |    10 -
 eos/effects/effect3618.py |    10 -
 eos/effects/effect3619.py |    10 -
 eos/effects/effect3620.py |    10 -
 eos/effects/effect3648.py |     9 -
 eos/effects/effect3649.py |    11 -
 eos/effects/effect3650.py |    10 -
 eos/effects/effect3651.py |    10 -
 eos/effects/effect3652.py |    10 -
 eos/effects/effect3653.py |    10 -
 eos/effects/effect3655.py |    11 -
 eos/effects/effect3656.py |    11 -
 eos/effects/effect3657.py |    11 -
 eos/effects/effect3659.py |    11 -
 eos/effects/effect3660.py |    10 -
 eos/effects/effect3668.py |    10 -
 eos/effects/effect3669.py |    10 -
 eos/effects/effect3670.py |    10 -
 eos/effects/effect3671.py |    10 -
 eos/effects/effect3672.py |    11 -
 eos/effects/effect3677.py |    11 -
 eos/effects/effect3678.py |    11 -
 eos/effects/effect3679.py |    10 -
 eos/effects/effect3680.py |     9 -
 eos/effects/effect3681.py |     9 -
 eos/effects/effect3682.py |     9 -
 eos/effects/effect3683.py |     9 -
 eos/effects/effect3686.py |    10 -
 eos/effects/effect3703.py |    11 -
 eos/effects/effect3705.py |    11 -
 eos/effects/effect3706.py |    10 -
 eos/effects/effect3726.py |     9 -
 eos/effects/effect3727.py |    10 -
 eos/effects/effect3739.py |    10 -
 eos/effects/effect3740.py |    10 -
 eos/effects/effect3742.py |    15 -
 eos/effects/effect3744.py |    18 -
 eos/effects/effect3745.py |    10 -
 eos/effects/effect3765.py |    10 -
 eos/effects/effect3766.py |    11 -
 eos/effects/effect3767.py |    11 -
 eos/effects/effect3771.py |     9 -
 eos/effects/effect3773.py |    10 -
 eos/effects/effect3774.py |    11 -
 eos/effects/effect3782.py |     9 -
 eos/effects/effect3783.py |     9 -
 eos/effects/effect3797.py |     9 -
 eos/effects/effect3799.py |     9 -
 eos/effects/effect38.py   |     9 -
 eos/effects/effect3807.py |     9 -
 eos/effects/effect3808.py |    10 -
 eos/effects/effect3810.py |    10 -
 eos/effects/effect3811.py |     9 -
 eos/effects/effect3831.py |     9 -
 eos/effects/effect3857.py |    10 -
 eos/effects/effect3859.py |    10 -
 eos/effects/effect3860.py |    10 -
 eos/effects/effect3861.py |    11 -
 eos/effects/effect3863.py |    11 -
 eos/effects/effect3864.py |    11 -
 eos/effects/effect3865.py |    10 -
 eos/effects/effect3866.py |    10 -
 eos/effects/effect3867.py |    10 -
 eos/effects/effect3868.py |    10 -
 eos/effects/effect3869.py |    11 -
 eos/effects/effect3872.py |    11 -
 eos/effects/effect3875.py |    11 -
 eos/effects/effect3893.py |    10 -
 eos/effects/effect3895.py |    10 -
 eos/effects/effect3897.py |     9 -
 eos/effects/effect39.py   |    10 -
 eos/effects/effect3900.py |    10 -
 eos/effects/effect391.py  |    14 -
 eos/effects/effect392.py  |    12 -
 eos/effects/effect394.py  |    17 -
 eos/effects/effect395.py  |    17 -
 eos/effects/effect3959.py |    12 -
 eos/effects/effect396.py  |    13 -
 eos/effects/effect3961.py |    12 -
 eos/effects/effect3962.py |    15 -
 eos/effects/effect3964.py |    12 -
 eos/effects/effect397.py  |    14 -
 eos/effects/effect3976.py |    10 -
 eos/effects/effect3979.py |    12 -
 eos/effects/effect3980.py |    10 -
 eos/effects/effect3982.py |    10 -
 eos/effects/effect3992.py |    10 -
 eos/effects/effect3993.py |    12 -
 eos/effects/effect3995.py |    12 -
 eos/effects/effect3996.py |    12 -
 eos/effects/effect3997.py |    13 -
 eos/effects/effect3998.py |    13 -
 eos/effects/effect3999.py |    13 -
 eos/effects/effect4.py    |    12 -
 eos/effects/effect4002.py |    12 -
 eos/effects/effect4003.py |    11 -
 eos/effects/effect4016.py |    12 -
 eos/effects/effect4017.py |    12 -
 eos/effects/effect4018.py |    12 -
 eos/effects/effect4019.py |    12 -
 eos/effects/effect4020.py |    12 -
 eos/effects/effect4021.py |    12 -
 eos/effects/effect4022.py |    12 -
 eos/effects/effect4023.py |    11 -
 eos/effects/effect4033.py |    11 -
 eos/effects/effect4034.py |    11 -
 eos/effects/effect4035.py |    11 -
 eos/effects/effect4036.py |    11 -
 eos/effects/effect4037.py |    11 -
 eos/effects/effect4038.py |    11 -
 eos/effects/effect4039.py |    11 -
 eos/effects/effect4040.py |    11 -
 eos/effects/effect4041.py |    11 -
 eos/effects/effect4042.py |    11 -
 eos/effects/effect4043.py |    11 -
 eos/effects/effect4044.py |    11 -
 eos/effects/effect4045.py |    11 -
 eos/effects/effect4046.py |    11 -
 eos/effects/effect4047.py |    11 -
 eos/effects/effect4048.py |    11 -
 eos/effects/effect4049.py |    11 -
 eos/effects/effect4054.py |    12 -
 eos/effects/effect4055.py |    12 -
 eos/effects/effect4056.py |    12 -
 eos/effects/effect4057.py |    12 -
 eos/effects/effect4058.py |    12 -
 eos/effects/effect4059.py |    12 -
 eos/effects/effect4060.py |    12 -
 eos/effects/effect4061.py |    12 -
 eos/effects/effect4062.py |    12 -
 eos/effects/effect4063.py |    12 -
 eos/effects/effect408.py  |    12 -
 eos/effects/effect4086.py |    13 -
 eos/effects/effect4088.py |    13 -
 eos/effects/effect4089.py |    12 -
 eos/effects/effect4090.py |    10 -
 eos/effects/effect4091.py |    11 -
 eos/effects/effect4093.py |    11 -
 eos/effects/effect4104.py |    11 -
 eos/effects/effect4106.py |    11 -
 eos/effects/effect4114.py |    11 -
 eos/effects/effect4115.py |    11 -
 eos/effects/effect4122.py |    11 -
 eos/effects/effect4135.py |    11 -
 eos/effects/effect4136.py |    12 -
 eos/effects/effect4137.py |    12 -
 eos/effects/effect4138.py |    12 -
 eos/effects/effect414.py  |    13 -
 eos/effects/effect4152.py |    11 -
 eos/effects/effect4153.py |    11 -
 eos/effects/effect4154.py |    11 -
 eos/effects/effect4155.py |    11 -
 eos/effects/effect4158.py |    10 -
 eos/effects/effect4159.py |     9 -
 eos/effects/effect4161.py |    14 -
 eos/effects/effect4162.py |    18 -
 eos/effects/effect4165.py |    11 -
 eos/effects/effect4166.py |    11 -
 eos/effects/effect4167.py |    11 -
 eos/effects/effect4168.py |    11 -
 eos/effects/effect4187.py |    11 -
 eos/effects/effect4188.py |    11 -
 eos/effects/effect4189.py |    11 -
 eos/effects/effect4190.py |    11 -
 eos/effects/effect4215.py |    11 -
 eos/effects/effect4216.py |    10 -
 eos/effects/effect4217.py |    10 -
 eos/effects/effect4248.py |    17 -
 eos/effects/effect4250.py |    20 -
 eos/effects/effect4251.py |    11 -
 eos/effects/effect4256.py |    12 -
 eos/effects/effect4264.py |    10 -
 eos/effects/effect4265.py |    10 -
 eos/effects/effect4269.py |    10 -
 eos/effects/effect4270.py |    10 -
 eos/effects/effect4271.py |     9 -
 eos/effects/effect4272.py |    10 -
 eos/effects/effect4273.py |    10 -
 eos/effects/effect4274.py |    10 -
 eos/effects/effect4275.py |    10 -
 eos/effects/effect4277.py |    10 -
 eos/effects/effect4278.py |    10 -
 eos/effects/effect4280.py |    10 -
 eos/effects/effect4282.py |    11 -
 eos/effects/effect4283.py |    11 -
 eos/effects/effect4286.py |    10 -
 eos/effects/effect4288.py |    10 -
 eos/effects/effect4290.py |    11 -
 eos/effects/effect4292.py |    11 -
 eos/effects/effect4321.py |    18 -
 eos/effects/effect4327.py |    16 -
 eos/effects/effect4330.py |    11 -
 eos/effects/effect4331.py |    11 -
 eos/effects/effect4342.py |    10 -
 eos/effects/effect4343.py |    10 -
 eos/effects/effect4347.py |    12 -
 eos/effects/effect4351.py |    11 -
 eos/effects/effect4358.py |    11 -
 eos/effects/effect4360.py |    11 -
 eos/effects/effect4362.py |    16 -
 eos/effects/effect4366.py |    10 -
 eos/effects/effect4369.py |     9 -
 eos/effects/effect4370.py |    11 -
 eos/effects/effect4372.py |    11 -
 eos/effects/effect4373.py |    40 -
 eos/effects/effect4377.py |    11 -
 eos/effects/effect4378.py |    10 -
 eos/effects/effect4379.py |    10 -
 eos/effects/effect4380.py |    10 -
 eos/effects/effect4384.py |    11 -
 eos/effects/effect4385.py |    11 -
 eos/effects/effect4393.py |    12 -
 eos/effects/effect4394.py |    10 -
 eos/effects/effect4395.py |    12 -
 eos/effects/effect4396.py |    11 -
 eos/effects/effect4397.py |    10 -
 eos/effects/effect4398.py |    11 -
 eos/effects/effect4399.py |    10 -
 eos/effects/effect4400.py |    10 -
 eos/effects/effect4413.py |    10 -
 eos/effects/effect4415.py |    11 -
 eos/effects/effect4416.py |    10 -
 eos/effects/effect4417.py |    10 -
 eos/effects/effect4451.py |     9 -
 eos/effects/effect4452.py |     9 -
 eos/effects/effect4453.py |     9 -
 eos/effects/effect4454.py |    10 -
 eos/effects/effect4456.py |    12 -
 eos/effects/effect4457.py |    12 -
 eos/effects/effect4458.py |    12 -
 eos/effects/effect4459.py |    12 -
 eos/effects/effect446.py  |    14 -
 eos/effects/effect4460.py |    12 -
 eos/effects/effect4461.py |    12 -
 eos/effects/effect4462.py |    12 -
 eos/effects/effect4463.py |    12 -
 eos/effects/effect4464.py |    10 -
 eos/effects/effect4471.py |    12 -
 eos/effects/effect4472.py |    10 -
 eos/effects/effect4473.py |    10 -
 eos/effects/effect4474.py |    10 -
 eos/effects/effect4475.py |    10 -
 eos/effects/effect4476.py |    10 -
 eos/effects/effect4477.py |    10 -
 eos/effects/effect4478.py |    10 -
 eos/effects/effect4479.py |    11 -
 eos/effects/effect4482.py |    11 -
 eos/effects/effect4484.py |    10 -
 eos/effects/effect4485.py |    10 -
 eos/effects/effect4489.py |     9 -
 eos/effects/effect4490.py |     9 -
 eos/effects/effect4491.py |     9 -
 eos/effects/effect4492.py |     9 -
 eos/effects/effect4510.py |    11 -
 eos/effects/effect4512.py |    11 -
 eos/effects/effect4513.py |    11 -
 eos/effects/effect4515.py |    11 -
 eos/effects/effect4516.py |    11 -
 eos/effects/effect4527.py |    11 -
 eos/effects/effect4555.py |    10 -
 eos/effects/effect4556.py |    10 -
 eos/effects/effect4557.py |    10 -
 eos/effects/effect4558.py |    10 -
 eos/effects/effect4559.py |    12 -
 eos/effects/effect4575.py |   114 -
 eos/effects/effect4576.py |    11 -
 eos/effects/effect4577.py |    11 -
 eos/effects/effect4579.py |    10 -
 eos/effects/effect4619.py |    10 -
 eos/effects/effect4620.py |    11 -
 eos/effects/effect4621.py |    12 -
 eos/effects/effect4622.py |    10 -
 eos/effects/effect4623.py |    10 -
 eos/effects/effect4624.py |    10 -
 eos/effects/effect4625.py |    10 -
 eos/effects/effect4626.py |    11 -
 eos/effects/effect4635.py |    13 -
 eos/effects/effect4636.py |    11 -
 eos/effects/effect4637.py |    12 -
 eos/effects/effect4640.py |    14 -
 eos/effects/effect4643.py |    13 -
 eos/effects/effect4645.py |    12 -
 eos/effects/effect4648.py |    12 -
 eos/effects/effect4649.py |    11 -
 eos/effects/effect4667.py |    11 -
 eos/effects/effect4668.py |    11 -
 eos/effects/effect4669.py |    11 -
 eos/effects/effect4670.py |    11 -
 eos/effects/effect4728.py |    32 -
 eos/effects/effect4760.py |    10 -
 eos/effects/effect4775.py |    11 -
 eos/effects/effect4782.py |    10 -
 eos/effects/effect4789.py |    10 -
 eos/effects/effect4793.py |    10 -
 eos/effects/effect4794.py |    10 -
 eos/effects/effect4795.py |    10 -
 eos/effects/effect4799.py |    13 -
 eos/effects/effect48.py   |    17 -
 eos/effects/effect4804.py |    12 -
 eos/effects/effect4809.py |    11 -
 eos/effects/effect4810.py |    11 -
 eos/effects/effect4811.py |    12 -
 eos/effects/effect4812.py |    11 -
 eos/effects/effect4814.py |    10 -
 eos/effects/effect4817.py |    10 -
 eos/effects/effect4820.py |    10 -
 eos/effects/effect4821.py |    11 -
 eos/effects/effect4822.py |    10 -
 eos/effects/effect4823.py |    10 -
 eos/effects/effect4824.py |    11 -
 eos/effects/effect4825.py |    10 -
 eos/effects/effect4826.py |    10 -
 eos/effects/effect4827.py |    11 -
 eos/effects/effect485.py  |    13 -
 eos/effects/effect486.py  |    13 -
 eos/effects/effect4867.py |    12 -
 eos/effects/effect4868.py |    12 -
 eos/effects/effect4869.py |    11 -
 eos/effects/effect4871.py |    11 -
 eos/effects/effect4896.py |    10 -
 eos/effects/effect4897.py |    10 -
 eos/effects/effect4898.py |    10 -
 eos/effects/effect490.py  |    14 -
 eos/effects/effect4901.py |    10 -
 eos/effects/effect4902.py |    12 -
 eos/effects/effect4906.py |    12 -
 eos/effects/effect4911.py |     9 -
 eos/effects/effect4921.py |     9 -
 eos/effects/effect4923.py |    10 -
 eos/effects/effect4928.py |   128 -
 eos/effects/effect4934.py |    11 -
 eos/effects/effect4936.py |    12 -
 eos/effects/effect494.py  |    12 -
 eos/effects/effect4941.py |    11 -
 eos/effects/effect4942.py |     9 -
 eos/effects/effect4945.py |    10 -
 eos/effects/effect4946.py |    10 -
 eos/effects/effect4950.py |    10 -
 eos/effects/effect4951.py |    13 -
 eos/effects/effect4961.py |    13 -
 eos/effects/effect4967.py |    11 -
 eos/effects/effect4970.py |    20 -
 eos/effects/effect4972.py |    10 -
 eos/effects/effect4973.py |    10 -
 eos/effects/effect4974.py |    11 -
 eos/effects/effect4975.py |    10 -
 eos/effects/effect4976.py |    13 -
 eos/effects/effect4989.py |    10 -
 eos/effects/effect4990.py |    11 -
 eos/effects/effect4991.py |    12 -
 eos/effects/effect4994.py |    13 -
 eos/effects/effect4995.py |    13 -
 eos/effects/effect4996.py |    13 -
 eos/effects/effect4997.py |    13 -
 eos/effects/effect4999.py |    10 -
 eos/effects/effect50.py   |    13 -
 eos/effects/effect5000.py |    10 -
 eos/effects/effect5008.py |    11 -
 eos/effects/effect5009.py |    11 -
 eos/effects/effect5011.py |    11 -
 eos/effects/effect5012.py |    11 -
 eos/effects/effect5013.py |    12 -
 eos/effects/effect5014.py |    14 -
 eos/effects/effect5015.py |    10 -
 eos/effects/effect5016.py |    10 -
 eos/effects/effect5017.py |    10 -
 eos/effects/effect5018.py |     9 -
 eos/effects/effect5019.py |    10 -
 eos/effects/effect5020.py |    11 -
 eos/effects/effect5021.py |    11 -
 eos/effects/effect5028.py |    12 -
 eos/effects/effect5029.py |    12 -
 eos/effects/effect5030.py |    13 -
 eos/effects/effect5035.py |    16 -
 eos/effects/effect5036.py |    10 -
 eos/effects/effect504.py  |    12 -
 eos/effects/effect5045.py |    10 -
 eos/effects/effect5048.py |    10 -
 eos/effects/effect5051.py |    10 -
 eos/effects/effect5055.py |    10 -
 eos/effects/effect5058.py |    10 -
 eos/effects/effect5059.py |    11 -
 eos/effects/effect506.py  |    11 -
 eos/effects/effect5066.py |    11 -
 eos/effects/effect5067.py |     9 -
 eos/effects/effect5068.py |     9 -
 eos/effects/effect5069.py |    12 -
 eos/effects/effect507.py  |    11 -
 eos/effects/effect5079.py |    10 -
 eos/effects/effect508.py  |    16 -
 eos/effects/effect5080.py |    12 -
 eos/effects/effect5081.py |    10 -
 eos/effects/effect5087.py |    13 -
 eos/effects/effect5090.py |    11 -
 eos/effects/effect51.py   |    14 -
 eos/effects/effect5103.py |    10 -
 eos/effects/effect5104.py |    10 -
 eos/effects/effect5105.py |    10 -
 eos/effects/effect5106.py |    10 -
 eos/effects/effect5107.py |    10 -
 eos/effects/effect5108.py |    11 -
 eos/effects/effect5109.py |    11 -
 eos/effects/effect511.py  |    16 -
 eos/effects/effect5110.py |    11 -
 eos/effects/effect5111.py |    11 -
 eos/effects/effect5119.py |    11 -
 eos/effects/effect512.py  |    15 -
 eos/effects/effect5121.py |    11 -
 eos/effects/effect5122.py |    10 -
 eos/effects/effect5123.py |    10 -
 eos/effects/effect5124.py |    10 -
 eos/effects/effect5125.py |    11 -
 eos/effects/effect5126.py |    10 -
 eos/effects/effect5127.py |    10 -
 eos/effects/effect5128.py |    10 -
 eos/effects/effect5129.py |    12 -
 eos/effects/effect5131.py |    12 -
 eos/effects/effect5132.py |    11 -
 eos/effects/effect5133.py |    10 -
 eos/effects/effect5136.py |    13 -
 eos/effects/effect5139.py |    11 -
 eos/effects/effect514.py  |    13 -
 eos/effects/effect5142.py |    11 -
 eos/effects/effect5153.py |    11 -
 eos/effects/effect5156.py |    11 -
 eos/effects/effect516.py  |    12 -
 eos/effects/effect5162.py |    13 -
 eos/effects/effect5165.py |    11 -
 eos/effects/effect5168.py |    11 -
 eos/effects/effect5180.py |    10 -
 eos/effects/effect5181.py |     9 -
 eos/effects/effect5182.py |    10 -
 eos/effects/effect5183.py |     9 -
 eos/effects/effect5185.py |    11 -
 eos/effects/effect5187.py |    11 -
 eos/effects/effect5188.py |    11 -
 eos/effects/effect5189.py |    11 -
 eos/effects/effect5190.py |    11 -
 eos/effects/effect5201.py |    11 -
 eos/effects/effect5205.py |    10 -
 eos/effects/effect5206.py |    10 -
 eos/effects/effect5207.py |    10 -
 eos/effects/effect5208.py |    10 -
 eos/effects/effect5209.py |    11 -
 eos/effects/effect521.py  |    10 -
 eos/effects/effect5212.py |    10 -
 eos/effects/effect5213.py |    10 -
 eos/effects/effect5214.py |    10 -
 eos/effects/effect5215.py |    10 -
 eos/effects/effect5216.py |    10 -
 eos/effects/effect5217.py |    10 -
 eos/effects/effect5218.py |    10 -
 eos/effects/effect5219.py |    10 -
 eos/effects/effect5220.py |    10 -
 eos/effects/effect5221.py |    10 -
 eos/effects/effect5222.py |    10 -
 eos/effects/effect5223.py |    10 -
 eos/effects/effect5224.py |    10 -
 eos/effects/effect5225.py |    10 -
 eos/effects/effect5226.py |    10 -
 eos/effects/effect5227.py |    10 -
 eos/effects/effect5228.py |    10 -
 eos/effects/effect5229.py |    14 -
 eos/effects/effect5230.py |    13 -
 eos/effects/effect5231.py |    13 -
 eos/effects/effect5234.py |    12 -
 eos/effects/effect5237.py |    11 -
 eos/effects/effect5240.py |    12 -
 eos/effects/effect5243.py |    12 -
 eos/effects/effect5259.py |    11 -
 eos/effects/effect5260.py |    11 -
 eos/effects/effect5261.py |    10 -
 eos/effects/effect5262.py |    10 -
 eos/effects/effect5263.py |    10 -
 eos/effects/effect5264.py |    10 -
 eos/effects/effect5265.py |    10 -
 eos/effects/effect5266.py |    12 -
 eos/effects/effect5267.py |    11 -
 eos/effects/effect5268.py |    11 -
 eos/effects/effect527.py  |    11 -
 eos/effects/effect5275.py |    20 -
 eos/effects/effect529.py  |    10 -
 eos/effects/effect5293.py |    10 -
 eos/effects/effect5294.py |    10 -
 eos/effects/effect5295.py |    10 -
 eos/effects/effect5300.py |    14 -
 eos/effects/effect5303.py |    10 -
 eos/effects/effect5304.py |    10 -
 eos/effects/effect5305.py |    11 -
 eos/effects/effect5306.py |    11 -
 eos/effects/effect5307.py |    10 -
 eos/effects/effect5308.py |    10 -
 eos/effects/effect5309.py |    10 -
 eos/effects/effect5310.py |    11 -
 eos/effects/effect5311.py |    10 -
 eos/effects/effect5316.py |    14 -
 eos/effects/effect5317.py |    11 -
 eos/effects/effect5318.py |    10 -
 eos/effects/effect5319.py |    11 -
 eos/effects/effect5320.py |    11 -
 eos/effects/effect5321.py |    11 -
 eos/effects/effect5322.py |    11 -
 eos/effects/effect5323.py |    11 -
 eos/effects/effect5324.py |    11 -
 eos/effects/effect5325.py |    11 -
 eos/effects/effect5326.py |    11 -
 eos/effects/effect5331.py |    11 -
 eos/effects/effect5332.py |    11 -
 eos/effects/effect5333.py |    11 -
 eos/effects/effect5334.py |    10 -
 eos/effects/effect5335.py |    12 -
 eos/effects/effect5336.py |    12 -
 eos/effects/effect5337.py |    12 -
 eos/effects/effect5338.py |    12 -
 eos/effects/effect5339.py |    12 -
 eos/effects/effect5340.py |    12 -
 eos/effects/effect5341.py |    11 -
 eos/effects/effect5342.py |    13 -
 eos/effects/effect5343.py |    11 -
 eos/effects/effect5348.py |    11 -
 eos/effects/effect5349.py |    10 -
 eos/effects/effect5350.py |    10 -
 eos/effects/effect5351.py |    12 -
 eos/effects/effect5352.py |    11 -
 eos/effects/effect5353.py |    10 -
 eos/effects/effect5354.py |    11 -
 eos/effects/effect5355.py |    11 -
 eos/effects/effect5356.py |    10 -
 eos/effects/effect5357.py |    11 -
 eos/effects/effect5358.py |    11 -
 eos/effects/effect5359.py |    11 -
 eos/effects/effect536.py  |    10 -
 eos/effects/effect5360.py |    10 -
 eos/effects/effect5361.py |    10 -
 eos/effects/effect5364.py |    13 -
 eos/effects/effect5365.py |    12 -
 eos/effects/effect5366.py |    10 -
 eos/effects/effect5367.py |    11 -
 eos/effects/effect5378.py |    11 -
 eos/effects/effect5379.py |    11 -
 eos/effects/effect5380.py |    11 -
 eos/effects/effect5381.py |    12 -
 eos/effects/effect5382.py |    11 -
 eos/effects/effect5383.py |    11 -
 eos/effects/effect5384.py |    11 -
 eos/effects/effect5385.py |    11 -
 eos/effects/effect5386.py |    10 -
 eos/effects/effect5387.py |    10 -
 eos/effects/effect5388.py |    10 -
 eos/effects/effect5389.py |    10 -
 eos/effects/effect5390.py |    10 -
 eos/effects/effect5397.py |    12 -
 eos/effects/effect5398.py |    10 -
 eos/effects/effect5399.py |    11 -
 eos/effects/effect5402.py |    11 -
 eos/effects/effect5403.py |    11 -
 eos/effects/effect5410.py |    11 -
 eos/effects/effect5411.py |    10 -
 eos/effects/effect5417.py |    10 -
 eos/effects/effect5418.py |    10 -
 eos/effects/effect5419.py |    10 -
 eos/effects/effect542.py  |    11 -
 eos/effects/effect5420.py |    10 -
 eos/effects/effect5424.py |    11 -
 eos/effects/effect5427.py |    10 -
 eos/effects/effect5428.py |    10 -
 eos/effects/effect5429.py |    11 -
 eos/effects/effect5430.py |    11 -
 eos/effects/effect5431.py |    11 -
 eos/effects/effect5433.py |    15 -
 eos/effects/effect5437.py |    14 -
 eos/effects/effect5440.py |    12 -
 eos/effects/effect5444.py |    10 -
 eos/effects/effect5445.py |    10 -
 eos/effects/effect5456.py |    10 -
 eos/effects/effect5457.py |    10 -
 eos/effects/effect5459.py |     9 -
 eos/effects/effect5460.py |    20 -
 eos/effects/effect5461.py |     9 -
 eos/effects/effect5468.py |     9 -
 eos/effects/effect5469.py |     9 -
 eos/effects/effect5470.py |     9 -
 eos/effects/effect5471.py |     9 -
 eos/effects/effect5476.py |    10 -
 eos/effects/effect5477.py |    10 -
 eos/effects/effect5478.py |    10 -
 eos/effects/effect5479.py |    10 -
 eos/effects/effect5480.py |    11 -
 eos/effects/effect5482.py |    11 -
 eos/effects/effect5483.py |    11 -
 eos/effects/effect5484.py |    11 -
 eos/effects/effect5485.py |    10 -
 eos/effects/effect5486.py |    11 -
 eos/effects/effect549.py  |    13 -
 eos/effects/effect5496.py |    11 -
 eos/effects/effect5497.py |    11 -
 eos/effects/effect5498.py |    11 -
 eos/effects/effect5499.py |    11 -
 eos/effects/effect55.py   |    10 -
 eos/effects/effect550.py  |    16 -
 eos/effects/effect5500.py |    11 -
 eos/effects/effect5501.py |    11 -
 eos/effects/effect5502.py |    11 -
 eos/effects/effect5503.py |    11 -
 eos/effects/effect5504.py |    11 -
 eos/effects/effect5505.py |    10 -
 eos/effects/effect5514.py |    13 -
 eos/effects/effect5521.py |    13 -
 eos/effects/effect553.py  |    10 -
 eos/effects/effect5539.py |    10 -
 eos/effects/effect5540.py |    10 -
 eos/effects/effect5541.py |    10 -
 eos/effects/effect5542.py |    10 -
 eos/effects/effect5552.py |    11 -
 eos/effects/effect5553.py |    11 -
 eos/effects/effect5554.py |    11 -
 eos/effects/effect5555.py |    10 -
 eos/effects/effect5556.py |    10 -
 eos/effects/effect5557.py |    11 -
 eos/effects/effect5558.py |    11 -
 eos/effects/effect5559.py |    10 -
 eos/effects/effect5560.py |    10 -
 eos/effects/effect5564.py |    40 -
 eos/effects/effect5568.py |    40 -
 eos/effects/effect5570.py |    41 -
 eos/effects/effect5572.py |    18 -
 eos/effects/effect5573.py |    18 -
 eos/effects/effect5574.py |    18 -
 eos/effects/effect5575.py |    18 -
 eos/effects/effect56.py   |    15 -
 eos/effects/effect5607.py |    13 -
 eos/effects/effect5610.py |    11 -
 eos/effects/effect5611.py |    10 -
 eos/effects/effect5618.py |    11 -
 eos/effects/effect5619.py |    10 -
 eos/effects/effect562.py  |    17 -
 eos/effects/effect5620.py |    10 -
 eos/effects/effect5621.py |    10 -
 eos/effects/effect5622.py |    10 -
 eos/effects/effect5628.py |    10 -
 eos/effects/effect5629.py |    11 -
 eos/effects/effect5630.py |    11 -
 eos/effects/effect5631.py |    11 -
 eos/effects/effect5632.py |    11 -
 eos/effects/effect5633.py |    10 -
 eos/effects/effect5634.py |    11 -
 eos/effects/effect5635.py |    11 -
 eos/effects/effect5636.py |    10 -
 eos/effects/effect5637.py |    11 -
 eos/effects/effect5638.py |    11 -
 eos/effects/effect5639.py |    11 -
 eos/effects/effect5644.py |    10 -
 eos/effects/effect5647.py |    17 -
 eos/effects/effect5650.py |    12 -
 eos/effects/effect5657.py |    12 -
 eos/effects/effect5673.py |    11 -
 eos/effects/effect5676.py |    11 -
 eos/effects/effect5688.py |    10 -
 eos/effects/effect5695.py |    11 -
 eos/effects/effect57.py   |    14 -
 eos/effects/effect5717.py |    11 -
 eos/effects/effect5721.py |    10 -
 eos/effects/effect5722.py |    10 -
 eos/effects/effect5723.py |    11 -
 eos/effects/effect5724.py |    10 -
 eos/effects/effect5725.py |    10 -
 eos/effects/effect5726.py |    10 -
 eos/effects/effect5733.py |    10 -
 eos/effects/effect5734.py |    10 -
 eos/effects/effect5735.py |    10 -
 eos/effects/effect5736.py |    10 -
 eos/effects/effect5737.py |    10 -
 eos/effects/effect5738.py |    12 -
 eos/effects/effect5754.py |    12 -
 eos/effects/effect5757.py |    20 -
 eos/effects/effect5758.py |     9 -
 eos/effects/effect5769.py |    12 -
 eos/effects/effect5778.py |    11 -
 eos/effects/effect5779.py |    11 -
 eos/effects/effect5793.py |    13 -
 eos/effects/effect58.py   |    15 -
 eos/effects/effect5802.py |    10 -
 eos/effects/effect5803.py |    10 -
 eos/effects/effect5804.py |    10 -
 eos/effects/effect5805.py |    10 -
 eos/effects/effect5806.py |    10 -
 eos/effects/effect5807.py |    10 -
 eos/effects/effect5808.py |    10 -
 eos/effects/effect5809.py |    10 -
 eos/effects/effect581.py  |    12 -
 eos/effects/effect5810.py |    10 -
 eos/effects/effect5811.py |    11 -
 eos/effects/effect5812.py |    11 -
 eos/effects/effect5813.py |    11 -
 eos/effects/effect5814.py |    11 -
 eos/effects/effect5815.py |    11 -
 eos/effects/effect5816.py |    11 -
 eos/effects/effect5817.py |    11 -
 eos/effects/effect5818.py |    11 -
 eos/effects/effect5819.py |    11 -
 eos/effects/effect582.py  |    10 -
 eos/effects/effect5820.py |    11 -
 eos/effects/effect5821.py |    11 -
 eos/effects/effect5822.py |    11 -
 eos/effects/effect5823.py |    11 -
 eos/effects/effect5824.py |    11 -
 eos/effects/effect5825.py |    11 -
 eos/effects/effect5826.py |    12 -
 eos/effects/effect5827.py |    10 -
 eos/effects/effect5829.py |    11 -
 eos/effects/effect5832.py |    11 -
 eos/effects/effect5839.py |    11 -
 eos/effects/effect584.py  |    12 -
 eos/effects/effect5840.py |    10 -
 eos/effects/effect5852.py |    11 -
 eos/effects/effect5853.py |    10 -
 eos/effects/effect5862.py |    10 -
 eos/effects/effect5863.py |    11 -
 eos/effects/effect5864.py |    11 -
 eos/effects/effect5865.py |    11 -
 eos/effects/effect5866.py |    10 -
 eos/effects/effect5867.py |    12 -
 eos/effects/effect5868.py |     9 -
 eos/effects/effect5869.py |    10 -
 eos/effects/effect587.py  |    10 -
 eos/effects/effect5870.py |    10 -
 eos/effects/effect5871.py |    10 -
 eos/effects/effect5872.py |    11 -
 eos/effects/effect5873.py |    11 -
 eos/effects/effect5874.py |    10 -
 eos/effects/effect588.py  |    10 -
 eos/effects/effect5881.py |    12 -
 eos/effects/effect5888.py |    12 -
 eos/effects/effect5889.py |    10 -
 eos/effects/effect589.py  |    10 -
 eos/effects/effect5890.py |    10 -
 eos/effects/effect5891.py |    10 -
 eos/effects/effect5892.py |    10 -
 eos/effects/effect5893.py |    10 -
 eos/effects/effect5896.py |    12 -
 eos/effects/effect5899.py |    12 -
 eos/effects/effect59.py   |    11 -
 eos/effects/effect590.py  |    12 -
 eos/effects/effect5900.py |     9 -
 eos/effects/effect5901.py |    11 -
 eos/effects/effect5911.py |    11 -
 eos/effects/effect5912.py |    12 -
 eos/effects/effect5913.py |    10 -
 eos/effects/effect5914.py |    13 -
 eos/effects/effect5915.py |    13 -
 eos/effects/effect5916.py |    12 -
 eos/effects/effect5917.py |    12 -
 eos/effects/effect5918.py |    12 -
 eos/effects/effect5919.py |    12 -
 eos/effects/effect5920.py |    11 -
 eos/effects/effect5921.py |    13 -
 eos/effects/effect5922.py |    12 -
 eos/effects/effect5923.py |    13 -
 eos/effects/effect5924.py |    13 -
 eos/effects/effect5925.py |    13 -
 eos/effects/effect5926.py |    13 -
 eos/effects/effect5927.py |    13 -
 eos/effects/effect5929.py |    12 -
 eos/effects/effect5934.py |    25 -
 eos/effects/effect5938.py |    11 -
 eos/effects/effect5939.py |    10 -
 eos/effects/effect5940.py |    10 -
 eos/effects/effect5944.py |    10 -
 eos/effects/effect5945.py |    16 -
 eos/effects/effect5951.py |     9 -
 eos/effects/effect5956.py |    10 -
 eos/effects/effect5957.py |    11 -
 eos/effects/effect5958.py |    11 -
 eos/effects/effect5959.py |    11 -
 eos/effects/effect596.py  |     9 -
 eos/effects/effect598.py  |    11 -
 eos/effects/effect599.py  |    14 -
 eos/effects/effect5994.py |    11 -
 eos/effects/effect5995.py |    12 -
 eos/effects/effect5998.py |    11 -
 eos/effects/effect60.py   |    10 -
 eos/effects/effect600.py  |    10 -
 eos/effects/effect6001.py |    10 -
 eos/effects/effect6006.py |    11 -
 eos/effects/effect6007.py |    11 -
 eos/effects/effect6008.py |    11 -
 eos/effects/effect6009.py |    10 -
 eos/effects/effect6010.py |    14 -
 eos/effects/effect6011.py |    15 -
 eos/effects/effect6012.py |    15 -
 eos/effects/effect6014.py |    11 -
 eos/effects/effect6015.py |    20 -
 eos/effects/effect6016.py |    14 -
 eos/effects/effect6017.py |    14 -
 eos/effects/effect602.py  |    14 -
 eos/effects/effect6020.py |    10 -
 eos/effects/effect6021.py |    10 -
 eos/effects/effect6025.py |    10 -
 eos/effects/effect6027.py |    11 -
 eos/effects/effect6032.py |    10 -
 eos/effects/effect6036.py |    11 -
 eos/effects/effect6037.py |    11 -
 eos/effects/effect6038.py |    11 -
 eos/effects/effect6039.py |    15 -
 eos/effects/effect604.py  |    14 -
 eos/effects/effect6040.py |    15 -
 eos/effects/effect6041.py |    21 -
 eos/effects/effect6045.py |    10 -
 eos/effects/effect6046.py |    10 -
 eos/effects/effect6047.py |    10 -
 eos/effects/effect6048.py |    10 -
 eos/effects/effect6051.py |    10 -
 eos/effects/effect6052.py |    10 -
 eos/effects/effect6053.py |    10 -
 eos/effects/effect6054.py |    10 -
 eos/effects/effect6055.py |    10 -
 eos/effects/effect6056.py |    10 -
 eos/effects/effect6057.py |    10 -
 eos/effects/effect6058.py |    10 -
 eos/effects/effect6059.py |    10 -
 eos/effects/effect6060.py |    10 -
 eos/effects/effect6061.py |    10 -
 eos/effects/effect6062.py |    10 -
 eos/effects/effect6063.py |    15 -
 eos/effects/effect607.py  |    16 -
 eos/effects/effect6076.py |    15 -
 eos/effects/effect6077.py |    11 -
 eos/effects/effect6083.py |    13 -
 eos/effects/effect6085.py |    11 -
 eos/effects/effect6088.py |    13 -
 eos/effects/effect6093.py |    13 -
 eos/effects/effect6096.py |    13 -
 eos/effects/effect6098.py |    11 -
 eos/effects/effect61.py   |     9 -
 eos/effects/effect6104.py |    10 -
 eos/effects/effect6110.py |    11 -
 eos/effects/effect6111.py |    11 -
 eos/effects/effect6112.py |    11 -
 eos/effects/effect6113.py |    12 -
 eos/effects/effect6128.py |    10 -
 eos/effects/effect6129.py |    10 -
 eos/effects/effect6130.py |     9 -
 eos/effects/effect6131.py |     9 -
 eos/effects/effect6135.py |    17 -
 eos/effects/effect6144.py |    16 -
 eos/effects/effect6148.py |    11 -
 eos/effects/effect6149.py |    11 -
 eos/effects/effect6150.py |    11 -
 eos/effects/effect6151.py |    18 -
 eos/effects/effect6152.py |    15 -
 eos/effects/effect6153.py |    13 -
 eos/effects/effect6154.py |    15 -
 eos/effects/effect6155.py |    13 -
 eos/effects/effect6163.py |    10 -
 eos/effects/effect6164.py |    10 -
 eos/effects/effect6166.py |    15 -
 eos/effects/effect6170.py |    10 -
 eos/effects/effect6171.py |     9 -
 eos/effects/effect6172.py |    12 -
 eos/effects/effect6173.py |    13 -
 eos/effects/effect6174.py |    12 -
 eos/effects/effect6175.py |    11 -
 eos/effects/effect6176.py |    11 -
 eos/effects/effect6177.py |    11 -
 eos/effects/effect6178.py |    11 -
 eos/effects/effect6184.py |    22 -
 eos/effects/effect6185.py |    15 -
 eos/effects/effect6186.py |    12 -
 eos/effects/effect6187.py |    21 -
 eos/effects/effect6188.py |    17 -
 eos/effects/effect6195.py |    16 -
 eos/effects/effect6196.py |    10 -
 eos/effects/effect6197.py |    21 -
 eos/effects/effect6201.py |     9 -
 eos/effects/effect6208.py |    10 -
 eos/effects/effect6214.py |    11 -
 eos/effects/effect6216.py |    22 -
 eos/effects/effect6222.py |    20 -
 eos/effects/effect623.py  |    13 -
 eos/effects/effect6230.py |    10 -
 eos/effects/effect6232.py |    10 -
 eos/effects/effect6233.py |    10 -
 eos/effects/effect6234.py |    10 -
 eos/effects/effect6237.py |    10 -
 eos/effects/effect6238.py |    10 -
 eos/effects/effect6239.py |    10 -
 eos/effects/effect6241.py |    10 -
 eos/effects/effect6242.py |    10 -
 eos/effects/effect6245.py |    10 -
 eos/effects/effect6246.py |    10 -
 eos/effects/effect6253.py |    10 -
 eos/effects/effect6256.py |    10 -
 eos/effects/effect6257.py |    10 -
 eos/effects/effect6260.py |    10 -
 eos/effects/effect6267.py |    11 -
 eos/effects/effect627.py  |     9 -
 eos/effects/effect6272.py |    11 -
 eos/effects/effect6273.py |    11 -
 eos/effects/effect6278.py |    11 -
 eos/effects/effect6281.py |    10 -
 eos/effects/effect6285.py |    10 -
 eos/effects/effect6287.py |    10 -
 eos/effects/effect6291.py |    10 -
 eos/effects/effect6294.py |    10 -
 eos/effects/effect6299.py |    10 -
 eos/effects/effect63.py   |    10 -
 eos/effects/effect6300.py |    10 -
 eos/effects/effect6301.py |    12 -
 eos/effects/effect6305.py |    10 -
 eos/effects/effect6307.py |    10 -
 eos/effects/effect6308.py |    10 -
 eos/effects/effect6309.py |    10 -
 eos/effects/effect6310.py |    11 -
 eos/effects/effect6315.py |    19 -
 eos/effects/effect6316.py |    19 -
 eos/effects/effect6317.py |    10 -
 eos/effects/effect6318.py |    10 -
 eos/effects/effect6319.py |    10 -
 eos/effects/effect6320.py |    10 -
 eos/effects/effect6321.py |    10 -
 eos/effects/effect6322.py |    10 -
 eos/effects/effect6323.py |    10 -
 eos/effects/effect6324.py |    10 -
 eos/effects/effect6325.py |    10 -
 eos/effects/effect6326.py |    10 -
 eos/effects/effect6327.py |    10 -
 eos/effects/effect6328.py |    10 -
 eos/effects/effect6329.py |    11 -
 eos/effects/effect6330.py |    10 -
 eos/effects/effect6331.py |    10 -
 eos/effects/effect6332.py |    10 -
 eos/effects/effect6333.py |    10 -
 eos/effects/effect6334.py |    19 -
 eos/effects/effect6335.py |    10 -
 eos/effects/effect6336.py |    10 -
 eos/effects/effect6337.py |     9 -
 eos/effects/effect6338.py |    10 -
 eos/effects/effect6339.py |    19 -
 eos/effects/effect6340.py |    10 -
 eos/effects/effect6341.py |    10 -
 eos/effects/effect6342.py |    10 -
 eos/effects/effect6343.py |    10 -
 eos/effects/effect6350.py |    12 -
 eos/effects/effect6351.py |    11 -
 eos/effects/effect6352.py |    12 -
 eos/effects/effect6353.py |    12 -
 eos/effects/effect6354.py |    22 -
 eos/effects/effect6355.py |    11 -
 eos/effects/effect6356.py |    12 -
 eos/effects/effect6357.py |    10 -
 eos/effects/effect6358.py |    10 -
 eos/effects/effect6359.py |    10 -
 eos/effects/effect6360.py |    14 -
 eos/effects/effect6361.py |    10 -
 eos/effects/effect6362.py |    10 -
 eos/effects/effect6368.py |    15 -
 eos/effects/effect6369.py |    10 -
 eos/effects/effect6370.py |    11 -
 eos/effects/effect6371.py |    11 -
 eos/effects/effect6372.py |    11 -
 eos/effects/effect6373.py |    16 -
 eos/effects/effect6374.py |    12 -
 eos/effects/effect6377.py |    13 -
 eos/effects/effect6378.py |    13 -
 eos/effects/effect6379.py |     9 -
 eos/effects/effect6380.py |     9 -
 eos/effects/effect6381.py |    11 -
 eos/effects/effect6384.py |    15 -
 eos/effects/effect6385.py |    11 -
 eos/effects/effect6386.py |    18 -
 eos/effects/effect6395.py |    22 -
 eos/effects/effect6396.py |    13 -
 eos/effects/effect6400.py |    12 -
 eos/effects/effect6401.py |    12 -
 eos/effects/effect6402.py |    13 -
 eos/effects/effect6403.py |    12 -
 eos/effects/effect6404.py |    16 -
 eos/effects/effect6405.py |    12 -
 eos/effects/effect6406.py |    22 -
 eos/effects/effect6407.py |    13 -
 eos/effects/effect6408.py |    10 -
 eos/effects/effect6409.py |    12 -
 eos/effects/effect6410.py |    12 -
 eos/effects/effect6411.py |    12 -
 eos/effects/effect6412.py |    12 -
 eos/effects/effect6413.py |    12 -
 eos/effects/effect6417.py |    11 -
 eos/effects/effect6422.py |    17 -
 eos/effects/effect6423.py |    18 -
 eos/effects/effect6424.py |    18 -
 eos/effects/effect6425.py |    11 -
 eos/effects/effect6426.py |    14 -
 eos/effects/effect6427.py |    22 -
 eos/effects/effect6428.py |    18 -
 eos/effects/effect6431.py |    23 -
 eos/effects/effect6434.py |    26 -
 eos/effects/effect6435.py |    21 -
 eos/effects/effect6436.py |    20 -
 eos/effects/effect6437.py |    29 -
 eos/effects/effect6439.py |    40 -
 eos/effects/effect6441.py |    24 -
 eos/effects/effect6443.py |     9 -
 eos/effects/effect6447.py |     9 -
 eos/effects/effect6448.py |    18 -
 eos/effects/effect6449.py |    20 -
 eos/effects/effect6465.py |    20 -
 eos/effects/effect6470.py |    19 -
 eos/effects/effect6472.py |     9 -
 eos/effects/effect6473.py |     9 -
 eos/effects/effect6474.py |     9 -
 eos/effects/effect6475.py |    11 -
 eos/effects/effect6476.py |    13 -
 eos/effects/effect6477.py |    22 -
 eos/effects/effect6478.py |    12 -
 eos/effects/effect6479.py |    30 -
 eos/effects/effect6481.py |    17 -
 eos/effects/effect6482.py |    10 -
 eos/effects/effect6484.py |    13 -
 eos/effects/effect6485.py |    22 -
 eos/effects/effect6487.py |    11 -
 eos/effects/effect6488.py |    11 -
 eos/effects/effect6501.py |    10 -
 eos/effects/effect6502.py |    16 -
 eos/effects/effect6503.py |    10 -
 eos/effects/effect6504.py |    32 -
 eos/effects/effect6505.py |    16 -
 eos/effects/effect6506.py |    10 -
 eos/effects/effect6507.py |    10 -
 eos/effects/effect6508.py |    10 -
 eos/effects/effect6509.py |    10 -
 eos/effects/effect6510.py |    10 -
 eos/effects/effect6511.py |    10 -
 eos/effects/effect6513.py |    19 -
 eos/effects/effect6526.py |    16 -
 eos/effects/effect6527.py |    16 -
 eos/effects/effect6533.py |    23 -
 eos/effects/effect6534.py |    23 -
 eos/effects/effect6535.py |    23 -
 eos/effects/effect6536.py |    23 -
 eos/effects/effect6537.py |    10 -
 eos/effects/effect6545.py |    19 -
 eos/effects/effect6546.py |    16 -
 eos/effects/effect6548.py |    16 -
 eos/effects/effect6549.py |    12 -
 eos/effects/effect6551.py |    17 -
 eos/effects/effect6552.py |    12 -
 eos/effects/effect6555.py |    12 -
 eos/effects/effect6556.py |    21 -
 eos/effects/effect6557.py |    43 -
 eos/effects/effect6558.py |    14 -
 eos/effects/effect6559.py |    43 -
 eos/effects/effect6560.py |    18 -
 eos/effects/effect6561.py |    11 -
 eos/effects/effect6562.py |    11 -
 eos/effects/effect6563.py |    18 -
 eos/effects/effect6565.py |    24 -
 eos/effects/effect6566.py |    21 -
 eos/effects/effect6567.py |    29 -
 eos/effects/effect657.py  |    13 -
 eos/effects/effect6570.py |    10 -
 eos/effects/effect6571.py |    11 -
 eos/effects/effect6572.py |    11 -
 eos/effects/effect6573.py |    11 -
 eos/effects/effect6574.py |    11 -
 eos/effects/effect6575.py |    11 -
 eos/effects/effect6576.py |    11 -
 eos/effects/effect6577.py |    11 -
 eos/effects/effect6578.py |    11 -
 eos/effects/effect6580.py |    14 -
 eos/effects/effect6581.py |    76 -
 eos/effects/effect6582.py |    64 -
 eos/effects/effect6591.py |    11 -
 eos/effects/effect6592.py |    11 -
 eos/effects/effect6593.py |    10 -
 eos/effects/effect6594.py |    11 -
 eos/effects/effect6595.py |    23 -
 eos/effects/effect6596.py |    23 -
 eos/effects/effect6597.py |    23 -
 eos/effects/effect6598.py |    23 -
 eos/effects/effect6599.py |    16 -
 eos/effects/effect660.py  |    12 -
 eos/effects/effect6600.py |    16 -
 eos/effects/effect6601.py |    17 -
 eos/effects/effect6602.py |    17 -
 eos/effects/effect6603.py |    18 -
 eos/effects/effect6604.py |    18 -
 eos/effects/effect6605.py |    17 -
 eos/effects/effect6606.py |    17 -
 eos/effects/effect6607.py |    23 -
 eos/effects/effect6608.py |    23 -
 eos/effects/effect6609.py |    23 -
 eos/effects/effect661.py  |    12 -
 eos/effects/effect6610.py |    23 -
 eos/effects/effect6611.py |    10 -
 eos/effects/effect6612.py |    14 -
 eos/effects/effect6613.py |    10 -
 eos/effects/effect6614.py |    12 -
 eos/effects/effect6615.py |    11 -
 eos/effects/effect6616.py |    11 -
 eos/effects/effect6617.py |    11 -
 eos/effects/effect6618.py |    11 -
 eos/effects/effect6619.py |    10 -
 eos/effects/effect662.py  |    12 -
 eos/effects/effect6620.py |    10 -
 eos/effects/effect6621.py |    16 -
 eos/effects/effect6622.py |    16 -
 eos/effects/effect6623.py |    10 -
 eos/effects/effect6624.py |    11 -
 eos/effects/effect6625.py |    13 -
 eos/effects/effect6626.py |    13 -
 eos/effects/effect6627.py |    13 -
 eos/effects/effect6628.py |    13 -
 eos/effects/effect6629.py |    13 -
 eos/effects/effect6634.py |    10 -
 eos/effects/effect6635.py |    14 -
 eos/effects/effect6636.py |    10 -
 eos/effects/effect6637.py |    10 -
 eos/effects/effect6638.py |    14 -
 eos/effects/effect6639.py |    14 -
 eos/effects/effect6640.py |    10 -
 eos/effects/effect6641.py |    12 -
 eos/effects/effect6642.py |    11 -
 eos/effects/effect6647.py |     9 -
 eos/effects/effect6648.py |     9 -
 eos/effects/effect6649.py |    10 -
 eos/effects/effect6650.py |     9 -
 eos/effects/effect6651.py |    24 -
 eos/effects/effect6652.py |    15 -
 eos/effects/effect6653.py |    10 -
 eos/effects/effect6654.py |    10 -
 eos/effects/effect6655.py |    10 -
 eos/effects/effect6656.py |    10 -
 eos/effects/effect6657.py |    26 -
 eos/effects/effect6658.py |    72 -
 eos/effects/effect6661.py |    10 -
 eos/effects/effect6662.py |    10 -
 eos/effects/effect6663.py |    22 -
 eos/effects/effect6664.py |    19 -
 eos/effects/effect6665.py |    17 -
 eos/effects/effect6667.py |    13 -
 eos/effects/effect6669.py |    17 -
 eos/effects/effect6670.py |    19 -
 eos/effects/effect6671.py |    13 -
 eos/effects/effect6672.py |    17 -
 eos/effects/effect6679.py |    11 -
 eos/effects/effect668.py  |    12 -
 eos/effects/effect6681.py |    10 -
 eos/effects/effect6682.py |    12 -
 eos/effects/effect6683.py |    11 -
 eos/effects/effect6684.py |    17 -
 eos/effects/effect6685.py |    13 -
 eos/effects/effect6686.py |    29 -
 eos/effects/effect6687.py |    15 -
 eos/effects/effect6688.py |    12 -
 eos/effects/effect6689.py |    14 -
 eos/effects/effect6690.py |    12 -
 eos/effects/effect6691.py |    20 -
 eos/effects/effect6692.py |    11 -
 eos/effects/effect6693.py |    16 -
 eos/effects/effect6694.py |    18 -
 eos/effects/effect6695.py |    18 -
 eos/effects/effect6697.py |    13 -
 eos/effects/effect6698.py |    13 -
 eos/effects/effect6699.py |    11 -
 eos/effects/effect67.py   |    13 -
 eos/effects/effect670.py  |     9 -
 eos/effects/effect6700.py |    15 -
 eos/effects/effect6701.py |    11 -
 eos/effects/effect6702.py |    11 -
 eos/effects/effect6703.py |    11 -
 eos/effects/effect6704.py |    11 -
 eos/effects/effect6705.py |    11 -
 eos/effects/effect6706.py |    11 -
 eos/effects/effect6708.py |    10 -
 eos/effects/effect6709.py |    10 -
 eos/effects/effect6710.py |    10 -
 eos/effects/effect6711.py |    10 -
 eos/effects/effect6712.py |    10 -
 eos/effects/effect6713.py |    11 -
 eos/effects/effect6714.py |    18 -
 eos/effects/effect6717.py |    16 -
 eos/effects/effect6720.py |    14 -
 eos/effects/effect6721.py |    16 -
 eos/effects/effect6722.py |    14 -
 eos/effects/effect6723.py |    10 -
 eos/effects/effect6724.py |    10 -
 eos/effects/effect6725.py |    10 -
 eos/effects/effect6726.py |    10 -
 eos/effects/effect6727.py |    11 -
 eos/effects/effect6730.py |    16 -
 eos/effects/effect6731.py |    14 -
 eos/effects/effect6732.py |    25 -
 eos/effects/effect6733.py |    16 -
 eos/effects/effect6734.py |    16 -
 eos/effects/effect6735.py |    16 -
 eos/effects/effect6736.py |    16 -
 eos/effects/effect6737.py |    11 -
 eos/effects/effect675.py  |    10 -
 eos/effects/effect6753.py |    15 -
 eos/effects/effect6762.py |    13 -
 eos/effects/effect6763.py |    11 -
 eos/effects/effect6764.py |    13 -
 eos/effects/effect6765.py |    11 -
 eos/effects/effect6766.py |    12 -
 eos/effects/effect6769.py |    12 -
 eos/effects/effect677.py  |    12 -
 eos/effects/effect6770.py |    11 -
 eos/effects/effect6771.py |    11 -
 eos/effects/effect6772.py |    11 -
 eos/effects/effect6773.py |    11 -
 eos/effects/effect6774.py |    11 -
 eos/effects/effect6776.py |    17 -
 eos/effects/effect6777.py |    17 -
 eos/effects/effect6778.py |    17 -
 eos/effects/effect6779.py |    17 -
 eos/effects/effect6780.py |    13 -
 eos/effects/effect6782.py |    12 -
 eos/effects/effect6783.py |    18 -
 eos/effects/effect6786.py |    18 -
 eos/effects/effect6787.py |    37 -
 eos/effects/effect6788.py |    13 -
 eos/effects/effect6789.py |    18 -
 eos/effects/effect6790.py |    10 -
 eos/effects/effect6792.py |    37 -
 eos/effects/effect6793.py |    18 -
 eos/effects/effect6794.py |    18 -
 eos/effects/effect6795.py |    13 -
 eos/effects/effect6796.py |    15 -
 eos/effects/effect6797.py |    15 -
 eos/effects/effect6798.py |    15 -
 eos/effects/effect6799.py |    15 -
 eos/effects/effect6800.py |    10 -
 eos/effects/effect6801.py |    16 -
 eos/effects/effect6807.py |    13 -
 eos/effects/effect6844.py |    10 -
 eos/effects/effect6845.py |    10 -
 eos/effects/effect6851.py |    10 -
 eos/effects/effect6852.py |    10 -
 eos/effects/effect6853.py |    12 -
 eos/effects/effect6855.py |    12 -
 eos/effects/effect6856.py |    10 -
 eos/effects/effect6857.py |    12 -
 eos/effects/effect6858.py |    10 -
 eos/effects/effect6859.py |    10 -
 eos/effects/effect6860.py |    10 -
 eos/effects/effect6861.py |     9 -
 eos/effects/effect6862.py |    10 -
 eos/effects/effect6865.py |     9 -
 eos/effects/effect6866.py |    12 -
 eos/effects/effect6867.py |    10 -
 eos/effects/effect6871.py |    23 -
 eos/effects/effect6872.py |     9 -
 eos/effects/effect6873.py |     9 -
 eos/effects/effect6874.py |    12 -
 eos/effects/effect6877.py |     9 -
 eos/effects/effect6878.py |    10 -
 eos/effects/effect6879.py |    10 -
 eos/effects/effect6880.py |    14 -
 eos/effects/effect6881.py |    12 -
 eos/effects/effect6883.py |    12 -
 eos/effects/effect6894.py |    12 -
 eos/effects/effect6895.py |    12 -
 eos/effects/effect6896.py |    14 -
 eos/effects/effect6897.py |    12 -
 eos/effects/effect6898.py |    14 -
 eos/effects/effect6899.py |    15 -
 eos/effects/effect6900.py |    15 -
 eos/effects/effect6908.py |    11 -
 eos/effects/effect6909.py |    11 -
 eos/effects/effect6910.py |    11 -
 eos/effects/effect6911.py |    11 -
 eos/effects/effect6920.py |    10 -
 eos/effects/effect6921.py |    11 -
 eos/effects/effect6923.py |    11 -
 eos/effects/effect6924.py |    11 -
 eos/effects/effect6925.py |    14 -
 eos/effects/effect6926.py |     9 -
 eos/effects/effect6927.py |    10 -
 eos/effects/effect6928.py |    11 -
 eos/effects/effect6929.py |    11 -
 eos/effects/effect6930.py |     9 -
 eos/effects/effect6931.py |    10 -
 eos/effects/effect6932.py |    10 -
 eos/effects/effect6933.py |    10 -
 eos/effects/effect6934.py |    11 -
 eos/effects/effect6935.py |    10 -
 eos/effects/effect6936.py |    11 -
 eos/effects/effect6937.py |    10 -
 eos/effects/effect6938.py |    10 -
 eos/effects/effect6939.py |    12 -
 eos/effects/effect6940.py |    12 -
 eos/effects/effect6941.py |    11 -
 eos/effects/effect6942.py |    14 -
 eos/effects/effect6943.py |    15 -
 eos/effects/effect6944.py |    15 -
 eos/effects/effect6945.py |    15 -
 eos/effects/effect6946.py |    15 -
 eos/effects/effect6947.py |    11 -
 eos/effects/effect6949.py |    10 -
 eos/effects/effect6951.py |    10 -
 eos/effects/effect6953.py |    13 -
 eos/effects/effect6954.py |    12 -
 eos/effects/effect6955.py |    11 -
 eos/effects/effect6956.py |    10 -
 eos/effects/effect6957.py |    10 -
 eos/effects/effect6958.py |    10 -
 eos/effects/effect6959.py |    10 -
 eos/effects/effect6960.py |    11 -
 eos/effects/effect6961.py |    11 -
 eos/effects/effect6962.py |    10 -
 eos/effects/effect6963.py |    10 -
 eos/effects/effect6964.py |    10 -
 eos/effects/effect6981.py |    20 -
 eos/effects/effect6982.py |    20 -
 eos/effects/effect6983.py |    12 -
 eos/effects/effect6984.py |    17 -
 eos/effects/effect6985.py |    20 -
 eos/effects/effect6986.py |    10 -
 eos/effects/effect6987.py |    20 -
 eos/effects/effect699.py  |    15 -
 eos/effects/effect6992.py |     9 -
 eos/effects/effect6993.py |    21 -
 eos/effects/effect6994.py |    10 -
 eos/effects/effect6995.py |    10 -
 eos/effects/effect6996.py |    10 -
 eos/effects/effect6997.py |    10 -
 eos/effects/effect6999.py |    10 -
 eos/effects/effect7000.py |    10 -
 eos/effects/effect7001.py |     9 -
 eos/effects/effect7002.py |    10 -
 eos/effects/effect7003.py |    10 -
 eos/effects/effect7008.py |    10 -
 eos/effects/effect7009.py |    14 -
 eos/effects/effect7012.py |    16 -
 eos/effects/effect7013.py |    10 -
 eos/effects/effect7014.py |    10 -
 eos/effects/effect7015.py |    10 -
 eos/effects/effect7016.py |    10 -
 eos/effects/effect7017.py |    10 -
 eos/effects/effect7018.py |    10 -
 eos/effects/effect7020.py |    11 -
 eos/effects/effect7021.py |    11 -
 eos/effects/effect7024.py |    10 -
 eos/effects/effect7026.py |    11 -
 eos/effects/effect7027.py |     9 -
 eos/effects/effect7028.py |     9 -
 eos/effects/effect7029.py |    10 -
 eos/effects/effect7030.py |    15 -
 eos/effects/effect7031.py |    10 -
 eos/effects/effect7032.py |    10 -
 eos/effects/effect7033.py |    10 -
 eos/effects/effect7034.py |    10 -
 eos/effects/effect7035.py |    10 -
 eos/effects/effect7036.py |    10 -
 eos/effects/effect7037.py |    10 -
 eos/effects/effect7038.py |    10 -
 eos/effects/effect7039.py |    13 -
 eos/effects/effect7040.py |     9 -
 eos/effects/effect7042.py |     9 -
 eos/effects/effect7043.py |     9 -
 eos/effects/effect7044.py |     9 -
 eos/effects/effect7045.py |     9 -
 eos/effects/effect7046.py |    20 -
 eos/effects/effect7047.py |    17 -
 eos/effects/effect7050.py |    16 -
 eos/effects/effect7051.py |    16 -
 eos/effects/effect7052.py |    12 -
 eos/effects/effect7055.py |    38 -
 eos/effects/effect7058.py |    16 -
 eos/effects/effect7059.py |    18 -
 eos/effects/effect706.py  |     9 -
 eos/effects/effect7060.py |    18 -
 eos/effects/effect7061.py |    18 -
 eos/effects/effect7062.py |    18 -
 eos/effects/effect7063.py |    18 -
 eos/effects/effect7064.py |    10 -
 eos/effects/effect7071.py |    11 -
 eos/effects/effect7072.py |    11 -
 eos/effects/effect7073.py |    11 -
 eos/effects/effect7074.py |    11 -
 eos/effects/effect7075.py |    11 -
 eos/effects/effect7076.py |    11 -
 eos/effects/effect7077.py |    11 -
 eos/effects/effect7078.py |    11 -
 eos/effects/effect7079.py |    10 -
 eos/effects/effect7080.py |    10 -
 eos/effects/effect7085.py |    11 -
 eos/effects/effect7086.py |    11 -
 eos/effects/effect7087.py |    11 -
 eos/effects/effect7088.py |    11 -
 eos/effects/effect7091.py |     7 -
 eos/effects/effect7092.py |    16 -
 eos/effects/effect7093.py |    17 -
 eos/effects/effect7094.py |    16 -
 eos/effects/effect7097.py |    10 -
 eos/effects/effect7111.py |    12 -
 eos/effects/effect7112.py |    16 -
 eos/effects/effect7116.py |    10 -
 eos/effects/effect7117.py |    13 -
 eos/effects/effect7118.py |    10 -
 eos/effects/effect7119.py |    10 -
 eos/effects/effect7142.py |    17 -
 eos/effects/effect7154.py |    11 -
 eos/effects/effect7155.py |    11 -
 eos/effects/effect7156.py |    10 -
 eos/effects/effect7157.py |    11 -
 eos/effects/effect7158.py |    10 -
 eos/effects/effect7159.py |    10 -
 eos/effects/effect7160.py |    10 -
 eos/effects/effect7161.py |    10 -
 eos/effects/effect7162.py |    10 -
 eos/effects/effect7166.py |    28 -
 eos/effects/effect7167.py |     7 -
 eos/effects/effect7168.py |     7 -
 eos/effects/effect7169.py |     7 -
 eos/effects/effect7170.py |     7 -
 eos/effects/effect7171.py |     7 -
 eos/effects/effect7172.py |     7 -
 eos/effects/effect7173.py |     7 -
 eos/effects/effect7176.py |    11 -
 eos/effects/effect7177.py |    14 -
 eos/effects/effect7179.py |    10 -
 eos/effects/effect7180.py |    10 -
 eos/effects/effect7183.py |    10 -
 eos/effects/effect726.py  |    17 -
 eos/effects/effect727.py  |    10 -
 eos/effects/effect728.py  |    10 -
 eos/effects/effect729.py  |    19 -
 eos/effects/effect730.py  |    10 -
 eos/effects/effect732.py  |    10 -
 eos/effects/effect736.py  |    10 -
 eos/effects/effect744.py  |    12 -
 eos/effects/effect754.py  |    10 -
 eos/effects/effect757.py  |    13 -
 eos/effects/effect760.py  |    12 -
 eos/effects/effect763.py  |    13 -
 eos/effects/effect784.py  |    16 -
 eos/effects/effect804.py  |    13 -
 eos/effects/effect836.py  |     9 -
 eos/effects/effect848.py  |    11 -
 eos/effects/effect854.py  |    11 -
 eos/effects/effect856.py  |    13 -
 eos/effects/effect874.py  |    10 -
 eos/effects/effect882.py  |    11 -
 eos/effects/effect887.py  |    10 -
 eos/effects/effect889.py  |    11 -
 eos/effects/effect89.py   |    11 -
 eos/effects/effect891.py  |    10 -
 eos/effects/effect892.py  |    10 -
 eos/effects/effect896.py  |    11 -
 eos/effects/effect898.py  |    12 -
 eos/effects/effect899.py  |    12 -
 eos/effects/effect900.py  |    10 -
 eos/effects/effect907.py  |    11 -
 eos/effects/effect909.py  |     9 -
 eos/effects/effect91.py   |    11 -
 eos/effects/effect912.py  |    10 -
 eos/effects/effect918.py  |     9 -
 eos/effects/effect919.py  |    11 -
 eos/effects/effect92.py   |    11 -
 eos/effects/effect93.py   |    11 -
 eos/effects/effect95.py   |    11 -
 eos/effects/effect958.py  |     9 -
 eos/effects/effect959.py  |    10 -
 eos/effects/effect96.py   |    11 -
 eos/effects/effect960.py  |    10 -
 eos/effects/effect961.py  |    10 -
 eos/effects/effect968.py  |    13 -
 eos/effects/effect980.py  |    11 -
 eos/effects/effect989.py  |    12 -
 eos/effects/effect991.py  |    10 -
 eos/effects/effect996.py  |    11 -
 eos/effects/effect998.py  |    10 -
 eos/effects/effect999.py  |    11 -
 eos/gamedata.py           |    69 +-
 scripts/effect_rollup.py  |    24 -
 1986 files changed, 22849 insertions(+), 24044 deletions(-)
 create mode 100644 eos/effects.py
 delete mode 100644 eos/effects/__init__.py
 delete mode 100644 eos/effects/effect10.py
 delete mode 100644 eos/effects/effect1001.py
 delete mode 100644 eos/effects/effect1003.py
 delete mode 100644 eos/effects/effect1004.py
 delete mode 100644 eos/effects/effect1005.py
 delete mode 100644 eos/effects/effect1006.py
 delete mode 100644 eos/effects/effect1007.py
 delete mode 100644 eos/effects/effect1008.py
 delete mode 100644 eos/effects/effect1009.py
 delete mode 100644 eos/effects/effect101.py
 delete mode 100644 eos/effects/effect1010.py
 delete mode 100644 eos/effects/effect1011.py
 delete mode 100644 eos/effects/effect1012.py
 delete mode 100644 eos/effects/effect1013.py
 delete mode 100644 eos/effects/effect1014.py
 delete mode 100644 eos/effects/effect1015.py
 delete mode 100644 eos/effects/effect1016.py
 delete mode 100644 eos/effects/effect1017.py
 delete mode 100644 eos/effects/effect1018.py
 delete mode 100644 eos/effects/effect1019.py
 delete mode 100644 eos/effects/effect1020.py
 delete mode 100644 eos/effects/effect1021.py
 delete mode 100644 eos/effects/effect1024.py
 delete mode 100644 eos/effects/effect1025.py
 delete mode 100644 eos/effects/effect1030.py
 delete mode 100644 eos/effects/effect1033.py
 delete mode 100644 eos/effects/effect1034.py
 delete mode 100644 eos/effects/effect1035.py
 delete mode 100644 eos/effects/effect1036.py
 delete mode 100644 eos/effects/effect1046.py
 delete mode 100644 eos/effects/effect1047.py
 delete mode 100644 eos/effects/effect1048.py
 delete mode 100644 eos/effects/effect1049.py
 delete mode 100644 eos/effects/effect1056.py
 delete mode 100644 eos/effects/effect1057.py
 delete mode 100644 eos/effects/effect1058.py
 delete mode 100644 eos/effects/effect1060.py
 delete mode 100644 eos/effects/effect1061.py
 delete mode 100644 eos/effects/effect1062.py
 delete mode 100644 eos/effects/effect1063.py
 delete mode 100644 eos/effects/effect1080.py
 delete mode 100644 eos/effects/effect1081.py
 delete mode 100644 eos/effects/effect1082.py
 delete mode 100644 eos/effects/effect1084.py
 delete mode 100644 eos/effects/effect1087.py
 delete mode 100644 eos/effects/effect1099.py
 delete mode 100644 eos/effects/effect1176.py
 delete mode 100644 eos/effects/effect1179.py
 delete mode 100644 eos/effects/effect118.py
 delete mode 100644 eos/effects/effect1181.py
 delete mode 100644 eos/effects/effect1182.py
 delete mode 100644 eos/effects/effect1183.py
 delete mode 100644 eos/effects/effect1184.py
 delete mode 100644 eos/effects/effect1185.py
 delete mode 100644 eos/effects/effect1190.py
 delete mode 100644 eos/effects/effect1200.py
 delete mode 100644 eos/effects/effect1212.py
 delete mode 100644 eos/effects/effect1215.py
 delete mode 100644 eos/effects/effect1218.py
 delete mode 100644 eos/effects/effect1219.py
 delete mode 100644 eos/effects/effect1220.py
 delete mode 100644 eos/effects/effect1221.py
 delete mode 100644 eos/effects/effect1222.py
 delete mode 100644 eos/effects/effect1228.py
 delete mode 100644 eos/effects/effect1230.py
 delete mode 100644 eos/effects/effect1232.py
 delete mode 100644 eos/effects/effect1233.py
 delete mode 100644 eos/effects/effect1234.py
 delete mode 100644 eos/effects/effect1239.py
 delete mode 100644 eos/effects/effect1240.py
 delete mode 100644 eos/effects/effect1255.py
 delete mode 100644 eos/effects/effect1256.py
 delete mode 100644 eos/effects/effect1261.py
 delete mode 100644 eos/effects/effect1264.py
 delete mode 100644 eos/effects/effect1268.py
 delete mode 100644 eos/effects/effect1281.py
 delete mode 100644 eos/effects/effect1318.py
 delete mode 100644 eos/effects/effect1360.py
 delete mode 100644 eos/effects/effect1361.py
 delete mode 100644 eos/effects/effect1370.py
 delete mode 100644 eos/effects/effect1372.py
 delete mode 100644 eos/effects/effect1395.py
 delete mode 100644 eos/effects/effect1397.py
 delete mode 100644 eos/effects/effect1409.py
 delete mode 100644 eos/effects/effect1410.py
 delete mode 100644 eos/effects/effect1412.py
 delete mode 100644 eos/effects/effect1434.py
 delete mode 100644 eos/effects/effect1441.py
 delete mode 100644 eos/effects/effect1442.py
 delete mode 100644 eos/effects/effect1443.py
 delete mode 100644 eos/effects/effect1445.py
 delete mode 100644 eos/effects/effect1446.py
 delete mode 100644 eos/effects/effect1448.py
 delete mode 100644 eos/effects/effect1449.py
 delete mode 100644 eos/effects/effect1450.py
 delete mode 100644 eos/effects/effect1451.py
 delete mode 100644 eos/effects/effect1452.py
 delete mode 100644 eos/effects/effect1453.py
 delete mode 100644 eos/effects/effect1472.py
 delete mode 100644 eos/effects/effect1500.py
 delete mode 100644 eos/effects/effect1550.py
 delete mode 100644 eos/effects/effect1551.py
 delete mode 100644 eos/effects/effect157.py
 delete mode 100644 eos/effects/effect1577.py
 delete mode 100644 eos/effects/effect1579.py
 delete mode 100644 eos/effects/effect1581.py
 delete mode 100644 eos/effects/effect1585.py
 delete mode 100644 eos/effects/effect1586.py
 delete mode 100644 eos/effects/effect1587.py
 delete mode 100644 eos/effects/effect1588.py
 delete mode 100644 eos/effects/effect159.py
 delete mode 100644 eos/effects/effect1590.py
 delete mode 100644 eos/effects/effect1592.py
 delete mode 100644 eos/effects/effect1593.py
 delete mode 100644 eos/effects/effect1594.py
 delete mode 100644 eos/effects/effect1595.py
 delete mode 100644 eos/effects/effect1596.py
 delete mode 100644 eos/effects/effect1597.py
 delete mode 100644 eos/effects/effect160.py
 delete mode 100644 eos/effects/effect161.py
 delete mode 100644 eos/effects/effect1615.py
 delete mode 100644 eos/effects/effect1616.py
 delete mode 100644 eos/effects/effect1617.py
 delete mode 100644 eos/effects/effect162.py
 delete mode 100644 eos/effects/effect1634.py
 delete mode 100644 eos/effects/effect1635.py
 delete mode 100644 eos/effects/effect1638.py
 delete mode 100644 eos/effects/effect1643.py
 delete mode 100644 eos/effects/effect1644.py
 delete mode 100644 eos/effects/effect1645.py
 delete mode 100644 eos/effects/effect1646.py
 delete mode 100644 eos/effects/effect1650.py
 delete mode 100644 eos/effects/effect1657.py
 delete mode 100644 eos/effects/effect1668.py
 delete mode 100644 eos/effects/effect1669.py
 delete mode 100644 eos/effects/effect1670.py
 delete mode 100644 eos/effects/effect1671.py
 delete mode 100644 eos/effects/effect1672.py
 delete mode 100644 eos/effects/effect1673.py
 delete mode 100644 eos/effects/effect1674.py
 delete mode 100644 eos/effects/effect1675.py
 delete mode 100644 eos/effects/effect17.py
 delete mode 100644 eos/effects/effect172.py
 delete mode 100644 eos/effects/effect1720.py
 delete mode 100644 eos/effects/effect1722.py
 delete mode 100644 eos/effects/effect173.py
 delete mode 100644 eos/effects/effect1730.py
 delete mode 100644 eos/effects/effect1738.py
 delete mode 100644 eos/effects/effect174.py
 delete mode 100644 eos/effects/effect1763.py
 delete mode 100644 eos/effects/effect1764.py
 delete mode 100644 eos/effects/effect1773.py
 delete mode 100644 eos/effects/effect1804.py
 delete mode 100644 eos/effects/effect1805.py
 delete mode 100644 eos/effects/effect1806.py
 delete mode 100644 eos/effects/effect1807.py
 delete mode 100644 eos/effects/effect1812.py
 delete mode 100644 eos/effects/effect1813.py
 delete mode 100644 eos/effects/effect1814.py
 delete mode 100644 eos/effects/effect1815.py
 delete mode 100644 eos/effects/effect1816.py
 delete mode 100644 eos/effects/effect1817.py
 delete mode 100644 eos/effects/effect1819.py
 delete mode 100644 eos/effects/effect1820.py
 delete mode 100644 eos/effects/effect1848.py
 delete mode 100644 eos/effects/effect1851.py
 delete mode 100644 eos/effects/effect1862.py
 delete mode 100644 eos/effects/effect1863.py
 delete mode 100644 eos/effects/effect1864.py
 delete mode 100644 eos/effects/effect1882.py
 delete mode 100644 eos/effects/effect1885.py
 delete mode 100644 eos/effects/effect1886.py
 delete mode 100644 eos/effects/effect1896.py
 delete mode 100644 eos/effects/effect1910.py
 delete mode 100644 eos/effects/effect1911.py
 delete mode 100644 eos/effects/effect1912.py
 delete mode 100644 eos/effects/effect1913.py
 delete mode 100644 eos/effects/effect1914.py
 delete mode 100644 eos/effects/effect1921.py
 delete mode 100644 eos/effects/effect1922.py
 delete mode 100644 eos/effects/effect1959.py
 delete mode 100644 eos/effects/effect1964.py
 delete mode 100644 eos/effects/effect1969.py
 delete mode 100644 eos/effects/effect1996.py
 delete mode 100644 eos/effects/effect2000.py
 delete mode 100644 eos/effects/effect2008.py
 delete mode 100644 eos/effects/effect2013.py
 delete mode 100644 eos/effects/effect2014.py
 delete mode 100644 eos/effects/effect2015.py
 delete mode 100644 eos/effects/effect2016.py
 delete mode 100644 eos/effects/effect2017.py
 delete mode 100644 eos/effects/effect2019.py
 delete mode 100644 eos/effects/effect2020.py
 delete mode 100644 eos/effects/effect2029.py
 delete mode 100644 eos/effects/effect2041.py
 delete mode 100644 eos/effects/effect2052.py
 delete mode 100644 eos/effects/effect2053.py
 delete mode 100644 eos/effects/effect2054.py
 delete mode 100644 eos/effects/effect2055.py
 delete mode 100644 eos/effects/effect2056.py
 delete mode 100644 eos/effects/effect21.py
 delete mode 100644 eos/effects/effect2105.py
 delete mode 100644 eos/effects/effect2106.py
 delete mode 100644 eos/effects/effect2107.py
 delete mode 100644 eos/effects/effect2108.py
 delete mode 100644 eos/effects/effect2109.py
 delete mode 100644 eos/effects/effect2110.py
 delete mode 100644 eos/effects/effect2111.py
 delete mode 100644 eos/effects/effect2112.py
 delete mode 100644 eos/effects/effect212.py
 delete mode 100644 eos/effects/effect2130.py
 delete mode 100644 eos/effects/effect2131.py
 delete mode 100644 eos/effects/effect2132.py
 delete mode 100644 eos/effects/effect2133.py
 delete mode 100644 eos/effects/effect2134.py
 delete mode 100644 eos/effects/effect2135.py
 delete mode 100644 eos/effects/effect214.py
 delete mode 100644 eos/effects/effect2143.py
 delete mode 100644 eos/effects/effect2155.py
 delete mode 100644 eos/effects/effect2156.py
 delete mode 100644 eos/effects/effect2157.py
 delete mode 100644 eos/effects/effect2158.py
 delete mode 100644 eos/effects/effect2160.py
 delete mode 100644 eos/effects/effect2161.py
 delete mode 100644 eos/effects/effect2179.py
 delete mode 100644 eos/effects/effect2181.py
 delete mode 100644 eos/effects/effect2186.py
 delete mode 100644 eos/effects/effect2187.py
 delete mode 100644 eos/effects/effect2188.py
 delete mode 100644 eos/effects/effect2189.py
 delete mode 100644 eos/effects/effect2200.py
 delete mode 100644 eos/effects/effect2201.py
 delete mode 100644 eos/effects/effect2215.py
 delete mode 100644 eos/effects/effect223.py
 delete mode 100644 eos/effects/effect2232.py
 delete mode 100644 eos/effects/effect2249.py
 delete mode 100644 eos/effects/effect2250.py
 delete mode 100644 eos/effects/effect2251.py
 delete mode 100644 eos/effects/effect2252.py
 delete mode 100644 eos/effects/effect2253.py
 delete mode 100644 eos/effects/effect2255.py
 delete mode 100644 eos/effects/effect227.py
 delete mode 100644 eos/effects/effect2298.py
 delete mode 100644 eos/effects/effect230.py
 delete mode 100644 eos/effects/effect2302.py
 delete mode 100644 eos/effects/effect2305.py
 delete mode 100644 eos/effects/effect235.py
 delete mode 100644 eos/effects/effect2354.py
 delete mode 100644 eos/effects/effect2355.py
 delete mode 100644 eos/effects/effect2356.py
 delete mode 100644 eos/effects/effect2402.py
 delete mode 100644 eos/effects/effect242.py
 delete mode 100644 eos/effects/effect2422.py
 delete mode 100644 eos/effects/effect2432.py
 delete mode 100644 eos/effects/effect244.py
 delete mode 100644 eos/effects/effect2444.py
 delete mode 100644 eos/effects/effect2445.py
 delete mode 100644 eos/effects/effect2456.py
 delete mode 100644 eos/effects/effect2465.py
 delete mode 100644 eos/effects/effect2479.py
 delete mode 100644 eos/effects/effect2485.py
 delete mode 100644 eos/effects/effect2488.py
 delete mode 100644 eos/effects/effect2489.py
 delete mode 100644 eos/effects/effect2490.py
 delete mode 100644 eos/effects/effect2491.py
 delete mode 100644 eos/effects/effect2492.py
 delete mode 100644 eos/effects/effect25.py
 delete mode 100644 eos/effects/effect2503.py
 delete mode 100644 eos/effects/effect2504.py
 delete mode 100644 eos/effects/effect2561.py
 delete mode 100644 eos/effects/effect2589.py
 delete mode 100644 eos/effects/effect26.py
 delete mode 100644 eos/effects/effect2602.py
 delete mode 100644 eos/effects/effect2603.py
 delete mode 100644 eos/effects/effect2604.py
 delete mode 100644 eos/effects/effect2605.py
 delete mode 100644 eos/effects/effect2611.py
 delete mode 100644 eos/effects/effect2644.py
 delete mode 100644 eos/effects/effect2645.py
 delete mode 100644 eos/effects/effect2646.py
 delete mode 100644 eos/effects/effect2647.py
 delete mode 100644 eos/effects/effect2648.py
 delete mode 100644 eos/effects/effect2649.py
 delete mode 100644 eos/effects/effect2670.py
 delete mode 100644 eos/effects/effect2688.py
 delete mode 100644 eos/effects/effect2689.py
 delete mode 100644 eos/effects/effect2690.py
 delete mode 100644 eos/effects/effect2691.py
 delete mode 100644 eos/effects/effect2693.py
 delete mode 100644 eos/effects/effect2694.py
 delete mode 100644 eos/effects/effect2695.py
 delete mode 100644 eos/effects/effect2696.py
 delete mode 100644 eos/effects/effect2697.py
 delete mode 100644 eos/effects/effect2698.py
 delete mode 100644 eos/effects/effect27.py
 delete mode 100644 eos/effects/effect2706.py
 delete mode 100644 eos/effects/effect2707.py
 delete mode 100644 eos/effects/effect2708.py
 delete mode 100644 eos/effects/effect271.py
 delete mode 100644 eos/effects/effect2712.py
 delete mode 100644 eos/effects/effect2713.py
 delete mode 100644 eos/effects/effect2714.py
 delete mode 100644 eos/effects/effect2716.py
 delete mode 100644 eos/effects/effect2717.py
 delete mode 100644 eos/effects/effect2718.py
 delete mode 100644 eos/effects/effect272.py
 delete mode 100644 eos/effects/effect2726.py
 delete mode 100644 eos/effects/effect2727.py
 delete mode 100644 eos/effects/effect273.py
 delete mode 100644 eos/effects/effect2734.py
 delete mode 100644 eos/effects/effect2735.py
 delete mode 100644 eos/effects/effect2736.py
 delete mode 100644 eos/effects/effect2737.py
 delete mode 100644 eos/effects/effect2739.py
 delete mode 100644 eos/effects/effect2741.py
 delete mode 100644 eos/effects/effect2745.py
 delete mode 100644 eos/effects/effect2746.py
 delete mode 100644 eos/effects/effect2747.py
 delete mode 100644 eos/effects/effect2748.py
 delete mode 100644 eos/effects/effect2749.py
 delete mode 100644 eos/effects/effect2756.py
 delete mode 100644 eos/effects/effect2757.py
 delete mode 100644 eos/effects/effect2760.py
 delete mode 100644 eos/effects/effect2763.py
 delete mode 100644 eos/effects/effect2766.py
 delete mode 100644 eos/effects/effect277.py
 delete mode 100644 eos/effects/effect2776.py
 delete mode 100644 eos/effects/effect2778.py
 delete mode 100644 eos/effects/effect279.py
 delete mode 100644 eos/effects/effect2791.py
 delete mode 100644 eos/effects/effect2792.py
 delete mode 100644 eos/effects/effect2794.py
 delete mode 100644 eos/effects/effect2795.py
 delete mode 100644 eos/effects/effect2796.py
 delete mode 100644 eos/effects/effect2797.py
 delete mode 100644 eos/effects/effect2798.py
 delete mode 100644 eos/effects/effect2799.py
 delete mode 100644 eos/effects/effect2801.py
 delete mode 100644 eos/effects/effect2802.py
 delete mode 100644 eos/effects/effect2803.py
 delete mode 100644 eos/effects/effect2804.py
 delete mode 100644 eos/effects/effect2805.py
 delete mode 100644 eos/effects/effect2809.py
 delete mode 100644 eos/effects/effect2810.py
 delete mode 100644 eos/effects/effect2812.py
 delete mode 100644 eos/effects/effect2837.py
 delete mode 100644 eos/effects/effect2847.py
 delete mode 100644 eos/effects/effect2848.py
 delete mode 100644 eos/effects/effect2849.py
 delete mode 100644 eos/effects/effect2850.py
 delete mode 100644 eos/effects/effect2851.py
 delete mode 100644 eos/effects/effect2853.py
 delete mode 100644 eos/effects/effect2857.py
 delete mode 100644 eos/effects/effect2865.py
 delete mode 100644 eos/effects/effect2866.py
 delete mode 100644 eos/effects/effect2867.py
 delete mode 100644 eos/effects/effect2868.py
 delete mode 100644 eos/effects/effect287.py
 delete mode 100644 eos/effects/effect2872.py
 delete mode 100644 eos/effects/effect2881.py
 delete mode 100644 eos/effects/effect2882.py
 delete mode 100644 eos/effects/effect2883.py
 delete mode 100644 eos/effects/effect2884.py
 delete mode 100644 eos/effects/effect2885.py
 delete mode 100644 eos/effects/effect2887.py
 delete mode 100644 eos/effects/effect2888.py
 delete mode 100644 eos/effects/effect2889.py
 delete mode 100644 eos/effects/effect2890.py
 delete mode 100644 eos/effects/effect2891.py
 delete mode 100644 eos/effects/effect2892.py
 delete mode 100644 eos/effects/effect2893.py
 delete mode 100644 eos/effects/effect2894.py
 delete mode 100644 eos/effects/effect2899.py
 delete mode 100644 eos/effects/effect290.py
 delete mode 100644 eos/effects/effect2900.py
 delete mode 100644 eos/effects/effect2901.py
 delete mode 100644 eos/effects/effect2902.py
 delete mode 100644 eos/effects/effect2903.py
 delete mode 100644 eos/effects/effect2904.py
 delete mode 100644 eos/effects/effect2905.py
 delete mode 100644 eos/effects/effect2906.py
 delete mode 100644 eos/effects/effect2907.py
 delete mode 100644 eos/effects/effect2908.py
 delete mode 100644 eos/effects/effect2909.py
 delete mode 100644 eos/effects/effect2910.py
 delete mode 100644 eos/effects/effect2911.py
 delete mode 100644 eos/effects/effect2967.py
 delete mode 100644 eos/effects/effect2977.py
 delete mode 100644 eos/effects/effect298.py
 delete mode 100644 eos/effects/effect2980.py
 delete mode 100644 eos/effects/effect2982.py
 delete mode 100644 eos/effects/effect3001.py
 delete mode 100644 eos/effects/effect3002.py
 delete mode 100644 eos/effects/effect3024.py
 delete mode 100644 eos/effects/effect3025.py
 delete mode 100644 eos/effects/effect3026.py
 delete mode 100644 eos/effects/effect3027.py
 delete mode 100644 eos/effects/effect3028.py
 delete mode 100644 eos/effects/effect3029.py
 delete mode 100644 eos/effects/effect3030.py
 delete mode 100644 eos/effects/effect3031.py
 delete mode 100644 eos/effects/effect3032.py
 delete mode 100644 eos/effects/effect3035.py
 delete mode 100644 eos/effects/effect3036.py
 delete mode 100644 eos/effects/effect3046.py
 delete mode 100644 eos/effects/effect3047.py
 delete mode 100644 eos/effects/effect3061.py
 delete mode 100644 eos/effects/effect315.py
 delete mode 100644 eos/effects/effect3169.py
 delete mode 100644 eos/effects/effect3172.py
 delete mode 100644 eos/effects/effect3173.py
 delete mode 100644 eos/effects/effect3174.py
 delete mode 100644 eos/effects/effect3175.py
 delete mode 100644 eos/effects/effect3182.py
 delete mode 100644 eos/effects/effect3196.py
 delete mode 100644 eos/effects/effect3200.py
 delete mode 100644 eos/effects/effect3201.py
 delete mode 100644 eos/effects/effect3212.py
 delete mode 100644 eos/effects/effect3234.py
 delete mode 100644 eos/effects/effect3235.py
 delete mode 100644 eos/effects/effect3236.py
 delete mode 100644 eos/effects/effect3237.py
 delete mode 100644 eos/effects/effect3241.py
 delete mode 100644 eos/effects/effect3242.py
 delete mode 100644 eos/effects/effect3243.py
 delete mode 100644 eos/effects/effect3244.py
 delete mode 100644 eos/effects/effect3249.py
 delete mode 100644 eos/effects/effect3264.py
 delete mode 100644 eos/effects/effect3267.py
 delete mode 100644 eos/effects/effect3297.py
 delete mode 100644 eos/effects/effect3298.py
 delete mode 100644 eos/effects/effect3299.py
 delete mode 100644 eos/effects/effect3313.py
 delete mode 100644 eos/effects/effect3331.py
 delete mode 100644 eos/effects/effect3335.py
 delete mode 100644 eos/effects/effect3336.py
 delete mode 100644 eos/effects/effect3339.py
 delete mode 100644 eos/effects/effect3340.py
 delete mode 100644 eos/effects/effect3343.py
 delete mode 100644 eos/effects/effect3355.py
 delete mode 100644 eos/effects/effect3356.py
 delete mode 100644 eos/effects/effect3357.py
 delete mode 100644 eos/effects/effect3366.py
 delete mode 100644 eos/effects/effect3367.py
 delete mode 100644 eos/effects/effect3369.py
 delete mode 100644 eos/effects/effect3370.py
 delete mode 100644 eos/effects/effect3371.py
 delete mode 100644 eos/effects/effect3374.py
 delete mode 100644 eos/effects/effect3379.py
 delete mode 100644 eos/effects/effect3380.py
 delete mode 100644 eos/effects/effect3392.py
 delete mode 100644 eos/effects/effect34.py
 delete mode 100644 eos/effects/effect3403.py
 delete mode 100644 eos/effects/effect3406.py
 delete mode 100644 eos/effects/effect3415.py
 delete mode 100644 eos/effects/effect3416.py
 delete mode 100644 eos/effects/effect3417.py
 delete mode 100644 eos/effects/effect3424.py
 delete mode 100644 eos/effects/effect3425.py
 delete mode 100644 eos/effects/effect3427.py
 delete mode 100644 eos/effects/effect3439.py
 delete mode 100644 eos/effects/effect3447.py
 delete mode 100644 eos/effects/effect3466.py
 delete mode 100644 eos/effects/effect3467.py
 delete mode 100644 eos/effects/effect3468.py
 delete mode 100644 eos/effects/effect3473.py
 delete mode 100644 eos/effects/effect3478.py
 delete mode 100644 eos/effects/effect3480.py
 delete mode 100644 eos/effects/effect3483.py
 delete mode 100644 eos/effects/effect3484.py
 delete mode 100644 eos/effects/effect3487.py
 delete mode 100644 eos/effects/effect3489.py
 delete mode 100644 eos/effects/effect3493.py
 delete mode 100644 eos/effects/effect3494.py
 delete mode 100644 eos/effects/effect3495.py
 delete mode 100644 eos/effects/effect3496.py
 delete mode 100644 eos/effects/effect3498.py
 delete mode 100644 eos/effects/effect3499.py
 delete mode 100644 eos/effects/effect3513.py
 delete mode 100644 eos/effects/effect3514.py
 delete mode 100644 eos/effects/effect3519.py
 delete mode 100644 eos/effects/effect3520.py
 delete mode 100644 eos/effects/effect3526.py
 delete mode 100644 eos/effects/effect3530.py
 delete mode 100644 eos/effects/effect3532.py
 delete mode 100644 eos/effects/effect3561.py
 delete mode 100644 eos/effects/effect3568.py
 delete mode 100644 eos/effects/effect3569.py
 delete mode 100644 eos/effects/effect3570.py
 delete mode 100644 eos/effects/effect3571.py
 delete mode 100644 eos/effects/effect3586.py
 delete mode 100644 eos/effects/effect3587.py
 delete mode 100644 eos/effects/effect3588.py
 delete mode 100644 eos/effects/effect3589.py
 delete mode 100644 eos/effects/effect3590.py
 delete mode 100644 eos/effects/effect3591.py
 delete mode 100644 eos/effects/effect3592.py
 delete mode 100644 eos/effects/effect3593.py
 delete mode 100644 eos/effects/effect3597.py
 delete mode 100644 eos/effects/effect3598.py
 delete mode 100644 eos/effects/effect3599.py
 delete mode 100644 eos/effects/effect3600.py
 delete mode 100644 eos/effects/effect3601.py
 delete mode 100644 eos/effects/effect3602.py
 delete mode 100644 eos/effects/effect3617.py
 delete mode 100644 eos/effects/effect3618.py
 delete mode 100644 eos/effects/effect3619.py
 delete mode 100644 eos/effects/effect3620.py
 delete mode 100644 eos/effects/effect3648.py
 delete mode 100644 eos/effects/effect3649.py
 delete mode 100644 eos/effects/effect3650.py
 delete mode 100644 eos/effects/effect3651.py
 delete mode 100644 eos/effects/effect3652.py
 delete mode 100644 eos/effects/effect3653.py
 delete mode 100644 eos/effects/effect3655.py
 delete mode 100644 eos/effects/effect3656.py
 delete mode 100644 eos/effects/effect3657.py
 delete mode 100644 eos/effects/effect3659.py
 delete mode 100644 eos/effects/effect3660.py
 delete mode 100644 eos/effects/effect3668.py
 delete mode 100644 eos/effects/effect3669.py
 delete mode 100644 eos/effects/effect3670.py
 delete mode 100644 eos/effects/effect3671.py
 delete mode 100644 eos/effects/effect3672.py
 delete mode 100644 eos/effects/effect3677.py
 delete mode 100644 eos/effects/effect3678.py
 delete mode 100644 eos/effects/effect3679.py
 delete mode 100644 eos/effects/effect3680.py
 delete mode 100644 eos/effects/effect3681.py
 delete mode 100644 eos/effects/effect3682.py
 delete mode 100644 eos/effects/effect3683.py
 delete mode 100644 eos/effects/effect3686.py
 delete mode 100644 eos/effects/effect3703.py
 delete mode 100644 eos/effects/effect3705.py
 delete mode 100644 eos/effects/effect3706.py
 delete mode 100644 eos/effects/effect3726.py
 delete mode 100644 eos/effects/effect3727.py
 delete mode 100644 eos/effects/effect3739.py
 delete mode 100644 eos/effects/effect3740.py
 delete mode 100644 eos/effects/effect3742.py
 delete mode 100644 eos/effects/effect3744.py
 delete mode 100644 eos/effects/effect3745.py
 delete mode 100644 eos/effects/effect3765.py
 delete mode 100644 eos/effects/effect3766.py
 delete mode 100644 eos/effects/effect3767.py
 delete mode 100644 eos/effects/effect3771.py
 delete mode 100644 eos/effects/effect3773.py
 delete mode 100644 eos/effects/effect3774.py
 delete mode 100644 eos/effects/effect3782.py
 delete mode 100644 eos/effects/effect3783.py
 delete mode 100644 eos/effects/effect3797.py
 delete mode 100644 eos/effects/effect3799.py
 delete mode 100644 eos/effects/effect38.py
 delete mode 100644 eos/effects/effect3807.py
 delete mode 100644 eos/effects/effect3808.py
 delete mode 100644 eos/effects/effect3810.py
 delete mode 100644 eos/effects/effect3811.py
 delete mode 100644 eos/effects/effect3831.py
 delete mode 100644 eos/effects/effect3857.py
 delete mode 100644 eos/effects/effect3859.py
 delete mode 100644 eos/effects/effect3860.py
 delete mode 100644 eos/effects/effect3861.py
 delete mode 100644 eos/effects/effect3863.py
 delete mode 100644 eos/effects/effect3864.py
 delete mode 100644 eos/effects/effect3865.py
 delete mode 100644 eos/effects/effect3866.py
 delete mode 100644 eos/effects/effect3867.py
 delete mode 100644 eos/effects/effect3868.py
 delete mode 100644 eos/effects/effect3869.py
 delete mode 100644 eos/effects/effect3872.py
 delete mode 100644 eos/effects/effect3875.py
 delete mode 100644 eos/effects/effect3893.py
 delete mode 100644 eos/effects/effect3895.py
 delete mode 100644 eos/effects/effect3897.py
 delete mode 100644 eos/effects/effect39.py
 delete mode 100644 eos/effects/effect3900.py
 delete mode 100644 eos/effects/effect391.py
 delete mode 100644 eos/effects/effect392.py
 delete mode 100644 eos/effects/effect394.py
 delete mode 100644 eos/effects/effect395.py
 delete mode 100644 eos/effects/effect3959.py
 delete mode 100644 eos/effects/effect396.py
 delete mode 100644 eos/effects/effect3961.py
 delete mode 100644 eos/effects/effect3962.py
 delete mode 100644 eos/effects/effect3964.py
 delete mode 100644 eos/effects/effect397.py
 delete mode 100644 eos/effects/effect3976.py
 delete mode 100644 eos/effects/effect3979.py
 delete mode 100644 eos/effects/effect3980.py
 delete mode 100644 eos/effects/effect3982.py
 delete mode 100644 eos/effects/effect3992.py
 delete mode 100644 eos/effects/effect3993.py
 delete mode 100644 eos/effects/effect3995.py
 delete mode 100644 eos/effects/effect3996.py
 delete mode 100644 eos/effects/effect3997.py
 delete mode 100644 eos/effects/effect3998.py
 delete mode 100644 eos/effects/effect3999.py
 delete mode 100644 eos/effects/effect4.py
 delete mode 100644 eos/effects/effect4002.py
 delete mode 100644 eos/effects/effect4003.py
 delete mode 100644 eos/effects/effect4016.py
 delete mode 100644 eos/effects/effect4017.py
 delete mode 100644 eos/effects/effect4018.py
 delete mode 100644 eos/effects/effect4019.py
 delete mode 100644 eos/effects/effect4020.py
 delete mode 100644 eos/effects/effect4021.py
 delete mode 100644 eos/effects/effect4022.py
 delete mode 100644 eos/effects/effect4023.py
 delete mode 100644 eos/effects/effect4033.py
 delete mode 100644 eos/effects/effect4034.py
 delete mode 100644 eos/effects/effect4035.py
 delete mode 100644 eos/effects/effect4036.py
 delete mode 100644 eos/effects/effect4037.py
 delete mode 100644 eos/effects/effect4038.py
 delete mode 100644 eos/effects/effect4039.py
 delete mode 100644 eos/effects/effect4040.py
 delete mode 100644 eos/effects/effect4041.py
 delete mode 100644 eos/effects/effect4042.py
 delete mode 100644 eos/effects/effect4043.py
 delete mode 100644 eos/effects/effect4044.py
 delete mode 100644 eos/effects/effect4045.py
 delete mode 100644 eos/effects/effect4046.py
 delete mode 100644 eos/effects/effect4047.py
 delete mode 100644 eos/effects/effect4048.py
 delete mode 100644 eos/effects/effect4049.py
 delete mode 100644 eos/effects/effect4054.py
 delete mode 100644 eos/effects/effect4055.py
 delete mode 100644 eos/effects/effect4056.py
 delete mode 100644 eos/effects/effect4057.py
 delete mode 100644 eos/effects/effect4058.py
 delete mode 100644 eos/effects/effect4059.py
 delete mode 100644 eos/effects/effect4060.py
 delete mode 100644 eos/effects/effect4061.py
 delete mode 100644 eos/effects/effect4062.py
 delete mode 100644 eos/effects/effect4063.py
 delete mode 100644 eos/effects/effect408.py
 delete mode 100644 eos/effects/effect4086.py
 delete mode 100644 eos/effects/effect4088.py
 delete mode 100644 eos/effects/effect4089.py
 delete mode 100644 eos/effects/effect4090.py
 delete mode 100644 eos/effects/effect4091.py
 delete mode 100644 eos/effects/effect4093.py
 delete mode 100644 eos/effects/effect4104.py
 delete mode 100644 eos/effects/effect4106.py
 delete mode 100644 eos/effects/effect4114.py
 delete mode 100644 eos/effects/effect4115.py
 delete mode 100644 eos/effects/effect4122.py
 delete mode 100644 eos/effects/effect4135.py
 delete mode 100644 eos/effects/effect4136.py
 delete mode 100644 eos/effects/effect4137.py
 delete mode 100644 eos/effects/effect4138.py
 delete mode 100644 eos/effects/effect414.py
 delete mode 100644 eos/effects/effect4152.py
 delete mode 100644 eos/effects/effect4153.py
 delete mode 100644 eos/effects/effect4154.py
 delete mode 100644 eos/effects/effect4155.py
 delete mode 100644 eos/effects/effect4158.py
 delete mode 100644 eos/effects/effect4159.py
 delete mode 100644 eos/effects/effect4161.py
 delete mode 100644 eos/effects/effect4162.py
 delete mode 100644 eos/effects/effect4165.py
 delete mode 100644 eos/effects/effect4166.py
 delete mode 100644 eos/effects/effect4167.py
 delete mode 100644 eos/effects/effect4168.py
 delete mode 100644 eos/effects/effect4187.py
 delete mode 100644 eos/effects/effect4188.py
 delete mode 100644 eos/effects/effect4189.py
 delete mode 100644 eos/effects/effect4190.py
 delete mode 100644 eos/effects/effect4215.py
 delete mode 100644 eos/effects/effect4216.py
 delete mode 100644 eos/effects/effect4217.py
 delete mode 100644 eos/effects/effect4248.py
 delete mode 100644 eos/effects/effect4250.py
 delete mode 100644 eos/effects/effect4251.py
 delete mode 100644 eos/effects/effect4256.py
 delete mode 100644 eos/effects/effect4264.py
 delete mode 100644 eos/effects/effect4265.py
 delete mode 100644 eos/effects/effect4269.py
 delete mode 100644 eos/effects/effect4270.py
 delete mode 100644 eos/effects/effect4271.py
 delete mode 100644 eos/effects/effect4272.py
 delete mode 100644 eos/effects/effect4273.py
 delete mode 100644 eos/effects/effect4274.py
 delete mode 100644 eos/effects/effect4275.py
 delete mode 100644 eos/effects/effect4277.py
 delete mode 100644 eos/effects/effect4278.py
 delete mode 100644 eos/effects/effect4280.py
 delete mode 100644 eos/effects/effect4282.py
 delete mode 100644 eos/effects/effect4283.py
 delete mode 100644 eos/effects/effect4286.py
 delete mode 100644 eos/effects/effect4288.py
 delete mode 100644 eos/effects/effect4290.py
 delete mode 100644 eos/effects/effect4292.py
 delete mode 100644 eos/effects/effect4321.py
 delete mode 100644 eos/effects/effect4327.py
 delete mode 100644 eos/effects/effect4330.py
 delete mode 100644 eos/effects/effect4331.py
 delete mode 100644 eos/effects/effect4342.py
 delete mode 100644 eos/effects/effect4343.py
 delete mode 100644 eos/effects/effect4347.py
 delete mode 100644 eos/effects/effect4351.py
 delete mode 100644 eos/effects/effect4358.py
 delete mode 100644 eos/effects/effect4360.py
 delete mode 100644 eos/effects/effect4362.py
 delete mode 100644 eos/effects/effect4366.py
 delete mode 100644 eos/effects/effect4369.py
 delete mode 100644 eos/effects/effect4370.py
 delete mode 100644 eos/effects/effect4372.py
 delete mode 100644 eos/effects/effect4373.py
 delete mode 100644 eos/effects/effect4377.py
 delete mode 100644 eos/effects/effect4378.py
 delete mode 100644 eos/effects/effect4379.py
 delete mode 100644 eos/effects/effect4380.py
 delete mode 100644 eos/effects/effect4384.py
 delete mode 100644 eos/effects/effect4385.py
 delete mode 100644 eos/effects/effect4393.py
 delete mode 100644 eos/effects/effect4394.py
 delete mode 100644 eos/effects/effect4395.py
 delete mode 100644 eos/effects/effect4396.py
 delete mode 100644 eos/effects/effect4397.py
 delete mode 100644 eos/effects/effect4398.py
 delete mode 100644 eos/effects/effect4399.py
 delete mode 100644 eos/effects/effect4400.py
 delete mode 100644 eos/effects/effect4413.py
 delete mode 100644 eos/effects/effect4415.py
 delete mode 100644 eos/effects/effect4416.py
 delete mode 100644 eos/effects/effect4417.py
 delete mode 100644 eos/effects/effect4451.py
 delete mode 100644 eos/effects/effect4452.py
 delete mode 100644 eos/effects/effect4453.py
 delete mode 100644 eos/effects/effect4454.py
 delete mode 100644 eos/effects/effect4456.py
 delete mode 100644 eos/effects/effect4457.py
 delete mode 100644 eos/effects/effect4458.py
 delete mode 100644 eos/effects/effect4459.py
 delete mode 100644 eos/effects/effect446.py
 delete mode 100644 eos/effects/effect4460.py
 delete mode 100644 eos/effects/effect4461.py
 delete mode 100644 eos/effects/effect4462.py
 delete mode 100644 eos/effects/effect4463.py
 delete mode 100644 eos/effects/effect4464.py
 delete mode 100644 eos/effects/effect4471.py
 delete mode 100644 eos/effects/effect4472.py
 delete mode 100644 eos/effects/effect4473.py
 delete mode 100644 eos/effects/effect4474.py
 delete mode 100644 eos/effects/effect4475.py
 delete mode 100644 eos/effects/effect4476.py
 delete mode 100644 eos/effects/effect4477.py
 delete mode 100644 eos/effects/effect4478.py
 delete mode 100644 eos/effects/effect4479.py
 delete mode 100644 eos/effects/effect4482.py
 delete mode 100644 eos/effects/effect4484.py
 delete mode 100644 eos/effects/effect4485.py
 delete mode 100644 eos/effects/effect4489.py
 delete mode 100644 eos/effects/effect4490.py
 delete mode 100644 eos/effects/effect4491.py
 delete mode 100644 eos/effects/effect4492.py
 delete mode 100644 eos/effects/effect4510.py
 delete mode 100644 eos/effects/effect4512.py
 delete mode 100644 eos/effects/effect4513.py
 delete mode 100644 eos/effects/effect4515.py
 delete mode 100644 eos/effects/effect4516.py
 delete mode 100644 eos/effects/effect4527.py
 delete mode 100644 eos/effects/effect4555.py
 delete mode 100644 eos/effects/effect4556.py
 delete mode 100644 eos/effects/effect4557.py
 delete mode 100644 eos/effects/effect4558.py
 delete mode 100644 eos/effects/effect4559.py
 delete mode 100644 eos/effects/effect4575.py
 delete mode 100644 eos/effects/effect4576.py
 delete mode 100644 eos/effects/effect4577.py
 delete mode 100644 eos/effects/effect4579.py
 delete mode 100644 eos/effects/effect4619.py
 delete mode 100644 eos/effects/effect4620.py
 delete mode 100644 eos/effects/effect4621.py
 delete mode 100644 eos/effects/effect4622.py
 delete mode 100644 eos/effects/effect4623.py
 delete mode 100644 eos/effects/effect4624.py
 delete mode 100644 eos/effects/effect4625.py
 delete mode 100644 eos/effects/effect4626.py
 delete mode 100644 eos/effects/effect4635.py
 delete mode 100644 eos/effects/effect4636.py
 delete mode 100644 eos/effects/effect4637.py
 delete mode 100644 eos/effects/effect4640.py
 delete mode 100644 eos/effects/effect4643.py
 delete mode 100644 eos/effects/effect4645.py
 delete mode 100644 eos/effects/effect4648.py
 delete mode 100644 eos/effects/effect4649.py
 delete mode 100644 eos/effects/effect4667.py
 delete mode 100644 eos/effects/effect4668.py
 delete mode 100644 eos/effects/effect4669.py
 delete mode 100644 eos/effects/effect4670.py
 delete mode 100644 eos/effects/effect4728.py
 delete mode 100644 eos/effects/effect4760.py
 delete mode 100644 eos/effects/effect4775.py
 delete mode 100644 eos/effects/effect4782.py
 delete mode 100644 eos/effects/effect4789.py
 delete mode 100644 eos/effects/effect4793.py
 delete mode 100644 eos/effects/effect4794.py
 delete mode 100644 eos/effects/effect4795.py
 delete mode 100644 eos/effects/effect4799.py
 delete mode 100644 eos/effects/effect48.py
 delete mode 100644 eos/effects/effect4804.py
 delete mode 100644 eos/effects/effect4809.py
 delete mode 100644 eos/effects/effect4810.py
 delete mode 100644 eos/effects/effect4811.py
 delete mode 100644 eos/effects/effect4812.py
 delete mode 100644 eos/effects/effect4814.py
 delete mode 100644 eos/effects/effect4817.py
 delete mode 100644 eos/effects/effect4820.py
 delete mode 100644 eos/effects/effect4821.py
 delete mode 100644 eos/effects/effect4822.py
 delete mode 100644 eos/effects/effect4823.py
 delete mode 100644 eos/effects/effect4824.py
 delete mode 100644 eos/effects/effect4825.py
 delete mode 100644 eos/effects/effect4826.py
 delete mode 100644 eos/effects/effect4827.py
 delete mode 100644 eos/effects/effect485.py
 delete mode 100644 eos/effects/effect486.py
 delete mode 100644 eos/effects/effect4867.py
 delete mode 100644 eos/effects/effect4868.py
 delete mode 100644 eos/effects/effect4869.py
 delete mode 100644 eos/effects/effect4871.py
 delete mode 100644 eos/effects/effect4896.py
 delete mode 100644 eos/effects/effect4897.py
 delete mode 100644 eos/effects/effect4898.py
 delete mode 100644 eos/effects/effect490.py
 delete mode 100644 eos/effects/effect4901.py
 delete mode 100644 eos/effects/effect4902.py
 delete mode 100644 eos/effects/effect4906.py
 delete mode 100644 eos/effects/effect4911.py
 delete mode 100644 eos/effects/effect4921.py
 delete mode 100644 eos/effects/effect4923.py
 delete mode 100644 eos/effects/effect4928.py
 delete mode 100644 eos/effects/effect4934.py
 delete mode 100644 eos/effects/effect4936.py
 delete mode 100644 eos/effects/effect494.py
 delete mode 100644 eos/effects/effect4941.py
 delete mode 100644 eos/effects/effect4942.py
 delete mode 100644 eos/effects/effect4945.py
 delete mode 100644 eos/effects/effect4946.py
 delete mode 100644 eos/effects/effect4950.py
 delete mode 100644 eos/effects/effect4951.py
 delete mode 100644 eos/effects/effect4961.py
 delete mode 100644 eos/effects/effect4967.py
 delete mode 100644 eos/effects/effect4970.py
 delete mode 100644 eos/effects/effect4972.py
 delete mode 100644 eos/effects/effect4973.py
 delete mode 100644 eos/effects/effect4974.py
 delete mode 100644 eos/effects/effect4975.py
 delete mode 100644 eos/effects/effect4976.py
 delete mode 100644 eos/effects/effect4989.py
 delete mode 100644 eos/effects/effect4990.py
 delete mode 100644 eos/effects/effect4991.py
 delete mode 100644 eos/effects/effect4994.py
 delete mode 100644 eos/effects/effect4995.py
 delete mode 100644 eos/effects/effect4996.py
 delete mode 100644 eos/effects/effect4997.py
 delete mode 100644 eos/effects/effect4999.py
 delete mode 100644 eos/effects/effect50.py
 delete mode 100644 eos/effects/effect5000.py
 delete mode 100644 eos/effects/effect5008.py
 delete mode 100644 eos/effects/effect5009.py
 delete mode 100644 eos/effects/effect5011.py
 delete mode 100644 eos/effects/effect5012.py
 delete mode 100644 eos/effects/effect5013.py
 delete mode 100644 eos/effects/effect5014.py
 delete mode 100644 eos/effects/effect5015.py
 delete mode 100644 eos/effects/effect5016.py
 delete mode 100644 eos/effects/effect5017.py
 delete mode 100644 eos/effects/effect5018.py
 delete mode 100644 eos/effects/effect5019.py
 delete mode 100644 eos/effects/effect5020.py
 delete mode 100644 eos/effects/effect5021.py
 delete mode 100644 eos/effects/effect5028.py
 delete mode 100644 eos/effects/effect5029.py
 delete mode 100644 eos/effects/effect5030.py
 delete mode 100644 eos/effects/effect5035.py
 delete mode 100644 eos/effects/effect5036.py
 delete mode 100644 eos/effects/effect504.py
 delete mode 100644 eos/effects/effect5045.py
 delete mode 100644 eos/effects/effect5048.py
 delete mode 100644 eos/effects/effect5051.py
 delete mode 100644 eos/effects/effect5055.py
 delete mode 100644 eos/effects/effect5058.py
 delete mode 100644 eos/effects/effect5059.py
 delete mode 100644 eos/effects/effect506.py
 delete mode 100644 eos/effects/effect5066.py
 delete mode 100644 eos/effects/effect5067.py
 delete mode 100644 eos/effects/effect5068.py
 delete mode 100644 eos/effects/effect5069.py
 delete mode 100644 eos/effects/effect507.py
 delete mode 100644 eos/effects/effect5079.py
 delete mode 100644 eos/effects/effect508.py
 delete mode 100644 eos/effects/effect5080.py
 delete mode 100644 eos/effects/effect5081.py
 delete mode 100644 eos/effects/effect5087.py
 delete mode 100644 eos/effects/effect5090.py
 delete mode 100644 eos/effects/effect51.py
 delete mode 100644 eos/effects/effect5103.py
 delete mode 100644 eos/effects/effect5104.py
 delete mode 100644 eos/effects/effect5105.py
 delete mode 100644 eos/effects/effect5106.py
 delete mode 100644 eos/effects/effect5107.py
 delete mode 100644 eos/effects/effect5108.py
 delete mode 100644 eos/effects/effect5109.py
 delete mode 100644 eos/effects/effect511.py
 delete mode 100644 eos/effects/effect5110.py
 delete mode 100644 eos/effects/effect5111.py
 delete mode 100644 eos/effects/effect5119.py
 delete mode 100644 eos/effects/effect512.py
 delete mode 100644 eos/effects/effect5121.py
 delete mode 100644 eos/effects/effect5122.py
 delete mode 100644 eos/effects/effect5123.py
 delete mode 100644 eos/effects/effect5124.py
 delete mode 100644 eos/effects/effect5125.py
 delete mode 100644 eos/effects/effect5126.py
 delete mode 100644 eos/effects/effect5127.py
 delete mode 100644 eos/effects/effect5128.py
 delete mode 100644 eos/effects/effect5129.py
 delete mode 100644 eos/effects/effect5131.py
 delete mode 100644 eos/effects/effect5132.py
 delete mode 100644 eos/effects/effect5133.py
 delete mode 100644 eos/effects/effect5136.py
 delete mode 100644 eos/effects/effect5139.py
 delete mode 100644 eos/effects/effect514.py
 delete mode 100644 eos/effects/effect5142.py
 delete mode 100644 eos/effects/effect5153.py
 delete mode 100644 eos/effects/effect5156.py
 delete mode 100644 eos/effects/effect516.py
 delete mode 100644 eos/effects/effect5162.py
 delete mode 100644 eos/effects/effect5165.py
 delete mode 100644 eos/effects/effect5168.py
 delete mode 100644 eos/effects/effect5180.py
 delete mode 100644 eos/effects/effect5181.py
 delete mode 100644 eos/effects/effect5182.py
 delete mode 100644 eos/effects/effect5183.py
 delete mode 100644 eos/effects/effect5185.py
 delete mode 100644 eos/effects/effect5187.py
 delete mode 100644 eos/effects/effect5188.py
 delete mode 100644 eos/effects/effect5189.py
 delete mode 100644 eos/effects/effect5190.py
 delete mode 100644 eos/effects/effect5201.py
 delete mode 100644 eos/effects/effect5205.py
 delete mode 100644 eos/effects/effect5206.py
 delete mode 100644 eos/effects/effect5207.py
 delete mode 100644 eos/effects/effect5208.py
 delete mode 100644 eos/effects/effect5209.py
 delete mode 100644 eos/effects/effect521.py
 delete mode 100644 eos/effects/effect5212.py
 delete mode 100644 eos/effects/effect5213.py
 delete mode 100644 eos/effects/effect5214.py
 delete mode 100644 eos/effects/effect5215.py
 delete mode 100644 eos/effects/effect5216.py
 delete mode 100644 eos/effects/effect5217.py
 delete mode 100644 eos/effects/effect5218.py
 delete mode 100644 eos/effects/effect5219.py
 delete mode 100644 eos/effects/effect5220.py
 delete mode 100644 eos/effects/effect5221.py
 delete mode 100644 eos/effects/effect5222.py
 delete mode 100644 eos/effects/effect5223.py
 delete mode 100644 eos/effects/effect5224.py
 delete mode 100644 eos/effects/effect5225.py
 delete mode 100644 eos/effects/effect5226.py
 delete mode 100644 eos/effects/effect5227.py
 delete mode 100644 eos/effects/effect5228.py
 delete mode 100644 eos/effects/effect5229.py
 delete mode 100644 eos/effects/effect5230.py
 delete mode 100644 eos/effects/effect5231.py
 delete mode 100644 eos/effects/effect5234.py
 delete mode 100644 eos/effects/effect5237.py
 delete mode 100644 eos/effects/effect5240.py
 delete mode 100644 eos/effects/effect5243.py
 delete mode 100644 eos/effects/effect5259.py
 delete mode 100644 eos/effects/effect5260.py
 delete mode 100644 eos/effects/effect5261.py
 delete mode 100644 eos/effects/effect5262.py
 delete mode 100644 eos/effects/effect5263.py
 delete mode 100644 eos/effects/effect5264.py
 delete mode 100644 eos/effects/effect5265.py
 delete mode 100644 eos/effects/effect5266.py
 delete mode 100644 eos/effects/effect5267.py
 delete mode 100644 eos/effects/effect5268.py
 delete mode 100644 eos/effects/effect527.py
 delete mode 100644 eos/effects/effect5275.py
 delete mode 100644 eos/effects/effect529.py
 delete mode 100644 eos/effects/effect5293.py
 delete mode 100644 eos/effects/effect5294.py
 delete mode 100644 eos/effects/effect5295.py
 delete mode 100644 eos/effects/effect5300.py
 delete mode 100644 eos/effects/effect5303.py
 delete mode 100644 eos/effects/effect5304.py
 delete mode 100644 eos/effects/effect5305.py
 delete mode 100644 eos/effects/effect5306.py
 delete mode 100644 eos/effects/effect5307.py
 delete mode 100644 eos/effects/effect5308.py
 delete mode 100644 eos/effects/effect5309.py
 delete mode 100644 eos/effects/effect5310.py
 delete mode 100644 eos/effects/effect5311.py
 delete mode 100644 eos/effects/effect5316.py
 delete mode 100644 eos/effects/effect5317.py
 delete mode 100644 eos/effects/effect5318.py
 delete mode 100644 eos/effects/effect5319.py
 delete mode 100644 eos/effects/effect5320.py
 delete mode 100644 eos/effects/effect5321.py
 delete mode 100644 eos/effects/effect5322.py
 delete mode 100644 eos/effects/effect5323.py
 delete mode 100644 eos/effects/effect5324.py
 delete mode 100644 eos/effects/effect5325.py
 delete mode 100644 eos/effects/effect5326.py
 delete mode 100644 eos/effects/effect5331.py
 delete mode 100644 eos/effects/effect5332.py
 delete mode 100644 eos/effects/effect5333.py
 delete mode 100644 eos/effects/effect5334.py
 delete mode 100644 eos/effects/effect5335.py
 delete mode 100644 eos/effects/effect5336.py
 delete mode 100644 eos/effects/effect5337.py
 delete mode 100644 eos/effects/effect5338.py
 delete mode 100644 eos/effects/effect5339.py
 delete mode 100644 eos/effects/effect5340.py
 delete mode 100644 eos/effects/effect5341.py
 delete mode 100644 eos/effects/effect5342.py
 delete mode 100644 eos/effects/effect5343.py
 delete mode 100644 eos/effects/effect5348.py
 delete mode 100644 eos/effects/effect5349.py
 delete mode 100644 eos/effects/effect5350.py
 delete mode 100644 eos/effects/effect5351.py
 delete mode 100644 eos/effects/effect5352.py
 delete mode 100644 eos/effects/effect5353.py
 delete mode 100644 eos/effects/effect5354.py
 delete mode 100644 eos/effects/effect5355.py
 delete mode 100644 eos/effects/effect5356.py
 delete mode 100644 eos/effects/effect5357.py
 delete mode 100644 eos/effects/effect5358.py
 delete mode 100644 eos/effects/effect5359.py
 delete mode 100644 eos/effects/effect536.py
 delete mode 100644 eos/effects/effect5360.py
 delete mode 100644 eos/effects/effect5361.py
 delete mode 100644 eos/effects/effect5364.py
 delete mode 100644 eos/effects/effect5365.py
 delete mode 100644 eos/effects/effect5366.py
 delete mode 100644 eos/effects/effect5367.py
 delete mode 100644 eos/effects/effect5378.py
 delete mode 100644 eos/effects/effect5379.py
 delete mode 100644 eos/effects/effect5380.py
 delete mode 100644 eos/effects/effect5381.py
 delete mode 100644 eos/effects/effect5382.py
 delete mode 100644 eos/effects/effect5383.py
 delete mode 100644 eos/effects/effect5384.py
 delete mode 100644 eos/effects/effect5385.py
 delete mode 100644 eos/effects/effect5386.py
 delete mode 100644 eos/effects/effect5387.py
 delete mode 100644 eos/effects/effect5388.py
 delete mode 100644 eos/effects/effect5389.py
 delete mode 100644 eos/effects/effect5390.py
 delete mode 100644 eos/effects/effect5397.py
 delete mode 100644 eos/effects/effect5398.py
 delete mode 100644 eos/effects/effect5399.py
 delete mode 100644 eos/effects/effect5402.py
 delete mode 100644 eos/effects/effect5403.py
 delete mode 100644 eos/effects/effect5410.py
 delete mode 100644 eos/effects/effect5411.py
 delete mode 100644 eos/effects/effect5417.py
 delete mode 100644 eos/effects/effect5418.py
 delete mode 100644 eos/effects/effect5419.py
 delete mode 100644 eos/effects/effect542.py
 delete mode 100644 eos/effects/effect5420.py
 delete mode 100644 eos/effects/effect5424.py
 delete mode 100644 eos/effects/effect5427.py
 delete mode 100644 eos/effects/effect5428.py
 delete mode 100644 eos/effects/effect5429.py
 delete mode 100644 eos/effects/effect5430.py
 delete mode 100644 eos/effects/effect5431.py
 delete mode 100644 eos/effects/effect5433.py
 delete mode 100644 eos/effects/effect5437.py
 delete mode 100644 eos/effects/effect5440.py
 delete mode 100644 eos/effects/effect5444.py
 delete mode 100644 eos/effects/effect5445.py
 delete mode 100644 eos/effects/effect5456.py
 delete mode 100644 eos/effects/effect5457.py
 delete mode 100644 eos/effects/effect5459.py
 delete mode 100644 eos/effects/effect5460.py
 delete mode 100644 eos/effects/effect5461.py
 delete mode 100644 eos/effects/effect5468.py
 delete mode 100644 eos/effects/effect5469.py
 delete mode 100644 eos/effects/effect5470.py
 delete mode 100644 eos/effects/effect5471.py
 delete mode 100644 eos/effects/effect5476.py
 delete mode 100644 eos/effects/effect5477.py
 delete mode 100644 eos/effects/effect5478.py
 delete mode 100644 eos/effects/effect5479.py
 delete mode 100644 eos/effects/effect5480.py
 delete mode 100644 eos/effects/effect5482.py
 delete mode 100644 eos/effects/effect5483.py
 delete mode 100644 eos/effects/effect5484.py
 delete mode 100644 eos/effects/effect5485.py
 delete mode 100644 eos/effects/effect5486.py
 delete mode 100644 eos/effects/effect549.py
 delete mode 100644 eos/effects/effect5496.py
 delete mode 100644 eos/effects/effect5497.py
 delete mode 100644 eos/effects/effect5498.py
 delete mode 100644 eos/effects/effect5499.py
 delete mode 100644 eos/effects/effect55.py
 delete mode 100644 eos/effects/effect550.py
 delete mode 100644 eos/effects/effect5500.py
 delete mode 100644 eos/effects/effect5501.py
 delete mode 100644 eos/effects/effect5502.py
 delete mode 100644 eos/effects/effect5503.py
 delete mode 100644 eos/effects/effect5504.py
 delete mode 100644 eos/effects/effect5505.py
 delete mode 100644 eos/effects/effect5514.py
 delete mode 100644 eos/effects/effect5521.py
 delete mode 100644 eos/effects/effect553.py
 delete mode 100644 eos/effects/effect5539.py
 delete mode 100644 eos/effects/effect5540.py
 delete mode 100644 eos/effects/effect5541.py
 delete mode 100644 eos/effects/effect5542.py
 delete mode 100644 eos/effects/effect5552.py
 delete mode 100644 eos/effects/effect5553.py
 delete mode 100644 eos/effects/effect5554.py
 delete mode 100644 eos/effects/effect5555.py
 delete mode 100644 eos/effects/effect5556.py
 delete mode 100644 eos/effects/effect5557.py
 delete mode 100644 eos/effects/effect5558.py
 delete mode 100644 eos/effects/effect5559.py
 delete mode 100644 eos/effects/effect5560.py
 delete mode 100644 eos/effects/effect5564.py
 delete mode 100644 eos/effects/effect5568.py
 delete mode 100644 eos/effects/effect5570.py
 delete mode 100644 eos/effects/effect5572.py
 delete mode 100644 eos/effects/effect5573.py
 delete mode 100644 eos/effects/effect5574.py
 delete mode 100644 eos/effects/effect5575.py
 delete mode 100644 eos/effects/effect56.py
 delete mode 100644 eos/effects/effect5607.py
 delete mode 100644 eos/effects/effect5610.py
 delete mode 100644 eos/effects/effect5611.py
 delete mode 100644 eos/effects/effect5618.py
 delete mode 100644 eos/effects/effect5619.py
 delete mode 100644 eos/effects/effect562.py
 delete mode 100644 eos/effects/effect5620.py
 delete mode 100644 eos/effects/effect5621.py
 delete mode 100644 eos/effects/effect5622.py
 delete mode 100644 eos/effects/effect5628.py
 delete mode 100644 eos/effects/effect5629.py
 delete mode 100644 eos/effects/effect5630.py
 delete mode 100644 eos/effects/effect5631.py
 delete mode 100644 eos/effects/effect5632.py
 delete mode 100644 eos/effects/effect5633.py
 delete mode 100644 eos/effects/effect5634.py
 delete mode 100644 eos/effects/effect5635.py
 delete mode 100644 eos/effects/effect5636.py
 delete mode 100644 eos/effects/effect5637.py
 delete mode 100644 eos/effects/effect5638.py
 delete mode 100644 eos/effects/effect5639.py
 delete mode 100644 eos/effects/effect5644.py
 delete mode 100644 eos/effects/effect5647.py
 delete mode 100644 eos/effects/effect5650.py
 delete mode 100644 eos/effects/effect5657.py
 delete mode 100644 eos/effects/effect5673.py
 delete mode 100644 eos/effects/effect5676.py
 delete mode 100644 eos/effects/effect5688.py
 delete mode 100644 eos/effects/effect5695.py
 delete mode 100644 eos/effects/effect57.py
 delete mode 100644 eos/effects/effect5717.py
 delete mode 100644 eos/effects/effect5721.py
 delete mode 100644 eos/effects/effect5722.py
 delete mode 100644 eos/effects/effect5723.py
 delete mode 100644 eos/effects/effect5724.py
 delete mode 100644 eos/effects/effect5725.py
 delete mode 100644 eos/effects/effect5726.py
 delete mode 100644 eos/effects/effect5733.py
 delete mode 100644 eos/effects/effect5734.py
 delete mode 100644 eos/effects/effect5735.py
 delete mode 100644 eos/effects/effect5736.py
 delete mode 100644 eos/effects/effect5737.py
 delete mode 100644 eos/effects/effect5738.py
 delete mode 100644 eos/effects/effect5754.py
 delete mode 100644 eos/effects/effect5757.py
 delete mode 100644 eos/effects/effect5758.py
 delete mode 100644 eos/effects/effect5769.py
 delete mode 100644 eos/effects/effect5778.py
 delete mode 100644 eos/effects/effect5779.py
 delete mode 100644 eos/effects/effect5793.py
 delete mode 100644 eos/effects/effect58.py
 delete mode 100644 eos/effects/effect5802.py
 delete mode 100644 eos/effects/effect5803.py
 delete mode 100644 eos/effects/effect5804.py
 delete mode 100644 eos/effects/effect5805.py
 delete mode 100644 eos/effects/effect5806.py
 delete mode 100644 eos/effects/effect5807.py
 delete mode 100644 eos/effects/effect5808.py
 delete mode 100644 eos/effects/effect5809.py
 delete mode 100644 eos/effects/effect581.py
 delete mode 100644 eos/effects/effect5810.py
 delete mode 100644 eos/effects/effect5811.py
 delete mode 100644 eos/effects/effect5812.py
 delete mode 100644 eos/effects/effect5813.py
 delete mode 100644 eos/effects/effect5814.py
 delete mode 100644 eos/effects/effect5815.py
 delete mode 100644 eos/effects/effect5816.py
 delete mode 100644 eos/effects/effect5817.py
 delete mode 100644 eos/effects/effect5818.py
 delete mode 100644 eos/effects/effect5819.py
 delete mode 100644 eos/effects/effect582.py
 delete mode 100644 eos/effects/effect5820.py
 delete mode 100644 eos/effects/effect5821.py
 delete mode 100644 eos/effects/effect5822.py
 delete mode 100644 eos/effects/effect5823.py
 delete mode 100644 eos/effects/effect5824.py
 delete mode 100644 eos/effects/effect5825.py
 delete mode 100644 eos/effects/effect5826.py
 delete mode 100644 eos/effects/effect5827.py
 delete mode 100644 eos/effects/effect5829.py
 delete mode 100644 eos/effects/effect5832.py
 delete mode 100644 eos/effects/effect5839.py
 delete mode 100644 eos/effects/effect584.py
 delete mode 100644 eos/effects/effect5840.py
 delete mode 100644 eos/effects/effect5852.py
 delete mode 100644 eos/effects/effect5853.py
 delete mode 100644 eos/effects/effect5862.py
 delete mode 100644 eos/effects/effect5863.py
 delete mode 100644 eos/effects/effect5864.py
 delete mode 100644 eos/effects/effect5865.py
 delete mode 100644 eos/effects/effect5866.py
 delete mode 100644 eos/effects/effect5867.py
 delete mode 100644 eos/effects/effect5868.py
 delete mode 100644 eos/effects/effect5869.py
 delete mode 100644 eos/effects/effect587.py
 delete mode 100644 eos/effects/effect5870.py
 delete mode 100644 eos/effects/effect5871.py
 delete mode 100644 eos/effects/effect5872.py
 delete mode 100644 eos/effects/effect5873.py
 delete mode 100644 eos/effects/effect5874.py
 delete mode 100644 eos/effects/effect588.py
 delete mode 100644 eos/effects/effect5881.py
 delete mode 100644 eos/effects/effect5888.py
 delete mode 100644 eos/effects/effect5889.py
 delete mode 100644 eos/effects/effect589.py
 delete mode 100644 eos/effects/effect5890.py
 delete mode 100644 eos/effects/effect5891.py
 delete mode 100644 eos/effects/effect5892.py
 delete mode 100644 eos/effects/effect5893.py
 delete mode 100644 eos/effects/effect5896.py
 delete mode 100644 eos/effects/effect5899.py
 delete mode 100644 eos/effects/effect59.py
 delete mode 100644 eos/effects/effect590.py
 delete mode 100644 eos/effects/effect5900.py
 delete mode 100644 eos/effects/effect5901.py
 delete mode 100644 eos/effects/effect5911.py
 delete mode 100644 eos/effects/effect5912.py
 delete mode 100644 eos/effects/effect5913.py
 delete mode 100644 eos/effects/effect5914.py
 delete mode 100644 eos/effects/effect5915.py
 delete mode 100644 eos/effects/effect5916.py
 delete mode 100644 eos/effects/effect5917.py
 delete mode 100644 eos/effects/effect5918.py
 delete mode 100644 eos/effects/effect5919.py
 delete mode 100644 eos/effects/effect5920.py
 delete mode 100644 eos/effects/effect5921.py
 delete mode 100644 eos/effects/effect5922.py
 delete mode 100644 eos/effects/effect5923.py
 delete mode 100644 eos/effects/effect5924.py
 delete mode 100644 eos/effects/effect5925.py
 delete mode 100644 eos/effects/effect5926.py
 delete mode 100644 eos/effects/effect5927.py
 delete mode 100644 eos/effects/effect5929.py
 delete mode 100644 eos/effects/effect5934.py
 delete mode 100644 eos/effects/effect5938.py
 delete mode 100644 eos/effects/effect5939.py
 delete mode 100644 eos/effects/effect5940.py
 delete mode 100644 eos/effects/effect5944.py
 delete mode 100644 eos/effects/effect5945.py
 delete mode 100644 eos/effects/effect5951.py
 delete mode 100644 eos/effects/effect5956.py
 delete mode 100644 eos/effects/effect5957.py
 delete mode 100644 eos/effects/effect5958.py
 delete mode 100644 eos/effects/effect5959.py
 delete mode 100644 eos/effects/effect596.py
 delete mode 100644 eos/effects/effect598.py
 delete mode 100644 eos/effects/effect599.py
 delete mode 100644 eos/effects/effect5994.py
 delete mode 100644 eos/effects/effect5995.py
 delete mode 100644 eos/effects/effect5998.py
 delete mode 100644 eos/effects/effect60.py
 delete mode 100644 eos/effects/effect600.py
 delete mode 100644 eos/effects/effect6001.py
 delete mode 100644 eos/effects/effect6006.py
 delete mode 100644 eos/effects/effect6007.py
 delete mode 100644 eos/effects/effect6008.py
 delete mode 100644 eos/effects/effect6009.py
 delete mode 100644 eos/effects/effect6010.py
 delete mode 100644 eos/effects/effect6011.py
 delete mode 100644 eos/effects/effect6012.py
 delete mode 100644 eos/effects/effect6014.py
 delete mode 100644 eos/effects/effect6015.py
 delete mode 100644 eos/effects/effect6016.py
 delete mode 100644 eos/effects/effect6017.py
 delete mode 100644 eos/effects/effect602.py
 delete mode 100644 eos/effects/effect6020.py
 delete mode 100644 eos/effects/effect6021.py
 delete mode 100644 eos/effects/effect6025.py
 delete mode 100644 eos/effects/effect6027.py
 delete mode 100644 eos/effects/effect6032.py
 delete mode 100644 eos/effects/effect6036.py
 delete mode 100644 eos/effects/effect6037.py
 delete mode 100644 eos/effects/effect6038.py
 delete mode 100644 eos/effects/effect6039.py
 delete mode 100644 eos/effects/effect604.py
 delete mode 100644 eos/effects/effect6040.py
 delete mode 100644 eos/effects/effect6041.py
 delete mode 100644 eos/effects/effect6045.py
 delete mode 100644 eos/effects/effect6046.py
 delete mode 100644 eos/effects/effect6047.py
 delete mode 100644 eos/effects/effect6048.py
 delete mode 100644 eos/effects/effect6051.py
 delete mode 100644 eos/effects/effect6052.py
 delete mode 100644 eos/effects/effect6053.py
 delete mode 100644 eos/effects/effect6054.py
 delete mode 100644 eos/effects/effect6055.py
 delete mode 100644 eos/effects/effect6056.py
 delete mode 100644 eos/effects/effect6057.py
 delete mode 100644 eos/effects/effect6058.py
 delete mode 100644 eos/effects/effect6059.py
 delete mode 100644 eos/effects/effect6060.py
 delete mode 100644 eos/effects/effect6061.py
 delete mode 100644 eos/effects/effect6062.py
 delete mode 100644 eos/effects/effect6063.py
 delete mode 100644 eos/effects/effect607.py
 delete mode 100644 eos/effects/effect6076.py
 delete mode 100644 eos/effects/effect6077.py
 delete mode 100644 eos/effects/effect6083.py
 delete mode 100644 eos/effects/effect6085.py
 delete mode 100644 eos/effects/effect6088.py
 delete mode 100644 eos/effects/effect6093.py
 delete mode 100644 eos/effects/effect6096.py
 delete mode 100644 eos/effects/effect6098.py
 delete mode 100644 eos/effects/effect61.py
 delete mode 100644 eos/effects/effect6104.py
 delete mode 100644 eos/effects/effect6110.py
 delete mode 100644 eos/effects/effect6111.py
 delete mode 100644 eos/effects/effect6112.py
 delete mode 100644 eos/effects/effect6113.py
 delete mode 100644 eos/effects/effect6128.py
 delete mode 100644 eos/effects/effect6129.py
 delete mode 100644 eos/effects/effect6130.py
 delete mode 100644 eos/effects/effect6131.py
 delete mode 100644 eos/effects/effect6135.py
 delete mode 100644 eos/effects/effect6144.py
 delete mode 100644 eos/effects/effect6148.py
 delete mode 100644 eos/effects/effect6149.py
 delete mode 100644 eos/effects/effect6150.py
 delete mode 100644 eos/effects/effect6151.py
 delete mode 100644 eos/effects/effect6152.py
 delete mode 100644 eos/effects/effect6153.py
 delete mode 100644 eos/effects/effect6154.py
 delete mode 100644 eos/effects/effect6155.py
 delete mode 100644 eos/effects/effect6163.py
 delete mode 100644 eos/effects/effect6164.py
 delete mode 100644 eos/effects/effect6166.py
 delete mode 100644 eos/effects/effect6170.py
 delete mode 100644 eos/effects/effect6171.py
 delete mode 100644 eos/effects/effect6172.py
 delete mode 100644 eos/effects/effect6173.py
 delete mode 100644 eos/effects/effect6174.py
 delete mode 100644 eos/effects/effect6175.py
 delete mode 100644 eos/effects/effect6176.py
 delete mode 100644 eos/effects/effect6177.py
 delete mode 100644 eos/effects/effect6178.py
 delete mode 100644 eos/effects/effect6184.py
 delete mode 100644 eos/effects/effect6185.py
 delete mode 100644 eos/effects/effect6186.py
 delete mode 100644 eos/effects/effect6187.py
 delete mode 100644 eos/effects/effect6188.py
 delete mode 100644 eos/effects/effect6195.py
 delete mode 100644 eos/effects/effect6196.py
 delete mode 100644 eos/effects/effect6197.py
 delete mode 100644 eos/effects/effect6201.py
 delete mode 100644 eos/effects/effect6208.py
 delete mode 100644 eos/effects/effect6214.py
 delete mode 100644 eos/effects/effect6216.py
 delete mode 100644 eos/effects/effect6222.py
 delete mode 100644 eos/effects/effect623.py
 delete mode 100644 eos/effects/effect6230.py
 delete mode 100644 eos/effects/effect6232.py
 delete mode 100644 eos/effects/effect6233.py
 delete mode 100644 eos/effects/effect6234.py
 delete mode 100644 eos/effects/effect6237.py
 delete mode 100644 eos/effects/effect6238.py
 delete mode 100644 eos/effects/effect6239.py
 delete mode 100644 eos/effects/effect6241.py
 delete mode 100644 eos/effects/effect6242.py
 delete mode 100644 eos/effects/effect6245.py
 delete mode 100644 eos/effects/effect6246.py
 delete mode 100644 eos/effects/effect6253.py
 delete mode 100644 eos/effects/effect6256.py
 delete mode 100644 eos/effects/effect6257.py
 delete mode 100644 eos/effects/effect6260.py
 delete mode 100644 eos/effects/effect6267.py
 delete mode 100644 eos/effects/effect627.py
 delete mode 100644 eos/effects/effect6272.py
 delete mode 100644 eos/effects/effect6273.py
 delete mode 100644 eos/effects/effect6278.py
 delete mode 100644 eos/effects/effect6281.py
 delete mode 100644 eos/effects/effect6285.py
 delete mode 100644 eos/effects/effect6287.py
 delete mode 100644 eos/effects/effect6291.py
 delete mode 100644 eos/effects/effect6294.py
 delete mode 100644 eos/effects/effect6299.py
 delete mode 100644 eos/effects/effect63.py
 delete mode 100644 eos/effects/effect6300.py
 delete mode 100644 eos/effects/effect6301.py
 delete mode 100644 eos/effects/effect6305.py
 delete mode 100644 eos/effects/effect6307.py
 delete mode 100644 eos/effects/effect6308.py
 delete mode 100644 eos/effects/effect6309.py
 delete mode 100644 eos/effects/effect6310.py
 delete mode 100644 eos/effects/effect6315.py
 delete mode 100644 eos/effects/effect6316.py
 delete mode 100644 eos/effects/effect6317.py
 delete mode 100644 eos/effects/effect6318.py
 delete mode 100644 eos/effects/effect6319.py
 delete mode 100644 eos/effects/effect6320.py
 delete mode 100644 eos/effects/effect6321.py
 delete mode 100644 eos/effects/effect6322.py
 delete mode 100644 eos/effects/effect6323.py
 delete mode 100644 eos/effects/effect6324.py
 delete mode 100644 eos/effects/effect6325.py
 delete mode 100644 eos/effects/effect6326.py
 delete mode 100644 eos/effects/effect6327.py
 delete mode 100644 eos/effects/effect6328.py
 delete mode 100644 eos/effects/effect6329.py
 delete mode 100644 eos/effects/effect6330.py
 delete mode 100644 eos/effects/effect6331.py
 delete mode 100644 eos/effects/effect6332.py
 delete mode 100644 eos/effects/effect6333.py
 delete mode 100644 eos/effects/effect6334.py
 delete mode 100644 eos/effects/effect6335.py
 delete mode 100644 eos/effects/effect6336.py
 delete mode 100644 eos/effects/effect6337.py
 delete mode 100644 eos/effects/effect6338.py
 delete mode 100644 eos/effects/effect6339.py
 delete mode 100644 eos/effects/effect6340.py
 delete mode 100644 eos/effects/effect6341.py
 delete mode 100644 eos/effects/effect6342.py
 delete mode 100644 eos/effects/effect6343.py
 delete mode 100644 eos/effects/effect6350.py
 delete mode 100644 eos/effects/effect6351.py
 delete mode 100644 eos/effects/effect6352.py
 delete mode 100644 eos/effects/effect6353.py
 delete mode 100644 eos/effects/effect6354.py
 delete mode 100644 eos/effects/effect6355.py
 delete mode 100644 eos/effects/effect6356.py
 delete mode 100644 eos/effects/effect6357.py
 delete mode 100644 eos/effects/effect6358.py
 delete mode 100644 eos/effects/effect6359.py
 delete mode 100644 eos/effects/effect6360.py
 delete mode 100644 eos/effects/effect6361.py
 delete mode 100644 eos/effects/effect6362.py
 delete mode 100644 eos/effects/effect6368.py
 delete mode 100644 eos/effects/effect6369.py
 delete mode 100644 eos/effects/effect6370.py
 delete mode 100644 eos/effects/effect6371.py
 delete mode 100644 eos/effects/effect6372.py
 delete mode 100644 eos/effects/effect6373.py
 delete mode 100644 eos/effects/effect6374.py
 delete mode 100644 eos/effects/effect6377.py
 delete mode 100644 eos/effects/effect6378.py
 delete mode 100644 eos/effects/effect6379.py
 delete mode 100644 eos/effects/effect6380.py
 delete mode 100644 eos/effects/effect6381.py
 delete mode 100644 eos/effects/effect6384.py
 delete mode 100644 eos/effects/effect6385.py
 delete mode 100644 eos/effects/effect6386.py
 delete mode 100644 eos/effects/effect6395.py
 delete mode 100644 eos/effects/effect6396.py
 delete mode 100644 eos/effects/effect6400.py
 delete mode 100644 eos/effects/effect6401.py
 delete mode 100644 eos/effects/effect6402.py
 delete mode 100644 eos/effects/effect6403.py
 delete mode 100644 eos/effects/effect6404.py
 delete mode 100644 eos/effects/effect6405.py
 delete mode 100644 eos/effects/effect6406.py
 delete mode 100644 eos/effects/effect6407.py
 delete mode 100644 eos/effects/effect6408.py
 delete mode 100644 eos/effects/effect6409.py
 delete mode 100644 eos/effects/effect6410.py
 delete mode 100644 eos/effects/effect6411.py
 delete mode 100644 eos/effects/effect6412.py
 delete mode 100644 eos/effects/effect6413.py
 delete mode 100644 eos/effects/effect6417.py
 delete mode 100644 eos/effects/effect6422.py
 delete mode 100644 eos/effects/effect6423.py
 delete mode 100644 eos/effects/effect6424.py
 delete mode 100644 eos/effects/effect6425.py
 delete mode 100644 eos/effects/effect6426.py
 delete mode 100644 eos/effects/effect6427.py
 delete mode 100644 eos/effects/effect6428.py
 delete mode 100644 eos/effects/effect6431.py
 delete mode 100644 eos/effects/effect6434.py
 delete mode 100644 eos/effects/effect6435.py
 delete mode 100644 eos/effects/effect6436.py
 delete mode 100644 eos/effects/effect6437.py
 delete mode 100644 eos/effects/effect6439.py
 delete mode 100644 eos/effects/effect6441.py
 delete mode 100644 eos/effects/effect6443.py
 delete mode 100644 eos/effects/effect6447.py
 delete mode 100644 eos/effects/effect6448.py
 delete mode 100644 eos/effects/effect6449.py
 delete mode 100644 eos/effects/effect6465.py
 delete mode 100644 eos/effects/effect6470.py
 delete mode 100644 eos/effects/effect6472.py
 delete mode 100644 eos/effects/effect6473.py
 delete mode 100644 eos/effects/effect6474.py
 delete mode 100644 eos/effects/effect6475.py
 delete mode 100644 eos/effects/effect6476.py
 delete mode 100644 eos/effects/effect6477.py
 delete mode 100644 eos/effects/effect6478.py
 delete mode 100644 eos/effects/effect6479.py
 delete mode 100644 eos/effects/effect6481.py
 delete mode 100644 eos/effects/effect6482.py
 delete mode 100644 eos/effects/effect6484.py
 delete mode 100644 eos/effects/effect6485.py
 delete mode 100644 eos/effects/effect6487.py
 delete mode 100644 eos/effects/effect6488.py
 delete mode 100644 eos/effects/effect6501.py
 delete mode 100644 eos/effects/effect6502.py
 delete mode 100644 eos/effects/effect6503.py
 delete mode 100644 eos/effects/effect6504.py
 delete mode 100644 eos/effects/effect6505.py
 delete mode 100644 eos/effects/effect6506.py
 delete mode 100644 eos/effects/effect6507.py
 delete mode 100644 eos/effects/effect6508.py
 delete mode 100644 eos/effects/effect6509.py
 delete mode 100644 eos/effects/effect6510.py
 delete mode 100644 eos/effects/effect6511.py
 delete mode 100644 eos/effects/effect6513.py
 delete mode 100644 eos/effects/effect6526.py
 delete mode 100644 eos/effects/effect6527.py
 delete mode 100644 eos/effects/effect6533.py
 delete mode 100644 eos/effects/effect6534.py
 delete mode 100644 eos/effects/effect6535.py
 delete mode 100644 eos/effects/effect6536.py
 delete mode 100644 eos/effects/effect6537.py
 delete mode 100644 eos/effects/effect6545.py
 delete mode 100644 eos/effects/effect6546.py
 delete mode 100644 eos/effects/effect6548.py
 delete mode 100644 eos/effects/effect6549.py
 delete mode 100644 eos/effects/effect6551.py
 delete mode 100644 eos/effects/effect6552.py
 delete mode 100644 eos/effects/effect6555.py
 delete mode 100644 eos/effects/effect6556.py
 delete mode 100644 eos/effects/effect6557.py
 delete mode 100644 eos/effects/effect6558.py
 delete mode 100644 eos/effects/effect6559.py
 delete mode 100644 eos/effects/effect6560.py
 delete mode 100644 eos/effects/effect6561.py
 delete mode 100644 eos/effects/effect6562.py
 delete mode 100644 eos/effects/effect6563.py
 delete mode 100644 eos/effects/effect6565.py
 delete mode 100644 eos/effects/effect6566.py
 delete mode 100644 eos/effects/effect6567.py
 delete mode 100644 eos/effects/effect657.py
 delete mode 100644 eos/effects/effect6570.py
 delete mode 100644 eos/effects/effect6571.py
 delete mode 100644 eos/effects/effect6572.py
 delete mode 100644 eos/effects/effect6573.py
 delete mode 100644 eos/effects/effect6574.py
 delete mode 100644 eos/effects/effect6575.py
 delete mode 100644 eos/effects/effect6576.py
 delete mode 100644 eos/effects/effect6577.py
 delete mode 100644 eos/effects/effect6578.py
 delete mode 100644 eos/effects/effect6580.py
 delete mode 100644 eos/effects/effect6581.py
 delete mode 100644 eos/effects/effect6582.py
 delete mode 100644 eos/effects/effect6591.py
 delete mode 100644 eos/effects/effect6592.py
 delete mode 100644 eos/effects/effect6593.py
 delete mode 100644 eos/effects/effect6594.py
 delete mode 100644 eos/effects/effect6595.py
 delete mode 100644 eos/effects/effect6596.py
 delete mode 100644 eos/effects/effect6597.py
 delete mode 100644 eos/effects/effect6598.py
 delete mode 100644 eos/effects/effect6599.py
 delete mode 100644 eos/effects/effect660.py
 delete mode 100644 eos/effects/effect6600.py
 delete mode 100644 eos/effects/effect6601.py
 delete mode 100644 eos/effects/effect6602.py
 delete mode 100644 eos/effects/effect6603.py
 delete mode 100644 eos/effects/effect6604.py
 delete mode 100644 eos/effects/effect6605.py
 delete mode 100644 eos/effects/effect6606.py
 delete mode 100644 eos/effects/effect6607.py
 delete mode 100644 eos/effects/effect6608.py
 delete mode 100644 eos/effects/effect6609.py
 delete mode 100644 eos/effects/effect661.py
 delete mode 100644 eos/effects/effect6610.py
 delete mode 100644 eos/effects/effect6611.py
 delete mode 100644 eos/effects/effect6612.py
 delete mode 100644 eos/effects/effect6613.py
 delete mode 100644 eos/effects/effect6614.py
 delete mode 100644 eos/effects/effect6615.py
 delete mode 100644 eos/effects/effect6616.py
 delete mode 100644 eos/effects/effect6617.py
 delete mode 100644 eos/effects/effect6618.py
 delete mode 100644 eos/effects/effect6619.py
 delete mode 100644 eos/effects/effect662.py
 delete mode 100644 eos/effects/effect6620.py
 delete mode 100644 eos/effects/effect6621.py
 delete mode 100644 eos/effects/effect6622.py
 delete mode 100644 eos/effects/effect6623.py
 delete mode 100644 eos/effects/effect6624.py
 delete mode 100644 eos/effects/effect6625.py
 delete mode 100644 eos/effects/effect6626.py
 delete mode 100644 eos/effects/effect6627.py
 delete mode 100644 eos/effects/effect6628.py
 delete mode 100644 eos/effects/effect6629.py
 delete mode 100644 eos/effects/effect6634.py
 delete mode 100644 eos/effects/effect6635.py
 delete mode 100644 eos/effects/effect6636.py
 delete mode 100644 eos/effects/effect6637.py
 delete mode 100644 eos/effects/effect6638.py
 delete mode 100644 eos/effects/effect6639.py
 delete mode 100644 eos/effects/effect6640.py
 delete mode 100644 eos/effects/effect6641.py
 delete mode 100644 eos/effects/effect6642.py
 delete mode 100644 eos/effects/effect6647.py
 delete mode 100644 eos/effects/effect6648.py
 delete mode 100644 eos/effects/effect6649.py
 delete mode 100644 eos/effects/effect6650.py
 delete mode 100644 eos/effects/effect6651.py
 delete mode 100644 eos/effects/effect6652.py
 delete mode 100644 eos/effects/effect6653.py
 delete mode 100644 eos/effects/effect6654.py
 delete mode 100644 eos/effects/effect6655.py
 delete mode 100644 eos/effects/effect6656.py
 delete mode 100644 eos/effects/effect6657.py
 delete mode 100644 eos/effects/effect6658.py
 delete mode 100644 eos/effects/effect6661.py
 delete mode 100644 eos/effects/effect6662.py
 delete mode 100644 eos/effects/effect6663.py
 delete mode 100644 eos/effects/effect6664.py
 delete mode 100644 eos/effects/effect6665.py
 delete mode 100644 eos/effects/effect6667.py
 delete mode 100644 eos/effects/effect6669.py
 delete mode 100644 eos/effects/effect6670.py
 delete mode 100644 eos/effects/effect6671.py
 delete mode 100644 eos/effects/effect6672.py
 delete mode 100644 eos/effects/effect6679.py
 delete mode 100644 eos/effects/effect668.py
 delete mode 100644 eos/effects/effect6681.py
 delete mode 100644 eos/effects/effect6682.py
 delete mode 100644 eos/effects/effect6683.py
 delete mode 100644 eos/effects/effect6684.py
 delete mode 100644 eos/effects/effect6685.py
 delete mode 100644 eos/effects/effect6686.py
 delete mode 100644 eos/effects/effect6687.py
 delete mode 100644 eos/effects/effect6688.py
 delete mode 100644 eos/effects/effect6689.py
 delete mode 100644 eos/effects/effect6690.py
 delete mode 100644 eos/effects/effect6691.py
 delete mode 100644 eos/effects/effect6692.py
 delete mode 100644 eos/effects/effect6693.py
 delete mode 100644 eos/effects/effect6694.py
 delete mode 100644 eos/effects/effect6695.py
 delete mode 100644 eos/effects/effect6697.py
 delete mode 100644 eos/effects/effect6698.py
 delete mode 100644 eos/effects/effect6699.py
 delete mode 100644 eos/effects/effect67.py
 delete mode 100644 eos/effects/effect670.py
 delete mode 100644 eos/effects/effect6700.py
 delete mode 100644 eos/effects/effect6701.py
 delete mode 100644 eos/effects/effect6702.py
 delete mode 100644 eos/effects/effect6703.py
 delete mode 100644 eos/effects/effect6704.py
 delete mode 100644 eos/effects/effect6705.py
 delete mode 100644 eos/effects/effect6706.py
 delete mode 100644 eos/effects/effect6708.py
 delete mode 100644 eos/effects/effect6709.py
 delete mode 100644 eos/effects/effect6710.py
 delete mode 100644 eos/effects/effect6711.py
 delete mode 100644 eos/effects/effect6712.py
 delete mode 100644 eos/effects/effect6713.py
 delete mode 100644 eos/effects/effect6714.py
 delete mode 100644 eos/effects/effect6717.py
 delete mode 100644 eos/effects/effect6720.py
 delete mode 100644 eos/effects/effect6721.py
 delete mode 100644 eos/effects/effect6722.py
 delete mode 100644 eos/effects/effect6723.py
 delete mode 100644 eos/effects/effect6724.py
 delete mode 100644 eos/effects/effect6725.py
 delete mode 100644 eos/effects/effect6726.py
 delete mode 100644 eos/effects/effect6727.py
 delete mode 100644 eos/effects/effect6730.py
 delete mode 100644 eos/effects/effect6731.py
 delete mode 100644 eos/effects/effect6732.py
 delete mode 100644 eos/effects/effect6733.py
 delete mode 100644 eos/effects/effect6734.py
 delete mode 100644 eos/effects/effect6735.py
 delete mode 100644 eos/effects/effect6736.py
 delete mode 100644 eos/effects/effect6737.py
 delete mode 100644 eos/effects/effect675.py
 delete mode 100644 eos/effects/effect6753.py
 delete mode 100644 eos/effects/effect6762.py
 delete mode 100644 eos/effects/effect6763.py
 delete mode 100644 eos/effects/effect6764.py
 delete mode 100644 eos/effects/effect6765.py
 delete mode 100644 eos/effects/effect6766.py
 delete mode 100644 eos/effects/effect6769.py
 delete mode 100644 eos/effects/effect677.py
 delete mode 100644 eos/effects/effect6770.py
 delete mode 100644 eos/effects/effect6771.py
 delete mode 100644 eos/effects/effect6772.py
 delete mode 100644 eos/effects/effect6773.py
 delete mode 100644 eos/effects/effect6774.py
 delete mode 100644 eos/effects/effect6776.py
 delete mode 100644 eos/effects/effect6777.py
 delete mode 100644 eos/effects/effect6778.py
 delete mode 100644 eos/effects/effect6779.py
 delete mode 100644 eos/effects/effect6780.py
 delete mode 100644 eos/effects/effect6782.py
 delete mode 100644 eos/effects/effect6783.py
 delete mode 100644 eos/effects/effect6786.py
 delete mode 100644 eos/effects/effect6787.py
 delete mode 100644 eos/effects/effect6788.py
 delete mode 100644 eos/effects/effect6789.py
 delete mode 100644 eos/effects/effect6790.py
 delete mode 100644 eos/effects/effect6792.py
 delete mode 100644 eos/effects/effect6793.py
 delete mode 100644 eos/effects/effect6794.py
 delete mode 100644 eos/effects/effect6795.py
 delete mode 100644 eos/effects/effect6796.py
 delete mode 100644 eos/effects/effect6797.py
 delete mode 100644 eos/effects/effect6798.py
 delete mode 100644 eos/effects/effect6799.py
 delete mode 100644 eos/effects/effect6800.py
 delete mode 100644 eos/effects/effect6801.py
 delete mode 100644 eos/effects/effect6807.py
 delete mode 100644 eos/effects/effect6844.py
 delete mode 100644 eos/effects/effect6845.py
 delete mode 100644 eos/effects/effect6851.py
 delete mode 100644 eos/effects/effect6852.py
 delete mode 100644 eos/effects/effect6853.py
 delete mode 100644 eos/effects/effect6855.py
 delete mode 100644 eos/effects/effect6856.py
 delete mode 100644 eos/effects/effect6857.py
 delete mode 100644 eos/effects/effect6858.py
 delete mode 100644 eos/effects/effect6859.py
 delete mode 100644 eos/effects/effect6860.py
 delete mode 100644 eos/effects/effect6861.py
 delete mode 100644 eos/effects/effect6862.py
 delete mode 100644 eos/effects/effect6865.py
 delete mode 100644 eos/effects/effect6866.py
 delete mode 100644 eos/effects/effect6867.py
 delete mode 100644 eos/effects/effect6871.py
 delete mode 100644 eos/effects/effect6872.py
 delete mode 100644 eos/effects/effect6873.py
 delete mode 100644 eos/effects/effect6874.py
 delete mode 100644 eos/effects/effect6877.py
 delete mode 100644 eos/effects/effect6878.py
 delete mode 100644 eos/effects/effect6879.py
 delete mode 100644 eos/effects/effect6880.py
 delete mode 100644 eos/effects/effect6881.py
 delete mode 100644 eos/effects/effect6883.py
 delete mode 100644 eos/effects/effect6894.py
 delete mode 100644 eos/effects/effect6895.py
 delete mode 100644 eos/effects/effect6896.py
 delete mode 100644 eos/effects/effect6897.py
 delete mode 100644 eos/effects/effect6898.py
 delete mode 100644 eos/effects/effect6899.py
 delete mode 100644 eos/effects/effect6900.py
 delete mode 100644 eos/effects/effect6908.py
 delete mode 100644 eos/effects/effect6909.py
 delete mode 100644 eos/effects/effect6910.py
 delete mode 100644 eos/effects/effect6911.py
 delete mode 100644 eos/effects/effect6920.py
 delete mode 100644 eos/effects/effect6921.py
 delete mode 100644 eos/effects/effect6923.py
 delete mode 100644 eos/effects/effect6924.py
 delete mode 100644 eos/effects/effect6925.py
 delete mode 100644 eos/effects/effect6926.py
 delete mode 100644 eos/effects/effect6927.py
 delete mode 100644 eos/effects/effect6928.py
 delete mode 100644 eos/effects/effect6929.py
 delete mode 100644 eos/effects/effect6930.py
 delete mode 100644 eos/effects/effect6931.py
 delete mode 100644 eos/effects/effect6932.py
 delete mode 100644 eos/effects/effect6933.py
 delete mode 100644 eos/effects/effect6934.py
 delete mode 100644 eos/effects/effect6935.py
 delete mode 100644 eos/effects/effect6936.py
 delete mode 100644 eos/effects/effect6937.py
 delete mode 100644 eos/effects/effect6938.py
 delete mode 100644 eos/effects/effect6939.py
 delete mode 100644 eos/effects/effect6940.py
 delete mode 100644 eos/effects/effect6941.py
 delete mode 100644 eos/effects/effect6942.py
 delete mode 100644 eos/effects/effect6943.py
 delete mode 100644 eos/effects/effect6944.py
 delete mode 100644 eos/effects/effect6945.py
 delete mode 100644 eos/effects/effect6946.py
 delete mode 100644 eos/effects/effect6947.py
 delete mode 100644 eos/effects/effect6949.py
 delete mode 100644 eos/effects/effect6951.py
 delete mode 100644 eos/effects/effect6953.py
 delete mode 100644 eos/effects/effect6954.py
 delete mode 100644 eos/effects/effect6955.py
 delete mode 100644 eos/effects/effect6956.py
 delete mode 100644 eos/effects/effect6957.py
 delete mode 100644 eos/effects/effect6958.py
 delete mode 100644 eos/effects/effect6959.py
 delete mode 100644 eos/effects/effect6960.py
 delete mode 100644 eos/effects/effect6961.py
 delete mode 100644 eos/effects/effect6962.py
 delete mode 100644 eos/effects/effect6963.py
 delete mode 100644 eos/effects/effect6964.py
 delete mode 100644 eos/effects/effect6981.py
 delete mode 100644 eos/effects/effect6982.py
 delete mode 100644 eos/effects/effect6983.py
 delete mode 100644 eos/effects/effect6984.py
 delete mode 100644 eos/effects/effect6985.py
 delete mode 100644 eos/effects/effect6986.py
 delete mode 100644 eos/effects/effect6987.py
 delete mode 100644 eos/effects/effect699.py
 delete mode 100644 eos/effects/effect6992.py
 delete mode 100644 eos/effects/effect6993.py
 delete mode 100644 eos/effects/effect6994.py
 delete mode 100644 eos/effects/effect6995.py
 delete mode 100644 eos/effects/effect6996.py
 delete mode 100644 eos/effects/effect6997.py
 delete mode 100644 eos/effects/effect6999.py
 delete mode 100644 eos/effects/effect7000.py
 delete mode 100644 eos/effects/effect7001.py
 delete mode 100644 eos/effects/effect7002.py
 delete mode 100644 eos/effects/effect7003.py
 delete mode 100644 eos/effects/effect7008.py
 delete mode 100644 eos/effects/effect7009.py
 delete mode 100644 eos/effects/effect7012.py
 delete mode 100644 eos/effects/effect7013.py
 delete mode 100644 eos/effects/effect7014.py
 delete mode 100644 eos/effects/effect7015.py
 delete mode 100644 eos/effects/effect7016.py
 delete mode 100644 eos/effects/effect7017.py
 delete mode 100644 eos/effects/effect7018.py
 delete mode 100644 eos/effects/effect7020.py
 delete mode 100644 eos/effects/effect7021.py
 delete mode 100644 eos/effects/effect7024.py
 delete mode 100644 eos/effects/effect7026.py
 delete mode 100644 eos/effects/effect7027.py
 delete mode 100644 eos/effects/effect7028.py
 delete mode 100644 eos/effects/effect7029.py
 delete mode 100644 eos/effects/effect7030.py
 delete mode 100644 eos/effects/effect7031.py
 delete mode 100644 eos/effects/effect7032.py
 delete mode 100644 eos/effects/effect7033.py
 delete mode 100644 eos/effects/effect7034.py
 delete mode 100644 eos/effects/effect7035.py
 delete mode 100644 eos/effects/effect7036.py
 delete mode 100644 eos/effects/effect7037.py
 delete mode 100644 eos/effects/effect7038.py
 delete mode 100644 eos/effects/effect7039.py
 delete mode 100644 eos/effects/effect7040.py
 delete mode 100644 eos/effects/effect7042.py
 delete mode 100644 eos/effects/effect7043.py
 delete mode 100644 eos/effects/effect7044.py
 delete mode 100644 eos/effects/effect7045.py
 delete mode 100644 eos/effects/effect7046.py
 delete mode 100644 eos/effects/effect7047.py
 delete mode 100644 eos/effects/effect7050.py
 delete mode 100644 eos/effects/effect7051.py
 delete mode 100644 eos/effects/effect7052.py
 delete mode 100644 eos/effects/effect7055.py
 delete mode 100644 eos/effects/effect7058.py
 delete mode 100644 eos/effects/effect7059.py
 delete mode 100644 eos/effects/effect706.py
 delete mode 100644 eos/effects/effect7060.py
 delete mode 100644 eos/effects/effect7061.py
 delete mode 100644 eos/effects/effect7062.py
 delete mode 100644 eos/effects/effect7063.py
 delete mode 100644 eos/effects/effect7064.py
 delete mode 100644 eos/effects/effect7071.py
 delete mode 100644 eos/effects/effect7072.py
 delete mode 100644 eos/effects/effect7073.py
 delete mode 100644 eos/effects/effect7074.py
 delete mode 100644 eos/effects/effect7075.py
 delete mode 100644 eos/effects/effect7076.py
 delete mode 100644 eos/effects/effect7077.py
 delete mode 100644 eos/effects/effect7078.py
 delete mode 100644 eos/effects/effect7079.py
 delete mode 100644 eos/effects/effect7080.py
 delete mode 100644 eos/effects/effect7085.py
 delete mode 100644 eos/effects/effect7086.py
 delete mode 100644 eos/effects/effect7087.py
 delete mode 100644 eos/effects/effect7088.py
 delete mode 100644 eos/effects/effect7091.py
 delete mode 100644 eos/effects/effect7092.py
 delete mode 100644 eos/effects/effect7093.py
 delete mode 100644 eos/effects/effect7094.py
 delete mode 100644 eos/effects/effect7097.py
 delete mode 100644 eos/effects/effect7111.py
 delete mode 100644 eos/effects/effect7112.py
 delete mode 100644 eos/effects/effect7116.py
 delete mode 100644 eos/effects/effect7117.py
 delete mode 100644 eos/effects/effect7118.py
 delete mode 100644 eos/effects/effect7119.py
 delete mode 100644 eos/effects/effect7142.py
 delete mode 100644 eos/effects/effect7154.py
 delete mode 100644 eos/effects/effect7155.py
 delete mode 100644 eos/effects/effect7156.py
 delete mode 100644 eos/effects/effect7157.py
 delete mode 100644 eos/effects/effect7158.py
 delete mode 100644 eos/effects/effect7159.py
 delete mode 100644 eos/effects/effect7160.py
 delete mode 100644 eos/effects/effect7161.py
 delete mode 100644 eos/effects/effect7162.py
 delete mode 100644 eos/effects/effect7166.py
 delete mode 100644 eos/effects/effect7167.py
 delete mode 100644 eos/effects/effect7168.py
 delete mode 100644 eos/effects/effect7169.py
 delete mode 100644 eos/effects/effect7170.py
 delete mode 100644 eos/effects/effect7171.py
 delete mode 100644 eos/effects/effect7172.py
 delete mode 100644 eos/effects/effect7173.py
 delete mode 100644 eos/effects/effect7176.py
 delete mode 100644 eos/effects/effect7177.py
 delete mode 100644 eos/effects/effect7179.py
 delete mode 100644 eos/effects/effect7180.py
 delete mode 100644 eos/effects/effect7183.py
 delete mode 100644 eos/effects/effect726.py
 delete mode 100644 eos/effects/effect727.py
 delete mode 100644 eos/effects/effect728.py
 delete mode 100644 eos/effects/effect729.py
 delete mode 100644 eos/effects/effect730.py
 delete mode 100644 eos/effects/effect732.py
 delete mode 100644 eos/effects/effect736.py
 delete mode 100644 eos/effects/effect744.py
 delete mode 100644 eos/effects/effect754.py
 delete mode 100644 eos/effects/effect757.py
 delete mode 100644 eos/effects/effect760.py
 delete mode 100644 eos/effects/effect763.py
 delete mode 100644 eos/effects/effect784.py
 delete mode 100644 eos/effects/effect804.py
 delete mode 100644 eos/effects/effect836.py
 delete mode 100644 eos/effects/effect848.py
 delete mode 100644 eos/effects/effect854.py
 delete mode 100644 eos/effects/effect856.py
 delete mode 100644 eos/effects/effect874.py
 delete mode 100644 eos/effects/effect882.py
 delete mode 100644 eos/effects/effect887.py
 delete mode 100644 eos/effects/effect889.py
 delete mode 100644 eos/effects/effect89.py
 delete mode 100644 eos/effects/effect891.py
 delete mode 100644 eos/effects/effect892.py
 delete mode 100644 eos/effects/effect896.py
 delete mode 100644 eos/effects/effect898.py
 delete mode 100644 eos/effects/effect899.py
 delete mode 100644 eos/effects/effect900.py
 delete mode 100644 eos/effects/effect907.py
 delete mode 100644 eos/effects/effect909.py
 delete mode 100644 eos/effects/effect91.py
 delete mode 100644 eos/effects/effect912.py
 delete mode 100644 eos/effects/effect918.py
 delete mode 100644 eos/effects/effect919.py
 delete mode 100644 eos/effects/effect92.py
 delete mode 100644 eos/effects/effect93.py
 delete mode 100644 eos/effects/effect95.py
 delete mode 100644 eos/effects/effect958.py
 delete mode 100644 eos/effects/effect959.py
 delete mode 100644 eos/effects/effect96.py
 delete mode 100644 eos/effects/effect960.py
 delete mode 100644 eos/effects/effect961.py
 delete mode 100644 eos/effects/effect968.py
 delete mode 100644 eos/effects/effect980.py
 delete mode 100644 eos/effects/effect989.py
 delete mode 100644 eos/effects/effect991.py
 delete mode 100644 eos/effects/effect996.py
 delete mode 100644 eos/effects/effect998.py
 delete mode 100644 eos/effects/effect999.py
 delete mode 100644 scripts/effect_rollup.py

diff --git a/.appveyor.yml b/.appveyor.yml
index 8c740b418..65d78d226 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -61,8 +61,6 @@ before_build:
   - ps: $env:PYFA_VERSION = (python ./scripts/dump_version.py)
   - ps: echo("pyfa version ")
   - ps: echo ($env:PYFA_VERSION)
-  - ps: python ./scripts/effect_rollup.py
-
 
 build_script:
   - ECHO "Build pyfa:"
@@ -121,7 +119,7 @@ artifacts:
   - path: pyfa*-win.exe
   #- path: pyfa_debug.zip
   #  name: Pyfa_debug
-  
+
 deploy:
   tag: $(pyfa_version)
   release: pyfa $(pyfa_version)
@@ -134,4 +132,4 @@ deploy:
     APPVEYOR_REPO_TAG: true        # deploy on tag push only
 #on_success:
 #  - TODO: upload the content of dist/*.whl to a public wheelhouse
-#
\ No newline at end of file
+#
diff --git a/.gitignore b/.gitignore
index 09b400aab..a9eb5e25c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -123,4 +123,3 @@ gitversion
 *.swp
 
 *.fsdbinary
-/eos/effects/all.py
diff --git a/.travis.yml b/.travis.yml
index 2aae5823c..9140c2f10 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,7 +12,6 @@ before_install:
   - bash scripts/setup-osx.sh
 install:
   - export PYFA_VERSION="$(python3 scripts/dump_version.py)"
-  - python3 ./scripts/effect_rollup.py
   - bash scripts/package-osx.sh
 before_deploy:
   - export RELEASE_PKG_FILE=$(ls *.deb)
diff --git a/eos/config.py b/eos/config.py
index 641a00ba9..ce612880b 100644
--- a/eos/config.py
+++ b/eos/config.py
@@ -15,8 +15,6 @@ gamedata_date = ""
 gamedata_connectionstring = 'sqlite:///' + realpath(join(dirname(abspath(__file__)), "..", "eve.db"))
 pyfalog.debug("Gamedata connection string: {0}", gamedata_connectionstring)
 
-use_all_effect_module = True
-
 if istravis is True or hasattr(sys, '_called_from_test'):
     # Running in Travis. Run saveddata database in memory.
     saveddata_connectionstring = 'sqlite:///:memory:'
diff --git a/eos/effects.py b/eos/effects.py
new file mode 100644
index 000000000..20506604d
--- /dev/null
+++ b/eos/effects.py
@@ -0,0 +1,22824 @@
+# ===============================================================================
+# Copyright (C) 2010 Diego Duclos
+#
+# This file is part of eos.
+#
+# eos is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation, either version 2 of the License, or
+# (at your option) any later version.
+#
+# eos is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with eos.  If not, see <http://www.gnu.org/licenses/>.
+# ===============================================================================
+
+
+import eos.config
+from eos.const import FittingModuleState
+from eos.utils.spoolSupport import SpoolType, SpoolOptions, calculateSpoolup, resolveSpoolOptions
+
+
+class EffectDef:
+
+    @staticmethod
+    def handler(fit, module, context, *args, **kwargs):
+        pass
+
+
+class Effect4(EffectDef):
+
+    runTime = 'late'
+    type = 'active'
+
+    @staticmethod
+    def handler(fit, module, context):
+        amount = module.getModifiedItemAttr('shieldBonus')
+        speed = module.getModifiedItemAttr('duration') / 1000.0
+        fit.extraAttributes.increase('shieldRepair', amount / speed)
+
+
+class Effect10(EffectDef):
+
+    type = 'active'
+
+    @staticmethod
+    def handler(fit, module, context):
+        # Set reload time to 1 second
+        module.reloadTime = 1000
+
+
+class Effect17(EffectDef):
+
+    grouped = True
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context):
+        miningDroneAmountPercent = container.getModifiedItemAttr('miningDroneAmountPercent')
+        if (miningDroneAmountPercent is None) or (miningDroneAmountPercent == 0):
+            pass
+        else:
+            container.multiplyItemAttr('miningAmount', miningDroneAmountPercent / 100)
+
+
+class Effect21(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.ship.increaseItemAttr('shieldCapacity', module.getModifiedItemAttr('capacityBonus'))
+
+
+class Effect25(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.ship.increaseItemAttr('capacitorCapacity', ship.getModifiedItemAttr('capacitorBonus'))
+
+
+class Effect26(EffectDef):
+
+    runTime = 'late'
+    type = 'active'
+
+    @staticmethod
+    def handler(fit, module, context):
+        amount = module.getModifiedItemAttr('structureDamageAmount')
+        speed = module.getModifiedItemAttr('duration') / 1000.0
+        fit.extraAttributes.increase('hullRepair', amount / speed)
+
+
+class Effect27(EffectDef):
+
+    runTime = 'late'
+    type = 'active'
+
+    @staticmethod
+    def handler(fit, module, context):
+        amount = module.getModifiedItemAttr('armorDamageAmount')
+        speed = module.getModifiedItemAttr('duration') / 1000.0
+        rps = amount / speed
+        fit.extraAttributes.increase('armorRepair', rps)
+        fit.extraAttributes.increase('armorRepairPreSpool', rps)
+        fit.extraAttributes.increase('armorRepairFullSpool', rps)
+
+
+class Effect34(EffectDef):
+
+    type = 'active'
+
+    @staticmethod
+    def handler(fit, module, context):
+        rt = module.getModifiedItemAttr('reloadTime')
+        if not rt:
+            # Set reload time to 10 seconds
+            module.reloadTime = 10000
+        else:
+            module.reloadTime = rt
+
+
+class Effect38(EffectDef):
+
+    type = 'active'
+
+
+class Effect39(EffectDef):
+
+    type = 'projected', 'active'
+
+    @staticmethod
+    def handler(fit, module, context):
+        if 'projected' in context:
+            fit.ship.increaseItemAttr('warpScrambleStatus', module.getModifiedItemAttr('warpScrambleStrength'))
+
+
+class Effect48(EffectDef):
+
+    type = 'active'
+
+    @staticmethod
+    def handler(fit, module, context):
+        # Set reload time to 10 seconds
+        module.reloadTime = 10000
+        # Make so that reloads are always taken into account during clculations
+        module.forceReload = True
+
+        if module.charge is None:
+            return
+        capAmount = module.getModifiedChargeAttr('capacitorBonus') or 0
+        module.itemModifiedAttributes['capacitorNeed'] = -capAmount
+
+
+class Effect50(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.ship.multiplyItemAttr('shieldRechargeRate', module.getModifiedItemAttr('shieldRechargeRateMultiplier') or 1)
+
+
+class Effect51(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.ship.multiplyItemAttr('rechargeRate', module.getModifiedItemAttr('capacitorRechargeRateMultiplier'))
+
+
+class Effect55(EffectDef):
+
+    type = 'active'
+
+
+class Effect56(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        # We default this to None as there are times when the source attribute doesn't exist (for example, Cap Power Relay).
+        # It will return 0 as it doesn't exist, which would nullify whatever the target attribute is
+        fit.ship.multiplyItemAttr('powerOutput', module.getModifiedItemAttr('powerOutputMultiplier', None))
+
+
+class Effect57(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        # We default this to None as there are times when the source attribute doesn't exist (for example, Cap Power Relay).
+        # It will return 0 as it doesn't exist, which would nullify whatever the target attribute is
+        fit.ship.multiplyItemAttr('shieldCapacity', module.getModifiedItemAttr('shieldCapacityMultiplier', None))
+
+
+class Effect58(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        # We default this to None as there are times when the source attribute doesn't exist (for example, Cap Power Relay).
+        # It will return 0 as it doesn't exist, which would nullify whatever the target attribute is
+        fit.ship.multiplyItemAttr('capacitorCapacity', module.getModifiedItemAttr('capacitorCapacityMultiplier', None))
+
+
+class Effect59(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.ship.multiplyItemAttr('capacity', module.getModifiedItemAttr('cargoCapacityMultiplier'))
+
+
+class Effect60(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.ship.multiplyItemAttr('hp', module.getModifiedItemAttr('structureHPMultiplier'))
+
+
+class Effect61(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.ship.increaseItemAttr('agility', src.getModifiedItemAttr('agilityBonusAdd'))
+
+
+class Effect63(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.ship.multiplyItemAttr('armorHP', module.getModifiedItemAttr('armorHPMultiplier'))
+
+
+class Effect67(EffectDef):
+
+    type = 'active'
+
+    @staticmethod
+    def handler(fit, module, context):
+        # Set reload time to 1 second
+        module.reloadTime = 1000
+
+
+class Effect89(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.modules.filteredItemMultiply(lambda mod: mod.item.group.name == 'Projectile Weapon',
+                                         'speed', module.getModifiedItemAttr('speedMultiplier'),
+                                         stackingPenalties=True)
+
+
+class Effect91(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.modules.filteredItemMultiply(lambda mod: mod.item.group.name == 'Energy Weapon',
+                                         'damageMultiplier', module.getModifiedItemAttr('damageMultiplier'),
+                                         stackingPenalties=True)
+
+
+class Effect92(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.modules.filteredItemMultiply(lambda mod: mod.item.group.name == 'Projectile Weapon',
+                                         'damageMultiplier', module.getModifiedItemAttr('damageMultiplier'),
+                                         stackingPenalties=True)
+
+
+class Effect93(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.modules.filteredItemMultiply(lambda mod: mod.item.group.name == 'Hybrid Weapon',
+                                         'damageMultiplier', module.getModifiedItemAttr('damageMultiplier'),
+                                         stackingPenalties=True)
+
+
+class Effect95(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.modules.filteredItemMultiply(lambda mod: mod.item.group.name == 'Energy Weapon',
+                                         'speed', module.getModifiedItemAttr('speedMultiplier'),
+                                         stackingPenalties=True)
+
+
+class Effect96(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.modules.filteredItemMultiply(lambda mod: mod.item.group.name == 'Hybrid Weapon',
+                                         'speed', module.getModifiedItemAttr('speedMultiplier'),
+                                         stackingPenalties=True)
+
+
+class Effect101(EffectDef):
+
+    type = 'active', 'projected'
+
+    @staticmethod
+    def handler(fit, src, context):
+        # Set reload time to 10 seconds
+        src.reloadTime = 10000
+
+        if 'projected' in context:
+            if src.item.group.name == 'Missile Launcher Bomb':
+                # Bomb Launcher Cooldown Timer
+                moduleReactivationDelay = src.getModifiedItemAttr('moduleReactivationDelay')
+                speed = src.getModifiedItemAttr('speed')
+
+                # Void and Focused Void Bombs
+                neutAmount = src.getModifiedChargeAttr('energyNeutralizerAmount')
+
+                if moduleReactivationDelay and neutAmount and speed:
+                    fit.addDrain(src, speed + moduleReactivationDelay, neutAmount, 0)
+
+                # Lockbreaker Bombs
+                ecmStrengthBonus = src.getModifiedChargeAttr('scan{0}StrengthBonus'.format(fit.scanType))
+
+                if ecmStrengthBonus:
+                    strModifier = 1 - ecmStrengthBonus / fit.scanStrength
+                    fit.ecmProjectedStr *= strModifier
+
+
+class Effect118(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.ship.increaseItemAttr('maxLockedTargets', module.getModifiedItemAttr('maxLockedTargetsBonus'))
+
+
+class Effect157(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context):
+        level = container.level if 'skill' in context else 1
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Large Hybrid Turret'),
+                                      'damageMultiplier', container.getModifiedItemAttr('damageMultiplierBonus') * level)
+
+
+class Effect159(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context):
+        level = container.level if 'skill' in context else 1
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Energy Turret'),
+                                      'damageMultiplier', container.getModifiedItemAttr('damageMultiplierBonus') * level)
+
+
+class Effect160(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context):
+        level = container.level if 'skill' in context else 1
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Hybrid Turret'),
+                                      'damageMultiplier', container.getModifiedItemAttr('damageMultiplierBonus') * level)
+
+
+class Effect161(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context):
+        level = container.level if 'skill' in context else 1
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Projectile Turret'),
+                                      'damageMultiplier', container.getModifiedItemAttr('damageMultiplierBonus') * level)
+
+
+class Effect162(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context):
+        level = container.level if 'skill' in context else 1
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Large Energy Turret'),
+                                      'damageMultiplier', container.getModifiedItemAttr('damageMultiplierBonus') * level)
+
+
+class Effect172(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context):
+        level = container.level if 'skill' in context else 1
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Small Energy Turret'),
+                                      'damageMultiplier', container.getModifiedItemAttr('damageMultiplierBonus') * level)
+
+
+class Effect173(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context):
+        level = container.level if 'skill' in context else 1
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Small Hybrid Turret'),
+                                      'damageMultiplier', container.getModifiedItemAttr('damageMultiplierBonus') * level)
+
+
+class Effect174(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context):
+        level = container.level if 'skill' in context else 1
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Small Projectile Turret'),
+                                      'damageMultiplier', container.getModifiedItemAttr('damageMultiplierBonus') * level)
+
+
+class Effect212(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context):
+        level = container.level if 'skill' in context else 1
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Electronics Upgrades'),
+                                      'cpu', container.getModifiedItemAttr('cpuNeedBonus') * level)
+
+
+class Effect214(EffectDef):
+
+    type = 'passive', 'structure'
+
+    @staticmethod
+    def handler(fit, skill, context):
+        amount = skill.getModifiedItemAttr('maxTargetBonus') * skill.level
+        fit.extraAttributes.increase('maxTargetsLockedFromSkills', amount)
+
+
+class Effect223(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, implant, context):
+        fit.ship.boostItemAttr('maxVelocity', implant.getModifiedItemAttr('velocityBonus'))
+
+
+class Effect227(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Propulsion Module',
+                                      'capacitorNeed', container.getModifiedItemAttr('capNeedBonus'))
+
+
+class Effect230(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context):
+        level = container.level if 'skill' in context else 1
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Afterburner'),
+                                      'duration', container.getModifiedItemAttr('durationBonus') * level)
+
+
+class Effect235(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, implant, context):
+        fit.ship.boostItemAttr('warpCapacitorNeed', implant.getModifiedItemAttr('warpCapacitorNeedBonus'))
+
+
+class Effect242(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, implant, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Propulsion Module',
+                                      'speedFactor', implant.getModifiedItemAttr('speedFBonus'))
+
+
+class Effect244(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context):
+        level = container.level if 'skill' in context else 1
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('High Speed Maneuvering'),
+                                      'capacitorNeed', container.getModifiedItemAttr('capNeedBonus') * level)
+
+
+class Effect271(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context):
+        level = container.level if 'skill' in context else 1
+        fit.ship.boostItemAttr('armorHP', (container.getModifiedItemAttr('armorHpBonus') or 0) * level)
+
+
+class Effect272(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context):
+        level = container.level if 'skill' in context else 1
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Repair Systems'),
+                                      'duration', container.getModifiedItemAttr('durationSkillBonus') * level)
+
+
+class Effect273(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context):
+        level = container.level if 'skill' in context else 1
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Shield Upgrades'),
+                                      'power', container.getModifiedItemAttr('powerNeedBonus') * level)
+
+
+class Effect277(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, skill, context):
+        fit.ship.increaseItemAttr('shieldUniformity', skill.getModifiedItemAttr('uniformityBonus') * skill.level)
+
+
+class Effect279(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context):
+        level = container.level if 'skill' in context else 1
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Shield Emission Systems'),
+                                      'capacitorNeed', container.getModifiedItemAttr('capNeedBonus') * level)
+
+
+class Effect287(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context):
+        level = container.level if 'skill' in context else 1
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Gunnery'),
+                                      'capacitorNeed', container.getModifiedItemAttr('capNeedBonus') * level)
+
+
+class Effect290(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context):
+        level = container.level if 'skill' in context else 1
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Gunnery'),
+                                      'maxRange', container.getModifiedItemAttr('rangeSkillBonus') * level)
+
+
+class Effect298(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context):
+        level = container.level if 'skill' in context else 1
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Gunnery'),
+                                      'falloff', container.getModifiedItemAttr('falloffBonus') * level)
+
+
+class Effect315(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, skill, context):
+        amount = skill.getModifiedItemAttr('maxActiveDroneBonus') * skill.level
+        fit.extraAttributes.increase('maxActiveDrones', amount)
+
+
+class Effect391(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context):
+        level = container.level if 'skill' in context else 1
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Mining'),
+                                      'miningAmount', container.getModifiedItemAttr('miningAmountBonus') * level)
+
+
+class Effect392(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context):
+        level = container.level if 'skill' in context else 1
+        fit.ship.boostItemAttr('hp', container.getModifiedItemAttr('hullHpBonus') * level)
+
+
+class Effect394(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context):
+        level = container.level if 'skill' in context else 1
+        amount = container.getModifiedItemAttr('velocityBonus') or 0
+        fit.ship.boostItemAttr('maxVelocity', amount * level,
+                               stackingPenalties='skill' not in context and 'implant' not in context and 'booster' not in context)
+
+
+class Effect395(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context):
+        level = container.level if 'skill' in context else 1
+        fit.ship.boostItemAttr('agility', container.getModifiedItemAttr('agilityBonus') * level,
+                               stackingPenalties='skill' not in context and 'implant' not in context)
+
+
+class Effect396(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context):
+        level = container.level if 'skill' in context else 1
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Energy Grid Upgrades'),
+                                      'cpu', container.getModifiedItemAttr('cpuNeedBonus') * level)
+
+
+class Effect397(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context):
+        level = container.level if 'skill' in context else 1
+        fit.ship.boostItemAttr('cpuOutput', container.getModifiedItemAttr('cpuOutputBonus2') * level)
+
+
+class Effect408(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context):
+        level = container.level if 'skill' in context else 1
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Large Projectile Turret'),
+                                      'damageMultiplier', container.getModifiedItemAttr('damageMultiplierBonus') * level)
+
+
+class Effect414(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context):
+        level = container.level if 'skill' in context else 1
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Gunnery'),
+                                      'speed', container.getModifiedItemAttr('turretSpeeBonus') * level)
+
+
+class Effect446(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context):
+        level = container.level if 'skill' in context else 1
+        fit.ship.boostItemAttr('shieldCapacity', container.getModifiedItemAttr('shieldCapacityBonus') * level)
+
+
+class Effect485(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context):
+        level = container.level if 'skill' in context else 1
+        fit.ship.boostItemAttr('rechargeRate', container.getModifiedItemAttr('capRechargeBonus') * level)
+
+
+class Effect486(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context):
+        level = container.level if 'skill' in context else 1
+        fit.ship.boostItemAttr('shieldRechargeRate', container.getModifiedItemAttr('rechargeratebonus') * level)
+
+
+class Effect490(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context):
+        level = container.level if 'skill' in context else 1
+        fit.ship.boostItemAttr('powerOutput', container.getModifiedItemAttr('powerEngineeringOutputBonus') * level)
+
+
+class Effect494(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context):
+        level = container.level if 'skill' in context else 1
+        fit.ship.boostItemAttr('warpCapacitorNeed', container.getModifiedItemAttr('warpCapacitorNeedBonus') * level,
+                               stackingPenalties='skill' not in context)
+
+
+class Effect504(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context):
+        level = container.level if 'skill' in context else 1
+        amount = container.getModifiedItemAttr('droneRangeBonus') * level
+        fit.extraAttributes.increase('droneControlRange', amount)
+
+
+class Effect506(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, skill, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Afterburner'),
+                                      'capacitorNeed', skill.getModifiedItemAttr('capNeedBonus') * skill.level)
+
+
+class Effect507(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context):
+        level = container.level if 'skill' in context else 1
+        fit.ship.boostItemAttr('maxTargetRange', container.getModifiedItemAttr('maxTargetRangeBonus') * level)
+
+
+class Effect508(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Small Projectile Turret'),
+                                      'damageMultiplier', ship.getModifiedItemAttr('shipBonusMF'), skill='Minmatar Frigate')
+
+
+class Effect511(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Small Energy Turret'),
+                                      'capacitorNeed', ship.getModifiedItemAttr('shipBonus2AF'), skill='Amarr Frigate')
+
+
+class Effect512(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Small Hybrid Turret'),
+                                      'damageMultiplier', ship.getModifiedItemAttr('shipBonusGF'), skill='Gallente Frigate')
+
+
+class Effect514(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Small Energy Turret'),
+                                      'damageMultiplier', ship.getModifiedItemAttr('shipBonusAF'), skill='Amarr Frigate')
+
+
+class Effect516(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Energy Turret'),
+                                      'capacitorNeed', ship.getModifiedItemAttr('shipBonusAC'), skill='Amarr Cruiser')
+
+
+class Effect521(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Hybrid Turret'),
+                                      'maxRange', ship.getModifiedItemAttr('shipBonusCC'), skill='Caldari Cruiser')
+
+
+class Effect527(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.ship.boostItemAttr('maxVelocity', ship.getModifiedItemAttr('shipBonusMI'), skill='Minmatar Industrial')
+
+
+class Effect529(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.ship.boostItemAttr('capacity', ship.getModifiedItemAttr('shipBonusAI'), skill='Amarr Industrial')
+
+
+class Effect536(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.ship.multiplyItemAttr('cpuOutput', module.getModifiedItemAttr('cpuMultiplier'))
+
+
+class Effect542(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Large Energy Turret'),
+                                      'capacitorNeed', ship.getModifiedItemAttr('shipBonusAB'), skill='Amarr Battleship')
+
+
+class Effect549(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Large Projectile Turret'),
+                                      'damageMultiplier', ship.getModifiedItemAttr('shipBonusMB'),
+                                      skill='Minmatar Battleship')
+
+
+class Effect550(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Large Hybrid Turret'),
+                                      'damageMultiplier', ship.getModifiedItemAttr('shipBonusGB'),
+                                      skill='Gallente Battleship')
+
+
+class Effect553(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Large Hybrid Turret'),
+                                      'trackingSpeed', ship.getModifiedItemAttr('shipBonusGB'), skill='Gallente Battleship')
+
+
+class Effect562(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Hybrid Turret'),
+                                      'damageMultiplier', ship.getModifiedItemAttr('shipBonusGC'), skill='Gallente Cruiser')
+
+
+class Effect581(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context):
+        level = container.level if 'skill' in context else 1
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Gunnery'),
+                                      'cpu', container.getModifiedItemAttr('cpuNeedBonus') * level)
+
+
+class Effect582(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, skill, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Gunnery'),
+                                      'speed', skill.getModifiedItemAttr('rofBonus') * skill.level)
+
+
+class Effect584(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, implant, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Gunnery'),
+                                      'damageMultiplier', implant.getModifiedItemAttr('damageMultiplierBonus'))
+
+
+class Effect587(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, skill, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Energy Weapon',
+                                      'damageMultiplier', skill.getModifiedItemAttr('damageMultiplierBonus') * skill.level)
+
+
+class Effect588(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, skill, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Projectile Weapon',
+                                      'damageMultiplier', skill.getModifiedItemAttr('damageMultiplierBonus') * skill.level)
+
+
+class Effect589(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, skill, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Hybrid Weapon',
+                                      'damageMultiplier', skill.getModifiedItemAttr('damageMultiplierBonus') * skill.level)
+
+
+class Effect590(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context):
+        level = container.level if 'skill' in context else 1
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Energy Pulse Weapons'),
+                                      'duration', container.getModifiedItemAttr('durationBonus') * level)
+
+
+class Effect596(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        module.multiplyItemAttr('maxRange', module.getModifiedChargeAttr('weaponRangeMultiplier'))
+
+
+class Effect598(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        module.multiplyItemAttr('speed', module.getModifiedChargeAttr('speedMultiplier') or 1)
+
+
+class Effect599(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        module.multiplyItemAttr('falloff', module.getModifiedChargeAttr('fallofMultiplier') or 1)
+
+
+class Effect600(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        module.multiplyItemAttr('trackingSpeed', module.getModifiedChargeAttr('trackingSpeedMultiplier'))
+
+
+class Effect602(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Projectile Turret'),
+                                      'speed', ship.getModifiedItemAttr('shipBonusMC'), skill='Minmatar Cruiser')
+
+
+class Effect604(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Large Projectile Turret'),
+                                      'speed', ship.getModifiedItemAttr('shipBonusMB2'), skill='Minmatar Battleship')
+
+
+class Effect607(EffectDef):
+
+    runTime = 'early'
+    type = 'active'
+
+    @staticmethod
+    def handler(fit, module, context):
+        # Set flag which is used to determine if ship is cloaked or not
+        # This is used to apply cloak-only bonuses, like Black Ops' speed bonus
+        # Doesn't apply to covops cloaks
+        fit.extraAttributes['cloaked'] = True
+        # Apply speed penalty
+        fit.ship.multiplyItemAttr('maxVelocity', module.getModifiedItemAttr('maxVelocityModifier'))
+
+
+class Effect623(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context):
+        level = container.level if 'skill' in context else 1
+        fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Mining Drone Operation'),
+                                     'miningAmount',
+                                     container.getModifiedItemAttr('miningAmountBonus') * level)
+
+
+class Effect627(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.ship.increaseItemAttr('powerOutput', module.getModifiedItemAttr('powerIncrease'))
+
+
+class Effect657(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.ship.boostItemAttr('agility',
+                               module.getModifiedItemAttr('agilityMultiplier'),
+                               stackingPenalties=True)
+
+
+class Effect660(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, skill, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill(skill),
+                                        'emDamage', skill.getModifiedItemAttr('damageMultiplierBonus') * skill.level)
+
+
+class Effect661(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, skill, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill(skill),
+                                        'explosiveDamage', skill.getModifiedItemAttr('damageMultiplierBonus') * skill.level)
+
+
+class Effect662(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, skill, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill(skill),
+                                        'thermalDamage', skill.getModifiedItemAttr('damageMultiplierBonus') * skill.level)
+
+
+class Effect668(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, skill, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill(skill),
+                                        'kineticDamage', skill.getModifiedItemAttr('damageMultiplierBonus') * skill.level)
+
+
+class Effect670(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.ship.increaseItemAttr('warpScrambleStatus', module.getModifiedItemAttr('warpScrambleStrength'))
+
+
+class Effect675(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, skill, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Energy Pulse Weapons'),
+                                      'cpu', skill.getModifiedItemAttr('cpuNeedBonus') * skill.level)
+
+
+class Effect677(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context):
+        level = container.level if 'skill' in context else 1
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Missile Launcher Operation'),
+                                      'cpu', container.getModifiedItemAttr('cpuNeedBonus') * level)
+
+
+class Effect699(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context):
+        level = container.level if 'skill' in context else 1
+        penalized = False if 'skill' in context or 'implant' in context or 'booster' in context else True
+        fit.ship.boostItemAttr('scanResolution', container.getModifiedItemAttr('scanResolutionBonus') * level,
+                               stackingPenalties=penalized)
+
+
+class Effect706(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.ship.increaseItemAttr('warpFactor', src.getModifiedItemAttr('eliteBonusCovertOps1'), skill='Covert Ops')
+
+
+class Effect726(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        # TODO: investigate if we can live without such ifs or hardcoding
+        # Viator doesn't have GI bonus
+        if 'shipBonusGI' in fit.ship.item.attributes:
+            bonusAttr = 'shipBonusGI'
+        else:
+            bonusAttr = 'shipBonusGI2'
+        fit.ship.boostItemAttr('capacity', ship.getModifiedItemAttr(bonusAttr), skill='Gallente Industrial')
+
+
+class Effect727(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.ship.boostItemAttr('capacity', ship.getModifiedItemAttr('shipBonusCI'), skill='Caldari Industrial')
+
+
+class Effect728(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.ship.boostItemAttr('capacity', ship.getModifiedItemAttr('shipBonusMI'), skill='Minmatar Industrial')
+
+
+class Effect729(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        # TODO: investigate if we can live without such ifs or hardcoding
+        # Viator doesn't have GI bonus
+        if 'shipBonusGI' in fit.ship.item.attributes:
+            bonusAttr = 'shipBonusGI'
+        else:
+            bonusAttr = 'shipBonusGI2'
+        fit.ship.boostItemAttr('maxVelocity', ship.getModifiedItemAttr(bonusAttr), skill='Gallente Industrial')
+
+
+class Effect730(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.ship.boostItemAttr('maxVelocity', ship.getModifiedItemAttr('shipBonusCI'), skill='Caldari Industrial')
+
+
+class Effect732(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.ship.boostItemAttr('maxVelocity', ship.getModifiedItemAttr('shipBonusAI'), skill='Amarr Industrial')
+
+
+class Effect736(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.ship.boostItemAttr('capacitorCapacity', ship.getModifiedItemAttr('shipBonusAB2'), skill='Amarr Battleship')
+
+
+class Effect744(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context):
+        level = container.level if 'skill' in context else 1
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('CPU Management'),
+                                      'duration', container.getModifiedItemAttr('scanspeedBonus') * level)
+
+
+class Effect754(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Small Hybrid Turret'),
+                                      'damageMultiplier', ship.getModifiedItemAttr('shipBonusCF'), skill='Caldari Frigate')
+
+
+class Effect757(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Small Energy Turret'), 'damageMultiplier',
+                                      src.getModifiedItemAttr('shipBonusAF'), skill='Amarr Frigate')
+
+
+class Effect760(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Missile Launcher Operation'),
+                                      'speed', ship.getModifiedItemAttr('shipBonusCF2'), skill='Caldari Frigate')
+
+
+class Effect763(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context):
+        for dmgType in ('em', 'kinetic', 'explosive', 'thermal'):
+            fit.modules.filteredChargeMultiply(lambda mod: mod.charge.requiresSkill('Missile Launcher Operation'),
+                                               '%sDamage' % dmgType,
+                                               container.getModifiedItemAttr('missileDamageMultiplierBonus'),
+                                               stackingPenalties=True)
+
+
+class Effect784(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context):
+        level = container.level if 'skill' in context else 1
+        penalized = False if 'skill' in context or 'implant' in context or 'booster' in context else True
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Missile Launcher Operation'),
+                                        'explosionDelay', container.getModifiedItemAttr('maxFlightTimeBonus') * level,
+                                        stackingPenalties=penalized)
+
+
+class Effect804(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        # Dirty hack to work around cap charges setting cap booster
+        # injection amount to zero
+        rawAttr = module.item.getAttribute('capacitorNeed')
+        if rawAttr is not None and rawAttr >= 0:
+            module.boostItemAttr('capacitorNeed', module.getModifiedChargeAttr('capNeedBonus') or 0)
+
+
+class Effect836(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.ship.boostItemAttr('capacity', module.getModifiedItemAttr('cargoCapacityBonus'))
+
+
+class Effect848(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, skill, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Cloaking'),
+                                      'cloakingTargetingDelay',
+                                      skill.getModifiedItemAttr('cloakingTargetingDelayBonus') * skill.level)
+
+
+class Effect854(EffectDef):
+
+    type = 'offline'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.ship.multiplyItemAttr('scanResolution',
+                                  module.getModifiedItemAttr('scanResolutionMultiplier'),
+                                  stackingPenalties=True, penaltyGroup='cloakingScanResolutionMultiplier')
+
+
+class Effect856(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context):
+        penalized = False if 'skill' in context or 'implant' in context else True
+        fit.ship.boostItemAttr('baseWarpSpeed', container.getModifiedItemAttr('WarpSBonus'),
+                               stackingPenalties=penalized)
+
+
+class Effect874(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Small Projectile Turret'),
+                                      'maxRange', ship.getModifiedItemAttr('shipBonusMF2'), skill='Minmatar Frigate')
+
+
+class Effect882(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Small Hybrid Turret'),
+                                      'maxRange', ship.getModifiedItemAttr('shipBonusCF2'), skill='Caldari Frigate')
+
+
+class Effect887(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Large Energy Turret'),
+                                      'speed', ship.getModifiedItemAttr('shipBonusAB2'), skill='Amarr Battleship')
+
+
+class Effect889(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.modules.filteredItemMultiply(lambda mod: mod.item.requiresSkill('Missile Launcher Operation'),
+                                         'speed', module.getModifiedItemAttr('speedMultiplier'),
+                                         stackingPenalties=True)
+
+
+class Effect891(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Cruise Missiles'),
+                                        'maxVelocity', ship.getModifiedItemAttr('shipBonusCB3'), skill='Caldari Battleship')
+
+
+class Effect892(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Torpedoes'),
+                                        'maxVelocity', ship.getModifiedItemAttr('shipBonusCB3'), skill='Caldari Battleship')
+
+
+class Effect896(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context):
+        fit.modules.filteredItemMultiply(lambda mod: mod.item.group.name == 'Cloaking Device',
+                                         'cpu', container.getModifiedItemAttr('cloakingCpuNeedBonus'))
+
+
+class Effect898(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Missile Launcher Operation'),
+                                        'kineticDamage', ship.getModifiedItemAttr('shipBonusCF'), skill='Caldari Frigate')
+
+
+class Effect899(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Missile Launcher Operation'),
+                                        'kineticDamage', ship.getModifiedItemAttr('shipBonusCC'), skill='Caldari Cruiser')
+
+
+class Effect900(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill('Light Drone Operation'),
+                                     'thermalDamage', ship.getModifiedItemAttr('shipBonusGF2'), skill='Gallente Frigate')
+
+
+class Effect907(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Energy Turret'),
+                                      'speed', ship.getModifiedItemAttr('shipBonusAC2'), skill='Amarr Cruiser')
+
+
+class Effect909(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.ship.boostItemAttr('armorHP', ship.getModifiedItemAttr('shipBonusAC2'), skill='Amarr Cruiser')
+
+
+class Effect912(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Missile Launcher Operation'),
+                                      'speed', ship.getModifiedItemAttr('shipBonusCC2'), skill='Caldari Cruiser')
+
+
+class Effect918(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.extraAttributes.increase('maxActiveDrones', ship.getModifiedItemAttr('shipBonusGC2'), skill='Gallente Cruiser')
+
+
+class Effect919(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Hybrid Turret'),
+                                      'trackingSpeed', ship.getModifiedItemAttr('shipBonusGC2'), skill='Gallente Cruiser')
+
+
+class Effect958(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.ship.boostItemAttr('armorEmDamageResonance', ship.getModifiedItemAttr('shipBonusAC2'), skill='Amarr Cruiser')
+
+
+class Effect959(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.ship.boostItemAttr('armorExplosiveDamageResonance', ship.getModifiedItemAttr('shipBonusAC2'),
+                               skill='Amarr Cruiser')
+
+
+class Effect960(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.ship.boostItemAttr('armorKineticDamageResonance', ship.getModifiedItemAttr('shipBonusAC2'),
+                               skill='Amarr Cruiser')
+
+
+class Effect961(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.ship.boostItemAttr('armorThermalDamageResonance', ship.getModifiedItemAttr('shipBonusAC2'),
+                               skill='Amarr Cruiser')
+
+
+class Effect968(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Projectile Turret'),
+                                      'damageMultiplier', ship.getModifiedItemAttr('shipBonusMC2'),
+                                      skill='Minmatar Cruiser')
+
+
+class Effect980(EffectDef):
+
+    runTime = 'early'
+    type = 'active'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.extraAttributes['cloaked'] = True
+        # TODO: Implement
+
+
+class Effect989(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Small Hybrid Turret'),
+                                      'maxRange', ship.getModifiedItemAttr('eliteBonusGunship1'), skill='Assault Frigates')
+
+
+class Effect991(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Small Energy Turret'),
+                                      'maxRange', ship.getModifiedItemAttr('eliteBonusGunship1'), skill='Assault Frigates')
+
+
+class Effect996(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Small Hybrid Turret'),
+                                      'trackingSpeed', ship.getModifiedItemAttr('eliteBonusGunship2'),
+                                      skill='Assault Frigates')
+
+
+class Effect998(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Small Projectile Turret'),
+                                      'falloff', ship.getModifiedItemAttr('eliteBonusGunship2'), skill='Assault Frigates')
+
+
+class Effect999(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Shield Operation'),
+                                      'shieldBonus', ship.getModifiedItemAttr('eliteBonusGunship2'),
+                                      skill='Assault Frigates')
+
+
+class Effect1001(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.ship.boostItemAttr('rechargeRate', ship.getModifiedItemAttr('eliteBonusGunship2'), skill='Assault Frigates')
+
+
+class Effect1003(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, skill, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Small Pulse Laser Specialization'),
+                                      'damageMultiplier', skill.getModifiedItemAttr('damageMultiplierBonus') * skill.level)
+
+
+class Effect1004(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, skill, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Small Beam Laser Specialization'),
+                                      'damageMultiplier', skill.getModifiedItemAttr('damageMultiplierBonus') * skill.level)
+
+
+class Effect1005(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, skill, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Small Blaster Specialization'),
+                                      'damageMultiplier', skill.getModifiedItemAttr('damageMultiplierBonus') * skill.level)
+
+
+class Effect1006(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, skill, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Small Railgun Specialization'),
+                                      'damageMultiplier', skill.getModifiedItemAttr('damageMultiplierBonus') * skill.level)
+
+
+class Effect1007(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, skill, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Small Autocannon Specialization'),
+                                      'damageMultiplier', skill.getModifiedItemAttr('damageMultiplierBonus') * skill.level)
+
+
+class Effect1008(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, skill, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Small Artillery Specialization'),
+                                      'damageMultiplier', skill.getModifiedItemAttr('damageMultiplierBonus') * skill.level)
+
+
+class Effect1009(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, skill, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Pulse Laser Specialization'),
+                                      'damageMultiplier', skill.getModifiedItemAttr('damageMultiplierBonus') * skill.level)
+
+
+class Effect1010(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, skill, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Beam Laser Specialization'),
+                                      'damageMultiplier', skill.getModifiedItemAttr('damageMultiplierBonus') * skill.level)
+
+
+class Effect1011(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, skill, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Blaster Specialization'),
+                                      'damageMultiplier', skill.getModifiedItemAttr('damageMultiplierBonus') * skill.level)
+
+
+class Effect1012(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, skill, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Railgun Specialization'),
+                                      'damageMultiplier', skill.getModifiedItemAttr('damageMultiplierBonus') * skill.level)
+
+
+class Effect1013(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, skill, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Autocannon Specialization'),
+                                      'damageMultiplier', skill.getModifiedItemAttr('damageMultiplierBonus') * skill.level)
+
+
+class Effect1014(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, skill, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Artillery Specialization'),
+                                      'damageMultiplier', skill.getModifiedItemAttr('damageMultiplierBonus') * skill.level)
+
+
+class Effect1015(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, skill, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Large Pulse Laser Specialization'),
+                                      'damageMultiplier', skill.getModifiedItemAttr('damageMultiplierBonus') * skill.level)
+
+
+class Effect1016(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, skill, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Large Beam Laser Specialization'),
+                                      'damageMultiplier', skill.getModifiedItemAttr('damageMultiplierBonus') * skill.level)
+
+
+class Effect1017(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, skill, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Large Blaster Specialization'),
+                                      'damageMultiplier', skill.getModifiedItemAttr('damageMultiplierBonus') * skill.level)
+
+
+class Effect1018(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, skill, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Large Railgun Specialization'),
+                                      'damageMultiplier', skill.getModifiedItemAttr('damageMultiplierBonus') * skill.level)
+
+
+class Effect1019(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, skill, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Large Autocannon Specialization'),
+                                      'damageMultiplier', skill.getModifiedItemAttr('damageMultiplierBonus') * skill.level)
+
+
+class Effect1020(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, skill, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Large Artillery Specialization'),
+                                      'damageMultiplier', skill.getModifiedItemAttr('damageMultiplierBonus') * skill.level)
+
+
+class Effect1021(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Small Hybrid Turret'),
+                                      'damageMultiplier', ship.getModifiedItemAttr('eliteBonusGunship2'),
+                                      skill='Assault Frigates')
+
+
+class Effect1024(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Heavy Missiles'),
+                                        'maxVelocity', ship.getModifiedItemAttr('shipBonusCC2'), skill='Caldari Cruiser')
+
+
+class Effect1025(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Light Missiles'),
+                                        'maxVelocity', ship.getModifiedItemAttr('shipBonusCC2'), skill='Caldari Cruiser')
+
+
+class Effect1030(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context):
+        level = container.level if 'skill' in context else 1
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Remote Armor Repair Systems'),
+                                      'capacitorNeed', container.getModifiedItemAttr('capNeedBonus') * level)
+
+
+class Effect1033(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Remote Armor Repair Systems'), 'capacitorNeed',
+                                      src.getModifiedItemAttr('eliteBonusLogistics1'), skill='Logistics Cruisers')
+
+
+class Effect1034(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Remote Armor Repair Systems'), 'capacitorNeed',
+                                      src.getModifiedItemAttr('eliteBonusLogistics2'), skill='Logistics Cruisers')
+
+
+class Effect1035(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Shield Emission Systems'), 'capacitorNeed',
+                                      src.getModifiedItemAttr('eliteBonusLogistics2'), skill='Logistics Cruisers')
+
+
+class Effect1036(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Shield Emission Systems'), 'capacitorNeed',
+                                      src.getModifiedItemAttr('eliteBonusLogistics1'), skill='Logistics Cruisers')
+
+
+class Effect1046(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Remote Armor Repair Systems'), 'maxRange',
+                                      src.getModifiedItemAttr('shipBonusGC'), skill='Gallente Cruiser')
+
+
+class Effect1047(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Remote Armor Repair Systems'), 'maxRange',
+                                      src.getModifiedItemAttr('shipBonusAC2'), skill='Amarr Cruiser')
+
+
+class Effect1048(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Shield Emission Systems'), 'maxRange',
+                                      src.getModifiedItemAttr('shipBonusCC'), skill='Caldari Cruiser')
+
+
+class Effect1049(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Shield Emission Systems'), 'maxRange',
+                                      src.getModifiedItemAttr('shipBonusMC2'), skill='Minmatar Cruiser')
+
+
+class Effect1056(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Hybrid Turret'),
+                                      'maxRange', ship.getModifiedItemAttr('eliteBonusHeavyGunship1'),
+                                      skill='Heavy Assault Cruisers')
+
+
+class Effect1057(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Projectile Turret'),
+                                      'maxRange', ship.getModifiedItemAttr('eliteBonusHeavyGunship1'),
+                                      skill='Heavy Assault Cruisers')
+
+
+class Effect1058(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Energy Turret'),
+                                      'maxRange', ship.getModifiedItemAttr('eliteBonusHeavyGunship1'),
+                                      skill='Heavy Assault Cruisers')
+
+
+class Effect1060(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Projectile Turret'),
+                                      'falloff', ship.getModifiedItemAttr('eliteBonusHeavyGunship1'),
+                                      skill='Heavy Assault Cruisers')
+
+
+class Effect1061(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Hybrid Turret'),
+                                      'damageMultiplier', ship.getModifiedItemAttr('eliteBonusHeavyGunship2'),
+                                      skill='Heavy Assault Cruisers')
+
+
+class Effect1062(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Energy Turret'),
+                                      'damageMultiplier', ship.getModifiedItemAttr('eliteBonusHeavyGunship2'),
+                                      skill='Heavy Assault Cruisers')
+
+
+class Effect1063(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Projectile Turret'),
+                                      'trackingSpeed', ship.getModifiedItemAttr('eliteBonusHeavyGunship2'),
+                                      skill='Heavy Assault Cruisers')
+
+
+class Effect1080(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Hybrid Turret'),
+                                      'falloff', ship.getModifiedItemAttr('eliteBonusHeavyGunship1'),
+                                      skill='Heavy Assault Cruisers')
+
+
+class Effect1081(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Heavy Missiles'),
+                                        'explosionDelay', ship.getModifiedItemAttr('eliteBonusHeavyGunship1'),
+                                        skill='Heavy Assault Cruisers')
+
+
+class Effect1082(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Light Missiles'),
+                                        'explosionDelay', ship.getModifiedItemAttr('eliteBonusHeavyGunship1'),
+                                        skill='Heavy Assault Cruisers')
+
+
+class Effect1084(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.extraAttributes.increase('droneControlRange', ship.getModifiedItemAttr('eliteBonusHeavyGunship1'),
+                                     skill='Heavy Assault Cruisers')
+
+
+class Effect1087(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Projectile Turret'),
+                                      'damageMultiplier', ship.getModifiedItemAttr('eliteBonusHeavyGunship2'),
+                                      skill='Heavy Assault Cruisers')
+
+
+class Effect1099(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Small Projectile Turret'),
+                                      'trackingSpeed', ship.getModifiedItemAttr('shipBonusMF2'), skill='Minmatar Frigate')
+
+
+class Effect1176(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context):
+        level = container.level if 'skill' in context else 1
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Propulsion Module',
+                                      'speedFactor', container.getModifiedItemAttr('speedFBonus') * level)
+
+
+class Effect1179(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Small Energy Turret'),
+                                      'damageMultiplier', ship.getModifiedItemAttr('eliteBonusGunship2'),
+                                      skill='Assault Frigates')
+
+
+class Effect1181(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Remote Capacitor Transmitter',
+                                      'capacitorNeed', ship.getModifiedItemAttr('eliteBonusLogistics1'),
+                                      skill='Logistics Cruisers')
+
+
+class Effect1182(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Remote Capacitor Transmitter',
+                                      'maxRange', ship.getModifiedItemAttr('shipBonusAC'), skill='Amarr Cruiser')
+
+
+class Effect1183(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Remote Capacitor Transmitter',
+                                      'capacitorNeed', ship.getModifiedItemAttr('eliteBonusLogistics2'),
+                                      skill='Logistics Cruisers')
+
+
+class Effect1184(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Remote Capacitor Transmitter',
+                                      'maxRange', ship.getModifiedItemAttr('shipBonusCC2'), skill='Caldari Cruiser')
+
+
+class Effect1185(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, implant, context):
+        fit.ship.boostItemAttr('signatureRadius', implant.getModifiedItemAttr('signatureRadiusBonus'))
+
+
+class Effect1190(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context):
+        level = container.level if 'skill' in context else 1
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Ice Harvesting'),
+                                      'duration', container.getModifiedItemAttr('iceHarvestCycleBonus') * level)
+
+
+class Effect1200(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        module.multiplyItemAttr('specialtyMiningAmount',
+                                module.getModifiedChargeAttr('specialisationAsteroidYieldMultiplier'))
+        # module.multiplyItemAttr('miningAmount', module.getModifiedChargeAttr('specialisationAsteroidYieldMultiplier'))
+
+
+class Effect1212(EffectDef):
+
+    runTime = 'late'
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        module.preAssignItemAttr('specialtyMiningAmount', module.getModifiedItemAttr('miningAmount'))
+
+
+class Effect1215(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Energy Nosferatu',
+                                      'powerTransferAmount', ship.getModifiedItemAttr('shipBonusAF'), skill='Amarr Frigate')
+
+
+class Effect1218(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Small Hybrid Turret'),
+                                      'damageMultiplier', ship.getModifiedItemAttr('shipBonusRole7'))
+
+
+class Effect1219(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Energy Nosferatu',
+                                      'powerTransferAmount', ship.getModifiedItemAttr('shipBonusAB'),
+                                      skill='Amarr Battleship')
+
+
+class Effect1220(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Energy Nosferatu',
+                                      'powerTransferAmount', ship.getModifiedItemAttr('shipBonusAC'), skill='Amarr Cruiser')
+
+
+class Effect1221(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Stasis Web',
+                                      'maxRange', ship.getModifiedItemAttr('shipBonusMB'), skill='Minmatar Battleship')
+
+
+class Effect1222(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Stasis Web',
+                                      'maxRange', ship.getModifiedItemAttr('shipBonusMC2'), skill='Minmatar Cruiser')
+
+
+class Effect1228(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Small Projectile Turret'),
+                                      'trackingSpeed', ship.getModifiedItemAttr('shipBonusGF'), skill='Gallente Frigate')
+
+
+class Effect1230(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Missile Launcher Operation'),
+                                        'maxVelocity', ship.getModifiedItemAttr('shipBonusRole7'))
+
+
+class Effect1232(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Projectile Turret'),
+                                      'speed', ship.getModifiedItemAttr('shipBonusRole7'))
+
+
+class Effect1233(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Hybrid Turret'),
+                                      'damageMultiplier', ship.getModifiedItemAttr('shipBonusRole7'))
+
+
+class Effect1234(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Light Missiles'),
+                                        'maxVelocity', ship.getModifiedItemAttr('shipBonusRole7'))
+
+
+class Effect1239(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Large Projectile Turret'),
+                                      'speed', ship.getModifiedItemAttr('shipBonusRole7'))
+
+
+class Effect1240(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Large Hybrid Turret'),
+                                      'damageMultiplier', ship.getModifiedItemAttr('shipBonusRole7'))
+
+
+class Effect1255(EffectDef):
+
+    runTime = 'early'
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, implant, context):
+        fit.appliedImplants.filteredItemMultiply(lambda mod: mod.item.group.name == 'Cyberimplant',
+                                                 'durationBonus', implant.getModifiedItemAttr('implantSetBloodraider'))
+
+
+class Effect1256(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, implant, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Capacitor Emission Systems'),
+                                      'duration', implant.getModifiedItemAttr('durationBonus'))
+
+
+class Effect1261(EffectDef):
+
+    runTime = 'early'
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, implant, context):
+        fit.appliedImplants.filteredItemMultiply(lambda mod: mod.item.group.name == 'Cyberimplant',
+                                                 'velocityBonus', implant.getModifiedItemAttr('implantSetSerpentis'))
+
+
+class Effect1264(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Small Hybrid Turret'),
+                                      'trackingSpeed', ship.getModifiedItemAttr('eliteBonusInterceptor2'),
+                                      skill='Interceptors')
+
+
+class Effect1268(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Small Energy Turret'),
+                                      'trackingSpeed', ship.getModifiedItemAttr('eliteBonusInterceptor2'),
+                                      skill='Interceptors')
+
+
+class Effect1281(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context):
+        penalized = 'implant' not in context
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Repair Systems'),
+                                      'armorDamageAmount', container.getModifiedItemAttr('repairBonus'),
+                                      stackingPenalties=penalized)
+
+
+class Effect1318(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context):
+        groups = ('ECM', 'Burst Jammer')
+        level = container.level if 'skill' in context else 1
+        for scanType in ('Gravimetric', 'Ladar', 'Magnetometric', 'Radar'):
+            fit.modules.filteredItemBoost(lambda mod: mod.item.group.name in groups,
+                                          'scan{0}StrengthBonus'.format(scanType),
+                                          container.getModifiedItemAttr('scanSkillEwStrengthBonus') * level,
+                                          stackingPenalties=False if 'skill' in context else True)
+
+
+class Effect1360(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context):
+        level = container.level if 'skill' in context else 1
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Sensor Linking'),
+                                      'capacitorNeed', container.getModifiedItemAttr('capNeedBonus') * level)
+
+
+class Effect1361(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context):
+        level = container.level if 'skill' in context else 1
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Weapon Disruption'),
+                                      'capacitorNeed', container.getModifiedItemAttr('capNeedBonus') * level)
+
+
+class Effect1370(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context):
+        level = container.level if 'skill' in context else 1
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Target Painting'),
+                                      'capacitorNeed', container.getModifiedItemAttr('capNeedBonus') * level)
+
+
+class Effect1372(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context):
+        level = container.level if 'skill' in context else 1
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'ECM',
+                                      'capacitorNeed', container.getModifiedItemAttr('capNeedBonus') * level)
+
+
+class Effect1395(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Shield Operation'),
+                                      'shieldBonus', container.getModifiedItemAttr('shieldBoostMultiplier'))
+
+
+class Effect1397(EffectDef):
+
+    runTime = 'early'
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, implant, context):
+        fit.appliedImplants.filteredItemMultiply(lambda mod: mod.item.group.name == 'Cyberimplant',
+                                                 'shieldBoostMultiplier', implant.getModifiedItemAttr('implantSetGuristas'))
+
+
+class Effect1409(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context):
+        level = container.level if 'skill' in context else 1
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Astrometrics'),
+                                      'duration', container.getModifiedItemAttr('durationBonus') * level)
+
+
+class Effect1410(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context):
+
+        level = container.level if 'skill' in context else 1
+
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Propulsion Jamming'),
+                                      'capacitorNeed', container.getModifiedItemAttr('capNeedBonus') * level)
+
+
+class Effect1412(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Large Hybrid Turret'),
+                                      'maxRange', ship.getModifiedItemAttr('shipBonusCB'), skill='Caldari Battleship')
+
+
+class Effect1434(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        for sensorType in ('Gravimetric', 'Ladar', 'Magnetometric', 'Radar'):
+            fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Electronic Warfare'),
+                                          'scan{0}StrengthBonus'.format(sensorType),
+                                          ship.getModifiedItemAttr('shipBonusCB'), stackingPenalties=True,
+                                          skill='Caldari Battleship')
+
+
+class Effect1441(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'ECM',
+                                      'maxRange', ship.getModifiedItemAttr('shipBonusCB3'), skill='Caldari Battleship')
+
+
+class Effect1442(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'ECM',
+                                      'maxRange', ship.getModifiedItemAttr('shipBonusCC2'), skill='Caldari Cruiser')
+
+
+class Effect1443(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'ECM',
+                                      'capacitorNeed', ship.getModifiedItemAttr('shipBonusCC'), skill='Caldari Cruiser')
+
+
+class Effect1445(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context):
+        level = container.level if 'skill' in context else 1
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Sensor Linking'),
+                                      'maxRange', container.getModifiedItemAttr('rangeSkillBonus') * level,
+                                      stackingPenalties='skill' not in context)
+
+
+class Effect1446(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context):
+        level = container.level if 'skill' in context else 1
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Target Painter',
+                                      'maxRange', container.getModifiedItemAttr('rangeSkillBonus') * level,
+                                      stackingPenalties='skill' not in context)
+
+
+class Effect1448(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context):
+        level = container.level if 'skill' in context else 1
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Weapon Disruptor',
+                                      'maxRange', container.getModifiedItemAttr('rangeSkillBonus') * level,
+                                      stackingPenalties='skill' not in context)
+
+
+class Effect1449(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, skill, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Sensor Linking'),
+                                      'falloffEffectiveness', skill.getModifiedItemAttr('falloffBonus') * skill.level)
+
+
+class Effect1450(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, skill, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Target Painter',
+                                      'falloffEffectiveness', skill.getModifiedItemAttr('falloffBonus') * skill.level)
+
+
+class Effect1451(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, skill, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Weapon Disruptor',
+                                      'falloffEffectiveness', skill.getModifiedItemAttr('falloffBonus') * skill.level)
+
+
+class Effect1452(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context):
+        level = container.level if 'skill' in context else 1
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'ECM',
+                                      'maxRange', container.getModifiedItemAttr('rangeSkillBonus') * level,
+                                      stackingPenalties='skill' not in context and 'implant' not in context)
+
+
+class Effect1453(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, skill, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'ECM',
+                                      'falloffEffectiveness', skill.getModifiedItemAttr('falloffBonus') * skill.level)
+
+
+class Effect1472(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context):
+        level = container.level if 'skill' in context else 1
+        penalize = False if 'skill' in context or 'implant' in context else True
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Missile Launcher Operation'),
+                                        'aoeCloudSize', container.getModifiedItemAttr('aoeCloudSizeBonus') * level,
+                                        stackingPenalties=penalize)
+
+
+class Effect1500(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context):
+        level = container.level if 'skill' in context else 1
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Shield Operation'),
+                                      'capacitorNeed', container.getModifiedItemAttr('shieldBoostCapacitorBonus') * level)
+
+
+class Effect1550(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, skill, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Target Painter',
+                                      'signatureRadiusBonus',
+                                      skill.getModifiedItemAttr('scanSkillTargetPaintStrengthBonus') * skill.level)
+
+
+class Effect1551(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Target Painter',
+                                      'signatureRadiusBonus', ship.getModifiedItemAttr('shipBonusMF2'),
+                                      skill='Minmatar Frigate')
+
+
+class Effect1577(EffectDef):
+
+    runTime = 'early'
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, implant, context):
+        fit.appliedImplants.filteredItemMultiply(
+            lambda implant: 'signatureRadiusBonus' in implant.itemModifiedAttributes and
+                            'implantSetAngel' in implant.itemModifiedAttributes,
+            'signatureRadiusBonus',
+            implant.getModifiedItemAttr('implantSetAngel'))
+
+
+class Effect1579(EffectDef):
+
+    runTime = 'early'
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, implant, context):
+        fit.appliedImplants.filteredItemMultiply(lambda target: target.item.requiresSkill('Cybernetics'),
+                                                 'armorHpBonus', implant.getModifiedItemAttr('implantSetSansha') or 1)
+
+
+class Effect1581(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, skill, context):
+        fit.ship.boostItemAttr('jumpDriveRange', skill.getModifiedItemAttr('jumpDriveRangeBonus') * skill.level)
+
+
+class Effect1585(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, skill, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Capital Energy Turret'),
+                                      'damageMultiplier', skill.getModifiedItemAttr('damageMultiplierBonus') * skill.level)
+
+
+class Effect1586(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, skill, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Capital Projectile Turret'),
+                                      'damageMultiplier', skill.getModifiedItemAttr('damageMultiplierBonus') * skill.level)
+
+
+class Effect1587(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, skill, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Capital Hybrid Turret'),
+                                      'damageMultiplier', skill.getModifiedItemAttr('damageMultiplierBonus') * skill.level)
+
+
+class Effect1588(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context):
+        level = container.level if 'skill' in context else 1
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('XL Torpedoes'),
+                                        'kineticDamage', container.getModifiedItemAttr('damageMultiplierBonus') * level)
+
+
+class Effect1590(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context):
+        level = container.level if 'skill' in context else 1
+        penalize = False if 'skill' in context or 'implant' in context else True
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Missile Launcher Operation'),
+                                        'aoeVelocity', container.getModifiedItemAttr('aoeVelocityBonus') * level,
+                                        stackingPenalties=penalize)
+
+
+class Effect1592(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context):
+        level = container.level if 'skill' in context else 1
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('XL Torpedoes'),
+                                        'emDamage', container.getModifiedItemAttr('damageMultiplierBonus') * level)
+
+
+class Effect1593(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context):
+        level = container.level if 'skill' in context else 1
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('XL Torpedoes'),
+                                        'explosiveDamage', container.getModifiedItemAttr('damageMultiplierBonus') * level)
+
+
+class Effect1594(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context):
+        level = container.level if 'skill' in context else 1
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('XL Torpedoes'),
+                                        'thermalDamage', container.getModifiedItemAttr('damageMultiplierBonus') * level)
+
+
+class Effect1595(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        mod = src.level if 'skill' in context else 1
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Missile Launcher Operation'),
+                                        'emDamage', src.getModifiedItemAttr('damageMultiplierBonus') * mod)
+
+
+class Effect1596(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        mod = src.level if 'skill' in context else 1
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Missile Launcher Operation'),
+                                        'explosiveDamage', src.getModifiedItemAttr('damageMultiplierBonus') * mod)
+
+
+class Effect1597(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        mod = src.level if 'skill' in context else 1
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Missile Launcher Operation'),
+                                        'kineticDamage', src.getModifiedItemAttr('damageMultiplierBonus') * mod)
+
+
+class Effect1615(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        skillName = 'Advanced Spaceship Command'
+        skill = fit.character.getSkill(skillName)
+        fit.ship.boostItemAttr('agility', skill.getModifiedItemAttr('agilityBonus'), skill=skillName)
+
+
+class Effect1616(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, skill, context):
+        if fit.ship.item.requiresSkill('Capital Ships'):
+            fit.ship.boostItemAttr('agility', skill.getModifiedItemAttr('agilityBonus') * skill.level)
+
+
+class Effect1617(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.ship.multiplyItemAttr('agility', src.getModifiedItemAttr('advancedCapitalAgility'), stackingPenalties=True)
+
+
+class Effect1634(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context):
+        level = container.level if 'skill' in context else 1
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Capital Shield Operation'),
+                                      'capacitorNeed', container.getModifiedItemAttr('shieldBoostCapacitorBonus') * level)
+
+
+class Effect1635(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context):
+        level = container.level if 'skill' in context else 1
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Capital Repair Systems'),
+                                      'duration', container.getModifiedItemAttr('durationSkillBonus') * level,
+                                      stackingPenalties='skill' not in context)
+
+
+class Effect1638(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, skill, context):
+        fit.modules.filteredItemBoost(
+            lambda mod: mod.item.requiresSkill('Gunnery') or mod.item.requiresSkill('Missile Launcher Operation'),
+            'power', skill.getModifiedItemAttr('powerNeedBonus') * skill.level)
+
+
+class Effect1643(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill('Armored Command'), 'warfareBuff2Multiplier',
+                                        src.getModifiedItemAttr('mindlinkBonus'))
+        fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill('Armored Command'), 'warfareBuff1Multiplier',
+                                        src.getModifiedItemAttr('mindlinkBonus'))
+        fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill('Armored Command'), 'warfareBuff4Multiplier',
+                                        src.getModifiedItemAttr('mindlinkBonus'))
+        fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill('Armored Command'), 'warfareBuff3Multiplier',
+                                        src.getModifiedItemAttr('mindlinkBonus'))
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Armored Command'), 'buffDuration',
+                                      src.getModifiedItemAttr('mindlinkBonus'))
+
+
+class Effect1644(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill('Skirmish Command'), 'warfareBuff3Multiplier',
+                                        src.getModifiedItemAttr('mindlinkBonus'))
+        fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill('Skirmish Command'), 'warfareBuff4Multiplier',
+                                        src.getModifiedItemAttr('mindlinkBonus'))
+        fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill('Skirmish Command'), 'warfareBuff2Multiplier',
+                                        src.getModifiedItemAttr('mindlinkBonus'))
+        fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill('Skirmish Command'), 'warfareBuff1Multiplier',
+                                        src.getModifiedItemAttr('mindlinkBonus'))
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Skirmish Command'), 'buffDuration',
+                                      src.getModifiedItemAttr('mindlinkBonus'))
+
+
+class Effect1645(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill('Shield Command'), 'warfareBuff4Multiplier',
+                                        src.getModifiedItemAttr('mindlinkBonus'))
+        fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill('Shield Command'), 'warfareBuff3Multiplier',
+                                        src.getModifiedItemAttr('mindlinkBonus'))
+        fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill('Shield Command'), 'warfareBuff2Multiplier',
+                                        src.getModifiedItemAttr('mindlinkBonus'))
+        fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill('Shield Command'), 'warfareBuff1Multiplier',
+                                        src.getModifiedItemAttr('mindlinkBonus'))
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Shield Command'), 'buffDuration',
+                                      src.getModifiedItemAttr('mindlinkBonus'))
+
+
+class Effect1646(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill('Information Command'), 'warfareBuff4Multiplier',
+                                        src.getModifiedItemAttr('mindlinkBonus'))
+        fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill('Information Command'), 'warfareBuff3Multiplier',
+                                        src.getModifiedItemAttr('mindlinkBonus'))
+        fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill('Information Command'), 'warfareBuff1Multiplier',
+                                        src.getModifiedItemAttr('mindlinkBonus'))
+        fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill('Information Command'), 'warfareBuff2Multiplier',
+                                        src.getModifiedItemAttr('mindlinkBonus'))
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Information Command'), 'buffDuration',
+                                      src.getModifiedItemAttr('mindlinkBonus'))
+
+
+class Effect1650(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, skill, context):
+        amount = -skill.getModifiedItemAttr('consumptionQuantityBonus')
+        fit.modules.filteredItemIncrease(lambda mod: mod.item.requiresSkill(skill),
+                                         'consumptionQuantity', amount * skill.level)
+
+
+class Effect1657(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        mod = src.level if 'skill' in context else 1
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Missile Launcher Operation'),
+                                        'thermalDamage', src.getModifiedItemAttr('damageMultiplierBonus') * mod)
+
+
+class Effect1668(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.ship.boostItemAttr('capacity', ship.getModifiedItemAttr('freighterBonusA2'), skill='Amarr Freighter')
+
+
+class Effect1669(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.ship.boostItemAttr('capacity', ship.getModifiedItemAttr('freighterBonusC2'), skill='Caldari Freighter')
+
+
+class Effect1670(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.ship.boostItemAttr('capacity', ship.getModifiedItemAttr('freighterBonusG2'), skill='Gallente Freighter')
+
+
+class Effect1671(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.ship.boostItemAttr('capacity', ship.getModifiedItemAttr('freighterBonusM2'), skill='Minmatar Freighter')
+
+
+class Effect1672(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.ship.boostItemAttr('maxVelocity', ship.getModifiedItemAttr('freighterBonusA1'), skill='Amarr Freighter')
+
+
+class Effect1673(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.ship.boostItemAttr('maxVelocity', ship.getModifiedItemAttr('freighterBonusC1'), skill='Caldari Freighter')
+
+
+class Effect1674(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.ship.boostItemAttr('maxVelocity', ship.getModifiedItemAttr('freighterBonusG1'), skill='Gallente Freighter')
+
+
+class Effect1675(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.ship.boostItemAttr('maxVelocity', ship.getModifiedItemAttr('freighterBonusM1'), skill='Minmatar Freighter')
+
+
+class Effect1720(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.modules.filteredItemBoost(
+            lambda mod: mod.item.requiresSkill('Shield Operation') or mod.item.requiresSkill('Capital Shield Operation'),
+            'shieldBonus', module.getModifiedItemAttr('shieldBoostMultiplier'),
+            stackingPenalties=True)
+
+
+class Effect1722(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, skill, context):
+        fit.ship.boostItemAttr('jumpDriveCapacitorNeed',
+                               skill.getModifiedItemAttr('jumpDriveCapacitorNeedBonus') * skill.level)
+
+
+class Effect1730(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, skill, context):
+        fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill(skill),
+                                     'damageMultiplier', skill.getModifiedItemAttr('damageMultiplierBonus') * skill.level)
+
+
+class Effect1738(EffectDef):
+
+    type = 'active'
+
+
+class Effect1763(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context):
+        level = container.level if 'skill' in context else 1
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Missile Launcher Operation'),
+                                      'speed', container.getModifiedItemAttr('rofBonus') * level)
+
+
+class Effect1764(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context):
+        level = container.level if 'skill' in context else 1
+        penalized = False if 'skill' in context or 'implant' in context else True
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Missile Launcher Operation'),
+                                        'maxVelocity', container.getModifiedItemAttr('speedFactor') * level,
+                                        stackingPenalties=penalized)
+
+
+class Effect1773(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Small Hybrid Turret'),
+                                      'falloff', ship.getModifiedItemAttr('shipBonusGF2'), skill='Gallente Frigate')
+
+
+class Effect1804(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.ship.boostItemAttr('armorEmDamageResonance', ship.getModifiedItemAttr('shipBonusAF'), skill='Amarr Frigate')
+
+
+class Effect1805(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.ship.boostItemAttr('armorThermalDamageResonance', ship.getModifiedItemAttr('shipBonusAF'),
+                               skill='Amarr Frigate')
+
+
+class Effect1806(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.ship.boostItemAttr('armorKineticDamageResonance', ship.getModifiedItemAttr('shipBonusAF'),
+                               skill='Amarr Frigate')
+
+
+class Effect1807(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.ship.boostItemAttr('armorExplosiveDamageResonance', ship.getModifiedItemAttr('shipBonusAF'),
+                               skill='Amarr Frigate')
+
+
+class Effect1812(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.ship.boostItemAttr('shieldEmDamageResonance', ship.getModifiedItemAttr('shipBonusCC2'), skill='Caldari Cruiser')
+
+
+class Effect1813(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.ship.boostItemAttr('shieldThermalDamageResonance', ship.getModifiedItemAttr('shipBonusCC2'),
+                               skill='Caldari Cruiser')
+
+
+class Effect1814(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.ship.boostItemAttr('shieldKineticDamageResonance', ship.getModifiedItemAttr('shipBonusCC2'),
+                               skill='Caldari Cruiser')
+
+
+class Effect1815(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.ship.boostItemAttr('shieldExplosiveDamageResonance', ship.getModifiedItemAttr('shipBonusCC2'),
+                               skill='Caldari Cruiser')
+
+
+class Effect1816(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.ship.boostItemAttr('shieldEmDamageResonance', ship.getModifiedItemAttr('shipBonusCF'), skill='Caldari Frigate')
+
+
+class Effect1817(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.ship.boostItemAttr('shieldThermalDamageResonance', ship.getModifiedItemAttr('shipBonusCF'),
+                               skill='Caldari Frigate')
+
+
+class Effect1819(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.ship.boostItemAttr('shieldKineticDamageResonance', ship.getModifiedItemAttr('shipBonusCF'),
+                               skill='Caldari Frigate')
+
+
+class Effect1820(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.ship.boostItemAttr('shieldExplosiveDamageResonance', ship.getModifiedItemAttr('shipBonusCF'),
+                               skill='Caldari Frigate')
+
+
+class Effect1848(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill('Mining Foreman'), 'warfareBuff4Multiplier',
+                                        src.getModifiedItemAttr('mindlinkBonus'))
+        fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill('Mining Foreman'), 'warfareBuff2Multiplier',
+                                        src.getModifiedItemAttr('mindlinkBonus'))
+        fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill('Mining Foreman'), 'warfareBuff1Multiplier',
+                                        src.getModifiedItemAttr('mindlinkBonus'))
+        fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill('Mining Foreman'), 'warfareBuff3Multiplier',
+                                        src.getModifiedItemAttr('mindlinkBonus'))
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Mining Foreman'), 'buffDuration',
+                                      src.getModifiedItemAttr('mindlinkBonus'))
+
+
+class Effect1851(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, skill, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill(skill),
+                                      'speed', skill.getModifiedItemAttr('rofBonus') * skill.level)
+
+
+class Effect1862(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Missile Launcher Operation'),
+                                        'emDamage', ship.getModifiedItemAttr('shipBonusCF2'), skill='Caldari Frigate')
+
+
+class Effect1863(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Missile Launcher Operation'),
+                                        'thermalDamage', ship.getModifiedItemAttr('shipBonusCF2'), skill='Caldari Frigate')
+
+
+class Effect1864(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Missile Launcher Operation'),
+                                        'explosiveDamage', ship.getModifiedItemAttr('shipBonusCF2'),
+                                        skill='Caldari Frigate')
+
+
+class Effect1882(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Mining'),
+                                      'miningAmount', module.getModifiedItemAttr('miningAmountBonus'))
+
+
+class Effect1885(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Missile Launcher Cruise',
+                                      'speed', ship.getModifiedItemAttr('shipBonus2CB'), skill='Caldari Battleship')
+
+
+class Effect1886(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Missile Launcher Torpedo',
+                                      'speed', ship.getModifiedItemAttr('shipBonus2CB'), skill='Caldari Battleship')
+
+
+class Effect1896(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Ice Harvesting'),
+                                      'duration', ship.getModifiedItemAttr('eliteBonusBarge2'), skill='Exhumers')
+
+
+class Effect1910(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Energy Nosferatu',
+                                      'powerTransferAmount', ship.getModifiedItemAttr('eliteBonusReconShip2'),
+                                      skill='Recon Ships')
+
+
+class Effect1911(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'ECM',
+                                      'scanGravimetricStrengthBonus', ship.getModifiedItemAttr('eliteBonusReconShip2'),
+                                      skill='Recon Ships')
+
+
+class Effect1912(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'ECM',
+                                      'scanMagnetometricStrengthBonus', ship.getModifiedItemAttr('eliteBonusReconShip2'),
+                                      skill='Recon Ships')
+
+
+class Effect1913(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'ECM',
+                                      'scanRadarStrengthBonus', ship.getModifiedItemAttr('eliteBonusReconShip2'),
+                                      skill='Recon Ships')
+
+
+class Effect1914(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'ECM',
+                                      'scanLadarStrengthBonus', ship.getModifiedItemAttr('eliteBonusReconShip2'),
+                                      skill='Recon Ships')
+
+
+class Effect1921(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Stasis Web',
+                                      'maxRange', ship.getModifiedItemAttr('eliteBonusReconShip2'), skill='Recon Ships')
+
+
+class Effect1922(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Warp Scrambler',
+                                      'maxRange', ship.getModifiedItemAttr('eliteBonusReconShip2'), skill='Recon Ships')
+
+
+class Effect1959(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.ship.increaseItemAttr('mass', module.getModifiedItemAttr('massAddition'))
+
+
+class Effect1964(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Shield Emission Systems'), 'capacitorNeed',
+                                      src.getModifiedItemAttr('shipBonusCC'), skill='Caldari Cruiser')
+
+
+class Effect1969(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Remote Armor Repair Systems'), 'capacitorNeed',
+                                      src.getModifiedItemAttr('shipBonusGC'), skill='Gallente Cruiser')
+
+
+class Effect1996(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'ECM',
+                                      'capacitorNeed', ship.getModifiedItemAttr('shipBonusCF2'), skill='Caldari Frigate')
+
+
+class Effect2000(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        amount = module.getModifiedItemAttr('droneRangeBonus')
+        fit.extraAttributes.increase('droneControlRange', amount)
+
+
+class Effect2008(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Cynosural Field Generator',
+                                      'duration', ship.getModifiedItemAttr('durationBonus'))
+
+
+class Effect2013(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context):
+        level = container.level if 'skill' in context else 1
+        fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Drones'),
+                                     'maxVelocity', container.getModifiedItemAttr('droneMaxVelocityBonus') * level, stackingPenalties=True)
+
+
+class Effect2014(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context):
+        level = container.level if 'skill' in context else 1
+        stacking = False if 'skill' in context else True
+        fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Drones'),
+                                     'maxRange',
+                                     container.getModifiedItemAttr('rangeSkillBonus') * level,
+                                     stackingPenalties=stacking)
+
+
+class Effect2015(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Drones'),
+                                     'shieldCapacity', module.getModifiedItemAttr('hullHpBonus'))
+
+
+class Effect2016(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Drones'),
+                                     'armorHP', module.getModifiedItemAttr('hullHpBonus'))
+
+
+class Effect2017(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context):
+        level = container.level if 'skill' in context else 1
+        fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Drones'),
+                                     'hp', container.getModifiedItemAttr('hullHpBonus') * level)
+
+
+class Effect2019(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context):
+        level = container.level if 'skill' in context else 1
+        fit.drones.filteredItemBoost(lambda drone: drone.item.group.name == 'Logistic Drone',
+                                     'shieldBonus', container.getModifiedItemAttr('damageHP') * level)
+
+
+class Effect2020(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context):
+        level = container.level if 'skill' in context else 1
+        fit.drones.filteredItemBoost(lambda drone: drone.item.group.name == 'Logistic Drone',
+                                     'armorDamageAmount', container.getModifiedItemAttr('damageHP') * level,
+                                     stackingPenalties=True)
+
+
+class Effect2029(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.ship.increaseItemAttr('signatureRadius', module.getModifiedItemAttr('signatureRadiusAdd'))
+
+
+class Effect2041(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        for type in ('kinetic', 'thermal', 'explosive', 'em'):
+            fit.ship.boostItemAttr('armor%sDamageResonance' % type.capitalize(),
+                                   module.getModifiedItemAttr('%sDamageResistanceBonus' % type),
+                                   stackingPenalties=True)
+
+
+class Effect2052(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        for type in ('kinetic', 'thermal', 'explosive', 'em'):
+            fit.ship.boostItemAttr('shield%sDamageResonance' % type.capitalize(),
+                                   module.getModifiedItemAttr('%sDamageResistanceBonus' % type),
+                                   stackingPenalties=True)
+
+
+class Effect2053(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, skill, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Shield Resistance Amplifier',
+                                      'emDamageResistanceBonus', skill.getModifiedItemAttr('hardeningBonus') * skill.level)
+
+
+class Effect2054(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, skill, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Shield Resistance Amplifier',
+                                      'explosiveDamageResistanceBonus',
+                                      skill.getModifiedItemAttr('hardeningBonus') * skill.level)
+
+
+class Effect2055(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, skill, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Shield Resistance Amplifier',
+                                      'kineticDamageResistanceBonus',
+                                      skill.getModifiedItemAttr('hardeningBonus') * skill.level)
+
+
+class Effect2056(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, skill, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Shield Resistance Amplifier',
+                                      'thermalDamageResistanceBonus',
+                                      skill.getModifiedItemAttr('hardeningBonus') * skill.level)
+
+
+class Effect2105(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, skill, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Armor Coating',
+                                      'emDamageResistanceBonus', skill.getModifiedItemAttr('hardeningBonus') * skill.level)
+
+
+class Effect2106(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, skill, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Armor Coating',
+                                      'explosiveDamageResistanceBonus',
+                                      skill.getModifiedItemAttr('hardeningBonus') * skill.level)
+
+
+class Effect2107(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, skill, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Armor Coating',
+                                      'kineticDamageResistanceBonus',
+                                      skill.getModifiedItemAttr('hardeningBonus') * skill.level)
+
+
+class Effect2108(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, skill, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Armor Coating',
+                                      'thermalDamageResistanceBonus',
+                                      skill.getModifiedItemAttr('hardeningBonus') * skill.level)
+
+
+class Effect2109(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, skill, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Armor Plating Energized',
+                                      'emDamageResistanceBonus', skill.getModifiedItemAttr('hardeningBonus') * skill.level)
+
+
+class Effect2110(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, skill, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Armor Plating Energized',
+                                      'explosiveDamageResistanceBonus',
+                                      skill.getModifiedItemAttr('hardeningBonus') * skill.level)
+
+
+class Effect2111(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, skill, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Armor Plating Energized',
+                                      'kineticDamageResistanceBonus',
+                                      skill.getModifiedItemAttr('hardeningBonus') * skill.level)
+
+
+class Effect2112(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, skill, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Armor Plating Energized',
+                                      'thermalDamageResistanceBonus',
+                                      skill.getModifiedItemAttr('hardeningBonus') * skill.level)
+
+
+class Effect2130(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Small Hybrid Turret'),
+                                      'maxRange', ship.getModifiedItemAttr('maxRangeBonus'))
+
+
+class Effect2131(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Small Energy Turret'),
+                                      'maxRange', ship.getModifiedItemAttr('maxRangeBonus'))
+
+
+class Effect2132(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Small Projectile Turret'),
+                                      'maxRange', ship.getModifiedItemAttr('maxRangeBonus'))
+
+
+class Effect2133(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Remote Capacitor Transmitter',
+                                      'maxRange', ship.getModifiedItemAttr('maxRangeBonus2'))
+
+
+class Effect2134(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Remote Shield Booster', 'maxRange',
+                                      ship.getModifiedItemAttr('maxRangeBonus'))
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Ancillary Remote Shield Booster', 'maxRange',
+                                      ship.getModifiedItemAttr('maxRangeBonus'))
+
+
+class Effect2135(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Remote Armor Repairer', 'maxRange',
+                                      src.getModifiedItemAttr('maxRangeBonus'))
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Ancillary Remote Armor Repairer', 'maxRange',
+                                      src.getModifiedItemAttr('maxRangeBonus'))
+
+
+class Effect2143(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Target Painter',
+                                      'signatureRadiusBonus', ship.getModifiedItemAttr('shipBonusMC2'),
+                                      skill='Minmatar Cruiser')
+
+
+class Effect2155(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Projectile Turret'),
+                                      'damageMultiplier', ship.getModifiedItemAttr('eliteBonusCommandShips1'),
+                                      skill='Command Ships')
+
+
+class Effect2156(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Projectile Turret'),
+                                      'falloff', ship.getModifiedItemAttr('eliteBonusCommandShips2'), skill='Command Ships')
+
+
+class Effect2157(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Energy Turret'),
+                                      'damageMultiplier', ship.getModifiedItemAttr('eliteBonusCommandShips1'),
+                                      skill='Command Ships')
+
+
+class Effect2158(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Energy Turret'),
+                                      'speed', ship.getModifiedItemAttr('eliteBonusCommandShips2'), skill='Command Ships')
+
+
+class Effect2160(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Hybrid Turret'),
+                                      'falloff', ship.getModifiedItemAttr('eliteBonusCommandShips2'), skill='Command Ships')
+
+
+class Effect2161(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Hybrid Turret'),
+                                      'maxRange', ship.getModifiedItemAttr('eliteBonusCommandShips1'),
+                                      skill='Command Ships')
+
+
+class Effect2179(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        for type in ('shieldCapacity', 'armorHP', 'hp'):
+            fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Drones'),
+                                         type, ship.getModifiedItemAttr('shipBonusGC2'), skill='Gallente Cruiser')
+
+
+class Effect2181(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        for type in ('shieldCapacity', 'armorHP', 'hp'):
+            fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Drones'),
+                                         type, ship.getModifiedItemAttr('shipBonusAC2'), skill='Amarr Cruiser')
+
+
+class Effect2186(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        for type in ('shieldCapacity', 'armorHP', 'hp'):
+            fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Drones'),
+                                         type, ship.getModifiedItemAttr('shipBonusGB2'), skill='Gallente Battleship')
+
+
+class Effect2187(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Drones'),
+                                     'damageMultiplier', ship.getModifiedItemAttr('shipBonusGB2'),
+                                     skill='Gallente Battleship')
+
+
+class Effect2188(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Drones'),
+                                     'damageMultiplier', ship.getModifiedItemAttr('shipBonusGC2'), skill='Gallente Cruiser')
+
+
+class Effect2189(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Drones'),
+                                     'damageMultiplier', ship.getModifiedItemAttr('shipBonusAC2'), skill='Amarr Cruiser')
+
+
+class Effect2200(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredChargeBoost(
+            lambda mod: mod.charge.requiresSkill('Light Missiles') or mod.charge.requiresSkill('Rockets'),
+            'kineticDamage', ship.getModifiedItemAttr('eliteBonusInterdictors1'), skill='Interdictors')
+
+
+class Effect2201(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Small Projectile Turret'),
+                                      'falloff', ship.getModifiedItemAttr('eliteBonusInterdictors1'), skill='Interdictors')
+
+
+class Effect2215(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Small Projectile Turret'),
+                                      'damageMultiplier', ship.getModifiedItemAttr('shipBonusRole7'))
+
+
+class Effect2232(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        for type in ('Gravimetric', 'Magnetometric', 'Radar', 'Ladar'):
+            fit.ship.boostItemAttr('scan%sStrength' % type,
+                                   module.getModifiedItemAttr('scan%sStrengthPercent' % type),
+                                   stackingPenalties=True)
+
+
+class Effect2249(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Drones'),
+                                     'miningAmount', ship.getModifiedItemAttr('shipBonusAC2'), skill='Amarr Cruiser')
+
+
+class Effect2250(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Mining Drone Operation'),
+                                     'miningAmount', ship.getModifiedItemAttr('shipBonusGC2'), skill='Gallente Cruiser')
+
+
+class Effect2251(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemIncrease(lambda mod: mod.item.requiresSkill('Leadership'), 'maxGroupActive',
+                                         src.getModifiedItemAttr('maxGangModules'))
+        fit.modules.filteredItemIncrease(lambda mod: mod.item.requiresSkill('Leadership'), 'maxGroupOnline',
+                                         src.getModifiedItemAttr('maxGangModules'))
+
+
+class Effect2252(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context):
+        fit.modules.filteredItemForce(lambda mod: mod.item.requiresSkill('Cloaking'),
+                                      'moduleReactivationDelay',
+                                      container.getModifiedItemAttr('covertOpsAndReconOpsCloakModuleDelay'))
+
+
+class Effect2253(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemForce(lambda mod: mod.item.group.name == 'Cloaking Device',
+                                      'cloakingTargetingDelay',
+                                      ship.getModifiedItemAttr('covertOpsStealthBomberTargettingDelay'))
+
+
+class Effect2255(EffectDef):
+
+    type = 'active'
+
+
+class Effect2298(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, implant, context):
+        for type in ('Gravimetric', 'Magnetometric', 'Radar', 'Ladar'):
+            sensorType = 'scan{0}Strength'.format(type)
+            sensorBoost = 'scan{0}StrengthPercent'.format(type)
+            if sensorBoost in implant.item.attributes:
+                fit.ship.boostItemAttr(sensorType, implant.getModifiedItemAttr(sensorBoost))
+
+
+class Effect2302(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        for layer, attrPrefix in (('shield', 'shield'), ('armor', 'armor'), ('hull', '')):
+            for damageType in ('Kinetic', 'Thermal', 'Explosive', 'Em'):
+                bonus = '%s%sDamageResonance' % (attrPrefix, damageType)
+                bonus = '%s%s' % (bonus[0].lower(), bonus[1:])
+                booster = '%s%sDamageResonance' % (layer, damageType)
+                fit.ship.multiplyItemAttr(bonus, module.getModifiedItemAttr(booster),
+                                          stackingPenalties=True, penaltyGroup='preMul')
+
+
+class Effect2305(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Energy Neutralizer',
+                                      'energyNeutralizerAmount', ship.getModifiedItemAttr('eliteBonusReconShip2'),
+                                      skill='Recon Ships')
+
+
+class Effect2354(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context):
+        level = container.level if 'skill' in context else 1
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Capital Remote Armor Repair Systems'),
+                                      'capacitorNeed', container.getModifiedItemAttr('capNeedBonus') * level)
+
+
+class Effect2355(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context):
+        level = container.level if 'skill' in context else 1
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Capital Shield Emission Systems'),
+                                      'capacitorNeed', container.getModifiedItemAttr('capNeedBonus') * level)
+
+
+class Effect2356(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, skill, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Capital Capacitor Emission Systems'),
+                                      'capacitorNeed', skill.getModifiedItemAttr('capNeedBonus') * skill.level)
+
+
+class Effect2402(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, skill, context):
+        damageTypes = ('em', 'explosive', 'kinetic', 'thermal')
+        for dmgType in damageTypes:
+            dmgAttr = '{0}Damage'.format(dmgType)
+            fit.modules.filteredItemBoost(
+                lambda mod: mod.item.group.name == 'Super Weapon' and dmgAttr in mod.itemModifiedAttributes,
+                dmgAttr, skill.getModifiedItemAttr('damageMultiplierBonus') * skill.level)
+
+
+class Effect2422(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, implant, context):
+        fit.ship.boostItemAttr('maxVelocity', implant.getModifiedItemAttr('implantBonusVelocity'))
+
+
+class Effect2432(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context):
+        level = container.level if 'skill' in context else 1
+        fit.ship.boostItemAttr('capacitorCapacity', container.getModifiedItemAttr('capacitorCapacityBonus') * level)
+
+
+class Effect2444(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Mining'),
+                                      'cpu', module.getModifiedItemAttr('cpuPenaltyPercent'))
+
+
+class Effect2445(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Ice Harvesting'),
+                                      'cpu', module.getModifiedItemAttr('cpuPenaltyPercent'))
+
+
+class Effect2456(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context):
+        level = container.level if 'skill' in context else 1
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Mining Upgrades'),
+                                      'cpuPenaltyPercent',
+                                      container.getModifiedItemAttr('miningUpgradeCPUReductionBonus') * level)
+
+
+class Effect2465(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        for type in ('Em', 'Explosive', 'Kinetic', 'Thermal'):
+            fit.ship.boostItemAttr('armor{0}DamageResonance'.format(type), ship.getModifiedItemAttr('shipBonusAB'),
+                                   skill='Amarr Battleship')
+
+
+class Effect2479(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Ice Harvesting'),
+                                      'duration', module.getModifiedItemAttr('iceHarvestCycleBonus'))
+
+
+class Effect2485(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, implant, context):
+        fit.ship.boostItemAttr('armorHP', implant.getModifiedItemAttr('armorHpBonus2'))
+
+
+class Effect2488(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, implant, context):
+        fit.ship.boostItemAttr('maxVelocity', implant.getModifiedItemAttr('velocityBonus2'))
+
+
+class Effect2489(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Remote Tracking Computer',
+                                      'falloffEffectiveness', ship.getModifiedItemAttr('shipBonusMC'),
+                                      skill='Minmatar Cruiser')
+
+
+class Effect2490(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Remote Tracking Computer',
+                                      'falloffEffectiveness', ship.getModifiedItemAttr('shipBonusGC2'),
+                                      skill='Gallente Cruiser')
+
+
+class Effect2491(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context):
+        level = container.level if 'skill' in context else 1
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Burst Jammer',
+                                      'ecmBurstRange', container.getModifiedItemAttr('rangeSkillBonus') * level,
+                                      stackingPenalties=False if 'skill' in context else True)
+
+
+class Effect2492(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context):
+        level = container.level if 'skill' in context else 1
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Burst Jammer',
+                                      'capacitorNeed', container.getModifiedItemAttr('capNeedBonus') * level)
+
+
+class Effect2503(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Large Hybrid Turret'),
+                                      'trackingSpeed', ship.getModifiedItemAttr('shipBonusGB2'),
+                                      skill='Gallente Battleship')
+
+
+class Effect2504(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Small Hybrid Turret'),
+                                      'trackingSpeed', ship.getModifiedItemAttr('shipBonusGF2'), skill='Gallente Frigate')
+
+
+class Effect2561(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Missile Launcher Operation'),
+                                        'maxVelocity', ship.getModifiedItemAttr('eliteBonusGunship1'),
+                                        skill='Assault Frigates')
+
+
+class Effect2589(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context):
+        level = container.level if 'skill' in context else 1
+        for i in range(5):
+            attr = 'boosterEffectChance{0}'.format(i + 1)
+            fit.boosters.filteredItemBoost(lambda booster: attr in booster.itemModifiedAttributes,
+                                           attr, container.getModifiedItemAttr('boosterChanceBonus') * level)
+
+
+class Effect2602(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.ship.boostItemAttr('shieldEmDamageResonance', ship.getModifiedItemAttr('shipBonus2CB'),
+                               skill='Caldari Battleship')
+
+
+class Effect2603(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.ship.boostItemAttr('shieldExplosiveDamageResonance', ship.getModifiedItemAttr('shipBonus2CB'),
+                               skill='Caldari Battleship')
+
+
+class Effect2604(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.ship.boostItemAttr('shieldKineticDamageResonance', ship.getModifiedItemAttr('shipBonus2CB'),
+                               skill='Caldari Battleship')
+
+
+class Effect2605(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.ship.boostItemAttr('shieldThermalDamageResonance', ship.getModifiedItemAttr('shipBonus2CB'),
+                               skill='Caldari Battleship')
+
+
+class Effect2611(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Small Projectile Turret'),
+                                      'damageMultiplier', ship.getModifiedItemAttr('eliteBonusGunship1'),
+                                      skill='Assault Frigates')
+
+
+class Effect2644(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.ship.boostItemAttr('signatureRadius', module.getModifiedItemAttr('signatureRadiusBonus'), stackingPenalties=True)
+
+
+class Effect2645(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.ship.multiplyItemAttr('scanResolution', module.getModifiedItemAttr('scanResolutionMultiplier'),
+                                  stackingPenalties=True)
+
+
+class Effect2646(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.ship.boostItemAttr('maxTargetRange', module.getModifiedItemAttr('maxTargetRangeBonus'),
+                               stackingPenalties=True)
+
+
+class Effect2647(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Missile Launcher Heavy',
+                                      'speed', ship.getModifiedItemAttr('eliteBonusHeavyGunship2'),
+                                      skill='Heavy Assault Cruisers')
+
+
+class Effect2648(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Missile Launcher Heavy Assault',
+                                      'speed', ship.getModifiedItemAttr('eliteBonusHeavyGunship2'),
+                                      skill='Heavy Assault Cruisers')
+
+
+class Effect2649(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Missile Launcher Rapid Light',
+                                      'speed', ship.getModifiedItemAttr('eliteBonusHeavyGunship2'),
+                                      skill='Heavy Assault Cruisers')
+
+
+class Effect2670(EffectDef):
+
+    type = 'active'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.ship.boostItemAttr('maxTargetRange', module.getModifiedItemAttr('maxTargetRangeBonus'),
+                               stackingPenalties=True)
+        fit.ship.boostItemAttr('scanResolution', module.getModifiedItemAttr('scanResolutionBonus'),
+                               stackingPenalties=True)
+
+        for scanType in ('Gravimetric', 'Magnetometric', 'Radar', 'Ladar'):
+            fit.ship.boostItemAttr(
+                'scan{}Strength'.format(scanType),
+                module.getModifiedItemAttr('scan{}StrengthPercent'.format(scanType)),
+                stackingPenalties=True
+            )
+
+
+class Effect2688(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Energy Weapon',
+                                      'capacitorNeed', module.getModifiedItemAttr('capNeedBonus'))
+
+
+class Effect2689(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Hybrid Weapon',
+                                      'capacitorNeed', module.getModifiedItemAttr('capNeedBonus'))
+
+
+class Effect2690(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Energy Weapon',
+                                      'cpu', module.getModifiedItemAttr('cpuNeedBonus'))
+
+
+class Effect2691(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Hybrid Weapon',
+                                      'cpu', module.getModifiedItemAttr('cpuNeedBonus'))
+
+
+class Effect2693(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Energy Weapon',
+                                      'falloff', module.getModifiedItemAttr('falloffBonus'),
+                                      stackingPenalties=True)
+
+
+class Effect2694(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Hybrid Weapon',
+                                      'falloff', module.getModifiedItemAttr('falloffBonus'),
+                                      stackingPenalties=True)
+
+
+class Effect2695(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Projectile Weapon',
+                                      'falloff', module.getModifiedItemAttr('falloffBonus'),
+                                      stackingPenalties=True)
+
+
+class Effect2696(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Energy Weapon',
+                                      'maxRange', module.getModifiedItemAttr('maxRangeBonus'),
+                                      stackingPenalties=True)
+
+
+class Effect2697(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Hybrid Weapon',
+                                      'maxRange', module.getModifiedItemAttr('maxRangeBonus'),
+                                      stackingPenalties=True)
+
+
+class Effect2698(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Projectile Weapon',
+                                      'maxRange', module.getModifiedItemAttr('maxRangeBonus'),
+                                      stackingPenalties=True)
+
+
+class Effect2706(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Energy Weapon',
+                                      'power', module.getModifiedItemAttr('drawback'))
+
+
+class Effect2707(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Hybrid Weapon',
+                                      'power', module.getModifiedItemAttr('drawback'))
+
+
+class Effect2708(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Projectile Weapon',
+                                      'power', module.getModifiedItemAttr('drawback'))
+
+
+class Effect2712(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.ship.boostItemAttr('armorHP', module.getModifiedItemAttr('drawback'))
+
+
+class Effect2713(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.ship.boostItemAttr('cpuOutput', module.getModifiedItemAttr('drawback'))
+
+
+class Effect2714(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Missile Launcher Operation'),
+                                      'cpu', module.getModifiedItemAttr('drawback'))
+
+
+class Effect2716(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.ship.boostItemAttr('signatureRadius', module.getModifiedItemAttr('drawback'), stackingPenalties=True)
+
+
+class Effect2717(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.ship.boostItemAttr('maxVelocity', module.getModifiedItemAttr('drawback'),
+                               stackingPenalties=True)
+
+
+class Effect2718(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.ship.boostItemAttr('shieldCapacity', module.getModifiedItemAttr('drawback'))
+
+
+class Effect2726(EffectDef):
+
+    type = 'active'
+
+
+class Effect2727(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, skill, context):
+        fit.modules.filteredItemIncrease(lambda mod: mod.item.group.name == 'Gas Cloud Harvester',
+                                         'maxGroupActive', skill.level)
+
+
+class Effect2734(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        for type in ('Gravimetric', 'Ladar', 'Radar', 'Magnetometric'):
+            fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'ECM',
+                                          'scan{0}StrengthBonus'.format(type),
+                                          ship.getModifiedItemAttr('shipBonusCF'), skill='Caldari Frigate')
+
+
+class Effect2735(EffectDef):
+
+    attr = 'boosterArmorHPPenalty'
+    displayName = 'Armor Capacity'
+    type = 'boosterSideEffect'
+
+    @staticmethod
+    def handler(fit, booster, context):
+        fit.ship.boostItemAttr('armorHP', booster.getModifiedItemAttr(attr))
+
+
+class Effect2736(EffectDef):
+
+    attr = 'boosterArmorRepairAmountPenalty'
+    displayName = 'Armor Repair Amount'
+    type = 'boosterSideEffect'
+
+    @staticmethod
+    def handler(fit, booster, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Armor Repair Unit',
+                                      'armorDamageAmount', booster.getModifiedItemAttr(attr))
+
+
+class Effect2737(EffectDef):
+
+    attr = 'boosterShieldCapacityPenalty'
+    displayName = 'Shield Capacity'
+    type = 'boosterSideEffect'
+
+    @staticmethod
+    def handler(fit, booster, context):
+        fit.ship.boostItemAttr('shieldCapacity', booster.getModifiedItemAttr(attr))
+
+
+class Effect2739(EffectDef):
+
+    attr = 'boosterTurretOptimalRangePenalty'
+    displayName = 'Turret Optimal Range'
+    type = 'boosterSideEffect'
+
+    @staticmethod
+    def handler(fit, booster, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Gunnery'),
+                                      'maxRange', booster.getModifiedItemAttr(attr))
+
+
+class Effect2741(EffectDef):
+
+    attr = 'boosterTurretFalloffPenalty'
+    displayName = 'Turret Falloff'
+    type = 'boosterSideEffect'
+
+    @staticmethod
+    def handler(fit, booster, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Gunnery'),
+                                      'falloff', booster.getModifiedItemAttr(attr))
+
+
+class Effect2745(EffectDef):
+
+    attr = 'boosterCapacitorCapacityPenalty'
+    displayName = 'Cap Capacity'
+    type = 'boosterSideEffect'
+
+    @staticmethod
+    def handler(fit, booster, context):
+        fit.ship.boostItemAttr('capacitorCapacity', booster.getModifiedItemAttr(attr))
+
+
+class Effect2746(EffectDef):
+
+    attr = 'boosterMaxVelocityPenalty'
+    displayName = 'Velocity'
+    type = 'boosterSideEffect'
+
+    @staticmethod
+    def handler(fit, booster, context):
+        fit.ship.boostItemAttr('maxVelocity', booster.getModifiedItemAttr(attr))
+
+
+class Effect2747(EffectDef):
+
+    attr = 'boosterTurretTrackingPenalty'
+    displayName = 'Turret Tracking'
+    type = 'boosterSideEffect'
+
+    @staticmethod
+    def handler(fit, booster, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Gunnery'),
+                                      'trackingSpeed', booster.getModifiedItemAttr(attr))
+
+
+class Effect2748(EffectDef):
+
+    attr = 'boosterMissileVelocityPenalty'
+    displayName = 'Missile Velocity'
+    type = 'boosterSideEffect'
+
+    @staticmethod
+    def handler(fit, booster, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Missile Launcher Operation'),
+                                        'maxVelocity', booster.getModifiedItemAttr(attr))
+
+
+class Effect2749(EffectDef):
+
+    attr = 'boosterAOEVelocityPenalty'
+    displayName = 'Missile Explosion Velocity'
+    type = 'boosterSideEffect'
+
+    @staticmethod
+    def handler(fit, booster, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Missile Launcher Operation'),
+                                        'aoeVelocity', booster.getModifiedItemAttr(attr))
+
+
+class Effect2756(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        for type in ('Gravimetric', 'Magnetometric', 'Ladar', 'Radar'):
+            fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'ECM',
+                                          'scan{0}StrengthBonus'.format(type), ship.getModifiedItemAttr('shipBonusCC'),
+                                          skill='Caldari Cruiser')
+
+
+class Effect2757(EffectDef):
+
+    type = 'active'
+
+
+class Effect2760(EffectDef):
+
+    runTime = 'early'
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context):
+        level = container.level if 'skill' in context else 1
+        attrs = ('boosterArmorHPPenalty', 'boosterArmorRepairAmountPenalty')
+        for attr in attrs:
+            fit.boosters.filteredItemBoost(lambda booster: True, attr,
+                                           container.getModifiedItemAttr('boosterAttributeModifier') * level)
+
+
+class Effect2763(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context):
+        level = container.level if 'skill' in context else 1
+        attrs = ('boosterShieldBoostAmountPenalty', 'boosterShieldCapacityPenalty', 'shieldBoostMultiplier')
+        for attr in attrs:
+            # shieldBoostMultiplier can be positive (Blue Pill) and negative value (other boosters)
+            # We're interested in decreasing only side-effects
+            fit.boosters.filteredItemBoost(lambda booster: booster.getModifiedItemAttr(attr) < 0,
+                                           attr, container.getModifiedItemAttr('boosterAttributeModifier') * level)
+
+
+class Effect2766(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context):
+        level = container.level if 'skill' in context else 1
+        attrs = ('boosterCapacitorCapacityPenalty', 'boosterMaxVelocityPenalty')
+        for attr in attrs:
+            fit.boosters.filteredItemBoost(lambda booster: True, attr,
+                                           container.getModifiedItemAttr('boosterAttributeModifier') * level)
+
+
+class Effect2776(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context):
+        level = container.level if 'skill' in context else 1
+        attrs = ('boosterAOEVelocityPenalty', 'boosterMissileAOECloudPenalty', 'boosterMissileVelocityPenalty')
+        for attr in attrs:
+            fit.boosters.filteredItemBoost(lambda booster: True, attr,
+                                           container.getModifiedItemAttr('boosterAttributeModifier') * level)
+
+
+class Effect2778(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context):
+        level = container.level if 'skill' in context else 1
+        attrs = ('boosterTurretFalloffPenalty', 'boosterTurretOptimalRangePenalty', 'boosterTurretTrackingPenalty')
+        for attr in attrs:
+            fit.boosters.filteredItemBoost(lambda booster: True, attr,
+                                           container.getModifiedItemAttr('boosterAttributeModifier') * level)
+
+
+class Effect2791(EffectDef):
+
+    attr = 'boosterMissileAOECloudPenalty'
+    displayName = 'Missile Explosion Radius'
+    type = 'boosterSideEffect'
+
+    @staticmethod
+    def handler(fit, booster, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Missile Launcher Operation'),
+                                        'aoeCloudSize', booster.getModifiedItemAttr(attr))
+
+
+class Effect2792(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        for type in ('kinetic', 'thermal', 'explosive', 'em'):
+            fit.ship.boostItemAttr('armor' + type.capitalize() + 'DamageResonance',
+                                   module.getModifiedItemAttr(type + 'DamageResistanceBonus') or 0,
+                                   stackingPenalties=True)
+
+
+class Effect2794(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context):
+        fit.modules.filteredItemIncrease(lambda mod: mod.item.requiresSkill('Salvaging'),
+                                         'accessDifficultyBonus', container.getModifiedItemAttr('accessDifficultyBonus'),
+                                         position='post')
+
+
+class Effect2795(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        for type in ('kinetic', 'thermal', 'explosive', 'em'):
+            fit.ship.boostItemAttr('shield' + type.capitalize() + 'DamageResonance',
+                                   module.getModifiedItemAttr(type + 'DamageResistanceBonus') or 0,
+                                   stackingPenalties=True)
+
+
+class Effect2796(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.ship.boostItemAttr('mass', module.getModifiedItemAttr('massBonusPercentage'), stackingPenalties=True)
+
+
+class Effect2797(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.modules.filteredItemMultiply(lambda mod: mod.item.group.name == 'Projectile Weapon',
+                                         'speed', module.getModifiedItemAttr('speedMultiplier'),
+                                         stackingPenalties=True)
+
+
+class Effect2798(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.modules.filteredItemMultiply(lambda mod: mod.item.group.name == 'Projectile Weapon',
+                                         'damageMultiplier', module.getModifiedItemAttr('damageMultiplier'),
+                                         stackingPenalties=True)
+
+
+class Effect2799(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.modules.filteredItemMultiply(lambda mod: mod.item.requiresSkill('Missile Launcher Operation'),
+                                         'speed', module.getModifiedItemAttr('speedMultiplier'),
+                                         stackingPenalties=True)
+
+
+class Effect2801(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.modules.filteredItemMultiply(lambda mod: mod.item.group.name == 'Energy Weapon',
+                                         'speed', module.getModifiedItemAttr('speedMultiplier'),
+                                         stackingPenalties=True)
+
+
+class Effect2802(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.modules.filteredItemMultiply(lambda mod: mod.item.group.name == 'Hybrid Weapon',
+                                         'damageMultiplier', module.getModifiedItemAttr('damageMultiplier'),
+                                         stackingPenalties=True)
+
+
+class Effect2803(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.modules.filteredItemMultiply(lambda mod: mod.item.group.name == 'Energy Weapon',
+                                         'damageMultiplier', module.getModifiedItemAttr('damageMultiplier'),
+                                         stackingPenalties=True)
+
+
+class Effect2804(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.modules.filteredItemMultiply(lambda mod: mod.item.group.name == 'Hybrid Weapon',
+                                         'speed', module.getModifiedItemAttr('speedMultiplier'),
+                                         stackingPenalties=True)
+
+
+class Effect2805(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Large Energy Turret'),
+                                      'damageMultiplier', ship.getModifiedItemAttr('shipBonusAB2'),
+                                      skill='Amarr Battleship')
+
+
+class Effect2809(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Heavy Assault Missiles'),
+                                        'maxVelocity', ship.getModifiedItemAttr('shipBonusCC2'), skill='Caldari Cruiser')
+
+
+class Effect2810(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Heavy Assault Missiles'),
+                                        'explosionDelay', ship.getModifiedItemAttr('eliteBonusHeavyGunship1'),
+                                        skill='Heavy Assault Cruisers')
+
+
+class Effect2812(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Burst Jammer',
+                                      'ecmBurstRange', ship.getModifiedItemAttr('shipBonusCB3'), skill='Caldari Battleship')
+
+
+class Effect2837(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.ship.increaseItemAttr('armorHP', module.getModifiedItemAttr('armorHPBonusAdd'))
+
+
+class Effect2847(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context):
+        level = container.level if 'skill' in context else 1
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Gunnery'),
+                                      'trackingSpeed', container.getModifiedItemAttr('trackingSpeedBonus') * level)
+
+
+class Effect2848(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context):
+        fit.modules.filteredItemIncrease(lambda module: module.item.requiresSkill('Archaeology'),
+                                         'accessDifficultyBonus',
+                                         container.getModifiedItemAttr('accessDifficultyBonusModifier'), position='post')
+
+
+class Effect2849(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context):
+        fit.modules.filteredItemIncrease(lambda c: c.item.requiresSkill('Hacking'),
+                                         'accessDifficultyBonus',
+                                         container.getModifiedItemAttr('accessDifficultyBonusModifier'), position='post')
+
+
+class Effect2850(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Propulsion Module',
+                                      'duration', module.getModifiedItemAttr('durationBonus'))
+
+
+class Effect2851(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context):
+        for dmgType in ('em', 'kinetic', 'explosive', 'thermal'):
+            fit.modules.filteredChargeMultiply(lambda mod: mod.charge.requiresSkill('Missile Launcher Operation'),
+                                               '%sDamage' % dmgType,
+                                               container.getModifiedItemAttr('missileDamageMultiplierBonus'),
+                                               stackingPenalties=True)
+
+
+class Effect2853(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.modules.filteredItemBoost(lambda module: module.item.requiresSkill('Cloaking'),
+                                      'cloakingTargetingDelay', module.getModifiedItemAttr('cloakingTargetingDelayBonus'))
+
+
+class Effect2857(EffectDef):
+
+    type = 'active'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.ship.boostItemAttr('maxVelocity', module.getModifiedItemAttr('speedFactor'))
+
+
+class Effect2865(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.ship.boostItemAttr('maxVelocity', module.getModifiedItemAttr('implantBonusVelocity'),
+                               stackingPenalties=True)
+
+
+class Effect2866(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context):
+        level = container.level if 'skill' in context else 1
+        fit.boosters.filteredItemBoost(lambda bst: True, 'boosterDuration',
+                                       container.getModifiedItemAttr('durationBonus') * level)
+
+
+class Effect2867(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Sentry Drone Interfacing'),
+                                     'damageMultiplier', module.getModifiedItemAttr('damageMultiplierBonus'),
+                                     stackingPenalties=True)
+
+
+class Effect2868(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, implant, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Capital Repair Systems'),
+                                      'armorDamageAmount', implant.getModifiedItemAttr('repairBonus'),
+                                      stackingPenalties=True)
+
+
+class Effect2872(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context):
+        fit.modules.filteredChargeMultiply(lambda mod: mod.charge.requiresSkill('Defender Missiles'),
+                                           'maxVelocity', container.getModifiedItemAttr('missileVelocityBonus'))
+
+
+class Effect2881(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, implant, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Cruise Missiles'),
+                                        'emDamage', implant.getModifiedItemAttr('damageMultiplierBonus'))
+
+
+class Effect2882(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Cruise Missiles'),
+                                        'explosiveDamage', container.getModifiedItemAttr('damageMultiplierBonus'))
+
+
+class Effect2883(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Cruise Missiles'),
+                                        'kineticDamage', container.getModifiedItemAttr('damageMultiplierBonus'))
+
+
+class Effect2884(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Cruise Missiles'),
+                                        'thermalDamage', container.getModifiedItemAttr('damageMultiplierBonus'))
+
+
+class Effect2885(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, implant, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Gas Cloud Harvesting'),
+                                      'duration', implant.getModifiedItemAttr('durationBonus'))
+
+
+class Effect2887(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, implant, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Rockets'),
+                                        'emDamage', implant.getModifiedItemAttr('damageMultiplierBonus'))
+
+
+class Effect2888(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Rockets'),
+                                        'explosiveDamage', container.getModifiedItemAttr('damageMultiplierBonus'))
+
+
+class Effect2889(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Rockets'),
+                                        'kineticDamage', container.getModifiedItemAttr('damageMultiplierBonus'))
+
+
+class Effect2890(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Rockets'),
+                                        'thermalDamage', container.getModifiedItemAttr('damageMultiplierBonus'))
+
+
+class Effect2891(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, implant, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Light Missiles'),
+                                        'emDamage', implant.getModifiedItemAttr('damageMultiplierBonus'))
+
+
+class Effect2892(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Light Missiles'),
+                                        'explosiveDamage', container.getModifiedItemAttr('damageMultiplierBonus'))
+
+
+class Effect2893(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Light Missiles'),
+                                        'kineticDamage', container.getModifiedItemAttr('damageMultiplierBonus'))
+
+
+class Effect2894(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Light Missiles'),
+                                        'thermalDamage', container.getModifiedItemAttr('damageMultiplierBonus'))
+
+
+class Effect2899(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, implant, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Heavy Missiles'),
+                                        'emDamage', implant.getModifiedItemAttr('damageMultiplierBonus'))
+
+
+class Effect2900(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Heavy Missiles'),
+                                        'explosiveDamage', container.getModifiedItemAttr('damageMultiplierBonus'))
+
+
+class Effect2901(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Heavy Missiles'),
+                                        'kineticDamage', container.getModifiedItemAttr('damageMultiplierBonus'))
+
+
+class Effect2902(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Heavy Missiles'),
+                                        'thermalDamage', container.getModifiedItemAttr('damageMultiplierBonus'))
+
+
+class Effect2903(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, implant, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Heavy Assault Missiles'),
+                                        'emDamage', implant.getModifiedItemAttr('damageMultiplierBonus'))
+
+
+class Effect2904(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Heavy Assault Missiles'),
+                                        'explosiveDamage', container.getModifiedItemAttr('damageMultiplierBonus'))
+
+
+class Effect2905(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Heavy Assault Missiles'),
+                                        'kineticDamage', container.getModifiedItemAttr('damageMultiplierBonus'))
+
+
+class Effect2906(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Heavy Assault Missiles'),
+                                        'thermalDamage', container.getModifiedItemAttr('damageMultiplierBonus'))
+
+
+class Effect2907(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, implant, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Torpedoes'),
+                                        'emDamage', implant.getModifiedItemAttr('damageMultiplierBonus'))
+
+
+class Effect2908(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Torpedoes'),
+                                        'explosiveDamage', container.getModifiedItemAttr('damageMultiplierBonus'))
+
+
+class Effect2909(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Torpedoes'),
+                                        'kineticDamage', container.getModifiedItemAttr('damageMultiplierBonus'))
+
+
+class Effect2910(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Torpedoes'),
+                                        'thermalDamage', container.getModifiedItemAttr('damageMultiplierBonus'))
+
+
+class Effect2911(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, implant, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Data Miners',
+                                      'duration', implant.getModifiedItemAttr('durationBonus'))
+
+
+class Effect2967(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, skill, context):
+        amount = -skill.getModifiedItemAttr('consumptionQuantityBonus')
+        fit.modules.filteredItemIncrease(lambda mod: mod.item.requiresSkill(skill),
+                                         'consumptionQuantity', amount * skill.level)
+
+
+class Effect2977(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, skill, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Remote Hull Repair Systems'),
+                                      'capacitorNeed', skill.getModifiedItemAttr('capNeedBonus') * skill.level)
+
+
+class Effect2980(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, skill, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Capital Remote Hull Repair Systems'),
+                                      'capacitorNeed', skill.getModifiedItemAttr('capNeedBonus') * skill.level)
+
+
+class Effect2982(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, skill, context):
+        # We need to make sure that the attribute exists, otherwise we add attributes that don't belong.  See #927
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Burst Projector Operation') and
+                                                  mod.item.getAttribute('duration'),
+                                      'duration',
+                                      skill.getModifiedItemAttr('projECMDurationBonus') * skill.level)
+
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Burst Projector Operation') and
+                                                  mod.item.getAttribute('durationECMJammerBurstProjector'),
+                                      'durationECMJammerBurstProjector',
+                                      skill.getModifiedItemAttr('projECMDurationBonus') * skill.level)
+
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Burst Projector Operation') and
+                                                  mod.item.getAttribute('durationTargetIlluminationBurstProjector'),
+                                      'durationTargetIlluminationBurstProjector',
+                                      skill.getModifiedItemAttr('projECMDurationBonus') * skill.level)
+
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Burst Projector Operation') and
+                                                  mod.item.getAttribute('durationSensorDampeningBurstProjector'),
+                                      'durationSensorDampeningBurstProjector',
+                                      skill.getModifiedItemAttr('projECMDurationBonus') * skill.level)
+
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Burst Projector Operation') and
+                                                  mod.item.getAttribute('durationWeaponDisruptionBurstProjector'),
+                                      'durationWeaponDisruptionBurstProjector',
+                                      skill.getModifiedItemAttr('projECMDurationBonus') * skill.level)
+
+
+class Effect3001(EffectDef):
+
+    type = 'overheat'
+
+    @staticmethod
+    def handler(fit, module, context):
+        module.boostItemAttr('speed', module.getModifiedItemAttr('overloadRofBonus'))
+
+
+class Effect3002(EffectDef):
+
+    type = 'overheat'
+
+    @staticmethod
+    def handler(fit, module, context):
+        module.boostItemAttr('duration', module.getModifiedItemAttr('overloadSelfDurationBonus') or 0)
+
+
+class Effect3024(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Bomb Deployment'),
+                                        'explosiveDamage', ship.getModifiedItemAttr('eliteBonusCovertOps1'),
+                                        skill='Covert Ops')
+
+
+class Effect3025(EffectDef):
+
+    type = 'overheat'
+
+    @staticmethod
+    def handler(fit, module, context):
+        module.boostItemAttr('damageMultiplier', module.getModifiedItemAttr('overloadDamageModifier'))
+
+
+class Effect3026(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Bomb Deployment'),
+                                        'kineticDamage', ship.getModifiedItemAttr('eliteBonusCovertOps1'),
+                                        skill='Covert Ops')
+
+
+class Effect3027(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Bomb Deployment'),
+                                        'thermalDamage', ship.getModifiedItemAttr('eliteBonusCovertOps1'),
+                                        skill='Covert Ops')
+
+
+class Effect3028(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Bomb Deployment'),
+                                        'emDamage', ship.getModifiedItemAttr('eliteBonusCovertOps1'), skill='Covert Ops')
+
+
+class Effect3029(EffectDef):
+
+    type = 'overheat'
+
+    @staticmethod
+    def handler(fit, module, context):
+        module.boostItemAttr('emDamageResistanceBonus', module.getModifiedItemAttr('overloadHardeningBonus'))
+
+
+class Effect3030(EffectDef):
+
+    type = 'overheat'
+
+    @staticmethod
+    def handler(fit, module, context):
+        module.boostItemAttr('thermalDamageResistanceBonus', module.getModifiedItemAttr('overloadHardeningBonus'))
+
+
+class Effect3031(EffectDef):
+
+    type = 'overheat'
+
+    @staticmethod
+    def handler(fit, module, context):
+        module.boostItemAttr('explosiveDamageResistanceBonus', module.getModifiedItemAttr('overloadHardeningBonus'))
+
+
+class Effect3032(EffectDef):
+
+    type = 'overheat'
+
+    @staticmethod
+    def handler(fit, module, context):
+        module.boostItemAttr('kineticDamageResistanceBonus', module.getModifiedItemAttr('overloadHardeningBonus'))
+
+
+class Effect3035(EffectDef):
+
+    type = 'overheat'
+
+    @staticmethod
+    def handler(fit, module, context):
+        for type in ('kinetic', 'thermal', 'explosive', 'em'):
+            module.boostItemAttr('%sDamageResistanceBonus' % type,
+                                 module.getModifiedItemAttr('overloadHardeningBonus'))
+
+
+class Effect3036(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, skill, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Missile Launcher Bomb',
+                                      'moduleReactivationDelay', skill.getModifiedItemAttr('reactivationDelayBonus') * skill.level)
+
+
+class Effect3046(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.ship.multiplyItemAttr('maxVelocity', module.getModifiedItemAttr('maxVelocityModifier'), stackingPenalties=True)
+
+
+class Effect3047(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.ship.multiplyItemAttr('hp', module.getModifiedItemAttr('structureHPMultiplier'))
+
+
+class Effect3061(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Shield Operation'),
+                                      'heatDamage', module.getModifiedItemAttr('heatDamageBonus'))
+
+
+class Effect3169(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Shield Emission Systems'), 'cpu',
+                                      src.getModifiedItemAttr('shieldTransportCpuNeedBonus'))
+
+
+class Effect3172(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        # This is actually level-less bonus, anyway you have to train cruisers 5
+        # and will get 100% (20%/lvl as stated by description)
+        fit.drones.filteredItemBoost(lambda drone: drone.item.group.name == 'Logistic Drone',
+                                     'armorDamageAmount', ship.getModifiedItemAttr('droneArmorDamageAmountBonus'))
+
+
+class Effect3173(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        # This is actually level-less bonus, anyway you have to train cruisers 5
+        # and will get 100% (20%/lvl as stated by description)
+        fit.drones.filteredItemBoost(lambda drone: drone.item.group.name == 'Logistic Drone',
+                                     'shieldBonus', ship.getModifiedItemAttr('droneShieldBonusBonus'))
+
+
+class Effect3174(EffectDef):
+
+    type = 'overheat'
+
+    @staticmethod
+    def handler(fit, module, context):
+        module.boostItemAttr('maxRange', module.getModifiedItemAttr('overloadRangeBonus'),
+                             stackingPenalties=True)
+
+
+class Effect3175(EffectDef):
+
+    type = 'overheat'
+
+    @staticmethod
+    def handler(fit, module, context):
+        module.boostItemAttr('speedFactor', module.getModifiedItemAttr('overloadSpeedFactorBonus'),
+                             stackingPenalties=True)
+
+
+class Effect3182(EffectDef):
+
+    type = 'overheat'
+
+    @staticmethod
+    def handler(fit, module, context):
+        if 'projected' not in context:
+            for scanType in ('Gravimetric', 'Magnetometric', 'Radar', 'Ladar'):
+                module.boostItemAttr('scan{0}StrengthBonus'.format(scanType),
+                                     module.getModifiedItemAttr('overloadECMStrengthBonus'),
+                                     stackingPenalties=True)
+
+
+class Effect3196(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, skill, context):
+        fit.modules.filteredItemBoost(lambda mod: 'heatDamage' in mod.item.attributes, 'heatDamage',
+                                      skill.getModifiedItemAttr('thermodynamicsHeatDamage') * skill.level)
+
+
+class Effect3200(EffectDef):
+
+    type = 'overheat'
+
+    @staticmethod
+    def handler(fit, module, context):
+        module.boostItemAttr('duration', module.getModifiedItemAttr('overloadSelfDurationBonus'))
+        module.boostItemAttr('armorDamageAmount', module.getModifiedItemAttr('overloadArmorDamageAmount'),
+                             stackingPenalties=True)
+
+
+class Effect3201(EffectDef):
+
+    type = 'overheat'
+
+    @staticmethod
+    def handler(fit, module, context):
+        module.boostItemAttr('duration', module.getModifiedItemAttr('overloadSelfDurationBonus'))
+        module.boostItemAttr('shieldBonus', module.getModifiedItemAttr('overloadShieldBonus'), stackingPenalties=True)
+
+
+class Effect3212(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context):
+        level = container.level if 'skill' in context else 1
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('FoF Missiles'),
+                                        'aoeCloudSize', container.getModifiedItemAttr('aoeCloudSizeBonus') * level)
+
+
+class Effect3234(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Rockets'),
+                                        'explosiveDamage', ship.getModifiedItemAttr('shipBonusAF'), skill='Amarr Frigate')
+
+
+class Effect3235(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Rockets'),
+                                        'kineticDamage', ship.getModifiedItemAttr('shipBonusAF'), skill='Amarr Frigate')
+
+
+class Effect3236(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Rockets'),
+                                        'thermalDamage', ship.getModifiedItemAttr('shipBonusAF'), skill='Amarr Frigate')
+
+
+class Effect3237(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Rockets'),
+                                        'emDamage', ship.getModifiedItemAttr('shipBonusAF'), skill='Amarr Frigate')
+
+
+class Effect3241(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.ship.boostItemAttr('armorEmDamageResonance', ship.getModifiedItemAttr('eliteBonusGunship1'),
+                               skill='Assault Frigates')
+
+
+class Effect3242(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.ship.boostItemAttr('armorThermalDamageResonance', ship.getModifiedItemAttr('eliteBonusGunship1'),
+                               skill='Assault Frigates')
+
+
+class Effect3243(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.ship.boostItemAttr('armorKineticDamageResonance', ship.getModifiedItemAttr('eliteBonusGunship1'),
+                               skill='Assault Frigates')
+
+
+class Effect3244(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.ship.boostItemAttr('armorExplosiveDamageResonance', ship.getModifiedItemAttr('eliteBonusGunship1'),
+                               skill='Assault Frigates')
+
+
+class Effect3249(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.ship.boostItemAttr('rechargeRate', ship.getModifiedItemAttr('shipBonus2AF'), skill='Amarr Frigate')
+
+
+class Effect3264(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, skill, context):
+        amount = -skill.getModifiedItemAttr('consumptionQuantityBonus')
+        fit.modules.filteredItemIncrease(lambda mod: mod.item.requiresSkill(skill),
+                                         'consumptionQuantity', amount * skill.level)
+
+
+class Effect3267(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Industrial Reconfiguration'),
+                                      'consumptionQuantity', ship.getModifiedItemAttr('shipBonusORECapital1'),
+                                      skill='Capital Industrial Ships')
+
+
+class Effect3297(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Energy Neutralizer',
+                                      'energyNeutralizerAmount', ship.getModifiedItemAttr('shipBonusAB'),
+                                      skill='Amarr Battleship')
+
+
+class Effect3298(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Energy Neutralizer',
+                                      'energyNeutralizerAmount', ship.getModifiedItemAttr('shipBonusAC'),
+                                      skill='Amarr Cruiser')
+
+
+class Effect3299(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Energy Neutralizer',
+                                      'energyNeutralizerAmount', ship.getModifiedItemAttr('shipBonusAF'),
+                                      skill='Amarr Frigate')
+
+
+class Effect3313(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, skill, context):
+        fit.ship.boostItemAttr('maxJumpClones', skill.getModifiedItemAttr('maxJumpClonesBonus') * skill.level)
+
+
+class Effect3331(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.ship.boostItemAttr('armorHP', ship.getModifiedItemAttr('eliteBonusCommandShips1'), skill='Command Ships')
+
+
+class Effect3335(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.ship.boostItemAttr('armorEmDamageResonance', ship.getModifiedItemAttr('shipBonusMC2'), skill='Minmatar Cruiser')
+
+
+class Effect3336(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.ship.boostItemAttr('armorExplosiveDamageResonance', ship.getModifiedItemAttr('shipBonusMC2'),
+                               skill='Minmatar Cruiser')
+
+
+class Effect3339(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.ship.boostItemAttr('armorKineticDamageResonance', ship.getModifiedItemAttr('shipBonusMC2'),
+                               skill='Minmatar Cruiser')
+
+
+class Effect3340(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.ship.boostItemAttr('armorThermalDamageResonance', ship.getModifiedItemAttr('shipBonusMC2'),
+                               skill='Minmatar Cruiser')
+
+
+class Effect3343(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Projectile Turret'),
+                                      'falloff', ship.getModifiedItemAttr('eliteBonusHeavyInterdictors1'),
+                                      skill='Heavy Interdiction Cruisers')
+
+
+class Effect3355(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Heavy Missiles'),
+                                        'maxVelocity', ship.getModifiedItemAttr('eliteBonusHeavyInterdictors1'),
+                                        skill='Heavy Interdiction Cruisers')
+
+
+class Effect3356(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Heavy Assault Missiles'),
+                                        'maxVelocity', ship.getModifiedItemAttr('eliteBonusHeavyInterdictors1'),
+                                        skill='Heavy Interdiction Cruisers')
+
+
+class Effect3357(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Light Missiles'),
+                                        'maxVelocity', ship.getModifiedItemAttr('eliteBonusHeavyInterdictors1'),
+                                        skill='Heavy Interdiction Cruisers')
+
+
+class Effect3366(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Sensor Dampener',
+                                      'capacitorNeed', ship.getModifiedItemAttr('shipBonusGF'), skill='Gallente Frigate')
+
+
+class Effect3367(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Warp Scrambler',
+                                      'maxRange', ship.getModifiedItemAttr('eliteBonusElectronicAttackShip1'),
+                                      skill='Electronic Attack Ships')
+
+
+class Effect3369(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'ECM',
+                                      'maxRange', ship.getModifiedItemAttr('eliteBonusElectronicAttackShip1'),
+                                      skill='Electronic Attack Ships')
+
+
+class Effect3370(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Stasis Web',
+                                      'maxRange', ship.getModifiedItemAttr('eliteBonusElectronicAttackShip1'),
+                                      skill='Electronic Attack Ships')
+
+
+class Effect3371(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Warp Scrambler',
+                                      'capacitorNeed', ship.getModifiedItemAttr('eliteBonusElectronicAttackShip2'),
+                                      skill='Electronic Attack Ships')
+
+
+class Effect3374(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.ship.boostItemAttr('signatureRadius', ship.getModifiedItemAttr('eliteBonusElectronicAttackShip2'),
+                               skill='Electronic Attack Ships')
+
+
+class Effect3379(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, implant, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Afterburner'),
+                                      'capacitorNeed', implant.getModifiedItemAttr('capNeedBonus'))
+
+
+class Effect3380(EffectDef):
+
+    runTime = 'early'
+    type = 'projected', 'active'
+
+    @staticmethod
+    def handler(fit, module, context):
+
+        if 'projected' in context:
+            fit.ship.increaseItemAttr('warpScrambleStatus', module.getModifiedItemAttr('warpScrambleStrength'))
+            if module.charge is not None and module.charge.ID == 45010:
+                for mod in fit.modules:
+                    if not mod.isEmpty and mod.item.requiresSkill('High Speed Maneuvering') and mod.state > FittingModuleState.ONLINE:
+                        mod.state = FittingModuleState.ONLINE
+                    if not mod.isEmpty and mod.item.requiresSkill('Micro Jump Drive Operation') and mod.state > FittingModuleState.ONLINE:
+                        mod.state = FittingModuleState.ONLINE
+        else:
+            if module.charge is None:
+                fit.ship.boostItemAttr('mass', module.getModifiedItemAttr('massBonusPercentage'))
+                fit.ship.boostItemAttr('signatureRadius', module.getModifiedItemAttr('signatureRadiusBonus'))
+                fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Propulsion Module',
+                                              'speedBoostFactor', module.getModifiedItemAttr('speedBoostFactorBonus'))
+                fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Propulsion Module',
+                                          'speedFactor', module.getModifiedItemAttr('speedFactorBonus'))
+
+            fit.ship.forceItemAttr('disallowAssistance', 1)
+
+
+class Effect3392(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Large Energy Turret'),
+                                      'trackingSpeed', ship.getModifiedItemAttr('eliteBonusBlackOps1'), skill='Black Ops')
+
+
+class Effect3403(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        if fit.extraAttributes['cloaked']:
+            fit.ship.multiplyItemAttr('maxVelocity', ship.getModifiedItemAttr('eliteBonusBlackOps2'), skill='Black Ops')
+
+
+class Effect3406(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.ship.boostItemAttr('maxVelocity', ship.getModifiedItemAttr('eliteBonusBlackOps1'), skill='Black Ops')
+
+
+class Effect3415(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Large Energy Turret'),
+                                      'damageMultiplier', ship.getModifiedItemAttr('eliteBonusViolatorsRole1'))
+
+
+class Effect3416(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Large Hybrid Turret'),
+                                      'damageMultiplier', ship.getModifiedItemAttr('eliteBonusViolatorsRole1'))
+
+
+class Effect3417(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Large Projectile Turret'),
+                                      'damageMultiplier', ship.getModifiedItemAttr('eliteBonusViolatorsRole1'))
+
+
+class Effect3424(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Large Hybrid Turret'),
+                                      'trackingSpeed', ship.getModifiedItemAttr('eliteBonusViolators1'), skill='Marauders')
+
+
+class Effect3425(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Large Projectile Turret'),
+                                      'trackingSpeed', ship.getModifiedItemAttr('eliteBonusViolators1'), skill='Marauders')
+
+
+class Effect3427(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Tractor Beam',
+                                      'maxRange', ship.getModifiedItemAttr('eliteBonusViolatorsRole2'))
+
+
+class Effect3439(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Target Painter',
+                                      'signatureRadiusBonus', ship.getModifiedItemAttr('eliteBonusViolators1'),
+                                      skill='Marauders')
+
+
+class Effect3447(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Large Projectile Turret'),
+                                      'falloff', ship.getModifiedItemAttr('shipBonusMB'), skill='Minmatar Battleship')
+
+
+class Effect3466(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.ship.boostItemAttr('rechargeRate', ship.getModifiedItemAttr('eliteBonusElectronicAttackShip2'),
+                               skill='Electronic Attack Ships')
+
+
+class Effect3467(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.ship.boostItemAttr('capacitorCapacity', ship.getModifiedItemAttr('eliteBonusElectronicAttackShip2'),
+                               skill='Electronic Attack Ships')
+
+
+class Effect3468(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Warp Disrupt Field Generator',
+                                      'warpScrambleRange', ship.getModifiedItemAttr('eliteBonusHeavyInterdictors2'),
+                                      skill='Heavy Interdiction Cruisers')
+
+
+class Effect3473(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Tractor Beam',
+                                      'maxTractorVelocity', ship.getModifiedItemAttr('eliteBonusViolatorsRole3'))
+
+
+class Effect3478(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Large Energy Turret'),
+                                      'damageMultiplier', ship.getModifiedItemAttr('shipBonusRole7'))
+
+
+class Effect3480(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Large Energy Turret'),
+                                      'trackingSpeed', ship.getModifiedItemAttr('shipBonusAB2'), skill='Amarr Battleship')
+
+
+class Effect3483(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Energy Turret'),
+                                      'damageMultiplier', ship.getModifiedItemAttr('shipBonusRole7'))
+
+
+class Effect3484(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Energy Turret'),
+                                      'trackingSpeed', ship.getModifiedItemAttr('shipBonusAC2'), skill='Amarr Cruiser')
+
+
+class Effect3487(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Small Energy Turret'),
+                                      'damageMultiplier', ship.getModifiedItemAttr('shipBonusRole7'))
+
+
+class Effect3489(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Small Energy Turret'),
+                                      'trackingSpeed', ship.getModifiedItemAttr('shipBonus2AF'), skill='Amarr Frigate')
+
+
+class Effect3493(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Cargo Scanner',
+                                      'cargoScanRange', ship.getModifiedItemAttr('cargoScannerRangeBonus'))
+
+
+class Effect3494(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Survey Scanner',
+                                      'surveyScanRange', ship.getModifiedItemAttr('surveyScannerRangeBonus'))
+
+
+class Effect3495(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        groups = ('Stasis Web', 'Warp Scrambler')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name in groups,
+                                      'capacitorNeed', ship.getModifiedItemAttr('eliteBonusInterceptorRole'))
+
+
+class Effect3496(EffectDef):
+
+    runTime = 'early'
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, implant, context):
+        fit.appliedImplants.filteredItemMultiply(lambda mod: mod.item.group.name == 'Cyberimplant',
+                                                 'agilityBonus', implant.getModifiedItemAttr('implantSetThukker'))
+
+
+class Effect3498(EffectDef):
+
+    runTime = 'early'
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, implant, context):
+        fit.appliedImplants.filteredItemMultiply(lambda mod: mod.item.group.name == 'Cyberimplant',
+                                                 'scanStrengthBonus', implant.getModifiedItemAttr('implantSetSisters'))
+
+
+class Effect3499(EffectDef):
+
+    runTime = 'early'
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, implant, context):
+        fit.appliedImplants.filteredItemMultiply(lambda mod: mod.item.group.name == 'Cyberimplant',
+                                                 'boosterAttributeModifier',
+                                                 implant.getModifiedItemAttr('implantSetSyndicate'))
+
+
+class Effect3513(EffectDef):
+
+    runTime = 'early'
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, implant, context):
+        fit.appliedImplants.filteredItemMultiply(lambda mod: mod.item.group.name == 'Cyberimplant',
+                                                 'rangeSkillBonus', implant.getModifiedItemAttr('implantSetMordus'))
+
+
+class Effect3514(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Warp Scrambler',
+                                      'maxRange', ship.getModifiedItemAttr('eliteBonusInterceptor2'), skill='Interceptors')
+
+
+class Effect3519(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, skill, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Bomb Deployment'),
+                                      'cpu', skill.getModifiedItemAttr('cpuNeedBonus') * skill.level)
+
+
+class Effect3520(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, skill, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Bomb Deployment'),
+                                      'power', skill.getModifiedItemAttr('powerNeedBonus') * skill.level)
+
+
+class Effect3526(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context):
+        level = container.level if 'skill' in context else 1
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Cynosural Field Generator',
+                                      'consumptionQuantity',
+                                      container.getModifiedItemAttr('consumptionQuantityBonusPercentage') * level)
+
+
+class Effect3530(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.ship.boostItemAttr('agility', ship.getModifiedItemAttr('eliteBonusBlackOps1'), skill='Black Ops')
+
+
+class Effect3532(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, skill, context):
+        fit.ship.boostItemAttr('jumpDriveConsumptionAmount',
+                               skill.getModifiedItemAttr('consumptionQuantityBonusPercentage') * skill.level)
+
+
+class Effect3561(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context):
+        level = container.level if 'skill' in context else 1
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Weapon Disruptor',
+                                      'trackingSpeedBonus',
+                                      container.getModifiedItemAttr('scanSkillEwStrengthBonus') * level)
+
+
+class Effect3568(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Remote Tracking Computer',
+                                      'maxRangeBonus', ship.getModifiedItemAttr('eliteBonusLogistics1'),
+                                      skill='Logistics Cruisers')
+
+
+class Effect3569(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Remote Tracking Computer',
+                                      'maxRangeBonus', ship.getModifiedItemAttr('eliteBonusLogistics2'),
+                                      skill='Logistics Cruisers')
+
+
+class Effect3570(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Remote Tracking Computer',
+                                      'trackingSpeedBonus', ship.getModifiedItemAttr('eliteBonusLogistics2'),
+                                      skill='Logistics Cruisers')
+
+
+class Effect3571(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Remote Tracking Computer',
+                                      'trackingSpeedBonus', ship.getModifiedItemAttr('eliteBonusLogistics1'),
+                                      skill='Logistics Cruisers')
+
+
+class Effect3586(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context):
+        level = container.level if 'skill' in context else 1
+        penalized = False if 'skill' in context else True
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Sensor Dampener',
+                                      'scanResolutionBonus',
+                                      container.getModifiedItemAttr('scanSkillEwStrengthBonus') * level,
+                                      stackingPenalties=penalized)
+
+
+class Effect3587(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Sensor Dampener',
+                                      'maxTargetRangeBonus', ship.getModifiedItemAttr('shipBonusGC2'),
+                                      skill='Gallente Cruiser')
+
+
+class Effect3588(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Sensor Dampener',
+                                      'maxTargetRangeBonus', ship.getModifiedItemAttr('shipBonusGF2'),
+                                      skill='Gallente Frigate')
+
+
+class Effect3589(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Sensor Dampener',
+                                      'scanResolutionBonus', ship.getModifiedItemAttr('shipBonusGF2'),
+                                      skill='Gallente Frigate')
+
+
+class Effect3590(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Sensor Dampener',
+                                      'scanResolutionBonus', ship.getModifiedItemAttr('shipBonusGC2'),
+                                      skill='Gallente Cruiser')
+
+
+class Effect3591(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context):
+        level = container.level if 'skill' in context else 1
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Sensor Dampener',
+                                      'maxTargetRangeBonus',
+                                      container.getModifiedItemAttr('scanSkillEwStrengthBonus') * level)
+
+
+class Effect3592(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.ship.boostItemAttr('hp', ship.getModifiedItemAttr('eliteBonusJumpFreighter1'), skill='Jump Freighters')
+
+
+class Effect3593(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.ship.boostItemAttr('jumpDriveConsumptionAmount', ship.getModifiedItemAttr('eliteBonusJumpFreighter2'),
+                               skill='Jump Freighters')
+
+
+class Effect3597(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        module.boostItemAttr('scanResolutionBonus', module.getModifiedChargeAttr('scanResolutionBonusBonus'))
+
+
+class Effect3598(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        module.boostItemAttr('maxTargetRangeBonus', module.getModifiedChargeAttr('maxTargetRangeBonusBonus'))
+
+
+class Effect3599(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        module.boostItemAttr('trackingSpeedBonus', module.getModifiedChargeAttr('trackingSpeedBonusBonus'))
+
+
+class Effect3600(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        module.boostItemAttr('maxRangeBonus', module.getModifiedChargeAttr('maxRangeBonusBonus'))
+
+
+class Effect3601(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        module.forceItemAttr('disallowInEmpireSpace', module.getModifiedChargeAttr('disallowInEmpireSpace'))
+
+
+class Effect3602(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        module.boostItemAttr('duration', module.getModifiedChargeAttr('durationBonus'))
+
+
+class Effect3617(EffectDef):
+
+    runTime = 'early'
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        module.boostItemAttr('signatureRadiusBonus', module.getModifiedChargeAttr('signatureRadiusBonusBonus'))
+
+
+class Effect3618(EffectDef):
+
+    runTime = 'early'
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        module.boostItemAttr('massBonusPercentage', module.getModifiedChargeAttr('massBonusPercentageBonus'))
+
+
+class Effect3619(EffectDef):
+
+    runTime = 'early'
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        module.boostItemAttr('speedBoostFactorBonus', module.getModifiedChargeAttr('speedBoostFactorBonusBonus'))
+
+
+class Effect3620(EffectDef):
+
+    runTime = 'early'
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        module.boostItemAttr('speedFactorBonus', module.getModifiedChargeAttr('speedFactorBonusBonus'))
+
+
+class Effect3648(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        module.boostItemAttr('warpScrambleRange', module.getModifiedChargeAttr('warpScrambleRangeBonus'))
+
+
+class Effect3649(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Large Energy Turret'),
+                                      'damageMultiplier', ship.getModifiedItemAttr('eliteBonusViolators1'),
+                                      skill='Marauders')
+
+
+class Effect3650(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, implant, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Sensor Dampener',
+                                      'maxRange', implant.getModifiedItemAttr('rangeSkillBonus'))
+
+
+class Effect3651(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, implant, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Target Painter',
+                                      'maxRange', implant.getModifiedItemAttr('rangeSkillBonus'))
+
+
+class Effect3652(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, implant, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Weapon Disruptor',
+                                      'maxRange', implant.getModifiedItemAttr('rangeSkillBonus'))
+
+
+class Effect3653(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, implant, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Burst Projectors',
+                                      'maxRange', implant.getModifiedItemAttr('rangeSkillBonus'))
+
+
+class Effect3655(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Gunnery'),
+                                      'maxRange', module.getModifiedItemAttr('maxRangeBonus'),
+                                      stackingPenalties=True)
+
+
+class Effect3656(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Gunnery'),
+                                      'trackingSpeed', module.getModifiedItemAttr('trackingSpeedBonus'),
+                                      stackingPenalties=True)
+
+
+class Effect3657(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.ship.boostItemAttr('scanResolution', module.getModifiedItemAttr('scanResolutionBonus'),
+                               stackingPenalties=True)
+
+
+class Effect3659(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.ship.boostItemAttr('maxTargetRange', module.getModifiedItemAttr('maxTargetRangeBonus'),
+                               stackingPenalties=True)
+
+
+class Effect3660(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.ship.increaseItemAttr('maxLockedTargets', module.getModifiedItemAttr('maxLockedTargetsBonus'))
+
+
+class Effect3668(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, implant, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Mining Laser',
+                                      'maxRange', implant.getModifiedItemAttr('maxRangeBonus'))
+
+
+class Effect3669(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, implant, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Frequency Mining Laser',
+                                      'maxRange', implant.getModifiedItemAttr('maxRangeBonus'))
+
+
+class Effect3670(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, implant, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Strip Miner',
+                                      'maxRange', implant.getModifiedItemAttr('maxRangeBonus'))
+
+
+class Effect3671(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, implant, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Gas Cloud Harvester',
+                                      'maxRange', implant.getModifiedItemAttr('maxRangeBonus'))
+
+
+class Effect3672(EffectDef):
+
+    runTime = 'early'
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, implant, context):
+        fit.appliedImplants.filteredItemMultiply(lambda mod: mod.item.group.name == 'Cyberimplant',
+                                                 'maxRangeBonus', implant.getModifiedItemAttr('implantSetORE'))
+
+
+class Effect3677(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Large Energy Turret'),
+                                      'maxRange', ship.getModifiedItemAttr('shipBonusAB2'), skill='Amarr Battleship')
+
+
+class Effect3678(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.ship.boostItemAttr('shieldCapacity', ship.getModifiedItemAttr('eliteBonusJumpFreighter1'),
+                               skill='Jump Freighters')
+
+
+class Effect3679(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.ship.boostItemAttr('armorHP', ship.getModifiedItemAttr('eliteBonusJumpFreighter1'), skill='Jump Freighters')
+
+
+class Effect3680(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.ship.boostItemAttr('agility', ship.getModifiedItemAttr('freighterBonusC1'), skill='Caldari Freighter')
+
+
+class Effect3681(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.ship.boostItemAttr('agility', ship.getModifiedItemAttr('freighterBonusM1'), skill='Minmatar Freighter')
+
+
+class Effect3682(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.ship.boostItemAttr('agility', ship.getModifiedItemAttr('freighterBonusG1'), skill='Gallente Freighter')
+
+
+class Effect3683(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.ship.boostItemAttr('agility', ship.getModifiedItemAttr('freighterBonusA1'), skill='Amarr Freighter')
+
+
+class Effect3686(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        module.boostItemAttr('falloffBonus', module.getModifiedChargeAttr('falloffBonusBonus'))
+
+
+class Effect3703(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        groups = ('Missile Launcher Rapid Light', 'Missile Launcher Heavy', 'Missile Launcher Heavy Assault')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name in groups,
+                                      'speed', ship.getModifiedItemAttr('shipBonusMC2'), skill='Minmatar Cruiser')
+
+
+class Effect3705(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Hybrid Turret'),
+                                      'speed', ship.getModifiedItemAttr('shipBonusGC2'), skill='Gallente Cruiser')
+
+
+class Effect3706(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Projectile Turret'),
+                                      'trackingSpeed', ship.getModifiedItemAttr('shipBonusMC2'), skill='Minmatar Cruiser')
+
+
+class Effect3726(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.ship.boostItemAttr('agility', module.getModifiedItemAttr('agilityBonus'), stackingPenalties=True)
+
+
+class Effect3727(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.ship.boostItemAttr('maxVelocity', module.getModifiedItemAttr('implantBonusVelocity'),
+                               stackingPenalties=True)
+
+
+class Effect3739(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Tractor Beam', 'maxRange',
+                                      src.getModifiedItemAttr('roleBonusTractorBeamRange'))
+
+
+class Effect3740(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Tractor Beam', 'maxTractorVelocity',
+                                      ship.getModifiedItemAttr('roleBonusTractorBeamVelocity'))
+
+
+class Effect3742(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.ship.boostItemAttr('specialOreHoldCapacity',
+                               src.getModifiedItemAttr('shipBonusICS1'),
+                               skill='Industrial Command Ships')
+
+        fit.ship.boostItemAttr('capacity',
+                               src.getModifiedItemAttr('shipBonusICS1'),
+                               skill='Industrial Command Ships')
+
+
+class Effect3744(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Mining Foreman'), 'warfareBuff4Value',
+                                      src.getModifiedItemAttr('shipBonusICS2'), skill='Industrial Command Ships')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Mining Foreman'), 'warfareBuff1Value',
+                                      src.getModifiedItemAttr('shipBonusICS2'), skill='Industrial Command Ships')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Mining Foreman'), 'buffDuration',
+                                      src.getModifiedItemAttr('shipBonusICS2'), skill='Industrial Command Ships')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Mining Foreman'), 'warfareBuff3Value',
+                                      src.getModifiedItemAttr('shipBonusICS2'), skill='Industrial Command Ships')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Mining Foreman'), 'warfareBuff2Value',
+                                      src.getModifiedItemAttr('shipBonusICS2'), skill='Industrial Command Ships')
+
+
+class Effect3745(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Survey Scanner', 'surveyScanRange',
+                                      src.getModifiedItemAttr('roleBonusSurveyScannerRange'))
+
+
+class Effect3765(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemMultiply(lambda mod: mod.item.group.name == 'Missile Launcher Torpedo',
+                                         'power', ship.getModifiedItemAttr('stealthBomberLauncherPower'))
+
+
+class Effect3766(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('High Speed Maneuvering'),
+                                      'signatureRadiusBonus', ship.getModifiedItemAttr('eliteBonusInterceptor'),
+                                      skill='Interceptors')
+
+
+class Effect3767(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Heavy Missiles'),
+                                        'aoeVelocity', ship.getModifiedItemAttr('eliteBonusCommandShips2'),
+                                        skill='Command Ships')
+
+
+class Effect3771(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.ship.increaseItemAttr('armorHP', module.getModifiedItemAttr('armorHPBonusAdd') or 0)
+
+
+class Effect3773(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.ship.increaseItemAttr('turretSlotsLeft', module.getModifiedItemAttr('turretHardPointModifier'))
+        fit.ship.increaseItemAttr('launcherSlotsLeft', module.getModifiedItemAttr('launcherHardPointModifier'))
+
+
+class Effect3774(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.ship.increaseItemAttr('hiSlots', module.getModifiedItemAttr('hiSlotModifier'))
+        fit.ship.increaseItemAttr('medSlots', module.getModifiedItemAttr('medSlotModifier'))
+        fit.ship.increaseItemAttr('lowSlots', module.getModifiedItemAttr('lowSlotModifier'))
+
+
+class Effect3782(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.ship.increaseItemAttr('powerOutput', module.getModifiedItemAttr('powerOutput'))
+
+
+class Effect3783(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.ship.increaseItemAttr('cpuOutput', module.getModifiedItemAttr('cpuOutput'))
+
+
+class Effect3797(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.ship.increaseItemAttr('droneBandwidth', module.getModifiedItemAttr('droneBandwidth'))
+
+
+class Effect3799(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.ship.increaseItemAttr('droneCapacity', module.getModifiedItemAttr('droneCapacity'))
+
+
+class Effect3807(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.ship.increaseItemAttr('maxTargetRange', module.getModifiedItemAttr('maxTargetRange'))
+
+
+class Effect3808(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.ship.increaseItemAttr('signatureRadius', module.getModifiedItemAttr('signatureRadius'))
+
+
+class Effect3810(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, subsystem, context):
+        fit.ship.increaseItemAttr('capacity', subsystem.getModifiedItemAttr('cargoCapacityAdd') or 0)
+
+
+class Effect3811(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.ship.increaseItemAttr('capacitorCapacity', module.getModifiedItemAttr('capacitorCapacity') or 0)
+
+
+class Effect3831(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.ship.increaseItemAttr('shieldCapacity', module.getModifiedItemAttr('shieldCapacity'))
+
+
+class Effect3857(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.ship.boostItemAttr('maxVelocity', module.getModifiedItemAttr('subsystemBonusAmarrPropulsion'),
+                               skill='Amarr Propulsion Systems')
+
+
+class Effect3859(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.ship.boostItemAttr('maxVelocity', src.getModifiedItemAttr('subsystemBonusCaldariPropulsion'),
+                               skill='Caldari Propulsion Systems')
+
+
+class Effect3860(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.ship.boostItemAttr('maxVelocity', module.getModifiedItemAttr('subsystemBonusMinmatarPropulsion'),
+                               skill='Minmatar Propulsion Systems')
+
+
+class Effect3861(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Afterburner'),
+                                      'speedFactor', module.getModifiedItemAttr('subsystemBonusMinmatarPropulsion'),
+                                      skill='Minmatar Propulsion Systems')
+
+
+class Effect3863(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Afterburner'),
+                                      'speedFactor', module.getModifiedItemAttr('subsystemBonusCaldariPropulsion'),
+                                      skill='Caldari Propulsion Systems')
+
+
+class Effect3864(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Afterburner'),
+                                      'speedFactor', module.getModifiedItemAttr('subsystemBonusAmarrPropulsion'),
+                                      skill='Amarr Propulsion Systems')
+
+
+class Effect3865(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.ship.boostItemAttr('agility', src.getModifiedItemAttr('subsystemBonusAmarrPropulsion2'),
+                               skill='Amarr Propulsion Systems')
+
+
+class Effect3866(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.ship.boostItemAttr('agility', src.getModifiedItemAttr('subsystemBonusCaldariPropulsion2'),
+                               skill='Caldari Propulsion Systems')
+
+
+class Effect3867(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.ship.boostItemAttr('agility', src.getModifiedItemAttr('subsystemBonusGallentePropulsion2'),
+                               skill='Gallente Propulsion Systems')
+
+
+class Effect3868(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.ship.boostItemAttr('agility', src.getModifiedItemAttr('subsystemBonusMinmatarPropulsion2'),
+                               skill='Minmatar Propulsion Systems')
+
+
+class Effect3869(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('High Speed Maneuvering'),
+                                      'signatureRadiusBonus', src.getModifiedItemAttr('subsystemBonusMinmatarPropulsion2'),
+                                      skill='Minmatar Propulsion Systems')
+
+
+class Effect3872(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('High Speed Maneuvering'),
+                                      'signatureRadiusBonus', src.getModifiedItemAttr('subsystemBonusAmarrPropulsion2'),
+                                      skill='Amarr Propulsion Systems')
+
+
+class Effect3875(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Propulsion Module',
+                                      'capacitorNeed', module.getModifiedItemAttr('subsystemBonusGallentePropulsion'),
+                                      skill='Gallente Propulsion Systems')
+
+
+class Effect3893(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.ship.boostItemAttr('scanLadarStrength', src.getModifiedItemAttr('subsystemBonusMinmatarCore'),
+                               skill='Minmatar Core Systems')
+
+
+class Effect3895(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.ship.boostItemAttr('scanMagnetometricStrength', src.getModifiedItemAttr('subsystemBonusGallenteCore'),
+                               skill='Gallente Core Systems')
+
+
+class Effect3897(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.ship.boostItemAttr('scanGravimetricStrength', src.getModifiedItemAttr('subsystemBonusCaldariCore'), skill='Caldari Core Systems')
+
+
+class Effect3900(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.ship.boostItemAttr('scanRadarStrength', src.getModifiedItemAttr('subsystemBonusAmarrCore'),
+                               skill='Amarr Core Systems')
+
+
+class Effect3959(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Repair Systems'),
+                                      'armorDamageAmount', module.getModifiedItemAttr('subsystemBonusAmarrDefensive'),
+                                      skill='Amarr Defensive Systems')
+
+
+class Effect3961(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Repair Systems'),
+                                      'armorDamageAmount', module.getModifiedItemAttr('subsystemBonusGallenteDefensive'),
+                                      skill='Gallente Defensive Systems')
+
+
+class Effect3962(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Repair Systems'),
+                                      'armorDamageAmount', src.getModifiedItemAttr('subsystemBonusMinmatarDefensive'),
+                                      skill='Minmatar Defensive Systems')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Shield Operation'),
+                                      'shieldBonus', src.getModifiedItemAttr('subsystemBonusMinmatarDefensive'),
+                                      skill='Minmatar Defensive Systems')
+
+
+class Effect3964(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Shield Operation'),
+                                      'shieldBonus', module.getModifiedItemAttr('subsystemBonusCaldariDefensive'),
+                                      skill='Caldari Defensive Systems')
+
+
+class Effect3976(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.ship.boostItemAttr('shieldCapacity', module.getModifiedItemAttr('subsystemBonusCaldariDefensive'),
+                               skill='Caldari Defensive Systems')
+
+
+class Effect3979(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.ship.boostItemAttr('shieldCapacity', src.getModifiedItemAttr('subsystemBonusMinmatarDefensive'),
+                               skill='Minmatar Defensive Systems')
+        fit.ship.boostItemAttr('armorHP', src.getModifiedItemAttr('subsystemBonusMinmatarDefensive'),
+                               skill='Minmatar Defensive Systems')
+
+
+class Effect3980(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.ship.boostItemAttr('armorHP', module.getModifiedItemAttr('subsystemBonusGallenteDefensive'),
+                               skill='Gallente Defensive Systems')
+
+
+class Effect3982(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.ship.boostItemAttr('armorHP', module.getModifiedItemAttr('subsystemBonusAmarrDefensive'),
+                               skill='Amarr Defensive Systems')
+
+
+class Effect3992(EffectDef):
+
+    runTime = 'early'
+    type = ('projected', 'passive')
+
+    @staticmethod
+    def handler(fit, beacon, context):
+        fit.ship.multiplyItemAttr('shieldCapacity', beacon.getModifiedItemAttr('shieldCapacityMultiplier'))
+
+
+class Effect3993(EffectDef):
+
+    runTime = 'early'
+    type = ('projected', 'passive')
+
+    @staticmethod
+    def handler(fit, beacon, context):
+        fit.ship.multiplyItemAttr('maxTargetRange', beacon.getModifiedItemAttr('maxTargetRangeMultiplier'),
+                                  stackingPenalties=True, penaltyGroup='postMul')
+
+
+class Effect3995(EffectDef):
+
+    runTime = 'early'
+    type = ('projected', 'passive')
+
+    @staticmethod
+    def handler(fit, beacon, context):
+        fit.ship.multiplyItemAttr('signatureRadius', beacon.getModifiedItemAttr('signatureRadiusMultiplier'),
+                                  stackingPenalties=True, penaltyGroup='postMul')
+
+
+class Effect3996(EffectDef):
+
+    runTime = 'early'
+    type = ('projected', 'passive')
+
+    @staticmethod
+    def handler(fit, beacon, context):
+        fit.ship.boostItemAttr('armorEmDamageResonance', beacon.getModifiedItemAttr('armorEmDamageResistanceBonus'),
+                               stackingPenalties=True)
+
+
+class Effect3997(EffectDef):
+
+    runTime = 'early'
+    type = ('projected', 'passive')
+
+    @staticmethod
+    def handler(fit, beacon, context):
+        fit.ship.boostItemAttr('armorExplosiveDamageResonance',
+                               beacon.getModifiedItemAttr('armorExplosiveDamageResistanceBonus'),
+                               stackingPenalties=True)
+
+
+class Effect3998(EffectDef):
+
+    runTime = 'early'
+    type = ('projected', 'passive')
+
+    @staticmethod
+    def handler(fit, beacon, context):
+        fit.ship.boostItemAttr('armorKineticDamageResonance',
+                               beacon.getModifiedItemAttr('armorKineticDamageResistanceBonus'),
+                               stackingPenalties=True)
+
+
+class Effect3999(EffectDef):
+
+    runTime = 'early'
+    type = ('projected', 'passive')
+
+    @staticmethod
+    def handler(fit, beacon, context):
+        fit.ship.boostItemAttr('armorThermalDamageResonance',
+                               beacon.getModifiedItemAttr('armorThermalDamageResistanceBonus'),
+                               stackingPenalties=True)
+
+
+class Effect4002(EffectDef):
+
+    runTime = 'early'
+    type = ('projected', 'passive')
+
+    @staticmethod
+    def handler(fit, beacon, context):
+        fit.modules.filteredChargeMultiply(lambda mod: mod.charge.requiresSkill('Missile Launcher Operation'),
+                                           'maxVelocity', beacon.getModifiedItemAttr('missileVelocityMultiplier'),
+                                           stackingPenalties=True, penaltyGroup='postMul')
+
+
+class Effect4003(EffectDef):
+
+    runTime = 'early'
+    type = ('projected', 'passive')
+
+    @staticmethod
+    def handler(fit, beacon, context):
+        fit.ship.multiplyItemAttr('maxVelocity', beacon.getModifiedItemAttr('maxVelocityMultiplier'),
+                                  stackingPenalties=True, penaltyGroup='postMul')
+
+
+class Effect4016(EffectDef):
+
+    runTime = 'early'
+    type = ('projected', 'passive')
+
+    @staticmethod
+    def handler(fit, beacon, context):
+        fit.modules.filteredItemMultiply(lambda mod: mod.item.requiresSkill('Gunnery'),
+                                         'damageMultiplier', beacon.getModifiedItemAttr('damageMultiplierMultiplier'),
+                                         stackingPenalties=True)
+
+
+class Effect4017(EffectDef):
+
+    runTime = 'early'
+    type = ('projected', 'passive')
+
+    @staticmethod
+    def handler(fit, beacon, context):
+        fit.modules.filteredChargeMultiply(lambda mod: mod.charge.requiresSkill('Missile Launcher Operation'),
+                                           'thermalDamage', beacon.getModifiedItemAttr('damageMultiplierMultiplier'),
+                                           stackingPenalties=True, penaltyGroup='postMul')
+
+
+class Effect4018(EffectDef):
+
+    runTime = 'early'
+    type = ('projected', 'passive')
+
+    @staticmethod
+    def handler(fit, beacon, context):
+        fit.modules.filteredChargeMultiply(lambda mod: mod.charge.requiresSkill('Missile Launcher Operation'),
+                                           'emDamage', beacon.getModifiedItemAttr('damageMultiplierMultiplier'),
+                                           stackingPenalties=True, penaltyGroup='postMul')
+
+
+class Effect4019(EffectDef):
+
+    runTime = 'early'
+    type = ('projected', 'passive')
+
+    @staticmethod
+    def handler(fit, beacon, context):
+        fit.modules.filteredChargeMultiply(lambda mod: mod.charge.requiresSkill('Missile Launcher Operation'),
+                                           'explosiveDamage', beacon.getModifiedItemAttr('damageMultiplierMultiplier'),
+                                           stackingPenalties=True, penaltyGroup='postMul')
+
+
+class Effect4020(EffectDef):
+
+    runTime = 'early'
+    type = ('projected', 'passive')
+
+    @staticmethod
+    def handler(fit, beacon, context):
+        fit.modules.filteredChargeMultiply(lambda mod: mod.charge.requiresSkill('Missile Launcher Operation'),
+                                           'kineticDamage', beacon.getModifiedItemAttr('damageMultiplierMultiplier'),
+                                           stackingPenalties=True, penaltyGroup='postMul')
+
+
+class Effect4021(EffectDef):
+
+    runTime = 'early'
+    type = ('projected', 'passive')
+
+    @staticmethod
+    def handler(fit, beacon, context):
+        fit.drones.filteredItemMultiply(lambda drone: drone.item.requiresSkill('Drones'),
+                                        'damageMultiplier', beacon.getModifiedItemAttr('damageMultiplierMultiplier'),
+                                        stackingPenalties=True, penaltyGroup='postMul')
+
+
+class Effect4022(EffectDef):
+
+    runTime = 'early'
+    type = ('projected', 'passive')
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.modules.filteredItemMultiply(lambda mod: mod.item.requiresSkill('Gunnery'),
+                                         'trackingSpeed', module.getModifiedItemAttr('trackingSpeedMultiplier'),
+                                         stackingPenalties=True, penaltyGroup='postMul')
+
+
+class Effect4023(EffectDef):
+
+    runTime = 'early'
+    type = ('projected', 'passive')
+
+    @staticmethod
+    def handler(fit, beacon, context):
+        fit.modules.filteredChargeMultiply(lambda mod: mod.charge.requiresSkill('Missile Launcher Operation'),
+                                           'aoeVelocity', beacon.getModifiedItemAttr('aoeVelocityMultiplier'))
+
+
+class Effect4033(EffectDef):
+
+    runTime = 'early'
+    type = ('projected', 'passive')
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.modules.filteredItemMultiply(lambda mod: 'heatDamage' in mod.itemModifiedAttributes,
+                                         'heatDamage', module.getModifiedItemAttr('heatDamageMultiplier'))
+
+
+class Effect4034(EffectDef):
+
+    runTime = 'early'
+    type = ('projected', 'passive')
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.modules.filteredItemMultiply(lambda mod: 'overloadArmorDamageAmount' in mod.itemModifiedAttributes,
+                                         'overloadArmorDamageAmount', module.getModifiedItemAttr('overloadBonusMultiplier'))
+
+
+class Effect4035(EffectDef):
+
+    runTime = 'early'
+    type = ('projected', 'passive')
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.modules.filteredItemMultiply(lambda mod: 'overloadDamageModifier' in mod.itemModifiedAttributes,
+                                         'overloadDamageModifier', module.getModifiedItemAttr('overloadBonusMultiplier'))
+
+
+class Effect4036(EffectDef):
+
+    runTime = 'early'
+    type = ('projected', 'passive')
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.modules.filteredItemMultiply(lambda mod: 'overloadDurationBonus' in mod.itemModifiedAttributes,
+                                         'overloadDurationBonus', module.getModifiedItemAttr('overloadBonusMultiplier'))
+
+
+class Effect4037(EffectDef):
+
+    runTime = 'early'
+    type = ('projected', 'passive')
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.modules.filteredItemMultiply(lambda mod: 'overloadECCMStrenghtBonus' in mod.itemModifiedAttributes,
+                                         'overloadECCMStrenghtBonus', module.getModifiedItemAttr('overloadBonusMultiplier'))
+
+
+class Effect4038(EffectDef):
+
+    runTime = 'early'
+    type = ('projected', 'passive')
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.modules.filteredItemMultiply(lambda mod: 'overloadECMStrenghtBonus' in mod.itemModifiedAttributes,
+                                         'overloadECMStrenghtBonus', module.getModifiedItemAttr('overloadBonusMultiplier'))
+
+
+class Effect4039(EffectDef):
+
+    runTime = 'early'
+    type = ('projected', 'passive')
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.modules.filteredItemMultiply(lambda mod: 'overloadHardeningBonus' in mod.itemModifiedAttributes,
+                                         'overloadHardeningBonus', module.getModifiedItemAttr('overloadBonusMultiplier'))
+
+
+class Effect4040(EffectDef):
+
+    runTime = 'early'
+    type = ('projected', 'passive')
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.modules.filteredItemMultiply(lambda mod: 'overloadRangeBonus' in mod.itemModifiedAttributes,
+                                         'overloadRangeBonus', module.getModifiedItemAttr('overloadBonusMultiplier'))
+
+
+class Effect4041(EffectDef):
+
+    runTime = 'early'
+    type = ('projected', 'passive')
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.modules.filteredItemMultiply(lambda mod: 'overloadRofBonus' in mod.itemModifiedAttributes,
+                                         'overloadRofBonus', module.getModifiedItemAttr('overloadBonusMultiplier'))
+
+
+class Effect4042(EffectDef):
+
+    runTime = 'early'
+    type = ('projected', 'passive')
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.modules.filteredItemMultiply(lambda mod: 'overloadSelfDurationBonus' in mod.itemModifiedAttributes,
+                                         'overloadSelfDurationBonus', module.getModifiedItemAttr('overloadBonusMultiplier'))
+
+
+class Effect4043(EffectDef):
+
+    runTime = 'early'
+    type = ('projected', 'passive')
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.modules.filteredItemMultiply(lambda mod: 'overloadShieldBonus' in mod.itemModifiedAttributes,
+                                         'overloadShieldBonus', module.getModifiedItemAttr('overloadBonusMultiplier'))
+
+
+class Effect4044(EffectDef):
+
+    runTime = 'early'
+    type = ('projected', 'passive')
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.modules.filteredItemMultiply(lambda mod: 'overloadSpeedFactorBonus' in mod.itemModifiedAttributes,
+                                         'overloadSpeedFactorBonus', module.getModifiedItemAttr('overloadBonusMultiplier'))
+
+
+class Effect4045(EffectDef):
+
+    runTime = 'early'
+    type = ('projected', 'passive')
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.modules.filteredItemMultiply(lambda mod: mod.item.group.name == 'Smart Bomb',
+                                         'empFieldRange', module.getModifiedItemAttr('empFieldRangeMultiplier'))
+
+
+class Effect4046(EffectDef):
+
+    runTime = 'early'
+    type = ('projected', 'passive')
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.modules.filteredItemMultiply(lambda mod: mod.item.group.name == 'Smart Bomb',
+                                         'emDamage', module.getModifiedItemAttr('smartbombDamageMultiplier'))
+
+
+class Effect4047(EffectDef):
+
+    runTime = 'early'
+    type = ('projected', 'passive')
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.modules.filteredItemMultiply(lambda mod: mod.item.group.name == 'Smart Bomb',
+                                         'thermalDamage', module.getModifiedItemAttr('smartbombDamageMultiplier'))
+
+
+class Effect4048(EffectDef):
+
+    runTime = 'early'
+    type = ('projected', 'passive')
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.modules.filteredItemMultiply(lambda mod: mod.item.group.name == 'Smart Bomb',
+                                         'kineticDamage', module.getModifiedItemAttr('smartbombDamageMultiplier'))
+
+
+class Effect4049(EffectDef):
+
+    runTime = 'early'
+    type = ('projected', 'passive')
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.modules.filteredItemMultiply(lambda mod: mod.item.group.name == 'Smart Bomb',
+                                         'explosiveDamage', module.getModifiedItemAttr('smartbombDamageMultiplier'))
+
+
+class Effect4054(EffectDef):
+
+    runTime = 'early'
+    type = ('projected', 'passive')
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.modules.filteredItemMultiply(lambda mod: mod.item.requiresSkill('Small Energy Turret'),
+                                         'damageMultiplier', module.getModifiedItemAttr('smallWeaponDamageMultiplier'),
+                                         stackingPenalties=True)
+
+
+class Effect4055(EffectDef):
+
+    runTime = 'early'
+    type = ('projected', 'passive')
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.modules.filteredItemMultiply(lambda mod: mod.item.requiresSkill('Small Projectile Turret'),
+                                         'damageMultiplier', module.getModifiedItemAttr('smallWeaponDamageMultiplier'),
+                                         stackingPenalties=True)
+
+
+class Effect4056(EffectDef):
+
+    runTime = 'early'
+    type = ('projected', 'passive')
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.modules.filteredItemMultiply(lambda mod: mod.item.requiresSkill('Small Hybrid Turret'),
+                                         'damageMultiplier', module.getModifiedItemAttr('smallWeaponDamageMultiplier'),
+                                         stackingPenalties=True)
+
+
+class Effect4057(EffectDef):
+
+    runTime = 'early'
+    type = ('projected', 'passive')
+
+    @staticmethod
+    def handler(fit, beacon, context):
+        fit.modules.filteredChargeMultiply(lambda mod: mod.charge.requiresSkill('Rockets'),
+                                           'emDamage', beacon.getModifiedItemAttr('smallWeaponDamageMultiplier'),
+                                           stackingPenalties=True, penaltyGroup='postMul')
+
+
+class Effect4058(EffectDef):
+
+    runTime = 'early'
+    type = ('projected', 'passive')
+
+    @staticmethod
+    def handler(fit, beacon, context):
+        fit.modules.filteredChargeMultiply(lambda mod: mod.charge.requiresSkill('Rockets'),
+                                           'explosiveDamage', beacon.getModifiedItemAttr('smallWeaponDamageMultiplier'),
+                                           stackingPenalties=True, penaltyGroup='postMul')
+
+
+class Effect4059(EffectDef):
+
+    runTime = 'early'
+    type = ('projected', 'passive')
+
+    @staticmethod
+    def handler(fit, beacon, context):
+        fit.modules.filteredChargeMultiply(lambda mod: mod.charge.requiresSkill('Rockets'),
+                                           'kineticDamage', beacon.getModifiedItemAttr('smallWeaponDamageMultiplier'),
+                                           stackingPenalties=True, penaltyGroup='postMul')
+
+
+class Effect4060(EffectDef):
+
+    runTime = 'early'
+    type = ('projected', 'passive')
+
+    @staticmethod
+    def handler(fit, beacon, context):
+        fit.modules.filteredChargeMultiply(lambda mod: mod.charge.requiresSkill('Rockets'),
+                                           'thermalDamage', beacon.getModifiedItemAttr('smallWeaponDamageMultiplier'),
+                                           stackingPenalties=True, penaltyGroup='postMul')
+
+
+class Effect4061(EffectDef):
+
+    runTime = 'early'
+    type = ('projected', 'passive')
+
+    @staticmethod
+    def handler(fit, beacon, context):
+        fit.modules.filteredChargeMultiply(lambda mod: mod.charge.requiresSkill('Light Missiles'),
+                                           'thermalDamage', beacon.getModifiedItemAttr('smallWeaponDamageMultiplier'),
+                                           stackingPenalties=True, penaltyGroup='postMul')
+
+
+class Effect4062(EffectDef):
+
+    runTime = 'early'
+    type = ('projected', 'passive')
+
+    @staticmethod
+    def handler(fit, beacon, context):
+        fit.modules.filteredChargeMultiply(lambda mod: mod.charge.requiresSkill('Light Missiles'),
+                                           'emDamage', beacon.getModifiedItemAttr('smallWeaponDamageMultiplier'),
+                                           stackingPenalties=True, penaltyGroup='postMul')
+
+
+class Effect4063(EffectDef):
+
+    runTime = 'early'
+    type = ('projected', 'passive')
+
+    @staticmethod
+    def handler(fit, beacon, context):
+        fit.modules.filteredChargeMultiply(lambda mod: mod.charge.requiresSkill('Light Missiles'),
+                                           'explosiveDamage', beacon.getModifiedItemAttr('smallWeaponDamageMultiplier'),
+                                           stackingPenalties=True, penaltyGroup='postMul')
+
+
+class Effect4086(EffectDef):
+
+    runTime = 'early'
+    type = ('projected', 'passive')
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.modules.filteredItemMultiply(lambda mod: mod.item.requiresSkill('Repair Systems') or
+                                                     mod.item.requiresSkill('Capital Repair Systems'),
+                                         'armorDamageAmount', module.getModifiedItemAttr('armorDamageAmountMultiplier'),
+                                         stackingPenalties=True, penaltyGroup='postMul')
+
+
+class Effect4088(EffectDef):
+
+    runTime = 'early'
+    type = ('projected', 'passive')
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.modules.filteredItemMultiply(lambda mod: mod.item.requiresSkill('Remote Armor Repair Systems'),
+                                         'armorDamageAmount',
+                                         module.getModifiedItemAttr('armorDamageAmountMultiplierRemote'),
+                                         stackingPenalties=True)
+
+
+class Effect4089(EffectDef):
+
+    runTime = 'early'
+    type = ('projected', 'passive')
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.modules.filteredItemMultiply(lambda mod: mod.item.requiresSkill('Shield Emission Systems'),
+                                         'shieldBonus', module.getModifiedItemAttr('shieldBonusMultiplierRemote'),
+                                         stackingPenalties=True, penaltyGroup='postMul')
+
+
+class Effect4090(EffectDef):
+
+    runTime = 'early'
+    type = ('projected', 'passive')
+
+    @staticmethod
+    def handler(fit, beacon, context):
+        fit.ship.multiplyItemAttr('capacitorCapacity', beacon.getModifiedItemAttr('capacitorCapacityMultiplierSystem'))
+
+
+class Effect4091(EffectDef):
+
+    runTime = 'early'
+    type = ('projected', 'passive')
+
+    @staticmethod
+    def handler(fit, beacon, context):
+        fit.ship.multiplyItemAttr('rechargeRate', beacon.getModifiedItemAttr('rechargeRateMultiplier'))
+
+
+class Effect4093(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Energy Turret'),
+                                      'damageMultiplier', module.getModifiedItemAttr('subsystemBonusAmarrOffensive'),
+                                      skill='Amarr Offensive Systems')
+
+
+class Effect4104(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Hybrid Turret'),
+                                      'maxRange', module.getModifiedItemAttr('subsystemBonusCaldariOffensive'),
+                                      skill='Caldari Offensive Systems')
+
+
+class Effect4106(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Hybrid Turret'),
+                                      'falloff', module.getModifiedItemAttr('subsystemBonusGallenteOffensive'),
+                                      skill='Gallente Offensive Systems')
+
+
+class Effect4114(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Projectile Turret'),
+                                      'falloff', module.getModifiedItemAttr('subsystemBonusMinmatarOffensive'),
+                                      skill='Minmatar Offensive Systems')
+
+
+class Effect4115(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Projectile Turret'),
+                                      'maxRange', module.getModifiedItemAttr('subsystemBonusMinmatarOffensive'),
+                                      skill='Minmatar Offensive Systems')
+
+
+class Effect4122(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        groups = ('Missile Launcher Heavy', 'Missile Launcher Rapid Light', 'Missile Launcher Heavy Assault')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name in groups,
+                                      'speed', src.getModifiedItemAttr('subsystemBonusCaldariOffensive'), skill='Caldari Offensive Systems')
+
+
+class Effect4135(EffectDef):
+
+    runTime = 'early'
+    type = ('projected', 'passive')
+
+    @staticmethod
+    def handler(fit, beacon, context):
+        fit.ship.boostItemAttr('shieldEmDamageResonance', beacon.getModifiedItemAttr('shieldEmDamageResistanceBonus'),
+                               stackingPenalties=True)
+
+
+class Effect4136(EffectDef):
+
+    runTime = 'early'
+    type = ('projected', 'passive')
+
+    @staticmethod
+    def handler(fit, beacon, context):
+        fit.ship.boostItemAttr('shieldExplosiveDamageResonance',
+                               beacon.getModifiedItemAttr('shieldExplosiveDamageResistanceBonus'),
+                               stackingPenalties=True)
+
+
+class Effect4137(EffectDef):
+
+    runTime = 'early'
+    type = ('projected', 'passive')
+
+    @staticmethod
+    def handler(fit, beacon, context):
+        fit.ship.boostItemAttr('shieldKineticDamageResonance',
+                               beacon.getModifiedItemAttr('shieldKineticDamageResistanceBonus'),
+                               stackingPenalties=True)
+
+
+class Effect4138(EffectDef):
+
+    runTime = 'early'
+    type = ('projected', 'passive')
+
+    @staticmethod
+    def handler(fit, beacon, context):
+        fit.ship.boostItemAttr('shieldThermalDamageResonance',
+                               beacon.getModifiedItemAttr('shieldThermalDamageResistanceBonus'),
+                               stackingPenalties=True)
+
+
+class Effect4152(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.modules.filteredItemBoost(lambda mod: True, 'heatDamage',
+                                      module.getModifiedItemAttr('subsystemBonusAmarrCore'),
+                                      skill='Amarr Core Systems')
+
+
+class Effect4153(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.modules.filteredItemBoost(lambda mod: True, 'heatDamage',
+                                      module.getModifiedItemAttr('subsystemBonusCaldariCore'),
+                                      skill='Caldari Core Systems')
+
+
+class Effect4154(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.modules.filteredItemBoost(lambda mod: True, 'heatDamage',
+                                      module.getModifiedItemAttr('subsystemBonusGallenteCore'),
+                                      skill='Gallente Core Systems')
+
+
+class Effect4155(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.modules.filteredItemBoost(lambda mod: True, 'heatDamage',
+                                      module.getModifiedItemAttr('subsystemBonusMinmatarCore'),
+                                      skill='Minmatar Core Systems')
+
+
+class Effect4158(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.ship.boostItemAttr('capacitorCapacity', src.getModifiedItemAttr('subsystemBonusCaldariCore'),
+                               skill='Caldari Core Systems')
+
+
+class Effect4159(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.ship.boostItemAttr('capacitorCapacity', src.getModifiedItemAttr('subsystemBonusAmarrCore'), skill='Amarr Core Systems')
+
+
+class Effect4161(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context):
+        level = container.level if 'skill' in context else 1
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Astrometrics'),
+                                        'baseMaxScanDeviation',
+                                        container.getModifiedItemAttr('maxScanDeviationModifier') * level)
+
+
+class Effect4162(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context):
+        level = container.level if 'skill' in context else 1
+        penalized = False if 'skill' in context or 'implant' in context else True
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Astrometrics'),
+                                        'baseSensorStrength', container.getModifiedItemAttr('scanStrengthBonus') * level,
+                                        stackingPenalties=penalized)
+
+
+class Effect4165(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.group.name == 'Scanner Probe',
+                                        'baseSensorStrength', ship.getModifiedItemAttr('shipBonusCF2'),
+                                        skill='Caldari Frigate')
+
+
+class Effect4166(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.group.name == 'Scanner Probe',
+                                        'baseSensorStrength', ship.getModifiedItemAttr('shipBonusMF2'),
+                                        skill='Minmatar Frigate')
+
+
+class Effect4167(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.group.name == 'Scanner Probe',
+                                        'baseSensorStrength', ship.getModifiedItemAttr('shipBonusGF2'),
+                                        skill='Gallente Frigate')
+
+
+class Effect4168(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.group.name == 'Scanner Probe',
+                                        'baseSensorStrength', ship.getModifiedItemAttr('eliteBonusCovertOps2'),
+                                        skill='Covert Ops')
+
+
+class Effect4187(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: True, 'heatDamage',
+                                      ship.getModifiedItemAttr('shipBonusStrategicCruiserAmarr1'),
+                                      skill='Amarr Strategic Cruiser')
+
+
+class Effect4188(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: True, 'heatDamage',
+                                      ship.getModifiedItemAttr('shipBonusStrategicCruiserCaldari1'),
+                                      skill='Caldari Strategic Cruiser')
+
+
+class Effect4189(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: True, 'heatDamage',
+                                      ship.getModifiedItemAttr('shipBonusStrategicCruiserGallente1'),
+                                      skill='Gallente Strategic Cruiser')
+
+
+class Effect4190(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: True, 'heatDamage',
+                                      ship.getModifiedItemAttr('shipBonusStrategicCruiserMinmatar1'),
+                                      skill='Minmatar Strategic Cruiser')
+
+
+class Effect4215(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Energy Turret'),
+                                      'capacitorNeed', module.getModifiedItemAttr('subsystemBonusAmarrOffensive2'),
+                                      skill='Amarr Offensive Systems')
+
+
+class Effect4216(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Energy Nosferatu', 'powerTransferAmount',
+                                      src.getModifiedItemAttr('subsystemBonusAmarrCore2'), skill='Amarr Core Systems')
+
+
+class Effect4217(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Energy Neutralizer', 'energyNeutralizerAmount',
+                                      src.getModifiedItemAttr('subsystemBonusAmarrCore2'), skill='Amarr Core Systems')
+
+
+class Effect4248(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Light Missiles'),
+                                        'kineticDamage', src.getModifiedItemAttr('subsystemBonusCaldariOffensive2'),
+                                        skill='Caldari Offensive Systems')
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Heavy Missiles'),
+                                        'kineticDamage', src.getModifiedItemAttr('subsystemBonusCaldariOffensive2'),
+                                        skill='Caldari Offensive Systems')
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Heavy Assault Missiles'),
+                                        'kineticDamage', src.getModifiedItemAttr('subsystemBonusCaldariOffensive2'),
+                                        skill='Caldari Offensive Systems')
+
+
+class Effect4250(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill('Drones'),
+                                     'armorHP', src.getModifiedItemAttr('subsystemBonusGallenteOffensive'),
+                                     skill='Gallente Offensive Systems')
+        fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill('Drones'),
+                                     'hp', src.getModifiedItemAttr('subsystemBonusGallenteOffensive'),
+                                     skill='Gallente Offensive Systems')
+        fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill('Drones'),
+                                     'damageMultiplier', src.getModifiedItemAttr('subsystemBonusGallenteOffensive'),
+                                     skill='Gallente Offensive Systems')
+        fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill('Drones'),
+                                     'shieldCapacity', src.getModifiedItemAttr('subsystemBonusGallenteOffensive'),
+                                     skill='Gallente Offensive Systems')
+
+
+class Effect4251(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Projectile Turret'),
+                                      'damageMultiplier', module.getModifiedItemAttr('subsystemBonusMinmatarOffensive2'),
+                                      skill='Minmatar Offensive Systems')
+
+
+class Effect4256(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        groups = ('Missile Launcher Heavy', 'Missile Launcher Rapid Light', 'Missile Launcher Heavy Assault')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name in groups,
+                                      'speed', src.getModifiedItemAttr('subsystemBonusMinmatarOffensive2'),
+                                      skill='Minmatar Offensive Systems')
+
+
+class Effect4264(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.ship.boostItemAttr('rechargeRate', src.getModifiedItemAttr('subsystemBonusMinmatarCore'),
+                               skill='Minmatar Core Systems')
+
+
+class Effect4265(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.ship.boostItemAttr('rechargeRate', src.getModifiedItemAttr('subsystemBonusGallenteCore'),
+                               skill='Gallente Core Systems')
+
+
+class Effect4269(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.ship.boostItemAttr('scanResolution', src.getModifiedItemAttr('subsystemBonusAmarrCore3'),
+                               skill='Amarr Core Systems')
+
+
+class Effect4270(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.ship.boostItemAttr('scanResolution', src.getModifiedItemAttr('subsystemBonusMinmatarCore3'),
+                               skill='Minmatar Core Systems')
+
+
+class Effect4271(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.ship.boostItemAttr('maxTargetRange', src.getModifiedItemAttr('subsystemBonusCaldariCore2'), skill='Caldari Core Systems')
+
+
+class Effect4272(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.ship.boostItemAttr('maxTargetRange', src.getModifiedItemAttr('subsystemBonusGallenteCore2'),
+                               skill='Gallente Core Systems')
+
+
+class Effect4273(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Warp Scrambler', 'maxRange',
+                                      src.getModifiedItemAttr('subsystemBonusGallenteCore2'), skill='Gallente Core Systems')
+
+
+class Effect4274(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Stasis Web',
+                                      'maxRange', src.getModifiedItemAttr('subsystemBonusMinmatarCore2'), skill='Minmatar Core Systems')
+
+
+class Effect4275(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.ship.boostItemAttr('warpSpeedMultiplier', src.getModifiedItemAttr('subsystemBonusCaldariPropulsion2'),
+                               skill='Caldari Propulsion Systems')
+
+
+class Effect4277(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.ship.boostItemAttr('warpCapacitorNeed', src.getModifiedItemAttr('subsystemBonusGallentePropulsion'),
+                               skill='Gallente Propulsion Systems')
+
+
+class Effect4278(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.ship.boostItemAttr('warpSpeedMultiplier', src.getModifiedItemAttr('subsystemBonusGallentePropulsion2'),
+                               skill='Gallente Propulsion Systems')
+
+
+class Effect4280(EffectDef):
+
+    runTime = 'early'
+    type = ('projected', 'passive')
+
+    @staticmethod
+    def handler(fit, beacon, context):
+        fit.ship.multiplyItemAttr('agility', beacon.getModifiedItemAttr('agilityMultiplier'), stackingPenalties=True)
+
+
+class Effect4282(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Hybrid Turret'),
+                                      'damageMultiplier', module.getModifiedItemAttr('subsystemBonusGallenteOffensive2'),
+                                      skill='Gallente Offensive Systems')
+
+
+class Effect4283(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Hybrid Turret'),
+                                      'damageMultiplier', module.getModifiedItemAttr('subsystemBonusCaldariOffensive2'),
+                                      skill='Caldari Offensive Systems')
+
+
+class Effect4286(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Remote Armor Repair Systems'), 'capacitorNeed',
+                                      src.getModifiedItemAttr('subsystemBonusAmarrOffensive2'), skill='Amarr Offensive Systems')
+
+
+class Effect4288(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Remote Armor Repair Systems'), 'capacitorNeed',
+                                      src.getModifiedItemAttr('subsystemBonusGallenteOffensive2'), skill='Gallente Offensive Systems')
+
+
+class Effect4290(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Shield Emission Systems') or mod.item.requiresSkill('Remote Armor Repair Systems'),
+                                      'capacitorNeed', src.getModifiedItemAttr('subsystemBonusMinmatarOffensive2'),
+                                      skill='Minmatar Offensive Systems')
+
+
+class Effect4292(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Shield Emission Systems'),
+                                      'capacitorNeed', src.getModifiedItemAttr('subsystemBonusCaldariOffensive2'),
+                                      skill='Caldari Offensive Systems')
+
+
+class Effect4321(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'ECM', 'scanLadarStrengthBonus',
+                                      src.getModifiedItemAttr('subsystemBonusCaldariCore2'), skill='Caldari Core Systems')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'ECM', 'scanRadarStrengthBonus',
+                                      src.getModifiedItemAttr('subsystemBonusCaldariCore2'), skill='Caldari Core Systems')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'ECM', 'maxRange',
+                                      src.getModifiedItemAttr('subsystemBonusCaldariCore2'), skill='Caldari Core Systems')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'ECM', 'scanGravimetricStrengthBonus',
+                                      src.getModifiedItemAttr('subsystemBonusCaldariCore2'), skill='Caldari Core Systems')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'ECM', 'scanMagnetometricStrengthBonus',
+                                      src.getModifiedItemAttr('subsystemBonusCaldariCore2'), skill='Caldari Core Systems')
+
+
+class Effect4327(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill('Drones'),
+                                     'hp', src.getModifiedItemAttr('subsystemBonusAmarrOffensive3'), skill='Amarr Offensive Systems')
+        fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill('Drones'),
+                                     'armorHP', src.getModifiedItemAttr('subsystemBonusAmarrOffensive3'), skill='Amarr Offensive Systems')
+        fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill('Drones'),
+                                     'shieldCapacity', src.getModifiedItemAttr('subsystemBonusAmarrOffensive3'), skill='Amarr Offensive Systems')
+        fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill('Drones'),
+                                     'damageMultiplier', src.getModifiedItemAttr('subsystemBonusAmarrOffensive3'), skill='Amarr Offensive Systems')
+
+
+class Effect4330(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Energy Turret'),
+                                      'maxRange', module.getModifiedItemAttr('subsystemBonusAmarrOffensive3'),
+                                      skill='Amarr Offensive Systems')
+
+
+class Effect4331(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Heavy Missiles') or mod.charge.requiresSkill('Heavy Assault Missiles'),
+                                        'maxVelocity', src.getModifiedItemAttr('subsystemBonusCaldariOffensive3'),
+                                        skill='Caldari Offensive Systems')
+
+
+class Effect4342(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.ship.boostItemAttr('maxTargetRange', src.getModifiedItemAttr('subsystemBonusMinmatarCore2'),
+                               skill='Minmatar Core Systems')
+
+
+class Effect4343(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.ship.boostItemAttr('maxTargetRange', src.getModifiedItemAttr('subsystemBonusAmarrCore2'),
+                               skill='Amarr Core Systems')
+
+
+class Effect4347(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Hybrid Turret'),
+                                      'trackingSpeed', module.getModifiedItemAttr('subsystemBonusGallenteOffensive3'),
+                                      skill='Gallente Offensive Systems')
+
+
+class Effect4351(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Projectile Turret'),
+                                      'trackingSpeed', module.getModifiedItemAttr('subsystemBonusMinmatarOffensive3'),
+                                      skill='Minmatar Offensive Systems')
+
+
+class Effect4358(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'ECM',
+                                      'maxRange', module.getModifiedItemAttr('ecmRangeBonus'),
+                                      stackingPenalties=True)
+
+
+class Effect4360(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        groups = ('Missile Launcher Heavy', 'Missile Launcher Rapid Light', 'Missile Launcher Heavy Assault')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name in groups,
+                                      'speed', src.getModifiedItemAttr('subsystemBonusAmarrOffensive'), skill='Amarr Offensive Systems')
+
+
+class Effect4362(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill('Missile Launcher Operation'),
+                                        'explosiveDamage', src.getModifiedItemAttr('subsystemBonusAmarrOffensive2'), skill='Amarr Offensive Systems')
+        fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill('Missile Launcher Operation'),
+                                        'kineticDamage', src.getModifiedItemAttr('subsystemBonusAmarrOffensive2'), skill='Amarr Offensive Systems')
+        fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill('Missile Launcher Operation'),
+                                        'emDamage', src.getModifiedItemAttr('subsystemBonusAmarrOffensive2'), skill='Amarr Offensive Systems')
+        fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill('Missile Launcher Operation'),
+                                        'thermalDamage', src.getModifiedItemAttr('subsystemBonusAmarrOffensive2'), skill='Amarr Offensive Systems')
+
+
+class Effect4366(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Hybrid Turret'),
+                                      'damageMultiplier', ship.getModifiedItemAttr('shipBonusCC2'), skill='Caldari Cruiser')
+
+
+class Effect4369(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.ship.forceItemAttr('warpBubbleImmune', module.getModifiedItemAttr('warpBubbleImmuneModifier'))
+
+
+class Effect4370(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'ECM',
+                                      'falloffEffectiveness', ship.getModifiedItemAttr('shipBonusCC2'),
+                                      skill='Caldari Cruiser')
+
+
+class Effect4372(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'ECM',
+                                      'falloffEffectiveness', ship.getModifiedItemAttr('shipBonusCB3'),
+                                      skill='Caldari Battleship')
+
+
+class Effect4373(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Skirmish Command'),
+                                      'buffDuration', src.getModifiedItemAttr('subsystemBonusAmarrOffensive'), skill='Amarr Offensive Systems')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Skirmish Command'),
+                                      'warfareBuff2Value', src.getModifiedItemAttr('subsystemBonusAmarrOffensive'), skill='Amarr Offensive Systems')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Skirmish Command'),
+                                      'warfareBuff3Value', src.getModifiedItemAttr('subsystemBonusAmarrOffensive'), skill='Amarr Offensive Systems')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Skirmish Command'),
+                                      'warfareBuff1Value', src.getModifiedItemAttr('subsystemBonusAmarrOffensive'), skill='Amarr Offensive Systems')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Skirmish Command'),
+                                      'warfareBuff4Value', src.getModifiedItemAttr('subsystemBonusAmarrOffensive'), skill='Amarr Offensive Systems')
+
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Armored Command'),
+                                      'warfareBuff3Value', src.getModifiedItemAttr('subsystemBonusAmarrOffensive'), skill='Amarr Offensive Systems')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Armored Command'),
+                                      'warfareBuff1Value', src.getModifiedItemAttr('subsystemBonusAmarrOffensive'), skill='Amarr Offensive Systems')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Armored Command'),
+                                      'warfareBuff4Value', src.getModifiedItemAttr('subsystemBonusAmarrOffensive'), skill='Amarr Offensive Systems')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Armored Command'),
+                                      'warfareBuff2Value', src.getModifiedItemAttr('subsystemBonusAmarrOffensive'), skill='Amarr Offensive Systems')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Armored Command'),
+                                      'buffDuration', src.getModifiedItemAttr('subsystemBonusAmarrOffensive'), skill='Amarr Offensive Systems')
+
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Information Command'),
+                                      'warfareBuff3Value', src.getModifiedItemAttr('subsystemBonusAmarrOffensive'), skill='Amarr Offensive Systems')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Information Command'),
+                                      'warfareBuff1Value', src.getModifiedItemAttr('subsystemBonusAmarrOffensive'), skill='Amarr Offensive Systems')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Information Command'),
+                                      'warfareBuff2Value', src.getModifiedItemAttr('subsystemBonusAmarrOffensive'), skill='Amarr Offensive Systems')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Information Command'),
+                                      'buffDuration', src.getModifiedItemAttr('subsystemBonusAmarrOffensive'), skill='Amarr Offensive Systems')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Information Command'),
+                                      'warfareBuff4Value', src.getModifiedItemAttr('subsystemBonusAmarrOffensive'), skill='Amarr Offensive Systems')
+
+
+class Effect4377(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Torpedoes'),
+                                        'maxVelocity', ship.getModifiedItemAttr('shipBonusGF2'), skill='Gallente Frigate')
+
+
+class Effect4378(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Torpedoes'),
+                                        'maxVelocity', ship.getModifiedItemAttr('shipBonusMF2'), skill='Minmatar Frigate')
+
+
+class Effect4379(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Torpedoes'),
+                                        'maxVelocity', ship.getModifiedItemAttr('shipBonus2AF'), skill='Amarr Frigate')
+
+
+class Effect4380(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Torpedoes'),
+                                        'maxVelocity', ship.getModifiedItemAttr('shipBonusCF2'), skill='Caldari Frigate')
+
+
+class Effect4384(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Heavy Missiles'),
+                                        'maxVelocity', ship.getModifiedItemAttr('eliteBonusReconShip1'),
+                                        skill='Recon Ships')
+
+
+class Effect4385(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Heavy Assault Missiles'),
+                                        'maxVelocity', ship.getModifiedItemAttr('eliteBonusReconShip1'),
+                                        skill='Recon Ships')
+
+
+class Effect4393(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Torpedoes'),
+                                        'thermalDamage', ship.getModifiedItemAttr('eliteBonusCovertOps2'),
+                                        skill='Covert Ops')
+
+
+class Effect4394(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Torpedoes'),
+                                        'emDamage', ship.getModifiedItemAttr('eliteBonusCovertOps2'), skill='Covert Ops')
+
+
+class Effect4395(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Torpedoes'),
+                                        'explosiveDamage', ship.getModifiedItemAttr('eliteBonusCovertOps2'),
+                                        skill='Covert Ops')
+
+
+class Effect4396(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Torpedoes'),
+                                        'kineticDamage', ship.getModifiedItemAttr('eliteBonusCovertOps2'),
+                                        skill='Covert Ops')
+
+
+class Effect4397(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Torpedoes'),
+                                        'aoeVelocity', ship.getModifiedItemAttr('shipBonusGF'), skill='Gallente Frigate')
+
+
+class Effect4398(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Torpedoes'),
+                                        'aoeVelocity', ship.getModifiedItemAttr('shipBonusMF'), skill='Minmatar Frigate')
+
+
+class Effect4399(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Torpedoes'),
+                                        'aoeVelocity', ship.getModifiedItemAttr('shipBonusCF'), skill='Caldari Frigate')
+
+
+class Effect4400(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Torpedoes'),
+                                        'aoeVelocity', ship.getModifiedItemAttr('shipBonusAF'), skill='Amarr Frigate')
+
+
+class Effect4413(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Torpedoes'),
+                                        'explosionDelay', ship.getModifiedItemAttr('shipBonusGF'), skill='Gallente Frigate')
+
+
+class Effect4415(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Torpedoes'),
+                                        'explosionDelay', ship.getModifiedItemAttr('shipBonusMF'), skill='Minmatar Frigate')
+
+
+class Effect4416(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Torpedoes'),
+                                        'explosionDelay', ship.getModifiedItemAttr('shipBonusCF'), skill='Caldari Frigate')
+
+
+class Effect4417(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Torpedoes'),
+                                        'explosionDelay', ship.getModifiedItemAttr('shipBonusAF'), skill='Amarr Frigate')
+
+
+class Effect4451(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, implant, context):
+        fit.ship.increaseItemAttr('scanRadarStrength', implant.getModifiedItemAttr('scanRadarStrengthModifier'))
+
+
+class Effect4452(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, implant, context):
+        fit.ship.increaseItemAttr('scanLadarStrength', implant.getModifiedItemAttr('scanLadarStrengthModifier'))
+
+
+class Effect4453(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, implant, context):
+        fit.ship.increaseItemAttr('scanGravimetricStrength', implant.getModifiedItemAttr('scanGravimetricStrengthModifier'))
+
+
+class Effect4454(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, implant, context):
+        fit.ship.increaseItemAttr('scanMagnetometricStrength',
+                                  implant.getModifiedItemAttr('scanMagnetometricStrengthModifier'))
+
+
+class Effect4456(EffectDef):
+
+    runTime = 'early'
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, implant, context):
+        fit.appliedImplants.filteredItemMultiply(lambda target: target.item.requiresSkill('Cybernetics'),
+                                                 'scanMagnetometricStrengthPercent',
+                                                 implant.getModifiedItemAttr('implantSetFederationNavy'))
+
+
+class Effect4457(EffectDef):
+
+    runTime = 'early'
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, implant, context):
+        fit.appliedImplants.filteredItemMultiply(lambda target: target.item.requiresSkill('Cybernetics'),
+                                                 'scanRadarStrengthPercent',
+                                                 implant.getModifiedItemAttr('implantSetImperialNavy'))
+
+
+class Effect4458(EffectDef):
+
+    runTime = 'early'
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, implant, context):
+        fit.appliedImplants.filteredItemMultiply(lambda target: target.item.requiresSkill('Cybernetics'),
+                                                 'scanLadarStrengthPercent',
+                                                 implant.getModifiedItemAttr('implantSetRepublicFleet'))
+
+
+class Effect4459(EffectDef):
+
+    runTime = 'early'
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, implant, context):
+        fit.appliedImplants.filteredItemMultiply(lambda target: target.item.requiresSkill('Cybernetics'),
+                                                 'scanGravimetricStrengthPercent',
+                                                 implant.getModifiedItemAttr('implantSetCaldariNavy'))
+
+
+class Effect4460(EffectDef):
+
+    runTime = 'early'
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, implant, context):
+        fit.appliedImplants.filteredItemMultiply(lambda target: target.item.requiresSkill('Cybernetics'),
+                                                 'scanRadarStrengthModifier',
+                                                 implant.getModifiedItemAttr('implantSetLGImperialNavy'))
+
+
+class Effect4461(EffectDef):
+
+    runTime = 'early'
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, implant, context):
+        fit.appliedImplants.filteredItemMultiply(lambda target: target.item.requiresSkill('Cybernetics'),
+                                                 'scanMagnetometricStrengthModifier',
+                                                 implant.getModifiedItemAttr('implantSetLGFederationNavy'))
+
+
+class Effect4462(EffectDef):
+
+    runTime = 'early'
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, implant, context):
+        fit.appliedImplants.filteredItemMultiply(lambda target: target.item.requiresSkill('Cybernetics'),
+                                                 'scanGravimetricStrengthModifier',
+                                                 implant.getModifiedItemAttr('implantSetLGCaldariNavy'))
+
+
+class Effect4463(EffectDef):
+
+    runTime = 'early'
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, implant, context):
+        fit.appliedImplants.filteredItemMultiply(lambda target: target.item.requiresSkill('Cybernetics'),
+                                                 'scanLadarStrengthModifier',
+                                                 implant.getModifiedItemAttr('implantSetLGRepublicFleet'))
+
+
+class Effect4464(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Small Projectile Turret'), 'speed',
+                                      src.getModifiedItemAttr('shipBonusMF'), stackingPenalties=True, skill='Minmatar Frigate')
+
+
+class Effect4471(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Stasis Web',
+                                      'maxRange', ship.getModifiedItemAttr('shipBonusMF2'), skill='Minmatar Frigate')
+
+
+class Effect4472(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Projectile Turret'),
+                                      'damageMultiplier', ship.getModifiedItemAttr('shipBonusMC'), skill='Minmatar Cruiser')
+
+
+class Effect4473(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.ship.boostItemAttr('maxVelocity', ship.getModifiedItemAttr('shipBonusATC1'))
+
+
+class Effect4474(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Projectile Turret'),
+                                      'maxRange', ship.getModifiedItemAttr('shipBonusATC2'))
+
+
+class Effect4475(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Projectile Turret'),
+                                      'falloff', ship.getModifiedItemAttr('shipBonusATC2'))
+
+
+class Effect4476(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Small Projectile Turret'),
+                                      'falloff', ship.getModifiedItemAttr('shipBonusATF2'))
+
+
+class Effect4477(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Small Projectile Turret'),
+                                      'maxRange', ship.getModifiedItemAttr('shipBonusATF2'))
+
+
+class Effect4478(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Propulsion Module',
+                                      'capacitorNeed', ship.getModifiedItemAttr('shipBonusATF1'))
+
+
+class Effect4479(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.group.name == 'Survey Probe',
+                                        'explosionDelay', ship.getModifiedItemAttr('eliteBonusCovertOps3'),
+                                        skill='Covert Ops')
+
+
+class Effect4482(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Small Energy Turret'),
+                                      'maxRange', ship.getModifiedItemAttr('shipBonus2AF'), skill='Amarr Frigate')
+
+
+class Effect4484(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Large Projectile Turret'),
+                                      'falloff', ship.getModifiedItemAttr('shipBonusGB'), skill='Gallente Battleship')
+
+
+class Effect4485(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Stasis Web',
+                                      'speedFactor', ship.getModifiedItemAttr('shipBonusMB'), skill='Minmatar Battleship')
+
+
+class Effect4489(EffectDef):
+
+    type = 'active'
+
+
+class Effect4490(EffectDef):
+
+    type = 'active'
+
+
+class Effect4491(EffectDef):
+
+    type = 'active'
+
+
+class Effect4492(EffectDef):
+
+    type = 'active'
+
+
+class Effect4510(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Stasis Web',
+                                      'speedFactor', ship.getModifiedItemAttr('shipBonusMC2'), skill='Minmatar Cruiser')
+
+
+class Effect4512(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Projectile Turret'),
+                                      'falloff', ship.getModifiedItemAttr('shipBonusGC'), skill='Gallente Cruiser')
+
+
+class Effect4513(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Stasis Web',
+                                      'speedFactor', ship.getModifiedItemAttr('shipBonusMF2'), skill='Minmatar Frigate')
+
+
+class Effect4515(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Small Projectile Turret'),
+                                      'falloff', ship.getModifiedItemAttr('shipBonusMF'), skill='Minmatar Frigate')
+
+
+class Effect4516(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Hybrid Turret'),
+                                      'falloff', ship.getModifiedItemAttr('shipBonusGC'), skill='Gallente Cruiser')
+
+
+class Effect4527(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Gunnery'),
+                                      'falloff', module.getModifiedItemAttr('falloffBonus'),
+                                      stackingPenalties=True)
+
+
+class Effect4555(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, skill, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('XL Cruise Missiles'),
+                                        'emDamage', skill.getModifiedItemAttr('damageMultiplierBonus') * skill.level)
+
+
+class Effect4556(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, skill, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('XL Cruise Missiles'),
+                                        'explosiveDamage', skill.getModifiedItemAttr('damageMultiplierBonus') * skill.level)
+
+
+class Effect4557(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, skill, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('XL Cruise Missiles'),
+                                        'kineticDamage', skill.getModifiedItemAttr('damageMultiplierBonus') * skill.level)
+
+
+class Effect4558(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, skill, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('XL Cruise Missiles'),
+                                        'thermalDamage', skill.getModifiedItemAttr('damageMultiplierBonus') * skill.level)
+
+
+class Effect4559(EffectDef):
+
+    type = 'active'
+
+    @staticmethod
+    def handler(fit, module, context):
+        for attr in ('maxRange', 'falloff', 'trackingSpeed'):
+            fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Gunnery'),
+                                          attr, module.getModifiedItemAttr('%sBonus' % attr),
+                                          stackingPenalties=True)
+
+
+class Effect4575(EffectDef):
+
+    runTime = 'early'
+    type = 'active'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.extraAttributes['siege'] = True
+        fit.ship.boostItemAttr('maxVelocity', src.getModifiedItemAttr('speedFactor'), stackingPenalties=True)
+        fit.ship.multiplyItemAttr('mass', src.getModifiedItemAttr('siegeMassMultiplier'))
+        fit.ship.multiplyItemAttr('scanResolution',
+                                  src.getModifiedItemAttr('scanResolutionMultiplier'),
+                                  stackingPenalties=True)
+
+        #  Remote Shield Repper Bonuses
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Capital Shield Emission Systems'),
+                                      'duration',
+                                      src.getModifiedItemAttr('industrialCoreRemoteLogisticsDurationBonus'),
+                                      )
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Capital Shield Emission Systems'),
+                                      'maxRange',
+                                      src.getModifiedItemAttr('industrialCoreRemoteLogisticsRangeBonus'),
+                                      stackingPenalties=True
+                                      )
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Capital Shield Emission Systems'),
+                                      'capacitorNeed',
+                                      src.getModifiedItemAttr('industrialCoreRemoteLogisticsDurationBonus')
+                                      )
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Capital Shield Emission Systems'),
+                                      'falloffEffectiveness',
+                                      src.getModifiedItemAttr('industrialCoreRemoteLogisticsRangeBonus'),
+                                      stackingPenalties=True
+                                      )
+
+        #  Local Shield Repper Bonuses
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Capital Shield Operation'),
+                                      'duration',
+                                      src.getModifiedItemAttr('industrialCoreLocalLogisticsDurationBonus'),
+                                      )
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Capital Shield Operation'),
+                                      'shieldBonus',
+                                      src.getModifiedItemAttr('industrialCoreLocalLogisticsAmountBonus'),
+                                      stackingPenalties=True
+                                      )
+
+        # Mining Burst Bonuses
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Mining Foreman'),
+                                      'warfareBuff1Value',
+                                      src.getModifiedItemAttr('industrialCoreBonusMiningBurstStrength'),
+                                      )
+
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Mining Foreman'),
+                                      'warfareBuff2Value',
+                                      src.getModifiedItemAttr('industrialCoreBonusMiningBurstStrength'),
+                                      )
+
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Mining Foreman'),
+                                      'warfareBuff3Value',
+                                      src.getModifiedItemAttr('industrialCoreBonusMiningBurstStrength'),
+                                      )
+
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Mining Foreman'),
+                                      'warfareBuff4Value',
+                                      src.getModifiedItemAttr('industrialCoreBonusMiningBurstStrength'),
+                                      )
+
+        #  Command Burst Range Bonus
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Leadership'),
+                                      'maxRange',
+                                      src.getModifiedItemAttr('industrialCoreBonusCommandBurstRange'),
+                                      stackingPenalties=True
+                                      )
+
+        # Drone Bonuses
+        fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Ice Harvesting Drone Operation'),
+                                     'duration',
+                                     src.getModifiedItemAttr('industrialCoreBonusDroneIceHarvesting'),
+                                     )
+        fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Mining Drone Operation'),
+                                     'miningAmount',
+                                     src.getModifiedItemAttr('industrialCoreBonusDroneMining'),
+                                     )
+        fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Drones'),
+                                     'maxVelocity',
+                                     src.getModifiedItemAttr('industrialCoreBonusDroneVelocity'),
+                                     )
+
+        fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Drones'),
+                                     'damageMultiplier',
+                                     src.getModifiedItemAttr('industrialCoreBonusDroneDamageHP'),
+                                     stackingPenalties=True
+                                     )
+        fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Drones'),
+                                     'shieldCapacity',
+                                     src.getModifiedItemAttr('industrialCoreBonusDroneDamageHP'),
+                                     )
+        fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Drones'),
+                                     'armorHP',
+                                     src.getModifiedItemAttr('industrialCoreBonusDroneDamageHP'),
+                                     )
+        fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Drones'),
+                                     'hp',
+                                     src.getModifiedItemAttr('industrialCoreBonusDroneDamageHP'),
+                                     )
+
+        #  Todo: remote impedance (no reps, etc)
+        fit.ship.increaseItemAttr('warpScrambleStatus', src.getModifiedItemAttr('siegeModeWarpStatus'))
+        fit.ship.boostItemAttr('remoteRepairImpedance', src.getModifiedItemAttr('remoteRepairImpedanceBonus'))
+        fit.ship.increaseItemAttr('disallowTethering', src.getModifiedItemAttr('disallowTethering'))
+        fit.ship.boostItemAttr('sensorDampenerResistance', src.getModifiedItemAttr('sensorDampenerResistanceBonus'))
+        fit.ship.boostItemAttr('remoteAssistanceImpedance', src.getModifiedItemAttr('remoteAssistanceImpedanceBonus'))
+        fit.ship.increaseItemAttr('disallowDocking', src.getModifiedItemAttr('disallowDocking'))
+
+
+class Effect4576(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Remote Tracking Computer',
+                                      'falloffBonus', ship.getModifiedItemAttr('eliteBonusLogistics1'),
+                                      skill='Logistics Cruisers')
+
+
+class Effect4577(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Remote Tracking Computer',
+                                      'falloffBonus', ship.getModifiedItemAttr('eliteBonusLogistics2'),
+                                      skill='Logistics Cruisers')
+
+
+class Effect4579(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.drones.filteredItemBoost(lambda drone: drone.item.group.name == 'Stasis Webifying Drone',
+                                     'speedFactor', module.getModifiedItemAttr('webSpeedFactorBonus'))
+
+
+class Effect4619(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Drones'),
+                                     'damageMultiplier', ship.getModifiedItemAttr('shipBonusGF2'), skill='Gallente Frigate')
+
+
+class Effect4620(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Warp Scrambler',
+                                      'maxRange', ship.getModifiedItemAttr('shipBonusGF2'), skill='Gallente Frigate')
+
+
+class Effect4621(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: True, 'heatDamage',
+                                      ship.getModifiedItemAttr('shipBonusATF1'))
+
+
+class Effect4622(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Small Hybrid Turret'),
+                                      'maxRange', ship.getModifiedItemAttr('shipBonusATF2'))
+
+
+class Effect4623(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Small Hybrid Turret'),
+                                      'trackingSpeed', ship.getModifiedItemAttr('shipBonusATF2'))
+
+
+class Effect4624(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Hybrid Turret'),
+                                      'trackingSpeed', ship.getModifiedItemAttr('shipBonusATC2'))
+
+
+class Effect4625(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Hybrid Turret'),
+                                      'falloff', ship.getModifiedItemAttr('shipBonusATC2'))
+
+
+class Effect4626(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Warp Scrambler',
+                                      'maxRange', ship.getModifiedItemAttr('shipBonusGC2'), skill='Gallente Cruiser')
+
+
+class Effect4635(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        damageTypes = ('em', 'explosive', 'kinetic', 'thermal')
+        for damageType in damageTypes:
+            fit.modules.filteredChargeBoost(
+                lambda mod: mod.charge.requiresSkill('Cruise Missiles') or mod.charge.requiresSkill('Torpedoes'),
+                '{0}Damage'.format(damageType), ship.getModifiedItemAttr('eliteBonusViolatorsRole1'))
+
+
+class Effect4636(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredChargeBoost(
+            lambda mod: mod.charge.requiresSkill('Cruise Missiles') or mod.charge.requiresSkill('Torpedoes'),
+            'aoeVelocity', ship.getModifiedItemAttr('shipBonus2CB'), skill='Caldari Battleship')
+
+
+class Effect4637(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredChargeBoost(
+            lambda mod: mod.charge.requiresSkill('Cruise Missiles') or mod.charge.requiresSkill('Torpedoes'),
+            'maxVelocity', ship.getModifiedItemAttr('shipBonusCB3'), skill='Caldari Battleship')
+
+
+class Effect4640(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        damageTypes = ('Em', 'Explosive', 'Kinetic', 'Thermal')
+        for damageType in damageTypes:
+            fit.ship.boostItemAttr('armor{0}DamageResonance'.format(damageType), ship.getModifiedItemAttr('shipBonusAC2'),
+                                   skill='Amarr Cruiser')
+
+
+class Effect4643(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        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('shipBonusAC'),
+                                            skill='Amarr Cruiser')
+
+
+class Effect4645(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        groups = ('Missile Launcher Rapid Light', 'Missile Launcher Heavy Assault', 'Missile Launcher Heavy')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name in groups,
+                                      'speed', ship.getModifiedItemAttr('eliteBonusHeavyGunship2'),
+                                      skill='Heavy Assault Cruisers')
+
+
+class Effect4648(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        sensorTypes = ('Gravimetric', 'Ladar', 'Magnetometric', 'Radar')
+        for type in sensorTypes:
+            fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'ECM', 'scan{0}StrengthBonus'.format(type),
+                                          ship.getModifiedItemAttr('eliteBonusBlackOps1'), skill='Black Ops')
+
+
+class Effect4649(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        affectedGroups = ('Missile Launcher Cruise', 'Missile Launcher Torpedo')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name in affectedGroups,
+                                      'speed', ship.getModifiedItemAttr('shipBonus2CB'), skill='Caldari Battleship')
+
+
+class Effect4667(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Salvaging'),
+                                      'duration', ship.getModifiedItemAttr('shipBonusOreIndustrial1'),
+                                      skill='ORE Industrial')
+
+
+class Effect4668(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Tractor Beam',
+                                      'duration', ship.getModifiedItemAttr('shipBonusOreIndustrial1'),
+                                      skill='ORE Industrial')
+
+
+class Effect4669(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Tractor Beam',
+                                      'maxTractorVelocity', ship.getModifiedItemAttr('shipBonusOreIndustrial2'),
+                                      skill='ORE Industrial')
+
+
+class Effect4670(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Tractor Beam',
+                                      'maxRange', ship.getModifiedItemAttr('shipBonusOreIndustrial2'),
+                                      skill='ORE Industrial')
+
+
+class Effect4728(EffectDef):
+
+    runTime = 'early'
+    type = ('projected', 'passive')
+
+    @staticmethod
+    def handler(fit, beacon, context):
+        damages = ('em', 'thermal', 'kinetic', 'explosive')
+        for damage in damages:
+            # Nerf missile damage
+            fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Missile Launcher Operation'),
+                                            '{0}Damage'.format(damage),
+                                            beacon.getModifiedItemAttr('systemEffectDamageReduction'))
+            # Nerf smartbomb damage
+            fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Smart Bomb',
+                                          '{0}Damage'.format(damage),
+                                          beacon.getModifiedItemAttr('systemEffectDamageReduction'))
+            # Nerf armor resistances
+            fit.ship.boostItemAttr('armor{0}DamageResonance'.format(damage.capitalize()),
+                                   beacon.getModifiedItemAttr('armor{0}DamageResistanceBonus'.format(damage.capitalize())))
+            # Nerf shield resistances
+            fit.ship.boostItemAttr('shield{0}DamageResonance'.format(damage.capitalize()),
+                                   beacon.getModifiedItemAttr('shield{0}DamageResistanceBonus'.format(damage.capitalize())))
+        # Nerf drone damage output
+        fit.drones.filteredItemBoost(lambda drone: True,
+                                     'damageMultiplier', beacon.getModifiedItemAttr('systemEffectDamageReduction'))
+        # Nerf turret damage output
+        fit.modules.filteredItemBoost(lambda module: module.item.requiresSkill('Gunnery'),
+                                      'damageMultiplier', beacon.getModifiedItemAttr('systemEffectDamageReduction'))
+
+
+class Effect4760(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.ship.boostItemAttr('warpCapacitorNeed', src.getModifiedItemAttr('subsystemBonusCaldariPropulsion'),
+                               skill='Caldari Propulsion Systems')
+
+
+class Effect4775(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Energy Neutralizer',
+                                      'energyNeutralizerAmount', ship.getModifiedItemAttr('shipBonus2AF'),
+                                      skill='Amarr Frigate')
+
+
+class Effect4782(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Small Energy Turret'),
+                                      'maxRange', ship.getModifiedItemAttr('shipBonusATF2'))
+
+
+class Effect4789(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Small Energy Turret'),
+                                      'damageMultiplier', ship.getModifiedItemAttr('shipBonusATF1'))
+
+
+class Effect4793(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Missile Launcher Heavy',
+                                      'speed', ship.getModifiedItemAttr('shipBonusATC1'))
+
+
+class Effect4794(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Missile Launcher Rapid Light',
+                                      'speed', ship.getModifiedItemAttr('shipBonusATC1'))
+
+
+class Effect4795(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Missile Launcher Heavy Assault',
+                                      'speed', ship.getModifiedItemAttr('shipBonusATC1'))
+
+
+class Effect4799(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        sensorTypes = ('Gravimetric', 'Ladar', 'Magnetometric', 'Radar')
+        for type in sensorTypes:
+            fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Burst Jammer',
+                                          'scan{0}StrengthBonus'.format(type),
+                                          ship.getModifiedItemAttr('eliteBonusBlackOps1'), skill='Black Ops')
+
+
+class Effect4804(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, skill, context):
+        fit.modules.filteredItemMultiply(lambda mod: mod.item.requiresSkill(skill), 'accessDifficultyBonus',
+                                         skill.getModifiedItemAttr('accessDifficultyBonusAbsolutePercent') * skill.level)
+
+
+class Effect4809(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'ECM',
+                                      'scanGravimetricStrengthBonus', module.getModifiedItemAttr('ecmStrengthBonusPercent'),
+                                      stackingPenalties=True)
+
+
+class Effect4810(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'ECM',
+                                      'scanLadarStrengthBonus', module.getModifiedItemAttr('ecmStrengthBonusPercent'),
+                                      stackingPenalties=True)
+
+
+class Effect4811(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'ECM',
+                                      'scanMagnetometricStrengthBonus',
+                                      module.getModifiedItemAttr('ecmStrengthBonusPercent'),
+                                      stackingPenalties=True)
+
+
+class Effect4812(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'ECM',
+                                      'scanRadarStrengthBonus', module.getModifiedItemAttr('ecmStrengthBonusPercent'),
+                                      stackingPenalties=True)
+
+
+class Effect4814(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, skill, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill(skill), 'consumptionQuantity',
+                                      skill.getModifiedItemAttr('consumptionQuantityBonusPercent') * skill.level)
+
+
+class Effect4817(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, implant, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Salvager',
+                                      'duration', implant.getModifiedItemAttr('durationBonus'))
+
+
+class Effect4820(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemMultiply(lambda mod: mod.item.requiresSkill('Large Energy Turret'),
+                                         'power', ship.getModifiedItemAttr('bcLargeTurretPower'))
+
+
+class Effect4821(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemMultiply(lambda mod: mod.item.requiresSkill('Large Hybrid Turret'),
+                                         'power', ship.getModifiedItemAttr('bcLargeTurretPower'))
+
+
+class Effect4822(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemMultiply(lambda mod: mod.item.requiresSkill('Large Projectile Turret'),
+                                         'power', ship.getModifiedItemAttr('bcLargeTurretPower'))
+
+
+class Effect4823(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemMultiply(lambda mod: mod.item.requiresSkill('Large Energy Turret'),
+                                         'cpu', ship.getModifiedItemAttr('bcLargeTurretCPU'))
+
+
+class Effect4824(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemMultiply(lambda mod: mod.item.requiresSkill('Large Hybrid Turret'),
+                                         'cpu', ship.getModifiedItemAttr('bcLargeTurretCPU'))
+
+
+class Effect4825(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemMultiply(lambda mod: mod.item.requiresSkill('Large Projectile Turret'),
+                                         'cpu', ship.getModifiedItemAttr('bcLargeTurretCPU'))
+
+
+class Effect4826(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemMultiply(lambda mod: mod.item.requiresSkill('Large Energy Turret'),
+                                         'capacitorNeed', ship.getModifiedItemAttr('bcLargeTurretCap'))
+
+
+class Effect4827(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemMultiply(lambda mod: mod.item.requiresSkill('Large Hybrid Turret'),
+                                         'capacitorNeed', ship.getModifiedItemAttr('bcLargeTurretCap'))
+
+
+class Effect4867(EffectDef):
+
+    runTime = 'early'
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, implant, context):
+        fit.appliedImplants.filteredItemMultiply(lambda mod: mod.item.group.name == 'Special Edition Implant',
+                                                 'powerEngineeringOutputBonus',
+                                                 implant.getModifiedItemAttr('implantSetChristmas'))
+
+
+class Effect4868(EffectDef):
+
+    runTime = 'early'
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, implant, context):
+        fit.appliedImplants.filteredItemMultiply(lambda mod: mod.item.group.name == 'Special Edition Implant',
+                                                 'capacitorCapacityBonus',
+                                                 implant.getModifiedItemAttr('implantSetChristmas'))
+
+
+class Effect4869(EffectDef):
+
+    runTime = 'early'
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, implant, context):
+        fit.appliedImplants.filteredItemMultiply(lambda mod: mod.item.group.name == 'Special Edition Implant',
+                                                 'cpuOutputBonus2', implant.getModifiedItemAttr('implantSetChristmas'))
+
+
+class Effect4871(EffectDef):
+
+    runTime = 'early'
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, implant, context):
+        fit.appliedImplants.filteredItemMultiply(lambda mod: mod.item.group.name == 'Special Edition Implant',
+                                                 'capRechargeBonus', implant.getModifiedItemAttr('implantSetChristmas'))
+
+
+class Effect4896(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Drones'),
+                                     'hp', ship.getModifiedItemAttr('shipBonusGF2'), skill='Gallente Frigate')
+
+
+class Effect4897(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Drones'),
+                                     'armorHP', ship.getModifiedItemAttr('shipBonusGF2'), skill='Gallente Frigate')
+
+
+class Effect4898(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Drones'),
+                                     'shieldCapacity', ship.getModifiedItemAttr('shipBonusGF2'), skill='Gallente Frigate')
+
+
+class Effect4901(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Missile Launcher Operation'),
+                                      'speed', ship.getModifiedItemAttr('shipBonus2AF'), skill='Amarr Frigate')
+
+
+class Effect4902(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('High Speed Maneuvering'),
+                                      'signatureRadiusBonus', ship.getModifiedItemAttr('MWDSignatureRadiusBonus'))
+
+
+class Effect4906(EffectDef):
+
+    runTime = 'early'
+    type = ('projected', 'passive')
+
+    @staticmethod
+    def handler(fit, beacon, context):
+        fit.drones.filteredItemMultiply(lambda drone: drone.item.requiresSkill('Fighters'),
+                                        'damageMultiplier', beacon.getModifiedItemAttr('damageMultiplierMultiplier'),
+                                        stackingPenalties=True, penaltyGroup='postMul')
+
+
+class Effect4911(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.ship.multiplyItemAttr('shieldRechargeRate', module.getModifiedItemAttr('shieldRechargeRateMultiplier'))
+
+
+class Effect4921(EffectDef):
+
+    type = 'active'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.ship.boostItemAttr('signatureRadius', module.getModifiedItemAttr('signatureRadiusBonusPercent'))
+
+
+class Effect4923(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, skill, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Micro Jump Drive Operation'),
+                                      'duration', skill.getModifiedItemAttr('durationBonus') * skill.level)
+
+
+class Effect4928(EffectDef):
+
+    runTime = 'late'
+    type = 'active'
+
+    @staticmethod
+    def handler(fit, module, context):
+        # pyfalog = Logger(__name__)
+
+        damagePattern = fit.damagePattern
+        # pyfalog.debug('==============================')
+
+        static_adaptive_behavior = eos.config.settings['useStaticAdaptiveArmorHardener']
+
+        if (damagePattern.emAmount == damagePattern.thermalAmount == damagePattern.kineticAmount == damagePattern.explosiveAmount) and static_adaptive_behavior:
+            # pyfalog.debug('Setting adaptivearmorhardener resists to uniform profile.')
+            for attr in ('armorEmDamageResonance', 'armorThermalDamageResonance', 'armorKineticDamageResonance', 'armorExplosiveDamageResonance'):
+                fit.ship.multiplyItemAttr(attr, module.getModifiedItemAttr(attr), stackingPenalties=True, penaltyGroup='preMul')
+            return
+
+        # Skip if there is no damage pattern. Example: projected ships or fleet boosters
+        if damagePattern:
+
+            # Populate a tuple with the damage profile modified by current armor resists.
+            baseDamageTaken = (
+                damagePattern.emAmount * fit.ship.getModifiedItemAttr('armorEmDamageResonance'),
+                damagePattern.thermalAmount * fit.ship.getModifiedItemAttr('armorThermalDamageResonance'),
+                damagePattern.kineticAmount * fit.ship.getModifiedItemAttr('armorKineticDamageResonance'),
+                damagePattern.explosiveAmount * fit.ship.getModifiedItemAttr('armorExplosiveDamageResonance'),
+            )
+            # pyfalog.debug('Damage Adjusted for Armor Resists: %f/%f/%f/%f' % (baseDamageTaken[0], baseDamageTaken[1], baseDamageTaken[2], baseDamageTaken[3]))
+
+            resistanceShiftAmount = module.getModifiedItemAttr(
+                'resistanceShiftAmount') / 100  # The attribute is in percent and we want a fraction
+            RAHResistance = [
+                module.getModifiedItemAttr('armorEmDamageResonance'),
+                module.getModifiedItemAttr('armorThermalDamageResonance'),
+                module.getModifiedItemAttr('armorKineticDamageResonance'),
+                module.getModifiedItemAttr('armorExplosiveDamageResonance'),
+            ]
+
+            # Simulate RAH cycles until the RAH either stops changing or enters a loop.
+            # The number of iterations is limited to prevent an infinite loop if something goes wrong.
+            cycleList = []
+            loopStart = -20
+            for num in range(50):
+                # pyfalog.debug('Starting cycle %d.' % num)
+                # The strange order is to emulate the ingame sorting when different types have taken the same amount of damage.
+                # This doesn't take into account stacking penalties. In a few cases fitting a Damage Control causes an inaccurate result.
+                damagePattern_tuples = [
+                    (0, baseDamageTaken[0] * RAHResistance[0], RAHResistance[0]),
+                    (3, baseDamageTaken[3] * RAHResistance[3], RAHResistance[3]),
+                    (2, baseDamageTaken[2] * RAHResistance[2], RAHResistance[2]),
+                    (1, baseDamageTaken[1] * RAHResistance[1], RAHResistance[1]),
+                ]
+
+                # Sort the tuple to drop the highest damage value to the bottom
+                sortedDamagePattern_tuples = sorted(damagePattern_tuples, key=lambda damagePattern: damagePattern[1])
+
+                if sortedDamagePattern_tuples[2][1] == 0:
+                    # One damage type: the top damage type takes from the other three
+                    # Since the resistances not taking damage will end up going to the type taking damage we just do the whole thing at once.
+                    change0 = 1 - sortedDamagePattern_tuples[0][2]
+                    change1 = 1 - sortedDamagePattern_tuples[1][2]
+                    change2 = 1 - sortedDamagePattern_tuples[2][2]
+                    change3 = -(change0 + change1 + change2)
+                elif sortedDamagePattern_tuples[1][1] == 0:
+                    # Two damage types: the top two damage types take from the other two
+                    # Since the resistances not taking damage will end up going equally to the types taking damage we just do the whole thing at once.
+                    change0 = 1 - sortedDamagePattern_tuples[0][2]
+                    change1 = 1 - sortedDamagePattern_tuples[1][2]
+                    change2 = -(change0 + change1) / 2
+                    change3 = -(change0 + change1) / 2
+                else:
+                    # Three or four damage types: the top two damage types take from the other two
+                    change0 = min(resistanceShiftAmount, 1 - sortedDamagePattern_tuples[0][2])
+                    change1 = min(resistanceShiftAmount, 1 - sortedDamagePattern_tuples[1][2])
+                    change2 = -(change0 + change1) / 2
+                    change3 = -(change0 + change1) / 2
+
+                RAHResistance[sortedDamagePattern_tuples[0][0]] = sortedDamagePattern_tuples[0][2] + change0
+                RAHResistance[sortedDamagePattern_tuples[1][0]] = sortedDamagePattern_tuples[1][2] + change1
+                RAHResistance[sortedDamagePattern_tuples[2][0]] = sortedDamagePattern_tuples[2][2] + change2
+                RAHResistance[sortedDamagePattern_tuples[3][0]] = sortedDamagePattern_tuples[3][2] + change3
+                # pyfalog.debug('Resistances shifted to %f/%f/%f/%f' % ( RAHResistance[0], RAHResistance[1], RAHResistance[2], RAHResistance[3]))
+
+                # See if the current RAH profile has been encountered before, indicating a loop.
+                for i, val in enumerate(cycleList):
+                    tolerance = 1e-06
+                    if abs(RAHResistance[0] - val[0]) <= tolerance and \
+                                abs(RAHResistance[1] - val[1]) <= tolerance and \
+                                abs(RAHResistance[2] - val[2]) <= tolerance and \
+                                abs(RAHResistance[3] - val[3]) <= tolerance:
+                        loopStart = i
+                        # pyfalog.debug('Loop found: %d-%d' % (loopStart, num))
+                        break
+                if loopStart >= 0:
+                    break
+
+                cycleList.append(list(RAHResistance))
+
+            # if loopStart < 0:
+                # pyfalog.error('Reactive Armor Hardener failed to find equilibrium. Damage profile after armor: {0}/{1}/{2}/{3}'.format(
+                #             baseDamageTaken[0], baseDamageTaken[1], baseDamageTaken[2], baseDamageTaken[3]))
+
+            # Average the profiles in the RAH loop, or the last 20 if it didn't find a loop.
+            loopCycles = cycleList[loopStart:]
+            numCycles = len(loopCycles)
+            average = [0, 0, 0, 0]
+            for cycle in loopCycles:
+                for i in range(4):
+                    average[i] += cycle[i]
+
+            for i in range(4):
+                average[i] = round(average[i] / numCycles, 3)
+
+            # Set the new resistances
+            # pyfalog.debug('Setting new resist profile: %f/%f/%f/%f' % ( average[0], average[1], average[2],average[3]))
+            for i, attr in enumerate((
+                    'armorEmDamageResonance', 'armorThermalDamageResonance', 'armorKineticDamageResonance',
+                    'armorExplosiveDamageResonance')):
+                module.increaseItemAttr(attr, average[i] - module.getModifiedItemAttr(attr))
+                fit.ship.multiplyItemAttr(attr, average[i], stackingPenalties=True, penaltyGroup='preMul')
+
+
+class Effect4934(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Repair Systems'),
+                                      'armorDamageAmount', ship.getModifiedItemAttr('shipBonusGF2'),
+                                      skill='Gallente Frigate')
+
+
+class Effect4936(EffectDef):
+
+    runTime = 'late'
+    type = 'active'
+
+    @staticmethod
+    def handler(fit, module, context):
+        amount = module.getModifiedItemAttr('shieldBonus')
+        speed = module.getModifiedItemAttr('duration') / 1000.0
+        fit.extraAttributes.increase('shieldRepair', amount / speed)
+
+
+class Effect4941(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Small Hybrid Turret'),
+                                      'damageMultiplier', ship.getModifiedItemAttr('shipBonusCF2'), skill='Caldari Frigate')
+
+
+class Effect4942(EffectDef):
+
+    type = 'active'
+
+
+class Effect4945(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, skill, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Target Breaker',
+                                      'duration', skill.getModifiedItemAttr('durationBonus') * skill.level)
+
+
+class Effect4946(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, skill, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Target Breaker',
+                                      'capacitorNeed', skill.getModifiedItemAttr('capNeedBonus') * skill.level)
+
+
+class Effect4950(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Shield Operation'),
+                                      'shieldBonus', ship.getModifiedItemAttr('shipBonusMB'), skill='Minmatar Battleship')
+
+
+class Effect4951(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context):
+        fit.modules.filteredItemBoost(
+            lambda mod: mod.item.requiresSkill('Shield Operation') or mod.item.requiresSkill('Capital Shield Operation'),
+            'shieldBonus', container.getModifiedItemAttr('shieldBoostMultiplier'))
+
+
+class Effect4961(EffectDef):
+
+    runTime = 'early'
+    type = ('projected', 'passive')
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.modules.filteredItemMultiply(lambda mod: mod.item.requiresSkill('Shield Operation') or
+                                                     mod.item.requiresSkill('Capital Shield Operation'),
+                                         'shieldBonus', module.getModifiedItemAttr('shieldBonusMultiplier'),
+                                         stackingPenalties=True, penaltyGroup='postMul')
+
+
+class Effect4967(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.modules.filteredItemBoost(
+            lambda mod: mod.item.requiresSkill('Shield Operation') or mod.item.requiresSkill('Capital Shield Operation'),
+            'duration', module.getModifiedItemAttr('durationSkillBonus'))
+
+
+class Effect4970(EffectDef):
+
+    attr = 'boosterShieldBoostAmountPenalty'
+    displayName = 'Shield Boost'
+    type = 'boosterSideEffect'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Shield Operation'), 'shieldBonus',
+                                      src.getModifiedItemAttr('boosterShieldBoostAmountPenalty'))
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Capital Shield Operation'), 'shieldBonus',
+                                      src.getModifiedItemAttr('boosterShieldBoostAmountPenalty'))
+
+
+class Effect4972(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Missile Launcher Light',
+                                      'speed', ship.getModifiedItemAttr('eliteBonusGunship1'), skill='Assault Frigates')
+
+
+class Effect4973(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Missile Launcher Rocket',
+                                      'speed', ship.getModifiedItemAttr('eliteBonusGunship1'), skill='Assault Frigates')
+
+
+class Effect4974(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Shield Operation'),
+                                      'shieldBonus', ship.getModifiedItemAttr('eliteBonusViolators2'), skill='Marauders')
+
+
+class Effect4975(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Missile Launcher Operation'),
+                                        'kineticDamage', ship.getModifiedItemAttr('shipBonusATF2'))
+
+
+class Effect4976(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        lvl = src.level
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Armor Resistance Shift Hardener', 'duration',
+                                      src.getModifiedItemAttr('durationBonus') * lvl)
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Resistance Phasing'), 'duration',
+                                      src.getModifiedItemAttr('durationBonus') * lvl)
+
+
+class Effect4989(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, implant, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Missile Launcher Operation'),
+                                        'aoeCloudSize', implant.getModifiedItemAttr('aoeCloudSizeBonus'))
+
+
+class Effect4990(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Small Energy Turret'),
+                                      'capacitorNeed', ship.getModifiedItemAttr('rookieSETCapBonus'))
+
+
+class Effect4991(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Small Energy Turret'),
+                                      'damageMultiplier', ship.getModifiedItemAttr('rookieSETDamageBonus'))
+
+
+class Effect4994(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.ship.boostItemAttr('armorEmDamageResonance', ship.getModifiedItemAttr('rookieArmorResistanceBonus'))
+
+
+class Effect4995(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.ship.boostItemAttr('armorExplosiveDamageResonance', ship.getModifiedItemAttr('rookieArmorResistanceBonus'))
+
+
+class Effect4996(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.ship.boostItemAttr('armorKineticDamageResonance', ship.getModifiedItemAttr('rookieArmorResistanceBonus'))
+
+
+class Effect4997(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.ship.boostItemAttr('armorThermalDamageResonance', ship.getModifiedItemAttr('rookieArmorResistanceBonus'))
+
+
+class Effect4999(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Small Hybrid Turret'),
+                                      'maxRange', ship.getModifiedItemAttr('rookieSHTOptimalBonus'))
+
+
+class Effect5000(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Missile Launcher Operation'),
+                                        'kineticDamage', ship.getModifiedItemAttr('rookieMissileKinDamageBonus'))
+
+
+class Effect5008(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.ship.boostItemAttr('shieldEmDamageResonance', ship.getModifiedItemAttr('rookieShieldResistBonus'))
+
+
+class Effect5009(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.ship.boostItemAttr('shieldExplosiveDamageResonance', ship.getModifiedItemAttr('rookieShieldResistBonus'))
+
+
+class Effect5011(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.ship.boostItemAttr('shieldKineticDamageResonance', ship.getModifiedItemAttr('rookieShieldResistBonus'))
+
+
+class Effect5012(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.ship.boostItemAttr('shieldThermalDamageResonance', ship.getModifiedItemAttr('rookieShieldResistBonus'))
+
+
+class Effect5013(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Small Hybrid Turret'),
+                                      'damageMultiplier', ship.getModifiedItemAttr('rookieSHTDamageBonus'))
+
+
+class Effect5014(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Drones'),
+                                     'damageMultiplier', ship.getModifiedItemAttr('rookieDroneBonus'))
+
+
+class Effect5015(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Sensor Dampener',
+                                      'maxTargetRangeBonus', ship.getModifiedItemAttr('rookieDampStrengthBonus'))
+
+
+class Effect5016(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Sensor Dampener',
+                                      'scanResolutionBonus', ship.getModifiedItemAttr('rookieDampStrengthBonus'))
+
+
+class Effect5017(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Repair Systems'),
+                                      'armorDamageAmount', ship.getModifiedItemAttr('rookieArmorRepBonus'))
+
+
+class Effect5018(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.ship.boostItemAttr('maxVelocity', ship.getModifiedItemAttr('rookieShipVelocityBonus'))
+
+
+class Effect5019(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Target Painter',
+                                      'signatureRadiusBonus', ship.getModifiedItemAttr('rookieTargetPainterStrengthBonus'))
+
+
+class Effect5020(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Small Projectile Turret'),
+                                      'damageMultiplier', ship.getModifiedItemAttr('rookieSPTDamageBonus'))
+
+
+class Effect5021(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Shield Operation'),
+                                      'shieldBonus', ship.getModifiedItemAttr('rookieShieldBoostBonus'))
+
+
+class Effect5028(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        for type in ('Gravimetric', 'Ladar', 'Radar', 'Magnetometric'):
+            fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'ECM',
+                                          'scan{0}StrengthBonus'.format(type),
+                                          ship.getModifiedItemAttr('rookieECMStrengthBonus'))
+
+
+class Effect5029(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Mining Drone Operation'),
+                                     'miningAmount',
+                                     src.getModifiedItemAttr('roleBonusDroneMiningYield'),
+                                     )
+
+
+class Effect5030(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context):
+        fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Mining Drone Operation'),
+                                     'miningAmount', container.getModifiedItemAttr('rookieDroneBonus'))
+
+
+class Effect5035(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        for type in ('shieldCapacity', 'armorHP', 'hp'):
+            fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Drones'),
+                                         type, ship.getModifiedItemAttr('rookieDroneBonus'))
+
+
+class Effect5036(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Salvaging'),
+                                      'duration', ship.getModifiedItemAttr('shipBonusAF'), skill='Amarr Frigate')
+
+
+class Effect5045(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Salvaging'),
+                                      'duration', ship.getModifiedItemAttr('shipBonusCF'), skill='Caldari Frigate')
+
+
+class Effect5048(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Salvaging'),
+                                      'duration', ship.getModifiedItemAttr('shipBonusGF'), skill='Amarr Frigate')
+
+
+class Effect5051(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Salvaging'),
+                                      'duration', ship.getModifiedItemAttr('shipBonusMF'), skill='Minmatar Frigate')
+
+
+class Effect5055(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemMultiply(lambda mod: mod.item.requiresSkill('Ice Harvesting'),
+                                         'duration', ship.getModifiedItemAttr('iceHarvestCycleBonus'))
+
+
+class Effect5058(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.modules.filteredItemMultiply(lambda mod: mod.item.requiresSkill('Mining'),
+                                         'miningAmount', module.getModifiedItemAttr('miningAmountMultiplier'))
+
+
+class Effect5059(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Ice Harvesting'),
+                                      'duration', container.getModifiedItemAttr('shipBonusORE3'), skill='Mining Barge')
+
+
+class Effect5066(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Target Painting'),
+                                      'maxRange', ship.getModifiedItemAttr('shipBonusMF'), skill='Minmatar Frigate')
+
+
+class Effect5067(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.ship.boostItemAttr('specialOreHoldCapacity', ship.getModifiedItemAttr('shipBonusORE2'), skill='Mining Barge')
+
+
+class Effect5068(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.ship.boostItemAttr('shieldCapacity', ship.getModifiedItemAttr('shipBonusORE2'), skill='Mining Barge')
+
+
+class Effect5069(EffectDef):
+
+    runTime = 'early'
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Mercoxit Processing'),
+                                        'specialisationAsteroidYieldMultiplier',
+                                        module.getModifiedItemAttr('miningAmountBonus'))
+
+
+class Effect5079(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Missile Launcher Operation'),
+                                        'kineticDamage', ship.getModifiedItemAttr('shipBonusCF2'), skill='Caldari Frigate')
+
+
+class Effect5080(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Missile Launcher Operation'),
+                                        'maxVelocity', ship.getModifiedItemAttr('shipBonusCF'), skill='Caldari Frigate')
+
+
+class Effect5081(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.ship.boostItemAttr('maxTargetRange', module.getModifiedItemAttr('maxTargetRangeBonus'),
+                               stackingPenalties=True)
+
+
+class Effect5087(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        for layer in ('shieldCapacity', 'armorHP', 'hp'):
+            fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Drones'),
+                                         layer, ship.getModifiedItemAttr('shipBonusGF'), skill='Gallente Frigate')
+
+
+class Effect5090(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Shield Operation'),
+                                      'shieldBonus', ship.getModifiedItemAttr('shipBonusMF'), skill='Minmatar Frigate')
+
+
+class Effect5103(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Shield Emission Systems'),
+                                      'capacitorNeed', ship.getModifiedItemAttr('shipBonusCF'), skill='Caldari Frigate')
+
+
+class Effect5104(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Shield Emission Systems'),
+                                      'shieldBonus', ship.getModifiedItemAttr('shipBonusCF2'), skill='Caldari Frigate')
+
+
+class Effect5105(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Shield Emission Systems'),
+                                      'capacitorNeed', ship.getModifiedItemAttr('shipBonusMF'), skill='Minmatar Frigate')
+
+
+class Effect5106(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Shield Emission Systems'),
+                                      'shieldBonus', ship.getModifiedItemAttr('shipBonusMF2'), skill='Minmatar Frigate')
+
+
+class Effect5107(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Remote Armor Repair Systems'), 'capacitorNeed',
+                                      src.getModifiedItemAttr('shipBonusGF'), skill='Gallente Frigate')
+
+
+class Effect5108(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Remote Armor Repair Systems'),
+                                      'armorDamageAmount', src.getModifiedItemAttr('shipBonusGF2'),
+                                      skill='Gallente Frigate')
+
+
+class Effect5109(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Remote Armor Repair Systems'), 'capacitorNeed',
+                                      src.getModifiedItemAttr('shipBonusAF'), skill='Amarr Frigate')
+
+
+class Effect5110(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Remote Armor Repair Systems'),
+                                      'armorDamageAmount', src.getModifiedItemAttr('shipBonus2AF'), skill='Amarr Frigate')
+
+
+class Effect5111(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Drones'),
+                                     'trackingSpeed', ship.getModifiedItemAttr('shipBonusGF'), skill='Gallente Frigate')
+
+
+class Effect5119(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.group.name == 'Scanner Probe',
+                                        'baseSensorStrength', ship.getModifiedItemAttr('shipBonus2AF'),
+                                        skill='Amarr Frigate')
+
+
+class Effect5121(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Remote Capacitor Transmitter',
+                                      'powerTransferAmount', ship.getModifiedItemAttr('energyTransferAmountBonus'))
+
+
+class Effect5122(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Shield Emission Systems'),
+                                      'capacitorNeed', ship.getModifiedItemAttr('shipBonusMC'), skill='Minmatar Cruiser')
+
+
+class Effect5123(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Remote Armor Repair Systems'), 'capacitorNeed',
+                                      src.getModifiedItemAttr('shipBonusAC'), skill='Amarr Cruiser')
+
+
+class Effect5124(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Remote Armor Repair Systems'),
+                                      'armorDamageAmount', src.getModifiedItemAttr('shipBonusAC2'), skill='Amarr Cruiser')
+
+
+class Effect5125(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Remote Armor Repair Systems'),
+                                      'armorDamageAmount', src.getModifiedItemAttr('shipBonusGC2'),
+                                      skill='Gallente Cruiser')
+
+
+class Effect5126(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Shield Emission Systems'),
+                                      'shieldBonus', ship.getModifiedItemAttr('shipBonusCC2'), skill='Caldari Cruiser')
+
+
+class Effect5127(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Shield Emission Systems'),
+                                      'shieldBonus', ship.getModifiedItemAttr('shipBonusMC2'), skill='Minmatar Cruiser')
+
+
+class Effect5128(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Sensor Dampener',
+                                      'maxRange', ship.getModifiedItemAttr('shipBonusGC'), skill='Gallente Cruiser')
+
+
+class Effect5129(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Target Painter',
+                                      'signatureRadiusBonus', ship.getModifiedItemAttr('shipBonusMC'),
+                                      skill='Minmatar Cruiser')
+
+
+class Effect5131(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        groups = ('Missile Launcher Heavy', 'Missile Launcher Rapid Light', 'Missile Launcher Heavy Assault')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name in groups,
+                                      'speed', ship.getModifiedItemAttr('shipBonusCC'), skill='Caldari Cruiser')
+
+
+class Effect5132(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Projectile Turret'),
+                                      'falloff', ship.getModifiedItemAttr('shipBonusMC2'), skill='Minmatar Cruiser')
+
+
+class Effect5133(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Hybrid Turret'),
+                                      'damageMultiplier', ship.getModifiedItemAttr('shipBonusCC'), skill='Caldari Cruiser')
+
+
+class Effect5136(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Energy Turret'),
+                                      'damageMultiplier', ship.getModifiedItemAttr('shipBonusAC'), skill='Amarr Cruiser')
+
+
+class Effect5139(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Mining'),
+                                      'miningAmount', module.getModifiedItemAttr('shipBonusOREfrig1'),
+                                      skill='Mining Frigate')
+
+
+class Effect5142(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.modules.filteredItemMultiply(lambda mod: mod.item.group.name == 'Gas Cloud Harvester',
+                                         'miningAmount', module.getModifiedItemAttr('miningAmountMultiplier'))
+
+
+class Effect5153(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Rockets'),
+                                        'maxVelocity', ship.getModifiedItemAttr('shipBonusRole7'))
+
+
+class Effect5156(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Gas Cloud Harvester',
+                                      'duration', module.getModifiedItemAttr('shipBonusOREfrig2'), skill='Mining Frigate')
+
+
+class Effect5162(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        lvl = src.level
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Armor Resistance Shift Hardener', 'capacitorNeed',
+                                      src.getModifiedItemAttr('capNeedBonus') * lvl)
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Resistance Phasing'), 'capacitorNeed',
+                                      src.getModifiedItemAttr('capNeedBonus') * lvl)
+
+
+class Effect5165(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Drones'),
+                                     'maxVelocity', ship.getModifiedItemAttr('shipBonusRole7'))
+
+
+class Effect5168(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context):
+        fit.drones.filteredItemIncrease(lambda drone: drone.item.requiresSkill('Salvage Drone Operation'),
+                                        'accessDifficultyBonus',
+                                        container.getModifiedItemAttr('accessDifficultyBonus') * container.level)
+
+
+class Effect5180(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context):
+        fit.ship.boostItemAttr('scanGravimetricStrength',
+                               container.getModifiedItemAttr('sensorStrengthBonus') * container.level)
+
+
+class Effect5181(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context):
+        fit.ship.boostItemAttr('scanLadarStrength', container.getModifiedItemAttr('sensorStrengthBonus') * container.level)
+
+
+class Effect5182(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context):
+        fit.ship.boostItemAttr('scanMagnetometricStrength',
+                               container.getModifiedItemAttr('sensorStrengthBonus') * container.level)
+
+
+class Effect5183(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context):
+        fit.ship.boostItemAttr('scanRadarStrength', container.getModifiedItemAttr('sensorStrengthBonus') * container.level)
+
+
+class Effect5185(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Energy Nosferatu',
+                                      'powerTransferAmount', ship.getModifiedItemAttr('shipBonus2AF'),
+                                      skill='Amarr Frigate')
+
+
+class Effect5187(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Sensor Dampener',
+                                      'falloffEffectiveness', ship.getModifiedItemAttr('shipBonusGC'),
+                                      skill='Gallente Cruiser')
+
+
+class Effect5188(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Hybrid Weapon',
+                                      'trackingSpeed', module.getModifiedItemAttr('trackingSpeedBonus'),
+                                      stackingPenalties=True)
+
+
+class Effect5189(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Energy Weapon',
+                                      'trackingSpeed', module.getModifiedItemAttr('trackingSpeedBonus'),
+                                      stackingPenalties=True)
+
+
+class Effect5190(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Projectile Weapon',
+                                      'trackingSpeed', module.getModifiedItemAttr('trackingSpeedBonus'),
+                                      stackingPenalties=True)
+
+
+class Effect5201(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context):
+        level = container.level
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Armor Reinforcer',
+                                      'massAddition', container.getModifiedItemAttr('massPenaltyReduction') * level)
+
+
+class Effect5205(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Small Energy Turret'),
+                                      'trackingSpeed', ship.getModifiedItemAttr('rookieSETTracking'))
+
+
+class Effect5206(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Small Energy Turret'),
+                                      'maxRange', ship.getModifiedItemAttr('rookieSETOptimal'))
+
+
+class Effect5207(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Energy Nosferatu',
+                                      'powerTransferAmount', ship.getModifiedItemAttr('rookieNosDrain'))
+
+
+class Effect5208(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Energy Neutralizer',
+                                      'energyNeutralizerAmount', ship.getModifiedItemAttr('rookieNeutDrain'))
+
+
+class Effect5209(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Stasis Web',
+                                      'speedFactor', ship.getModifiedItemAttr('rookieWebAmount'))
+
+
+class Effect5212(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.drones.filteredItemBoost(lambda mod: True,
+                                     'maxVelocity', ship.getModifiedItemAttr('rookieDroneMWDspeed'))
+
+
+class Effect5213(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Rockets'),
+                                        'maxVelocity', ship.getModifiedItemAttr('rookieRocketVelocity'))
+
+
+class Effect5214(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Light Missiles'),
+                                        'maxVelocity', ship.getModifiedItemAttr('rookieLightMissileVelocity'))
+
+
+class Effect5215(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Small Hybrid Turret'),
+                                      'trackingSpeed', ship.getModifiedItemAttr('rookieSHTTracking'))
+
+
+class Effect5216(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Small Hybrid Turret'),
+                                      'falloff', ship.getModifiedItemAttr('rookieSHTFalloff'))
+
+
+class Effect5217(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Small Projectile Turret'),
+                                      'trackingSpeed', ship.getModifiedItemAttr('rookieSPTTracking'))
+
+
+class Effect5218(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Small Projectile Turret'),
+                                      'falloff', ship.getModifiedItemAttr('rookieSPTFalloff'))
+
+
+class Effect5219(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Small Projectile Turret'),
+                                      'maxRange', ship.getModifiedItemAttr('rookieSPTOptimal'))
+
+
+class Effect5220(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Projectile Turret'),
+                                      'damageMultiplier', ship.getModifiedItemAttr('shipBonusRole7'))
+
+
+class Effect5221(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Heavy Assault Missiles'),
+                                        'emDamage', ship.getModifiedItemAttr('shipBonusRole7'))
+
+
+class Effect5222(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Heavy Assault Missiles'),
+                                        'kineticDamage', ship.getModifiedItemAttr('shipBonusRole7'))
+
+
+class Effect5223(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Heavy Assault Missiles'),
+                                        'thermalDamage', ship.getModifiedItemAttr('shipBonusRole7'))
+
+
+class Effect5224(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Heavy Assault Missiles'),
+                                        'explosiveDamage', ship.getModifiedItemAttr('shipBonusRole7'))
+
+
+class Effect5225(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Heavy Missiles'),
+                                        'emDamage', ship.getModifiedItemAttr('shipBonusRole7'))
+
+
+class Effect5226(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Heavy Missiles'),
+                                        'explosiveDamage', ship.getModifiedItemAttr('shipBonusRole7'))
+
+
+class Effect5227(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Heavy Missiles'),
+                                        'kineticDamage', ship.getModifiedItemAttr('shipBonusRole7'))
+
+
+class Effect5228(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Heavy Missiles'),
+                                        'thermalDamage', ship.getModifiedItemAttr('shipBonusRole7'))
+
+
+class Effect5229(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Astrometrics'),
+                                        'baseSensorStrength', container.getModifiedItemAttr('shipBonusRole8'))
+
+
+class Effect5230(EffectDef):
+
+    type = 'active'
+
+    @staticmethod
+    def handler(fit, module, context):
+        for damageType in ('kinetic', 'thermal', 'explosive', 'em'):
+            fit.ship.boostItemAttr('shield' + damageType.capitalize() + 'DamageResonance',
+                                   module.getModifiedItemAttr(damageType + 'DamageResistanceBonus'),
+                                   stackingPenalties=True)
+
+
+class Effect5231(EffectDef):
+
+    type = 'active'
+
+    @staticmethod
+    def handler(fit, module, context):
+        for damageType in ('kinetic', 'thermal', 'explosive', 'em'):
+            fit.ship.boostItemAttr('armor%sDamageResonance' % damageType.capitalize(),
+                                   module.getModifiedItemAttr('%sDamageResistanceBonus' % damageType),
+                                   stackingPenalties=True)
+
+
+class Effect5234(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredChargeBoost(
+            lambda mod: mod.charge.requiresSkill('Rockets') or mod.charge.requiresSkill('Light Missiles'),
+            'explosiveDamage', ship.getModifiedItemAttr('shipBonusCF2'), skill='Caldari Frigate')
+
+
+class Effect5237(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredChargeBoost(
+            lambda mod: mod.charge.requiresSkill('Rockets') or mod.charge.requiresSkill('Light Missiles'),
+            'kineticDamage', ship.getModifiedItemAttr('shipBonusCF2'), skill='Caldari Frigate')
+
+
+class Effect5240(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredChargeBoost(
+            lambda mod: mod.charge.requiresSkill('Rockets') or mod.charge.requiresSkill('Light Missiles'),
+            'thermalDamage', ship.getModifiedItemAttr('shipBonusCF2'), skill='Caldari Frigate')
+
+
+class Effect5243(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredChargeBoost(
+            lambda mod: mod.charge.requiresSkill('Rockets') or mod.charge.requiresSkill('Light Missiles'),
+            'emDamage', ship.getModifiedItemAttr('shipBonusCF2'), skill='Caldari Frigate')
+
+
+class Effect5259(EffectDef):
+
+    runTime = 'early'
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Cloaking Device',
+                                      'cpu', ship.getModifiedItemAttr('eliteBonusReconShip1'), skill='Recon Ships')
+
+
+class Effect5260(EffectDef):
+
+    runTime = 'early'
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Cloaking'),
+                                      'cpu', ship.getModifiedItemAttr('eliteBonusCovertOps1'), skill='Covert Ops')
+
+
+class Effect5261(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        module.increaseItemAttr('cpu', module.getModifiedItemAttr('covertCloakCPUAdd') or 0)
+
+
+class Effect5262(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.modules.filteredItemIncrease(lambda mod: mod.item.requiresSkill('Cloaking'),
+                                         'covertCloakCPUAdd', module.getModifiedItemAttr('covertCloakCPUPenalty'))
+
+
+class Effect5263(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.modules.filteredItemIncrease(lambda mod: mod.item.requiresSkill('Cynosural Field Theory'),
+                                         'covertCloakCPUAdd', module.getModifiedItemAttr('covertCloakCPUPenalty'))
+
+
+class Effect5264(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        module.increaseItemAttr('cpu', module.getModifiedItemAttr('warfareLinkCPUAdd') or 0)
+
+
+class Effect5265(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.modules.filteredItemIncrease(lambda mod: mod.item.requiresSkill('Leadership'),
+                                         'warfareLinkCPUAdd', module.getModifiedItemAttr('warfareLinkCPUPenalty'))
+
+
+class Effect5266(EffectDef):
+
+    runTime = 'early'
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Cloaking Device',
+                                      'cpu', ship.getModifiedItemAttr('eliteIndustrialCovertCloakBonus'),
+                                      skill='Transport Ships')
+
+
+class Effect5267(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Repair Systems'),
+                                      'power', module.getModifiedItemAttr('drawback'))
+
+
+class Effect5268(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Capital Repair Systems'),
+                                      'power', module.getModifiedItemAttr('drawback'))
+
+
+class Effect5275(EffectDef):
+
+    runTime = 'late'
+    type = 'active'
+
+    @staticmethod
+    def handler(fit, module, context):
+        if module.charge and module.charge.name == 'Nanite Repair Paste':
+            multiplier = 3
+        else:
+            multiplier = 1
+
+        amount = module.getModifiedItemAttr('armorDamageAmount') * multiplier
+        speed = module.getModifiedItemAttr('duration') / 1000.0
+        rps = amount / speed
+        fit.extraAttributes.increase('armorRepair', rps)
+        fit.extraAttributes.increase('armorRepairPreSpool', rps)
+        fit.extraAttributes.increase('armorRepairFullSpool', rps)
+
+
+class Effect5293(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Small Energy Turret'),
+                                      'capacitorNeed', ship.getModifiedItemAttr('shipBonusAD1'), skill='Amarr Destroyer')
+
+
+class Effect5294(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Small Energy Turret'),
+                                      'trackingSpeed', ship.getModifiedItemAttr('shipBonusAD2'), skill='Amarr Destroyer')
+
+
+class Effect5295(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill('Drones'), 'damageMultiplier',
+                                     src.getModifiedItemAttr('shipBonusAD1'), skill='Amarr Destroyer')
+
+
+class Effect5300(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill('Drones'), 'shieldCapacity',
+                                     src.getModifiedItemAttr('shipBonusAD1'), skill='Amarr Destroyer')
+        fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill('Drones'), 'hp',
+                                     src.getModifiedItemAttr('shipBonusAD1'), skill='Amarr Destroyer')
+        fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill('Drones'), 'armorHP',
+                                     src.getModifiedItemAttr('shipBonusAD1'), skill='Amarr Destroyer')
+
+
+class Effect5303(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Small Hybrid Turret'),
+                                      'maxRange', ship.getModifiedItemAttr('shipBonusCD1'), skill='Caldari Destroyer')
+
+
+class Effect5304(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Small Hybrid Turret'),
+                                      'trackingSpeed', ship.getModifiedItemAttr('shipBonusCD2'), skill='Caldari Destroyer')
+
+
+class Effect5305(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Light Missiles'),
+                                        'kineticDamage', ship.getModifiedItemAttr('shipBonusCD1'),
+                                        skill='Caldari Destroyer')
+
+
+class Effect5306(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Rockets'),
+                                        'kineticDamage', ship.getModifiedItemAttr('shipBonusCD1'),
+                                        skill='Caldari Destroyer')
+
+
+class Effect5307(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Rockets'),
+                                        'aoeVelocity', ship.getModifiedItemAttr('shipBonusCD2'), skill='Caldari Destroyer')
+
+
+class Effect5308(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Light Missiles'),
+                                        'aoeVelocity', ship.getModifiedItemAttr('shipBonusCD2'), skill='Caldari Destroyer')
+
+
+class Effect5309(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Small Hybrid Turret'),
+                                      'falloff', ship.getModifiedItemAttr('shipBonusGD1'), skill='Gallente Destroyer')
+
+
+class Effect5310(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Small Hybrid Turret'),
+                                      'trackingSpeed', ship.getModifiedItemAttr('shipBonusGD2'), skill='Gallente Destroyer')
+
+
+class Effect5311(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill('Drones'), 'damageMultiplier',
+                                     src.getModifiedItemAttr('shipBonusGD1'), skill='Gallente Destroyer')
+
+
+class Effect5316(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill('Drones'), 'shieldCapacity',
+                                     src.getModifiedItemAttr('shipBonusGD1'), skill='Gallente Destroyer')
+        fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill('Drones'), 'armorHP',
+                                     src.getModifiedItemAttr('shipBonusGD1'), skill='Gallente Destroyer')
+        fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill('Drones'), 'hp',
+                                     src.getModifiedItemAttr('shipBonusGD1'), skill='Gallente Destroyer')
+
+
+class Effect5317(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Small Projectile Turret'),
+                                      'damageMultiplier', ship.getModifiedItemAttr('shipBonusMD1'),
+                                      skill='Minmatar Destroyer')
+
+
+class Effect5318(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Small Projectile Turret'),
+                                      'trackingSpeed', ship.getModifiedItemAttr('shipBonusMD2'), skill='Minmatar Destroyer')
+
+
+class Effect5319(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Light Missiles'),
+                                        'explosiveDamage', ship.getModifiedItemAttr('shipBonusMD1'),
+                                        skill='Minmatar Destroyer')
+
+
+class Effect5320(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Rockets'),
+                                        'explosiveDamage', ship.getModifiedItemAttr('shipBonusMD1'),
+                                        skill='Minmatar Destroyer')
+
+
+class Effect5321(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('High Speed Maneuvering'),
+                                      'signatureRadiusBonus', ship.getModifiedItemAttr('shipBonusMD2'),
+                                      skill='Minmatar Destroyer')
+
+
+class Effect5322(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.ship.boostItemAttr('armorEmDamageResonance', ship.getModifiedItemAttr('shipBonusABC1'),
+                               skill='Amarr Battlecruiser')
+
+
+class Effect5323(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.ship.boostItemAttr('armorExplosiveDamageResonance', ship.getModifiedItemAttr('shipBonusABC1'),
+                               skill='Amarr Battlecruiser')
+
+
+class Effect5324(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.ship.boostItemAttr('armorKineticDamageResonance', ship.getModifiedItemAttr('shipBonusABC1'),
+                               skill='Amarr Battlecruiser')
+
+
+class Effect5325(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.ship.boostItemAttr('armorThermalDamageResonance', ship.getModifiedItemAttr('shipBonusABC1'),
+                               skill='Amarr Battlecruiser')
+
+
+class Effect5326(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Drones'),
+                                     'damageMultiplier', ship.getModifiedItemAttr('shipBonusABC2'),
+                                     skill='Amarr Battlecruiser')
+
+
+class Effect5331(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        for layer in ('shieldCapacity', 'armorHP', 'hp'):
+            fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Drones'),
+                                         layer, ship.getModifiedItemAttr('shipBonusABC2'), skill='Amarr Battlecruiser')
+
+
+class Effect5332(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Energy Turret'),
+                                      'capacitorNeed', ship.getModifiedItemAttr('shipBonusABC1'),
+                                      skill='Amarr Battlecruiser')
+
+
+class Effect5333(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Energy Turret'),
+                                      'damageMultiplier', ship.getModifiedItemAttr('shipBonusABC2'),
+                                      skill='Amarr Battlecruiser')
+
+
+class Effect5334(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Hybrid Turret'),
+                                      'maxRange', ship.getModifiedItemAttr('shipBonusCBC1'), skill='Caldari Battlecruiser')
+
+
+class Effect5335(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.ship.boostItemAttr('shieldEmDamageResonance', ship.getModifiedItemAttr('shipBonusCBC2'),
+                               skill='Caldari Battlecruiser')
+
+
+class Effect5336(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.ship.boostItemAttr('shieldExplosiveDamageResonance', ship.getModifiedItemAttr('shipBonusCBC2'),
+                               skill='Caldari Battlecruiser')
+
+
+class Effect5337(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.ship.boostItemAttr('shieldKineticDamageResonance', ship.getModifiedItemAttr('shipBonusCBC2'),
+                               skill='Caldari Battlecruiser')
+
+
+class Effect5338(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.ship.boostItemAttr('shieldThermalDamageResonance', ship.getModifiedItemAttr('shipBonusCBC2'),
+                               skill='Caldari Battlecruiser')
+
+
+class Effect5339(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Heavy Assault Missiles'),
+                                        'kineticDamage', ship.getModifiedItemAttr('shipBonusCBC1'),
+                                        skill='Caldari Battlecruiser')
+
+
+class Effect5340(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Heavy Missiles'),
+                                        'kineticDamage', ship.getModifiedItemAttr('shipBonusCBC1'),
+                                        skill='Caldari Battlecruiser')
+
+
+class Effect5341(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Hybrid Turret'),
+                                      'damageMultiplier', ship.getModifiedItemAttr('shipBonusGBC1'),
+                                      skill='Gallente Battlecruiser')
+
+
+class Effect5342(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Repair Systems'),
+                                      'armorDamageAmount', ship.getModifiedItemAttr('shipBonusGBC2'),
+                                      skill='Gallente Battlecruiser')
+
+
+class Effect5343(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Drones'),
+                                     'damageMultiplier', ship.getModifiedItemAttr('shipBonusGBC1'),
+                                     skill='Gallente Battlecruiser')
+
+
+class Effect5348(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        for layer in ('shieldCapacity', 'armorHP', 'hp'):
+            fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Drones'),
+                                         layer, ship.getModifiedItemAttr('shipBonusGBC1'), skill='Gallente Battlecruiser')
+
+
+class Effect5349(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Missile Launcher Heavy',
+                                      'speed', ship.getModifiedItemAttr('shipBonusMBC2'), skill='Minmatar Battlecruiser')
+
+
+class Effect5350(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Missile Launcher Heavy Assault',
+                                      'speed', ship.getModifiedItemAttr('shipBonusMBC2'), skill='Minmatar Battlecruiser')
+
+
+class Effect5351(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Shield Operation'),
+                                      'shieldBonus', ship.getModifiedItemAttr('shipBonusMBC1'),
+                                      skill='Minmatar Battlecruiser')
+
+
+class Effect5352(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Projectile Turret'),
+                                      'damageMultiplier', ship.getModifiedItemAttr('shipBonusMBC1'),
+                                      skill='Minmatar Battlecruiser')
+
+
+class Effect5353(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Projectile Turret'),
+                                      'speed', ship.getModifiedItemAttr('shipBonusMBC2'), skill='Minmatar Battlecruiser')
+
+
+class Effect5354(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Large Energy Turret'),
+                                      'capacitorNeed', ship.getModifiedItemAttr('shipBonusABC1'),
+                                      skill='Amarr Battlecruiser')
+
+
+class Effect5355(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Large Energy Turret'),
+                                      'damageMultiplier', ship.getModifiedItemAttr('shipBonusABC2'),
+                                      skill='Amarr Battlecruiser')
+
+
+class Effect5356(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Large Hybrid Turret'),
+                                      'maxRange', ship.getModifiedItemAttr('shipBonusCBC1'), skill='Caldari Battlecruiser')
+
+
+class Effect5357(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Large Hybrid Turret'),
+                                      'damageMultiplier', ship.getModifiedItemAttr('shipBonusCBC2'),
+                                      skill='Caldari Battlecruiser')
+
+
+class Effect5358(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Large Hybrid Turret'),
+                                      'trackingSpeed', ship.getModifiedItemAttr('shipBonusGBC1'),
+                                      skill='Gallente Battlecruiser')
+
+
+class Effect5359(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Large Hybrid Turret'),
+                                      'damageMultiplier', ship.getModifiedItemAttr('shipBonusGBC2'),
+                                      skill='Gallente Battlecruiser')
+
+
+class Effect5360(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Large Projectile Turret'),
+                                      'speed', ship.getModifiedItemAttr('shipBonusMBC1'), skill='Minmatar Battlecruiser')
+
+
+class Effect5361(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Large Projectile Turret'),
+                                      'falloff', ship.getModifiedItemAttr('shipBonusMBC2'), skill='Minmatar Battlecruiser')
+
+
+class Effect5364(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, booster, context):
+        fit.modules.filteredItemBoost(
+            lambda mod: mod.item.requiresSkill('Repair Systems') or mod.item.requiresSkill('Capital Repair Systems'),
+            'armorDamageAmount', booster.getModifiedItemAttr('armorDamageAmountBonus') or 0)
+
+
+class Effect5365(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Repair Systems'),
+                                      'armorDamageAmount', ship.getModifiedItemAttr('eliteBonusViolators2'),
+                                      skill='Marauders')
+
+
+class Effect5366(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Repair Systems'),
+                                      'armorDamageAmount', ship.getModifiedItemAttr('shipBonusATC2'))
+
+
+class Effect5367(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Repair Systems'),
+                                      'armorDamageAmount', ship.getModifiedItemAttr('shipBonusGB2'),
+                                      skill='Gallente Battleship')
+
+
+class Effect5378(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Heavy Missiles'),
+                                        'aoeCloudSize', ship.getModifiedItemAttr('shipBonusCBC1'),
+                                        skill='Caldari Battlecruiser')
+
+
+class Effect5379(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Heavy Assault Missiles'),
+                                        'aoeCloudSize', ship.getModifiedItemAttr('shipBonusCBC1'),
+                                        skill='Caldari Battlecruiser')
+
+
+class Effect5380(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Hybrid Turret'),
+                                      'trackingSpeed', ship.getModifiedItemAttr('shipBonusGBC2'),
+                                      skill='Gallente Battlecruiser')
+
+
+class Effect5381(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Energy Turret'),
+                                      'trackingSpeed', ship.getModifiedItemAttr('shipBonusABC1'),
+                                      skill='Amarr Battlecruiser')
+
+
+class Effect5382(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Energy Turret'),
+                                      'maxRange', ship.getModifiedItemAttr('shipBonusAC2'), skill='Amarr Cruiser')
+
+
+class Effect5383(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Missile Launcher Operation'),
+                                        'emDamage', ship.getModifiedItemAttr('shipBonusCC'), skill='Caldari Cruiser')
+
+
+class Effect5384(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Missile Launcher Operation'),
+                                        'thermalDamage', ship.getModifiedItemAttr('shipBonusCC'), skill='Caldari Cruiser')
+
+
+class Effect5385(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Missile Launcher Operation'),
+                                        'explosiveDamage', ship.getModifiedItemAttr('shipBonusCC'), skill='Caldari Cruiser')
+
+
+class Effect5386(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Missile Launcher Operation'),
+                                        'kineticDamage', ship.getModifiedItemAttr('shipBonusCC2'), skill='Caldari Cruiser')
+
+
+class Effect5387(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Heavy Assault Missiles'),
+                                        'aoeCloudSize', ship.getModifiedItemAttr('shipBonusCC2'), skill='Caldari Cruiser')
+
+
+class Effect5388(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Heavy Missiles'),
+                                        'aoeCloudSize', ship.getModifiedItemAttr('shipBonusCC2'), skill='Caldari Cruiser')
+
+
+class Effect5389(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Drones'),
+                                     'trackingSpeed', ship.getModifiedItemAttr('shipBonusGC'), skill='Gallente Cruiser')
+
+
+class Effect5390(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Drones'),
+                                     'maxVelocity', ship.getModifiedItemAttr('shipBonusGC'), skill='Gallente Cruiser')
+
+
+class Effect5397(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Astrometrics'),
+                                        'baseMaxScanDeviation',
+                                        module.getModifiedItemAttr('maxScanDeviationModifierModule'),
+                                        stackingPenalties=True)
+
+
+class Effect5398(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Astrometrics'),
+                                      'duration', module.getModifiedItemAttr('scanDurationBonus'))
+
+
+class Effect5399(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Astrometrics'),
+                                        'baseSensorStrength', module.getModifiedItemAttr('scanStrengthBonusModule'),
+                                        stackingPenalties=True)
+
+
+class Effect5402(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Heavy Assault Missiles'),
+                                        'maxVelocity', ship.getModifiedItemAttr('shipBonusABC2'),
+                                        skill='Amarr Battlecruiser')
+
+
+class Effect5403(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Heavy Missiles'),
+                                        'maxVelocity', ship.getModifiedItemAttr('shipBonusABC2'),
+                                        skill='Amarr Battlecruiser')
+
+
+class Effect5410(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Energy Turret'),
+                                      'capacitorNeed', ship.getModifiedItemAttr('shipBonusABC2'),
+                                      skill='Amarr Battlecruiser')
+
+
+class Effect5411(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Missile Launcher Operation'),
+                                        'maxVelocity', ship.getModifiedItemAttr('shipBonusCD1'), skill='Caldari Destroyer')
+
+
+class Effect5417(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Drones'),
+                                     'damageMultiplier', ship.getModifiedItemAttr('shipBonusAB'), skill='Amarr Battleship')
+
+
+class Effect5418(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Drones'),
+                                     'armorHP', ship.getModifiedItemAttr('shipBonusAB'), skill='Amarr Battleship')
+
+
+class Effect5419(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Drones'),
+                                     'shieldCapacity', ship.getModifiedItemAttr('shipBonusAB'), skill='Amarr Battleship')
+
+
+class Effect5420(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Drones'),
+                                     'hp', ship.getModifiedItemAttr('shipBonusAB'), skill='Amarr Battleship')
+
+
+class Effect5424(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Large Hybrid Turret'),
+                                      'speed', ship.getModifiedItemAttr('shipBonusGB'), skill='Gallente Battleship')
+
+
+class Effect5427(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Drones'),
+                                     'trackingSpeed', ship.getModifiedItemAttr('shipBonusGB'), skill='Gallente Battleship')
+
+
+class Effect5428(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Drones'),
+                                     'maxRange', ship.getModifiedItemAttr('shipBonusGB'), skill='Gallente Battleship')
+
+
+class Effect5429(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Torpedoes'),
+                                        'aoeVelocity', ship.getModifiedItemAttr('shipBonusMB2'),
+                                        skill='Minmatar Battleship')
+
+
+class Effect5430(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Cruise Missiles'),
+                                        'aoeVelocity', ship.getModifiedItemAttr('shipBonusMB2'),
+                                        skill='Minmatar Battleship')
+
+
+class Effect5431(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Large Energy Turret'),
+                                      'trackingSpeed', ship.getModifiedItemAttr('shipBonusAB'), skill='Amarr Battleship')
+
+
+class Effect5433(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context):
+        level = container.level if 'skill' in context else 1
+        fit.modules.filteredItemIncrease(lambda mod: mod.item.requiresSkill('Hacking'),
+                                         'virusCoherence', container.getModifiedItemAttr('virusCoherenceBonus') * level)
+
+
+class Effect5437(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context):
+        level = container.level if 'skill' in context else 1
+        fit.modules.filteredItemIncrease(lambda mod: mod.item.requiresSkill('Archaeology'),
+                                         'virusCoherence', container.getModifiedItemAttr('virusCoherenceBonus') * level)
+
+
+class Effect5440(EffectDef):
+
+    runTime = 'early'
+    type = ('projected', 'passive')
+
+    @staticmethod
+    def handler(fit, beacon, context):
+        fit.modules.filteredChargeMultiply(lambda mod: mod.charge.requiresSkill('Light Missiles'),
+                                           'kineticDamage', beacon.getModifiedItemAttr('smallWeaponDamageMultiplier'),
+                                           stackingPenalties=True, penaltyGroup='postMul')
+
+
+class Effect5444(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Torpedoes'),
+                                        'aoeCloudSize', ship.getModifiedItemAttr('shipBonusCB'), skill='Caldari Battleship')
+
+
+class Effect5445(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Cruise Missiles'),
+                                        'aoeCloudSize', ship.getModifiedItemAttr('shipBonusCB'), skill='Caldari Battleship')
+
+
+class Effect5456(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Missile Launcher Cruise',
+                                      'speed', ship.getModifiedItemAttr('shipBonusCB'), skill='Caldari Battleship')
+
+
+class Effect5457(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Missile Launcher Torpedo',
+                                      'speed', ship.getModifiedItemAttr('shipBonusCB'), skill='Caldari Battleship')
+
+
+class Effect5459(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemIncrease(lambda mod: mod.item.requiresSkill('Hacking'), 'virusStrength', src.getModifiedItemAttr('virusStrengthBonus'))
+
+
+class Effect5460(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context):
+        level = container.level if 'skill' in context else 1
+        fit.modules.filteredItemIncrease(
+            lambda mod: (mod.item.requiresSkill('Hacking') or mod.item.requiresSkill('Archaeology')),
+            'virusStrength', container.getModifiedItemAttr('virusStrengthBonus') * level)
+
+
+class Effect5461(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.ship.boostItemAttr('shieldRechargeRate', module.getModifiedItemAttr('rechargeratebonus') or 0)
+
+
+class Effect5468(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.ship.boostItemAttr('agility', ship.getModifiedItemAttr('shipBonusCI2'), skill='Caldari Industrial')
+
+
+class Effect5469(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.ship.boostItemAttr('agility', ship.getModifiedItemAttr('shipBonusMI2'), skill='Minmatar Industrial')
+
+
+class Effect5470(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.ship.boostItemAttr('agility', ship.getModifiedItemAttr('shipBonusGI2'), skill='Gallente Industrial')
+
+
+class Effect5471(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.ship.boostItemAttr('agility', ship.getModifiedItemAttr('shipBonusAI2'), skill='Amarr Industrial')
+
+
+class Effect5476(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.ship.boostItemAttr('specialOreHoldCapacity', ship.getModifiedItemAttr('shipBonusGI2'),
+                               skill='Gallente Industrial')
+
+
+class Effect5477(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.ship.boostItemAttr('specialAmmoHoldCapacity', ship.getModifiedItemAttr('shipBonusMI2'),
+                               skill='Minmatar Industrial')
+
+
+class Effect5478(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.ship.boostItemAttr('specialPlanetaryCommoditiesHoldCapacity', ship.getModifiedItemAttr('shipBonusGI2'),
+                               skill='Gallente Industrial')
+
+
+class Effect5479(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.ship.boostItemAttr('specialMineralHoldCapacity', ship.getModifiedItemAttr('shipBonusGI2'),
+                               skill='Gallente Industrial')
+
+
+class Effect5480(EffectDef):
+
+    runTime = 'early'
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, implant, context):
+        fit.appliedImplants.filteredItemMultiply(lambda mod: mod.item.group.name == 'Special Edition Implant',
+                                                 'implantBonusVelocity', implant.getModifiedItemAttr('implantSetChristmas'))
+
+
+class Effect5482(EffectDef):
+
+    runTime = 'early'
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, implant, context):
+        fit.appliedImplants.filteredItemMultiply(lambda mod: mod.item.group.name == 'Special Edition Implant',
+                                                 'agilityBonus', implant.getModifiedItemAttr('implantSetChristmas'))
+
+
+class Effect5483(EffectDef):
+
+    runTime = 'early'
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, implant, context):
+        fit.appliedImplants.filteredItemMultiply(lambda mod: mod.item.group.name == 'Special Edition Implant',
+                                                 'shieldCapacityBonus', implant.getModifiedItemAttr('implantSetChristmas'))
+
+
+class Effect5484(EffectDef):
+
+    runTime = 'early'
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, implant, context):
+        fit.appliedImplants.filteredItemMultiply(lambda mod: mod.item.group.name == 'Special Edition Implant',
+                                                 'armorHpBonus2', implant.getModifiedItemAttr('implantSetChristmas'))
+
+
+class Effect5485(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Small Projectile Turret'),
+                                      'maxRange', ship.getModifiedItemAttr('shipBonusMF'), skill='Minmatar Frigate')
+
+
+class Effect5486(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Projectile Turret'),
+                                      'damageMultiplier', ship.getModifiedItemAttr('shipBonusMBC2'),
+                                      skill='Minmatar Battlecruiser')
+
+
+class Effect5496(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Missile Launcher Heavy Assault',
+                                      'speed', ship.getModifiedItemAttr('eliteBonusCommandShips1'), skill='Command Ships')
+
+
+class Effect5497(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Missile Launcher Heavy',
+                                      'speed', ship.getModifiedItemAttr('eliteBonusCommandShips1'), skill='Command Ships')
+
+
+class Effect5498(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Heavy Assault Missiles'),
+                                        'aoeVelocity', ship.getModifiedItemAttr('eliteBonusCommandShips2'),
+                                        skill='Command Ships')
+
+
+class Effect5499(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Heavy Assault Missiles'),
+                                        'aoeCloudSize', ship.getModifiedItemAttr('eliteBonusCommandShips2'),
+                                        skill='Command Ships')
+
+
+class Effect5500(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Heavy Missiles'),
+                                        'aoeCloudSize', ship.getModifiedItemAttr('eliteBonusCommandShips2'),
+                                        skill='Command Ships')
+
+
+class Effect5501(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Hybrid Turret'),
+                                      'damageMultiplier', ship.getModifiedItemAttr('eliteBonusCommandShips2'),
+                                      skill='Command Ships')
+
+
+class Effect5502(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Hybrid Turret'),
+                                      'trackingSpeed', ship.getModifiedItemAttr('eliteBonusCommandShips1'),
+                                      skill='Command Ships')
+
+
+class Effect5503(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Heavy Drone Operation'),
+                                     'trackingSpeed', ship.getModifiedItemAttr('eliteBonusCommandShips2'),
+                                     skill='Command Ships')
+
+
+class Effect5504(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Heavy Drone Operation'),
+                                     'maxVelocity', ship.getModifiedItemAttr('eliteBonusCommandShips2'),
+                                     skill='Command Ships')
+
+
+class Effect5505(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Hybrid Turret'),
+                                      'speed', ship.getModifiedItemAttr('eliteBonusCommandShips1'), skill='Command Ships')
+
+
+class Effect5514(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        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'), skill='Command Ships')
+
+
+class Effect5521(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        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'), skill='Command Ships')
+
+
+class Effect5539(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Heavy Missiles'),
+                                        'kineticDamage', ship.getModifiedItemAttr('shipBonusAC'), skill='Amarr Cruiser')
+
+
+class Effect5540(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Heavy Missiles'),
+                                        'emDamage', ship.getModifiedItemAttr('shipBonusAC'), skill='Amarr Cruiser')
+
+
+class Effect5541(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Heavy Missiles'),
+                                        'thermalDamage', ship.getModifiedItemAttr('shipBonusAC'), skill='Amarr Cruiser')
+
+
+class Effect5542(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Heavy Missiles'),
+                                        'explosiveDamage', ship.getModifiedItemAttr('shipBonusAC'), skill='Amarr Cruiser')
+
+
+class Effect5552(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Heavy Missiles'),
+                                        'maxVelocity', ship.getModifiedItemAttr('eliteBonusHeavyGunship1'),
+                                        skill='Heavy Assault Cruisers')
+
+
+class Effect5553(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Heavy Assault Missiles'),
+                                        'maxVelocity', ship.getModifiedItemAttr('eliteBonusHeavyGunship1'),
+                                        skill='Heavy Assault Cruisers')
+
+
+class Effect5554(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Repair Systems'),
+                                      'armorDamageAmount', ship.getModifiedItemAttr('shipBonusGC2'),
+                                      skill='Gallente Cruiser')
+
+
+class Effect5555(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Heavy Drone Operation'),
+                                     'maxVelocity', ship.getModifiedItemAttr('shipBonusGC'), skill='Gallente Cruiser')
+
+
+class Effect5556(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Heavy Drone Operation'),
+                                     'trackingSpeed', ship.getModifiedItemAttr('shipBonusGC'), skill='Gallente Cruiser')
+
+
+class Effect5557(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Sentry Drone Interfacing'),
+                                     'maxRange', ship.getModifiedItemAttr('eliteBonusHeavyGunship2'),
+                                     skill='Heavy Assault Cruisers')
+
+
+class Effect5558(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Sentry Drone Interfacing'),
+                                     'trackingSpeed', ship.getModifiedItemAttr('eliteBonusHeavyGunship2'),
+                                     skill='Heavy Assault Cruisers')
+
+
+class Effect5559(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Shield Operation'),
+                                      'shieldBonus', ship.getModifiedItemAttr('shipBonusMC2'), skill='Minmatar Cruiser')
+
+
+class Effect5560(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Micro Jump Drive',
+                                      'moduleReactivationDelay', ship.getModifiedItemAttr('roleBonusMarauder'))
+
+
+class Effect5564(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Skirmish Command'),
+                                      'warfareBuff2Value', src.getModifiedItemAttr('subsystemBonusCaldariOffensive'), skill='Caldari Offensive Systems')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Skirmish Command'),
+                                      'warfareBuff4Value', src.getModifiedItemAttr('subsystemBonusCaldariOffensive'), skill='Caldari Offensive Systems')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Skirmish Command'),
+                                      'warfareBuff3Value', src.getModifiedItemAttr('subsystemBonusCaldariOffensive'), skill='Caldari Offensive Systems')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Skirmish Command'),
+                                      'warfareBuff1Value', src.getModifiedItemAttr('subsystemBonusCaldariOffensive'), skill='Caldari Offensive Systems')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Skirmish Command'),
+                                      'buffDuration', src.getModifiedItemAttr('subsystemBonusCaldariOffensive'), skill='Caldari Offensive Systems')
+
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Shield Command'),
+                                      'buffDuration', src.getModifiedItemAttr('subsystemBonusCaldariOffensive'), skill='Caldari Offensive Systems')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Shield Command'),
+                                      'warfareBuff1Value', src.getModifiedItemAttr('subsystemBonusCaldariOffensive'), skill='Caldari Offensive Systems')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Shield Command'),
+                                      'warfareBuff3Value', src.getModifiedItemAttr('subsystemBonusCaldariOffensive'), skill='Caldari Offensive Systems')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Shield Command'),
+                                      'warfareBuff2Value', src.getModifiedItemAttr('subsystemBonusCaldariOffensive'), skill='Caldari Offensive Systems')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Shield Command'),
+                                      'warfareBuff4Value', src.getModifiedItemAttr('subsystemBonusCaldariOffensive'), skill='Caldari Offensive Systems')
+
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Information Command'),
+                                      'buffDuration', src.getModifiedItemAttr('subsystemBonusCaldariOffensive'), skill='Caldari Offensive Systems')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Information Command'),
+                                      'warfareBuff3Value', src.getModifiedItemAttr('subsystemBonusCaldariOffensive'), skill='Caldari Offensive Systems')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Information Command'),
+                                      'warfareBuff1Value', src.getModifiedItemAttr('subsystemBonusCaldariOffensive'), skill='Caldari Offensive Systems')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Information Command'),
+                                      'warfareBuff4Value', src.getModifiedItemAttr('subsystemBonusCaldariOffensive'), skill='Caldari Offensive Systems')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Information Command'),
+                                      'warfareBuff2Value', src.getModifiedItemAttr('subsystemBonusCaldariOffensive'), skill='Caldari Offensive Systems')
+
+
+class Effect5568(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Skirmish Command'),
+                                      'warfareBuff1Value', src.getModifiedItemAttr('subsystemBonusGallenteOffensive'), skill='Gallente Offensive Systems')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Skirmish Command'),
+                                      'warfareBuff4Value', src.getModifiedItemAttr('subsystemBonusGallenteOffensive'), skill='Gallente Offensive Systems')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Skirmish Command'),
+                                      'buffDuration', src.getModifiedItemAttr('subsystemBonusGallenteOffensive'), skill='Gallente Offensive Systems')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Skirmish Command'),
+                                      'warfareBuff2Value', src.getModifiedItemAttr('subsystemBonusGallenteOffensive'), skill='Gallente Offensive Systems')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Skirmish Command'),
+                                      'warfareBuff3Value', src.getModifiedItemAttr('subsystemBonusGallenteOffensive'), skill='Gallente Offensive Systems')
+
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Armored Command'),
+                                      'warfareBuff4Value', src.getModifiedItemAttr('subsystemBonusGallenteOffensive'), skill='Gallente Offensive Systems')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Armored Command'),
+                                      'warfareBuff1Value', src.getModifiedItemAttr('subsystemBonusGallenteOffensive'), skill='Gallente Offensive Systems')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Armored Command'),
+                                      'warfareBuff2Value', src.getModifiedItemAttr('subsystemBonusGallenteOffensive'), skill='Gallente Offensive Systems')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Armored Command'),
+                                      'buffDuration', src.getModifiedItemAttr('subsystemBonusGallenteOffensive'), skill='Gallente Offensive Systems')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Armored Command'),
+                                      'warfareBuff3Value', src.getModifiedItemAttr('subsystemBonusGallenteOffensive'), skill='Gallente Offensive Systems')
+
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Information Command'),
+                                      'warfareBuff3Value', src.getModifiedItemAttr('subsystemBonusGallenteOffensive'), skill='Gallente Offensive Systems')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Information Command'),
+                                      'warfareBuff1Value', src.getModifiedItemAttr('subsystemBonusGallenteOffensive'), skill='Gallente Offensive Systems')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Information Command'),
+                                      'warfareBuff2Value', src.getModifiedItemAttr('subsystemBonusGallenteOffensive'), skill='Gallente Offensive Systems')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Information Command'),
+                                      'buffDuration', src.getModifiedItemAttr('subsystemBonusGallenteOffensive'), skill='Gallente Offensive Systems')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Information Command'),
+                                      'warfareBuff4Value', src.getModifiedItemAttr('subsystemBonusGallenteOffensive'), skill='Gallente Offensive Systems')
+
+
+class Effect5570(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Skirmish Command'),
+                                      'warfareBuff1Value', src.getModifiedItemAttr('subsystemBonusMinmatarOffensive'), skill='Minmatar Offensive Systems')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Skirmish Command'),
+                                      'warfareBuff2Value', src.getModifiedItemAttr('subsystemBonusMinmatarOffensive'), skill='Minmatar Offensive Systems')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Skirmish Command'),
+                                      'buffDuration', src.getModifiedItemAttr('subsystemBonusMinmatarOffensive'), skill='Minmatar Offensive Systems')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Skirmish Command'),
+                                      'warfareBuff4Value', src.getModifiedItemAttr('subsystemBonusMinmatarOffensive'), skill='Minmatar Offensive Systems')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Skirmish Command'),
+                                      'warfareBuff3Value', src.getModifiedItemAttr('subsystemBonusMinmatarOffensive'), skill='Minmatar Offensive Systems')
+
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Shield Command'),
+                                      'warfareBuff3Value', src.getModifiedItemAttr('subsystemBonusMinmatarOffensive'), skill='Minmatar Offensive Systems')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Shield Command'),
+                                      'warfareBuff2Value', src.getModifiedItemAttr('subsystemBonusMinmatarOffensive'), skill='Minmatar Offensive Systems')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Shield Command'),
+                                      'buffDuration', src.getModifiedItemAttr('subsystemBonusMinmatarOffensive'), skill='Minmatar Offensive Systems')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Shield Command'),
+                                      'warfareBuff4Value', src.getModifiedItemAttr('subsystemBonusMinmatarOffensive'), skill='Minmatar Offensive Systems')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Shield Command'),
+                                      'war'
+                                      'fareBuff1Value', src.getModifiedItemAttr('subsystemBonusMinmatarOffensive'), skill='Minmatar Offensive Systems')
+
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Armored Command'),
+                                      'warfareBuff3Value', src.getModifiedItemAttr('subsystemBonusMinmatarOffensive'), skill='Minmatar Offensive Systems')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Armored Command'),
+                                      'warfareBuff4Value', src.getModifiedItemAttr('subsystemBonusMinmatarOffensive'), skill='Minmatar Offensive Systems')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Armored Command'),
+                                      'warfareBuff1Value', src.getModifiedItemAttr('subsystemBonusMinmatarOffensive'), skill='Minmatar Offensive Systems')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Armored Command'),
+                                      'buffDuration', src.getModifiedItemAttr('subsystemBonusMinmatarOffensive'), skill='Minmatar Offensive Systems')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Armored Command'),
+                                      'warfareBuff2Value', src.getModifiedItemAttr('subsystemBonusMinmatarOffensive'), skill='Minmatar Offensive Systems')
+
+
+class Effect5572(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Armored Command'), 'warfareBuff3Value',
+                                      src.getModifiedItemAttr('eliteBonusCommandShips3'), skill='Command Ships')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Armored Command'), 'warfareBuff1Value',
+                                      src.getModifiedItemAttr('eliteBonusCommandShips3'), skill='Command Ships')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Armored Command'), 'warfareBuff2Value',
+                                      src.getModifiedItemAttr('eliteBonusCommandShips3'), skill='Command Ships')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Armored Command'), 'buffDuration',
+                                      src.getModifiedItemAttr('eliteBonusCommandShips3'), skill='Command Ships')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Armored Command'), 'warfareBuff4Value',
+                                      src.getModifiedItemAttr('eliteBonusCommandShips3'), skill='Command Ships')
+
+
+class Effect5573(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Shield Command'), 'warfareBuff1Value',
+                                      src.getModifiedItemAttr('eliteBonusCommandShips3'), skill='Command Ships')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Shield Command'), 'warfareBuff4Value',
+                                      src.getModifiedItemAttr('eliteBonusCommandShips3'), skill='Command Ships')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Shield Command'), 'warfareBuff2Value',
+                                      src.getModifiedItemAttr('eliteBonusCommandShips3'), skill='Command Ships')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Shield Command'), 'buffDuration',
+                                      src.getModifiedItemAttr('eliteBonusCommandShips3'), skill='Command Ships')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Shield Command'), 'warfareBuff3Value',
+                                      src.getModifiedItemAttr('eliteBonusCommandShips3'), skill='Command Ships')
+
+
+class Effect5574(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Skirmish Command'), 'warfareBuff2Value',
+                                      src.getModifiedItemAttr('eliteBonusCommandShips3'), skill='Command Ships')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Skirmish Command'), 'warfareBuff1Value',
+                                      src.getModifiedItemAttr('eliteBonusCommandShips3'), skill='Command Ships')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Skirmish Command'), 'warfareBuff3Value',
+                                      src.getModifiedItemAttr('eliteBonusCommandShips3'), skill='Command Ships')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Skirmish Command'), 'warfareBuff4Value',
+                                      src.getModifiedItemAttr('eliteBonusCommandShips3'), skill='Command Ships')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Skirmish Command'), 'buffDuration',
+                                      src.getModifiedItemAttr('eliteBonusCommandShips3'), skill='Command Ships')
+
+
+class Effect5575(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Information Command'), 'buffDuration',
+                                      src.getModifiedItemAttr('eliteBonusCommandShips3'), skill='Command Ships')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Information Command'), 'warfareBuff3Value',
+                                      src.getModifiedItemAttr('eliteBonusCommandShips3'), skill='Command Ships')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Information Command'), 'warfareBuff2Value',
+                                      src.getModifiedItemAttr('eliteBonusCommandShips3'), skill='Command Ships')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Information Command'), 'warfareBuff1Value',
+                                      src.getModifiedItemAttr('eliteBonusCommandShips3'), skill='Command Ships')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Information Command'), 'warfareBuff4Value',
+                                      src.getModifiedItemAttr('eliteBonusCommandShips3'), skill='Command Ships')
+
+
+class Effect5607(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context):
+        level = container.level if 'skill' in context else 1
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Capacitor Emission Systems'),
+                                      'capacitorNeed', container.getModifiedItemAttr('capNeedBonus') * level)
+
+
+class Effect5610(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Large Energy Turret'),
+                                      'maxRange', ship.getModifiedItemAttr('shipBonusAB'), skill='Amarr Battleship')
+
+
+class Effect5611(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Large Hybrid Turret'),
+                                      'falloff', ship.getModifiedItemAttr('shipBonusGB2'), skill='Gallente Battleship')
+
+
+class Effect5618(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Missile Launcher Rapid Heavy',
+                                      'speed', ship.getModifiedItemAttr('shipBonus2CB'), skill='Caldari Battleship')
+
+
+class Effect5619(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Missile Launcher Rapid Heavy',
+                                      'speed', ship.getModifiedItemAttr('shipBonusCB'), skill='Caldari Battleship')
+
+
+class Effect5620(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Missile Launcher Rapid Heavy',
+                                      'speed', ship.getModifiedItemAttr('shipBonusMB'), skill='Minmatar Battleship')
+
+
+class Effect5621(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Missile Launcher Cruise',
+                                      'speed', ship.getModifiedItemAttr('shipBonusMB'), skill='Minmatar Battleship')
+
+
+class Effect5622(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Missile Launcher Torpedo',
+                                      'speed', ship.getModifiedItemAttr('shipBonusMB'), skill='Minmatar Battleship')
+
+
+class Effect5628(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Cruise Missiles'),
+                                        'emDamage', ship.getModifiedItemAttr('shipBonusMB'), skill='Minmatar Battleship')
+
+
+class Effect5629(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Cruise Missiles'),
+                                        'thermalDamage', ship.getModifiedItemAttr('shipBonusMB'),
+                                        skill='Minmatar Battleship')
+
+
+class Effect5630(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Cruise Missiles'),
+                                        'kineticDamage', ship.getModifiedItemAttr('shipBonusMB'),
+                                        skill='Minmatar Battleship')
+
+
+class Effect5631(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Cruise Missiles'),
+                                        'explosiveDamage', ship.getModifiedItemAttr('shipBonusMB'),
+                                        skill='Minmatar Battleship')
+
+
+class Effect5632(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Torpedoes'),
+                                        'explosiveDamage', ship.getModifiedItemAttr('shipBonusMB'),
+                                        skill='Minmatar Battleship')
+
+
+class Effect5633(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Torpedoes'),
+                                        'emDamage', ship.getModifiedItemAttr('shipBonusMB'), skill='Minmatar Battleship')
+
+
+class Effect5634(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Torpedoes'),
+                                        'thermalDamage', ship.getModifiedItemAttr('shipBonusMB'),
+                                        skill='Minmatar Battleship')
+
+
+class Effect5635(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Torpedoes'),
+                                        'kineticDamage', ship.getModifiedItemAttr('shipBonusMB'),
+                                        skill='Minmatar Battleship')
+
+
+class Effect5636(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Heavy Missiles'),
+                                        'emDamage', ship.getModifiedItemAttr('shipBonusMB'), skill='Minmatar Battleship')
+
+
+class Effect5637(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Heavy Missiles'),
+                                        'thermalDamage', ship.getModifiedItemAttr('shipBonusMB'),
+                                        skill='Minmatar Battleship')
+
+
+class Effect5638(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Heavy Missiles'),
+                                        'kineticDamage', ship.getModifiedItemAttr('shipBonusMB'),
+                                        skill='Minmatar Battleship')
+
+
+class Effect5639(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Heavy Missiles'),
+                                        'explosiveDamage', ship.getModifiedItemAttr('shipBonusMB'),
+                                        skill='Minmatar Battleship')
+
+
+class Effect5644(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Missile Launcher Operation'),
+                                        'maxVelocity', ship.getModifiedItemAttr('shipBonusCC2'), skill='Caldari Cruiser')
+
+
+class Effect5647(EffectDef):
+
+    runTime = 'early'
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Cloaking'),
+                                      'cpu', ship.getModifiedItemAttr('shipBonusRole7'))
+
+
+class Effect5650(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        damageTypes = ('Em', 'Explosive', 'Kinetic', 'Thermal')
+        for damageType in damageTypes:
+            fit.ship.boostItemAttr('armor{0}DamageResonance'.format(damageType), ship.getModifiedItemAttr('shipBonusAF'),
+                                   skill='Amarr Frigate')
+
+
+class Effect5657(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        damageTypes = ('Em', 'Explosive', 'Kinetic', 'Thermal')
+        for damageType in damageTypes:
+            fit.ship.boostItemAttr('shield{0}DamageResonance'.format(damageType),
+                                   ship.getModifiedItemAttr('eliteBonusInterceptor2'), skill='Interceptors')
+
+
+class Effect5673(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Small Projectile Turret'),
+                                      'damageMultiplier', ship.getModifiedItemAttr('eliteBonusInterceptor2'),
+                                      skill='Interceptors')
+
+
+class Effect5676(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredChargeBoost(
+            lambda mod: mod.charge.requiresSkill('Rockets') or mod.charge.requiresSkill('Light Missiles'),
+            'aoeCloudSize', ship.getModifiedItemAttr('shipBonusCD2'), skill='Caldari Destroyer')
+
+
+class Effect5688(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Missile Launcher Operation'),
+                                        'maxVelocity', ship.getModifiedItemAttr('shipBonusAD2'), skill='Amarr Destroyer')
+
+
+class Effect5695(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        for damageType in ('Em', 'Thermal', 'Explosive', 'Kinetic'):
+            fit.ship.boostItemAttr('armor%sDamageResonance' % damageType,
+                                   ship.getModifiedItemAttr('eliteBonusInterdictors1'), skill='Interdictors')
+
+
+class Effect5717(EffectDef):
+
+    runTime = 'early'
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, implant, context):
+        fit.appliedImplants.filteredItemMultiply(lambda mod: mod.item.group.name == 'Cyberimplant',
+                                                 'WarpSBonus', implant.getModifiedItemAttr('implantSetWarpSpeed'))
+
+
+class Effect5721(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Energy Turret'),
+                                      'maxRange', ship.getModifiedItemAttr('shipBonusRole7'))
+
+
+class Effect5722(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Small Hybrid Turret'),
+                                      'maxRange', ship.getModifiedItemAttr('shipBonusGD1'), skill='Gallente Destroyer')
+
+
+class Effect5723(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('High Speed Maneuvering'),
+                                      'signatureRadiusBonus', ship.getModifiedItemAttr('eliteBonusInterdictors2'),
+                                      skill='Interdictors')
+
+
+class Effect5724(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Small Hybrid Turret'),
+                                      'maxRange', ship.getModifiedItemAttr('shipBonusGF'), skill='Gallente Frigate')
+
+
+class Effect5725(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Remote Armor Repair Systems'),
+                                      'armorDamageAmount', ship.getModifiedItemAttr('shipBonusRole7'))
+
+
+class Effect5726(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Large Energy Turret'),
+                                      'maxRange', ship.getModifiedItemAttr('shipBonusRole7'))
+
+
+class Effect5733(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Heavy Missiles'),
+                                        'explosiveDamage', ship.getModifiedItemAttr('eliteBonusViolatorsRole1'))
+
+
+class Effect5734(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Heavy Missiles'),
+                                        'kineticDamage', ship.getModifiedItemAttr('eliteBonusViolatorsRole1'))
+
+
+class Effect5735(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Heavy Missiles'),
+                                        'emDamage', ship.getModifiedItemAttr('eliteBonusViolatorsRole1'))
+
+
+class Effect5736(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Heavy Missiles'),
+                                        'thermalDamage', ship.getModifiedItemAttr('eliteBonusViolatorsRole1'))
+
+
+class Effect5737(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Astrometrics'),
+                                        'baseSensorStrength', ship.getModifiedItemAttr('shipBonusRole7'))
+
+
+class Effect5738(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Remote Armor Repair Systems'),
+                                      'maxRange', ship.getModifiedItemAttr('shipBonusRole8'))
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Remote Armor Repair Systems'),
+                                      'falloffEffectiveness', ship.getModifiedItemAttr('shipBonusRole8'))
+
+
+class Effect5754(EffectDef):
+
+    type = 'overheat'
+
+    @staticmethod
+    def handler(fit, module, context):
+        module.boostItemAttr('maxRangeBonus', module.getModifiedItemAttr('overloadTrackingModuleStrengthBonus'))
+        module.boostItemAttr('falloffBonus', module.getModifiedItemAttr('overloadTrackingModuleStrengthBonus'))
+        module.boostItemAttr('trackingSpeedBonus', module.getModifiedItemAttr('overloadTrackingModuleStrengthBonus'))
+
+
+class Effect5757(EffectDef):
+
+    type = 'overheat'
+
+    @staticmethod
+    def handler(fit, module, context):
+        module.boostItemAttr('maxTargetRangeBonus', module.getModifiedItemAttr('overloadSensorModuleStrengthBonus'))
+        module.boostItemAttr('scanResolutionBonus', module.getModifiedItemAttr('overloadSensorModuleStrengthBonus'),
+                             stackingPenalties=True)
+
+        for scanType in ('Gravimetric', 'Magnetometric', 'Radar', 'Ladar'):
+            module.boostItemAttr(
+                'scan{}StrengthPercent'.format(scanType),
+                module.getModifiedItemAttr('overloadSensorModuleStrengthBonus'),
+                stackingPenalties=True
+            )
+
+
+class Effect5758(EffectDef):
+
+    type = 'overheat'
+
+    @staticmethod
+    def handler(fit, module, context):
+        module.boostItemAttr('signatureRadiusBonus', module.getModifiedItemAttr('overloadPainterStrengthBonus') or 0)
+
+
+class Effect5769(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context):
+        level = container.level if 'skill' in context else 1
+        fit.drones.filteredItemBoost(lambda drone: drone.item.group.name == 'Logistic Drone',
+                                     'structureDamageAmount', container.getModifiedItemAttr('damageHP') * level)
+
+
+class Effect5778(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Missile Launcher Operation'),
+                                      'speed', ship.getModifiedItemAttr('shipBonusMF2'), skill='Minmatar Frigate')
+
+
+class Effect5779(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Small Projectile Turret'),
+                                      'falloff', ship.getModifiedItemAttr('shipBonusMF2'), skill='Minmatar Frigate')
+
+
+class Effect5793(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context):
+        level = container.level if 'skill' in context else 1
+        for attr in ('maxRangeBonus', 'falloffBonus'):
+            fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Weapon Disruption'),
+                                          attr, container.getModifiedItemAttr('scanSkillEwStrengthBonus') * level)
+
+
+class Effect5802(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Afterburner'),
+                                      'speedFactor', module.getModifiedItemAttr('shipBonus2CB'), skill='Caldari Battleship')
+
+
+class Effect5803(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Sentry Drone Interfacing'),
+                                     'damageMultiplier', ship.getModifiedItemAttr('shipBonusRole7'))
+
+
+class Effect5804(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Heavy Drone Operation'),
+                                     'damageMultiplier', ship.getModifiedItemAttr('shipBonusRole7'))
+
+
+class Effect5805(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Sentry Drone Interfacing'),
+                                     'hp', ship.getModifiedItemAttr('shipBonusRole7'))
+
+
+class Effect5806(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Sentry Drone Interfacing'),
+                                     'armorHP', ship.getModifiedItemAttr('shipBonusRole7'))
+
+
+class Effect5807(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Sentry Drone Interfacing'),
+                                     'shieldCapacity', ship.getModifiedItemAttr('shipBonusRole7'))
+
+
+class Effect5808(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Heavy Drone Operation'),
+                                     'shieldCapacity', ship.getModifiedItemAttr('shipBonusRole7'))
+
+
+class Effect5809(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Heavy Drone Operation'),
+                                     'armorHP', ship.getModifiedItemAttr('shipBonusRole7'))
+
+
+class Effect5810(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Heavy Drone Operation'),
+                                     'hp', ship.getModifiedItemAttr('shipBonusRole7'))
+
+
+class Effect5811(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Missile Launcher Operation'),
+                                        'kineticDamage', ship.getModifiedItemAttr('shipBonusGB2'),
+                                        skill='Gallente Battleship')
+
+
+class Effect5812(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Missile Launcher Operation'),
+                                        'thermalDamage', ship.getModifiedItemAttr('shipBonusGB2'),
+                                        skill='Gallente Battleship')
+
+
+class Effect5813(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Afterburner'),
+                                      'speedFactor', module.getModifiedItemAttr('shipBonusCF2'), skill='Caldari Frigate')
+
+
+class Effect5814(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Missile Launcher Operation'),
+                                        'kineticDamage', ship.getModifiedItemAttr('shipBonusGF'), skill='Gallente Frigate')
+
+
+class Effect5815(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Missile Launcher Operation'),
+                                        'thermalDamage', ship.getModifiedItemAttr('shipBonusGF'), skill='Gallente Frigate')
+
+
+class Effect5816(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Light Drone Operation'),
+                                     'damageMultiplier', ship.getModifiedItemAttr('shipBonusRole7'))
+
+
+class Effect5817(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Light Drone Operation'),
+                                     'hp', ship.getModifiedItemAttr('shipBonusRole7'))
+
+
+class Effect5818(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Light Drone Operation'),
+                                     'armorHP', ship.getModifiedItemAttr('shipBonusRole7'))
+
+
+class Effect5819(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Light Drone Operation'),
+                                     'shieldCapacity', ship.getModifiedItemAttr('shipBonusRole7'))
+
+
+class Effect5820(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Afterburner'),
+                                      'speedFactor', module.getModifiedItemAttr('shipBonusCC2'), skill='Caldari Cruiser')
+
+
+class Effect5821(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Medium Drone Operation'),
+                                     'damageMultiplier', ship.getModifiedItemAttr('shipBonusRole7'))
+
+
+class Effect5822(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Medium Drone Operation'),
+                                     'hp', ship.getModifiedItemAttr('shipBonusRole7'))
+
+
+class Effect5823(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Medium Drone Operation'),
+                                     'armorHP', ship.getModifiedItemAttr('shipBonusRole7'))
+
+
+class Effect5824(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Medium Drone Operation'),
+                                     'shieldCapacity', ship.getModifiedItemAttr('shipBonusRole7'))
+
+
+class Effect5825(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Missile Launcher Operation'),
+                                        'kineticDamage', ship.getModifiedItemAttr('shipBonusGC2'), skill='Gallente Cruiser')
+
+
+class Effect5826(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Missile Launcher Operation'),
+                                        'thermalDamage', ship.getModifiedItemAttr('shipBonusGC2'), skill='Gallente Cruiser')
+
+
+class Effect5827(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Weapon Disruption'),
+                                      'maxRange', ship.getModifiedItemAttr('shipBonusAF'), skill='Amarr Frigate')
+
+
+class Effect5829(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Mining'),
+                                      'duration', ship.getModifiedItemAttr('shipBonusORE3'), skill='Mining Barge')
+
+
+class Effect5832(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(
+            lambda mod: mod.item.requiresSkill('Mining') or mod.item.requiresSkill('Ice Harvesting'),
+            'maxRange', ship.getModifiedItemAttr('shipBonusORE2'), skill='Mining Barge')
+
+
+class Effect5839(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        for damageType in ('em', 'thermal', 'explosive', 'kinetic'):
+            fit.ship.boostItemAttr('shield{}DamageResonance'.format(damageType.capitalize()),
+                                   ship.getModifiedItemAttr('eliteBonusBarge1'), skill='Exhumers')
+
+
+class Effect5840(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Mining'),
+                                      'duration', ship.getModifiedItemAttr('eliteBonusBarge2'), skill='Exhumers')
+
+
+class Effect5852(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Mining'),
+                                      'miningAmount', module.getModifiedItemAttr('eliteBonusExpedition1'),
+                                      skill='Expedition Frigates')
+
+
+class Effect5853(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.ship.boostItemAttr('signatureRadius', ship.getModifiedItemAttr('eliteBonusExpedition2'),
+                               skill='Expedition Frigates')
+
+
+class Effect5862(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Missile Launcher Operation'),
+                                        'emDamage', ship.getModifiedItemAttr('shipBonusCB'), skill='Caldari Battleship')
+
+
+class Effect5863(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Missile Launcher Operation'),
+                                        'kineticDamage', ship.getModifiedItemAttr('shipBonusCB'),
+                                        skill='Caldari Battleship')
+
+
+class Effect5864(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Missile Launcher Operation'),
+                                        'thermalDamage', ship.getModifiedItemAttr('shipBonusCB'),
+                                        skill='Caldari Battleship')
+
+
+class Effect5865(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Missile Launcher Operation'),
+                                        'explosiveDamage', ship.getModifiedItemAttr('shipBonusCB'),
+                                        skill='Caldari Battleship')
+
+
+class Effect5866(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Warp Scrambler',
+                                      'maxRange', ship.getModifiedItemAttr('shipBonusGB'), skill='Gallente Battleship')
+
+
+class Effect5867(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Missile Launcher Operation'),
+                                        'explosionDelay', ship.getModifiedItemAttr('shipBonusRole8'))
+
+
+class Effect5868(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.ship.boostItemAttr('capacity', module.getModifiedItemAttr('drawback'))
+
+
+class Effect5869(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.ship.boostItemAttr('warpSpeedMultiplier', ship.getModifiedItemAttr('eliteBonusIndustrial1'),
+                               skill='Transport Ships')
+
+
+class Effect5870(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Shield Operation'),
+                                      'shieldBonus', ship.getModifiedItemAttr('shipBonusCI2'), skill='Caldari Industrial')
+
+
+class Effect5871(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Shield Operation'),
+                                      'shieldBonus', ship.getModifiedItemAttr('shipBonusMI2'), skill='Minmatar Industrial')
+
+
+class Effect5872(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Repair Systems'),
+                                      'armorDamageAmount', ship.getModifiedItemAttr('shipBonusAI2'),
+                                      skill='Amarr Industrial')
+
+
+class Effect5873(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Repair Systems'),
+                                      'armorDamageAmount', ship.getModifiedItemAttr('shipBonusGI2'),
+                                      skill='Gallente Industrial')
+
+
+class Effect5874(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.ship.boostItemAttr('fleetHangarCapacity', ship.getModifiedItemAttr('eliteBonusIndustrial1'),
+                               skill='Transport Ships')
+
+
+class Effect5881(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        for damageType in ('em', 'thermal', 'explosive', 'kinetic'):
+            fit.ship.boostItemAttr('shield{}DamageResonance'.format(damageType.capitalize()),
+                                   ship.getModifiedItemAttr('eliteBonusIndustrial2'), skill='Transport Ships')
+
+
+class Effect5888(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        for damageType in ('em', 'thermal', 'explosive', 'kinetic'):
+            fit.ship.boostItemAttr('armor{}DamageResonance'.format(damageType.capitalize()),
+                                   ship.getModifiedItemAttr('eliteBonusIndustrial2'), skill='Transport Ships')
+
+
+class Effect5889(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Afterburner'),
+                                      'overloadSpeedFactorBonus', ship.getModifiedItemAttr('roleBonusOverheatDST'))
+
+
+class Effect5890(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('High Speed Maneuvering'),
+                                      'overloadSpeedFactorBonus', ship.getModifiedItemAttr('roleBonusOverheatDST'))
+
+
+class Effect5891(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Hull Upgrades'),
+                                      'overloadHardeningBonus', ship.getModifiedItemAttr('roleBonusOverheatDST'))
+
+
+class Effect5892(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Hull Upgrades'),
+                                      'overloadSelfDurationBonus', ship.getModifiedItemAttr('roleBonusOverheatDST'))
+
+
+class Effect5893(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Tactical Shield Manipulation'),
+                                      'overloadHardeningBonus', ship.getModifiedItemAttr('roleBonusOverheatDST'))
+
+
+class Effect5896(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Shield Operation'),
+                                      'overloadShieldBonus', ship.getModifiedItemAttr('roleBonusOverheatDST'))
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Shield Operation'),
+                                      'overloadSelfDurationBonus', ship.getModifiedItemAttr('roleBonusOverheatDST'))
+
+
+class Effect5899(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Repair Systems'),
+                                      'overloadArmorDamageAmount', ship.getModifiedItemAttr('roleBonusOverheatDST'))
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Repair Systems'),
+                                      'overloadSelfDurationBonus', ship.getModifiedItemAttr('roleBonusOverheatDST'))
+
+
+class Effect5900(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.ship.increaseItemAttr('warpSpeedMultiplier', module.getModifiedItemAttr('warpSpeedAdd'))
+
+
+class Effect5901(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Reinforced Bulkhead',
+                                      'cpu', ship.getModifiedItemAttr('cpuNeedBonus'))
+
+
+class Effect5911(EffectDef):
+
+    runTime = 'early'
+    type = ('projected', 'passive')
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.ship.boostItemAttr('jumpDriveConsumptionAmount',
+                               module.getModifiedItemAttr('consumptionQuantityBonusPercentage'), stackingPenalties=True)
+
+
+class Effect5912(EffectDef):
+
+    runTime = 'early'
+    type = ('projected', 'passive')
+
+    @staticmethod
+    def handler(fit, beacon, context):
+        fit.modules.filteredItemMultiply(lambda mod: mod.item.group.name == 'Remote Capacitor Transmitter',
+                                         'powerTransferAmount', beacon.getModifiedItemAttr('energyTransferAmountBonus'),
+                                         stackingPenalties=True, penaltyGroup='postMul')
+
+
+class Effect5913(EffectDef):
+
+    runTime = 'early'
+    type = ('projected', 'passive')
+
+    @staticmethod
+    def handler(fit, beacon, context):
+        fit.ship.multiplyItemAttr('armorHP', beacon.getModifiedItemAttr('armorHPMultiplier'))
+
+
+class Effect5914(EffectDef):
+
+    runTime = 'early'
+    type = ('projected', 'passive')
+
+    @staticmethod
+    def handler(fit, beacon, context):
+        fit.modules.filteredItemMultiply(lambda mod: mod.item.group.name == 'Energy Neutralizer',
+                                         'energyNeutralizerAmount',
+                                         beacon.getModifiedItemAttr('energyWarfareStrengthMultiplier'),
+                                         stackingPenalties=True, penaltyGroup='postMul')
+
+
+class Effect5915(EffectDef):
+
+    runTime = 'early'
+    type = ('projected', 'passive')
+
+    @staticmethod
+    def handler(fit, beacon, context):
+        fit.modules.filteredItemMultiply(lambda mod: mod.item.group.name == 'Energy Nosferatu',
+                                         'powerTransferAmount',
+                                         beacon.getModifiedItemAttr('energyWarfareStrengthMultiplier'),
+                                         stackingPenalties=True, penaltyGroup='postMul')
+
+
+class Effect5916(EffectDef):
+
+    runTime = 'early'
+    type = ('projected', 'passive')
+
+    @staticmethod
+    def handler(fit, beacon, context):
+        fit.modules.filteredChargeMultiply(lambda mod: mod.charge.requiresSkill('Bomb Deployment'),
+                                           'explosiveDamage', beacon.getModifiedItemAttr('smartbombDamageMultiplier'),
+                                           stackingPenalties=True, penaltyGroup='postMul')
+
+
+class Effect5917(EffectDef):
+
+    runTime = 'early'
+    type = ('projected', 'passive')
+
+    @staticmethod
+    def handler(fit, beacon, context):
+        fit.modules.filteredChargeMultiply(lambda mod: mod.charge.requiresSkill('Bomb Deployment'),
+                                           'kineticDamage', beacon.getModifiedItemAttr('smartbombDamageMultiplier'),
+                                           stackingPenalties=True, penaltyGroup='postMul')
+
+
+class Effect5918(EffectDef):
+
+    runTime = 'early'
+    type = ('projected', 'passive')
+
+    @staticmethod
+    def handler(fit, beacon, context):
+        fit.modules.filteredChargeMultiply(lambda mod: mod.charge.requiresSkill('Bomb Deployment'),
+                                           'thermalDamage', beacon.getModifiedItemAttr('smartbombDamageMultiplier'),
+                                           stackingPenalties=True, penaltyGroup='postMul')
+
+
+class Effect5919(EffectDef):
+
+    runTime = 'early'
+    type = ('projected', 'passive')
+
+    @staticmethod
+    def handler(fit, beacon, context):
+        fit.modules.filteredChargeMultiply(lambda mod: mod.charge.requiresSkill('Bomb Deployment'),
+                                           'emDamage', beacon.getModifiedItemAttr('smartbombDamageMultiplier'),
+                                           stackingPenalties=True, penaltyGroup='postMul')
+
+
+class Effect5920(EffectDef):
+
+    runTime = 'early'
+    type = ('projected', 'passive')
+
+    @staticmethod
+    def handler(fit, beacon, context):
+        fit.modules.filteredChargeMultiply(lambda mod: mod.charge.requiresSkill('Missile Launcher Operation'),
+                                           'aoeCloudSize', beacon.getModifiedItemAttr('aoeCloudSizeMultiplier'))
+
+
+class Effect5921(EffectDef):
+
+    runTime = 'early'
+    type = ('projected', 'passive')
+
+    @staticmethod
+    def handler(fit, beacon, context):
+        fit.modules.filteredItemMultiply(lambda mod: mod.item.requiresSkill('Target Painting'),
+                                         'signatureRadiusBonus',
+                                         beacon.getModifiedItemAttr('targetPainterStrengthMultiplier'),
+                                         stackingPenalties=True, penaltyGroup='postMul')
+
+
+class Effect5922(EffectDef):
+
+    runTime = 'early'
+    type = ('projected', 'passive')
+
+    @staticmethod
+    def handler(fit, beacon, context):
+        fit.modules.filteredItemMultiply(lambda mod: mod.item.group.name == 'Stasis Web',
+                                         'speedFactor', beacon.getModifiedItemAttr('stasisWebStrengthMultiplier'),
+                                         stackingPenalties=True, penaltyGroup='postMul')
+
+
+class Effect5923(EffectDef):
+
+    runTime = 'early'
+    type = ('projected', 'passive')
+
+    @staticmethod
+    def handler(fit, beacon, context):
+        fit.modules.filteredChargeMultiply(lambda mod: mod.charge.requiresSkill('Bomb Deployment'),
+                                           'energyNeutralizerAmount',
+                                           beacon.getModifiedItemAttr('smartbombDamageMultiplier'),
+                                           stackingPenalties=True, penaltyGroup='postMul')
+
+
+class Effect5924(EffectDef):
+
+    runTime = 'early'
+    type = ('projected', 'passive')
+
+    @staticmethod
+    def handler(fit, beacon, context):
+        fit.modules.filteredChargeMultiply(lambda mod: mod.charge.requiresSkill('Bomb Deployment'),
+                                           'scanGravimetricStrengthBonus',
+                                           beacon.getModifiedItemAttr('smartbombDamageMultiplier'),
+                                           stackingPenalties=True, penaltyGroup='postMul')
+
+
+class Effect5925(EffectDef):
+
+    runTime = 'early'
+    type = ('projected', 'passive')
+
+    @staticmethod
+    def handler(fit, beacon, context):
+        fit.modules.filteredChargeMultiply(lambda mod: mod.charge.requiresSkill('Bomb Deployment'),
+                                           'scanLadarStrengthBonus',
+                                           beacon.getModifiedItemAttr('smartbombDamageMultiplier'),
+                                           stackingPenalties=True, penaltyGroup='postMul')
+
+
+class Effect5926(EffectDef):
+
+    runTime = 'early'
+    type = ('projected', 'passive')
+
+    @staticmethod
+    def handler(fit, beacon, context):
+        fit.modules.filteredChargeMultiply(lambda mod: mod.charge.requiresSkill('Bomb Deployment'),
+                                           'scanMagnetometricStrengthBonus',
+                                           beacon.getModifiedItemAttr('smartbombDamageMultiplier'),
+                                           stackingPenalties=True, penaltyGroup='postMul')
+
+
+class Effect5927(EffectDef):
+
+    runTime = 'early'
+    type = ('projected', 'passive')
+
+    @staticmethod
+    def handler(fit, beacon, context):
+        fit.modules.filteredChargeMultiply(lambda mod: mod.charge.requiresSkill('Bomb Deployment'),
+                                           'scanRadarStrengthBonus',
+                                           beacon.getModifiedItemAttr('smartbombDamageMultiplier'),
+                                           stackingPenalties=True, penaltyGroup='postMul')
+
+
+class Effect5929(EffectDef):
+
+    runTime = 'early'
+    type = ('projected', 'passive')
+
+    @staticmethod
+    def handler(fit, beacon, context):
+        fit.drones.filteredItemMultiply(lambda drone: True,
+                                        'trackingSpeed', beacon.getModifiedItemAttr('trackingSpeedMultiplier'),
+                                        stackingPenalties=True, penaltyGroup='postMul')
+
+
+class Effect5934(EffectDef):
+
+    runTime = 'early'
+    type = 'projected', 'active'
+
+    @staticmethod
+    def handler(fit, module, context):
+        if 'projected' not in context:
+            return
+
+        fit.ship.increaseItemAttr('warpScrambleStatus', module.getModifiedItemAttr('warpScrambleStrength'))
+
+        # this is such a dirty hack
+        for mod in fit.modules:
+            if not mod.isEmpty and mod.state > FittingModuleState.ONLINE and (
+                    mod.item.requiresSkill('Micro Jump Drive Operation') or
+                    mod.item.requiresSkill('High Speed Maneuvering')
+            ):
+                mod.state = FittingModuleState.ONLINE
+            if not mod.isEmpty and mod.item.requiresSkill('Micro Jump Drive Operation') and mod.state > FittingModuleState.ONLINE:
+                mod.state = FittingModuleState.ONLINE
+
+
+class Effect5938(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredChargeBoost(
+            lambda mod: mod.charge.requiresSkill('Rockets') or mod.charge.requiresSkill('Light Missiles'),
+            'aoeCloudSize', ship.getModifiedItemAttr('shipBonusCF2'), skill='Caldari Frigate')
+
+
+class Effect5939(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Missile Launcher Rocket',
+                                      'speed', ship.getModifiedItemAttr('shipBonus2AF'), skill='Amarr Frigate')
+
+
+class Effect5940(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Small Hybrid Turret'),
+                                      'speed', ship.getModifiedItemAttr('eliteBonusInterdictors1'), skill='Interdictors')
+
+
+class Effect5944(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Missile Launcher Operation'),
+                                      'speed', ship.getModifiedItemAttr('shipBonusAD1'), skill='Amarr Destroyer')
+
+
+class Effect5945(EffectDef):
+
+    runTime = 'early'
+    type = 'active'
+
+    @staticmethod
+    def handler(fit, module, context):
+        # Set flag which is used to determine if ship is cloaked or not
+        # This is used to apply cloak-only bonuses, like Black Ops' speed bonus
+        # Doesn't apply to covops cloaks
+        fit.extraAttributes['cloaked'] = True
+        # Apply speed penalty
+        fit.ship.multiplyItemAttr('maxVelocity', module.getModifiedItemAttr('maxVelocityModifier'))
+
+
+class Effect5951(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.ship.boostItemAttr('warpSpeedMultiplier', module.getModifiedItemAttr('drawback'), stackingPenalties=True)
+
+
+class Effect5956(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Energy Turret'),
+                                      'damageMultiplier', ship.getModifiedItemAttr('shipBonusAC2'), skill='Amarr Cruiser')
+
+
+class Effect5957(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Energy Turret'),
+                                      'maxRange', ship.getModifiedItemAttr('eliteBonusHeavyInterdictors1'),
+                                      skill='Heavy Interdiction Cruisers')
+
+
+class Effect5958(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Hybrid Turret'),
+                                      'trackingSpeed', ship.getModifiedItemAttr('shipBonusGC'), skill='Gallente Cruiser')
+
+
+class Effect5959(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Hybrid Turret'),
+                                      'maxRange', ship.getModifiedItemAttr('eliteBonusHeavyInterdictors1'),
+                                      skill='Heavy Interdiction Cruisers')
+
+
+class Effect5994(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        for dmgType in ('em', 'thermal', 'kinetic', 'explosive'):
+            tgtAttr = '{}DamageResonance'.format(dmgType)
+            fit.ship.forceItemAttr(tgtAttr, module.getModifiedItemAttr('resistanceKillerHull'))
+
+
+class Effect5995(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        for layer in ('armor', 'shield'):
+            for dmgType in ('em', 'thermal', 'kinetic', 'explosive'):
+                tgtAttr = '{}{}DamageResonance'.format(layer, dmgType.capitalize())
+                fit.ship.forceItemAttr(tgtAttr, module.getModifiedItemAttr('resistanceKiller'))
+
+
+class Effect5998(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        # todo: stacking?
+        fit.ship.boostItemAttr('agility', ship.getModifiedItemAttr('freighterBonusO2'), skill='ORE Freighter',
+                               stackingPenalties=True)
+
+
+class Effect6001(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.ship.boostItemAttr('shipMaintenanceBayCapacity', ship.getModifiedItemAttr('freighterBonusO1'),
+                               skill='ORE Freighter')
+
+
+class Effect6006(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Small Energy Turret'),
+                                      'damageMultiplier', ship.getModifiedItemAttr('shipBonusTacticalDestroyerAmarr1'),
+                                      skill='Amarr Tactical Destroyer')
+
+
+class Effect6007(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Small Energy Turret'),
+                                      'capacitorNeed', ship.getModifiedItemAttr('shipBonusTacticalDestroyerAmarr2'),
+                                      skill='Amarr Tactical Destroyer')
+
+
+class Effect6008(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: True, 'heatDamage',
+                                      ship.getModifiedItemAttr('shipBonusTacticalDestroyerAmarr3'),
+                                      skill='Amarr Tactical Destroyer')
+
+
+class Effect6009(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Astrometrics'), 'cpu', src.getModifiedItemAttr('roleBonusT3ProbeCPU'))
+
+
+class Effect6010(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.ship.multiplyItemAttr(
+            'maxTargetRange',
+            1 / module.getModifiedItemAttr('modeMaxTargetRangePostDiv'),
+            stackingPenalties=True,
+            penaltyGroup='postDiv'
+        )
+
+
+class Effect6011(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.modules.filteredItemMultiply(
+            lambda mod: mod.item.requiresSkill('Small Energy Turret'),
+            'maxRange',
+            1 / module.getModifiedItemAttr('modeMaxRangePostDiv'),
+            stackingPenalties=True,
+            penaltyGroup='postDiv'
+        )
+
+
+class Effect6012(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        for scanType in ('Gravimetric', 'Magnetometric', 'Radar', 'Ladar'):
+            fit.ship.multiplyItemAttr(
+                'scan{}Strength'.format(scanType),
+                1 / (module.getModifiedItemAttr('mode{}StrengthPostDiv'.format(scanType)) or 1),
+                stackingPenalties=True,
+                penaltyGroup='postDiv'
+            )
+
+
+class Effect6014(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.ship.multiplyItemAttr('signatureRadius', 1 / module.getModifiedItemAttr('modeSignatureRadiusPostDiv'),
+                                  stackingPenalties=True, penaltyGroup='postDiv')
+
+
+class Effect6015(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        for srcResType, tgtResType in (
+                ('Em', 'Em'),
+                ('Explosive', 'Explosive'),
+                ('Kinetic', 'Kinetic'),
+                ('Thermic', 'Thermal')
+        ):
+            fit.ship.multiplyItemAttr(
+                'armor{0}DamageResonance'.format(tgtResType),
+                1 / module.getModifiedItemAttr('mode{0}ResistancePostDiv'.format(srcResType)),
+                stackingPenalties=True,
+                penaltyGroup='postDiv'
+            )
+
+
+class Effect6016(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.ship.multiplyItemAttr(
+            'agility',
+            1 / module.getModifiedItemAttr('modeAgilityPostDiv'),
+            stackingPenalties=True,
+            penaltyGroup='postDiv'
+        )
+
+
+class Effect6017(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.ship.multiplyItemAttr(
+            'maxVelocity',
+            1 / module.getModifiedItemAttr('modeVelocityPostDiv'),
+            stackingPenalties=True,
+            penaltyGroup='postDiv'
+        )
+
+
+class Effect6020(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Energy Neutralizer', 'maxRange',
+                                      src.getModifiedItemAttr('eliteBonusReconShip3'), skill='Recon Ships')
+
+
+class Effect6021(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Energy Nosferatu', 'maxRange',
+                                      src.getModifiedItemAttr('eliteBonusReconShip3'), skill='Recon Ships')
+
+
+class Effect6025(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Hybrid Turret'),
+                                      'maxRange', ship.getModifiedItemAttr('eliteBonusReconShip1'), skill='Recon Ships')
+
+
+class Effect6027(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Projectile Turret'),
+                                      'damageMultiplier', ship.getModifiedItemAttr('eliteBonusReconShip1'),
+                                      skill='Recon Ships')
+
+
+class Effect6032(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Remote Capacitor Transmitter',
+                                      'power', ship.getModifiedItemAttr('powerTransferPowerNeedBonus'))
+
+
+class Effect6036(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: True, 'heatDamage',
+                                      ship.getModifiedItemAttr('shipBonusTacticalDestroyerMinmatar3'),
+                                      skill='Minmatar Tactical Destroyer')
+
+
+class Effect6037(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Small Projectile Turret'),
+                                      'damageMultiplier', ship.getModifiedItemAttr('shipBonusTacticalDestroyerMinmatar1'),
+                                      skill='Minmatar Tactical Destroyer')
+
+
+class Effect6038(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Small Projectile Turret'),
+                                      'maxRange', ship.getModifiedItemAttr('shipBonusTacticalDestroyerMinmatar2'),
+                                      skill='Minmatar Tactical Destroyer')
+
+
+class Effect6039(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.modules.filteredItemMultiply(
+            lambda mod: mod.item.requiresSkill('Small Projectile Turret'),
+            'trackingSpeed',
+            1 / module.getModifiedItemAttr('modeTrackingPostDiv'),
+            stackingPenalties=True,
+            penaltyGroup='postDiv'
+        )
+
+
+class Effect6040(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.modules.filteredItemMultiply(
+            lambda mod: mod.item.requiresSkill('High Speed Maneuvering'),
+            'signatureRadiusBonus',
+            1 / module.getModifiedItemAttr('modeMWDSigPenaltyPostDiv'),
+            stackingPenalties=True,
+            penaltyGroup='postDiv'
+        )
+
+
+class Effect6041(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        for srcResType, tgtResType in (
+                ('Em', 'Em'),
+                ('Explosive', 'Explosive'),
+                ('Kinetic', 'Kinetic'),
+                ('Thermic', 'Thermal')
+        ):
+            fit.ship.multiplyItemAttr(
+                'shield{0}DamageResonance'.format(tgtResType),
+                1 / module.getModifiedItemAttr('mode{0}ResistancePostDiv'.format(srcResType)),
+                stackingPenalties=True,
+                penaltyGroup='postDiv'
+            )
+
+
+class Effect6045(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Sentry Drone Interfacing'),
+                                     'damageMultiplier', ship.getModifiedItemAttr('shipBonusGC3'), skill='Gallente Cruiser')
+
+
+class Effect6046(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Sentry Drone Interfacing'),
+                                     'hp', ship.getModifiedItemAttr('shipBonusGC3'), skill='Gallente Cruiser')
+
+
+class Effect6047(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Sentry Drone Interfacing'),
+                                     'armorHP', ship.getModifiedItemAttr('shipBonusGC3'), skill='Gallente Cruiser')
+
+
+class Effect6048(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Sentry Drone Interfacing'),
+                                     'shieldCapacity', ship.getModifiedItemAttr('shipBonusGC3'), skill='Gallente Cruiser')
+
+
+class Effect6051(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Light Drone Operation'),
+                                     'damageMultiplier', ship.getModifiedItemAttr('shipBonusGC2'), skill='Gallente Cruiser')
+
+
+class Effect6052(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Medium Drone Operation'),
+                                     'damageMultiplier', ship.getModifiedItemAttr('shipBonusGC2'), skill='Gallente Cruiser')
+
+
+class Effect6053(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Heavy Drone Operation'),
+                                     'damageMultiplier', ship.getModifiedItemAttr('shipBonusGC2'), skill='Gallente Cruiser')
+
+
+class Effect6054(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Heavy Drone Operation'),
+                                     'hp', ship.getModifiedItemAttr('shipBonusGC2'), skill='Gallente Cruiser')
+
+
+class Effect6055(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Heavy Drone Operation'),
+                                     'armorHP', ship.getModifiedItemAttr('shipBonusGC2'), skill='Gallente Cruiser')
+
+
+class Effect6056(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Heavy Drone Operation'),
+                                     'shieldCapacity', ship.getModifiedItemAttr('shipBonusGC2'), skill='Gallente Cruiser')
+
+
+class Effect6057(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Medium Drone Operation'),
+                                     'shieldCapacity', ship.getModifiedItemAttr('shipBonusGC2'), skill='Gallente Cruiser')
+
+
+class Effect6058(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Medium Drone Operation'),
+                                     'armorHP', ship.getModifiedItemAttr('shipBonusGC2'), skill='Gallente Cruiser')
+
+
+class Effect6059(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Medium Drone Operation'),
+                                     'hp', ship.getModifiedItemAttr('shipBonusGC2'), skill='Gallente Cruiser')
+
+
+class Effect6060(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Light Drone Operation'),
+                                     'hp', ship.getModifiedItemAttr('shipBonusGC2'), skill='Gallente Cruiser')
+
+
+class Effect6061(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Light Drone Operation'),
+                                     'armorHP', ship.getModifiedItemAttr('shipBonusGC2'), skill='Gallente Cruiser')
+
+
+class Effect6062(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Light Drone Operation'),
+                                     'shieldCapacity', ship.getModifiedItemAttr('shipBonusGC2'), skill='Gallente Cruiser')
+
+
+class Effect6063(EffectDef):
+
+    type = 'active'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.ship.forceItemAttr('disallowAssistance', module.getModifiedItemAttr('disallowAssistance'))
+        for scanType in ('Gravimetric', 'Magnetometric', 'Radar', 'Ladar'):
+            fit.ship.boostItemAttr(
+                'scan{}Strength'.format(scanType),
+                module.getModifiedItemAttr('scan{}StrengthPercent'.format(scanType)),
+                stackingPenalties=True
+            )
+
+
+class Effect6076(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.modules.filteredChargeMultiply(
+            lambda mod: mod.charge.requiresSkill('Missile Launcher Operation'),
+            'maxVelocity',
+            1 / module.getModifiedItemAttr('modeMaxRangePostDiv'),
+            stackingPenalties=True,
+            penaltyGroup='postDiv'
+        )
+
+
+class Effect6077(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: True, 'heatDamage',
+                                      ship.getModifiedItemAttr('shipBonusTacticalDestroyerCaldari3'),
+                                      skill='Caldari Tactical Destroyer')
+
+
+class Effect6083(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        for damageType in ('em', 'explosive', 'kinetic', 'thermal'):
+            fit.modules.filteredChargeBoost(
+                lambda mod: mod.charge.requiresSkill('Rockets') or mod.charge.requiresSkill('Light Missiles'),
+                '{0}Damage'.format(damageType), ship.getModifiedItemAttr('shipBonusRole7'))
+
+
+class Effect6085(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Missile Launcher Operation'),
+                                      'speed', ship.getModifiedItemAttr('shipBonusTacticalDestroyerCaldari1'),
+                                      skill='Caldari Tactical Destroyer')
+
+
+class Effect6088(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        for damageType in ('em', 'explosive', 'kinetic', 'thermal'):
+            fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Heavy Assault Missiles'),
+                                            '{0}Damage'.format(damageType), ship.getModifiedItemAttr('shipBonusMC2'),
+                                            skill='Minmatar Cruiser')
+
+
+class Effect6093(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        for damageType in ('em', 'explosive', 'kinetic', 'thermal'):
+            fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Heavy Missiles'),
+                                            '{0}Damage'.format(damageType), ship.getModifiedItemAttr('shipBonusMC2'),
+                                            skill='Minmatar Cruiser')
+
+
+class Effect6096(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        for damageType in ('em', 'explosive', 'kinetic', 'thermal'):
+            fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Light Missiles'),
+                                            '{0}Damage'.format(damageType), ship.getModifiedItemAttr('shipBonusMC2'),
+                                            skill='Minmatar Cruiser')
+
+
+class Effect6098(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Missile Launcher Operation'),
+                                      'reloadTime', ship.getModifiedItemAttr('shipBonusTacticalDestroyerCaldari2'),
+                                      skill='Caldari Tactical Destroyer')
+
+
+class Effect6104(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemMultiply(lambda mod: mod.item.requiresSkill('Infomorph Psychology'),
+                                         'duration', ship.getModifiedItemAttr('entosisDurationMultiplier') or 1)
+
+
+class Effect6110(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Missile Launcher Operation'),
+                                        'maxVelocity', module.getModifiedItemAttr('missileVelocityBonus'),
+                                        stackingPenalties=True)
+
+
+class Effect6111(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Missile Launcher Operation'),
+                                        'explosionDelay', module.getModifiedItemAttr('explosionDelayBonus'),
+                                        stackingPenalties=True)
+
+
+class Effect6112(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Missile Launcher Operation'),
+                                        'aoeCloudSize', module.getModifiedItemAttr('aoeCloudSizeBonus'),
+                                        stackingPenalties=True)
+
+
+class Effect6113(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Missile Launcher Operation'),
+                                        'aoeVelocity', module.getModifiedItemAttr('aoeVelocityBonus'),
+                                        stackingPenalties=True)
+
+
+class Effect6128(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        module.boostItemAttr('aoeCloudSizeBonus', module.getModifiedChargeAttr('aoeCloudSizeBonusBonus'))
+
+
+class Effect6129(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        module.boostItemAttr('aoeVelocityBonus', module.getModifiedChargeAttr('aoeVelocityBonusBonus'))
+
+
+class Effect6130(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        module.boostItemAttr('missileVelocityBonus', module.getModifiedChargeAttr('missileVelocityBonusBonus'))
+
+
+class Effect6131(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        module.boostItemAttr('explosionDelayBonus', module.getModifiedChargeAttr('explosionDelayBonusBonus'))
+
+
+class Effect6135(EffectDef):
+
+    type = 'active'
+
+    @staticmethod
+    def handler(fit, container, context):
+        for srcAttr, tgtAttr in (
+                ('aoeCloudSizeBonus', 'aoeCloudSize'),
+                ('aoeVelocityBonus', 'aoeVelocity'),
+                ('missileVelocityBonus', 'maxVelocity'),
+                ('explosionDelayBonus', 'explosionDelay'),
+        ):
+            fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Missile Launcher Operation'),
+                                            tgtAttr, container.getModifiedItemAttr(srcAttr),
+                                            stackingPenalties=True)
+
+
+class Effect6144(EffectDef):
+
+    type = 'overheat'
+
+    @staticmethod
+    def handler(fit, module, context):
+        for tgtAttr in (
+                'aoeCloudSizeBonus',
+                'explosionDelayBonus',
+                'missileVelocityBonus',
+                'maxVelocityModifier',
+                'aoeVelocityBonus'
+        ):
+            module.boostItemAttr(tgtAttr, module.getModifiedItemAttr('overloadTrackingModuleStrengthBonus'))
+
+
+class Effect6148(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: True, 'heatDamage',
+                                      ship.getModifiedItemAttr('shipBonusTacticalDestroyerGallente3'),
+                                      skill='Gallente Tactical Destroyer')
+
+
+class Effect6149(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Small Hybrid Turret'),
+                                      'speed', ship.getModifiedItemAttr('shipBonusTacticalDestroyerGallente1'),
+                                      skill='Gallente Tactical Destroyer')
+
+
+class Effect6150(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Small Hybrid Turret'),
+                                      'trackingSpeed', ship.getModifiedItemAttr('shipBonusTacticalDestroyerGallente2'),
+                                      skill='Gallente Tactical Destroyer')
+
+
+class Effect6151(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        for srcResType, tgtResType in (
+                ('Em', 'em'),
+                ('Explosive', 'explosive'),
+                ('Kinetic', 'kinetic'),
+                ('Thermic', 'thermal')
+        ):
+            fit.ship.multiplyItemAttr(
+                '{0}DamageResonance'.format(tgtResType),
+                1 / module.getModifiedItemAttr('mode{0}ResistancePostDiv'.format(srcResType))
+            )
+
+
+class Effect6152(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.modules.filteredItemMultiply(
+            lambda mod: mod.item.requiresSkill('Small Hybrid Turret'),
+            'maxRange',
+            1 / module.getModifiedItemAttr('modeMaxRangePostDiv'),
+            stackingPenalties=True,
+            penaltyGroup='postDiv'
+        )
+
+
+class Effect6153(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.modules.filteredItemMultiply(
+            lambda mod: mod.item.requiresSkill('High Speed Maneuvering'),
+            'capacitorNeed',
+            1 / module.getModifiedItemAttr('modeMWDCapPostDiv')
+        )
+
+
+class Effect6154(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.modules.filteredItemMultiply(
+            lambda mod: mod.item.requiresSkill('High Speed Maneuvering'),
+            'speedFactor',
+            1 / module.getModifiedItemAttr('modeMWDVelocityPostDiv'),
+            stackingPenalties=True,
+            penaltyGroup='postDiv'
+        )
+
+
+class Effect6155(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.modules.filteredItemMultiply(
+            lambda mod: mod.item.requiresSkill('Repair Systems'),
+            'duration',
+            1 / module.getModifiedItemAttr('modeArmorRepDurationPostDiv')
+        )
+
+
+class Effect6163(EffectDef):
+
+    runtime = 'late'
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.extraAttributes['speedLimit'] = src.getModifiedItemAttr('speedLimit')
+
+
+class Effect6164(EffectDef):
+
+    runTime = 'early'
+    type = ('projected', 'passive')
+
+    @staticmethod
+    def handler(fit, beacon, context):
+        fit.ship.boostItemAttr('maxVelocity', beacon.getModifiedItemAttr('maxVelocityMultiplier'), stackingPenalties=True)
+
+
+class Effect6166(EffectDef):
+
+    runTime = 'early'
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Propulsion Jamming'),
+                                      'speedFactorBonus', ship.getModifiedItemAttr('shipBonusAT'))
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Propulsion Jamming'),
+                                      'speedBoostFactorBonus', ship.getModifiedItemAttr('shipBonusAT'))
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Propulsion Jamming'),
+                                      'massBonusPercentage', ship.getModifiedItemAttr('shipBonusAT'))
+
+
+class Effect6170(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemIncrease(lambda mod: mod.item.requiresSkill('Infomorph Psychology'),
+                                         'entosisCPUAdd', ship.getModifiedItemAttr('entosisCPUPenalty'))
+
+
+class Effect6171(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        module.increaseItemAttr('cpu', module.getModifiedItemAttr('entosisCPUAdd'))
+
+
+class Effect6172(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Energy Turret'),
+                                      'maxRange', ship.getModifiedItemAttr('roleBonusCBC'))
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Energy Turret'),
+                                      'falloff', ship.getModifiedItemAttr('roleBonusCBC'))
+
+
+class Effect6173(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Hybrid Turret'),
+                                      'maxRange', ship.getModifiedItemAttr('roleBonusCBC'))
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Hybrid Turret'),
+                                      'falloff', ship.getModifiedItemAttr('roleBonusCBC'))
+
+
+class Effect6174(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Projectile Turret'),
+                                      'maxRange', ship.getModifiedItemAttr('roleBonusCBC'))
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Projectile Turret'),
+                                      'falloff', ship.getModifiedItemAttr('roleBonusCBC'))
+
+
+class Effect6175(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, skill, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Missile Launcher Operation'),
+                                        'maxVelocity', skill.getModifiedItemAttr('roleBonusCBC'))
+
+
+class Effect6176(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Drones'),
+                                     'maxVelocity', ship.getModifiedItemAttr('roleBonusCBC'))
+
+
+class Effect6177(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Hybrid Turret'),
+                                      'damageMultiplier', ship.getModifiedItemAttr('shipBonusCBC2'),
+                                      skill='Caldari Battlecruiser')
+
+
+class Effect6178(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Projectile Turret'),
+                                      'trackingSpeed', ship.getModifiedItemAttr('shipBonusMBC2'),
+                                      skill='Minmatar Battlecruiser')
+
+
+class Effect6184(EffectDef):
+
+    runTime = 'late'
+    type = 'projected', 'active'
+
+    @staticmethod
+    def handler(fit, src, context, **kwargs):
+        if 'projected' in context:
+            amount = src.getModifiedItemAttr('powerTransferAmount')
+            duration = src.getModifiedItemAttr('duration')
+
+            if 'effect' in kwargs:
+                from eos.modifiedAttributeDict import ModifiedAttributeDict
+                amount *= ModifiedAttributeDict.getResistance(fit, kwargs['effect'])
+
+            fit.addDrain(src, duration, -amount, 0)
+
+
+class Effect6185(EffectDef):
+
+    runTime = 'late'
+    type = 'projected', 'active'
+
+    @staticmethod
+    def handler(fit, module, context):
+        if 'projected' not in context:
+            return
+        bonus = module.getModifiedItemAttr('structureDamageAmount')
+        duration = module.getModifiedItemAttr('duration') / 1000.0
+        fit.extraAttributes.increase('hullRepair', bonus / duration)
+
+
+class Effect6186(EffectDef):
+
+    type = 'projected', 'active'
+
+    @staticmethod
+    def handler(fit, container, context, **kwargs):
+        if 'projected' in context:
+            bonus = container.getModifiedItemAttr('shieldBonus')
+            duration = container.getModifiedItemAttr('duration') / 1000.0
+            fit.extraAttributes.increase('shieldRepair', bonus / duration, **kwargs)
+
+
+class Effect6187(EffectDef):
+
+    type = 'active', 'projected'
+
+    @staticmethod
+    def handler(fit, src, context, **kwargs):
+        if 'projected' in context and ((hasattr(src, 'state') and src.state >= FittingModuleState.ACTIVE) or
+                                       hasattr(src, 'amountActive')):
+            amount = src.getModifiedItemAttr('energyNeutralizerAmount')
+
+            if 'effect' in kwargs:
+                from eos.modifiedAttributeDict import ModifiedAttributeDict
+                amount *= ModifiedAttributeDict.getResistance(fit, kwargs['effect'])
+
+            time = src.getModifiedItemAttr('duration')
+
+            fit.addDrain(src, time, amount, 0)
+
+
+class Effect6188(EffectDef):
+
+    runTime = 'late'
+    type = 'projected', 'active'
+
+    @staticmethod
+    def handler(fit, container, context, **kwargs):
+        if 'projected' in context:
+            bonus = container.getModifiedItemAttr('armorDamageAmount')
+            duration = container.getModifiedItemAttr('duration') / 1000.0
+            rps = bonus / duration
+            fit.extraAttributes.increase('armorRepair', rps)
+            fit.extraAttributes.increase('armorRepairPreSpool', rps)
+            fit.extraAttributes.increase('armorRepairFullSpool', rps)
+
+
+class Effect6195(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.ship.boostItemAttr('shieldThermalDamageResonance', src.getModifiedItemAttr('eliteBonusExpedition1'),
+                               skill='Expedition Frigates')
+        fit.ship.boostItemAttr('shieldKineticDamageResonance', src.getModifiedItemAttr('eliteBonusExpedition1'),
+                               skill='Expedition Frigates')
+        fit.ship.boostItemAttr('shieldExplosiveDamageResonance', src.getModifiedItemAttr('eliteBonusExpedition1'),
+                               skill='Expedition Frigates')
+        fit.ship.boostItemAttr('shieldEmDamageResonance', src.getModifiedItemAttr('eliteBonusExpedition1'),
+                               skill='Expedition Frigates')
+
+
+class Effect6196(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Ice Harvesting'), 'duration',
+                                      src.getModifiedItemAttr('eliteBonusExpedition2'), skill='Expedition Frigates')
+
+
+class Effect6197(EffectDef):
+
+    runTime = 'late'
+    type = 'active', 'projected'
+
+    @staticmethod
+    def handler(fit, src, context, **kwargs):
+        amount = src.getModifiedItemAttr('powerTransferAmount')
+        time = src.getModifiedItemAttr('duration')
+
+        if 'effect' in kwargs and 'projected' in context:
+            from eos.modifiedAttributeDict import ModifiedAttributeDict
+            amount *= ModifiedAttributeDict.getResistance(fit, kwargs['effect'])
+
+        if 'projected' in context:
+            fit.addDrain(src, time, amount, 0)
+        elif 'module' in context:
+            src.itemModifiedAttributes.force('capacitorNeed', -amount)
+
+
+class Effect6201(EffectDef):
+
+    type = 'active'
+
+
+class Effect6208(EffectDef):
+
+    type = 'active'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.ship.boostItemAttr('signatureRadius', module.getModifiedItemAttr('signatureRadiusBonusPercent'),
+                               stackingPenalties=True)
+
+
+class Effect6214(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Leadership'), 'power',
+                                      src.getModifiedItemAttr('roleBonusCD'))
+
+
+class Effect6216(EffectDef):
+
+    type = 'active', 'projected'
+
+    @staticmethod
+    def handler(fit, src, context, **kwargs):
+        amount = 0
+        if 'projected' in context:
+            if (hasattr(src, 'state') and src.state >= FittingModuleState.ACTIVE) or hasattr(src, 'amountActive'):
+                amount = src.getModifiedItemAttr('energyNeutralizerAmount')
+
+                if 'effect' in kwargs:
+                    from eos.modifiedAttributeDict import ModifiedAttributeDict
+                    amount *= ModifiedAttributeDict.getResistance(fit, kwargs['effect'])
+
+                time = src.getModifiedItemAttr('duration')
+
+                fit.addDrain(src, time, amount, 0)
+
+
+class Effect6222(EffectDef):
+
+    runTime = 'early'
+    type = 'projected', 'active'
+
+    @staticmethod
+    def handler(fit, module, context):
+        if 'projected' in context:
+            fit.ship.increaseItemAttr('warpScrambleStatus', module.getModifiedItemAttr('warpScrambleStrength'))
+            if module.charge is not None and module.charge.ID == 47336:
+                for mod in fit.modules:
+                    if not mod.isEmpty and mod.item.requiresSkill('High Speed Maneuvering') and mod.state > FittingModuleState.ONLINE:
+                        mod.state = FittingModuleState.ONLINE
+                    if not mod.isEmpty and mod.item.requiresSkill('Micro Jump Drive Operation') and mod.state > FittingModuleState.ONLINE:
+                        mod.state = FittingModuleState.ONLINE
+
+
+class Effect6230(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Energy Neutralizer', 'maxRange',
+                                      src.getModifiedItemAttr('eliteBonusReconShip1'), skill='Recon Ships')
+
+
+class Effect6232(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Energy Neutralizer', 'falloffEffectiveness',
+                                      src.getModifiedItemAttr('eliteBonusReconShip2'), skill='Recon Ships')
+
+
+class Effect6233(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Energy Neutralizer', 'falloffEffectiveness',
+                                      src.getModifiedItemAttr('eliteBonusReconShip3'), skill='Recon Ships')
+
+
+class Effect6234(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Energy Nosferatu', 'maxRange',
+                                      src.getModifiedItemAttr('eliteBonusReconShip1'), skill='Recon Ships')
+
+
+class Effect6237(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Energy Nosferatu', 'falloffEffectiveness',
+                                      src.getModifiedItemAttr('eliteBonusReconShip2'), skill='Recon Ships')
+
+
+class Effect6238(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Energy Nosferatu', 'falloffEffectiveness',
+                                      src.getModifiedItemAttr('eliteBonusReconShip3'), skill='Recon Ships')
+
+
+class Effect6239(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Ice Harvesting'), 'duration',
+                                      src.getModifiedItemAttr('shipBonusOREfrig2'), skill='Mining Frigate')
+
+
+class Effect6241(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Energy Neutralizer', 'falloffEffectiveness',
+                                      src.getModifiedItemAttr('shipBonusAD1'), skill='Amarr Destroyer')
+
+
+class Effect6242(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Energy Neutralizer', 'maxRange',
+                                      src.getModifiedItemAttr('shipBonusAD2'), skill='Amarr Destroyer')
+
+
+class Effect6245(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Energy Nosferatu', 'maxRange',
+                                      src.getModifiedItemAttr('shipBonusAD2'), skill='Amarr Destroyer')
+
+
+class Effect6246(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Energy Nosferatu', 'falloffEffectiveness',
+                                      src.getModifiedItemAttr('shipBonusAD1'), skill='Amarr Destroyer')
+
+
+class Effect6253(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Energy Neutralizer', 'maxRange',
+                                      src.getModifiedItemAttr('shipBonusAB'), skill='Amarr Battleship')
+
+
+class Effect6256(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Energy Neutralizer', 'falloffEffectiveness',
+                                      src.getModifiedItemAttr('shipBonusAB2'), skill='Amarr Battleship')
+
+
+class Effect6257(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Energy Nosferatu', 'maxRange',
+                                      src.getModifiedItemAttr('shipBonusAB'), skill='Amarr Battleship')
+
+
+class Effect6260(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Energy Nosferatu', 'falloffEffectiveness',
+                                      src.getModifiedItemAttr('shipBonusAB2'), skill='Amarr Battleship')
+
+
+class Effect6267(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Energy Neutralizer', 'maxRange',
+                                      src.getModifiedItemAttr('eliteBonusElectronicAttackShip1'),
+                                      skill='Electronic Attack Ships')
+
+
+class Effect6272(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Energy Neutralizer', 'falloffEffectiveness',
+                                      src.getModifiedItemAttr('eliteBonusElectronicAttackShip3'),
+                                      skill='Electronic Attack Ships')
+
+
+class Effect6273(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Energy Nosferatu', 'maxRange',
+                                      src.getModifiedItemAttr('eliteBonusElectronicAttackShip1'),
+                                      skill='Electronic Attack Ships')
+
+
+class Effect6278(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Energy Nosferatu', 'falloffEffectiveness',
+                                      src.getModifiedItemAttr('eliteBonusElectronicAttackShip3'),
+                                      skill='Electronic Attack Ships')
+
+
+class Effect6281(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Energy Neutralizer', 'maxRange',
+                                      src.getModifiedItemAttr('shipBonus2AF'), skill='Amarr Frigate')
+
+
+class Effect6285(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Energy Neutralizer', 'falloffEffectiveness',
+                                      src.getModifiedItemAttr('shipBonus3AF'), skill='Amarr Frigate')
+
+
+class Effect6287(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Energy Nosferatu', 'maxRange',
+                                      src.getModifiedItemAttr('shipBonus2AF'), skill='Amarr Frigate')
+
+
+class Effect6291(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Energy Nosferatu', 'falloffEffectiveness',
+                                      src.getModifiedItemAttr('shipBonus3AF'), skill='Amarr Frigate')
+
+
+class Effect6294(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Energy Neutralizer', 'maxRange',
+                                      src.getModifiedItemAttr('shipBonusAC'), skill='Amarr Cruiser')
+
+
+class Effect6299(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Energy Neutralizer', 'falloffEffectiveness',
+                                      src.getModifiedItemAttr('shipBonusAC3'), skill='Amarr Cruiser')
+
+
+class Effect6300(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Energy Nosferatu', 'maxRange',
+                                      src.getModifiedItemAttr('shipBonusAC'), skill='Amarr Cruiser')
+
+
+class Effect6301(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Energy Nosferatu', 'falloffEffectiveness',
+                                      src.getModifiedItemAttr('shipBonusAC2'), skill='Amarr Cruiser')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Energy Nosferatu', 'maxRange',
+                                      src.getModifiedItemAttr('shipBonusAC2'), skill='Amarr Cruiser')
+
+
+class Effect6305(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Energy Nosferatu', 'falloffEffectiveness',
+                                      src.getModifiedItemAttr('shipBonusAC3'), skill='Amarr Cruiser')
+
+
+class Effect6307(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Missile Launcher Operation'), 'thermalDamage',
+                                        src.getModifiedItemAttr('shipBonusMD1'), skill='Minmatar Destroyer')
+
+
+class Effect6308(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Missile Launcher Operation'), 'emDamage',
+                                        src.getModifiedItemAttr('shipBonusMD1'), skill='Minmatar Destroyer')
+
+
+class Effect6309(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Missile Launcher Operation'), 'kineticDamage',
+                                        src.getModifiedItemAttr('shipBonusMD1'), skill='Minmatar Destroyer')
+
+
+class Effect6310(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Missile Launcher Operation'),
+                                        'explosiveDamage', src.getModifiedItemAttr('shipBonusMD1'),
+                                        skill='Minmatar Destroyer')
+
+
+class Effect6315(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Skirmish Command'), 'warfareBuff3Value',
+                                      src.getModifiedItemAttr('eliteBonusCommandDestroyer1'), skill='Command Destroyers')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Skirmish Command'), 'buffDuration',
+                                      src.getModifiedItemAttr('eliteBonusCommandDestroyer1'), skill='Command Destroyers')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Skirmish Command'), 'warfareBuff1Value',
+                                      src.getModifiedItemAttr('eliteBonusCommandDestroyer1'), skill='Command Destroyers')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Skirmish Command'), 'warfareBuff4Value',
+                                      src.getModifiedItemAttr('eliteBonusCommandDestroyer1'), skill='Command Destroyers')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Skirmish Command'), 'warfareBuff2Value',
+                                      src.getModifiedItemAttr('eliteBonusCommandDestroyer1'), skill='Command Destroyers')
+
+
+class Effect6316(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Shield Command'), 'warfareBuff3Value',
+                                      src.getModifiedItemAttr('eliteBonusCommandDestroyer1'), skill='Command Destroyers')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Shield Command'), 'buffDuration',
+                                      src.getModifiedItemAttr('eliteBonusCommandDestroyer1'), skill='Command Destroyers')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Shield Command'), 'warfareBuff1Value',
+                                      src.getModifiedItemAttr('eliteBonusCommandDestroyer1'), skill='Command Destroyers')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Shield Command'), 'warfareBuff4Value',
+                                      src.getModifiedItemAttr('eliteBonusCommandDestroyer1'), skill='Command Destroyers')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Shield Command'), 'warfareBuff2Value',
+                                      src.getModifiedItemAttr('eliteBonusCommandDestroyer1'), skill='Command Destroyers')
+
+
+class Effect6317(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Micro Jump Drive Operation'), 'duration',
+                                      src.getModifiedItemAttr('eliteBonusCommandDestroyer2'), skill='Command Destroyers')
+
+
+class Effect6318(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.ship.boostItemAttr('shieldEmDamageResonance', src.getModifiedItemAttr('shipBonusMD2'),
+                               skill='Minmatar Destroyer')
+
+
+class Effect6319(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.ship.boostItemAttr('shieldKineticDamageResonance', src.getModifiedItemAttr('shipBonusMD2'),
+                               skill='Minmatar Destroyer')
+
+
+class Effect6320(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.ship.boostItemAttr('shieldThermalDamageResonance', src.getModifiedItemAttr('shipBonusMD2'),
+                               skill='Minmatar Destroyer')
+
+
+class Effect6321(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.ship.boostItemAttr('shieldExplosiveDamageResonance', src.getModifiedItemAttr('shipBonusMD2'),
+                               skill='Minmatar Destroyer')
+
+
+class Effect6322(EffectDef):
+
+    runTime = 'early'
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context, *args, **kwargs):
+        src.boostItemAttr('scanGravimetricStrengthBonus', src.getModifiedChargeAttr('scanGravimetricStrengthBonusBonus'))
+
+
+class Effect6323(EffectDef):
+
+    runTime = 'early'
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context, *args, **kwargs):
+        src.boostItemAttr('scanLadarStrengthBonus', src.getModifiedChargeAttr('scanLadarStrengthBonusBonus'))
+
+
+class Effect6324(EffectDef):
+
+    runTime = 'early'
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context, *args, **kwargs):
+        src.boostItemAttr('scanMagnetometricStrengthBonus', src.getModifiedChargeAttr('scanMagnetometricStrengthBonusBonus'))
+
+
+class Effect6325(EffectDef):
+
+    runTime = 'early'
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context, *args, **kwargs):
+        src.boostItemAttr('scanRadarStrengthBonus', src.getModifiedChargeAttr('scanRadarStrengthBonusBonus'))
+
+
+class Effect6326(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Missile Launcher Operation'), 'thermalDamage',
+                                        src.getModifiedItemAttr('shipBonusCD1'), skill='Caldari Destroyer')
+
+
+class Effect6327(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Missile Launcher Operation'), 'emDamage',
+                                        src.getModifiedItemAttr('shipBonusCD1'), skill='Caldari Destroyer')
+
+
+class Effect6328(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Missile Launcher Operation'), 'kineticDamage',
+                                        src.getModifiedItemAttr('shipBonusCD1'), skill='Caldari Destroyer')
+
+
+class Effect6329(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Missile Launcher Operation'),
+                                        'explosiveDamage', src.getModifiedItemAttr('shipBonusCD1'),
+                                        skill='Caldari Destroyer')
+
+
+class Effect6330(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.ship.boostItemAttr('shieldEmDamageResonance', src.getModifiedItemAttr('shipBonusCD2'),
+                               skill='Caldari Destroyer')
+
+
+class Effect6331(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.ship.boostItemAttr('shieldThermalDamageResonance', src.getModifiedItemAttr('shipBonusCD2'),
+                               skill='Caldari Destroyer')
+
+
+class Effect6332(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.ship.boostItemAttr('shieldKineticDamageResonance', src.getModifiedItemAttr('shipBonusCD2'),
+                               skill='Caldari Destroyer')
+
+
+class Effect6333(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.ship.boostItemAttr('shieldExplosiveDamageResonance', src.getModifiedItemAttr('shipBonusCD2'),
+                               skill='Caldari Destroyer')
+
+
+class Effect6334(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Information Command'), 'warfareBuff1Value',
+                                      src.getModifiedItemAttr('eliteBonusCommandDestroyer1'), skill='Command Destroyers')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Information Command'), 'warfareBuff3Value',
+                                      src.getModifiedItemAttr('eliteBonusCommandDestroyer1'), skill='Command Destroyers')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Information Command'), 'warfareBuff2Value',
+                                      src.getModifiedItemAttr('eliteBonusCommandDestroyer1'), skill='Command Destroyers')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Information Command'), 'buffDuration',
+                                      src.getModifiedItemAttr('eliteBonusCommandDestroyer1'), skill='Command Destroyers')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Information Command'), 'warfareBuff4Value',
+                                      src.getModifiedItemAttr('eliteBonusCommandDestroyer1'), skill='Command Destroyers')
+
+
+class Effect6335(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.ship.boostItemAttr('armorKineticDamageResonance', src.getModifiedItemAttr('shipBonusAD2'),
+                               skill='Amarr Destroyer')
+
+
+class Effect6336(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.ship.boostItemAttr('armorThermalDamageResonance', src.getModifiedItemAttr('shipBonusAD2'),
+                               skill='Amarr Destroyer')
+
+
+class Effect6337(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.ship.boostItemAttr('armorEmDamageResonance', src.getModifiedItemAttr('shipBonusAD2'), skill='Amarr Destroyer')
+
+
+class Effect6338(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.ship.boostItemAttr('armorExplosiveDamageResonance', src.getModifiedItemAttr('shipBonusAD2'),
+                               skill='Amarr Destroyer')
+
+
+class Effect6339(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Armored Command'), 'warfareBuff2Value',
+                                      src.getModifiedItemAttr('eliteBonusCommandDestroyer1'), skill='Command Destroyers')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Armored Command'), 'warfareBuff3Value',
+                                      src.getModifiedItemAttr('eliteBonusCommandDestroyer1'), skill='Command Destroyers')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Armored Command'), 'buffDuration',
+                                      src.getModifiedItemAttr('eliteBonusCommandDestroyer1'), skill='Command Destroyers')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Armored Command'), 'warfareBuff4Value',
+                                      src.getModifiedItemAttr('eliteBonusCommandDestroyer1'), skill='Command Destroyers')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Armored Command'), 'warfareBuff1Value',
+                                      src.getModifiedItemAttr('eliteBonusCommandDestroyer1'), skill='Command Destroyers')
+
+
+class Effect6340(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.ship.boostItemAttr('armorKineticDamageResonance', src.getModifiedItemAttr('shipBonusGD2'),
+                               skill='Gallente Destroyer')
+
+
+class Effect6341(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.ship.boostItemAttr('armorEmDamageResonance', src.getModifiedItemAttr('shipBonusGD2'),
+                               skill='Gallente Destroyer')
+
+
+class Effect6342(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.ship.boostItemAttr('armorThermalDamageResonance', src.getModifiedItemAttr('shipBonusGD2'),
+                               skill='Gallente Destroyer')
+
+
+class Effect6343(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.ship.boostItemAttr('armorExplosiveDamageResonance', src.getModifiedItemAttr('shipBonusGD2'),
+                               skill='Gallente Destroyer')
+
+
+class Effect6350(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredChargeBoost(
+            lambda mod: mod.charge.requiresSkill('Light Missiles') or mod.charge.requiresSkill('Rockets'), 'kineticDamage',
+            src.getModifiedItemAttr('shipBonus3CF'), skill='Caldari Frigate')
+
+
+class Effect6351(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Missile Launcher Operation'), 'kineticDamage',
+                                        src.getModifiedItemAttr('shipBonusCC3'), skill='Caldari Cruiser')
+
+
+class Effect6352(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Weapon Disruption'), 'falloffEffectiveness',
+                                      src.getModifiedItemAttr('roleBonus'))
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Weapon Disruption'), 'maxRange',
+                                      src.getModifiedItemAttr('roleBonus'))
+
+
+class Effect6353(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Weapon Disruption'), 'cpu',
+                                      src.getModifiedItemAttr('roleBonus'))
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Weapon Disruption'), 'capacitorNeed',
+                                      src.getModifiedItemAttr('roleBonus'))
+
+
+class Effect6354(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Weapon Disruption'), 'trackingSpeedBonus',
+                                      src.getModifiedItemAttr('shipBonus2AF'), skill='Amarr Frigate')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Weapon Disruption'), 'explosionDelayBonus',
+                                      src.getModifiedItemAttr('shipBonus2AF'), skill='Amarr Frigate')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Weapon Disruption'), 'maxRangeBonus',
+                                      src.getModifiedItemAttr('shipBonus2AF'), skill='Amarr Frigate')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Weapon Disruption'), 'falloffBonus',
+                                      src.getModifiedItemAttr('shipBonus2AF'), skill='Amarr Frigate')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Weapon Disruption'), 'missileVelocityBonus',
+                                      src.getModifiedItemAttr('shipBonus2AF'), skill='Amarr Frigate')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Weapon Disruption'), 'aoeVelocityBonus',
+                                      src.getModifiedItemAttr('shipBonus2AF'), skill='Amarr Frigate')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Weapon Disruption'), 'aoeCloudSizeBonus',
+                                      src.getModifiedItemAttr('shipBonus2AF'), skill='Amarr Frigate')
+
+
+class Effect6355(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'ECM', 'capacitorNeed',
+                                      src.getModifiedItemAttr('roleBonus'))
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'ECM', 'cpu', src.getModifiedItemAttr('roleBonus'))
+
+
+class Effect6356(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'ECM', 'falloffEffectiveness',
+                                      src.getModifiedItemAttr('roleBonus'))
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'ECM', 'maxRange',
+                                      src.getModifiedItemAttr('roleBonus'))
+
+
+class Effect6357(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Navigation'), 'maxRange',
+                                      src.getModifiedItemAttr('shipBonusGF2'), skill='Gallente Frigate')
+
+
+class Effect6358(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemIncrease(lambda mod: mod.item.requiresSkill('Navigation'),
+                                         'warpScrambleStrength', ship.getModifiedItemAttr('roleBonus'))
+
+
+class Effect6359(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Rockets'), 'aoeVelocity',
+                                        src.getModifiedItemAttr('shipBonusMF'), skill='Minmatar Frigate')
+
+
+class Effect6360(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Rockets'), 'emDamage',
+                                        src.getModifiedItemAttr('shipBonusMF2'), skill='Minmatar Frigate')
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Rockets'), 'thermalDamage',
+                                        src.getModifiedItemAttr('shipBonusMF2'), skill='Minmatar Frigate')
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Rockets'), 'kineticDamage',
+                                        src.getModifiedItemAttr('shipBonusMF2'), skill='Minmatar Frigate')
+
+
+class Effect6361(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Rockets'), 'explosiveDamage',
+                                        src.getModifiedItemAttr('shipBonus3MF'), skill='Minmatar Frigate')
+
+
+class Effect6362(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Stasis Web', 'maxRange',
+                                      src.getModifiedItemAttr('roleBonus'))
+
+
+class Effect6368(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Remote Shield Booster', 'falloffEffectiveness',
+                                      src.getModifiedItemAttr('falloffBonus'))
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Ancillary Remote Shield Booster',
+                                      'falloffEffectiveness', src.getModifiedItemAttr('falloffBonus'))
+
+
+class Effect6369(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Shield Emission Systems'), 'falloffEffectiveness',
+                                      src.getModifiedItemAttr('shipBonusMC2'), skill='Minmatar Cruiser')
+
+
+class Effect6370(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Shield Emission Systems'), 'falloffEffectiveness',
+                                      src.getModifiedItemAttr('shipBonusCC'), skill='Caldari Cruiser')
+
+
+class Effect6371(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Remote Armor Repair Systems'),
+                                      'falloffEffectiveness', src.getModifiedItemAttr('shipBonusGC'),
+                                      skill='Gallente Cruiser')
+
+
+class Effect6372(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Remote Armor Repair Systems'),
+                                      'falloffEffectiveness', src.getModifiedItemAttr('shipBonusAC2'),
+                                      skill='Amarr Cruiser')
+
+
+class Effect6373(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Remote Armor Repairer', 'falloffEffectiveness',
+                                      src.getModifiedItemAttr('falloffBonus'))
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Ancillary Remote Armor Repairer',
+                                      'falloffEffectiveness', src.getModifiedItemAttr('falloffBonus'))
+
+
+class Effect6374(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.drones.filteredItemBoost(lambda drone: drone.item.group.name == 'Logistic Drone', 'structureDamageAmount',
+                                     src.getModifiedItemAttr('droneArmorDamageAmountBonus'))
+
+
+class Effect6377(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Remote Armor Repair Systems'), 'capacitorNeed',
+                                      src.getModifiedItemAttr('eliteBonusLogiFrig1'), skill='Logistics Frigates')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Remote Armor Repair Systems'), 'duration',
+                                      src.getModifiedItemAttr('eliteBonusLogiFrig1'), skill='Logistics Frigates')
+
+
+class Effect6378(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Shield Emission Systems'), 'duration',
+                                      src.getModifiedItemAttr('eliteBonusLogiFrig1'), skill='Logistics Frigates')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Shield Emission Systems'), 'capacitorNeed',
+                                      src.getModifiedItemAttr('eliteBonusLogiFrig1'), skill='Logistics Frigates')
+
+
+class Effect6379(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.ship.boostItemAttr('armorHP', src.getModifiedItemAttr('eliteBonusLogiFrig2'), skill='Logistics Frigates')
+
+
+class Effect6380(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.ship.boostItemAttr('shieldCapacity', src.getModifiedItemAttr('eliteBonusLogiFrig2'), skill='Logistics Frigates')
+
+
+class Effect6381(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.ship.boostItemAttr('signatureRadius', src.getModifiedItemAttr('eliteBonusLogiFrig2'),
+                               skill='Logistics Frigates')
+
+
+class Effect6384(EffectDef):
+
+    type = 'overheat'
+
+    @staticmethod
+    def handler(fit, module, context):
+        for tgtAttr in (
+                'aoeCloudSizeBonus',
+                'explosionDelayBonus',
+                'missileVelocityBonus',
+                'aoeVelocityBonus'
+        ):
+            module.boostItemAttr(tgtAttr, module.getModifiedItemAttr('overloadTrackingModuleStrengthBonus'))
+
+
+class Effect6385(EffectDef):
+
+    runTime = 'early'
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemForce(lambda mod: mod.item.group.name == 'Cloaking Device',
+                                      'maxVelocityModifier', src.getModifiedItemAttr('velocityPenaltyReduction'))
+
+
+class Effect6386(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        level = src.level if 'skill' in context else 1
+        for attr in (
+                'explosionDelayBonus',
+                'aoeVelocityBonus',
+                'aoeCloudSizeBonus',
+                'missileVelocityBonus'
+        ):
+            fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Weapon Disruption'),
+                                          attr, src.getModifiedItemAttr('scanSkillEwStrengthBonus') * level)
+
+
+class Effect6395(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Weapon Disruption'), 'missileVelocityBonus',
+                                      src.getModifiedItemAttr('shipBonusAC'), skill='Amarr Cruiser')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Weapon Disruption'), 'aoeVelocityBonus',
+                                      src.getModifiedItemAttr('shipBonusAC'), skill='Amarr Cruiser')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Weapon Disruption'), 'maxRangeBonus',
+                                      src.getModifiedItemAttr('shipBonusAC'), skill='Amarr Cruiser')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Weapon Disruption'), 'explosionDelayBonus',
+                                      src.getModifiedItemAttr('shipBonusAC'), skill='Amarr Cruiser')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Weapon Disruption'), 'aoeCloudSizeBonus',
+                                      src.getModifiedItemAttr('shipBonusAC'), skill='Amarr Cruiser')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Weapon Disruption'), 'trackingSpeedBonus',
+                                      src.getModifiedItemAttr('shipBonusAC'), skill='Amarr Cruiser')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Weapon Disruption'), 'falloffBonus',
+                                      src.getModifiedItemAttr('shipBonusAC'), skill='Amarr Cruiser')
+
+
+class Effect6396(EffectDef):
+
+    type = 'passive', 'structure'
+
+    @staticmethod
+    def handler(fit, src, context):
+        groups = ('Structure Anti-Capital Missile', 'Structure Anti-Subcapital Missile', 'Structure Guided Bomb')
+        for damageType in ('em', 'thermal', 'explosive', 'kinetic'):
+            fit.modules.filteredChargeBoost(lambda mod: mod.charge.group.name in groups,
+                                            '%sDamage' % damageType, src.getModifiedItemAttr('damageMultiplierBonus'),
+                                            skill='Structure Missile Systems')
+
+
+class Effect6400(EffectDef):
+
+    type = 'passive', 'structure'
+
+    @staticmethod
+    def handler(fit, src, context):
+        groups = ('Structure Warp Scrambler', 'Structure Disruption Battery', 'Structure Stasis Webifier')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name in groups,
+                                      'capacitorNeed', src.getModifiedItemAttr('capNeedBonus'),
+                                      skill='Structure Electronic Systems')
+
+
+class Effect6401(EffectDef):
+
+    type = 'passive', 'structure'
+
+    @staticmethod
+    def handler(fit, src, context):
+        groups = ('Structure Energy Neutralizer', 'Structure Area Denial Module')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name in groups,
+                                      'capacitorNeed', src.getModifiedItemAttr('capNeedBonus'),
+                                      skill='Structure Engineering Systems')
+
+
+class Effect6402(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        groups = ('Structure Anti-Subcapital Missile', 'Structure Anti-Capital Missile')
+
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.group.name in groups,
+                                      'aoeVelocity', src.getModifiedItemAttr('structureRigMissileExploVeloBonus'),
+                                      stackingPenalties=True)
+
+
+class Effect6403(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        groups = ('Structure Anti-Subcapital Missile', 'Structure Anti-Capital Missile')
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.group.name in groups,
+                                      'maxVelocity', src.getModifiedItemAttr('structureRigMissileVelocityBonus'),
+                                      stackingPenalties=True)
+
+
+class Effect6404(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Structure Energy Neutralizer',
+                                      'maxRange', src.getModifiedItemAttr('structureRigEwarOptimalBonus'),
+                                      stackingPenalties=True)
+
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Structure Energy Neutralizer',
+                                      'falloffEffectiveness', src.getModifiedItemAttr('structureRigEwarFalloffBonus'),
+                                      stackingPenalties=True)
+
+
+class Effect6405(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Structure Energy Neutralizer',
+                                      'capacitorNeed', src.getModifiedItemAttr('structureRigEwarCapUseBonus'),
+                                      stackingPenalties=True)
+
+
+class Effect6406(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        groups = ('Structure ECM Battery', 'Structure Disruption Battery')
+
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name in groups,
+                                      'falloff', src.getModifiedItemAttr('structureRigEwarFalloffBonus'),
+                                      stackingPenalties=True)
+
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name in groups,
+                                      'maxRange', src.getModifiedItemAttr('structureRigEwarOptimalBonus'),
+                                      stackingPenalties=True)
+
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name in groups,
+                                      'falloffEffectiveness', src.getModifiedItemAttr('structureRigEwarFalloffBonus'),
+                                      stackingPenalties=True)
+
+
+class Effect6407(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        groups = ('Structure ECM Battery', 'Structure Disruption Battery')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name in groups,
+                                      'capacitorNeed', src.getModifiedItemAttr('structureRigEwarCapUseBonus'),
+                                      stackingPenalties=True)
+
+
+class Effect6408(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.extraAttributes.increase('maxTargetsLockedFromSkills', src.getModifiedItemAttr('structureRigMaxTargetBonus'))
+
+
+class Effect6409(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.ship.boostItemAttr('scanResolution', src.getModifiedItemAttr('structureRigScanResBonus'),
+                               stackingPenalties=True)
+
+
+class Effect6410(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.group.name == 'Structure Guided Bomb',
+                                        'aoeCloudSize', src.getModifiedItemAttr('structureRigMissileExplosionRadiusBonus'),
+                                        stackingPenalties=True)
+
+
+class Effect6411(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.group.name == 'Structure Guided Bomb',
+                                        'maxVelocity', src.getModifiedItemAttr('structureRigMissileVelocityBonus'),
+                                        stackingPenalties=True)
+
+
+class Effect6412(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Structure Area Denial Module',
+                                      'empFieldRange', src.getModifiedItemAttr('structureRigPDRangeBonus'),
+                                      stackingPenalties=True)
+
+
+class Effect6413(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Structure Area Denial Module',
+                                      'capacitorNeed', src.getModifiedItemAttr('structureRigPDCapUseBonus'),
+                                      stackingPenalties=True)
+
+
+class Effect6417(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemIncrease(lambda mod: mod.item.group.name == 'Structure Doomsday Weapon',
+                                         'lightningWeaponDamageLossTarget',
+                                         src.getModifiedItemAttr('structureRigDoomsdayDamageLossTargetBonus'))
+
+
+class Effect6422(EffectDef):
+
+    type = 'projected', 'active'
+
+    @staticmethod
+    def handler(fit, module, context, *args, **kwargs):
+        if 'projected' not in context:
+            return
+
+        fit.ship.boostItemAttr('maxTargetRange', module.getModifiedItemAttr('maxTargetRangeBonus'),
+                               stackingPenalties=True, *args, **kwargs)
+
+        fit.ship.boostItemAttr('scanResolution', module.getModifiedItemAttr('scanResolutionBonus'),
+                               stackingPenalties=True, *args, **kwargs)
+
+
+class Effect6423(EffectDef):
+
+    type = 'active', 'projected'
+
+    @staticmethod
+    def handler(fit, module, context, *args, **kwargs):
+        if 'projected' in context:
+            for srcAttr, tgtAttr in (
+                    ('aoeCloudSizeBonus', 'aoeCloudSize'),
+                    ('aoeVelocityBonus', 'aoeVelocity'),
+                    ('missileVelocityBonus', 'maxVelocity'),
+                    ('explosionDelayBonus', 'explosionDelay'),
+            ):
+                fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Missile Launcher Operation'),
+                                                tgtAttr, module.getModifiedItemAttr(srcAttr),
+                                                stackingPenalties=True, *args, **kwargs)
+
+
+class Effect6424(EffectDef):
+
+    type = 'projected', 'active'
+
+    @staticmethod
+    def handler(fit, module, context, *args, **kwargs):
+        if 'projected' in context:
+            fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Gunnery'),
+                                          'trackingSpeed', module.getModifiedItemAttr('trackingSpeedBonus'),
+                                          stackingPenalties=True, *args, **kwargs)
+            fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Gunnery'),
+                                          'maxRange', module.getModifiedItemAttr('maxRangeBonus'),
+                                          stackingPenalties=True, *args, **kwargs)
+            fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Gunnery'),
+                                          'falloff', module.getModifiedItemAttr('falloffBonus'),
+                                          stackingPenalties=True, *args, **kwargs)
+
+
+class Effect6425(EffectDef):
+
+    type = 'projected', 'active'
+
+    @staticmethod
+    def handler(fit, container, context, *args, **kwargs):
+        if 'projected' in context:
+            fit.ship.boostItemAttr('signatureRadius', container.getModifiedItemAttr('signatureRadiusBonus'),
+                                   stackingPenalties=True, *args, **kwargs)
+
+
+class Effect6426(EffectDef):
+
+    type = 'active', 'projected'
+
+    @staticmethod
+    def handler(fit, module, context, *args, **kwargs):
+        if 'projected' not in context:
+            return
+        fit.ship.boostItemAttr('maxVelocity', module.getModifiedItemAttr('speedFactor'),
+                               stackingPenalties=True, *args, **kwargs)
+
+
+class Effect6427(EffectDef):
+
+    type = 'projected', 'active'
+
+    @staticmethod
+    def handler(fit, module, context):
+        if 'projected' not in context:
+            return
+
+        fit.ship.boostItemAttr('maxTargetRange', module.getModifiedItemAttr('maxTargetRangeBonus'),
+                               stackingPenalties=True)
+        fit.ship.boostItemAttr('scanResolution', module.getModifiedItemAttr('scanResolutionBonus'),
+                               stackingPenalties=True)
+
+        for scanType in ('Gravimetric', 'Magnetometric', 'Radar', 'Ladar'):
+            fit.ship.boostItemAttr(
+                'scan{}Strength'.format(scanType),
+                module.getModifiedItemAttr('scan{}StrengthPercent'.format(scanType)),
+                stackingPenalties=True
+            )
+
+
+class Effect6428(EffectDef):
+
+    type = 'projected', 'active'
+
+    @staticmethod
+    def handler(fit, module, context, **kwargs):
+        if 'projected' in context:
+            fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Gunnery'),
+                                          'trackingSpeed', module.getModifiedItemAttr('trackingSpeedBonus'),
+                                          stackingPenalties=True, **kwargs)
+            fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Gunnery'),
+                                          'maxRange', module.getModifiedItemAttr('maxRangeBonus'),
+                                          stackingPenalties=True, **kwargs)
+            fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Gunnery'),
+                                          'falloff', module.getModifiedItemAttr('falloffBonus'),
+                                          stackingPenalties=True, **kwargs)
+
+
+class Effect6431(EffectDef):
+
+    displayName = 'Missile Attack'
+    hasCharges = True
+    prefix = 'fighterAbilityMissiles'
+    type = 'active'
+
+
+class Effect6434(EffectDef):
+
+    displayName = 'Energy Neutralizer'
+    grouped = True
+    prefix = 'fighterAbilityEnergyNeutralizer'
+    type = 'active', 'projected'
+
+    @classmethod
+    def handler(cls, fit, src, context, **kwargs):
+        if 'projected' in context:
+            amount = src.getModifiedItemAttr('{}Amount'.format(cls.prefix)) * src.amountActive
+            time = src.getModifiedItemAttr('{}Duration'.format(cls.prefix))
+
+            if 'effect' in kwargs:
+                from eos.modifiedAttributeDict import ModifiedAttributeDict
+                amount *= ModifiedAttributeDict.getResistance(fit, kwargs['effect'])
+
+            fit.addDrain(src, time, amount, 0)
+
+
+class Effect6435(EffectDef):
+
+    displayName = 'Stasis Webifier'
+    grouped = True
+    prefix = 'fighterAbilityStasisWebifier'
+    type = 'active', 'projected'
+
+    @classmethod
+    def handler(cls, fit, src, context):
+        if 'projected' not in context:
+            return
+        fit.ship.boostItemAttr('maxVelocity', src.getModifiedItemAttr('{}SpeedPenalty'.format(cls.prefix)) * src.amountActive,
+                               stackingPenalties=True)
+
+
+class Effect6436(EffectDef):
+
+    displayName = 'Warp Disruption'
+    grouped = True
+    prefix = 'fighterAbilityWarpDisruption'
+    type = 'active', 'projected'
+
+    @classmethod
+    def handler(cls, fit, src, context):
+        if 'projected' not in context:
+            return
+        fit.ship.increaseItemAttr('warpScrambleStatus', src.getModifiedItemAttr('{}PointStrength'.format(cls.prefix)) * src.amountActive)
+
+
+class Effect6437(EffectDef):
+
+    displayName = 'ECM'
+    grouped = True
+    prefix = 'fighterAbilityECM'
+    type = 'projected', 'active'
+
+    @classmethod
+    def handler(cls, fit, module, context, **kwargs):
+        if 'projected' not in context:
+            return
+        # jam formula: 1 - (1- (jammer str/ship str))^(# of jam mods with same str))
+        strModifier = 1 - (module.getModifiedItemAttr('{}Strength{}'.format(cls.prefix, fit.scanType)) * module.amountActive) / fit.scanStrength
+
+        if 'effect' in kwargs:
+            from eos.modifiedAttributeDict import ModifiedAttributeDict
+            strModifier *= ModifiedAttributeDict.getResistance(fit, kwargs['effect'])
+
+        fit.ecmProjectedStr *= strModifier
+
+
+class Effect6439(EffectDef):
+
+    displayName = 'Evasive Maneuvers'
+    grouped = True
+    prefix = 'fighterAbilityEvasiveManeuvers'
+    runTime = 'late'
+    type = 'active'
+
+    @staticmethod
+    def handler(fit, container, context):
+        container.boostItemAttr('maxVelocity',
+                                container.getModifiedItemAttr('fighterAbilityEvasiveManeuversSpeedBonus'))
+        container.boostItemAttr('signatureRadius',
+                                container.getModifiedItemAttr('fighterAbilityEvasiveManeuversSignatureRadiusBonus'),
+                                stackingPenalties=True)
+
+        # These may not have stacking penalties, but there's nothing else that affects the attributes yet to check.
+        container.multiplyItemAttr('shieldEmDamageResonance',
+                                   container.getModifiedItemAttr('fighterAbilityEvasiveManeuversEmResonance'),
+                                   stackingPenalties=True)
+        container.multiplyItemAttr('shieldThermalDamageResonance',
+                                   container.getModifiedItemAttr('fighterAbilityEvasiveManeuversThermResonance'),
+                                   stackingPenalties=True)
+        container.multiplyItemAttr('shieldKineticDamageResonance',
+                                   container.getModifiedItemAttr('fighterAbilityEvasiveManeuversKinResonance'),
+                                   stackingPenalties=True)
+        container.multiplyItemAttr('shieldExplosiveDamageResonance',
+                                   container.getModifiedItemAttr('fighterAbilityEvasiveManeuversExpResonance'),
+                                   stackingPenalties=True)
+
+
+class Effect6441(EffectDef):
+
+    displayName = 'Microwarpdrive'
+    grouped = True
+    runTime = 'late'
+    type = 'active'
+
+    @staticmethod
+    def handler(fit, module, context):
+        module.boostItemAttr('maxVelocity', module.getModifiedItemAttr('fighterAbilityMicroWarpDriveSpeedBonus'),
+                             stackingPenalties=True)
+        module.boostItemAttr('signatureRadius',
+                             module.getModifiedItemAttr('fighterAbilityMicroWarpDriveSignatureRadiusBonus'),
+                             stackingPenalties=True)
+
+
+class Effect6443(EffectDef):
+
+    type = 'active'
+
+
+class Effect6447(EffectDef):
+
+    type = 'active'
+
+
+class Effect6448(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context):
+        missileGroups = ('Structure Anti-Capital Missile', 'Structure Anti-Subcapital Missile')
+        for srcAttr, tgtAttr in (
+                ('aoeCloudSizeBonus', 'aoeCloudSize'),
+                ('aoeVelocityBonus', 'aoeVelocity'),
+                ('missileVelocityBonus', 'maxVelocity'),
+                ('explosionDelayBonus', 'explosionDelay'),
+        ):
+            fit.modules.filteredChargeBoost(lambda mod: mod.charge.group.name in missileGroups,
+                                            tgtAttr, container.getModifiedItemAttr(srcAttr),
+                                            stackingPenalties=True)
+
+
+class Effect6449(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        missileGroups = ('Structure Anti-Capital Missile', 'Structure Anti-Subcapital Missile')
+
+        for dmgType in ('em', 'kinetic', 'explosive', 'thermal'):
+            fit.modules.filteredChargeMultiply(lambda mod: mod.charge.group.name in missileGroups,
+                                               '%sDamage' % dmgType,
+                                               module.getModifiedItemAttr('missileDamageMultiplierBonus'),
+                                               stackingPenalties=True)
+
+        launcherGroups = ('Structure XL Missile Launcher', 'Structure Multirole Missile Launcher')
+        fit.modules.filteredItemMultiply(lambda mod: mod.item.group.name in launcherGroups,
+                                         'speed', module.getModifiedItemAttr('speedMultiplier'),
+                                         stackingPenalties=True)
+
+
+class Effect6465(EffectDef):
+
+    displayName = 'Turret Attack'
+    prefix = 'fighterAbilityAttackMissile'
+    type = 'active'
+
+
+class Effect6470(EffectDef):
+
+    type = 'projected', 'active'
+
+    @staticmethod
+    def handler(fit, module, context, **kwargs):
+        if 'projected' in context:
+            # jam formula: 1 - (1- (jammer str/ship str))^(# of jam mods with same str))
+            strModifier = 1 - module.getModifiedItemAttr('scan{0}StrengthBonus'.format(fit.scanType)) / fit.scanStrength
+
+            if 'effect' in kwargs:
+                from eos.modifiedAttributeDict import ModifiedAttributeDict
+                strModifier *= ModifiedAttributeDict.getResistance(fit, kwargs['effect'])
+
+            fit.ecmProjectedStr *= strModifier
+
+
+class Effect6472(EffectDef):
+
+    type = 'active'
+
+
+class Effect6473(EffectDef):
+
+    type = 'active'
+
+
+class Effect6474(EffectDef):
+
+    type = 'active'
+
+
+class Effect6475(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemIncrease(lambda mod: mod.item.group.name == 'Structure Doomsday Weapon',
+                                         'lightningWeaponTargetAmount',
+                                         src.getModifiedItemAttr('structureRigDoomsdayTargetAmountBonus'))
+
+
+class Effect6476(EffectDef):
+
+    type = 'active', 'projected'
+
+    @staticmethod
+    def handler(fit, module, context, *args, **kwargs):
+        if 'projected' not in context:
+            return
+        fit.ship.boostItemAttr('maxVelocity', module.getModifiedItemAttr('speedFactor'),
+                               stackingPenalties=True, *args, **kwargs)
+
+
+class Effect6477(EffectDef):
+
+    type = 'active', 'projected'
+
+    @staticmethod
+    def handler(fit, src, context, **kwargs):
+        if 'projected' in context and ((hasattr(src, 'state') and src.state >= FittingModuleState.ACTIVE) or
+                                       hasattr(src, 'amountActive')):
+            amount = src.getModifiedItemAttr('energyNeutralizerAmount')
+
+            if 'effect' in kwargs:
+                from eos.modifiedAttributeDict import ModifiedAttributeDict
+                amount *= ModifiedAttributeDict.getResistance(fit, kwargs['effect'])
+
+            time = src.getModifiedItemAttr('duration')
+
+            fit.addDrain(src, time, amount, 0)
+
+
+class Effect6478(EffectDef):
+
+    type = 'projected', 'active'
+
+    @staticmethod
+    def handler(fit, container, context, *args, **kwargs):
+        if 'projected' in context:
+            fit.ship.boostItemAttr('signatureRadius', container.getModifiedItemAttr('signatureRadiusBonus'),
+                                   stackingPenalties=True, *args, **kwargs)
+
+
+class Effect6479(EffectDef):
+
+    type = 'active', 'projected'
+
+    @staticmethod
+    def handler(fit, module, context, *args, **kwargs):
+        if 'projected' in context:
+            for srcAttr, tgtAttr in (
+                    ('aoeCloudSizeBonus', 'aoeCloudSize'),
+                    ('aoeVelocityBonus', 'aoeVelocity'),
+                    ('missileVelocityBonus', 'maxVelocity'),
+                    ('explosionDelayBonus', 'explosionDelay'),
+            ):
+                fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Missile Launcher Operation'),
+                                                tgtAttr, module.getModifiedItemAttr(srcAttr),
+                                                stackingPenalties=True, *args, **kwargs)
+
+            fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Gunnery'),
+                                          'trackingSpeed', module.getModifiedItemAttr('trackingSpeedBonus'),
+                                          stackingPenalties=True, *args, **kwargs)
+            fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Gunnery'),
+                                          'maxRange', module.getModifiedItemAttr('maxRangeBonus'),
+                                          stackingPenalties=True, *args, **kwargs)
+            fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Gunnery'),
+                                          'falloff', module.getModifiedItemAttr('falloffBonus'),
+                                          stackingPenalties=True, *args, **kwargs)
+
+
+class Effect6481(EffectDef):
+
+    type = 'projected', 'active'
+
+    @staticmethod
+    def handler(fit, module, context, *args, **kwargs):
+        if 'projected' not in context:
+            return
+
+        fit.ship.boostItemAttr('maxTargetRange', module.getModifiedItemAttr('maxTargetRangeBonus'),
+                               stackingPenalties=True, *args, **kwargs)
+
+        fit.ship.boostItemAttr('scanResolution', module.getModifiedItemAttr('scanResolutionBonus'),
+                               stackingPenalties=True, *args, **kwargs)
+
+
+class Effect6482(EffectDef):
+
+    type = 'projected', 'active'
+
+    @staticmethod
+    def handler(fit, module, context):
+        return
+
+
+class Effect6484(EffectDef):
+
+    runtime = 'late'
+    type = 'active'
+
+    @staticmethod
+    def handler(fit, src, context):
+        for dmgType in ('em', 'thermal', 'kinetic', 'explosive'):
+            fit.ship.multiplyItemAttr('{}DamageResonance'.format(dmgType),
+                                      src.getModifiedItemAttr('hull{}DamageResonance'.format(dmgType.title())),
+                                      stackingPenalties=True, penaltyGroup='postMul')
+
+
+class Effect6485(EffectDef):
+
+    displayName = 'Bomb'
+    hasCharges = True
+    prefix = 'fighterAbilityLaunchBomb'
+    type = 'active'
+
+
+class Effect6487(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.ship.boostItemAttr('energyWarfareResistance',
+                               module.getModifiedItemAttr('energyWarfareResistanceBonus'),
+                               stackingPenalties=True)
+
+
+class Effect6488(EffectDef):
+
+    type = 'active'
+
+    @staticmethod
+    def handler(fit, module, context):
+        for scanType in ('Gravimetric', 'Magnetometric', 'Radar', 'Ladar'):
+            module.boostItemAttr('scan{}StrengthPercent'.format(scanType),
+                                 module.getModifiedChargeAttr('sensorStrengthBonusBonus'))
+
+
+class Effect6501(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Capital Energy Turret'), 'damageMultiplier',
+                                      src.getModifiedItemAttr('shipBonusDreadnoughtA1'), skill='Amarr Dreadnought')
+
+
+class Effect6502(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.ship.boostItemAttr('armorExplosiveDamageResonance', src.getModifiedItemAttr('shipBonusDreadnoughtA2'),
+                               skill='Amarr Dreadnought')
+        fit.ship.boostItemAttr('armorEmDamageResonance', src.getModifiedItemAttr('shipBonusDreadnoughtA2'),
+                               skill='Amarr Dreadnought')
+        fit.ship.boostItemAttr('armorThermalDamageResonance', src.getModifiedItemAttr('shipBonusDreadnoughtA2'),
+                               skill='Amarr Dreadnought')
+        fit.ship.boostItemAttr('armorKineticDamageResonance', src.getModifiedItemAttr('shipBonusDreadnoughtA2'),
+                               skill='Amarr Dreadnought')
+
+
+class Effect6503(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Capital Energy Turret'), 'capacitorNeed',
+                                      src.getModifiedItemAttr('shipBonusDreadnoughtA3'), skill='Amarr Dreadnought')
+
+
+class Effect6504(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('XL Torpedoes'), 'thermalDamage',
+                                        src.getModifiedItemAttr('shipBonusDreadnoughtC1'), skill='Caldari Dreadnought')
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('XL Cruise Missiles'), 'kineticDamage',
+                                        src.getModifiedItemAttr('shipBonusDreadnoughtC1'), skill='Caldari Dreadnought')
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Torpedoes'), 'emDamage',
+                                        src.getModifiedItemAttr('shipBonusDreadnoughtC1'), skill='Caldari Dreadnought')
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Torpedoes'), 'explosiveDamage',
+                                        src.getModifiedItemAttr('shipBonusDreadnoughtC1'), skill='Caldari Dreadnought')
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('XL Cruise Missiles'), 'explosiveDamage',
+                                        src.getModifiedItemAttr('shipBonusDreadnoughtC1'), skill='Caldari Dreadnought')
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('XL Cruise Missiles'), 'thermalDamage',
+                                        src.getModifiedItemAttr('shipBonusDreadnoughtC1'), skill='Caldari Dreadnought')
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Torpedoes'), 'thermalDamage',
+                                        src.getModifiedItemAttr('shipBonusDreadnoughtC1'), skill='Caldari Dreadnought')
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('XL Torpedoes'), 'emDamage',
+                                        src.getModifiedItemAttr('shipBonusDreadnoughtC1'), skill='Caldari Dreadnought')
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Torpedoes'), 'kineticDamage',
+                                        src.getModifiedItemAttr('shipBonusDreadnoughtC1'), skill='Caldari Dreadnought')
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('XL Torpedoes'), 'kineticDamage',
+                                        src.getModifiedItemAttr('shipBonusDreadnoughtC1'), skill='Caldari Dreadnought')
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('XL Torpedoes'), 'explosiveDamage',
+                                        src.getModifiedItemAttr('shipBonusDreadnoughtC1'), skill='Caldari Dreadnought')
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('XL Cruise Missiles'), 'emDamage',
+                                        src.getModifiedItemAttr('shipBonusDreadnoughtC1'), skill='Caldari Dreadnought')
+
+
+class Effect6505(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.ship.boostItemAttr('shieldThermalDamageResonance', src.getModifiedItemAttr('shipBonusDreadnoughtC2'),
+                               skill='Caldari Dreadnought')
+        fit.ship.boostItemAttr('shieldKineticDamageResonance', src.getModifiedItemAttr('shipBonusDreadnoughtC2'),
+                               skill='Caldari Dreadnought')
+        fit.ship.boostItemAttr('shieldEmDamageResonance', src.getModifiedItemAttr('shipBonusDreadnoughtC2'),
+                               skill='Caldari Dreadnought')
+        fit.ship.boostItemAttr('shieldExplosiveDamageResonance', src.getModifiedItemAttr('shipBonusDreadnoughtC2'),
+                               skill='Caldari Dreadnought')
+
+
+class Effect6506(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Capital Hybrid Turret'), 'damageMultiplier',
+                                      src.getModifiedItemAttr('shipBonusDreadnoughtG1'), skill='Gallente Dreadnought')
+
+
+class Effect6507(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Capital Hybrid Turret'), 'speed',
+                                      src.getModifiedItemAttr('shipBonusDreadnoughtG2'), skill='Gallente Dreadnought')
+
+
+class Effect6508(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Capital Repair Systems'), 'duration',
+                                      src.getModifiedItemAttr('shipBonusDreadnoughtG3'), skill='Gallente Dreadnought')
+
+
+class Effect6509(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Capital Projectile Turret'), 'damageMultiplier',
+                                      src.getModifiedItemAttr('shipBonusDreadnoughtM1'), skill='Minmatar Dreadnought')
+
+
+class Effect6510(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Capital Projectile Turret'), 'speed',
+                                      src.getModifiedItemAttr('shipBonusDreadnoughtM2'), skill='Minmatar Dreadnought')
+
+
+class Effect6511(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Capital Shield Operation'), 'duration',
+                                      src.getModifiedItemAttr('shipBonusDreadnoughtM2'), skill='Minmatar Dreadnought')
+
+
+class Effect6513(EffectDef):
+
+    type = 'projected', 'active'
+
+    @staticmethod
+    def handler(fit, module, context, **kwargs):
+        if 'projected' in context:
+            # jam formula: 1 - (1- (jammer str/ship str))^(# of jam mods with same str))
+            strModifier = 1 - module.getModifiedItemAttr('scan{0}StrengthBonus'.format(fit.scanType)) / fit.scanStrength
+
+            if 'effect' in kwargs:
+                from eos.modifiedAttributeDict import ModifiedAttributeDict
+                strModifier *= ModifiedAttributeDict.getResistance(fit, kwargs['effect'])
+
+            fit.ecmProjectedStr *= strModifier
+
+
+class Effect6526(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Capacitor Emission Systems') or
+                                                  mod.item.requiresSkill('Capital Capacitor Emission Systems'),
+                                      'powerTransferAmount', src.getModifiedItemAttr('shipBonusForceAuxiliaryA1'),
+                                      skill='Amarr Carrier')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Remote Armor Repair Systems') or
+                                                  mod.item.requiresSkill('Capital Remote Armor Repair Systems'),
+                                      'armorDamageAmount', src.getModifiedItemAttr('shipBonusForceAuxiliaryA1'),
+                                      skill='Amarr Carrier')
+
+
+class Effect6527(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.ship.boostItemAttr('armorKineticDamageResonance', src.getModifiedItemAttr('shipBonusForceAuxiliaryA2'),
+                               skill='Amarr Carrier')
+        fit.ship.boostItemAttr('armorExplosiveDamageResonance', src.getModifiedItemAttr('shipBonusForceAuxiliaryA2'),
+                               skill='Amarr Carrier')
+        fit.ship.boostItemAttr('armorEmDamageResonance', src.getModifiedItemAttr('shipBonusForceAuxiliaryA2'),
+                               skill='Amarr Carrier')
+        fit.ship.boostItemAttr('armorThermalDamageResonance', src.getModifiedItemAttr('shipBonusForceAuxiliaryA2'),
+                               skill='Amarr Carrier')
+
+
+class Effect6533(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Armored Command') or
+                                                  mod.item.requiresSkill('Information Command'),
+                                      'warfareBuff4Value', src.getModifiedItemAttr('shipBonusForceAuxiliaryA4'), skill='Amarr Carrier')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Armored Command') or
+                                                  mod.item.requiresSkill('Information Command'),
+                                      'warfareBuff3Value', src.getModifiedItemAttr('shipBonusForceAuxiliaryA4'), skill='Amarr Carrier')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Armored Command') or
+                                                  mod.item.requiresSkill('Information Command'),
+                                      'warfareBuff1Value', src.getModifiedItemAttr('shipBonusForceAuxiliaryA4'), skill='Amarr Carrier')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Armored Command') or
+                                                  mod.item.requiresSkill('Information Command'),
+                                      'buffDuration', src.getModifiedItemAttr('shipBonusForceAuxiliaryA4'), skill='Amarr Carrier')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Armored Command') or
+                                                  mod.item.requiresSkill('Information Command'),
+                                      'warfareBuff2Value', src.getModifiedItemAttr('shipBonusForceAuxiliaryA4'), skill='Amarr Carrier')
+
+
+class Effect6534(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(
+            lambda mod: mod.item.requiresSkill('Skirmish Command') or mod.item.requiresSkill('Shield Command'),
+            'warfareBuff3Value', src.getModifiedItemAttr('shipBonusForceAuxiliaryM4'), skill='Minmatar Carrier')
+        fit.modules.filteredItemBoost(
+            lambda mod: mod.item.requiresSkill('Skirmish Command') or mod.item.requiresSkill('Shield Command'),
+            'warfareBuff2Value', src.getModifiedItemAttr('shipBonusForceAuxiliaryM4'), skill='Minmatar Carrier')
+        fit.modules.filteredItemBoost(
+            lambda mod: mod.item.requiresSkill('Skirmish Command') or mod.item.requiresSkill('Shield Command'),
+            'warfareBuff1Value', src.getModifiedItemAttr('shipBonusForceAuxiliaryM4'), skill='Minmatar Carrier')
+        fit.modules.filteredItemBoost(
+            lambda mod: mod.item.requiresSkill('Skirmish Command') or mod.item.requiresSkill('Shield Command'),
+            'buffDuration', src.getModifiedItemAttr('shipBonusForceAuxiliaryM4'), skill='Minmatar Carrier')
+        fit.modules.filteredItemBoost(
+            lambda mod: mod.item.requiresSkill('Skirmish Command') or mod.item.requiresSkill('Shield Command'),
+            'warfareBuff4Value', src.getModifiedItemAttr('shipBonusForceAuxiliaryM4'), skill='Minmatar Carrier')
+
+
+class Effect6535(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(
+            lambda mod: mod.item.requiresSkill('Skirmish Command') or mod.item.requiresSkill('Armored Command'),
+            'warfareBuff3Value', src.getModifiedItemAttr('shipBonusForceAuxiliaryG4'), skill='Gallente Carrier')
+        fit.modules.filteredItemBoost(
+            lambda mod: mod.item.requiresSkill('Skirmish Command') or mod.item.requiresSkill('Armored Command'),
+            'warfareBuff4Value', src.getModifiedItemAttr('shipBonusForceAuxiliaryG4'), skill='Gallente Carrier')
+        fit.modules.filteredItemBoost(
+            lambda mod: mod.item.requiresSkill('Skirmish Command') or mod.item.requiresSkill('Armored Command'),
+            'buffDuration', src.getModifiedItemAttr('shipBonusForceAuxiliaryG4'), skill='Gallente Carrier')
+        fit.modules.filteredItemBoost(
+            lambda mod: mod.item.requiresSkill('Skirmish Command') or mod.item.requiresSkill('Armored Command'),
+            'warfareBuff2Value', src.getModifiedItemAttr('shipBonusForceAuxiliaryG4'), skill='Gallente Carrier')
+        fit.modules.filteredItemBoost(
+            lambda mod: mod.item.requiresSkill('Skirmish Command') or mod.item.requiresSkill('Armored Command'),
+            'warfareBuff1Value', src.getModifiedItemAttr('shipBonusForceAuxiliaryG4'), skill='Gallente Carrier')
+
+
+class Effect6536(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(
+            lambda mod: mod.item.requiresSkill('Shield Command') or mod.item.requiresSkill('Information Command'),
+            'warfareBuff3Value', src.getModifiedItemAttr('shipBonusForceAuxiliaryC4'), skill='Caldari Carrier')
+        fit.modules.filteredItemBoost(
+            lambda mod: mod.item.requiresSkill('Shield Command') or mod.item.requiresSkill('Information Command'),
+            'warfareBuff4Value', src.getModifiedItemAttr('shipBonusForceAuxiliaryC4'), skill='Caldari Carrier')
+        fit.modules.filteredItemBoost(
+            lambda mod: mod.item.requiresSkill('Shield Command') or mod.item.requiresSkill('Information Command'),
+            'warfareBuff2Value', src.getModifiedItemAttr('shipBonusForceAuxiliaryC4'), skill='Caldari Carrier')
+        fit.modules.filteredItemBoost(
+            lambda mod: mod.item.requiresSkill('Shield Command') or mod.item.requiresSkill('Information Command'),
+            'buffDuration', src.getModifiedItemAttr('shipBonusForceAuxiliaryC4'), skill='Caldari Carrier')
+        fit.modules.filteredItemBoost(
+            lambda mod: mod.item.requiresSkill('Shield Command') or mod.item.requiresSkill('Information Command'),
+            'warfareBuff1Value', src.getModifiedItemAttr('shipBonusForceAuxiliaryC4'), skill='Caldari Carrier')
+
+
+class Effect6537(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Leadership'), 'cpu',
+                                      src.getModifiedItemAttr('shipBonusRole1'))
+
+
+class Effect6545(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        if src.getModifiedItemAttr('shipBonusForceAuxiliaryC1') is None:
+            return  # See GH Issue 1321
+
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Capacitor Emission Systems') or
+                                                  mod.item.requiresSkill('Capital Capacitor Emission Systems'),
+                                      'powerTransferAmount', src.getModifiedItemAttr('shipBonusForceAuxiliaryC1'),
+                                      skill='Caldari Carrier')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Shield Emission Systems') or
+                                                  mod.item.requiresSkill('Capital Shield Emission Systems'),
+                                      'shieldBonus', src.getModifiedItemAttr('shipBonusForceAuxiliaryC1'),
+                                      skill='Caldari Carrier')
+
+
+class Effect6546(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.ship.boostItemAttr('shieldEmDamageResonance', src.getModifiedItemAttr('shipBonusForceAuxiliaryC2'),
+                               skill='Caldari Carrier')
+        fit.ship.boostItemAttr('shieldExplosiveDamageResonance', src.getModifiedItemAttr('shipBonusForceAuxiliaryC2'),
+                               skill='Caldari Carrier')
+        fit.ship.boostItemAttr('shieldKineticDamageResonance', src.getModifiedItemAttr('shipBonusForceAuxiliaryC2'),
+                               skill='Caldari Carrier')
+        fit.ship.boostItemAttr('shieldThermalDamageResonance', src.getModifiedItemAttr('shipBonusForceAuxiliaryC2'),
+                               skill='Caldari Carrier')
+
+
+class Effect6548(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Shield Emission Systems') or
+                                                  mod.item.requiresSkill('Capital Shield Emission Systems'),
+                                      'duration', src.getModifiedItemAttr('shipBonusForceAuxiliaryG1'),
+                                      skill='Gallente Carrier')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Remote Armor Repair Systems') or
+                                                  mod.item.requiresSkill('Capital Remote Armor Repair Systems'),
+                                      'duration', src.getModifiedItemAttr('shipBonusForceAuxiliaryG1'),
+                                      skill='Gallente Carrier')
+
+
+class Effect6549(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Repair Systems'), 'armorDamageAmount',
+                                      src.getModifiedItemAttr('shipBonusForceAuxiliaryG2'), skill='Gallente Carrier')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Capital Repair Systems'), 'armorDamageAmount',
+                                      src.getModifiedItemAttr('shipBonusForceAuxiliaryG2'), skill='Gallente Carrier')
+
+
+class Effect6551(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Shield Emission Systems') or
+                                                  mod.item.requiresSkill('Capital Shield Emission Systems'),
+                                      'duration', src.getModifiedItemAttr('shipBonusForceAuxiliaryM1'),
+                                      skill='Minmatar Carrier')
+
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Remote Armor Repair Systems') or
+                                                  mod.item.requiresSkill('Capital Remote Armor Repair Systems'),
+                                      'duration', src.getModifiedItemAttr('shipBonusForceAuxiliaryM1'),
+                                      skill='Minmatar Carrier')
+
+
+class Effect6552(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Capital Shield Operation'), 'shieldBonus',
+                                      src.getModifiedItemAttr('shipBonusForceAuxiliaryM2'), skill='Minmatar Carrier')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Shield Operation'), 'shieldBonus',
+                                      src.getModifiedItemAttr('shipBonusForceAuxiliaryM2'), skill='Minmatar Carrier')
+
+
+class Effect6555(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill('Fighters'), 'maxVelocity',
+                                       src.getModifiedItemAttr('speedFactor'), stackingPenalties=True)
+        fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill('Drones'), 'maxVelocity',
+                                     src.getModifiedItemAttr('speedFactor'), stackingPenalties=True)
+
+
+class Effect6556(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill('Fighters'),
+                                       'fighterAbilityMissilesDamageMultiplier',
+                                       src.getModifiedItemAttr('droneDamageBonus'), stackingPenalties=True)
+        fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill('Fighters'),
+                                       'fighterAbilityAttackTurretDamageMultiplier',
+                                       src.getModifiedItemAttr('droneDamageBonus'), stackingPenalties=True)
+        fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill('Fighters'),
+                                       'fighterAbilityAttackMissileDamageMultiplier',
+                                       src.getModifiedItemAttr('droneDamageBonus'), stackingPenalties=True)
+        fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill('Drones'), 'damageMultiplier',
+                                     src.getModifiedItemAttr('droneDamageBonus'), stackingPenalties=True)
+
+
+class Effect6557(EffectDef):
+
+    type = 'active'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill('Fighters'),
+                                       'fighterAbilityAttackTurretRangeFalloff', src.getModifiedItemAttr('falloffBonus'),
+                                       stackingPenalties=True)
+        fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill('Fighters'),
+                                       'fighterAbilityMissilesExplosionVelocity',
+                                       src.getModifiedItemAttr('aoeVelocityBonus'), stackingPenalties=True)
+        fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill('Drones'), 'trackingSpeed',
+                                     src.getModifiedItemAttr('trackingSpeedBonus'), stackingPenalties=True)
+        fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill('Fighters'),
+                                       'fighterAbilityAttackMissileExplosionRadius',
+                                       src.getModifiedItemAttr('aoeCloudSizeBonus'), stackingPenalties=True)
+        fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill('Fighters'),
+                                       'fighterAbilityAttackTurretTrackingSpeed',
+                                       src.getModifiedItemAttr('trackingSpeedBonus'), stackingPenalties=True)
+        fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill('Fighters'),
+                                       'fighterAbilityMissilesExplosionRadius',
+                                       src.getModifiedItemAttr('aoeCloudSizeBonus'), stackingPenalties=True)
+        fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill('Fighters'), 'fighterAbilityMissilesRange',
+                                       src.getModifiedItemAttr('maxRangeBonus'), stackingPenalties=True)
+        fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill('Fighters'),
+                                       'fighterAbilityAttackMissileRangeOptimal', src.getModifiedItemAttr('maxRangeBonus'),
+                                       stackingPenalties=True)
+        fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill('Drones'), 'falloff',
+                                     src.getModifiedItemAttr('falloffBonus'), stackingPenalties=True)
+        fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill('Fighters'),
+                                       'fighterAbilityAttackMissileExplosionVelocity',
+                                       src.getModifiedItemAttr('aoeVelocityBonus'), stackingPenalties=True)
+        fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill('Fighters'),
+                                       'fighterAbilityAttackMissileRangeFalloff', src.getModifiedItemAttr('falloffBonus'),
+                                       stackingPenalties=True)
+        fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill('Drones'), 'maxRange',
+                                     src.getModifiedItemAttr('maxRangeBonus'), stackingPenalties=True)
+        fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill('Fighters'),
+                                       'fighterAbilityAttackTurretRangeOptimal', src.getModifiedItemAttr('maxRangeBonus'),
+                                       stackingPenalties=True)
+
+
+class Effect6558(EffectDef):
+
+    type = 'overheat'
+
+    @staticmethod
+    def handler(fit, module, context):
+        overloadBonus = module.getModifiedItemAttr('overloadTrackingModuleStrengthBonus')
+        module.boostItemAttr('maxRangeBonus', overloadBonus)
+        module.boostItemAttr('falloffBonus', overloadBonus)
+        module.boostItemAttr('trackingSpeedBonus', overloadBonus)
+        module.boostItemAttr('aoeCloudSizeBonus', overloadBonus)
+        module.boostItemAttr('aoeVelocityBonus', overloadBonus)
+
+
+class Effect6559(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill('Fighters'),
+                                       'fighterAbilityAttackMissileExplosionRadius',
+                                       src.getModifiedItemAttr('aoeCloudSizeBonus'), stackingPenalties=True)
+        fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill('Fighters'),
+                                       'fighterAbilityAttackMissileRangeOptimal', src.getModifiedItemAttr('maxRangeBonus'),
+                                       stackingPenalties=True)
+        fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill('Fighters'),
+                                       'fighterAbilityAttackTurretRangeFalloff', src.getModifiedItemAttr('falloffBonus'),
+                                       stackingPenalties=True)
+        fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill('Fighters'),
+                                       'fighterAbilityMissilesExplosionRadius',
+                                       src.getModifiedItemAttr('aoeCloudSizeBonus'), stackingPenalties=True)
+        fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill('Drones'), 'falloff',
+                                     src.getModifiedItemAttr('falloffBonus'), stackingPenalties=True)
+        fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill('Fighters'),
+                                       'fighterAbilityAttackMissileRangeFalloff', src.getModifiedItemAttr('falloffBonus'),
+                                       stackingPenalties=True)
+        fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill('Fighters'),
+                                       'fighterAbilityAttackTurretTrackingSpeed',
+                                       src.getModifiedItemAttr('trackingSpeedBonus'), stackingPenalties=True)
+        fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill('Drones'), 'maxRange',
+                                     src.getModifiedItemAttr('maxRangeBonus'), stackingPenalties=True)
+        fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill('Drones'), 'trackingSpeed',
+                                     src.getModifiedItemAttr('trackingSpeedBonus'), stackingPenalties=True)
+        fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill('Fighters'),
+                                       'fighterAbilityAttackTurretRangeOptimal', src.getModifiedItemAttr('maxRangeBonus'),
+                                       stackingPenalties=True)
+        fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill('Fighters'),
+                                       'fighterAbilityMissilesExplosionVelocity',
+                                       src.getModifiedItemAttr('aoeVelocityBonus'), stackingPenalties=True)
+        fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill('Fighters'),
+                                       'fighterAbilityAttackMissileExplosionVelocity',
+                                       src.getModifiedItemAttr('aoeVelocityBonus'), stackingPenalties=True)
+        fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill('Fighters'), 'fighterAbilityMissilesRange',
+                                       src.getModifiedItemAttr('maxRangeBonus'), stackingPenalties=True)
+
+
+class Effect6560(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        lvl = src.level
+        fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill('Fighters'),
+                                       'fighterAbilityAttackMissileDamageMultiplier',
+                                       src.getModifiedItemAttr('damageMultiplierBonus') * lvl)
+        fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill('Fighters'),
+                                       'fighterAbilityAttackTurretDamageMultiplier',
+                                       src.getModifiedItemAttr('damageMultiplierBonus') * lvl)
+        fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill('Fighters'),
+                                       'fighterAbilityMissilesDamageMultiplier',
+                                       src.getModifiedItemAttr('damageMultiplierBonus') * lvl)
+
+
+class Effect6561(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        lvl = src.level
+        fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill('Light Fighters'), 'maxVelocity',
+                                       src.getModifiedItemAttr('maxVelocityBonus') * lvl)
+
+
+class Effect6562(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        lvl = src.level
+        fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill('Support Fighters'), 'shieldCapacity',
+                                       src.getModifiedItemAttr('shieldBonus') * lvl)
+
+
+class Effect6563(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        lvl = src.level
+        fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill('Heavy Fighters'),
+                                       'fighterAbilityMissilesDamageMultiplier',
+                                       src.getModifiedItemAttr('damageMultiplierBonus') * lvl)
+        fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill('Heavy Fighters'),
+                                       'fighterAbilityAttackMissileDamageMultiplier',
+                                       src.getModifiedItemAttr('damageMultiplierBonus') * lvl)
+        fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill('Heavy Fighters'),
+                                       'fighterAbilityAttackTurretDamageMultiplier',
+                                       src.getModifiedItemAttr('damageMultiplierBonus') * lvl)
+
+
+class Effect6565(EffectDef):
+
+    runTime = 'early'
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+
+        for attr in [
+            'structureRigDoomsdayDamageLossTargetBonus',
+            'structureRigScanResBonus',
+            'structureRigPDRangeBonus',
+            'structureRigPDCapUseBonus',
+            'structureRigMissileExploVeloBonus',
+            'structureRigMissileVelocityBonus',
+            'structureRigEwarOptimalBonus',
+            'structureRigEwarFalloffBonus',
+            'structureRigEwarCapUseBonus',
+            'structureRigMissileExplosionRadiusBonus'
+        ]:
+            fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Jury Rigging'),
+                                      attr, src.getModifiedItemAttr('structureRoleBonus'))
+
+
+class Effect6566(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.fighters.filteredItemMultiply(lambda mod: mod.item.requiresSkill('Fighters'), 'shieldCapacity',
+                                       src.getModifiedItemAttr('fighterBonusShieldCapacityPercent'))
+        fit.fighters.filteredItemMultiply(lambda mod: mod.item.requiresSkill('Fighters'), 'maxVelocity',
+                                       src.getModifiedItemAttr('fighterBonusVelocityPercent'), stackingPenalties=True, penaltyGroup='postMul')
+        fit.fighters.filteredItemMultiply(lambda mod: mod.item.requiresSkill('Fighters'),
+                                       'fighterAbilityAttackMissileDuration',
+                                       src.getModifiedItemAttr('fighterBonusROFPercent'), stackingPenalties=True, penaltyGroup='postMul')
+        fit.fighters.filteredItemMultiply(lambda mod: mod.item.requiresSkill('Fighters'), 'fighterAbilityAttackTurretDuration',
+                                       src.getModifiedItemAttr('fighterBonusROFPercent'), stackingPenalties=True, penaltyGroup='postMul')
+        fit.fighters.filteredItemMultiply(lambda mod: mod.item.requiresSkill('Fighters'), 'fighterAbilityMissilesDuration',
+                                       src.getModifiedItemAttr('fighterBonusROFPercent'), stackingPenalties=True, penaltyGroup='postMul')
+        fit.fighters.filteredItemMultiply(lambda mod: mod.item.requiresSkill('Fighters'), 'shieldRechargeRate',
+                                       src.getModifiedItemAttr('fighterBonusShieldRechargePercent'))
+
+
+class Effect6567(EffectDef):
+
+    type = 'active'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.ship.boostItemAttr('scanResolution', src.getModifiedItemAttr('scanResolutionBonus'), stackingPenalties=True)
+
+        for scanType in ('Magnetometric', 'Ladar', 'Gravimetric', 'Radar'):
+            attr = 'scan{}Strength'.format(scanType)
+            bonus = src.getModifiedItemAttr('scan{}StrengthPercent'.format(scanType))
+            fit.ship.boostItemAttr(attr, bonus, stackingPenalties=True)
+            fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill('Fighters'), attr, bonus,
+                                           stackingPenalties=True)
+
+        # EW cap need increase
+        groups = [
+            'Burst Jammer',
+            'Weapon Disruptor',
+            'ECM',
+            'Stasis Grappler',
+            'Sensor Dampener',
+            'Target Painter']
+
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name in groups or
+                                                  mod.item.requiresSkill('Propulsion Jamming'),
+                                      'capacitorNeed', src.getModifiedItemAttr('ewCapacitorNeedBonus'))
+
+
+class Effect6570(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        lvl = src.level
+        fit.ship.boostItemAttr('fighterCapacity', src.getModifiedItemAttr('skillBonusFighterHangarSize') * lvl)
+
+
+class Effect6571(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        lvl = src.level
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Capital Autocannon Specialization'),
+                                      'damageMultiplier', src.getModifiedItemAttr('damageMultiplierBonus') * lvl)
+
+
+class Effect6572(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        lvl = src.level
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Capital Artillery Specialization'),
+                                      'damageMultiplier', src.getModifiedItemAttr('damageMultiplierBonus') * lvl)
+
+
+class Effect6573(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        lvl = src.level
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Capital Blaster Specialization'),
+                                      'damageMultiplier', src.getModifiedItemAttr('damageMultiplierBonus') * lvl)
+
+
+class Effect6574(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        lvl = src.level
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Capital Railgun Specialization'),
+                                      'damageMultiplier', src.getModifiedItemAttr('damageMultiplierBonus') * lvl)
+
+
+class Effect6575(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        lvl = src.level
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Capital Pulse Laser Specialization'),
+                                      'damageMultiplier', src.getModifiedItemAttr('damageMultiplierBonus') * lvl)
+
+
+class Effect6576(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        lvl = src.level
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Capital Beam Laser Specialization'),
+                                      'damageMultiplier', src.getModifiedItemAttr('damageMultiplierBonus') * lvl)
+
+
+class Effect6577(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        lvl = src.level
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('XL Cruise Missile Specialization'), 'speed',
+                                      src.getModifiedItemAttr('rofBonus') * lvl)
+
+
+class Effect6578(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        lvl = src.level
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('XL Torpedo Specialization'), 'speed',
+                                      src.getModifiedItemAttr('rofBonus') * lvl)
+
+
+class Effect6580(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill('Repair Drone Operation'), 'structureDamageAmount',
+                                     src.getModifiedItemAttr('shipBonusRole2'))
+        fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill('Repair Drone Operation'), 'armorDamageAmount',
+                                     src.getModifiedItemAttr('shipBonusRole2'))
+        fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill('Repair Drone Operation'), 'shieldBonus',
+                                     src.getModifiedItemAttr('shipBonusRole2'))
+
+
+class Effect6581(EffectDef):
+
+    runTime = 'early'
+    type = 'active'
+
+    @staticmethod
+    def handler(fit, src, context):
+        # Remote effect bonuses (duration / amount / range / fallout)
+        for skill, amtAttr, stack in (
+                ('Capital Remote Armor Repair Systems', 'armorDamageAmount', True),
+                ('Capital Shield Emission Systems', 'shieldBonus', True),
+                ('Capital Capacitor Emission Systems', 'powerTransferAmount', False),
+                ('Capital Remote Hull Repair Systems', 'structureDamageAmount', False)):
+            fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill(skill), 'duration',
+                                          src.getModifiedItemAttr('siegeRemoteLogisticsDurationBonus'))
+            fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill(skill), amtAttr,
+                                          src.getModifiedItemAttr('siegeRemoteLogisticsAmountBonus'),
+                                          stackingPenalties=stack)
+            fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill(skill), 'maxRange',
+                                          src.getModifiedItemAttr('siegeRemoteLogisticsRangeBonus'), stackingPenalties=True)
+            fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill(skill), 'falloffEffectiveness',
+                                          src.getModifiedItemAttr('siegeRemoteLogisticsRangeBonus'), stackingPenalties=True)
+
+        # Local armor/shield rep effects (duration / amoutn)
+        for skill, amtAttr in (
+                ('Capital Shield Operation', 'shieldBonus'),
+                ('Capital Repair Systems', 'armorDamageAmount')):
+            fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill(skill), 'duration',
+                                          src.getModifiedItemAttr('siegeLocalLogisticsDurationBonus'))
+            fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill(skill), amtAttr,
+                                          src.getModifiedItemAttr('siegeLocalLogisticsAmountBonus'))
+
+        # Speed bonus
+        fit.ship.boostItemAttr('maxVelocity', src.getModifiedItemAttr('speedFactor'), stackingPenalties=True)
+
+        # Scan resolution multiplier
+        fit.ship.multiplyItemAttr('scanResolution', src.getModifiedItemAttr('scanResolutionMultiplier'),
+                                  stackingPenalties=True)
+
+        # Mass multiplier
+        fit.ship.multiplyItemAttr('mass', src.getModifiedItemAttr('siegeMassMultiplier'), stackingPenalties=True)
+
+        # Max locked targets
+        fit.ship.increaseItemAttr('maxLockedTargets', src.getModifiedItemAttr('maxLockedTargetsBonus'))
+
+        # EW cap need increase
+        groups = [
+            'Burst Jammer',
+            'Weapon Disruptor',
+            'ECM',
+            'Stasis Grappler',
+            'Sensor Dampener',
+            'Target Painter']
+
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name in groups or
+                                                  mod.item.requiresSkill('Propulsion Jamming'),
+                                      'capacitorNeed', src.getModifiedItemAttr('ewCapacitorNeedBonus'))
+
+        # todo: test for April 2016 release
+        # Block EWAR & projected effects
+        fit.ship.forceItemAttr('disallowOffensiveModifiers', src.getModifiedItemAttr('disallowOffensiveModifiers'))
+        fit.ship.forceItemAttr('disallowAssistance', src.getModifiedItemAttr('disallowAssistance'))
+
+        # new in April 2016 release
+        fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill('Drones'), 'damageMultiplier',
+                                     src.getModifiedItemAttr('droneDamageBonus'), stackingPenalties=True)
+
+        fit.ship.increaseItemAttr('warpScrambleStatus', src.getModifiedItemAttr('siegeModeWarpStatus'))
+        fit.ship.boostItemAttr('sensorDampenerResistance', src.getModifiedItemAttr('sensorDampenerResistanceBonus'))
+        fit.ship.boostItemAttr('remoteAssistanceImpedance', src.getModifiedItemAttr('remoteAssistanceImpedanceBonus'))
+        fit.ship.boostItemAttr('remoteRepairImpedance', src.getModifiedItemAttr('remoteRepairImpedanceBonus'))
+
+        fit.ship.forceItemAttr('disallowTethering', src.getModifiedItemAttr('disallowTethering'))
+        fit.ship.forceItemAttr('disallowDocking', src.getModifiedItemAttr('disallowDocking'))
+
+
+class Effect6582(EffectDef):
+
+    runTime = 'early'
+    type = 'active'
+
+    @staticmethod
+    def handler(fit, src, context):
+        # Turrets
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Capital Energy Turret') or
+                                                  mod.item.requiresSkill('Capital Hybrid Turret') or
+                                                  mod.item.requiresSkill('Capital Projectile Turret'),
+                                      'damageMultiplier', src.getModifiedItemAttr('siegeTurretDamageBonus'))
+
+        # Missiles
+        for type in ('kinetic', 'thermal', 'explosive', 'em'):
+            fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('XL Torpedoes') or
+                                                        mod.charge.requiresSkill('XL Cruise Missiles') or
+                                                        mod.charge.requiresSkill('Torpedoes'),
+                                            '%sDamage' % type, src.getModifiedItemAttr('siegeMissileDamageBonus'))
+
+        # Reppers
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Capital Shield Operation') or
+                                                  mod.item.requiresSkill('Capital Repair Systems'),
+                                      'duration', src.getModifiedItemAttr('siegeLocalLogisticsDurationBonus'))
+
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Capital Shield Operation'),
+                                      'shieldBonus', src.getModifiedItemAttr('siegeLocalLogisticsAmountBonus'),
+                                      stackingPenalties=True)
+
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Capital Repair Systems'),
+                                      'armorDamageAmount', src.getModifiedItemAttr('siegeLocalLogisticsAmountBonus'),
+                                      stackingPenalties=True)
+
+        # Speed penalty
+        fit.ship.boostItemAttr('maxVelocity', src.getModifiedItemAttr('speedFactor'))
+
+        # Mass
+        fit.ship.multiplyItemAttr('mass', src.getModifiedItemAttr('siegeMassMultiplier'),
+                                  stackingPenalties=True, penaltyGroup='postMul')
+
+        # @ todo: test for April 2016 release
+        # Block Hostile EWAR and friendly effects
+        fit.ship.forceItemAttr('disallowOffensiveModifiers', src.getModifiedItemAttr('disallowOffensiveModifiers'))
+        fit.ship.forceItemAttr('disallowAssistance', src.getModifiedItemAttr('disallowAssistance'))
+
+        # new in April 2016 release
+        # missile ROF bonus
+        for group in ('Missile Launcher XL Torpedo', 'Missile Launcher Rapid Torpedo', 'Missile Launcher XL Cruise'):
+            fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == group, 'speed',
+                                          src.getModifiedItemAttr('siegeLauncherROFBonus'))
+
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Torpedoes'), 'maxVelocity',
+                                        src.getModifiedItemAttr('siegeTorpedoVelocityBonus'), stackingPenalties=True)
+
+        fit.ship.increaseItemAttr('warpScrambleStatus', src.getModifiedItemAttr('siegeModeWarpStatus'))
+        fit.ship.boostItemAttr('remoteRepairImpedance', src.getModifiedItemAttr('remoteRepairImpedanceBonus'))
+        fit.ship.boostItemAttr('sensorDampenerResistance', src.getModifiedItemAttr('sensorDampenerResistanceBonus'))
+        fit.ship.boostItemAttr('remoteAssistanceImpedance', src.getModifiedItemAttr('remoteAssistanceImpedanceBonus'))
+        fit.ship.boostItemAttr('weaponDisruptionResistance', src.getModifiedItemAttr('weaponDisruptionResistanceBonus'))
+
+        fit.ship.forceItemAttr('disallowDocking', src.getModifiedItemAttr('disallowDocking'))
+        fit.ship.forceItemAttr('disallowTethering', src.getModifiedItemAttr('disallowTethering'))
+
+
+class Effect6591(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.ship.increaseItemAttr('warpScrambleStatus', src.getModifiedItemAttr('shipBonusSupercarrierA3'),
+                                  skill='Amarr Carrier')
+
+
+class Effect6592(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.ship.increaseItemAttr('warpScrambleStatus', src.getModifiedItemAttr('shipBonusSupercarrierC3'),
+                                  skill='Caldari Carrier')
+
+
+class Effect6593(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.ship.increaseItemAttr('warpScrambleStatus', src.getModifiedItemAttr('shipBonusSupercarrierG3'),
+                                  skill='Gallente Carrier')
+
+
+class Effect6594(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.ship.increaseItemAttr('warpScrambleStatus', src.getModifiedItemAttr('shipBonusSupercarrierM3'),
+                                  skill='Minmatar Carrier')
+
+
+class Effect6595(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(
+            lambda mod: mod.item.requiresSkill('Armored Command') or mod.item.requiresSkill('Information Command'),
+            'buffDuration', src.getModifiedItemAttr('shipBonusCarrierA4'), skill='Amarr Carrier')
+        fit.modules.filteredItemBoost(
+            lambda mod: mod.item.requiresSkill('Armored Command') or mod.item.requiresSkill('Information Command'),
+            'warfareBuff3Value', src.getModifiedItemAttr('shipBonusCarrierA4'), skill='Amarr Carrier')
+        fit.modules.filteredItemBoost(
+            lambda mod: mod.item.requiresSkill('Armored Command') or mod.item.requiresSkill('Information Command'),
+            'warfareBuff1Value', src.getModifiedItemAttr('shipBonusCarrierA4'), skill='Amarr Carrier')
+        fit.modules.filteredItemBoost(
+            lambda mod: mod.item.requiresSkill('Armored Command') or mod.item.requiresSkill('Information Command'),
+            'warfareBuff4Value', src.getModifiedItemAttr('shipBonusCarrierA4'), skill='Amarr Carrier')
+        fit.modules.filteredItemBoost(
+            lambda mod: mod.item.requiresSkill('Armored Command') or mod.item.requiresSkill('Information Command'),
+            'warfareBuff2Value', src.getModifiedItemAttr('shipBonusCarrierA4'), skill='Amarr Carrier')
+
+
+class Effect6596(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(
+            lambda mod: mod.item.requiresSkill('Shield Command') or mod.item.requiresSkill('Information Command'),
+            'warfareBuff2Value', src.getModifiedItemAttr('shipBonusCarrierC4'), skill='Caldari Carrier')
+        fit.modules.filteredItemBoost(
+            lambda mod: mod.item.requiresSkill('Shield Command') or mod.item.requiresSkill('Information Command'),
+            'buffDuration', src.getModifiedItemAttr('shipBonusCarrierC4'), skill='Caldari Carrier')
+        fit.modules.filteredItemBoost(
+            lambda mod: mod.item.requiresSkill('Shield Command') or mod.item.requiresSkill('Information Command'),
+            'warfareBuff3Value', src.getModifiedItemAttr('shipBonusCarrierC4'), skill='Caldari Carrier')
+        fit.modules.filteredItemBoost(
+            lambda mod: mod.item.requiresSkill('Shield Command') or mod.item.requiresSkill('Information Command'),
+            'warfareBuff4Value', src.getModifiedItemAttr('shipBonusCarrierC4'), skill='Caldari Carrier')
+        fit.modules.filteredItemBoost(
+            lambda mod: mod.item.requiresSkill('Shield Command') or mod.item.requiresSkill('Information Command'),
+            'warfareBuff1Value', src.getModifiedItemAttr('shipBonusCarrierC4'), skill='Caldari Carrier')
+
+
+class Effect6597(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(
+            lambda mod: mod.item.requiresSkill('Skirmish Command') or mod.item.requiresSkill('Armored Command'),
+            'warfareBuff2Value', src.getModifiedItemAttr('shipBonusCarrierG4'), skill='Gallente Carrier')
+        fit.modules.filteredItemBoost(
+            lambda mod: mod.item.requiresSkill('Skirmish Command') or mod.item.requiresSkill('Armored Command'),
+            'warfareBuff3Value', src.getModifiedItemAttr('shipBonusCarrierG4'), skill='Gallente Carrier')
+        fit.modules.filteredItemBoost(
+            lambda mod: mod.item.requiresSkill('Skirmish Command') or mod.item.requiresSkill('Armored Command'),
+            'warfareBuff4Value', src.getModifiedItemAttr('shipBonusCarrierG4'), skill='Gallente Carrier')
+        fit.modules.filteredItemBoost(
+            lambda mod: mod.item.requiresSkill('Skirmish Command') or mod.item.requiresSkill('Armored Command'),
+            'buffDuration', src.getModifiedItemAttr('shipBonusCarrierG4'), skill='Gallente Carrier')
+        fit.modules.filteredItemBoost(
+            lambda mod: mod.item.requiresSkill('Skirmish Command') or mod.item.requiresSkill('Armored Command'),
+            'warfareBuff1Value', src.getModifiedItemAttr('shipBonusCarrierG4'), skill='Gallente Carrier')
+
+
+class Effect6598(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(
+            lambda mod: mod.item.requiresSkill('Skirmish Command') or mod.item.requiresSkill('Shield Command'),
+            'warfareBuff4Value', src.getModifiedItemAttr('shipBonusCarrierM4'), skill='Minmatar Carrier')
+        fit.modules.filteredItemBoost(
+            lambda mod: mod.item.requiresSkill('Skirmish Command') or mod.item.requiresSkill('Shield Command'),
+            'warfareBuff2Value', src.getModifiedItemAttr('shipBonusCarrierM4'), skill='Minmatar Carrier')
+        fit.modules.filteredItemBoost(
+            lambda mod: mod.item.requiresSkill('Skirmish Command') or mod.item.requiresSkill('Shield Command'),
+            'warfareBuff3Value', src.getModifiedItemAttr('shipBonusCarrierM4'), skill='Minmatar Carrier')
+        fit.modules.filteredItemBoost(
+            lambda mod: mod.item.requiresSkill('Skirmish Command') or mod.item.requiresSkill('Shield Command'),
+            'warfareBuff1Value', src.getModifiedItemAttr('shipBonusCarrierM4'), skill='Minmatar Carrier')
+        fit.modules.filteredItemBoost(
+            lambda mod: mod.item.requiresSkill('Skirmish Command') or mod.item.requiresSkill('Shield Command'),
+            'buffDuration', src.getModifiedItemAttr('shipBonusCarrierM4'), skill='Minmatar Carrier')
+
+
+class Effect6599(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.ship.boostItemAttr('armorKineticDamageResonance', src.getModifiedItemAttr('shipBonusCarrierA1'),
+                               skill='Amarr Carrier')
+        fit.ship.boostItemAttr('armorEmDamageResonance', src.getModifiedItemAttr('shipBonusCarrierA1'),
+                               skill='Amarr Carrier')
+        fit.ship.boostItemAttr('armorExplosiveDamageResonance', src.getModifiedItemAttr('shipBonusCarrierA1'),
+                               skill='Amarr Carrier')
+        fit.ship.boostItemAttr('armorThermalDamageResonance', src.getModifiedItemAttr('shipBonusCarrierA1'),
+                               skill='Amarr Carrier')
+
+
+class Effect6600(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.ship.boostItemAttr('shieldThermalDamageResonance', src.getModifiedItemAttr('shipBonusCarrierC1'),
+                               skill='Caldari Carrier')
+        fit.ship.boostItemAttr('shieldEmDamageResonance', src.getModifiedItemAttr('shipBonusCarrierC1'),
+                               skill='Caldari Carrier')
+        fit.ship.boostItemAttr('shieldKineticDamageResonance', src.getModifiedItemAttr('shipBonusCarrierC1'),
+                               skill='Caldari Carrier')
+        fit.ship.boostItemAttr('shieldExplosiveDamageResonance', src.getModifiedItemAttr('shipBonusCarrierC1'),
+                               skill='Caldari Carrier')
+
+
+class Effect6601(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill('Fighters'),
+                                       'fighterAbilityMissilesDamageMultiplier',
+                                       src.getModifiedItemAttr('shipBonusCarrierG1'), skill='Gallente Carrier')
+        fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill('Fighters'),
+                                       'fighterAbilityAttackTurretDamageMultiplier',
+                                       src.getModifiedItemAttr('shipBonusCarrierG1'), skill='Gallente Carrier')
+        fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill('Fighters'),
+                                       'fighterAbilityAttackMissileDamageMultiplier',
+                                       src.getModifiedItemAttr('shipBonusCarrierG1'), skill='Gallente Carrier')
+
+
+class Effect6602(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill('Fighters'),
+                                       'fighterAbilityAttackMissileDamageMultiplier',
+                                       src.getModifiedItemAttr('shipBonusCarrierM1'), skill='Minmatar Carrier')
+        fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill('Fighters'),
+                                       'fighterAbilityMissilesDamageMultiplier',
+                                       src.getModifiedItemAttr('shipBonusCarrierM1'), skill='Minmatar Carrier')
+        fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill('Fighters'),
+                                       'fighterAbilityAttackTurretDamageMultiplier',
+                                       src.getModifiedItemAttr('shipBonusCarrierM1'), skill='Minmatar Carrier')
+
+
+class Effect6603(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill('Fighters'),
+                                       'fighterAbilityMissilesDamageMultiplier',
+                                       src.getModifiedItemAttr('shipBonusSupercarrierA1'), skill='Amarr Carrier')
+        fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill('Fighters'),
+                                       'fighterAbilityAttackMissileDamageMultiplier',
+                                       src.getModifiedItemAttr('shipBonusSupercarrierA1'), skill='Amarr Carrier')
+        fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill('Fighters'),
+                                       'fighterAbilityAttackTurretDamageMultiplier',
+                                       src.getModifiedItemAttr('shipBonusSupercarrierA1'), skill='Amarr Carrier')
+
+
+class Effect6604(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill('Fighters'),
+                                       'fighterAbilityMissilesDamageMultiplier',
+                                       src.getModifiedItemAttr('shipBonusSupercarrierC1'), skill='Caldari Carrier')
+        fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill('Fighters'),
+                                       'fighterAbilityAttackTurretDamageMultiplier',
+                                       src.getModifiedItemAttr('shipBonusSupercarrierC1'), skill='Caldari Carrier')
+        fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill('Fighters'),
+                                       'fighterAbilityAttackMissileDamageMultiplier',
+                                       src.getModifiedItemAttr('shipBonusSupercarrierC1'), skill='Caldari Carrier')
+
+
+class Effect6605(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill('Fighters'),
+                                       'fighterAbilityAttackTurretDamageMultiplier',
+                                       src.getModifiedItemAttr('shipBonusSupercarrierG1'), skill='Gallente Carrier')
+        fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill('Fighters'),
+                                       'fighterAbilityMissilesDamageMultiplier',
+                                       src.getModifiedItemAttr('shipBonusSupercarrierG1'), skill='Gallente Carrier')
+        fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill('Fighters'),
+                                       'fighterAbilityAttackMissileDamageMultiplier',
+                                       src.getModifiedItemAttr('shipBonusSupercarrierG1'), skill='Gallente Carrier')
+
+
+class Effect6606(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill('Fighters'),
+                                       'fighterAbilityAttackMissileDamageMultiplier',
+                                       src.getModifiedItemAttr('shipBonusSupercarrierM1'), skill='Minmatar Carrier')
+        fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill('Fighters'),
+                                       'fighterAbilityMissilesDamageMultiplier',
+                                       src.getModifiedItemAttr('shipBonusSupercarrierM1'), skill='Minmatar Carrier')
+        fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill('Fighters'),
+                                       'fighterAbilityAttackTurretDamageMultiplier',
+                                       src.getModifiedItemAttr('shipBonusSupercarrierM1'), skill='Minmatar Carrier')
+
+
+class Effect6607(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(
+            lambda mod: mod.item.requiresSkill('Armored Command') or mod.item.requiresSkill('Information Command'),
+            'warfareBuff4Value', src.getModifiedItemAttr('shipBonusSupercarrierA5'), skill='Amarr Carrier')
+        fit.modules.filteredItemBoost(
+            lambda mod: mod.item.requiresSkill('Armored Command') or mod.item.requiresSkill('Information Command'),
+            'warfareBuff3Value', src.getModifiedItemAttr('shipBonusSupercarrierA5'), skill='Amarr Carrier')
+        fit.modules.filteredItemBoost(
+            lambda mod: mod.item.requiresSkill('Armored Command') or mod.item.requiresSkill('Information Command'),
+            'buffDuration', src.getModifiedItemAttr('shipBonusSupercarrierA5'), skill='Amarr Carrier')
+        fit.modules.filteredItemBoost(
+            lambda mod: mod.item.requiresSkill('Armored Command') or mod.item.requiresSkill('Information Command'),
+            'warfareBuff2Value', src.getModifiedItemAttr('shipBonusSupercarrierA5'), skill='Amarr Carrier')
+        fit.modules.filteredItemBoost(
+            lambda mod: mod.item.requiresSkill('Armored Command') or mod.item.requiresSkill('Information Command'),
+            'warfareBuff1Value', src.getModifiedItemAttr('shipBonusSupercarrierA5'), skill='Amarr Carrier')
+
+
+class Effect6608(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(
+            lambda mod: mod.item.requiresSkill('Shield Command') or mod.item.requiresSkill('Information Command'),
+            'buffDuration', src.getModifiedItemAttr('shipBonusSupercarrierC5'), skill='Caldari Carrier')
+        fit.modules.filteredItemBoost(
+            lambda mod: mod.item.requiresSkill('Shield Command') or mod.item.requiresSkill('Information Command'),
+            'warfareBuff2Value', src.getModifiedItemAttr('shipBonusSupercarrierC5'), skill='Caldari Carrier')
+        fit.modules.filteredItemBoost(
+            lambda mod: mod.item.requiresSkill('Shield Command') or mod.item.requiresSkill('Information Command'),
+            'warfareBuff1Value', src.getModifiedItemAttr('shipBonusSupercarrierC5'), skill='Caldari Carrier')
+        fit.modules.filteredItemBoost(
+            lambda mod: mod.item.requiresSkill('Shield Command') or mod.item.requiresSkill('Information Command'),
+            'warfareBuff4Value', src.getModifiedItemAttr('shipBonusSupercarrierC5'), skill='Caldari Carrier')
+        fit.modules.filteredItemBoost(
+            lambda mod: mod.item.requiresSkill('Shield Command') or mod.item.requiresSkill('Information Command'),
+            'warfareBuff3Value', src.getModifiedItemAttr('shipBonusSupercarrierC5'), skill='Caldari Carrier')
+
+
+class Effect6609(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(
+            lambda mod: mod.item.requiresSkill('Skirmish Command') or mod.item.requiresSkill('Armored Command'),
+            'warfareBuff2Value', src.getModifiedItemAttr('shipBonusSupercarrierG5'), skill='Gallente Carrier')
+        fit.modules.filteredItemBoost(
+            lambda mod: mod.item.requiresSkill('Skirmish Command') or mod.item.requiresSkill('Armored Command'),
+            'buffDuration', src.getModifiedItemAttr('shipBonusSupercarrierG5'), skill='Gallente Carrier')
+        fit.modules.filteredItemBoost(
+            lambda mod: mod.item.requiresSkill('Skirmish Command') or mod.item.requiresSkill('Armored Command'),
+            'warfareBuff1Value', src.getModifiedItemAttr('shipBonusSupercarrierG5'), skill='Gallente Carrier')
+        fit.modules.filteredItemBoost(
+            lambda mod: mod.item.requiresSkill('Skirmish Command') or mod.item.requiresSkill('Armored Command'),
+            'warfareBuff3Value', src.getModifiedItemAttr('shipBonusSupercarrierG5'), skill='Gallente Carrier')
+        fit.modules.filteredItemBoost(
+            lambda mod: mod.item.requiresSkill('Skirmish Command') or mod.item.requiresSkill('Armored Command'),
+            'warfareBuff4Value', src.getModifiedItemAttr('shipBonusSupercarrierG5'), skill='Gallente Carrier')
+
+
+class Effect6610(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(
+            lambda mod: mod.item.requiresSkill('Skirmish Command') or mod.item.requiresSkill('Shield Command'),
+            'warfareBuff4Value', src.getModifiedItemAttr('shipBonusSupercarrierM5'), skill='Minmatar Carrier')
+        fit.modules.filteredItemBoost(
+            lambda mod: mod.item.requiresSkill('Skirmish Command') or mod.item.requiresSkill('Shield Command'),
+            'warfareBuff1Value', src.getModifiedItemAttr('shipBonusSupercarrierM5'), skill='Minmatar Carrier')
+        fit.modules.filteredItemBoost(
+            lambda mod: mod.item.requiresSkill('Skirmish Command') or mod.item.requiresSkill('Shield Command'),
+            'warfareBuff3Value', src.getModifiedItemAttr('shipBonusSupercarrierM5'), skill='Minmatar Carrier')
+        fit.modules.filteredItemBoost(
+            lambda mod: mod.item.requiresSkill('Skirmish Command') or mod.item.requiresSkill('Shield Command'),
+            'buffDuration', src.getModifiedItemAttr('shipBonusSupercarrierM5'), skill='Minmatar Carrier')
+        fit.modules.filteredItemBoost(
+            lambda mod: mod.item.requiresSkill('Skirmish Command') or mod.item.requiresSkill('Shield Command'),
+            'warfareBuff2Value', src.getModifiedItemAttr('shipBonusSupercarrierM5'), skill='Minmatar Carrier')
+
+
+class Effect6611(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Afterburner'), 'speedFactor',
+                                      src.getModifiedItemAttr('shipBonusSupercarrierC2'), skill='Caldari Carrier')
+
+
+class Effect6612(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill('Fighters'),
+                                       'fighterAbilityMissilesExplosionVelocity',
+                                       src.getModifiedItemAttr('shipBonusSupercarrierA2'), skill='Amarr Carrier')
+        fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill('Fighters'),
+                                       'fighterAbilityAttackMissileExplosionVelocity',
+                                       src.getModifiedItemAttr('shipBonusSupercarrierA2'), skill='Amarr Carrier')
+
+
+class Effect6613(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemIncrease(lambda mod: mod.item.requiresSkill('Leadership'), 'maxGroupActive',
+                                         src.getModifiedItemAttr('shipBonusRole1'))
+
+
+class Effect6614(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Hull Upgrades'), 'armorHPBonusAdd',
+                                      src.getModifiedItemAttr('shipBonusRole2'))
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Shield Upgrades'), 'capacityBonus',
+                                      src.getModifiedItemAttr('shipBonusRole2'))
+
+
+class Effect6615(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Burst Projector Operation'),
+                                      'durationWeaponDisruptionBurstProjector',
+                                      src.getModifiedItemAttr('shipBonusSupercarrierA4'), skill='Amarr Carrier')
+
+
+class Effect6616(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Burst Projector Operation'),
+                                      'durationECMJammerBurstProjector', src.getModifiedItemAttr('shipBonusSupercarrierC4'),
+                                      skill='Caldari Carrier')
+
+
+class Effect6617(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Burst Projector Operation'),
+                                      'durationSensorDampeningBurstProjector',
+                                      src.getModifiedItemAttr('shipBonusSupercarrierG4'), skill='Gallente Carrier')
+
+
+class Effect6618(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Burst Projector Operation'),
+                                      'durationTargetIlluminationBurstProjector',
+                                      src.getModifiedItemAttr('shipBonusSupercarrierM4'), skill='Minmatar Carrier')
+
+
+class Effect6619(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemIncrease(lambda mod: mod.item.requiresSkill('Leadership'), 'maxGroupActive',
+                                         src.getModifiedItemAttr('shipBonusRole1'))
+
+
+class Effect6620(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Missile Launcher Operation'), 'reloadTime',
+                                      src.getModifiedItemAttr('shipBonusDreadnoughtC3'), skill='Caldari Dreadnought')
+
+
+class Effect6621(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.ship.boostItemAttr('armorExplosiveDamageResonance', src.getModifiedItemAttr('shipBonusSupercarrierA2'),
+                               skill='Amarr Carrier')
+        fit.ship.boostItemAttr('armorEmDamageResonance', src.getModifiedItemAttr('shipBonusSupercarrierA2'),
+                               skill='Amarr Carrier')
+        fit.ship.boostItemAttr('armorThermalDamageResonance', src.getModifiedItemAttr('shipBonusSupercarrierA2'),
+                               skill='Amarr Carrier')
+        fit.ship.boostItemAttr('armorKineticDamageResonance', src.getModifiedItemAttr('shipBonusSupercarrierA2'),
+                               skill='Amarr Carrier')
+
+
+class Effect6622(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.ship.boostItemAttr('shieldThermalDamageResonance', src.getModifiedItemAttr('shipBonusSupercarrierC2'),
+                               skill='Caldari Carrier')
+        fit.ship.boostItemAttr('shieldEmDamageResonance', src.getModifiedItemAttr('shipBonusSupercarrierC2'),
+                               skill='Caldari Carrier')
+        fit.ship.boostItemAttr('shieldKineticDamageResonance', src.getModifiedItemAttr('shipBonusSupercarrierC2'),
+                               skill='Caldari Carrier')
+        fit.ship.boostItemAttr('shieldExplosiveDamageResonance', src.getModifiedItemAttr('shipBonusSupercarrierC2'),
+                               skill='Caldari Carrier')
+
+
+class Effect6623(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill('Fighters'), 'shieldCapacity',
+                                       src.getModifiedItemAttr('shipBonusSupercarrierG2'), skill='Gallente Carrier')
+
+
+class Effect6624(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill('Fighters'), 'maxVelocity',
+                                       src.getModifiedItemAttr('shipBonusSupercarrierM2'), skill='Minmatar Carrier')
+
+
+class Effect6625(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill('Support Fighters'), 'fighterSquadronOrbitRange',
+                                       src.getModifiedItemAttr('shipBonusCarrierA2'), skill='Amarr Carrier')
+        fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill('Support Fighters'),
+                                       'fighterAbilityEnergyNeutralizerOptimalRange',
+                                       src.getModifiedItemAttr('shipBonusCarrierA2'), skill='Amarr Carrier')
+
+
+class Effect6626(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill('Support Fighters'), 'fighterSquadronOrbitRange',
+                                       src.getModifiedItemAttr('shipBonusCarrierC2'), skill='Caldari Carrier')
+        fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill('Support Fighters'),
+                                       'fighterAbilityECMRangeOptimal', src.getModifiedItemAttr('shipBonusCarrierC2'),
+                                       skill='Caldari Carrier')
+
+
+class Effect6627(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill('Support Fighters'), 'fighterSquadronOrbitRange',
+                                       src.getModifiedItemAttr('shipBonusCarrierG2'), skill='Gallente Carrier')
+        fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill('Support Fighters'),
+                                       'fighterAbilityWarpDisruptionRange', src.getModifiedItemAttr('shipBonusCarrierG2'),
+                                       skill='Gallente Carrier')
+
+
+class Effect6628(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill('Support Fighters'), 'fighterSquadronOrbitRange',
+                                       src.getModifiedItemAttr('shipBonusCarrierM2'), skill='Minmatar Carrier')
+        fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill('Support Fighters'),
+                                       'fighterAbilityStasisWebifierOptimalRange',
+                                       src.getModifiedItemAttr('shipBonusCarrierM2'), skill='Minmatar Carrier')
+
+
+class Effect6629(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        src.boostItemAttr('emDamageResistanceBonus', src.getModifiedChargeAttr('emDamageResistanceBonusBonus'))
+        src.boostItemAttr('explosiveDamageResistanceBonus',
+                          src.getModifiedChargeAttr('explosiveDamageResistanceBonusBonus'))
+        src.boostItemAttr('kineticDamageResistanceBonus', src.getModifiedChargeAttr('kineticDamageResistanceBonusBonus'))
+        src.boostItemAttr('thermalDamageResistanceBonus', src.getModifiedChargeAttr('thermalDamageResistanceBonusBonus'))
+
+
+class Effect6634(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Capital Energy Turret'), 'damageMultiplier',
+                                      src.getModifiedItemAttr('shipBonusTitanA1'), skill='Amarr Titan')
+
+
+class Effect6635(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('XL Torpedoes'), 'kineticDamage',
+                                        src.getModifiedItemAttr('shipBonusTitanC1'), skill='Caldari Titan')
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('XL Cruise Missiles'), 'kineticDamage',
+                                        src.getModifiedItemAttr('shipBonusTitanC1'), skill='Caldari Titan')
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Torpedoes'), 'kineticDamage',
+                                        src.getModifiedItemAttr('shipBonusTitanC1'), skill='Caldari Titan')
+
+
+class Effect6636(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Capital Hybrid Turret'), 'damageMultiplier',
+                                      src.getModifiedItemAttr('shipBonusTitanG1'), skill='Gallente Titan')
+
+
+class Effect6637(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Capital Projectile Turret'), 'damageMultiplier',
+                                      src.getModifiedItemAttr('shipBonusTitanM1'), skill='Minmatar Titan')
+
+
+class Effect6638(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Missile Launcher XL Cruise', 'speed',
+                                      src.getModifiedItemAttr('shipBonusTitanC2'), skill='Caldari Titan')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Missile Launcher Rapid Torpedo', 'speed',
+                                      src.getModifiedItemAttr('shipBonusTitanC2'), skill='Caldari Titan')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Missile Launcher XL Torpedo', 'speed',
+                                      src.getModifiedItemAttr('shipBonusTitanC2'), skill='Caldari Titan')
+
+
+class Effect6639(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill('Fighters'),
+                                       'fighterAbilityMissilesExplosionRadius',
+                                       src.getModifiedItemAttr('shipBonusSupercarrierA4'), skill='Amarr Carrier')
+        fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill('Fighters'),
+                                       'fighterAbilityAttackMissileExplosionRadius',
+                                       src.getModifiedItemAttr('shipBonusSupercarrierA4'), skill='Amarr Carrier')
+
+
+class Effect6640(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemIncrease(lambda mod: mod.item.requiresSkill('Leadership'), 'maxGroupActive',
+                                         src.getModifiedItemAttr('shipBonusRole1'))
+
+
+class Effect6641(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Hull Upgrades'), 'armorHPBonusAdd',
+                                      src.getModifiedItemAttr('shipBonusRole2'))
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Shield Upgrades'), 'capacityBonus',
+                                      src.getModifiedItemAttr('shipBonusRole2'))
+
+
+class Effect6642(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        lvl = src.level
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Doomsday Operation'), 'duration',
+                                      src.getModifiedItemAttr('rofBonus') * lvl)
+
+
+class Effect6647(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.ship.increaseItemAttr('warpScrambleStatus', src.getModifiedItemAttr('shipBonusTitanA3'), skill='Amarr Titan')
+
+
+class Effect6648(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.ship.increaseItemAttr('warpScrambleStatus', src.getModifiedItemAttr('shipBonusTitanC3'), skill='Caldari Titan')
+
+
+class Effect6649(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.ship.increaseItemAttr('warpScrambleStatus', src.getModifiedItemAttr('shipBonusTitanG3'), skill='Gallente Titan')
+
+
+class Effect6650(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.ship.increaseItemAttr('warpScrambleStatus', src.getModifiedItemAttr('shipBonusTitanM3'), skill='Minmatar Titan')
+
+
+class Effect6651(EffectDef):
+
+    runTime = 'late'
+    type = 'projected', 'active'
+
+    @staticmethod
+    def handler(fit, module, context, **kwargs):
+        if 'projected' not in context:
+            return
+
+        if module.charge and module.charge.name == 'Nanite Repair Paste':
+            multiplier = 3
+        else:
+            multiplier = 1
+
+        amount = module.getModifiedItemAttr('armorDamageAmount') * multiplier
+        speed = module.getModifiedItemAttr('duration') / 1000.0
+        rps = amount / speed
+        fit.extraAttributes.increase('armorRepair', rps)
+        fit.extraAttributes.increase('armorRepairPreSpool', rps)
+        fit.extraAttributes.increase('armorRepairFullSpool', rps)
+
+
+class Effect6652(EffectDef):
+
+    runTime = 'late'
+    type = 'projected', 'active'
+
+    @staticmethod
+    def handler(fit, module, context, **kwargs):
+        if 'projected' not in context:
+            return
+        amount = module.getModifiedItemAttr('shieldBonus')
+        speed = module.getModifiedItemAttr('duration') / 1000.0
+        fit.extraAttributes.increase('shieldRepair', amount / speed, **kwargs)
+
+
+class Effect6653(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Capital Energy Turret'), 'capacitorNeed',
+                                      src.getModifiedItemAttr('shipBonusTitanA2'), skill='Amarr Titan')
+
+
+class Effect6654(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Capital Hybrid Turret'), 'speed',
+                                      src.getModifiedItemAttr('shipBonusTitanG2'), skill='Gallente Titan')
+
+
+class Effect6655(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Capital Projectile Turret'), 'speed',
+                                      src.getModifiedItemAttr('shipBonusTitanM2'), skill='Minmatar Titan')
+
+
+class Effect6656(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Torpedoes'), 'maxVelocity',
+                                        src.getModifiedItemAttr('shipBonusRole3'))
+
+
+class Effect6657(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Torpedoes'), 'emDamage',
+                                        src.getModifiedItemAttr('shipBonusTitanC5'), skill='Caldari Titan')
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Torpedoes'), 'explosiveDamage',
+                                        src.getModifiedItemAttr('shipBonusTitanC5'), skill='Caldari Titan')
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Torpedoes'), 'thermalDamage',
+                                        src.getModifiedItemAttr('shipBonusTitanC5'), skill='Caldari Titan')
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('XL Cruise Missiles'), 'explosiveDamage',
+                                        src.getModifiedItemAttr('shipBonusTitanC5'), skill='Caldari Titan')
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('XL Cruise Missiles'), 'thermalDamage',
+                                        src.getModifiedItemAttr('shipBonusTitanC5'), skill='Caldari Titan')
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('XL Cruise Missiles'), 'emDamage',
+                                        src.getModifiedItemAttr('shipBonusTitanC5'), skill='Caldari Titan')
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('XL Torpedoes'), 'thermalDamage',
+                                        src.getModifiedItemAttr('shipBonusTitanC5'), skill='Caldari Titan')
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('XL Torpedoes'), 'emDamage',
+                                        src.getModifiedItemAttr('shipBonusTitanC5'), skill='Caldari Titan')
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('XL Torpedoes'), 'explosiveDamage',
+                                        src.getModifiedItemAttr('shipBonusTitanC5'), skill='Caldari Titan')
+
+
+class Effect6658(EffectDef):
+
+    runTime = 'early'
+    type = 'active'
+
+    @staticmethod
+    def handler(fit, src, context):
+        # Resistances
+        for layer, attrPrefix in (('shield', 'shield'), ('armor', 'armor'), ('hull', '')):
+            for damageType in ('Kinetic', 'Thermal', 'Explosive', 'Em'):
+                bonus = '%s%sDamageResonance' % (attrPrefix, damageType)
+                bonus = '%s%s' % (bonus[0].lower(), bonus[1:])
+                booster = '%s%sDamageResonance' % (layer, damageType)
+                penalize = False if layer == 'hull' else True
+                fit.ship.multiplyItemAttr(bonus, src.getModifiedItemAttr(booster),
+                                          stackingPenalties=penalize, penaltyGroup='preMul')
+
+        # Turrets
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Large Energy Turret') or
+                                                  mod.item.requiresSkill('Large Hybrid Turret') or
+                                                  mod.item.requiresSkill('Large Projectile Turret'),
+                                      'maxRange', src.getModifiedItemAttr('maxRangeBonus'),
+                                      stackingPenalties=True)
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Large Energy Turret') or
+                                                  mod.item.requiresSkill('Large Hybrid Turret') or
+                                                  mod.item.requiresSkill('Large Projectile Turret'),
+                                      'falloff', src.getModifiedItemAttr('falloffBonus'),
+                                      stackingPenalties=True)
+
+        # Missiles
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Torpedoes') or
+                                                    mod.charge.requiresSkill('Cruise Missiles') or
+                                                    mod.charge.requiresSkill('Heavy Missiles'),
+                                        'maxVelocity', src.getModifiedItemAttr('missileVelocityBonus'))
+
+        # Tanking
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Repair Systems'),
+                                      'armorDamageAmount', src.getModifiedItemAttr('armorDamageAmountBonus'),
+                                      stackingPenalties=True)
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Shield Operation'),
+                                      'shieldBonus', src.getModifiedItemAttr('shieldBoostMultiplier'),
+                                      stackingPenalties=True)
+
+        # Speed penalty
+        fit.ship.boostItemAttr('maxVelocity', src.getModifiedItemAttr('speedFactor'))
+
+        # @todo: test these for April 2016 release
+        # Max locked targets
+        fit.ship.forceItemAttr('maxLockedTargets', src.getModifiedItemAttr('maxLockedTargets'))
+
+        # Block Hostile ewar
+        fit.ship.forceItemAttr('disallowOffensiveModifiers', src.getModifiedItemAttr('disallowOffensiveModifiers'))
+
+        # new with April 2016 release
+        for scanType in ('Magnetometric', 'Ladar', 'Gravimetric', 'Radar'):
+            fit.ship.boostItemAttr('scan{}Strength'.format(scanType),
+                                   src.getModifiedItemAttr('scan{}StrengthPercent'.format(scanType)),
+                                   stackingPenalties=True)
+
+        fit.ship.boostItemAttr('remoteRepairImpedance', src.getModifiedItemAttr('remoteRepairImpedanceBonus'))
+        fit.ship.boostItemAttr('remoteAssistanceImpedance', src.getModifiedItemAttr('remoteAssistanceImpedanceBonus'))
+        fit.ship.boostItemAttr('sensorDampenerResistance', src.getModifiedItemAttr('sensorDampenerResistanceBonus'))
+        fit.modules.filteredItemIncrease(lambda mod: mod.item.requiresSkill('Micro Jump Drive Operation'),
+                                         'activationBlocked', src.getModifiedItemAttr('activationBlockedStrenght'))
+        fit.ship.boostItemAttr('targetPainterResistance', src.getModifiedItemAttr('targetPainterResistanceBonus'))
+        fit.ship.boostItemAttr('weaponDisruptionResistance', src.getModifiedItemAttr('weaponDisruptionResistanceBonus'))
+        fit.ship.increaseItemAttr('warpScrambleStatus', src.getModifiedItemAttr('siegeModeWarpStatus'))
+
+        fit.ship.forceItemAttr('disallowDocking', src.getModifiedItemAttr('disallowDocking'))
+        fit.ship.forceItemAttr('disallowTethering', src.getModifiedItemAttr('disallowTethering'))
+
+
+class Effect6661(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill('Fighters'), 'maxVelocity',
+                                       src.getModifiedItemAttr('shipBonusCarrierM3'), skill='Minmatar Carrier')
+
+
+class Effect6662(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill('Fighters'), 'shieldCapacity',
+                                       src.getModifiedItemAttr('shipBonusCarrierG3'), skill='Gallente Carrier')
+
+
+class Effect6663(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        lvl = src.level if 'skill' in context else 1
+        fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill('Drones'), 'damageMultiplier',
+                                     src.getModifiedItemAttr('damageMultiplierBonus') * lvl)
+        fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill('Fighters'),
+                                       'fighterAbilityAttackMissileDamageMultiplier',
+                                       src.getModifiedItemAttr('damageMultiplierBonus') * lvl)
+        fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill('Fighters'),
+                                       'fighterAbilityAttackTurretDamageMultiplier',
+                                       src.getModifiedItemAttr('damageMultiplierBonus') * lvl)
+        fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill('Fighters'),
+                                       'fighterAbilityMissilesDamageMultiplier',
+                                       src.getModifiedItemAttr('damageMultiplierBonus') * lvl)
+        fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Mining Drone Operation'), 'miningDroneAmountPercent',
+                                     src.getModifiedItemAttr('miningAmountBonus') * lvl)
+
+
+class Effect6664(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        lvl = src.level if 'skill' in context else 1
+        fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill('Drones'), 'maxRange',
+                                     src.getModifiedItemAttr('rangeSkillBonus') * lvl)
+        fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill('Fighters'), 'fighterAbilityMissilesRange',
+                                       src.getModifiedItemAttr('rangeSkillBonus') * lvl)
+        fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill('Fighters'),
+                                       'fighterAbilityAttackTurretRangeOptimal',
+                                       src.getModifiedItemAttr('rangeSkillBonus') * lvl)
+        fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill('Fighters'),
+                                       'fighterAbilityAttackMissileRangeOptimal',
+                                       src.getModifiedItemAttr('rangeSkillBonus') * lvl)
+
+
+class Effect6665(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        lvl = src.level if 'skill' in context else 1
+        fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill('Drones'), 'hp',
+                                     src.getModifiedItemAttr('hullHpBonus') * lvl)
+        fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill('Drones'), 'armorHP',
+                                     src.getModifiedItemAttr('armorHpBonus') * lvl)
+        fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill('Drones'), 'shieldCapacity',
+                                     src.getModifiedItemAttr('shieldCapacityBonus') * lvl)
+        fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill('Fighters'), 'shieldCapacity',
+                                       src.getModifiedItemAttr('shieldCapacityBonus') * lvl)
+
+
+class Effect6667(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        lvl = src.level if 'skill' in context else 1
+        fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill('Drones'), 'maxVelocity',
+                                     src.getModifiedItemAttr('maxVelocityBonus') * lvl)
+        fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill('Fighters'), 'maxVelocity',
+                                       src.getModifiedItemAttr('maxVelocityBonus') * lvl)
+
+
+class Effect6669(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill('Drones'), 'armorHP',
+                                     src.getModifiedItemAttr('hullHpBonus'))
+        fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill('Drones'), 'hp',
+                                     src.getModifiedItemAttr('hullHpBonus'))
+        fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill('Drones'), 'shieldCapacity',
+                                     src.getModifiedItemAttr('hullHpBonus'))
+        fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill('Fighters'), 'shieldCapacity',
+                                       src.getModifiedItemAttr('hullHpBonus'))
+        fit.ship.boostItemAttr('cpuOutput', src.getModifiedItemAttr('drawback'))
+
+
+class Effect6670(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill('Drones'), 'maxRange',
+                                     src.getModifiedItemAttr('rangeSkillBonus'), stackingPenalties=True)
+        fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill('Fighters'), 'fighterAbilityMissilesRange',
+                                       src.getModifiedItemAttr('rangeSkillBonus'), stackingPenalties=True)
+        fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill('Fighters'),
+                                       'fighterAbilityAttackTurretRangeOptimal', src.getModifiedItemAttr('rangeSkillBonus'),
+                                       stackingPenalties=True)
+        fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill('Fighters'),
+                                       'fighterAbilityAttackMissileRangeOptimal',
+                                       src.getModifiedItemAttr('rangeSkillBonus'), stackingPenalties=True)
+        fit.ship.boostItemAttr('cpuOutput', src.getModifiedItemAttr('drawback'))
+
+
+class Effect6671(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill('Drones'), 'maxVelocity',
+                                     src.getModifiedItemAttr('droneMaxVelocityBonus'), stackingPenalties=True)
+        fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill('Fighters'), 'maxVelocity',
+                                       src.getModifiedItemAttr('droneMaxVelocityBonus'), stackingPenalties=True)
+        fit.ship.boostItemAttr('cpuOutput', src.getModifiedItemAttr('drawback'))
+
+
+class Effect6672(EffectDef):
+
+    runTime = 'early'
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        secModifier = module.getModifiedItemAttr('securityModifier')
+        module.multiplyItemAttr('structureRigDoomsdayDamageLossTargetBonus', secModifier)
+        module.multiplyItemAttr('structureRigScanResBonus', secModifier)
+        module.multiplyItemAttr('structureRigPDRangeBonus', secModifier)
+        module.multiplyItemAttr('structureRigPDCapUseBonus', secModifier)
+        module.multiplyItemAttr('structureRigMissileExploVeloBonus', secModifier)
+        module.multiplyItemAttr('structureRigMissileVelocityBonus', secModifier)
+        module.multiplyItemAttr('structureRigEwarOptimalBonus', secModifier)
+        module.multiplyItemAttr('structureRigEwarFalloffBonus', secModifier)
+        module.multiplyItemAttr('structureRigEwarCapUseBonus', secModifier)
+        module.multiplyItemAttr('structureRigMissileExplosionRadiusBonus', secModifier)
+        module.multiplyItemAttr('structureRigMaxTargetRangeBonus', secModifier)
+
+
+class Effect6679(EffectDef):
+
+    type = 'passive', 'structure'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Structure Doomsday Weapon',
+                                      'duration', src.getModifiedItemAttr('durationBonus'),
+                                      skill='Structure Doomsday Operation')
+
+
+class Effect6681(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemIncrease(lambda mod: mod.item.requiresSkill('Leadership'), 'maxGroupActive',
+                                         src.getModifiedItemAttr('shipBonusRole3'))
+
+
+class Effect6682(EffectDef):
+
+    type = 'active', 'projected'
+
+    @staticmethod
+    def handler(fit, module, context, *args, **kwargs):
+        if 'projected' not in context:
+            return
+        fit.ship.boostItemAttr('maxVelocity', module.getModifiedItemAttr('speedFactor'),
+                               stackingPenalties=True, *args, **kwargs)
+
+
+class Effect6683(EffectDef):
+
+    type = 'projected', 'active'
+
+    @staticmethod
+    def handler(fit, container, context, *args, **kwargs):
+        if 'projected' in context:
+            fit.ship.boostItemAttr('signatureRadius', container.getModifiedItemAttr('signatureRadiusBonus'),
+                                   stackingPenalties=True, *args, **kwargs)
+
+
+class Effect6684(EffectDef):
+
+    type = 'projected', 'active'
+
+    @staticmethod
+    def handler(fit, module, context, *args, **kwargs):
+        if 'projected' not in context:
+            return
+
+        fit.ship.boostItemAttr('maxTargetRange', module.getModifiedItemAttr('maxTargetRangeBonus'),
+                               stackingPenalties=True, *args, **kwargs)
+
+        fit.ship.boostItemAttr('scanResolution', module.getModifiedItemAttr('scanResolutionBonus'),
+                               stackingPenalties=True, *args, **kwargs)
+
+
+class Effect6685(EffectDef):
+
+    type = 'projected', 'active'
+
+    @staticmethod
+    def handler(fit, module, context):
+        if 'projected' in context:
+            # jam formula: 1 - (1- (jammer str/ship str))^(# of jam mods with same str))
+            strModifier = 1 - module.getModifiedItemAttr('scan{0}StrengthBonus'.format(fit.scanType)) / fit.scanStrength
+
+            fit.ecmProjectedStr *= strModifier
+
+
+class Effect6686(EffectDef):
+
+    type = 'active', 'projected'
+
+    @staticmethod
+    def handler(fit, module, context, *args, **kwargs):
+        if 'projected' in context:
+            for srcAttr, tgtAttr in (
+                    ('aoeCloudSizeBonus', 'aoeCloudSize'),
+                    ('aoeVelocityBonus', 'aoeVelocity'),
+                    ('missileVelocityBonus', 'maxVelocity'),
+                    ('explosionDelayBonus', 'explosionDelay'),
+            ):
+                fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Missile Launcher Operation'),
+                                                tgtAttr, module.getModifiedItemAttr(srcAttr),
+                                                stackingPenalties=True, *args, **kwargs)
+
+            fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Gunnery'),
+                                          'trackingSpeed', module.getModifiedItemAttr('trackingSpeedBonus'),
+                                          stackingPenalties=True, *args, **kwargs)
+            fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Gunnery'),
+                                          'maxRange', module.getModifiedItemAttr('maxRangeBonus'),
+                                          stackingPenalties=True, *args, **kwargs)
+            fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Gunnery'),
+                                          'falloff', module.getModifiedItemAttr('falloffBonus'),
+                                          stackingPenalties=True, *args, **kwargs)
+
+
+class Effect6687(EffectDef):
+
+    type = 'projected', 'active'
+
+    @staticmethod
+    def handler(fit, container, context):
+        if 'projected' in context:
+            bonus = container.getModifiedItemAttr('armorDamageAmount')
+            duration = container.getModifiedItemAttr('duration') / 1000.0
+            rps = bonus / duration
+            fit.extraAttributes.increase('armorRepair', rps)
+            fit.extraAttributes.increase('armorRepairPreSpool', rps)
+            fit.extraAttributes.increase('armorRepairFullSpool', rps)
+
+
+class Effect6688(EffectDef):
+
+    type = 'projected', 'active'
+
+    @staticmethod
+    def handler(fit, container, context):
+        if 'projected' in context:
+            bonus = container.getModifiedItemAttr('shieldBonus')
+            duration = container.getModifiedItemAttr('duration') / 1000.0
+            fit.extraAttributes.increase('shieldRepair', bonus / duration)
+
+
+class Effect6689(EffectDef):
+
+    runTime = 'late'
+    type = 'projected', 'active'
+
+    @staticmethod
+    def handler(fit, module, context):
+        if 'projected' not in context:
+            return
+        bonus = module.getModifiedItemAttr('structureDamageAmount')
+        duration = module.getModifiedItemAttr('duration') / 1000.0
+        fit.extraAttributes.increase('hullRepair', bonus / duration)
+
+
+class Effect6690(EffectDef):
+
+    type = 'active', 'projected'
+
+    @staticmethod
+    def handler(fit, module, context, *args, **kwargs):
+        if 'projected' not in context:
+            return
+        fit.ship.boostItemAttr('maxVelocity', module.getModifiedItemAttr('speedFactor'),
+                               stackingPenalties=True, *args, **kwargs)
+
+
+class Effect6691(EffectDef):
+
+    type = 'active', 'projected'
+
+    @staticmethod
+    def handler(fit, src, context, **kwargs):
+        if 'projected' in context and ((hasattr(src, 'state') and src.state >= FittingModuleState.ACTIVE) or
+                                       hasattr(src, 'amountActive')):
+            amount = src.getModifiedItemAttr('energyNeutralizerAmount')
+            time = src.getModifiedItemAttr('energyNeutralizerDuration')
+
+            if 'effect' in kwargs:
+                from eos.modifiedAttributeDict import ModifiedAttributeDict
+                amount *= ModifiedAttributeDict.getResistance(fit, kwargs['effect'])
+
+            fit.addDrain(src, time, amount, 0)
+
+
+class Effect6692(EffectDef):
+
+    type = 'projected', 'active'
+
+    @staticmethod
+    def handler(fit, container, context, *args, **kwargs):
+        if 'projected' in context:
+            fit.ship.boostItemAttr('signatureRadius', container.getModifiedItemAttr('signatureRadiusBonus'),
+                                   stackingPenalties=True, *args, **kwargs)
+
+
+class Effect6693(EffectDef):
+
+    type = 'projected', 'active'
+
+    @staticmethod
+    def handler(fit, module, context, *args, **kwargs):
+        if 'projected' not in context:
+            return
+
+        fit.ship.boostItemAttr('maxTargetRange', module.getModifiedItemAttr('maxTargetRangeBonus'),
+                               stackingPenalties=True, *args, **kwargs)
+
+        fit.ship.boostItemAttr('scanResolution', module.getModifiedItemAttr('scanResolutionBonus'),
+                               stackingPenalties=True, *args, **kwargs)
+
+
+class Effect6694(EffectDef):
+
+    type = 'projected', 'active'
+
+    @staticmethod
+    def handler(fit, module, context, *args, **kwargs):
+        if 'projected' in context:
+            fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Gunnery'),
+                                          'trackingSpeed', module.getModifiedItemAttr('trackingSpeedBonus'),
+                                          stackingPenalties=True, *args, **kwargs)
+            fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Gunnery'),
+                                          'maxRange', module.getModifiedItemAttr('maxRangeBonus'),
+                                          stackingPenalties=True, *args, **kwargs)
+            fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Gunnery'),
+                                          'falloff', module.getModifiedItemAttr('falloffBonus'),
+                                          stackingPenalties=True, *args, **kwargs)
+
+
+class Effect6695(EffectDef):
+
+    type = 'projected', 'active'
+
+    @staticmethod
+    def handler(fit, module, context, **kwargs):
+        if 'projected' in context:
+            # jam formula: 1 - (1- (jammer str/ship str))^(# of jam mods with same str))
+            strModifier = 1 - module.getModifiedItemAttr('scan{0}StrengthBonus'.format(fit.scanType)) / fit.scanStrength
+
+            if 'effect' in kwargs:
+                from eos.modifiedAttributeDict import ModifiedAttributeDict
+                strModifier *= ModifiedAttributeDict.getResistance(fit, kwargs['effect'])
+
+            fit.ecmProjectedStr *= strModifier
+
+
+class Effect6697(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        lvl = src.level
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Rig Armor', 'drawback',
+                                      src.getModifiedItemAttr('rigDrawbackBonus') * lvl)
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Rig Resource Processing', 'drawback',
+                                      src.getModifiedItemAttr('rigDrawbackBonus') * lvl)
+
+
+class Effect6698(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        lvl = src.level
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Rig Navigation', 'drawback',
+                                      src.getModifiedItemAttr('rigDrawbackBonus') * lvl)
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Rig Anchor', 'drawback',
+                                      src.getModifiedItemAttr('rigDrawbackBonus') * lvl)
+
+
+class Effect6699(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        lvl = src.level
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Rig Drones', 'drawback',
+                                      src.getModifiedItemAttr('rigDrawbackBonus') * lvl)
+
+
+class Effect6700(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        lvl = src.level
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Rig Electronic Systems', 'drawback',
+                                      src.getModifiedItemAttr('rigDrawbackBonus') * lvl)
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Rig Scanning', 'drawback',
+                                      src.getModifiedItemAttr('rigDrawbackBonus') * lvl)
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Rig Targeting', 'drawback',
+                                      src.getModifiedItemAttr('rigDrawbackBonus') * lvl)
+
+
+class Effect6701(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        lvl = src.level
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Rig Projectile Weapon', 'drawback',
+                                      src.getModifiedItemAttr('rigDrawbackBonus') * lvl)
+
+
+class Effect6702(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        lvl = src.level
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Rig Energy Weapon', 'drawback',
+                                      src.getModifiedItemAttr('rigDrawbackBonus') * lvl)
+
+
+class Effect6703(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        lvl = src.level
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Rig Hybrid Weapon', 'drawback',
+                                      src.getModifiedItemAttr('rigDrawbackBonus') * lvl)
+
+
+class Effect6704(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        lvl = src.level
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Rig Launcher', 'drawback',
+                                      src.getModifiedItemAttr('rigDrawbackBonus') * lvl)
+
+
+class Effect6705(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        lvl = src.level
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Rig Shield', 'drawback',
+                                      src.getModifiedItemAttr('rigDrawbackBonus') * lvl)
+
+
+class Effect6706(EffectDef):
+
+    runTime = 'early'
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.appliedImplants.filteredItemMultiply(lambda mod: mod.item.requiresSkill('Cybernetics'),
+                                                 'armorRepairBonus', src.getModifiedItemAttr('implantSetSerpentis2'))
+
+
+class Effect6708(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Repair Systems'),
+                                      'armorDamageAmount', src.getModifiedItemAttr('armorRepairBonus'))
+
+
+class Effect6709(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Capital Hybrid Turret'),
+                                      'damageMultiplier', ship.getModifiedItemAttr('shipBonusRole1'))
+
+
+class Effect6710(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Stasis Web', 'speedFactor',
+                                      src.getModifiedItemAttr('shipBonusDreadnoughtM1'), skill='Minmatar Dreadnought')
+
+
+class Effect6711(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Capital Hybrid Turret'), 'damageMultiplier',
+                                      src.getModifiedItemAttr('shipBonusRole3'))
+
+
+class Effect6712(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Stasis Web', 'speedFactor',
+                                      src.getModifiedItemAttr('shipBonusTitanM1'), skill='Minmatar Titan')
+
+
+class Effect6713(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Burst Projector Operation'), 'speedFactor',
+                                      src.getModifiedItemAttr('shipBonusSupercarrierM1'), skill='Minmatar Carrier')
+
+
+class Effect6714(EffectDef):
+
+    type = 'projected', 'active'
+
+    @staticmethod
+    def handler(fit, module, context, **kwargs):
+        if 'projected' in context:
+            # jam formula: 1 - (1- (jammer str/ship str))^(# of jam mods with same str))
+            strModifier = 1 - module.getModifiedItemAttr('scan{0}StrengthBonus'.format(fit.scanType)) / fit.scanStrength
+
+            if 'effect' in kwargs:
+                from eos.modifiedAttributeDict import ModifiedAttributeDict
+                strModifier *= ModifiedAttributeDict.getResistance(fit, kwargs['effect'])
+
+            fit.ecmProjectedStr *= strModifier
+
+
+class Effect6717(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Mining'), 'capacitorNeed',
+                                      src.getModifiedItemAttr('miningDurationRoleBonus'))
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Mining'), 'duration',
+                                      src.getModifiedItemAttr('miningDurationRoleBonus'))
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Ice Harvesting'), 'duration',
+                                      src.getModifiedItemAttr('miningDurationRoleBonus'))
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Ice Harvesting'), 'capacitorNeed',
+                                      src.getModifiedItemAttr('miningDurationRoleBonus'))
+
+
+class Effect6720(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill('Drones'), 'shieldBonus',
+                                     src.getModifiedItemAttr('shipBonusMC'), skill='Minmatar Cruiser')
+        fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill('Drones'), 'structureDamageAmount',
+                                     src.getModifiedItemAttr('shipBonusMC'), skill='Minmatar Cruiser')
+        fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill('Drones'), 'armorDamageAmount',
+                                     src.getModifiedItemAttr('shipBonusMC'), skill='Minmatar Cruiser')
+
+
+class Effect6721(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Remote Armor Repair Systems'),
+                                      'falloffEffectiveness',
+                                      src.getModifiedItemAttr('eliteBonusLogistics1'),
+                                      skill='Logistics Cruisers')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Remote Armor Repair Systems'),
+                                      'maxRange',
+                                      src.getModifiedItemAttr('eliteBonusLogistics1'),
+                                      skill='Logistics Cruisers')
+
+
+class Effect6722(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Remote Armor Repair Systems'),
+                                      'falloffEffectiveness',
+                                      src.getModifiedItemAttr('roleBonusRepairRange'))
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Remote Armor Repair Systems'),
+                                      'maxRange',
+                                      src.getModifiedItemAttr('roleBonusRepairRange'))
+
+
+class Effect6723(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Cloaking'), 'cpu',
+                                      src.getModifiedItemAttr('shipBonusMC2'), skill='Minmatar Cruiser')
+
+
+class Effect6724(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Remote Armor Repair Systems'), 'duration',
+                                      src.getModifiedItemAttr('eliteBonusLogistics3'), skill='Logistics Cruisers')
+
+
+class Effect6725(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Small Energy Turret'), 'falloff',
+                                      src.getModifiedItemAttr('shipBonus2AF'), skill='Amarr Frigate')
+
+
+class Effect6726(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Cloaking'), 'cpu',
+                                      src.getModifiedItemAttr('shipBonusMF'), skill='Minmatar Frigate')
+
+
+class Effect6727(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name in ('Energy Nosferatu', 'Energy Neutralizer'),
+                                      'falloffEffectiveness', src.getModifiedItemAttr('eliteBonusCovertOps1'),
+                                      stackingPenalties=True, skill='Covert Ops')
+
+
+class Effect6730(EffectDef):
+
+    runTime = 'late'
+    type = 'active'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.ship.increaseItemAttr('mass', module.getModifiedItemAttr('massAddition'))
+        speedBoost = module.getModifiedItemAttr('speedFactor')
+        mass = fit.ship.getModifiedItemAttr('mass')
+        thrust = module.getModifiedItemAttr('speedBoostFactor')
+        fit.ship.boostItemAttr('maxVelocity', speedBoost * thrust / mass)
+        fit.ship.boostItemAttr('signatureRadius', module.getModifiedItemAttr('signatureRadiusBonus'),
+                               stackingPenalties=True)
+
+
+class Effect6731(EffectDef):
+
+    runTime = 'late'
+    type = 'active'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.ship.increaseItemAttr('mass', module.getModifiedItemAttr('massAddition'))
+        speedBoost = module.getModifiedItemAttr('speedFactor')
+        mass = fit.ship.getModifiedItemAttr('mass')
+        thrust = module.getModifiedItemAttr('speedBoostFactor')
+        fit.ship.boostItemAttr('maxVelocity', speedBoost * thrust / mass)
+
+
+class Effect6732(EffectDef):
+
+    type = 'active', 'gang'
+
+    @staticmethod
+    def handler(fit, module, context, **kwargs):
+        for x in range(1, 5):
+            if module.getModifiedChargeAttr('warfareBuff{}ID'.format(x)):
+                value = module.getModifiedItemAttr('warfareBuff{}Value'.format(x))
+                id = module.getModifiedChargeAttr('warfareBuff{}ID'.format(x))
+
+                if id:
+                    fit.addCommandBonus(id, value, module, kwargs['effect'])
+
+
+class Effect6733(EffectDef):
+
+    type = 'active', 'gang'
+
+    @staticmethod
+    def handler(fit, module, context, **kwargs):
+        for x in range(1, 5):
+            if module.getModifiedChargeAttr('warfareBuff{}ID'.format(x)):
+                value = module.getModifiedItemAttr('warfareBuff{}Value'.format(x))
+                id = module.getModifiedChargeAttr('warfareBuff{}ID'.format(x))
+
+                if id:
+                    fit.addCommandBonus(id, value, module, kwargs['effect'])
+
+
+class Effect6734(EffectDef):
+
+    type = 'active', 'gang'
+
+    @staticmethod
+    def handler(fit, module, context, **kwargs):
+        for x in range(1, 5):
+            if module.getModifiedChargeAttr('warfareBuff{}ID'.format(x)):
+                value = module.getModifiedItemAttr('warfareBuff{}Value'.format(x))
+                id = module.getModifiedChargeAttr('warfareBuff{}ID'.format(x))
+
+                if id:
+                    fit.addCommandBonus(id, value, module, kwargs['effect'])
+
+
+class Effect6735(EffectDef):
+
+    type = 'active', 'gang'
+
+    @staticmethod
+    def handler(fit, module, context, **kwargs):
+        for x in range(1, 5):
+            if module.getModifiedChargeAttr('warfareBuff{}ID'.format(x)):
+                value = module.getModifiedItemAttr('warfareBuff{}Value'.format(x))
+                id = module.getModifiedChargeAttr('warfareBuff{}ID'.format(x))
+
+                if id:
+                    fit.addCommandBonus(id, value, module, kwargs['effect'])
+
+
+class Effect6736(EffectDef):
+
+    type = 'active', 'gang'
+
+    @staticmethod
+    def handler(fit, module, context, **kwargs):
+        for x in range(1, 5):
+            if module.getModifiedChargeAttr('warfareBuff{}ID'.format(x)):
+                value = module.getModifiedItemAttr('warfareBuff{}Value'.format(x))
+                id = module.getModifiedChargeAttr('warfareBuff{}ID'.format(x))
+
+                if id:
+                    fit.addCommandBonus(id, value, module, kwargs['effect'])
+
+
+class Effect6737(EffectDef):
+
+    type = 'active'
+
+    @staticmethod
+    def handler(fit, module, context):
+        for x in range(1, 4):
+            value = module.getModifiedChargeAttr('warfareBuff{}Multiplier'.format(x))
+            module.multiplyItemAttr('warfareBuff{}Value'.format(x), value)
+
+
+class Effect6753(EffectDef):
+
+    type = 'active', 'gang'
+
+    @staticmethod
+    def handler(fit, module, context, **kwargs):
+        for x in range(1, 5):
+            if module.getModifiedItemAttr('warfareBuff{}ID'.format(x)):
+                value = module.getModifiedItemAttr('warfareBuff{}Value'.format(x))
+                id = module.getModifiedItemAttr('warfareBuff{}ID'.format(x))
+
+                if id:
+                    fit.addCommandBonus(id, value, module, kwargs['effect'])
+
+
+class Effect6762(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        lvl = src.level
+        fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill('Mining Drone Specialization'), 'miningAmount',
+                                     src.getModifiedItemAttr('miningAmountBonus') * lvl)
+        fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill('Mining Drone Specialization'), 'maxVelocity',
+                                     src.getModifiedItemAttr('maxVelocityBonus') * lvl)
+
+
+class Effect6763(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        lvl = src.level if 'skill' in context else 1
+        fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill('Ice Harvesting Drone Operation'), 'duration', src.getModifiedItemAttr('rofBonus') * lvl)
+
+
+class Effect6764(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        lvl = src.level
+        fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill('Ice Harvesting Drone Specialization'), 'duration',
+                                     src.getModifiedItemAttr('rofBonus') * lvl)
+        fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill('Ice Harvesting Drone Specialization'),
+                                     'maxVelocity', src.getModifiedItemAttr('maxVelocityBonus') * lvl)
+
+
+class Effect6765(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        lvl = src.level
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Spatial Phenomena Generation'), 'buffDuration',
+                                      src.getModifiedItemAttr('durationBonus') * lvl)
+
+
+class Effect6766(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemIncrease(lambda mod: mod.item.requiresSkill('Leadership'), 'maxGroupActive',
+                                         src.getModifiedItemAttr('maxGangModules'))
+        fit.modules.filteredItemIncrease(lambda mod: mod.item.requiresSkill('Leadership'), 'maxGroupOnline',
+                                         src.getModifiedItemAttr('maxGangModules'))
+
+
+class Effect6769(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Leadership'), 'maxRange',
+                                      src.getModifiedItemAttr('areaOfEffectBonus') * src.level)
+
+
+class Effect6770(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        lvl = src.level
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Armored Command'), 'buffDuration',
+                                      src.getModifiedItemAttr('durationBonus') * lvl)
+
+
+class Effect6771(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        lvl = src.level
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Shield Command'), 'buffDuration',
+                                      src.getModifiedItemAttr('durationBonus') * lvl)
+
+
+class Effect6772(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        lvl = src.level
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Information Command'), 'buffDuration',
+                                      src.getModifiedItemAttr('durationBonus') * lvl)
+
+
+class Effect6773(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        lvl = src.level
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Skirmish Command'), 'buffDuration',
+                                      src.getModifiedItemAttr('durationBonus') * lvl)
+
+
+class Effect6774(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        lvl = src.level
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Mining Foreman'), 'buffDuration',
+                                      src.getModifiedItemAttr('durationBonus') * lvl)
+
+
+class Effect6776(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        lvl = src.level
+        fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill('Armored Command'), 'warfareBuff1Multiplier',
+                                        src.getModifiedItemAttr('commandStrengthBonus') * lvl)
+        fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill('Armored Command'), 'warfareBuff2Multiplier',
+                                        src.getModifiedItemAttr('commandStrengthBonus') * lvl)
+        fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill('Armored Command'), 'warfareBuff4Multiplier',
+                                        src.getModifiedItemAttr('commandStrengthBonus') * lvl)
+        fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill('Armored Command'), 'warfareBuff3Multiplier',
+                                        src.getModifiedItemAttr('commandStrengthBonus') * lvl)
+
+
+class Effect6777(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        lvl = src.level
+        fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill('Shield Command'), 'warfareBuff3Multiplier',
+                                        src.getModifiedItemAttr('commandStrengthBonus') * lvl)
+        fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill('Shield Command'), 'warfareBuff1Multiplier',
+                                        src.getModifiedItemAttr('commandStrengthBonus') * lvl)
+        fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill('Shield Command'), 'warfareBuff2Multiplier',
+                                        src.getModifiedItemAttr('commandStrengthBonus') * lvl)
+        fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill('Shield Command'), 'warfareBuff4Multiplier',
+                                        src.getModifiedItemAttr('commandStrengthBonus') * lvl)
+
+
+class Effect6778(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        lvl = src.level
+        fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill('Information Command'), 'warfareBuff2Multiplier',
+                                        src.getModifiedItemAttr('commandStrengthBonus') * lvl)
+        fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill('Information Command'), 'warfareBuff1Multiplier',
+                                        src.getModifiedItemAttr('commandStrengthBonus') * lvl)
+        fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill('Information Command'), 'warfareBuff3Multiplier',
+                                        src.getModifiedItemAttr('commandStrengthBonus') * lvl)
+        fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill('Information Command'), 'warfareBuff4Multiplier',
+                                        src.getModifiedItemAttr('commandStrengthBonus') * lvl)
+
+
+class Effect6779(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        lvl = src.level
+        fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill('Skirmish Command'), 'warfareBuff3Multiplier',
+                                        src.getModifiedItemAttr('commandStrengthBonus') * lvl)
+        fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill('Skirmish Command'), 'warfareBuff4Multiplier',
+                                        src.getModifiedItemAttr('commandStrengthBonus') * lvl)
+        fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill('Skirmish Command'), 'warfareBuff1Multiplier',
+                                        src.getModifiedItemAttr('commandStrengthBonus') * lvl)
+        fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill('Skirmish Command'), 'warfareBuff2Multiplier',
+                                        src.getModifiedItemAttr('commandStrengthBonus') * lvl)
+
+
+class Effect6780(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        lvl = src.level
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Mining Foreman'), 'warfareBuff4Value', src.getModifiedItemAttr('commandStrengthBonus') * lvl)
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Mining Foreman'), 'warfareBuff3Value', src.getModifiedItemAttr('commandStrengthBonus') * lvl)
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Mining Foreman'), 'warfareBuff2Value', src.getModifiedItemAttr('commandStrengthBonus') * lvl)
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Mining Foreman'), 'warfareBuff1Value', src.getModifiedItemAttr('commandStrengthBonus') * lvl)
+
+
+class Effect6782(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        lvl = src.level
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Leadership'),
+                                      'reloadTime',
+                                      src.getModifiedItemAttr('reloadTimeBonus') * lvl)
+
+
+class Effect6783(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Leadership'), 'maxRange',
+                                      src.getModifiedItemAttr('roleBonusCommandBurstAoERange'))
+
+
+class Effect6786(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Shield Command'), 'warfareBuff4Multiplier',
+                                      src.getModifiedItemAttr('shipBonusICS3'), skill='Industrial Command Ships')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Shield Command'), 'warfareBuff1Multiplier',
+                                      src.getModifiedItemAttr('shipBonusICS3'), skill='Industrial Command Ships')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Shield Command'), 'warfareBuff2Multiplier',
+                                      src.getModifiedItemAttr('shipBonusICS3'), skill='Industrial Command Ships')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Shield Command'), 'warfareBuff3Multiplier',
+                                      src.getModifiedItemAttr('shipBonusICS3'), skill='Industrial Command Ships')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Shield Command'), 'buffDuration',
+                                      src.getModifiedItemAttr('shipBonusICS3'), skill='Industrial Command Ships')
+
+
+class Effect6787(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Drones'),
+                                     'damageMultiplier',
+                                     src.getModifiedItemAttr('shipBonusICS4'),
+                                     skill='Industrial Command Ships'
+                                     )
+
+        fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Drones'),
+                                     'shieldCapacity',
+                                     src.getModifiedItemAttr('shipBonusICS4'),
+                                     skill='Industrial Command Ships'
+                                     )
+
+        fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Drones'),
+                                     'armorHP',
+                                     src.getModifiedItemAttr('shipBonusICS4'),
+                                     skill='Industrial Command Ships'
+                                     )
+
+        fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Drones'),
+                                     'hp',
+                                     src.getModifiedItemAttr('shipBonusICS4'),
+                                     skill='Industrial Command Ships'
+                                     )
+
+        fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Mining Drone Operation'),
+                                     'miningAmount',
+                                     src.getModifiedItemAttr('shipBonusICS4'),
+                                     skill='Industrial Command Ships'
+                                     )
+
+
+class Effect6788(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Ice Harvesting Drone Operation'),
+                                     'duration',
+                                     src.getModifiedItemAttr('shipBonusICS5'),
+                                     skill='Industrial Command Ships'
+                                     )
+
+
+class Effect6789(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Drones'),
+                                     'damageMultiplier',
+                                     src.getModifiedItemAttr('industrialBonusDroneDamage'))
+
+
+class Effect6790(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill('Ice Harvesting Drone Operation'), 'duration',
+                                     src.getModifiedItemAttr('roleBonusDroneIceHarvestingSpeed'))
+
+
+class Effect6792(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Drones'),
+                                     'damageMultiplier',
+                                     src.getModifiedItemAttr('shipBonusORECapital4'),
+                                     skill='Capital Industrial Ships'
+                                     )
+
+        fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Drones'),
+                                     'shieldCapacity',
+                                     src.getModifiedItemAttr('shipBonusORECapital4'),
+                                     skill='Capital Industrial Ships'
+                                     )
+
+        fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Drones'),
+                                     'armorHP',
+                                     src.getModifiedItemAttr('shipBonusORECapital4'),
+                                     skill='Capital Industrial Ships'
+                                     )
+
+        fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Drones'),
+                                     'hp',
+                                     src.getModifiedItemAttr('shipBonusORECapital4'),
+                                     skill='Capital Industrial Ships'
+                                     )
+
+        fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Mining Drone Operation'),
+                                     'miningAmount',
+                                     src.getModifiedItemAttr('shipBonusORECapital4'),
+                                     skill='Capital Industrial Ships'
+                                     )
+
+
+class Effect6793(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Mining Foreman'), 'warfareBuff1Value',
+                                      src.getModifiedItemAttr('shipBonusORECapital2'), skill='Capital Industrial Ships')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Mining Foreman'), 'warfareBuff2Value',
+                                      src.getModifiedItemAttr('shipBonusORECapital2'), skill='Capital Industrial Ships')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Mining Foreman'), 'warfareBuff4Value',
+                                      src.getModifiedItemAttr('shipBonusORECapital2'), skill='Capital Industrial Ships')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Mining Foreman'), 'warfareBuff3Value',
+                                      src.getModifiedItemAttr('shipBonusORECapital2'), skill='Capital Industrial Ships')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Mining Foreman'), 'buffDuration',
+                                      src.getModifiedItemAttr('shipBonusORECapital2'), skill='Capital Industrial Ships')
+
+
+class Effect6794(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Shield Command'), 'warfareBuff4Value',
+                                      src.getModifiedItemAttr('shipBonusORECapital3'), skill='Capital Industrial Ships')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Shield Command'), 'buffDuration',
+                                      src.getModifiedItemAttr('shipBonusORECapital3'), skill='Capital Industrial Ships')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Shield Command'), 'warfareBuff1Value',
+                                      src.getModifiedItemAttr('shipBonusORECapital3'), skill='Capital Industrial Ships')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Shield Command'), 'warfareBuff3Value',
+                                      src.getModifiedItemAttr('shipBonusORECapital3'), skill='Capital Industrial Ships')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Shield Command'), 'warfareBuff2Value',
+                                      src.getModifiedItemAttr('shipBonusORECapital3'), skill='Capital Industrial Ships')
+
+
+class Effect6795(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Ice Harvesting Drone Operation'),
+                                     'duration',
+                                     src.getModifiedItemAttr('shipBonusORECapital5'),
+                                     skill='Capital Industrial Ships'
+                                     )
+
+
+class Effect6796(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.modules.filteredItemMultiply(
+            lambda mod: mod.item.requiresSkill('Small Hybrid Turret'),
+            'damageMultiplier',
+            1 / module.getModifiedItemAttr('modeDamageBonusPostDiv'),
+            stackingPenalties=True,
+            penaltyGroup='postDiv'
+        )
+
+
+class Effect6797(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.modules.filteredItemMultiply(
+            lambda mod: mod.item.requiresSkill('Small Projectile Turret'),
+            'damageMultiplier',
+            1 / module.getModifiedItemAttr('modeDamageBonusPostDiv'),
+            stackingPenalties=True,
+            penaltyGroup='postDiv'
+        )
+
+
+class Effect6798(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.modules.filteredItemMultiply(
+            lambda mod: mod.item.requiresSkill('Small Energy Turret'),
+            'damageMultiplier',
+            1 / module.getModifiedItemAttr('modeDamageBonusPostDiv'),
+            stackingPenalties=True,
+            penaltyGroup='postDiv'
+        )
+
+
+class Effect6799(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        types = ('thermal', 'em', 'explosive', 'kinetic')
+        for type in types:
+            fit.modules.filteredChargeMultiply(lambda mod: mod.charge.requiresSkill('Rockets') or mod.charge.requiresSkill('Light Missiles'),
+                                               '{}Damage'.format(type),
+                                               1 / module.getModifiedItemAttr('modeDamageBonusPostDiv'),
+                                               stackingPenalties=True,
+                                               penaltyGroup='postDiv')
+
+
+class Effect6800(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.ship.multiplyItemAttr('weaponDisruptionResistance', 1 / module.getModifiedItemAttr('modeEwarResistancePostDiv'))
+        fit.ship.multiplyItemAttr('sensorDampenerResistance', 1 / module.getModifiedItemAttr('modeEwarResistancePostDiv'))
+
+
+class Effect6801(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.modules.filteredItemMultiply(
+            lambda mod: mod.item.requiresSkill('High Speed Maneuvering') or mod.item.requiresSkill('Afterburner'),
+            'speedFactor',
+            1 / module.getModifiedItemAttr('modeVelocityPostDiv'),
+            stackingPenalties=True,
+            penaltyGroup='postDiv'
+        )
+
+
+class Effect6807(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        lvl = src.level
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Invulnerability Core Operation'), 'buffDuration',
+                                      src.getModifiedItemAttr('durationBonus') * lvl)
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Invulnerability Core Operation'), 'duration',
+                                      src.getModifiedItemAttr('durationBonus') * lvl)
+
+
+class Effect6844(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, skill, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Defender Missiles'),
+                                        'maxVelocity', skill.getModifiedItemAttr('missileVelocityBonus') * skill.level)
+
+
+class Effect6845(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Defender Missiles'),
+                                      'moduleReactivationDelay', ship.getModifiedItemAttr('shipBonusRole1'))
+
+
+class Effect6851(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Capital Energy Turret'), 'damageMultiplier', src.getModifiedItemAttr('shipBonusRole3'))
+
+
+class Effect6852(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Stasis Web',
+                                      'maxRange', src.getModifiedItemAttr('shipBonusTitanM1'), skill='Minmatar Titan')
+
+
+class Effect6853(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Energy Nosferatu',
+                                      'powerTransferAmount', src.getModifiedItemAttr('shipBonusTitanA1'), skill='Amarr Titan')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Energy Neutralizer',
+                                      'energyNeutralizerAmount', src.getModifiedItemAttr('shipBonusTitanA1'), skill='Amarr Titan')
+
+
+class Effect6855(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Energy Nosferatu',
+                                      'powerTransferAmount', src.getModifiedItemAttr('shipBonusDreadnoughtA1'), skill='Amarr Dreadnought')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Energy Neutralizer',
+                                      'energyNeutralizerAmount', src.getModifiedItemAttr('shipBonusDreadnoughtA1'), skill='Amarr Dreadnought')
+
+
+class Effect6856(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Stasis Web',
+                                      'maxRange', src.getModifiedItemAttr('shipBonusDreadnoughtM1'), skill='Minmatar Dreadnought')
+
+
+class Effect6857(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Energy Nosferatu',
+                                      'maxRange', src.getModifiedItemAttr('shipBonusForceAuxiliaryA1'), skill='Amarr Carrier')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Energy Nosferatu',
+                                      'falloffEffectiveness', src.getModifiedItemAttr('shipBonusForceAuxiliaryA1'), skill='Amarr Carrier')
+
+
+class Effect6858(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Energy Nosferatu',
+                                      'powerTransferAmount', src.getModifiedItemAttr('shipBonusForceAuxiliaryA1'), skill='Amarr Carrier')
+
+
+class Effect6859(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Energy Nosferatu', 'cpu', src.getModifiedItemAttr('shipBonusRole4'))
+
+
+class Effect6860(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Remote Armor Repair Systems'), 'power',
+                                      src.getModifiedItemAttr('shipBonusRole5'))
+
+
+class Effect6861(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Capital Remote Armor Repair Systems'), 'power', src.getModifiedItemAttr('shipBonusRole5'))
+
+
+class Effect6862(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Remote Armor Repair Systems'),
+                                      'duration', src.getModifiedItemAttr('shipBonusForceAuxiliaryM1'), skill='Minmatar Carrier')
+
+
+class Effect6865(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.ship.boostItemAttr('warpSpeedMultiplier', src.getModifiedItemAttr('eliteBonusCovertOps1'), skill='Covert Ops')
+
+
+class Effect6866(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Rockets'),
+                                        'explosionDelay', src.getModifiedItemAttr('shipBonusCF'), skill='Caldari Frigate')
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Light Missiles'),
+                                        'explosionDelay', src.getModifiedItemAttr('shipBonusCF'), skill='Caldari Frigate')
+
+
+class Effect6867(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Small Projectile Turret'),
+                                      'speed', src.getModifiedItemAttr('shipBonusMF'), skill='Minmatar Frigate')
+
+
+class Effect6871(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+
+        # Get pilot sec status bonus directly here, instead of going through the intermediary effects
+        # via https://forums.eveonline.com/default.aspx?g=posts&t=515826
+        try:
+            bonus = max(0, min(50.0, (src.parent.character.secStatus * 10)))
+        except:
+            bonus = None
+
+        if bonus is not None:
+            fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Repair Systems'),
+                                      'armorDamageAmount', bonus, stackingPenalties=True)
+            fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Shield Operation'),
+                                      'shieldBonus', bonus, stackingPenalties=True)
+
+
+class Effect6872(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Stasis Web', 'maxRange', src.getModifiedItemAttr('eliteBonusReconShip1'), skill='Recon Ships')
+
+
+class Effect6873(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.ship.boostItemAttr('warpSpeedMultiplier', src.getModifiedItemAttr('eliteBonusReconShip3'), skill='Recon Ships')
+
+
+class Effect6874(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Heavy Missiles'),
+                                        'explosionDelay', src.getModifiedItemAttr('shipBonusCC2'), skill='Caldari Cruiser')
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Heavy Assault Missiles'),
+                                        'explosionDelay', src.getModifiedItemAttr('shipBonusCC2'), skill='Caldari Cruiser')
+
+
+class Effect6877(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.ship.boostItemAttr('warpSpeedMultiplier', src.getModifiedItemAttr('eliteBonusBlackOps1'), stackingPenalties=True, skill='Black Ops')
+
+
+class Effect6878(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Warp Scrambler', 'maxRange',
+                                      src.getModifiedItemAttr('eliteBonusBlackOps4'), stackingPenalties=True, skill='Black Ops')
+
+
+class Effect6879(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Stasis Web', 'maxRange',
+                                      src.getModifiedItemAttr('eliteBonusBlackOps3'), stackingPenalties=True, skill='Black Ops')
+
+
+class Effect6880(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Missile Launcher Cruise', 'speed',
+                                      src.getModifiedItemAttr('shipBonus2CB'), skill='Caldari Battleship')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Missile Launcher Torpedo', 'speed',
+                                      src.getModifiedItemAttr('shipBonus2CB'), skill='Caldari Battleship')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Missile Launcher Rapid Heavy', 'speed',
+                                      src.getModifiedItemAttr('shipBonus2CB'), skill='Caldari Battleship')
+
+
+class Effect6881(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Torpedoes'), 'explosionDelay',
+                                        src.getModifiedItemAttr('shipBonusCB'), skill='Caldari Battleship')
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Cruise Missiles'), 'explosionDelay',
+                                        src.getModifiedItemAttr('shipBonusCB'), skill='Caldari Battleship')
+
+
+class Effect6883(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Repair Systems'),
+                                      'armorDamageAmount', src.getModifiedItemAttr('shipBonusForceAuxiliaryM2'), skill='Minmatar Carrier')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Capital Repair Systems'),
+                                      'armorDamageAmount', src.getModifiedItemAttr('shipBonusForceAuxiliaryM2'), skill='Minmatar Carrier')
+
+
+class Effect6894(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name in ('Energy Nosferatu', 'Energy Neutralizer'),
+        'cpu', src.getModifiedItemAttr('subsystemEnergyNeutFittingReduction'))
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name in ('Energy Nosferatu', 'Energy Neutralizer'),
+                                      'power', src.getModifiedItemAttr('subsystemEnergyNeutFittingReduction'))
+
+
+class Effect6895(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Energy Turret'),
+                                      'cpu', src.getModifiedItemAttr('subsystemMETFittingReduction'))
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Energy Turret'),
+                                      'power', src.getModifiedItemAttr('subsystemMETFittingReduction'))
+
+
+class Effect6896(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Hybrid Turret'),
+                                      'cpu', src.getModifiedItemAttr('subsystemMHTFittingReduction'))
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Hybrid Turret'),
+                                      'power', src.getModifiedItemAttr('subsystemMHTFittingReduction'))
+
+
+class Effect6897(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Projectile Turret'),
+                                      'power', src.getModifiedItemAttr('subsystemMPTFittingReduction'))
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Projectile Turret'),
+                                      'cpu', src.getModifiedItemAttr('subsystemMPTFittingReduction'))
+
+
+class Effect6898(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Remote Armor Repair Systems') and
+                                                  mod.getModifiedItemAttr('mediumRemoteRepFittingMultiplier', 0) == 1,
+                                      'cpu', src.getModifiedItemAttr('subsystemMRARFittingReduction'))
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Remote Armor Repair Systems') and
+                                                  mod.getModifiedItemAttr('mediumRemoteRepFittingMultiplier', 0) == 1,
+                                      'power', src.getModifiedItemAttr('subsystemMRARFittingReduction'))
+
+
+class Effect6899(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Shield Emission Systems') and
+                                                  mod.getModifiedItemAttr('mediumRemoteRepFittingMultiplier', 0) == 1,
+                                      'cpu', src.getModifiedItemAttr('subsystemMRSBFittingReduction'))
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Shield Emission Systems') and
+                                                  mod.getModifiedItemAttr('mediumRemoteRepFittingMultiplier', 0) == 1,
+                                      'power', src.getModifiedItemAttr('subsystemMRSBFittingReduction'))
+
+
+class Effect6900(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        groups = ('Missile Launcher Heavy', 'Missile Launcher Rapid Light', 'Missile Launcher Heavy Assault')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name in groups,
+                                      'cpu', src.getModifiedItemAttr('subsystemMMissileFittingReduction'))
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name in groups,
+                                      'power', src.getModifiedItemAttr('subsystemMMissileFittingReduction'))
+
+
+class Effect6908(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: True, 'moduleRepairRate',
+                                      ship.getModifiedItemAttr('shipBonusStrategicCruiserCaldari2'),
+                                      skill='Caldari Strategic Cruiser')
+
+
+class Effect6909(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: True, 'moduleRepairRate',
+                                      ship.getModifiedItemAttr('shipBonusStrategicCruiserAmarr2'),
+                                      skill='Amarr Strategic Cruiser')
+
+
+class Effect6910(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: True, 'moduleRepairRate',
+                                      ship.getModifiedItemAttr('shipBonusStrategicCruiserGallente2'),
+                                      skill='Gallente Strategic Cruiser')
+
+
+class Effect6911(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: True, 'moduleRepairRate',
+                                      ship.getModifiedItemAttr('shipBonusStrategicCruiserMinmatar2'),
+                                      skill='Minmatar Strategic Cruiser')
+
+
+class Effect6920(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.ship.increaseItemAttr('hp', module.getModifiedItemAttr('structureHPBonusAdd') or 0)
+
+
+class Effect6921(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Astrometrics'),
+                                        'baseSensorStrength', src.getModifiedItemAttr('subsystemBonusAmarrDefensive2'),
+                                        skill='Amarr Defensive Systems')
+
+
+class Effect6923(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Heavy Missiles') or mod.charge.requiresSkill('Heavy Assault Missiles'),
+                                      'maxVelocity', container.getModifiedItemAttr('subsystemBonusMinmatarOffensive'),
+                                      skill='Minmatar Offensive Systems')
+
+
+class Effect6924(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Missile Launcher Operation'),
+                                      'aoeVelocity', container.getModifiedItemAttr('subsystemBonusMinmatarOffensive3'),
+                                      skill='Minmatar Offensive Systems')
+
+
+class Effect6925(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill('Drones'),
+                                     'maxVelocity', src.getModifiedItemAttr('subsystemBonusGallenteOffensive2'),
+                                     skill='Gallente Offensive Systems')
+        fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill('Drones'),
+                                     'trackingSpeed', src.getModifiedItemAttr('subsystemBonusGallenteOffensive2'),
+                                     skill='Gallente Offensive Systems')
+
+
+class Effect6926(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.ship.boostItemAttr('warpCapacitorNeed', src.getModifiedItemAttr('subsystemBonusAmarrPropulsion'), skill='Amarr Propulsion Systems')
+
+
+class Effect6927(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.ship.boostItemAttr('warpCapacitorNeed', src.getModifiedItemAttr('subsystemBonusMinmatarPropulsion'),
+                               skill='Minmatar Propulsion Systems')
+
+
+class Effect6928(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Afterburner') or mod.item.requiresSkill('High Speed Maneuvering'),
+                                      'overloadSpeedFactorBonus', src.getModifiedItemAttr('subsystemBonusCaldariPropulsion2'),
+                                      skill='Caldari Propulsion Systems')
+
+
+class Effect6929(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Afterburner') or mod.item.requiresSkill('High Speed Maneuvering'),
+                                      'overloadSpeedFactorBonus', src.getModifiedItemAttr('subsystemBonusGallentePropulsion2'),
+                                      skill='Gallente Propulsion Systems')
+
+
+class Effect6930(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.ship.boostItemAttr('energyWarfareResistance', src.getModifiedItemAttr('subsystemBonusAmarrCore2'), skill='Amarr Core Systems')
+
+
+class Effect6931(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.ship.boostItemAttr('energyWarfareResistance', src.getModifiedItemAttr('subsystemBonusMinmatarCore2'),
+                               skill='Minmatar Core Systems')
+
+
+class Effect6932(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.ship.boostItemAttr('energyWarfareResistance', src.getModifiedItemAttr('subsystemBonusGallenteCore2'),
+                               skill='Gallente Core Systems')
+
+
+class Effect6933(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.ship.boostItemAttr('energyWarfareResistance', src.getModifiedItemAttr('subsystemBonusCaldariCore2'),
+                               skill='Caldari Core Systems')
+
+
+class Effect6934(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.ship.increaseItemAttr('maxLockedTargets', src.getModifiedItemAttr('maxLockedTargetsBonus'))
+
+
+class Effect6935(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name in ('Energy Nosferatu', 'Energy Neutralizer'), 'overloadSelfDurationBonus',
+                                      src.getModifiedItemAttr('subsystemBonusAmarrCore3'), skill='Amarr Core Systems')
+
+
+class Effect6936(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Stasis Web',
+                                      'overloadRangeBonus', src.getModifiedItemAttr('subsystemBonusMinmatarCore3'),
+                                      skill='Minmatar Core Systems')
+
+
+class Effect6937(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Warp Scrambler', 'overloadRangeBonus',
+                                      src.getModifiedItemAttr('subsystemBonusGallenteCore3'), skill='Gallente Core Systems')
+
+
+class Effect6938(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'ECM', 'overloadECMStrengthBonus',
+                                      src.getModifiedItemAttr('subsystemBonusCaldariCore3'), skill='Caldari Core Systems')
+
+
+class Effect6939(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Hull Upgrades'), 'overloadSelfDurationBonus',
+                                      src.getModifiedItemAttr('subsystemBonusAmarrDefensive2'), skill='Amarr Defensive Systems')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Hull Upgrades'), 'overloadHardeningBonus',
+                                      src.getModifiedItemAttr('subsystemBonusAmarrDefensive2'), skill='Amarr Defensive Systems')
+
+
+class Effect6940(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Hull Upgrades'), 'overloadHardeningBonus',
+                                      src.getModifiedItemAttr('subsystemBonusGallenteDefensive2'), skill='Gallente Defensive Systems')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Hull Upgrades'), 'overloadSelfDurationBonus',
+                                      src.getModifiedItemAttr('subsystemBonusGallenteDefensive2'), skill='Gallente Defensive Systems')
+
+
+class Effect6941(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Tactical Shield Manipulation'),
+                                      'overloadHardeningBonus', src.getModifiedItemAttr('subsystemBonusCaldariDefensive2'),
+                                      skill='Caldari Defensive Systems')
+
+
+class Effect6942(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Hull Upgrades'), 'overloadSelfDurationBonus',
+                                      src.getModifiedItemAttr('subsystemBonusMinmatarDefensive2'), skill='Minmatar Defensive Systems')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Hull Upgrades'), 'overloadHardeningBonus',
+                                      src.getModifiedItemAttr('subsystemBonusMinmatarDefensive2'), skill='Minmatar Defensive Systems')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Tactical Shield Manipulation'), 'overloadHardeningBonus',
+                                      src.getModifiedItemAttr('subsystemBonusMinmatarDefensive2'), skill='Minmatar Defensive Systems')
+
+
+class Effect6943(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Repair Systems'),
+                                      'overloadSelfDurationBonus', src.getModifiedItemAttr('subsystemBonusAmarrDefensive3'),
+                                      skill='Amarr Defensive Systems')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Repair Systems'),
+                                      'overloadArmorDamageAmount', src.getModifiedItemAttr('subsystemBonusAmarrDefensive3'),
+                                      skill='Amarr Defensive Systems')
+
+
+class Effect6944(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Repair Systems'),
+                                      'overloadSelfDurationBonus', src.getModifiedItemAttr('subsystemBonusGallenteDefensive3'),
+                                      skill='Gallente Defensive Systems')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Repair Systems'),
+                                      'overloadArmorDamageAmount', src.getModifiedItemAttr('subsystemBonusGallenteDefensive3'),
+                                      skill='Gallente Defensive Systems')
+
+
+class Effect6945(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Shield Operation'),
+                                      'overloadShieldBonus', src.getModifiedItemAttr('subsystemBonusCaldariDefensive3'),
+                                      skill='Caldari Defensive Systems')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Shield Operation'),
+                                      'overloadSelfDurationBonus', src.getModifiedItemAttr('subsystemBonusCaldariDefensive3'),
+                                      skill='Caldari Defensive Systems')
+
+
+class Effect6946(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Repair Systems') or mod.item.requiresSkill('Shield Operation'),
+                                      'overloadArmorDamageAmount', src.getModifiedItemAttr('subsystemBonusMinmatarDefensive3'),
+                                      skill='Minmatar Defensive Systems')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Repair Systems') or mod.item.requiresSkill('Shield Operation'),
+                                      'overloadSelfDurationBonus', src.getModifiedItemAttr('subsystemBonusMinmatarDefensive3'),
+                                      skill='Minmatar Defensive Systems')
+
+
+class Effect6947(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Astrometrics'),
+                                        'baseSensorStrength', src.getModifiedItemAttr('subsystemBonusCaldariDefensive2'),
+                                        skill='Caldari Defensive Systems')
+
+
+class Effect6949(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Astrometrics'), 'baseSensorStrength',
+                                        src.getModifiedItemAttr('subsystemBonusGallenteDefensive2'), skill='Gallente Defensive Systems')
+
+
+class Effect6951(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Astrometrics'), 'baseSensorStrength',
+                                        src.getModifiedItemAttr('subsystemBonusMinmatarDefensive2'), skill='Minmatar Defensive Systems')
+
+
+class Effect6953(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        module.multiplyItemAttr('power', module.getModifiedItemAttr('mediumRemoteRepFittingMultiplier'))
+        module.multiplyItemAttr('cpu', module.getModifiedItemAttr('mediumRemoteRepFittingMultiplier'))
+
+
+class Effect6954(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Leadership'), 'power',
+                                      src.getModifiedItemAttr('subsystemCommandBurstFittingReduction'))
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Leadership'), 'cpu',
+                                      src.getModifiedItemAttr('subsystemCommandBurstFittingReduction'))
+
+
+class Effect6955(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name in ('Remote Shield Booster', 'Ancillary Remote Shield Booster'),
+                                      'falloffEffectiveness', src.getModifiedItemAttr('remoteShieldBoosterFalloffBonus'))
+
+
+class Effect6956(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name in ('Remote Armor Repairer', 'Ancillary Remote Armor Repairer'),
+                                      'maxRange', src.getModifiedItemAttr('remoteArmorRepairerOptimalBonus'))
+
+
+class Effect6957(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name in ('Remote Armor Repairer', 'Ancillary Remote Armor Repairer'),
+                                      'falloffEffectiveness', src.getModifiedItemAttr('remoteArmorRepairerFalloffBonus'))
+
+
+class Effect6958(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Remote Armor Repair Systems'), 'overloadSelfDurationBonus',
+                                      src.getModifiedItemAttr('subsystemBonusAmarrOffensive3'), skill='Amarr Offensive Systems')
+
+
+class Effect6959(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Remote Armor Repair Systems'), 'overloadSelfDurationBonus',
+                                      src.getModifiedItemAttr('subsystemBonusGallenteOffensive3'), skill='Gallente Offensive Systems')
+
+
+class Effect6960(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Shield Emission Systems'),
+                                      'overloadSelfDurationBonus', src.getModifiedItemAttr('subsystemBonusCaldariOffensive3'),
+                                      skill='Caldari Offensive Systems')
+
+
+class Effect6961(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Shield Emission Systems') or mod.item.requiresSkill('Remote Armor Repair Systems'),
+                                      'overloadSelfDurationBonus', src.getModifiedItemAttr('subsystemBonusMinmatarOffensive3'),
+                                      skill='Minmatar Offensive Systems')
+
+
+class Effect6962(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.ship.boostItemAttr('warpSpeedMultiplier', src.getModifiedItemAttr('subsystemBonusAmarrPropulsion2'),
+                               skill='Amarr Propulsion Systems')
+
+
+class Effect6963(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.ship.boostItemAttr('warpSpeedMultiplier', src.getModifiedItemAttr('subsystemBonusMinmatarPropulsion2'),
+                               skill='Minmatar Propulsion Systems')
+
+
+class Effect6964(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.ship.boostItemAttr('baseWarpSpeed', module.getModifiedItemAttr('subsystemBonusGallentePropulsion'),
+                               skill='Gallente Propulsion Systems')
+
+
+class Effect6981(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill('Torpedoes'), 'thermalDamage',
+                                      src.getModifiedItemAttr('shipBonusTitanG1'), skill='Gallente Titan')
+        fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill('Torpedoes'), 'kineticDamage',
+                                      src.getModifiedItemAttr('shipBonusTitanG1'), skill='Gallente Titan')
+        fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill('XL Torpedoes'), 'thermalDamage',
+                                      src.getModifiedItemAttr('shipBonusTitanG1'), skill='Gallente Titan')
+        fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill('XL Torpedoes'), 'kineticDamage',
+                                      src.getModifiedItemAttr('shipBonusTitanG1'), skill='Gallente Titan')
+        fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill('XL Cruise Missiles'), 'thermalDamage',
+                                      src.getModifiedItemAttr('shipBonusTitanG1'), skill='Gallente Titan')
+        fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill('XL Cruise Missiles'), 'kineticDamage',
+                                      src.getModifiedItemAttr('shipBonusTitanG1'), skill='Gallente Titan')
+
+
+class Effect6982(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill('Torpedoes'), 'explosiveDamage',
+                                      src.getModifiedItemAttr('shipBonusTitanG2'), skill='Gallente Titan')
+        fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill('Torpedoes'), 'emDamage',
+                                      src.getModifiedItemAttr('shipBonusTitanG2'), skill='Gallente Titan')
+        fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill('XL Torpedoes'), 'emDamage',
+                                      src.getModifiedItemAttr('shipBonusTitanG2'), skill='Gallente Titan')
+        fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill('XL Torpedoes'), 'explosiveDamage',
+                                      src.getModifiedItemAttr('shipBonusTitanG2'), skill='Gallente Titan')
+        fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill('XL Cruise Missiles'), 'emDamage',
+                                      src.getModifiedItemAttr('shipBonusTitanG2'), skill='Gallente Titan')
+        fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill('XL Cruise Missiles'), 'explosiveDamage',
+                                      src.getModifiedItemAttr('shipBonusTitanG2'), skill='Gallente Titan')
+
+
+class Effect6983(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.ship.boostItemAttr('shieldKineticDamageResonance', src.getModifiedItemAttr('shipBonusTitanC1'), skill='Caldari Titan')
+        fit.ship.boostItemAttr('shieldEmDamageResonance', src.getModifiedItemAttr('shipBonusTitanC1'), skill='Caldari Titan')
+        fit.ship.boostItemAttr('shieldExplosiveDamageResonance', src.getModifiedItemAttr('shipBonusTitanC1'), skill='Caldari Titan')
+        fit.ship.boostItemAttr('shieldThermalDamageResonance', src.getModifiedItemAttr('shipBonusTitanC1'), skill='Caldari Titan')
+
+
+class Effect6984(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill('Fighters'), 'shieldCapacity',
+                                       src.getModifiedItemAttr('shipBonusRole4'))
+        fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill('Fighters'), 'fighterAbilityAttackTurretDamageMultiplier',
+                                       src.getModifiedItemAttr('shipBonusRole4'))
+        fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill('Fighters'), 'fighterAbilityAttackMissileDamageMultiplier',
+                                       src.getModifiedItemAttr('shipBonusRole4'))
+        fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill('Fighters'), 'fighterAbilityMissilesDamageMultiplier',
+                                       src.getModifiedItemAttr('shipBonusRole4'))
+
+
+class Effect6985(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill('Torpedoes'), 'kineticDamage',
+                                      src.getModifiedItemAttr('shipBonusDreadnoughtG1'), skill='Gallente Dreadnought')
+        fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill('Torpedoes'), 'thermalDamage',
+                                      src.getModifiedItemAttr('shipBonusDreadnoughtG1'), skill='Gallente Dreadnought')
+        fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill('XL Torpedoes'), 'kineticDamage',
+                                      src.getModifiedItemAttr('shipBonusDreadnoughtG1'), skill='Gallente Dreadnought')
+        fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill('XL Torpedoes'), 'thermalDamage',
+                                      src.getModifiedItemAttr('shipBonusDreadnoughtG1'), skill='Gallente Dreadnought')
+        fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill('XL Cruise Missiles'), 'thermalDamage',
+                                      src.getModifiedItemAttr('shipBonusDreadnoughtG1'), skill='Gallente Dreadnought')
+        fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill('XL Cruise Missiles'), 'kineticDamage',
+                                      src.getModifiedItemAttr('shipBonusDreadnoughtG1'), skill='Gallente Dreadnought')
+
+
+class Effect6986(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Capital Shield Emission Systems'), 'shieldBonus',
+                                      src.getModifiedItemAttr('shipBonusForceAuxiliaryG1'), skill='Gallente Carrier')
+
+
+class Effect6987(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill('Repair Drone Operation'),
+                                        'structureDamageAmount', src.getModifiedItemAttr('shipBonusRole2'))
+        fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill('Repair Drone Operation'),
+                                        'shieldBonus', src.getModifiedItemAttr('shipBonusRole2'))
+        fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill('Repair Drone Operation'),
+                                        'armorDamageAmount', src.getModifiedItemAttr('shipBonusRole2'))
+        fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill('Repair Drone Operation'),
+                                        'armorHP', src.getModifiedItemAttr('shipBonusRole2'))
+        fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill('Repair Drone Operation'),
+                                        'shieldCapacity', src.getModifiedItemAttr('shipBonusRole2'))
+        fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill('Repair Drone Operation'),
+                                        'hp', src.getModifiedItemAttr('shipBonusRole2'))
+
+
+class Effect6992(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Hybrid Turret'), 'damageMultiplier', src.getModifiedItemAttr('shipBonusRole1'))
+
+
+class Effect6993(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.boosters.filteredItemBoost(lambda mod: mod.item.group.name == 'Booster', 'boosterMissileAOECloudPenalty', src.getModifiedItemAttr('shipBonusRole2'))
+        fit.boosters.filteredItemBoost(lambda mod: mod.item.group.name == 'Booster', 'boosterCapacitorCapacityPenalty', src.getModifiedItemAttr('shipBonusRole2'))
+        fit.boosters.filteredItemBoost(lambda mod: mod.item.group.name == 'Booster', 'boosterAOEVelocityPenalty', src.getModifiedItemAttr('shipBonusRole2'))
+        fit.boosters.filteredItemBoost(lambda mod: mod.item.group.name == 'Booster', 'boosterArmorRepairAmountPenalty', src.getModifiedItemAttr('shipBonusRole2'))
+        fit.boosters.filteredItemBoost(lambda mod: mod.item.group.name == 'Booster', 'boosterMissileVelocityPenalty', src.getModifiedItemAttr('shipBonusRole2'))
+        fit.boosters.filteredItemBoost(lambda mod: mod.item.group.name == 'Booster', 'boosterTurretTrackingPenalty', src.getModifiedItemAttr('shipBonusRole2'))
+        fit.boosters.filteredItemBoost(lambda mod: mod.item.group.name == 'Booster', 'boosterShieldCapacityPenalty', src.getModifiedItemAttr('shipBonusRole2'))
+        fit.boosters.filteredItemBoost(lambda mod: mod.item.group.name == 'Booster', 'boosterTurretOptimalRangePenalty', src.getModifiedItemAttr('shipBonusRole2'))
+        fit.boosters.filteredItemBoost(lambda mod: mod.item.group.name == 'Booster', 'boosterShieldBoostAmountPenalty', src.getModifiedItemAttr('shipBonusRole2'))
+        fit.boosters.filteredItemBoost(lambda mod: mod.item.group.name == 'Booster', 'boosterTurretFalloffPenalty', src.getModifiedItemAttr('shipBonusRole2'))
+        fit.boosters.filteredItemBoost(lambda mod: mod.item.group.name == 'Booster', 'boosterArmorHPPenalty', src.getModifiedItemAttr('shipBonusRole2'))
+        fit.boosters.filteredItemBoost(lambda mod: mod.item.group.name == 'Booster', 'boosterMaxVelocityPenalty', src.getModifiedItemAttr('shipBonusRole2'))
+
+
+class Effect6994(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Hybrid Turret'), 'damageMultiplier',
+                                      src.getModifiedItemAttr('eliteBonusReconShip1'), skill='Recon Ships')
+
+
+class Effect6995(EffectDef):
+
+    type = 'active'
+
+    @staticmethod
+    def handler(fit, module, context):
+        # Set reload time to 1 second
+        module.reloadTime = 1000
+
+
+class Effect6996(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Repair Systems'), 'armorDamageAmount',
+                                      src.getModifiedItemAttr('eliteBonusReconShip3'), skill='Recon Ships')
+
+
+class Effect6997(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Repair Systems'), 'armorDamageAmount',
+                                      src.getModifiedItemAttr('eliteBonusCovertOps4'), skill='Covert Ops')
+
+
+class Effect6999(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemMultiply(lambda mod: mod.item.group.name == 'Missile Launcher Torpedo',
+                                         'cpu', ship.getModifiedItemAttr('stealthBomberLauncherCPU'))
+
+
+class Effect7000(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Small Hybrid Turret'), 'falloff',
+                                      src.getModifiedItemAttr('shipBonusGF'), skill='Gallente Frigate')
+
+
+class Effect7001(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Missile Launcher Torpedo', 'speed', src.getModifiedItemAttr('shipBonusRole1'))
+
+
+class Effect7002(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Bomb Deployment'), 'power', src.getModifiedItemAttr('shipBonusRole3'))
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Bomb Deployment'), 'cpu', src.getModifiedItemAttr('shipBonusRole3'))
+
+
+class Effect7003(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Small Hybrid Turret'), 'damageMultiplier',
+                                      src.getModifiedItemAttr('eliteBonusCovertOps3'), skill='Covert Ops')
+
+
+class Effect7008(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.ship.multiplyItemAttr('shieldCapacity', src.getModifiedItemAttr('structureFullPowerStateHitpointMultiplier') or 0)
+        fit.ship.multiplyItemAttr('armorHP', src.getModifiedItemAttr('structureFullPowerStateHitpointMultiplier') or 0)
+
+
+class Effect7009(EffectDef):
+
+    runTime = 'early'
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.ship.forceItemAttr('structureFullPowerStateHitpointMultiplier', src.getModifiedItemAttr('serviceModuleFullPowerStateHitpointMultiplier'))
+
+
+class Effect7012(EffectDef):
+
+    runTime = 'early'
+    type = 'active'
+
+    @staticmethod
+    def handler(fit, src, context):
+        for layer, attrPrefix in (('shield', 'shield'), ('armor', 'armor'), ('hull', '')):
+            for damageType in ('Kinetic', 'Thermal', 'Explosive', 'Em'):
+                bonus = '%s%sDamageResonance' % (attrPrefix, damageType)
+                bonus = '%s%s' % (bonus[0].lower(), bonus[1:])
+                booster = '%s%sDamageResonance' % (layer, damageType)
+
+                src.forceItemAttr(booster, src.getModifiedItemAttr('resistanceMultiplier'))
+
+
+class Effect7013(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Missile Launcher Operation'), 'kineticDamage',
+                                        src.getModifiedItemAttr('eliteBonusGunship1'), skill='Assault Frigates')
+
+
+class Effect7014(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Missile Launcher Operation'), 'thermalDamage',
+                                        src.getModifiedItemAttr('eliteBonusGunship1'), skill='Assault Frigates')
+
+
+class Effect7015(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Missile Launcher Operation'), 'emDamage',
+                                        src.getModifiedItemAttr('eliteBonusGunship1'), skill='Assault Frigates')
+
+
+class Effect7016(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Missile Launcher Operation'), 'explosiveDamage',
+                                        src.getModifiedItemAttr('eliteBonusGunship1'), skill='Assault Frigates')
+
+
+class Effect7017(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Missile Launcher Operation'), 'aoeVelocity',
+                                        src.getModifiedItemAttr('eliteBonusGunship2'), stackingPenalties=True, skill='Assault Frigates')
+
+
+class Effect7018(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Small Energy Turret'), 'speed',
+                                      src.getModifiedItemAttr('shipBonusAF'), stackingPenalties=False, skill='Amarr Frigate')
+
+
+class Effect7020(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Stasis Web', 'maxRange',
+                                      src.getModifiedItemAttr('stasisWebRangeBonus'), stackingPenalties=False)
+
+
+class Effect7021(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.ship.boostItemAttr('maxTargetRange', module.getModifiedItemAttr('structureRigMaxTargetRangeBonus'))
+
+
+class Effect7024(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill('Drones'), 'trackingSpeed',
+                                     src.getModifiedItemAttr('eliteBonusGunship2'), skill='Assault Frigates')
+
+
+class Effect7026(EffectDef):
+
+    runTime = 'early'
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context, *args, **kwargs):
+        src.boostItemAttr('maxRange', src.getModifiedChargeAttr('warpScrambleRangeBonus'))
+
+
+class Effect7027(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.ship.increaseItemAttr('capacitorCapacity', ship.getModifiedItemAttr('capacitorBonus'))
+
+
+class Effect7028(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.ship.multiplyItemAttr('rechargeRate', module.getModifiedItemAttr('capacitorRechargeRateMultiplier'))
+
+
+class Effect7029(EffectDef):
+
+    runTime = 'early'
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.ship.boostItemAttr('hiddenArmorHPMultiplier', src.getModifiedItemAttr('armorHpBonus'), stackingPenalties=True)
+
+
+class Effect7030(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Structure Guided Bomb Launcher',
+                                      'speed', ship.getModifiedItemAttr('structureAoERoFRoleBonus'))
+        for attr in ['duration', 'durationTargetIlluminationBurstProjector', 'durationWeaponDisruptionBurstProjector',
+                     'durationECMJammerBurstProjector', 'durationSensorDampeningBurstProjector', 'capacitorNeed']:
+            fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Structure Burst Projector',
+                                          attr, ship.getModifiedItemAttr('structureAoERoFRoleBonus'))
+
+
+class Effect7031(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Heavy Missiles'), 'kineticDamage',
+                                        src.getModifiedItemAttr('shipBonusCBC2'), skill='Caldari Battlecruiser')
+
+
+class Effect7032(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Heavy Missiles'), 'thermalDamage',
+                                        src.getModifiedItemAttr('shipBonusCBC2'), skill='Caldari Battlecruiser')
+
+
+class Effect7033(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Heavy Missiles'),
+                                        'emDamage', src.getModifiedItemAttr('shipBonusCBC2'), skill='Caldari Battlecruiser')
+
+
+class Effect7034(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Heavy Missiles'), 'explosiveDamage',
+                                        src.getModifiedItemAttr('shipBonusCBC2'), skill='Caldari Battlecruiser')
+
+
+class Effect7035(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Heavy Assault Missiles'), 'explosiveDamage',
+                                        src.getModifiedItemAttr('shipBonusCBC2'), skill='Caldari Battlecruiser')
+
+
+class Effect7036(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Heavy Assault Missiles'), 'emDamage',
+                                        src.getModifiedItemAttr('shipBonusCBC2'), skill='Caldari Battlecruiser')
+
+
+class Effect7037(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Heavy Assault Missiles'),
+                                        'thermalDamage', src.getModifiedItemAttr('shipBonusCBC2'), skill='Caldari Battlecruiser')
+
+
+class Effect7038(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Heavy Assault Missiles'),
+                                        'kineticDamage', src.getModifiedItemAttr('shipBonusCBC2'), skill='Caldari Battlecruiser')
+
+
+class Effect7039(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        groups = ('Structure Anti-Subcapital Missile', 'Structure Anti-Capital Missile')
+        for dmgType in ('em', 'kinetic', 'explosive', 'thermal'):
+            fit.modules.filteredChargeMultiply(lambda mod: mod.item.group.name in groups,
+                                               '%sDamage' % dmgType,
+                                               src.getModifiedItemAttr('hiddenMissileDamageMultiplier'))
+
+
+class Effect7040(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.ship.multiplyItemAttr('armorHP', src.getModifiedItemAttr('hiddenArmorHPMultiplier') or 0)
+
+
+class Effect7042(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.ship.boostItemAttr('armorHP', src.getModifiedItemAttr('shipBonusAC'), skill='Amarr Cruiser')
+
+
+class Effect7043(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.ship.boostItemAttr('shieldCapacity', src.getModifiedItemAttr('shipBonusCC'), skill='Caldari Cruiser')
+
+
+class Effect7044(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.ship.boostItemAttr('agility', src.getModifiedItemAttr('shipBonusGC'), skill='Gallente Cruiser')
+
+
+class Effect7045(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.ship.boostItemAttr('signatureRadius', src.getModifiedItemAttr('shipBonusMC'), skill='Minmatar Cruiser')
+
+
+class Effect7046(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.ship.boostItemAttr('explosiveDamageResonance', src.getModifiedItemAttr('eliteBonusFlagCruisers1'), skill='Flag Cruisers')
+        fit.ship.boostItemAttr('shieldKineticDamageResonance', src.getModifiedItemAttr('eliteBonusFlagCruisers1'), skill='Flag Cruisers')
+        fit.ship.boostItemAttr('shieldExplosiveDamageResonance', src.getModifiedItemAttr('eliteBonusFlagCruisers1'), skill='Flag Cruisers')
+        fit.ship.boostItemAttr('armorThermalDamageResonance', src.getModifiedItemAttr('eliteBonusFlagCruisers1'), skill='Flag Cruisers')
+        fit.ship.boostItemAttr('thermalDamageResonance', src.getModifiedItemAttr('eliteBonusFlagCruisers1'), skill='Flag Cruisers')
+        fit.ship.boostItemAttr('shieldEmDamageResonance', src.getModifiedItemAttr('eliteBonusFlagCruisers1'), skill='Flag Cruisers')
+        fit.ship.boostItemAttr('armorExplosiveDamageResonance', src.getModifiedItemAttr('eliteBonusFlagCruisers1'), skill='Flag Cruisers')
+        fit.ship.boostItemAttr('armorEmDamageResonance', src.getModifiedItemAttr('eliteBonusFlagCruisers1'), skill='Flag Cruisers')
+        fit.ship.boostItemAttr('shieldThermalDamageResonance', src.getModifiedItemAttr('eliteBonusFlagCruisers1'), skill='Flag Cruisers')
+        fit.ship.boostItemAttr('kineticDamageResonance', src.getModifiedItemAttr('eliteBonusFlagCruisers1'), skill='Flag Cruisers')
+        fit.ship.boostItemAttr('armorKineticDamageResonance', src.getModifiedItemAttr('eliteBonusFlagCruisers1'), skill='Flag Cruisers')
+        fit.ship.boostItemAttr('emDamageResonance', src.getModifiedItemAttr('eliteBonusFlagCruisers1'), skill='Flag Cruisers')
+
+
+class Effect7047(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name in ('Propulsion Module', 'Micro Jump Drive'),
+                                      'power', src.getModifiedItemAttr('flagCruiserFittingBonusPropMods'))
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name in ('Propulsion Module', 'Micro Jump Drive'),
+                                      'cpu', src.getModifiedItemAttr('flagCruiserFittingBonusPropMods'))
+
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name in ('Target Painter', 'Scan Probe Launcher'),
+                                      'cpu', src.getModifiedItemAttr('flagCruiserFittingBonusPainterProbes'))
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name in ('Target Painter', 'Scan Probe Launcher'),
+                                      'power', src.getModifiedItemAttr('flagCruiserFittingBonusPainterProbes'))
+
+
+class Effect7050(EffectDef):
+
+    runTime = 'early'
+    type = ('projected', 'passive', 'gang')
+
+    @staticmethod
+    def handler(fit, beacon, context, **kwargs):
+        for x in range(1, 3):
+            if beacon.getModifiedItemAttr('warfareBuff{}ID'.format(x)):
+                value = beacon.getModifiedItemAttr('warfareBuff{}Value'.format(x))
+                id = beacon.getModifiedItemAttr('warfareBuff{}ID'.format(x))
+
+                if id:
+                    fit.addCommandBonus(id, value, beacon, kwargs['effect'], 'early')
+
+
+class Effect7051(EffectDef):
+
+    runTime = 'early'
+    type = ('projected', 'passive', 'gang')
+
+    @staticmethod
+    def handler(fit, beacon, context, **kwargs):
+        for x in range(1, 3):
+            if beacon.getModifiedItemAttr('warfareBuff{}ID'.format(x)):
+                value = beacon.getModifiedItemAttr('warfareBuff{}Value'.format(x))
+                id = beacon.getModifiedItemAttr('warfareBuff{}ID'.format(x))
+
+                if id:
+                    fit.addCommandBonus(id, value, beacon, kwargs['effect'], 'early')
+
+
+class Effect7052(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Target Painter', 'signatureRadiusBonus',
+                                      src.getModifiedItemAttr('targetPainterStrengthModifierFlagCruisers'))
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Target Painter', 'maxRange',
+                                      src.getModifiedItemAttr('targetPainterRangeModifierFlagCruisers'))
+
+
+class Effect7055(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Large Hybrid Turret'), 'damageMultiplier',
+                                      src.getModifiedItemAttr('shipBonusRole7'))
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Large Projectile Turret'), 'damageMultiplier',
+                                      src.getModifiedItemAttr('shipBonusRole7'))
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Large Energy Turret'), 'damageMultiplier',
+                                      src.getModifiedItemAttr('shipBonusRole7'))
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Heavy Missiles'), 'thermalDamage',
+                                        src.getModifiedItemAttr('shipBonusRole7'))
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Heavy Missiles'), 'emDamage',
+                                        src.getModifiedItemAttr('shipBonusRole7'))
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Heavy Missiles'), 'kineticDamage',
+                                        src.getModifiedItemAttr('shipBonusRole7'))
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Heavy Missiles'), 'explosiveDamage',
+                                        src.getModifiedItemAttr('shipBonusRole7'))
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Torpedoes'), 'emDamage',
+                                        src.getModifiedItemAttr('shipBonusRole7'))
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Torpedoes'), 'kineticDamage',
+                                        src.getModifiedItemAttr('shipBonusRole7'))
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Torpedoes'), 'explosiveDamage',
+                                        src.getModifiedItemAttr('shipBonusRole7'))
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Torpedoes'), 'thermalDamage',
+                                        src.getModifiedItemAttr('shipBonusRole7'))
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Cruise Missiles'), 'thermalDamage',
+                                        src.getModifiedItemAttr('shipBonusRole7'))
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Cruise Missiles'), 'explosiveDamage',
+                                        src.getModifiedItemAttr('shipBonusRole7'))
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Cruise Missiles'), 'kineticDamage',
+                                        src.getModifiedItemAttr('shipBonusRole7'))
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Cruise Missiles'), 'emDamage',
+                                        src.getModifiedItemAttr('shipBonusRole7'))
+
+
+class Effect7058(EffectDef):
+
+    runTime = 'early'
+    type = ('projected', 'passive', 'gang')
+
+    @staticmethod
+    def handler(fit, beacon, context, **kwargs):
+        for x in range(1, 3):
+            if beacon.getModifiedItemAttr('warfareBuff{}ID'.format(x)):
+                value = beacon.getModifiedItemAttr('warfareBuff{}Value'.format(x))
+                id = beacon.getModifiedItemAttr('warfareBuff{}ID'.format(x))
+
+                if id:
+                    fit.addCommandBonus(id, value, beacon, kwargs['effect'], 'early')
+
+
+class Effect7059(EffectDef):
+
+    runTime = 'early'
+    type = ('projected', 'passive', 'gang')
+
+    @staticmethod
+    def handler(fit, beacon, context, **kwargs):
+        for x in range(1, 3):
+            if beacon.getModifiedItemAttr('warfareBuff{}ID'.format(x)):
+                value = beacon.getModifiedItemAttr('warfareBuff{}Value'.format(x))
+                id = beacon.getModifiedItemAttr('warfareBuff{}ID'.format(x))
+
+                if id:
+                    fit.addCommandBonus(id, value, beacon, kwargs['effect'], 'early')
+
+
+class Effect7060(EffectDef):
+
+    runTime = 'early'
+    type = ('projected', 'passive', 'gang')
+
+    @staticmethod
+    def handler(fit, beacon, context, **kwargs):
+        for x in range(1, 5):
+            if beacon.getModifiedItemAttr('warfareBuff{}ID'.format(x)):
+                value = beacon.getModifiedItemAttr('warfareBuff{}Value'.format(x))
+                id = beacon.getModifiedItemAttr('warfareBuff{}ID'.format(x))
+                if id:
+                    fit.addCommandBonus(id, value, beacon, kwargs['effect'], 'early')
+
+
+class Effect7061(EffectDef):
+
+    runTime = 'early'
+    type = ('projected', 'passive', 'gang')
+
+    @staticmethod
+    def handler(fit, beacon, context, **kwargs):
+        for x in range(1, 3):
+            if beacon.getModifiedItemAttr('warfareBuff{}ID'.format(x)):
+                value = beacon.getModifiedItemAttr('warfareBuff{}Value'.format(x))
+                id = beacon.getModifiedItemAttr('warfareBuff{}ID'.format(x))
+
+                if id:
+                    fit.addCommandBonus(id, value, beacon, kwargs['effect'], 'early')
+
+
+class Effect7062(EffectDef):
+
+    runTime = 'early'
+    type = ('projected', 'passive', 'gang')
+
+    @staticmethod
+    def handler(fit, beacon, context, **kwargs):
+        for x in range(1, 3):
+            if beacon.getModifiedItemAttr('warfareBuff{}ID'.format(x)):
+                value = beacon.getModifiedItemAttr('warfareBuff{}Value'.format(x))
+                id = beacon.getModifiedItemAttr('warfareBuff{}ID'.format(x))
+
+                if id:
+                    fit.addCommandBonus(id, value, beacon, kwargs['effect'], 'early')
+
+
+class Effect7063(EffectDef):
+
+    runTime = 'early'
+    type = ('projected', 'passive', 'gang')
+
+    @staticmethod
+    def handler(fit, beacon, context, **kwargs):
+        for x in range(1, 3):
+            if beacon.getModifiedItemAttr('warfareBuff{}ID'.format(x)):
+                value = beacon.getModifiedItemAttr('warfareBuff{}Value'.format(x))
+                id = beacon.getModifiedItemAttr('warfareBuff{}ID'.format(x))
+
+                if id:
+                    fit.addCommandBonus(id, value, beacon, kwargs['effect'], 'early')
+
+
+class Effect7064(EffectDef):
+
+    runTime = 'early'
+    type = ('projected', 'passive')
+
+
+class Effect7071(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context):
+        level = container.level if 'skill' in context else 1
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Small Precursor Weapon'),
+                                      'damageMultiplier', container.getModifiedItemAttr('damageMultiplierBonus') * level)
+
+
+class Effect7072(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context):
+        level = container.level if 'skill' in context else 1
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Precursor Weapon'),
+                                      'damageMultiplier', container.getModifiedItemAttr('damageMultiplierBonus') * level)
+
+
+class Effect7073(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context):
+        level = container.level if 'skill' in context else 1
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Large Precursor Weapon'),
+                                      'damageMultiplier', container.getModifiedItemAttr('damageMultiplierBonus') * level)
+
+
+class Effect7074(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context):
+        level = container.level if 'skill' in context else 1
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Small Disintegrator Specialization'),
+                                      'damageMultiplier', container.getModifiedItemAttr('damageMultiplierBonus') * level)
+
+
+class Effect7075(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context):
+        level = container.level if 'skill' in context else 1
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Disintegrator Specialization'),
+                                      'damageMultiplier', container.getModifiedItemAttr('damageMultiplierBonus') * level)
+
+
+class Effect7076(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context):
+        level = container.level if 'skill' in context else 1
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Large Disintegrator Specialization'),
+                                      'damageMultiplier', container.getModifiedItemAttr('damageMultiplierBonus') * level)
+
+
+class Effect7077(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.modules.filteredItemMultiply(lambda mod: mod.item.group.name == 'Precursor Weapon',
+                                         'damageMultiplier', module.getModifiedItemAttr('damageMultiplier'),
+                                         stackingPenalties=True)
+
+
+class Effect7078(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.modules.filteredItemMultiply(lambda mod: mod.item.group.name == 'Precursor Weapon',
+                                         'speed', module.getModifiedItemAttr('speedMultiplier'),
+                                         stackingPenalties=True)
+
+
+class Effect7079(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Large Precursor Weapon'),
+                                      'speed', ship.getModifiedItemAttr('shipBonusPBS1'), skill='Precursor Battleship')
+
+
+class Effect7080(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Large Precursor Weapon'),
+                                      'damageMultiplier', ship.getModifiedItemAttr('shipBonusPBS2'), skill='Precursor Battleship')
+
+
+class Effect7085(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Precursor Weapon'),
+                                      'damageMultiplier', ship.getModifiedItemAttr('shipBonusPC1'), skill='Precursor Cruiser')
+
+
+class Effect7086(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Precursor Weapon'),
+                                      'trackingSpeed', ship.getModifiedItemAttr('shipBonusPC2'), skill='Precursor Cruiser')
+
+
+class Effect7087(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Small Precursor Weapon'),
+                                      'maxRange', ship.getModifiedItemAttr('shipBonusPF2'), skill='Precursor Frigate')
+
+
+class Effect7088(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Small Precursor Weapon'),
+                                      'damageMultiplier', ship.getModifiedItemAttr('shipBonusPF1'), skill='Precursor Frigate')
+
+
+class Effect7091(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Capacitor Emission Systems'), 'capacitorNeed', src.getModifiedItemAttr('shipBonusRole2'))
+
+
+class Effect7092(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Remote Armor Repair Systems'),
+                                      'capacitorNeed', ship.getModifiedItemAttr('shipBonusRole2'))
+
+
+class Effect7093(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Energy Pulse Weapons'),
+                                      'capacitorNeed', ship.getModifiedItemAttr('shipBonusRole2'))
+
+
+class Effect7094(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Remote Armor Repair Systems'),
+                                      'maxRange', ship.getModifiedItemAttr('shipBonusRole1'))
+
+
+class Effect7097(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, skill, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Precursor Weapon',
+                                      'damageMultiplier', skill.getModifiedItemAttr('damageMultiplierBonus') * skill.level)
+
+
+class Effect7111(EffectDef):
+
+    runTime = 'early'
+    type = ('projected', 'passive')
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.modules.filteredItemMultiply(lambda mod: mod.item.requiresSkill('Small Precursor Weapon'),
+                                         'damageMultiplier', module.getModifiedItemAttr('smallWeaponDamageMultiplier'),
+                                         stackingPenalties=True)
+
+
+class Effect7112(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Energy Neutralizer', 'capacitorNeed',
+                                      src.getModifiedItemAttr('shipBonusRole2'))
+
+
+class Effect7116(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Astrometrics'), 'baseSensorStrength',
+                                        src.getModifiedItemAttr('eliteBonusReconShip2'), skill='Recon Ships')
+
+
+class Effect7117(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.ship.boostItemAttr('warpSpeedMultiplier', src.getModifiedItemAttr('shipRoleBonusWarpSpeed'))
+
+
+class Effect7118(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemIncrease(lambda mod: mod.item.requiresSkill('Small Precursor Weapon'), 'damageMultiplierBonusPerCycle',
+                                         src.getModifiedItemAttr('eliteBonusCovertOps3'), skill='Covert Ops')
+
+
+class Effect7119(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemIncrease(lambda mod: mod.item.requiresSkill('Medium Precursor Weapon'), 'damageMultiplierBonusPerCycle',
+                                         src.getModifiedItemAttr('eliteBonusReconShip3'), skill='Recon Ships')
+
+
+class Effect7142(EffectDef):
+
+    type = 'active'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.ship.increaseItemAttr('warpScrambleStatus', src.getModifiedItemAttr('warpScrambleStrength'))
+        fit.ship.boostItemAttr('mass', src.getModifiedItemAttr('massBonusPercentage'), stackingPenalties=True)
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Afterburner'), 'speedFactor',
+                                      src.getModifiedItemAttr('speedFactorBonus'), stackingPenalties=True)
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Afterburner'), 'speedBoostFactor',
+                                      src.getModifiedItemAttr('speedBoostFactorBonus'))
+        fit.modules.filteredItemIncrease(lambda mod: mod.item.requiresSkill('High Speed Maneuvering'), 'activationBlocked',
+                                         src.getModifiedItemAttr('activationBlockedStrenght'))
+        fit.ship.boostItemAttr('maxVelocity', src.getModifiedItemAttr('maxVelocityBonus'), stackingPenalties=True)
+
+
+class Effect7154(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Small Precursor Weapon'),
+                                      'damageMultiplier', ship.getModifiedItemAttr('shipBonusPD1'),
+                                      skill='Precursor Destroyer')
+
+
+class Effect7155(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Precursor Weapon'),
+                                      'damageMultiplier', ship.getModifiedItemAttr('shipBonusPBC1'),
+                                      skill='Precursor Battlecruiser')
+
+
+class Effect7156(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Small Precursor Weapon'),
+                                      'maxRange', ship.getModifiedItemAttr('maxRangeBonus'))
+
+
+class Effect7157(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Small Precursor Weapon'),
+                                      'maxRange', ship.getModifiedItemAttr('shipBonusPD2'),
+                                      skill='Precursor Destroyer')
+
+
+class Effect7158(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.ship.boostItemAttr('armorKineticDamageResonance', ship.getModifiedItemAttr('shipBonusPBC2'),
+                               skill='Precursor Battlecruiser')
+
+
+class Effect7159(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.ship.boostItemAttr('armorThermalDamageResonance', ship.getModifiedItemAttr('shipBonusPBC2'),
+                               skill='Precursor Battlecruiser')
+
+
+class Effect7160(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.ship.boostItemAttr('armorEmDamageResonance', ship.getModifiedItemAttr('shipBonusPBC2'),
+                               skill='Precursor Battlecruiser')
+
+
+class Effect7161(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.ship.boostItemAttr('armorExplosiveDamageResonance', ship.getModifiedItemAttr('shipBonusPBC2'),
+                               skill='Precursor Battlecruiser')
+
+
+class Effect7162(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Precursor Weapon'),
+                                      'maxRange', ship.getModifiedItemAttr('roleBonusCBC'))
+
+
+class Effect7166(EffectDef):
+
+    runTime = 'late'
+    type = 'projected', 'active'
+
+    @staticmethod
+    def handler(fit, container, context, **kwargs):
+        if 'projected' in context:
+            repAmountBase = container.getModifiedItemAttr('armorDamageAmount')
+            cycleTime = container.getModifiedItemAttr('duration') / 1000.0
+            repSpoolMax = container.getModifiedItemAttr('repairMultiplierBonusMax')
+            repSpoolPerCycle = container.getModifiedItemAttr('repairMultiplierBonusPerCycle')
+            defaultSpoolValue = eos.config.settings['globalDefaultSpoolupPercentage']
+            spoolType, spoolAmount = resolveSpoolOptions(SpoolOptions(SpoolType.SCALE, defaultSpoolValue, False), container)
+            rps = repAmountBase * (1 + calculateSpoolup(repSpoolMax, repSpoolPerCycle, cycleTime, spoolType, spoolAmount)[0]) / cycleTime
+            rpsPreSpool = repAmountBase * (1 + calculateSpoolup(repSpoolMax, repSpoolPerCycle, cycleTime, SpoolType.SCALE, 0)[0]) / cycleTime
+            rpsFullSpool = repAmountBase * (1 + calculateSpoolup(repSpoolMax, repSpoolPerCycle, cycleTime, SpoolType.SCALE, 1)[0]) / cycleTime
+            fit.extraAttributes.increase('armorRepair', rps, **kwargs)
+            fit.extraAttributes.increase('armorRepairPreSpool', rpsPreSpool, **kwargs)
+            fit.extraAttributes.increase('armorRepairFullSpool', rpsFullSpool, **kwargs)
+
+
+class Effect7167(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Remote Capacitor Transmitter', 'maxRange', src.getModifiedItemAttr('shipBonusRole1'))
+
+
+class Effect7168(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Mutadaptive Remote Armor Repairer', 'maxRange', src.getModifiedItemAttr('shipBonusRole3'))
+
+
+class Effect7169(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Mutadaptive Remote Armor Repairer', 'armorDamageAmount', src.getModifiedItemAttr('shipBonusPC1'), skill='Precursor Cruiser')
+
+
+class Effect7170(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Mutadaptive Remote Armor Repairer', 'capacitorNeed', src.getModifiedItemAttr('shipBonusPC2'), skill='Precursor Cruiser')
+
+
+class Effect7171(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Mutadaptive Remote Armor Repairer', 'maxRange', src.getModifiedItemAttr('shipBonusPC1'), skill='Precursor Cruiser')
+
+
+class Effect7172(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Mutadaptive Remote Armor Repairer', 'capacitorNeed', src.getModifiedItemAttr('eliteBonusLogistics1'), skill='Logistics Cruisers')
+
+
+class Effect7173(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Mutadaptive Remote Armor Repairer', 'armorDamageAmount', src.getModifiedItemAttr('eliteBonusLogistics2'), skill='Logistics Cruisers')
+
+
+class Effect7176(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill('Drones'), 'damageMultiplier',
+                                     src.getModifiedItemAttr('damageMultiplierBonus'))
+
+
+class Effect7177(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill('Drones'), 'hp',
+                                     src.getModifiedItemAttr('hullHpBonus'))
+        fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill('Drones'), 'armorHP',
+                                     src.getModifiedItemAttr('armorHpBonus'))
+        fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill('Drones'), 'shieldCapacity',
+                                     src.getModifiedItemAttr('shieldCapacityBonus'))
+
+
+class Effect7179(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Strip Miner',
+                                      'duration', module.getModifiedItemAttr('miningDurationMultiplier'))
+
+
+class Effect7180(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Mining Laser',
+                                      'duration', module.getModifiedItemAttr('miningDurationMultiplier'))
+
+
+class Effect7183(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Warp Scrambler', 'maxRange',
+                                      src.getModifiedItemAttr('warpScrambleRangeBonus'), stackingPenalties=False)
diff --git a/eos/effects/__init__.py b/eos/effects/__init__.py
deleted file mode 100644
index daa8ffc73..000000000
--- a/eos/effects/__init__.py
+++ /dev/null
@@ -1,19 +0,0 @@
-# ===============================================================================
-# Copyright (C) 2010 Diego Duclos
-#               2010 Anton Vorobyov
-#
-# This file, as well as all files in this folder, are part of eos.
-#
-# eos is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License as published by
-# the Free Software Foundation, either version 2 of the License, or
-# (at your option) any later version.
-#
-# eos is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public License
-# along with eos.  If not, see <http://www.gnu.org/licenses/>.
-# ===============================================================================
diff --git a/eos/effects/effect10.py b/eos/effects/effect10.py
deleted file mode 100644
index c0057acc5..000000000
--- a/eos/effects/effect10.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# targetAttack
-#
-# Used by:
-# Drones from group: Combat Drone (75 of 75)
-# Modules from group: Energy Weapon (212 of 214)
-type = 'active'
-
-
-def handler(fit, module, context):
-    # Set reload time to 1 second
-    module.reloadTime = 1000
diff --git a/eos/effects/effect1001.py b/eos/effects/effect1001.py
deleted file mode 100644
index ddce4507c..000000000
--- a/eos/effects/effect1001.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# eliteBonusGunshipCapRecharge2
-#
-# Used by:
-# Ship: Vengeance
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.ship.boostItemAttr("rechargeRate", ship.getModifiedItemAttr("eliteBonusGunship2"), skill="Assault Frigates")
diff --git a/eos/effects/effect1003.py b/eos/effects/effect1003.py
deleted file mode 100644
index 92a516038..000000000
--- a/eos/effects/effect1003.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# selfT2SmallLaserPulseDamageBonus
-#
-# Used by:
-# Skill: Small Pulse Laser Specialization
-type = "passive"
-
-
-def handler(fit, skill, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Pulse Laser Specialization"),
-                                  "damageMultiplier", skill.getModifiedItemAttr("damageMultiplierBonus") * skill.level)
diff --git a/eos/effects/effect1004.py b/eos/effects/effect1004.py
deleted file mode 100644
index b6cd4b2fd..000000000
--- a/eos/effects/effect1004.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# selfT2SmallLaserBeamDamageBonus
-#
-# Used by:
-# Skill: Small Beam Laser Specialization
-type = "passive"
-
-
-def handler(fit, skill, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Beam Laser Specialization"),
-                                  "damageMultiplier", skill.getModifiedItemAttr("damageMultiplierBonus") * skill.level)
diff --git a/eos/effects/effect1005.py b/eos/effects/effect1005.py
deleted file mode 100644
index 3bc3b79c1..000000000
--- a/eos/effects/effect1005.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# selfT2SmallHybridBlasterDamageBonus
-#
-# Used by:
-# Skill: Small Blaster Specialization
-type = "passive"
-
-
-def handler(fit, skill, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Blaster Specialization"),
-                                  "damageMultiplier", skill.getModifiedItemAttr("damageMultiplierBonus") * skill.level)
diff --git a/eos/effects/effect1006.py b/eos/effects/effect1006.py
deleted file mode 100644
index 8da445f83..000000000
--- a/eos/effects/effect1006.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# selfT2SmallHybridRailDamageBonus
-#
-# Used by:
-# Skill: Small Railgun Specialization
-type = "passive"
-
-
-def handler(fit, skill, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Railgun Specialization"),
-                                  "damageMultiplier", skill.getModifiedItemAttr("damageMultiplierBonus") * skill.level)
diff --git a/eos/effects/effect1007.py b/eos/effects/effect1007.py
deleted file mode 100644
index d86b1ed90..000000000
--- a/eos/effects/effect1007.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# selfT2SmallProjectileACDamageBonus
-#
-# Used by:
-# Skill: Small Autocannon Specialization
-type = "passive"
-
-
-def handler(fit, skill, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Autocannon Specialization"),
-                                  "damageMultiplier", skill.getModifiedItemAttr("damageMultiplierBonus") * skill.level)
diff --git a/eos/effects/effect1008.py b/eos/effects/effect1008.py
deleted file mode 100644
index 52510d1cb..000000000
--- a/eos/effects/effect1008.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# selfT2SmallProjectileArtyDamageBonus
-#
-# Used by:
-# Skill: Small Artillery Specialization
-type = "passive"
-
-
-def handler(fit, skill, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Artillery Specialization"),
-                                  "damageMultiplier", skill.getModifiedItemAttr("damageMultiplierBonus") * skill.level)
diff --git a/eos/effects/effect1009.py b/eos/effects/effect1009.py
deleted file mode 100644
index 021493979..000000000
--- a/eos/effects/effect1009.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# selfT2MediumLaserPulseDamageBonus
-#
-# Used by:
-# Skill: Medium Pulse Laser Specialization
-type = "passive"
-
-
-def handler(fit, skill, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Pulse Laser Specialization"),
-                                  "damageMultiplier", skill.getModifiedItemAttr("damageMultiplierBonus") * skill.level)
diff --git a/eos/effects/effect101.py b/eos/effects/effect101.py
deleted file mode 100644
index 7376dd563..000000000
--- a/eos/effects/effect101.py
+++ /dev/null
@@ -1,32 +0,0 @@
-# useMissiles
-#
-# Used by:
-# Modules from group: Missile Launcher Heavy (12 of 12)
-# Modules from group: Missile Launcher Rocket (15 of 15)
-# Modules named like: Launcher (154 of 154)
-# Structure Modules named like: Standup Launcher (7 of 7)
-type = 'active', "projected"
-
-
-def handler(fit, src, context):
-    # Set reload time to 10 seconds
-    src.reloadTime = 10000
-
-    if "projected" in context:
-        if src.item.group.name == 'Missile Launcher Bomb':
-            # Bomb Launcher Cooldown Timer
-            moduleReactivationDelay = src.getModifiedItemAttr("moduleReactivationDelay")
-            speed = src.getModifiedItemAttr("speed")
-
-            # Void and Focused Void Bombs
-            neutAmount = src.getModifiedChargeAttr("energyNeutralizerAmount")
-
-            if moduleReactivationDelay and neutAmount and speed:
-                fit.addDrain(src, speed + moduleReactivationDelay, neutAmount, 0)
-
-            # Lockbreaker Bombs
-            ecmStrengthBonus = src.getModifiedChargeAttr("scan{0}StrengthBonus".format(fit.scanType))
-
-            if ecmStrengthBonus:
-                strModifier = 1 - ecmStrengthBonus / fit.scanStrength
-                fit.ecmProjectedStr *= strModifier
diff --git a/eos/effects/effect1010.py b/eos/effects/effect1010.py
deleted file mode 100644
index e509d73de..000000000
--- a/eos/effects/effect1010.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# selfT2MediumLaserBeamDamageBonus
-#
-# Used by:
-# Skill: Medium Beam Laser Specialization
-type = "passive"
-
-
-def handler(fit, skill, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Beam Laser Specialization"),
-                                  "damageMultiplier", skill.getModifiedItemAttr("damageMultiplierBonus") * skill.level)
diff --git a/eos/effects/effect1011.py b/eos/effects/effect1011.py
deleted file mode 100644
index ca7dffdf5..000000000
--- a/eos/effects/effect1011.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# selfT2MediumHybridBlasterDamageBonus
-#
-# Used by:
-# Skill: Medium Blaster Specialization
-type = "passive"
-
-
-def handler(fit, skill, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Blaster Specialization"),
-                                  "damageMultiplier", skill.getModifiedItemAttr("damageMultiplierBonus") * skill.level)
diff --git a/eos/effects/effect1012.py b/eos/effects/effect1012.py
deleted file mode 100644
index 77b6c5abb..000000000
--- a/eos/effects/effect1012.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# selfT2MediumHybridRailDamageBonus
-#
-# Used by:
-# Skill: Medium Railgun Specialization
-type = "passive"
-
-
-def handler(fit, skill, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Railgun Specialization"),
-                                  "damageMultiplier", skill.getModifiedItemAttr("damageMultiplierBonus") * skill.level)
diff --git a/eos/effects/effect1013.py b/eos/effects/effect1013.py
deleted file mode 100644
index a18d3914a..000000000
--- a/eos/effects/effect1013.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# selfT2MediumProjectileACDamageBonus
-#
-# Used by:
-# Skill: Medium Autocannon Specialization
-type = "passive"
-
-
-def handler(fit, skill, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Autocannon Specialization"),
-                                  "damageMultiplier", skill.getModifiedItemAttr("damageMultiplierBonus") * skill.level)
diff --git a/eos/effects/effect1014.py b/eos/effects/effect1014.py
deleted file mode 100644
index 8b091e5d8..000000000
--- a/eos/effects/effect1014.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# selfT2MediumProjectileArtyDamageBonus
-#
-# Used by:
-# Skill: Medium Artillery Specialization
-type = "passive"
-
-
-def handler(fit, skill, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Artillery Specialization"),
-                                  "damageMultiplier", skill.getModifiedItemAttr("damageMultiplierBonus") * skill.level)
diff --git a/eos/effects/effect1015.py b/eos/effects/effect1015.py
deleted file mode 100644
index 4714dd913..000000000
--- a/eos/effects/effect1015.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# selfT2LargeLaserPulseDamageBonus
-#
-# Used by:
-# Skill: Large Pulse Laser Specialization
-type = "passive"
-
-
-def handler(fit, skill, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Large Pulse Laser Specialization"),
-                                  "damageMultiplier", skill.getModifiedItemAttr("damageMultiplierBonus") * skill.level)
diff --git a/eos/effects/effect1016.py b/eos/effects/effect1016.py
deleted file mode 100644
index 0a4cbafde..000000000
--- a/eos/effects/effect1016.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# selfT2LargeLaserBeamDamageBonus
-#
-# Used by:
-# Skill: Large Beam Laser Specialization
-type = "passive"
-
-
-def handler(fit, skill, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Large Beam Laser Specialization"),
-                                  "damageMultiplier", skill.getModifiedItemAttr("damageMultiplierBonus") * skill.level)
diff --git a/eos/effects/effect1017.py b/eos/effects/effect1017.py
deleted file mode 100644
index 929509540..000000000
--- a/eos/effects/effect1017.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# selfT2LargeHybridBlasterDamageBonus
-#
-# Used by:
-# Skill: Large Blaster Specialization
-type = "passive"
-
-
-def handler(fit, skill, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Large Blaster Specialization"),
-                                  "damageMultiplier", skill.getModifiedItemAttr("damageMultiplierBonus") * skill.level)
diff --git a/eos/effects/effect1018.py b/eos/effects/effect1018.py
deleted file mode 100644
index 6742d22d8..000000000
--- a/eos/effects/effect1018.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# selfT2LargeHybridRailDamageBonus
-#
-# Used by:
-# Skill: Large Railgun Specialization
-type = "passive"
-
-
-def handler(fit, skill, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Large Railgun Specialization"),
-                                  "damageMultiplier", skill.getModifiedItemAttr("damageMultiplierBonus") * skill.level)
diff --git a/eos/effects/effect1019.py b/eos/effects/effect1019.py
deleted file mode 100644
index 0b3e4c6e3..000000000
--- a/eos/effects/effect1019.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# selfT2LargeProjectileACDamageBonus
-#
-# Used by:
-# Skill: Large Autocannon Specialization
-type = "passive"
-
-
-def handler(fit, skill, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Large Autocannon Specialization"),
-                                  "damageMultiplier", skill.getModifiedItemAttr("damageMultiplierBonus") * skill.level)
diff --git a/eos/effects/effect1020.py b/eos/effects/effect1020.py
deleted file mode 100644
index 245a64866..000000000
--- a/eos/effects/effect1020.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# selfT2LargeProjectileArtyDamageBonus
-#
-# Used by:
-# Skill: Large Artillery Specialization
-type = "passive"
-
-
-def handler(fit, skill, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Large Artillery Specialization"),
-                                  "damageMultiplier", skill.getModifiedItemAttr("damageMultiplierBonus") * skill.level)
diff --git a/eos/effects/effect1021.py b/eos/effects/effect1021.py
deleted file mode 100644
index 2b5b31e5d..000000000
--- a/eos/effects/effect1021.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# eliteBonusGunshipHybridDmg2
-#
-# Used by:
-# Ship: Harpy
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Hybrid Turret"),
-                                  "damageMultiplier", ship.getModifiedItemAttr("eliteBonusGunship2"),
-                                  skill="Assault Frigates")
diff --git a/eos/effects/effect1024.py b/eos/effects/effect1024.py
deleted file mode 100644
index aaf6de930..000000000
--- a/eos/effects/effect1024.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipMissileHeavyVelocityBonusCC2
-#
-# Used by:
-# Ship: Caracal
-# Ship: Osprey Navy Issue
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Missiles"),
-                                    "maxVelocity", ship.getModifiedItemAttr("shipBonusCC2"), skill="Caldari Cruiser")
diff --git a/eos/effects/effect1025.py b/eos/effects/effect1025.py
deleted file mode 100644
index 32a307ef8..000000000
--- a/eos/effects/effect1025.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipMissileLightVelocityBonusCC2
-#
-# Used by:
-# Ship: Caracal
-# Ship: Osprey Navy Issue
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Light Missiles"),
-                                    "maxVelocity", ship.getModifiedItemAttr("shipBonusCC2"), skill="Caldari Cruiser")
diff --git a/eos/effects/effect1030.py b/eos/effects/effect1030.py
deleted file mode 100644
index 73ff83db6..000000000
--- a/eos/effects/effect1030.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# remoteArmorSystemsCapNeedBonusPostPercentCapacitorNeedLocationShipModulesRequiringRemoteArmorSystems
-#
-# Used by:
-# Implants named like: Inherent Implants 'Noble' Remote Armor Repair Systems RA (6 of 6)
-# Modules named like: Remote Repair Augmentor (6 of 8)
-# Skill: Remote Armor Repair Systems
-type = "passive"
-
-
-def handler(fit, container, context):
-    level = container.level if "skill" in context else 1
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Remote Armor Repair Systems"),
-                                  "capacitorNeed", container.getModifiedItemAttr("capNeedBonus") * level)
diff --git a/eos/effects/effect1033.py b/eos/effects/effect1033.py
deleted file mode 100644
index 2c954a502..000000000
--- a/eos/effects/effect1033.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# eliteBonusLogisticRemoteArmorRepairCapNeed1
-#
-# Used by:
-# Ship: Oneiros
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Remote Armor Repair Systems"), "capacitorNeed",
-                                  src.getModifiedItemAttr("eliteBonusLogistics1"), skill="Logistics Cruisers")
diff --git a/eos/effects/effect1034.py b/eos/effects/effect1034.py
deleted file mode 100644
index bb031021b..000000000
--- a/eos/effects/effect1034.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# eliteBonusLogisticRemoteArmorRepairCapNeed2
-#
-# Used by:
-# Ship: Guardian
-# Ship: Rabisu
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Remote Armor Repair Systems"), "capacitorNeed",
-                                  src.getModifiedItemAttr("eliteBonusLogistics2"), skill="Logistics Cruisers")
diff --git a/eos/effects/effect1035.py b/eos/effects/effect1035.py
deleted file mode 100644
index 81b94ee96..000000000
--- a/eos/effects/effect1035.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# eliteBonusLogisticShieldTransferCapNeed2
-#
-# Used by:
-# Ship: Scimitar
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Emission Systems"), "capacitorNeed",
-                                  src.getModifiedItemAttr("eliteBonusLogistics2"), skill="Logistics Cruisers")
diff --git a/eos/effects/effect1036.py b/eos/effects/effect1036.py
deleted file mode 100644
index 3060ef3be..000000000
--- a/eos/effects/effect1036.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# eliteBonusLogisticShieldTransferCapNeed1
-#
-# Used by:
-# Ship: Basilisk
-# Ship: Etana
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Emission Systems"), "capacitorNeed",
-                                  src.getModifiedItemAttr("eliteBonusLogistics1"), skill="Logistics Cruisers")
diff --git a/eos/effects/effect1046.py b/eos/effects/effect1046.py
deleted file mode 100644
index 737631924..000000000
--- a/eos/effects/effect1046.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipRemoteArmorRangeGC1
-#
-# Used by:
-# Ship: Oneiros
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Remote Armor Repair Systems"), "maxRange",
-                                  src.getModifiedItemAttr("shipBonusGC"), skill="Gallente Cruiser")
diff --git a/eos/effects/effect1047.py b/eos/effects/effect1047.py
deleted file mode 100644
index 05e10ee65..000000000
--- a/eos/effects/effect1047.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipRemoteArmorRangeAC2
-#
-# Used by:
-# Ship: Guardian
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Remote Armor Repair Systems"), "maxRange",
-                                  src.getModifiedItemAttr("shipBonusAC2"), skill="Amarr Cruiser")
diff --git a/eos/effects/effect1048.py b/eos/effects/effect1048.py
deleted file mode 100644
index fc9ef4cfd..000000000
--- a/eos/effects/effect1048.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipShieldTransferRangeCC1
-#
-# Used by:
-# Ship: Basilisk
-# Ship: Etana
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Emission Systems"), "maxRange",
-                                  src.getModifiedItemAttr("shipBonusCC"), skill="Caldari Cruiser")
diff --git a/eos/effects/effect1049.py b/eos/effects/effect1049.py
deleted file mode 100644
index f7096dea4..000000000
--- a/eos/effects/effect1049.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipShieldTransferRangeMC2
-#
-# Used by:
-# Ship: Scimitar
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Emission Systems"), "maxRange",
-                                  src.getModifiedItemAttr("shipBonusMC2"), skill="Minmatar Cruiser")
diff --git a/eos/effects/effect1056.py b/eos/effects/effect1056.py
deleted file mode 100644
index 1c697dcd9..000000000
--- a/eos/effects/effect1056.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# eliteBonusHeavyGunshipHybridOptimal1
-#
-# Used by:
-# Ship: Eagle
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Hybrid Turret"),
-                                  "maxRange", ship.getModifiedItemAttr("eliteBonusHeavyGunship1"),
-                                  skill="Heavy Assault Cruisers")
diff --git a/eos/effects/effect1057.py b/eos/effects/effect1057.py
deleted file mode 100644
index 4d9a93161..000000000
--- a/eos/effects/effect1057.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# eliteBonusHeavyGunshipProjectileOptimal1
-#
-# Used by:
-# Ship: Muninn
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Projectile Turret"),
-                                  "maxRange", ship.getModifiedItemAttr("eliteBonusHeavyGunship1"),
-                                  skill="Heavy Assault Cruisers")
diff --git a/eos/effects/effect1058.py b/eos/effects/effect1058.py
deleted file mode 100644
index 8b292f824..000000000
--- a/eos/effects/effect1058.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# eliteBonusHeavyGunshipLaserOptimal1
-#
-# Used by:
-# Ship: Zealot
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Energy Turret"),
-                                  "maxRange", ship.getModifiedItemAttr("eliteBonusHeavyGunship1"),
-                                  skill="Heavy Assault Cruisers")
diff --git a/eos/effects/effect1060.py b/eos/effects/effect1060.py
deleted file mode 100644
index 310bc6bb1..000000000
--- a/eos/effects/effect1060.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# eliteBonusHeavyGunshipProjectileFallOff1
-#
-# Used by:
-# Ship: Vagabond
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Projectile Turret"),
-                                  "falloff", ship.getModifiedItemAttr("eliteBonusHeavyGunship1"),
-                                  skill="Heavy Assault Cruisers")
diff --git a/eos/effects/effect1061.py b/eos/effects/effect1061.py
deleted file mode 100644
index c2cfc53cb..000000000
--- a/eos/effects/effect1061.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# eliteBonusHeavyGunshipHybridDmg2
-#
-# Used by:
-# Ship: Deimos
-# Ship: Eagle
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Hybrid Turret"),
-                                  "damageMultiplier", ship.getModifiedItemAttr("eliteBonusHeavyGunship2"),
-                                  skill="Heavy Assault Cruisers")
diff --git a/eos/effects/effect1062.py b/eos/effects/effect1062.py
deleted file mode 100644
index fb52f881d..000000000
--- a/eos/effects/effect1062.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# eliteBonusHeavyGunshipLaserDmg2
-#
-# Used by:
-# Ship: Zealot
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Energy Turret"),
-                                  "damageMultiplier", ship.getModifiedItemAttr("eliteBonusHeavyGunship2"),
-                                  skill="Heavy Assault Cruisers")
diff --git a/eos/effects/effect1063.py b/eos/effects/effect1063.py
deleted file mode 100644
index a4f3e915b..000000000
--- a/eos/effects/effect1063.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# eliteBonusHeavyGunshipProjectileTracking2
-#
-# Used by:
-# Ship: Muninn
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Projectile Turret"),
-                                  "trackingSpeed", ship.getModifiedItemAttr("eliteBonusHeavyGunship2"),
-                                  skill="Heavy Assault Cruisers")
diff --git a/eos/effects/effect1080.py b/eos/effects/effect1080.py
deleted file mode 100644
index 11e858e78..000000000
--- a/eos/effects/effect1080.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# eliteBonusHeavyGunshipHybridFallOff1
-#
-# Used by:
-# Ship: Deimos
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Hybrid Turret"),
-                                  "falloff", ship.getModifiedItemAttr("eliteBonusHeavyGunship1"),
-                                  skill="Heavy Assault Cruisers")
diff --git a/eos/effects/effect1081.py b/eos/effects/effect1081.py
deleted file mode 100644
index 3e2799483..000000000
--- a/eos/effects/effect1081.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# eliteBonusHeavyGunshipHeavyMissileFlightTime1
-#
-# Used by:
-# Ship: Cerberus
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Missiles"),
-                                    "explosionDelay", ship.getModifiedItemAttr("eliteBonusHeavyGunship1"),
-                                    skill="Heavy Assault Cruisers")
diff --git a/eos/effects/effect1082.py b/eos/effects/effect1082.py
deleted file mode 100644
index c4244df02..000000000
--- a/eos/effects/effect1082.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# eliteBonusHeavyGunshipLightMissileFlightTime1
-#
-# Used by:
-# Ship: Cerberus
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Light Missiles"),
-                                    "explosionDelay", ship.getModifiedItemAttr("eliteBonusHeavyGunship1"),
-                                    skill="Heavy Assault Cruisers")
diff --git a/eos/effects/effect1084.py b/eos/effects/effect1084.py
deleted file mode 100644
index 8c2a95017..000000000
--- a/eos/effects/effect1084.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# eliteBonusHeavyGunshipDroneControlRange1
-#
-# Used by:
-# Ship: Ishtar
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.extraAttributes.increase("droneControlRange", ship.getModifiedItemAttr("eliteBonusHeavyGunship1"),
-                                 skill="Heavy Assault Cruisers")
diff --git a/eos/effects/effect1087.py b/eos/effects/effect1087.py
deleted file mode 100644
index 92a9f9049..000000000
--- a/eos/effects/effect1087.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# eliteBonusHeavyGunshipProjectileDmg2
-#
-# Used by:
-# Ship: Vagabond
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Projectile Turret"),
-                                  "damageMultiplier", ship.getModifiedItemAttr("eliteBonusHeavyGunship2"),
-                                  skill="Heavy Assault Cruisers")
diff --git a/eos/effects/effect1099.py b/eos/effects/effect1099.py
deleted file mode 100644
index 588b6c7ff..000000000
--- a/eos/effects/effect1099.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# shipProjectileTrackingMF2
-#
-# Used by:
-# Variations of ship: Slasher (3 of 3)
-# Ship: Republic Fleet Firetail
-# Ship: Wolf
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Projectile Turret"),
-                                  "trackingSpeed", ship.getModifiedItemAttr("shipBonusMF2"), skill="Minmatar Frigate")
diff --git a/eos/effects/effect1176.py b/eos/effects/effect1176.py
deleted file mode 100644
index ef24601d2..000000000
--- a/eos/effects/effect1176.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# accerationControlSkillAb&MwdSpeedBoost
-#
-# Used by:
-# Implant: Zor's Custom Navigation Hyper-Link
-# Skill: Acceleration Control
-type = "passive"
-
-
-def handler(fit, container, context):
-    level = container.level if "skill" in context else 1
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Propulsion Module",
-                                  "speedFactor", container.getModifiedItemAttr("speedFBonus") * level)
diff --git a/eos/effects/effect1179.py b/eos/effects/effect1179.py
deleted file mode 100644
index 198854651..000000000
--- a/eos/effects/effect1179.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# eliteBonusGunshipLaserDamage2
-#
-# Used by:
-# Ship: Retribution
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Energy Turret"),
-                                  "damageMultiplier", ship.getModifiedItemAttr("eliteBonusGunship2"),
-                                  skill="Assault Frigates")
diff --git a/eos/effects/effect118.py b/eos/effects/effect118.py
deleted file mode 100644
index 9e1f52524..000000000
--- a/eos/effects/effect118.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# electronicAttributeModifyOnline
-#
-# Used by:
-# Modules from group: Automated Targeting System (6 of 6)
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.ship.increaseItemAttr("maxLockedTargets", module.getModifiedItemAttr("maxLockedTargetsBonus"))
diff --git a/eos/effects/effect1181.py b/eos/effects/effect1181.py
deleted file mode 100644
index 14d95aae6..000000000
--- a/eos/effects/effect1181.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# eliteBonusLogisticEnergyTransferCapNeed1
-#
-# Used by:
-# Ship: Guardian
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Remote Capacitor Transmitter",
-                                  "capacitorNeed", ship.getModifiedItemAttr("eliteBonusLogistics1"),
-                                  skill="Logistics Cruisers")
diff --git a/eos/effects/effect1182.py b/eos/effects/effect1182.py
deleted file mode 100644
index 95b5cac92..000000000
--- a/eos/effects/effect1182.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipEnergyTransferRange1
-#
-# Used by:
-# Ship: Guardian
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Remote Capacitor Transmitter",
-                                  "maxRange", ship.getModifiedItemAttr("shipBonusAC"), skill="Amarr Cruiser")
diff --git a/eos/effects/effect1183.py b/eos/effects/effect1183.py
deleted file mode 100644
index a18cb0a34..000000000
--- a/eos/effects/effect1183.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# eliteBonusLogisticEnergyTransferCapNeed2
-#
-# Used by:
-# Ship: Basilisk
-# Ship: Etana
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Remote Capacitor Transmitter",
-                                  "capacitorNeed", ship.getModifiedItemAttr("eliteBonusLogistics2"),
-                                  skill="Logistics Cruisers")
diff --git a/eos/effects/effect1184.py b/eos/effects/effect1184.py
deleted file mode 100644
index 3f65366f2..000000000
--- a/eos/effects/effect1184.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipEnergyTransferRange2
-#
-# Used by:
-# Ship: Basilisk
-# Ship: Etana
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Remote Capacitor Transmitter",
-                                  "maxRange", ship.getModifiedItemAttr("shipBonusCC2"), skill="Caldari Cruiser")
diff --git a/eos/effects/effect1185.py b/eos/effects/effect1185.py
deleted file mode 100644
index c7e19707f..000000000
--- a/eos/effects/effect1185.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# structureStealthEmitterArraySigDecrease
-#
-# Used by:
-# Implants named like: X Instinct Booster (4 of 4)
-# Implants named like: grade Halo (15 of 18)
-type = "passive"
-
-
-def handler(fit, implant, context):
-    fit.ship.boostItemAttr("signatureRadius", implant.getModifiedItemAttr("signatureRadiusBonus"))
diff --git a/eos/effects/effect1190.py b/eos/effects/effect1190.py
deleted file mode 100644
index 7066cba7b..000000000
--- a/eos/effects/effect1190.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# iceHarvestCycleTimeModulesRequiringIceHarvesting
-#
-# Used by:
-# Implants named like: Inherent Implants 'Yeti' Ice Harvesting IH (3 of 3)
-# Module: Medium Ice Harvester Accelerator I
-# Skill: Ice Harvesting
-type = "passive"
-
-
-def handler(fit, container, context):
-    level = container.level if "skill" in context else 1
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Ice Harvesting"),
-                                  "duration", container.getModifiedItemAttr("iceHarvestCycleBonus") * level)
diff --git a/eos/effects/effect1200.py b/eos/effects/effect1200.py
deleted file mode 100644
index c8a6c04f3..000000000
--- a/eos/effects/effect1200.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# miningInfoMultiplier
-#
-# Used by:
-# Charges from group: Mining Crystal (40 of 40)
-# Charges named like: Mining Crystal (42 of 42)
-type = "passive"
-
-
-def handler(fit, module, context):
-    module.multiplyItemAttr("specialtyMiningAmount",
-                            module.getModifiedChargeAttr("specialisationAsteroidYieldMultiplier"))
-    # module.multiplyItemAttr("miningAmount", module.getModifiedChargeAttr("specialisationAsteroidYieldMultiplier"))
diff --git a/eos/effects/effect1212.py b/eos/effects/effect1212.py
deleted file mode 100644
index 68a126d49..000000000
--- a/eos/effects/effect1212.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# crystalMiningamountInfo2
-#
-# Used by:
-# Modules from group: Frequency Mining Laser (3 of 3)
-type = "passive"
-runTime = "late"
-
-def handler(fit, module, context):
-    module.preAssignItemAttr("specialtyMiningAmount", module.getModifiedItemAttr("miningAmount"))
diff --git a/eos/effects/effect1215.py b/eos/effects/effect1215.py
deleted file mode 100644
index 429fd4b91..000000000
--- a/eos/effects/effect1215.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# shipEnergyDrainAmountAF1
-#
-# Used by:
-# Ship: Caedes
-# Ship: Cruor
-# Ship: Sentinel
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Nosferatu",
-                                  "powerTransferAmount", ship.getModifiedItemAttr("shipBonusAF"), skill="Amarr Frigate")
diff --git a/eos/effects/effect1218.py b/eos/effects/effect1218.py
deleted file mode 100644
index a9a7fb9eb..000000000
--- a/eos/effects/effect1218.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# shipBonusPirateSmallHybridDmg
-#
-# Used by:
-# Ship: Daredevil
-# Ship: Hecate
-# Ship: Sunesis
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Hybrid Turret"),
-                                  "damageMultiplier", ship.getModifiedItemAttr("shipBonusRole7"))
diff --git a/eos/effects/effect1219.py b/eos/effects/effect1219.py
deleted file mode 100644
index 288f21609..000000000
--- a/eos/effects/effect1219.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipEnergyVampireTransferAmountBonusAB
-#
-# Used by:
-# Ship: Bhaalgorn
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Nosferatu",
-                                  "powerTransferAmount", ship.getModifiedItemAttr("shipBonusAB"),
-                                  skill="Amarr Battleship")
diff --git a/eos/effects/effect1220.py b/eos/effects/effect1220.py
deleted file mode 100644
index f9a831cf3..000000000
--- a/eos/effects/effect1220.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# shipEnergyVampireTransferAmountBonusAc
-#
-# Used by:
-# Ship: Ashimmu
-# Ship: Rabisu
-# Ship: Vangel
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Nosferatu",
-                                  "powerTransferAmount", ship.getModifiedItemAttr("shipBonusAC"), skill="Amarr Cruiser")
diff --git a/eos/effects/effect1221.py b/eos/effects/effect1221.py
deleted file mode 100644
index b7513bbda..000000000
--- a/eos/effects/effect1221.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipStasisWebRangeBonusMB
-#
-# Used by:
-# Ship: Bhaalgorn
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Stasis Web",
-                                  "maxRange", ship.getModifiedItemAttr("shipBonusMB"), skill="Minmatar Battleship")
diff --git a/eos/effects/effect1222.py b/eos/effects/effect1222.py
deleted file mode 100644
index 3b43a9b64..000000000
--- a/eos/effects/effect1222.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipStasisWebRangeBonusMC2
-#
-# Used by:
-# Ship: Ashimmu
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Stasis Web",
-                                  "maxRange", ship.getModifiedItemAttr("shipBonusMC2"), skill="Minmatar Cruiser")
diff --git a/eos/effects/effect1228.py b/eos/effects/effect1228.py
deleted file mode 100644
index f4f73849f..000000000
--- a/eos/effects/effect1228.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipProjectileTrackingGF
-#
-# Used by:
-# Ship: Chremoas
-# Ship: Dramiel
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Projectile Turret"),
-                                  "trackingSpeed", ship.getModifiedItemAttr("shipBonusGF"), skill="Gallente Frigate")
diff --git a/eos/effects/effect1230.py b/eos/effects/effect1230.py
deleted file mode 100644
index 16c3df09c..000000000
--- a/eos/effects/effect1230.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# shipMissileVelocityPirateFactionFrigate
-#
-# Used by:
-# Ship: Barghest
-# Ship: Garmur
-# Ship: Orthrus
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"),
-                                    "maxVelocity", ship.getModifiedItemAttr("shipBonusRole7"))
diff --git a/eos/effects/effect1232.py b/eos/effects/effect1232.py
deleted file mode 100644
index 25a500674..000000000
--- a/eos/effects/effect1232.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipProjectileRofPirateCruiser
-#
-# Used by:
-# Ship: Cynabal
-# Ship: Moracha
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Projectile Turret"),
-                                  "speed", ship.getModifiedItemAttr("shipBonusRole7"))
diff --git a/eos/effects/effect1233.py b/eos/effects/effect1233.py
deleted file mode 100644
index 7d01b20c6..000000000
--- a/eos/effects/effect1233.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipHybridDmgPirateCruiser
-#
-# Used by:
-# Ship: Gnosis
-# Ship: Vigilant
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Hybrid Turret"),
-                                  "damageMultiplier", ship.getModifiedItemAttr("shipBonusRole7"))
diff --git a/eos/effects/effect1234.py b/eos/effects/effect1234.py
deleted file mode 100644
index 1cea02ec3..000000000
--- a/eos/effects/effect1234.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipMissileVelocityPirateFactionLight
-#
-# Used by:
-# Ship: Corax
-# Ship: Talwar
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Light Missiles"),
-                                    "maxVelocity", ship.getModifiedItemAttr("shipBonusRole7"))
diff --git a/eos/effects/effect1239.py b/eos/effects/effect1239.py
deleted file mode 100644
index 9b0a7168f..000000000
--- a/eos/effects/effect1239.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipProjectileRofPirateBattleship
-#
-# Used by:
-# Ship: Machariel
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Large Projectile Turret"),
-                                  "speed", ship.getModifiedItemAttr("shipBonusRole7"))
diff --git a/eos/effects/effect1240.py b/eos/effects/effect1240.py
deleted file mode 100644
index 417ed58aa..000000000
--- a/eos/effects/effect1240.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipHybridDmgPirateBattleship
-#
-# Used by:
-# Ship: Vindicator
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Large Hybrid Turret"),
-                                  "damageMultiplier", ship.getModifiedItemAttr("shipBonusRole7"))
diff --git a/eos/effects/effect1255.py b/eos/effects/effect1255.py
deleted file mode 100644
index 2b318f6f9..000000000
--- a/eos/effects/effect1255.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# setBonusBloodraider
-#
-# Used by:
-# Implants named like: grade Talisman (18 of 18)
-runTime = "early"
-type = "passive"
-
-
-def handler(fit, implant, context):
-    fit.appliedImplants.filteredItemMultiply(lambda mod: mod.item.group.name == "Cyberimplant",
-                                             "durationBonus", implant.getModifiedItemAttr("implantSetBloodraider"))
diff --git a/eos/effects/effect1256.py b/eos/effects/effect1256.py
deleted file mode 100644
index 81d37c598..000000000
--- a/eos/effects/effect1256.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# setBonusBloodraiderNosferatu
-#
-# Used by:
-# Implants named like: grade Talisman (15 of 18)
-type = "passive"
-
-
-def handler(fit, implant, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capacitor Emission Systems"),
-                                  "duration", implant.getModifiedItemAttr("durationBonus"))
diff --git a/eos/effects/effect1261.py b/eos/effects/effect1261.py
deleted file mode 100644
index 96f1048f5..000000000
--- a/eos/effects/effect1261.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# setBonusSerpentis
-#
-# Used by:
-# Implants named like: grade Snake (18 of 18)
-runTime = "early"
-type = "passive"
-
-
-def handler(fit, implant, context):
-    fit.appliedImplants.filteredItemMultiply(lambda mod: mod.item.group.name == "Cyberimplant",
-                                             "velocityBonus", implant.getModifiedItemAttr("implantSetSerpentis"))
diff --git a/eos/effects/effect1264.py b/eos/effects/effect1264.py
deleted file mode 100644
index c13c7bdea..000000000
--- a/eos/effects/effect1264.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# interceptor2HybridTracking
-#
-# Used by:
-# Ship: Taranis
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Hybrid Turret"),
-                                  "trackingSpeed", ship.getModifiedItemAttr("eliteBonusInterceptor2"),
-                                  skill="Interceptors")
diff --git a/eos/effects/effect1268.py b/eos/effects/effect1268.py
deleted file mode 100644
index bc71ac1e2..000000000
--- a/eos/effects/effect1268.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# interceptor2LaserTracking
-#
-# Used by:
-# Ship: Crusader
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Energy Turret"),
-                                  "trackingSpeed", ship.getModifiedItemAttr("eliteBonusInterceptor2"),
-                                  skill="Interceptors")
diff --git a/eos/effects/effect1281.py b/eos/effects/effect1281.py
deleted file mode 100644
index b94832ca0..000000000
--- a/eos/effects/effect1281.py
+++ /dev/null
@@ -1,14 +0,0 @@
-# structuralAnalysisEffect
-#
-# Used by:
-# Implants named like: Inherent Implants 'Noble' Repair Proficiency RP (6 of 6)
-# Modules named like: Auxiliary Nano Pump (8 of 8)
-# Implant: Imperial Navy Modified 'Noble' Implant
-type = "passive"
-
-
-def handler(fit, container, context):
-    penalized = "implant" not in context
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Repair Systems"),
-                                  "armorDamageAmount", container.getModifiedItemAttr("repairBonus"),
-                                  stackingPenalties=penalized)
diff --git a/eos/effects/effect1318.py b/eos/effects/effect1318.py
deleted file mode 100644
index 1af9d30f4..000000000
--- a/eos/effects/effect1318.py
+++ /dev/null
@@ -1,16 +0,0 @@
-# ewSkillScanStrengthBonus
-#
-# Used by:
-# Modules named like: Particle Dispersion Augmentor (8 of 8)
-# Skill: Signal Dispersion
-type = "passive"
-
-
-def handler(fit, container, context):
-    groups = ("ECM", "Burst Jammer")
-    level = container.level if "skill" in context else 1
-    for scanType in ("Gravimetric", "Ladar", "Magnetometric", "Radar"):
-        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name in groups,
-                                      "scan{0}StrengthBonus".format(scanType),
-                                      container.getModifiedItemAttr("scanSkillEwStrengthBonus") * level,
-                                      stackingPenalties=False if "skill" in context else True)
diff --git a/eos/effects/effect1360.py b/eos/effects/effect1360.py
deleted file mode 100644
index e7f0f80cb..000000000
--- a/eos/effects/effect1360.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# ewSkillRsdCapNeedBonusSkillLevel
-#
-# Used by:
-# Implants named like: Zainou 'Gypsy' Sensor Linking SL (6 of 6)
-# Skill: Sensor Linking
-type = "passive"
-
-
-def handler(fit, container, context):
-    level = container.level if "skill" in context else 1
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Sensor Linking"),
-                                  "capacitorNeed", container.getModifiedItemAttr("capNeedBonus") * level)
diff --git a/eos/effects/effect1361.py b/eos/effects/effect1361.py
deleted file mode 100644
index 88e084361..000000000
--- a/eos/effects/effect1361.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# ewSkillTdCapNeedBonusSkillLevel
-#
-# Used by:
-# Implants named like: Zainou 'Gypsy' Weapon Disruption WD (6 of 6)
-# Skill: Weapon Disruption
-type = "passive"
-
-
-def handler(fit, container, context):
-    level = container.level if "skill" in context else 1
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Weapon Disruption"),
-                                  "capacitorNeed", container.getModifiedItemAttr("capNeedBonus") * level)
diff --git a/eos/effects/effect1370.py b/eos/effects/effect1370.py
deleted file mode 100644
index 720cea451..000000000
--- a/eos/effects/effect1370.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# ewSkillTpCapNeedBonusSkillLevel
-#
-# Used by:
-# Implants named like: Zainou 'Gypsy' Target Painting TG (6 of 6)
-# Skill: Target Painting
-type = "passive"
-
-
-def handler(fit, container, context):
-    level = container.level if "skill" in context else 1
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Target Painting"),
-                                  "capacitorNeed", container.getModifiedItemAttr("capNeedBonus") * level)
diff --git a/eos/effects/effect1372.py b/eos/effects/effect1372.py
deleted file mode 100644
index 6b1a25c5d..000000000
--- a/eos/effects/effect1372.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# ewSkillEwCapNeedSkillLevel
-#
-# Used by:
-# Implants named like: Zainou 'Gypsy' Electronic Warfare EW (6 of 6)
-# Modules named like: Signal Disruption Amplifier (8 of 8)
-# Skill: Electronic Warfare
-type = "passive"
-
-
-def handler(fit, container, context):
-    level = container.level if "skill" in context else 1
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "ECM",
-                                  "capacitorNeed", container.getModifiedItemAttr("capNeedBonus") * level)
diff --git a/eos/effects/effect1395.py b/eos/effects/effect1395.py
deleted file mode 100644
index 182c04acf..000000000
--- a/eos/effects/effect1395.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shieldBoostAmplifierPassive
-#
-# Used by:
-# Implants named like: grade Crystal (15 of 18)
-type = "passive"
-
-
-def handler(fit, container, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Operation"),
-                                  "shieldBonus", container.getModifiedItemAttr("shieldBoostMultiplier"))
diff --git a/eos/effects/effect1397.py b/eos/effects/effect1397.py
deleted file mode 100644
index 18a708dc1..000000000
--- a/eos/effects/effect1397.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# setBonusGuristas
-#
-# Used by:
-# Implants named like: grade Crystal (18 of 18)
-runTime = "early"
-type = "passive"
-
-
-def handler(fit, implant, context):
-    fit.appliedImplants.filteredItemMultiply(lambda mod: mod.item.group.name == "Cyberimplant",
-                                             "shieldBoostMultiplier", implant.getModifiedItemAttr("implantSetGuristas"))
diff --git a/eos/effects/effect1409.py b/eos/effects/effect1409.py
deleted file mode 100644
index 16c26d373..000000000
--- a/eos/effects/effect1409.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# systemScanDurationSkillAstrometrics
-#
-# Used by:
-# Implants named like: Poteque 'Prospector' Astrometric Acquisition AQ (3 of 3)
-# Skill: Astrometric Acquisition
-# Skill: Astrometrics
-type = "passive"
-
-
-def handler(fit, container, context):
-    level = container.level if "skill" in context else 1
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Astrometrics"),
-                                  "duration", container.getModifiedItemAttr("durationBonus") * level)
diff --git a/eos/effects/effect1410.py b/eos/effects/effect1410.py
deleted file mode 100644
index 80cacae21..000000000
--- a/eos/effects/effect1410.py
+++ /dev/null
@@ -1,14 +0,0 @@
-# propulsionSkillCapNeedBonusSkillLevel
-#
-# Used by:
-# Implants named like: Zainou 'Gypsy' Propulsion Jamming PJ (6 of 6)
-# Skill: Propulsion Jamming
-type = "passive"
-
-
-def handler(fit, container, context):
-
-    level = container.level if "skill" in context else 1
-
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Propulsion Jamming"),
-                                  "capacitorNeed", container.getModifiedItemAttr("capNeedBonus") * level)
diff --git a/eos/effects/effect1412.py b/eos/effects/effect1412.py
deleted file mode 100644
index 5129958e9..000000000
--- a/eos/effects/effect1412.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusHybridOptimalCB
-#
-# Used by:
-# Ship: Rokh
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Large Hybrid Turret"),
-                                  "maxRange", ship.getModifiedItemAttr("shipBonusCB"), skill="Caldari Battleship")
diff --git a/eos/effects/effect1434.py b/eos/effects/effect1434.py
deleted file mode 100644
index 48bdccb60..000000000
--- a/eos/effects/effect1434.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# caldariShipEwStrengthCB
-#
-# Used by:
-# Ship: Scorpion
-type = "passive"
-
-
-def handler(fit, ship, context):
-    for sensorType in ("Gravimetric", "Ladar", "Magnetometric", "Radar"):
-        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Electronic Warfare"),
-                                      "scan{0}StrengthBonus".format(sensorType),
-                                      ship.getModifiedItemAttr("shipBonusCB"), stackingPenalties=True,
-                                      skill="Caldari Battleship")
diff --git a/eos/effects/effect1441.py b/eos/effects/effect1441.py
deleted file mode 100644
index f595eed45..000000000
--- a/eos/effects/effect1441.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# caldariShipEwOptimalRangeCB3
-#
-# Used by:
-# Ship: Scorpion
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "ECM",
-                                  "maxRange", ship.getModifiedItemAttr("shipBonusCB3"), skill="Caldari Battleship")
diff --git a/eos/effects/effect1442.py b/eos/effects/effect1442.py
deleted file mode 100644
index 0c0362a85..000000000
--- a/eos/effects/effect1442.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# caldariShipEwOptimalRangeCC2
-#
-# Used by:
-# Ship: Blackbird
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "ECM",
-                                  "maxRange", ship.getModifiedItemAttr("shipBonusCC2"), skill="Caldari Cruiser")
diff --git a/eos/effects/effect1443.py b/eos/effects/effect1443.py
deleted file mode 100644
index 05a33ec43..000000000
--- a/eos/effects/effect1443.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# caldariShipEwCapacitorNeedCC
-#
-# Used by:
-# Ship: Chameleon
-# Ship: Falcon
-# Ship: Rook
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "ECM",
-                                  "capacitorNeed", ship.getModifiedItemAttr("shipBonusCC"), skill="Caldari Cruiser")
diff --git a/eos/effects/effect1445.py b/eos/effects/effect1445.py
deleted file mode 100644
index a0d8a7db7..000000000
--- a/eos/effects/effect1445.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# ewSkillRsdMaxRangeBonus
-#
-# Used by:
-# Modules named like: Particle Dispersion Projector (8 of 8)
-# Skill: Long Distance Jamming
-type = "passive"
-
-
-def handler(fit, container, context):
-    level = container.level if "skill" in context else 1
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Sensor Linking"),
-                                  "maxRange", container.getModifiedItemAttr("rangeSkillBonus") * level,
-                                  stackingPenalties="skill" not in context)
diff --git a/eos/effects/effect1446.py b/eos/effects/effect1446.py
deleted file mode 100644
index 901d4c45b..000000000
--- a/eos/effects/effect1446.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# ewSkillTpMaxRangeBonus
-#
-# Used by:
-# Modules named like: Particle Dispersion Projector (8 of 8)
-# Skill: Long Distance Jamming
-type = "passive"
-
-
-def handler(fit, container, context):
-    level = container.level if "skill" in context else 1
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Target Painter",
-                                  "maxRange", container.getModifiedItemAttr("rangeSkillBonus") * level,
-                                  stackingPenalties="skill" not in context)
diff --git a/eos/effects/effect1448.py b/eos/effects/effect1448.py
deleted file mode 100644
index 1ed5b55d5..000000000
--- a/eos/effects/effect1448.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# ewSkillTdMaxRangeBonus
-#
-# Used by:
-# Modules named like: Particle Dispersion Projector (8 of 8)
-# Skill: Long Distance Jamming
-type = "passive"
-
-
-def handler(fit, container, context):
-    level = container.level if "skill" in context else 1
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Weapon Disruptor",
-                                  "maxRange", container.getModifiedItemAttr("rangeSkillBonus") * level,
-                                  stackingPenalties="skill" not in context)
diff --git a/eos/effects/effect1449.py b/eos/effects/effect1449.py
deleted file mode 100644
index 21ab67c21..000000000
--- a/eos/effects/effect1449.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# ewSkillRsdFallOffBonus
-#
-# Used by:
-# Skill: Frequency Modulation
-type = "passive"
-
-
-def handler(fit, skill, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Sensor Linking"),
-                                  "falloffEffectiveness", skill.getModifiedItemAttr("falloffBonus") * skill.level)
diff --git a/eos/effects/effect1450.py b/eos/effects/effect1450.py
deleted file mode 100644
index 38eebe10a..000000000
--- a/eos/effects/effect1450.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# ewSkillTpFallOffBonus
-#
-# Used by:
-# Skill: Frequency Modulation
-type = "passive"
-
-
-def handler(fit, skill, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Target Painter",
-                                  "falloffEffectiveness", skill.getModifiedItemAttr("falloffBonus") * skill.level)
diff --git a/eos/effects/effect1451.py b/eos/effects/effect1451.py
deleted file mode 100644
index 6b1490fc6..000000000
--- a/eos/effects/effect1451.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# ewSkillTdFallOffBonus
-#
-# Used by:
-# Skill: Frequency Modulation
-type = "passive"
-
-
-def handler(fit, skill, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Weapon Disruptor",
-                                  "falloffEffectiveness", skill.getModifiedItemAttr("falloffBonus") * skill.level)
diff --git a/eos/effects/effect1452.py b/eos/effects/effect1452.py
deleted file mode 100644
index 68cbc4d83..000000000
--- a/eos/effects/effect1452.py
+++ /dev/null
@@ -1,14 +0,0 @@
-# ewSkillEwMaxRangeBonus
-#
-# Used by:
-# Implants named like: grade Centurion (10 of 12)
-# Modules named like: Particle Dispersion Projector (8 of 8)
-# Skill: Long Distance Jamming
-type = "passive"
-
-
-def handler(fit, container, context):
-    level = container.level if "skill" in context else 1
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "ECM",
-                                  "maxRange", container.getModifiedItemAttr("rangeSkillBonus") * level,
-                                  stackingPenalties="skill" not in context and "implant" not in context)
diff --git a/eos/effects/effect1453.py b/eos/effects/effect1453.py
deleted file mode 100644
index 931a640f6..000000000
--- a/eos/effects/effect1453.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# ewSkillEwFallOffBonus
-#
-# Used by:
-# Skill: Frequency Modulation
-type = "passive"
-
-
-def handler(fit, skill, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "ECM",
-                                  "falloffEffectiveness", skill.getModifiedItemAttr("falloffBonus") * skill.level)
diff --git a/eos/effects/effect1472.py b/eos/effects/effect1472.py
deleted file mode 100644
index 0e3bfdddf..000000000
--- a/eos/effects/effect1472.py
+++ /dev/null
@@ -1,15 +0,0 @@
-# missileSkillAoeCloudSizeBonus
-#
-# Used by:
-# Implants named like: Zainou 'Deadeye' Guided Missile Precision GP (6 of 6)
-# Modules named like: Warhead Rigor Catalyst (8 of 8)
-# Skill: Guided Missile Precision
-type = "passive"
-
-
-def handler(fit, container, context):
-    level = container.level if "skill" in context else 1
-    penalize = False if "skill" in context or "implant" in context else True
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"),
-                                    "aoeCloudSize", container.getModifiedItemAttr("aoeCloudSizeBonus") * level,
-                                    stackingPenalties=penalize)
diff --git a/eos/effects/effect1500.py b/eos/effects/effect1500.py
deleted file mode 100644
index da4472bd4..000000000
--- a/eos/effects/effect1500.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# shieldOperationSkillBoostCapacitorNeedBonus
-#
-# Used by:
-# Modules named like: Core Defense Capacitor Safeguard (8 of 8)
-# Skill: Shield Compensation
-type = "passive"
-
-
-def handler(fit, container, context):
-    level = container.level if "skill" in context else 1
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Operation"),
-                                  "capacitorNeed", container.getModifiedItemAttr("shieldBoostCapacitorBonus") * level)
diff --git a/eos/effects/effect1550.py b/eos/effects/effect1550.py
deleted file mode 100644
index bf1267d77..000000000
--- a/eos/effects/effect1550.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# ewSkillTargetPaintingStrengthBonus
-#
-# Used by:
-# Skill: Signature Focusing
-type = "passive"
-
-
-def handler(fit, skill, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Target Painter",
-                                  "signatureRadiusBonus",
-                                  skill.getModifiedItemAttr("scanSkillTargetPaintStrengthBonus") * skill.level)
diff --git a/eos/effects/effect1551.py b/eos/effects/effect1551.py
deleted file mode 100644
index 0140a5d57..000000000
--- a/eos/effects/effect1551.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# minmatarShipEwTargetPainterMF2
-#
-# Used by:
-# Ship: Hyena
-# Ship: Vigil
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Target Painter",
-                                  "signatureRadiusBonus", ship.getModifiedItemAttr("shipBonusMF2"),
-                                  skill="Minmatar Frigate")
diff --git a/eos/effects/effect157.py b/eos/effects/effect157.py
deleted file mode 100644
index ea808b755..000000000
--- a/eos/effects/effect157.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# largeHybridTurretDamageMultiplierBonusPostPercentDamageMultiplierLocationShipModulesRequiringLargeHybridTurret
-#
-# Used by:
-# Implants named like: Zainou 'Deadeye' Large Hybrid Turret LH (6 of 6)
-# Skill: Large Hybrid Turret
-type = "passive"
-
-
-def handler(fit, container, context):
-    level = container.level if "skill" in context else 1
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Large Hybrid Turret"),
-                                  "damageMultiplier", container.getModifiedItemAttr("damageMultiplierBonus") * level)
diff --git a/eos/effects/effect1577.py b/eos/effects/effect1577.py
deleted file mode 100644
index 1591e9be1..000000000
--- a/eos/effects/effect1577.py
+++ /dev/null
@@ -1,14 +0,0 @@
-# angelsetbonus
-#
-# Used by:
-# Implants named like: grade Halo (18 of 18)
-runTime = "early"
-type = "passive"
-
-
-def handler(fit, implant, context):
-    fit.appliedImplants.filteredItemMultiply(
-        lambda implant: "signatureRadiusBonus" in implant.itemModifiedAttributes and
-                        "implantSetAngel" in implant.itemModifiedAttributes,
-        "signatureRadiusBonus",
-        implant.getModifiedItemAttr("implantSetAngel"))
diff --git a/eos/effects/effect1579.py b/eos/effects/effect1579.py
deleted file mode 100644
index 48c915f1d..000000000
--- a/eos/effects/effect1579.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# setBonusSansha
-#
-# Used by:
-# Implants named like: grade Slave (18 of 18)
-# Implant: High-grade Halo Omega
-runTime = "early"
-type = "passive"
-
-
-def handler(fit, implant, context):
-    fit.appliedImplants.filteredItemMultiply(lambda target: target.item.requiresSkill("Cybernetics"),
-                                             "armorHpBonus", implant.getModifiedItemAttr("implantSetSansha") or 1)
diff --git a/eos/effects/effect1581.py b/eos/effects/effect1581.py
deleted file mode 100644
index 86ff1b5ce..000000000
--- a/eos/effects/effect1581.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# jumpDriveSkillsRangeBonus
-#
-# Used by:
-# Skill: Jump Drive Calibration
-type = "passive"
-
-
-def handler(fit, skill, context):
-    fit.ship.boostItemAttr("jumpDriveRange", skill.getModifiedItemAttr("jumpDriveRangeBonus") * skill.level)
diff --git a/eos/effects/effect1585.py b/eos/effects/effect1585.py
deleted file mode 100644
index e1668e7c8..000000000
--- a/eos/effects/effect1585.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# capitalTurretSkillLaserDamage
-#
-# Used by:
-# Skill: Capital Energy Turret
-type = "passive"
-
-
-def handler(fit, skill, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Energy Turret"),
-                                  "damageMultiplier", skill.getModifiedItemAttr("damageMultiplierBonus") * skill.level)
diff --git a/eos/effects/effect1586.py b/eos/effects/effect1586.py
deleted file mode 100644
index ac4b49115..000000000
--- a/eos/effects/effect1586.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# capitalTurretSkillProjectileDamage
-#
-# Used by:
-# Skill: Capital Projectile Turret
-type = "passive"
-
-
-def handler(fit, skill, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Projectile Turret"),
-                                  "damageMultiplier", skill.getModifiedItemAttr("damageMultiplierBonus") * skill.level)
diff --git a/eos/effects/effect1587.py b/eos/effects/effect1587.py
deleted file mode 100644
index dac86333a..000000000
--- a/eos/effects/effect1587.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# capitalTurretSkillHybridDamage
-#
-# Used by:
-# Skill: Capital Hybrid Turret
-type = "passive"
-
-
-def handler(fit, skill, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Hybrid Turret"),
-                                  "damageMultiplier", skill.getModifiedItemAttr("damageMultiplierBonus") * skill.level)
diff --git a/eos/effects/effect1588.py b/eos/effects/effect1588.py
deleted file mode 100644
index 9e59f3aea..000000000
--- a/eos/effects/effect1588.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# capitalLauncherSkillCitadelKineticDamage
-#
-# Used by:
-# Implants named like: Hardwiring Zainou 'Sharpshooter' ZMX (6 of 6)
-# Skill: XL Torpedoes
-type = "passive"
-
-
-def handler(fit, container, context):
-    level = container.level if "skill" in context else 1
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("XL Torpedoes"),
-                                    "kineticDamage", container.getModifiedItemAttr("damageMultiplierBonus") * level)
diff --git a/eos/effects/effect159.py b/eos/effects/effect159.py
deleted file mode 100644
index c70854c90..000000000
--- a/eos/effects/effect159.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# mediumEnergyTurretDamageMultiplierBonusPostPercentDamageMultiplierLocationShipModulesRequiringMediumEnergyTurret
-#
-# Used by:
-# Implants named like: Inherent Implants 'Lancer' Medium Energy Turret ME (6 of 6)
-# Skill: Medium Energy Turret
-type = "passive"
-
-
-def handler(fit, container, context):
-    level = container.level if "skill" in context else 1
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Energy Turret"),
-                                  "damageMultiplier", container.getModifiedItemAttr("damageMultiplierBonus") * level)
diff --git a/eos/effects/effect1590.py b/eos/effects/effect1590.py
deleted file mode 100644
index 28fdae111..000000000
--- a/eos/effects/effect1590.py
+++ /dev/null
@@ -1,15 +0,0 @@
-# missileSkillAoeVelocityBonus
-#
-# Used by:
-# Implants named like: Zainou 'Deadeye' Target Navigation Prediction TN (6 of 6)
-# Modules named like: Warhead Flare Catalyst (8 of 8)
-# Skill: Target Navigation Prediction
-type = "passive"
-
-
-def handler(fit, container, context):
-    level = container.level if "skill" in context else 1
-    penalize = False if "skill" in context or "implant" in context else True
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"),
-                                    "aoeVelocity", container.getModifiedItemAttr("aoeVelocityBonus") * level,
-                                    stackingPenalties=penalize)
diff --git a/eos/effects/effect1592.py b/eos/effects/effect1592.py
deleted file mode 100644
index 253fbd818..000000000
--- a/eos/effects/effect1592.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# capitalLauncherSkillCitadelEmDamage
-#
-# Used by:
-# Implants named like: Hardwiring Zainou 'Sharpshooter' ZMX (6 of 6)
-# Skill: XL Torpedoes
-type = "passive"
-
-
-def handler(fit, container, context):
-    level = container.level if "skill" in context else 1
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("XL Torpedoes"),
-                                    "emDamage", container.getModifiedItemAttr("damageMultiplierBonus") * level)
diff --git a/eos/effects/effect1593.py b/eos/effects/effect1593.py
deleted file mode 100644
index 1ce75bd0b..000000000
--- a/eos/effects/effect1593.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# capitalLauncherSkillCitadelExplosiveDamage
-#
-# Used by:
-# Implants named like: Hardwiring Zainou 'Sharpshooter' ZMX (6 of 6)
-# Skill: XL Torpedoes
-type = "passive"
-
-
-def handler(fit, container, context):
-    level = container.level if "skill" in context else 1
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("XL Torpedoes"),
-                                    "explosiveDamage", container.getModifiedItemAttr("damageMultiplierBonus") * level)
diff --git a/eos/effects/effect1594.py b/eos/effects/effect1594.py
deleted file mode 100644
index 044c7a844..000000000
--- a/eos/effects/effect1594.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# capitalLauncherSkillCitadelThermalDamage
-#
-# Used by:
-# Implants named like: Hardwiring Zainou 'Sharpshooter' ZMX (6 of 6)
-# Skill: XL Torpedoes
-type = "passive"
-
-
-def handler(fit, container, context):
-    level = container.level if "skill" in context else 1
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("XL Torpedoes"),
-                                    "thermalDamage", container.getModifiedItemAttr("damageMultiplierBonus") * level)
diff --git a/eos/effects/effect1595.py b/eos/effects/effect1595.py
deleted file mode 100644
index 63e95f67f..000000000
--- a/eos/effects/effect1595.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# missileSkillWarheadUpgradesEmDamageBonus
-#
-# Used by:
-# Implants named like: Agency 'Pyrolancea' DB Dose (4 of 4)
-# Skill: Warhead Upgrades
-type = "passive"
-
-
-def handler(fit, src, context):
-    mod = src.level if "skill" in context else 1
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"),
-                                    "emDamage", src.getModifiedItemAttr("damageMultiplierBonus") * mod)
diff --git a/eos/effects/effect1596.py b/eos/effects/effect1596.py
deleted file mode 100644
index 6a6228e8e..000000000
--- a/eos/effects/effect1596.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# missileSkillWarheadUpgradesExplosiveDamageBonus
-#
-# Used by:
-# Implants named like: Agency 'Pyrolancea' DB Dose (4 of 4)
-# Skill: Warhead Upgrades
-type = "passive"
-
-
-def handler(fit, src, context):
-    mod = src.level if "skill" in context else 1
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"),
-                                    "explosiveDamage", src.getModifiedItemAttr("damageMultiplierBonus") * mod)
diff --git a/eos/effects/effect1597.py b/eos/effects/effect1597.py
deleted file mode 100644
index 8b25142a8..000000000
--- a/eos/effects/effect1597.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# missileSkillWarheadUpgradesKineticDamageBonus
-#
-# Used by:
-# Implants named like: Agency 'Pyrolancea' DB Dose (4 of 4)
-# Skill: Warhead Upgrades
-type = "passive"
-
-
-def handler(fit, src, context):
-    mod = src.level if "skill" in context else 1
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"),
-                                    "kineticDamage", src.getModifiedItemAttr("damageMultiplierBonus") * mod)
diff --git a/eos/effects/effect160.py b/eos/effects/effect160.py
deleted file mode 100644
index e64a0d35b..000000000
--- a/eos/effects/effect160.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# mediumHybridTurretDamageMultiplierBonusPostPercentDamageMultiplierLocationShipModulesRequiringMediumHybridTurret
-#
-# Used by:
-# Implants named like: Zainou 'Deadeye' Medium Hybrid Turret MH (6 of 6)
-# Skill: Medium Hybrid Turret
-type = "passive"
-
-
-def handler(fit, container, context):
-    level = container.level if "skill" in context else 1
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Hybrid Turret"),
-                                  "damageMultiplier", container.getModifiedItemAttr("damageMultiplierBonus") * level)
diff --git a/eos/effects/effect161.py b/eos/effects/effect161.py
deleted file mode 100644
index 8bd3dec22..000000000
--- a/eos/effects/effect161.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# mediumProjectileTurretDamageMultiplierBonusPostPercentDamageMultiplierLocationShipModulesRequiringMediumProjectileTurret
-#
-# Used by:
-# Implants named like: Eifyr and Co. 'Gunslinger' Medium Projectile Turret MP (6 of 6)
-# Skill: Medium Projectile Turret
-type = "passive"
-
-
-def handler(fit, container, context):
-    level = container.level if "skill" in context else 1
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Projectile Turret"),
-                                  "damageMultiplier", container.getModifiedItemAttr("damageMultiplierBonus") * level)
diff --git a/eos/effects/effect1615.py b/eos/effects/effect1615.py
deleted file mode 100644
index 34b19d1ac..000000000
--- a/eos/effects/effect1615.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipAdvancedSpaceshipCommandAgilityBonus
-#
-# Used by:
-# Items from market group: Ships > Capital Ships (40 of 40)
-type = "passive"
-
-
-def handler(fit, ship, context):
-    skillName = "Advanced Spaceship Command"
-    skill = fit.character.getSkill(skillName)
-    fit.ship.boostItemAttr("agility", skill.getModifiedItemAttr("agilityBonus"), skill=skillName)
diff --git a/eos/effects/effect1616.py b/eos/effects/effect1616.py
deleted file mode 100644
index 5a0846335..000000000
--- a/eos/effects/effect1616.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# skillCapitalShipsAdvancedAgility
-#
-# Used by:
-# Skill: Capital Ships
-type = "passive"
-
-
-def handler(fit, skill, context):
-    if fit.ship.item.requiresSkill("Capital Ships"):
-        fit.ship.boostItemAttr("agility", skill.getModifiedItemAttr("agilityBonus") * skill.level)
diff --git a/eos/effects/effect1617.py b/eos/effects/effect1617.py
deleted file mode 100644
index 05b0beb25..000000000
--- a/eos/effects/effect1617.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# shipCapitalAgilityBonus
-#
-# Used by:
-# Items from market group: Ships > Capital Ships (31 of 40)
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.ship.multiplyItemAttr("agility", src.getModifiedItemAttr("advancedCapitalAgility"), stackingPenalties=True)
diff --git a/eos/effects/effect162.py b/eos/effects/effect162.py
deleted file mode 100644
index 09ffdc5fb..000000000
--- a/eos/effects/effect162.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# largeEnergyTurretDamageMultiplierBonusPostPercentDamageMultiplierLocationShipModulesRequiringLargeEnergyTurret
-#
-# Used by:
-# Implants named like: Inherent Implants 'Lancer' Large Energy Turret LE (6 of 6)
-# Implant: Pashan's Turret Handling Mindlink
-# Skill: Large Energy Turret
-type = "passive"
-
-
-def handler(fit, container, context):
-    level = container.level if "skill" in context else 1
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Large Energy Turret"),
-                                  "damageMultiplier", container.getModifiedItemAttr("damageMultiplierBonus") * level)
diff --git a/eos/effects/effect1634.py b/eos/effects/effect1634.py
deleted file mode 100644
index 82b5f1cde..000000000
--- a/eos/effects/effect1634.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# capitalShieldOperationSkillCapacitorNeedBonus
-#
-# Used by:
-# Modules named like: Core Defense Capacitor Safeguard (8 of 8)
-# Skill: Capital Shield Operation
-type = "passive"
-
-
-def handler(fit, container, context):
-    level = container.level if "skill" in context else 1
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Shield Operation"),
-                                  "capacitorNeed", container.getModifiedItemAttr("shieldBoostCapacitorBonus") * level)
diff --git a/eos/effects/effect1635.py b/eos/effects/effect1635.py
deleted file mode 100644
index 9ccf42487..000000000
--- a/eos/effects/effect1635.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# capitalRepairSystemsSkillDurationBonus
-#
-# Used by:
-# Modules named like: Nanobot Accelerator (8 of 8)
-# Skill: Capital Repair Systems
-type = "passive"
-
-
-def handler(fit, container, context):
-    level = container.level if "skill" in context else 1
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Repair Systems"),
-                                  "duration", container.getModifiedItemAttr("durationSkillBonus") * level,
-                                  stackingPenalties="skill" not in context)
diff --git a/eos/effects/effect1638.py b/eos/effects/effect1638.py
deleted file mode 100644
index 6cd2337c9..000000000
--- a/eos/effects/effect1638.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# skillAdvancedWeaponUpgradesPowerNeedBonus
-#
-# Used by:
-# Skill: Advanced Weapon Upgrades
-type = "passive"
-
-
-def handler(fit, skill, context):
-    fit.modules.filteredItemBoost(
-        lambda mod: mod.item.requiresSkill("Gunnery") or mod.item.requiresSkill("Missile Launcher Operation"),
-        "power", skill.getModifiedItemAttr("powerNeedBonus") * skill.level)
diff --git a/eos/effects/effect1643.py b/eos/effects/effect1643.py
deleted file mode 100644
index 2e36ed6f0..000000000
--- a/eos/effects/effect1643.py
+++ /dev/null
@@ -1,20 +0,0 @@
-# armoredCommandMindlink
-#
-# Used by:
-# Implant: Armored Command Mindlink
-# Implant: Federation Navy Command Mindlink
-# Implant: Imperial Navy Command Mindlink
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Armored Command"), "warfareBuff2Multiplier",
-                                    src.getModifiedItemAttr("mindlinkBonus"))
-    fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Armored Command"), "warfareBuff1Multiplier",
-                                    src.getModifiedItemAttr("mindlinkBonus"))
-    fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Armored Command"), "warfareBuff4Multiplier",
-                                    src.getModifiedItemAttr("mindlinkBonus"))
-    fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Armored Command"), "warfareBuff3Multiplier",
-                                    src.getModifiedItemAttr("mindlinkBonus"))
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Armored Command"), "buffDuration",
-                                  src.getModifiedItemAttr("mindlinkBonus"))
diff --git a/eos/effects/effect1644.py b/eos/effects/effect1644.py
deleted file mode 100644
index 9999d7f56..000000000
--- a/eos/effects/effect1644.py
+++ /dev/null
@@ -1,20 +0,0 @@
-# skirmishCommandMindlink
-#
-# Used by:
-# Implant: Federation Navy Command Mindlink
-# Implant: Republic Fleet Command Mindlink
-# Implant: Skirmish Command Mindlink
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Skirmish Command"), "warfareBuff3Multiplier",
-                                    src.getModifiedItemAttr("mindlinkBonus"))
-    fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Skirmish Command"), "warfareBuff4Multiplier",
-                                    src.getModifiedItemAttr("mindlinkBonus"))
-    fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Skirmish Command"), "warfareBuff2Multiplier",
-                                    src.getModifiedItemAttr("mindlinkBonus"))
-    fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Skirmish Command"), "warfareBuff1Multiplier",
-                                    src.getModifiedItemAttr("mindlinkBonus"))
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Skirmish Command"), "buffDuration",
-                                  src.getModifiedItemAttr("mindlinkBonus"))
diff --git a/eos/effects/effect1645.py b/eos/effects/effect1645.py
deleted file mode 100644
index fac7a7720..000000000
--- a/eos/effects/effect1645.py
+++ /dev/null
@@ -1,18 +0,0 @@
-# shieldCommandMindlink
-#
-# Used by:
-# Implants from group: Cyber Leadership (4 of 10)
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Shield Command"), "warfareBuff4Multiplier",
-                                    src.getModifiedItemAttr("mindlinkBonus"))
-    fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Shield Command"), "warfareBuff3Multiplier",
-                                    src.getModifiedItemAttr("mindlinkBonus"))
-    fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Shield Command"), "warfareBuff2Multiplier",
-                                    src.getModifiedItemAttr("mindlinkBonus"))
-    fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Shield Command"), "warfareBuff1Multiplier",
-                                    src.getModifiedItemAttr("mindlinkBonus"))
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Command"), "buffDuration",
-                                  src.getModifiedItemAttr("mindlinkBonus"))
diff --git a/eos/effects/effect1646.py b/eos/effects/effect1646.py
deleted file mode 100644
index f545ab629..000000000
--- a/eos/effects/effect1646.py
+++ /dev/null
@@ -1,20 +0,0 @@
-# informationCommandMindlink
-#
-# Used by:
-# Implant: Caldari Navy Command Mindlink
-# Implant: Imperial Navy Command Mindlink
-# Implant: Information Command Mindlink
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Information Command"), "warfareBuff4Multiplier",
-                                    src.getModifiedItemAttr("mindlinkBonus"))
-    fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Information Command"), "warfareBuff3Multiplier",
-                                    src.getModifiedItemAttr("mindlinkBonus"))
-    fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Information Command"), "warfareBuff1Multiplier",
-                                    src.getModifiedItemAttr("mindlinkBonus"))
-    fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Information Command"), "warfareBuff2Multiplier",
-                                    src.getModifiedItemAttr("mindlinkBonus"))
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Information Command"), "buffDuration",
-                                  src.getModifiedItemAttr("mindlinkBonus"))
diff --git a/eos/effects/effect1650.py b/eos/effects/effect1650.py
deleted file mode 100644
index 119ed3072..000000000
--- a/eos/effects/effect1650.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# skillSiegeModuleConsumptionQuantityBonus
-#
-# Used by:
-# Skill: Tactical Weapon Reconfiguration
-type = "passive"
-
-
-def handler(fit, skill, context):
-    amount = -skill.getModifiedItemAttr("consumptionQuantityBonus")
-    fit.modules.filteredItemIncrease(lambda mod: mod.item.requiresSkill(skill),
-                                     "consumptionQuantity", amount * skill.level)
diff --git a/eos/effects/effect1657.py b/eos/effects/effect1657.py
deleted file mode 100644
index 737e5d20d..000000000
--- a/eos/effects/effect1657.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# missileSkillWarheadUpgradesThermalDamageBonus
-#
-# Used by:
-# Implants named like: Agency 'Pyrolancea' DB Dose (4 of 4)
-# Skill: Warhead Upgrades
-type = "passive"
-
-
-def handler(fit, src, context):
-    mod = src.level if "skill" in context else 1
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"),
-                                    "thermalDamage", src.getModifiedItemAttr("damageMultiplierBonus") * mod)
diff --git a/eos/effects/effect1668.py b/eos/effects/effect1668.py
deleted file mode 100644
index beda51a4c..000000000
--- a/eos/effects/effect1668.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# freighterCargoBonusA2
-#
-# Used by:
-# Variations of ship: Providence (2 of 2)
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.ship.boostItemAttr("capacity", ship.getModifiedItemAttr("freighterBonusA2"), skill="Amarr Freighter")
diff --git a/eos/effects/effect1669.py b/eos/effects/effect1669.py
deleted file mode 100644
index 35085c886..000000000
--- a/eos/effects/effect1669.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# freighterCargoBonusC2
-#
-# Used by:
-# Variations of ship: Charon (2 of 2)
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.ship.boostItemAttr("capacity", ship.getModifiedItemAttr("freighterBonusC2"), skill="Caldari Freighter")
diff --git a/eos/effects/effect1670.py b/eos/effects/effect1670.py
deleted file mode 100644
index 4b4807871..000000000
--- a/eos/effects/effect1670.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# freighterCargoBonusG2
-#
-# Used by:
-# Variations of ship: Obelisk (2 of 2)
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.ship.boostItemAttr("capacity", ship.getModifiedItemAttr("freighterBonusG2"), skill="Gallente Freighter")
diff --git a/eos/effects/effect1671.py b/eos/effects/effect1671.py
deleted file mode 100644
index ee616cb53..000000000
--- a/eos/effects/effect1671.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# freighterCargoBonusM2
-#
-# Used by:
-# Variations of ship: Fenrir (2 of 2)
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.ship.boostItemAttr("capacity", ship.getModifiedItemAttr("freighterBonusM2"), skill="Minmatar Freighter")
diff --git a/eos/effects/effect1672.py b/eos/effects/effect1672.py
deleted file mode 100644
index 0842ef288..000000000
--- a/eos/effects/effect1672.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# freighterMaxVelocityBonusA1
-#
-# Used by:
-# Ship: Providence
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.ship.boostItemAttr("maxVelocity", ship.getModifiedItemAttr("freighterBonusA1"), skill="Amarr Freighter")
diff --git a/eos/effects/effect1673.py b/eos/effects/effect1673.py
deleted file mode 100644
index e81e55459..000000000
--- a/eos/effects/effect1673.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# freighterMaxVelocityBonusC1
-#
-# Used by:
-# Ship: Charon
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.ship.boostItemAttr("maxVelocity", ship.getModifiedItemAttr("freighterBonusC1"), skill="Caldari Freighter")
diff --git a/eos/effects/effect1674.py b/eos/effects/effect1674.py
deleted file mode 100644
index 4fc3f4844..000000000
--- a/eos/effects/effect1674.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# freighterMaxVelocityBonusG1
-#
-# Used by:
-# Ship: Obelisk
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.ship.boostItemAttr("maxVelocity", ship.getModifiedItemAttr("freighterBonusG1"), skill="Gallente Freighter")
diff --git a/eos/effects/effect1675.py b/eos/effects/effect1675.py
deleted file mode 100644
index 497d0797f..000000000
--- a/eos/effects/effect1675.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# freighterMaxVelocityBonusM1
-#
-# Used by:
-# Ship: Fenrir
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.ship.boostItemAttr("maxVelocity", ship.getModifiedItemAttr("freighterBonusM1"), skill="Minmatar Freighter")
diff --git a/eos/effects/effect17.py b/eos/effects/effect17.py
deleted file mode 100644
index de0c95cac..000000000
--- a/eos/effects/effect17.py
+++ /dev/null
@@ -1,15 +0,0 @@
-# mining
-#
-# Used by:
-# Drones from group: Mining Drone (10 of 10)
-
-type = "passive"
-grouped = True
-
-
-def handler(fit, container, context):
-    miningDroneAmountPercent = container.getModifiedItemAttr("miningDroneAmountPercent")
-    if (miningDroneAmountPercent is None) or (miningDroneAmountPercent == 0):
-        pass
-    else:
-        container.multiplyItemAttr("miningAmount", miningDroneAmountPercent / 100)
diff --git a/eos/effects/effect172.py b/eos/effects/effect172.py
deleted file mode 100644
index 496efc986..000000000
--- a/eos/effects/effect172.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# smallEnergyTurretDamageMultiplierBonusPostPercentDamageMultiplierLocationShipModulesRequiringSmallEnergyTurret
-#
-# Used by:
-# Implants named like: Inherent Implants 'Lancer' Small Energy Turret SE (6 of 6)
-# Skill: Small Energy Turret
-type = "passive"
-
-
-def handler(fit, container, context):
-    level = container.level if "skill" in context else 1
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Energy Turret"),
-                                  "damageMultiplier", container.getModifiedItemAttr("damageMultiplierBonus") * level)
diff --git a/eos/effects/effect1720.py b/eos/effects/effect1720.py
deleted file mode 100644
index 6b37ba157..000000000
--- a/eos/effects/effect1720.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# shieldBoostAmplifier
-#
-# Used by:
-# 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):
-    fit.modules.filteredItemBoost(
-        lambda mod: mod.item.requiresSkill("Shield Operation") or mod.item.requiresSkill("Capital Shield Operation"),
-        "shieldBonus", module.getModifiedItemAttr("shieldBoostMultiplier"),
-        stackingPenalties=True)
diff --git a/eos/effects/effect1722.py b/eos/effects/effect1722.py
deleted file mode 100644
index 578b0f47f..000000000
--- a/eos/effects/effect1722.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# jumpDriveSkillsCapacitorNeedBonus
-#
-# Used by:
-# Skill: Jump Drive Operation
-type = "passive"
-
-
-def handler(fit, skill, context):
-    fit.ship.boostItemAttr("jumpDriveCapacitorNeed",
-                           skill.getModifiedItemAttr("jumpDriveCapacitorNeedBonus") * skill.level)
diff --git a/eos/effects/effect173.py b/eos/effects/effect173.py
deleted file mode 100644
index f317f297b..000000000
--- a/eos/effects/effect173.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# smallHybridTurretDamageMultiplierBonusPostPercentDamageMultiplierLocationShipModulesRequiringSmallHybridTurret
-#
-# Used by:
-# Implants named like: Zainou 'Deadeye' Small Hybrid Turret SH (6 of 6)
-# Skill: Small Hybrid Turret
-type = "passive"
-
-
-def handler(fit, container, context):
-    level = container.level if "skill" in context else 1
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Hybrid Turret"),
-                                  "damageMultiplier", container.getModifiedItemAttr("damageMultiplierBonus") * level)
diff --git a/eos/effects/effect1730.py b/eos/effects/effect1730.py
deleted file mode 100644
index 2256ff5b4..000000000
--- a/eos/effects/effect1730.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# droneDmgBonus
-#
-# Used by:
-# Skills from group: Drones (8 of 26)
-type = "passive"
-
-
-def handler(fit, skill, context):
-    fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill(skill),
-                                 "damageMultiplier", skill.getModifiedItemAttr("damageMultiplierBonus") * skill.level)
diff --git a/eos/effects/effect1738.py b/eos/effects/effect1738.py
deleted file mode 100644
index ddd2a7205..000000000
--- a/eos/effects/effect1738.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# doHacking
-#
-# Used by:
-# Modules from group: Data Miners (10 of 10)
-type = "active"
-
-
-def handler(fit, module, context):
-    pass
diff --git a/eos/effects/effect174.py b/eos/effects/effect174.py
deleted file mode 100644
index a77f76806..000000000
--- a/eos/effects/effect174.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# smallProjectileTurretDamageMultiplierBonusPostPercentDamageMultiplierLocationShipModulesRequiringSmallProjectileTurret
-#
-# Used by:
-# Implants named like: Eifyr and Co. 'Gunslinger' Small Projectile Turret SP (6 of 6)
-# Skill: Small Projectile Turret
-type = "passive"
-
-
-def handler(fit, container, context):
-    level = container.level if "skill" in context else 1
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Projectile Turret"),
-                                  "damageMultiplier", container.getModifiedItemAttr("damageMultiplierBonus") * level)
diff --git a/eos/effects/effect1763.py b/eos/effects/effect1763.py
deleted file mode 100644
index 9cdc9a0f6..000000000
--- a/eos/effects/effect1763.py
+++ /dev/null
@@ -1,15 +0,0 @@
-# missileSkillRapidLauncherRoF
-#
-# Used by:
-# Implants named like: Zainou 'Deadeye' Rapid Launch RL (6 of 6)
-# Implant: Standard Cerebral Accelerator
-# Implant: Whelan Machorin's Ballistic Smartlink
-# Skill: Missile Launcher Operation
-# Skill: Rapid Launch
-type = "passive"
-
-
-def handler(fit, container, context):
-    level = container.level if "skill" in context else 1
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Missile Launcher Operation"),
-                                  "speed", container.getModifiedItemAttr("rofBonus") * level)
diff --git a/eos/effects/effect1764.py b/eos/effects/effect1764.py
deleted file mode 100644
index 3c7cee775..000000000
--- a/eos/effects/effect1764.py
+++ /dev/null
@@ -1,15 +0,0 @@
-# missileSkillMissileProjectileVelocityBonus
-#
-# Used by:
-# Implants named like: Zainou 'Deadeye' Missile Projection MP (6 of 6)
-# Modules named like: Hydraulic Bay Thrusters (8 of 8)
-# Skill: Missile Projection
-type = "passive"
-
-
-def handler(fit, container, context):
-    level = container.level if "skill" in context else 1
-    penalized = False if "skill" in context or "implant" in context else True
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"),
-                                    "maxVelocity", container.getModifiedItemAttr("speedFactor") * level,
-                                    stackingPenalties=penalized)
diff --git a/eos/effects/effect1773.py b/eos/effects/effect1773.py
deleted file mode 100644
index ea9d1c560..000000000
--- a/eos/effects/effect1773.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipBonusSHTFalloffGF2
-#
-# Used by:
-# Ship: Atron
-# Ship: Daredevil
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Hybrid Turret"),
-                                  "falloff", ship.getModifiedItemAttr("shipBonusGF2"), skill="Gallente Frigate")
diff --git a/eos/effects/effect1804.py b/eos/effects/effect1804.py
deleted file mode 100644
index ba757a558..000000000
--- a/eos/effects/effect1804.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipArmorEMResistanceAF1
-#
-# Used by:
-# Ship: Astero
-# Ship: Malice
-# Ship: Punisher
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.ship.boostItemAttr("armorEmDamageResonance", ship.getModifiedItemAttr("shipBonusAF"), skill="Amarr Frigate")
diff --git a/eos/effects/effect1805.py b/eos/effects/effect1805.py
deleted file mode 100644
index 3e01abbc3..000000000
--- a/eos/effects/effect1805.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# shipArmorTHResistanceAF1
-#
-# Used by:
-# Ship: Astero
-# Ship: Malice
-# Ship: Punisher
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.ship.boostItemAttr("armorThermalDamageResonance", ship.getModifiedItemAttr("shipBonusAF"),
-                           skill="Amarr Frigate")
diff --git a/eos/effects/effect1806.py b/eos/effects/effect1806.py
deleted file mode 100644
index d5d9ea4ac..000000000
--- a/eos/effects/effect1806.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# shipArmorKNResistanceAF1
-#
-# Used by:
-# Ship: Astero
-# Ship: Malice
-# Ship: Punisher
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.ship.boostItemAttr("armorKineticDamageResonance", ship.getModifiedItemAttr("shipBonusAF"),
-                           skill="Amarr Frigate")
diff --git a/eos/effects/effect1807.py b/eos/effects/effect1807.py
deleted file mode 100644
index 448ed9fd3..000000000
--- a/eos/effects/effect1807.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# shipArmorEXResistanceAF1
-#
-# Used by:
-# Ship: Astero
-# Ship: Malice
-# Ship: Punisher
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.ship.boostItemAttr("armorExplosiveDamageResonance", ship.getModifiedItemAttr("shipBonusAF"),
-                           skill="Amarr Frigate")
diff --git a/eos/effects/effect1812.py b/eos/effects/effect1812.py
deleted file mode 100644
index 20a8e86a3..000000000
--- a/eos/effects/effect1812.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# shipShieldEMResistanceCC2
-#
-# Used by:
-# Variations of ship: Moa (3 of 4)
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.ship.boostItemAttr("shieldEmDamageResonance", ship.getModifiedItemAttr("shipBonusCC2"), skill="Caldari Cruiser")
diff --git a/eos/effects/effect1813.py b/eos/effects/effect1813.py
deleted file mode 100644
index 9c9328d43..000000000
--- a/eos/effects/effect1813.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipShieldThermalResistanceCC2
-#
-# Used by:
-# Variations of ship: Moa (3 of 4)
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.ship.boostItemAttr("shieldThermalDamageResonance", ship.getModifiedItemAttr("shipBonusCC2"),
-                           skill="Caldari Cruiser")
diff --git a/eos/effects/effect1814.py b/eos/effects/effect1814.py
deleted file mode 100644
index d8477420c..000000000
--- a/eos/effects/effect1814.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipShieldKineticResistanceCC2
-#
-# Used by:
-# Variations of ship: Moa (3 of 4)
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.ship.boostItemAttr("shieldKineticDamageResonance", ship.getModifiedItemAttr("shipBonusCC2"),
-                           skill="Caldari Cruiser")
diff --git a/eos/effects/effect1815.py b/eos/effects/effect1815.py
deleted file mode 100644
index 203b2676a..000000000
--- a/eos/effects/effect1815.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipShieldExplosiveResistanceCC2
-#
-# Used by:
-# Variations of ship: Moa (3 of 4)
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.ship.boostItemAttr("shieldExplosiveDamageResonance", ship.getModifiedItemAttr("shipBonusCC2"),
-                           skill="Caldari Cruiser")
diff --git a/eos/effects/effect1816.py b/eos/effects/effect1816.py
deleted file mode 100644
index 4e68a86aa..000000000
--- a/eos/effects/effect1816.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipShieldEMResistanceCF2
-#
-# Used by:
-# Variations of ship: Merlin (3 of 4)
-# Ship: Cambion
-# Ship: Whiptail
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.ship.boostItemAttr("shieldEmDamageResonance", ship.getModifiedItemAttr("shipBonusCF"), skill="Caldari Frigate")
diff --git a/eos/effects/effect1817.py b/eos/effects/effect1817.py
deleted file mode 100644
index 739d4033f..000000000
--- a/eos/effects/effect1817.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# shipShieldThermalResistanceCF2
-#
-# Used by:
-# Variations of ship: Merlin (3 of 4)
-# Ship: Cambion
-# Ship: Whiptail
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.ship.boostItemAttr("shieldThermalDamageResonance", ship.getModifiedItemAttr("shipBonusCF"),
-                           skill="Caldari Frigate")
diff --git a/eos/effects/effect1819.py b/eos/effects/effect1819.py
deleted file mode 100644
index 3fd3ebb89..000000000
--- a/eos/effects/effect1819.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# shipShieldKineticResistanceCF2
-#
-# Used by:
-# Variations of ship: Merlin (3 of 4)
-# Ship: Cambion
-# Ship: Whiptail
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.ship.boostItemAttr("shieldKineticDamageResonance", ship.getModifiedItemAttr("shipBonusCF"),
-                           skill="Caldari Frigate")
diff --git a/eos/effects/effect1820.py b/eos/effects/effect1820.py
deleted file mode 100644
index 264c2b94d..000000000
--- a/eos/effects/effect1820.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# shipShieldExplosiveResistanceCF2
-#
-# Used by:
-# Variations of ship: Merlin (3 of 4)
-# Ship: Cambion
-# Ship: Whiptail
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.ship.boostItemAttr("shieldExplosiveDamageResonance", ship.getModifiedItemAttr("shipBonusCF"),
-                           skill="Caldari Frigate")
diff --git a/eos/effects/effect1848.py b/eos/effects/effect1848.py
deleted file mode 100644
index ad4339f67..000000000
--- a/eos/effects/effect1848.py
+++ /dev/null
@@ -1,19 +0,0 @@
-# miningForemanMindlink
-#
-# Used by:
-# Implant: Mining Foreman Mindlink
-# Implant: ORE Mining Director Mindlink
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Mining Foreman"), "warfareBuff4Multiplier",
-                                    src.getModifiedItemAttr("mindlinkBonus"))
-    fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Mining Foreman"), "warfareBuff2Multiplier",
-                                    src.getModifiedItemAttr("mindlinkBonus"))
-    fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Mining Foreman"), "warfareBuff1Multiplier",
-                                    src.getModifiedItemAttr("mindlinkBonus"))
-    fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Mining Foreman"), "warfareBuff3Multiplier",
-                                    src.getModifiedItemAttr("mindlinkBonus"))
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Mining Foreman"), "buffDuration",
-                                  src.getModifiedItemAttr("mindlinkBonus"))
diff --git a/eos/effects/effect1851.py b/eos/effects/effect1851.py
deleted file mode 100644
index b9f0541f2..000000000
--- a/eos/effects/effect1851.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# selfRof
-#
-# Used by:
-# Skills named like: Missile Specialization (4 of 5)
-# Skill: Rocket Specialization
-# Skill: Torpedo Specialization
-type = "passive"
-
-
-def handler(fit, skill, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill(skill),
-                                  "speed", skill.getModifiedItemAttr("rofBonus") * skill.level)
diff --git a/eos/effects/effect1862.py b/eos/effects/effect1862.py
deleted file mode 100644
index 62e2e0fb3..000000000
--- a/eos/effects/effect1862.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipMissileEMDamageCF2
-#
-# Used by:
-# Ship: Garmur
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"),
-                                    "emDamage", ship.getModifiedItemAttr("shipBonusCF2"), skill="Caldari Frigate")
diff --git a/eos/effects/effect1863.py b/eos/effects/effect1863.py
deleted file mode 100644
index c61c29ee1..000000000
--- a/eos/effects/effect1863.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipMissileThermalDamageCF2
-#
-# Used by:
-# Ship: Garmur
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"),
-                                    "thermalDamage", ship.getModifiedItemAttr("shipBonusCF2"), skill="Caldari Frigate")
diff --git a/eos/effects/effect1864.py b/eos/effects/effect1864.py
deleted file mode 100644
index ba61d0f47..000000000
--- a/eos/effects/effect1864.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipMissileExplosiveDamageCF2
-#
-# Used by:
-# Ship: Garmur
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"),
-                                    "explosiveDamage", ship.getModifiedItemAttr("shipBonusCF2"),
-                                    skill="Caldari Frigate")
diff --git a/eos/effects/effect1882.py b/eos/effects/effect1882.py
deleted file mode 100644
index a02b4333b..000000000
--- a/eos/effects/effect1882.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# miningYieldMultiplyPercent
-#
-# Used by:
-# Variations of module: Mining Laser Upgrade I (5 of 5)
-# Module: Frostline 'Omnivore' Harvester Upgrade
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Mining"),
-                                  "miningAmount", module.getModifiedItemAttr("miningAmountBonus"))
diff --git a/eos/effects/effect1885.py b/eos/effects/effect1885.py
deleted file mode 100644
index e525b593f..000000000
--- a/eos/effects/effect1885.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipCruiseLauncherROFBonus2CB
-#
-# Used by:
-# Ship: Raven
-# Ship: Raven State Issue
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Missile Launcher Cruise",
-                                  "speed", ship.getModifiedItemAttr("shipBonus2CB"), skill="Caldari Battleship")
diff --git a/eos/effects/effect1886.py b/eos/effects/effect1886.py
deleted file mode 100644
index 9ab173443..000000000
--- a/eos/effects/effect1886.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipSiegeLauncherROFBonus2CB
-#
-# Used by:
-# Ship: Raven
-# Ship: Raven State Issue
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Missile Launcher Torpedo",
-                                  "speed", ship.getModifiedItemAttr("shipBonus2CB"), skill="Caldari Battleship")
diff --git a/eos/effects/effect1896.py b/eos/effects/effect1896.py
deleted file mode 100644
index 0ae042d2d..000000000
--- a/eos/effects/effect1896.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# eliteBargeBonusIceHarvestingCycleTimeBarge3
-#
-# Used by:
-# Ships from group: Exhumer (3 of 3)
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Ice Harvesting"),
-                                  "duration", ship.getModifiedItemAttr("eliteBonusBarge2"), skill="Exhumers")
diff --git a/eos/effects/effect1910.py b/eos/effects/effect1910.py
deleted file mode 100644
index 8fb5bac49..000000000
--- a/eos/effects/effect1910.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# eliteBonusVampireDrainAmount2
-#
-# Used by:
-# Ship: Curse
-# Ship: Pilgrim
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Nosferatu",
-                                  "powerTransferAmount", ship.getModifiedItemAttr("eliteBonusReconShip2"),
-                                  skill="Recon Ships")
diff --git a/eos/effects/effect1911.py b/eos/effects/effect1911.py
deleted file mode 100644
index a023201da..000000000
--- a/eos/effects/effect1911.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# eliteReconBonusGravimetricStrength2
-#
-# Used by:
-# Ship: Chameleon
-# Ship: Falcon
-# Ship: Rook
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "ECM",
-                                  "scanGravimetricStrengthBonus", ship.getModifiedItemAttr("eliteBonusReconShip2"),
-                                  skill="Recon Ships")
diff --git a/eos/effects/effect1912.py b/eos/effects/effect1912.py
deleted file mode 100644
index 89baa4a80..000000000
--- a/eos/effects/effect1912.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# eliteReconBonusMagnetometricStrength2
-#
-# Used by:
-# Ship: Chameleon
-# Ship: Falcon
-# Ship: Rook
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "ECM",
-                                  "scanMagnetometricStrengthBonus", ship.getModifiedItemAttr("eliteBonusReconShip2"),
-                                  skill="Recon Ships")
diff --git a/eos/effects/effect1913.py b/eos/effects/effect1913.py
deleted file mode 100644
index fec2c9490..000000000
--- a/eos/effects/effect1913.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# eliteReconBonusRadarStrength2
-#
-# Used by:
-# Ship: Chameleon
-# Ship: Falcon
-# Ship: Rook
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "ECM",
-                                  "scanRadarStrengthBonus", ship.getModifiedItemAttr("eliteBonusReconShip2"),
-                                  skill="Recon Ships")
diff --git a/eos/effects/effect1914.py b/eos/effects/effect1914.py
deleted file mode 100644
index 3bab26dfa..000000000
--- a/eos/effects/effect1914.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# eliteReconBonusLadarStrength2
-#
-# Used by:
-# Ship: Chameleon
-# Ship: Falcon
-# Ship: Rook
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "ECM",
-                                  "scanLadarStrengthBonus", ship.getModifiedItemAttr("eliteBonusReconShip2"),
-                                  skill="Recon Ships")
diff --git a/eos/effects/effect1921.py b/eos/effects/effect1921.py
deleted file mode 100644
index 071739847..000000000
--- a/eos/effects/effect1921.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# eliteReconStasisWebBonus2
-#
-# Used by:
-# Ship: Huginn
-# Ship: Moracha
-# Ship: Rapier
-# Ship: Victor
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Stasis Web",
-                                  "maxRange", ship.getModifiedItemAttr("eliteBonusReconShip2"), skill="Recon Ships")
diff --git a/eos/effects/effect1922.py b/eos/effects/effect1922.py
deleted file mode 100644
index d308a56ba..000000000
--- a/eos/effects/effect1922.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# eliteReconScramblerRangeBonus2
-#
-# Used by:
-# Ship: Arazu
-# Ship: Enforcer
-# Ship: Lachesis
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Warp Scrambler",
-                                  "maxRange", ship.getModifiedItemAttr("eliteBonusReconShip2"), skill="Recon Ships")
diff --git a/eos/effects/effect1959.py b/eos/effects/effect1959.py
deleted file mode 100644
index e60326892..000000000
--- a/eos/effects/effect1959.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# armorReinforcerMassAdd
-#
-# Used by:
-# Modules from group: Armor Reinforcer (51 of 51)
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.ship.increaseItemAttr("mass", module.getModifiedItemAttr("massAddition"))
diff --git a/eos/effects/effect1964.py b/eos/effects/effect1964.py
deleted file mode 100644
index 6a7ab5f90..000000000
--- a/eos/effects/effect1964.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusShieldTransferCapneed1
-#
-# Used by:
-# Ship: Osprey
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Emission Systems"), "capacitorNeed",
-                                  src.getModifiedItemAttr("shipBonusCC"), skill="Caldari Cruiser")
diff --git a/eos/effects/effect1969.py b/eos/effects/effect1969.py
deleted file mode 100644
index 3c04cdc3a..000000000
--- a/eos/effects/effect1969.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusRemoteArmorRepairCapNeedGC1
-#
-# Used by:
-# Ship: Exequror
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Remote Armor Repair Systems"), "capacitorNeed",
-                                  src.getModifiedItemAttr("shipBonusGC"), skill="Gallente Cruiser")
diff --git a/eos/effects/effect1996.py b/eos/effects/effect1996.py
deleted file mode 100644
index 3a63615dd..000000000
--- a/eos/effects/effect1996.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# caldariShipEwCapacitorNeedCF2
-#
-# Used by:
-# Ship: Griffin
-# Ship: Kitsune
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "ECM",
-                                  "capacitorNeed", ship.getModifiedItemAttr("shipBonusCF2"), skill="Caldari Frigate")
diff --git a/eos/effects/effect2000.py b/eos/effects/effect2000.py
deleted file mode 100644
index 790825723..000000000
--- a/eos/effects/effect2000.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# droneRangeBonusAdd
-#
-# Used by:
-# Modules from group: Drone Control Range Module (7 of 7)
-type = "passive"
-
-
-def handler(fit, module, context):
-    amount = module.getModifiedItemAttr("droneRangeBonus")
-    fit.extraAttributes.increase("droneControlRange", amount)
diff --git a/eos/effects/effect2008.py b/eos/effects/effect2008.py
deleted file mode 100644
index defbd9ca3..000000000
--- a/eos/effects/effect2008.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# cynosuralDurationBonus
-#
-# Used by:
-# Ships from group: Force Recon Ship (8 of 9)
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Cynosural Field Generator",
-                                  "duration", ship.getModifiedItemAttr("durationBonus"))
diff --git a/eos/effects/effect2013.py b/eos/effects/effect2013.py
deleted file mode 100644
index 9ab5f4af0..000000000
--- a/eos/effects/effect2013.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# droneMaxVelocityBonus
-#
-# Used by:
-# Modules named like: Drone Speed Augmentor (6 of 8)
-# Implant: Overmind 'Goliath' Drone Tuner T25-10S
-# Implant: Overmind 'Hawkmoth' Drone Tuner S10-25T
-type = "passive"
-
-
-def handler(fit, container, context):
-    level = container.level if "skill" in context else 1
-    fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Drones"),
-                                 "maxVelocity", container.getModifiedItemAttr("droneMaxVelocityBonus") * level, stackingPenalties=True)
diff --git a/eos/effects/effect2014.py b/eos/effects/effect2014.py
deleted file mode 100644
index fba4a35bc..000000000
--- a/eos/effects/effect2014.py
+++ /dev/null
@@ -1,14 +0,0 @@
-# droneMaxRangeBonus
-#
-# Used by:
-# Modules named like: Drone Scope Chip (6 of 8)
-type = "passive"
-
-
-def handler(fit, container, context):
-    level = container.level if "skill" in context else 1
-    stacking = False if "skill" in context else True
-    fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Drones"),
-                                 "maxRange",
-                                 container.getModifiedItemAttr("rangeSkillBonus") * level,
-                                 stackingPenalties=stacking)
diff --git a/eos/effects/effect2015.py b/eos/effects/effect2015.py
deleted file mode 100644
index 75f7c1ca7..000000000
--- a/eos/effects/effect2015.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# droneDurabilityShieldCapBonus
-#
-# Used by:
-# Modules named like: Drone Durability Enhancer (6 of 8)
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Drones"),
-                                 "shieldCapacity", module.getModifiedItemAttr("hullHpBonus"))
diff --git a/eos/effects/effect2016.py b/eos/effects/effect2016.py
deleted file mode 100644
index 9f22fa762..000000000
--- a/eos/effects/effect2016.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# droneDurabilityArmorHPBonus
-#
-# Used by:
-# Modules named like: Drone Durability Enhancer (6 of 8)
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Drones"),
-                                 "armorHP", module.getModifiedItemAttr("hullHpBonus"))
diff --git a/eos/effects/effect2017.py b/eos/effects/effect2017.py
deleted file mode 100644
index cbd2fb065..000000000
--- a/eos/effects/effect2017.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# droneDurabilityHPBonus
-#
-# Used by:
-# Modules named like: Drone Durability Enhancer (6 of 8)
-type = "passive"
-
-
-def handler(fit, container, context):
-    level = container.level if "skill" in context else 1
-    fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Drones"),
-                                 "hp", container.getModifiedItemAttr("hullHpBonus") * level)
diff --git a/eos/effects/effect2019.py b/eos/effects/effect2019.py
deleted file mode 100644
index 86bcba79b..000000000
--- a/eos/effects/effect2019.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# repairDroneShieldBonusBonus
-#
-# Used by:
-# Modules named like: Drone Repair Augmentor (8 of 8)
-# Skill: Repair Drone Operation
-type = "passive"
-
-
-def handler(fit, container, context):
-    level = container.level if "skill" in context else 1
-    fit.drones.filteredItemBoost(lambda drone: drone.item.group.name == "Logistic Drone",
-                                 "shieldBonus", container.getModifiedItemAttr("damageHP") * level)
diff --git a/eos/effects/effect2020.py b/eos/effects/effect2020.py
deleted file mode 100644
index 3d7d56d4b..000000000
--- a/eos/effects/effect2020.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# repairDroneArmorDamageAmountBonus
-#
-# Used by:
-# Modules named like: Drone Repair Augmentor (8 of 8)
-# Skill: Repair Drone Operation
-type = "passive"
-
-
-def handler(fit, container, context):
-    level = container.level if "skill" in context else 1
-    fit.drones.filteredItemBoost(lambda drone: drone.item.group.name == "Logistic Drone",
-                                 "armorDamageAmount", container.getModifiedItemAttr("damageHP") * level,
-                                 stackingPenalties=True)
diff --git a/eos/effects/effect2029.py b/eos/effects/effect2029.py
deleted file mode 100644
index 6c790a925..000000000
--- a/eos/effects/effect2029.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# addToSignatureRadius2
-#
-# Used by:
-# Modules from group: Missile Launcher Bomb (2 of 2)
-# Modules from group: Shield Extender (36 of 36)
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.ship.increaseItemAttr("signatureRadius", module.getModifiedItemAttr("signatureRadiusAdd"))
diff --git a/eos/effects/effect2041.py b/eos/effects/effect2041.py
deleted file mode 100644
index f5316cb3a..000000000
--- a/eos/effects/effect2041.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# modifyArmorResonancePostPercent
-#
-# Used by:
-# Modules from group: Armor Coating (202 of 202)
-# Modules from group: Armor Plating Energized (187 of 187)
-type = "passive"
-
-
-def handler(fit, module, context):
-    for type in ("kinetic", "thermal", "explosive", "em"):
-        fit.ship.boostItemAttr("armor%sDamageResonance" % type.capitalize(),
-                               module.getModifiedItemAttr("%sDamageResistanceBonus" % type),
-                               stackingPenalties=True)
diff --git a/eos/effects/effect2052.py b/eos/effects/effect2052.py
deleted file mode 100644
index 93125bf7c..000000000
--- a/eos/effects/effect2052.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# modifyShieldResonancePostPercent
-#
-# Used by:
-# Modules from group: Shield Resistance Amplifier (88 of 88)
-type = "passive"
-
-
-def handler(fit, module, context):
-    for type in ("kinetic", "thermal", "explosive", "em"):
-        fit.ship.boostItemAttr("shield%sDamageResonance" % type.capitalize(),
-                               module.getModifiedItemAttr("%sDamageResistanceBonus" % type),
-                               stackingPenalties=True)
diff --git a/eos/effects/effect2053.py b/eos/effects/effect2053.py
deleted file mode 100644
index 189738822..000000000
--- a/eos/effects/effect2053.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# emShieldCompensationHardeningBonusGroupShieldAmp
-#
-# Used by:
-# Skill: EM Shield Compensation
-type = "passive"
-
-
-def handler(fit, skill, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Shield Resistance Amplifier",
-                                  "emDamageResistanceBonus", skill.getModifiedItemAttr("hardeningBonus") * skill.level)
diff --git a/eos/effects/effect2054.py b/eos/effects/effect2054.py
deleted file mode 100644
index 332ccae6e..000000000
--- a/eos/effects/effect2054.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# explosiveShieldCompensationHardeningBonusGroupShieldAmp
-#
-# Used by:
-# Skill: Explosive Shield Compensation
-type = "passive"
-
-
-def handler(fit, skill, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Shield Resistance Amplifier",
-                                  "explosiveDamageResistanceBonus",
-                                  skill.getModifiedItemAttr("hardeningBonus") * skill.level)
diff --git a/eos/effects/effect2055.py b/eos/effects/effect2055.py
deleted file mode 100644
index 3b07f5957..000000000
--- a/eos/effects/effect2055.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# kineticShieldCompensationHardeningBonusGroupShieldAmp
-#
-# Used by:
-# Skill: Kinetic Shield Compensation
-type = "passive"
-
-
-def handler(fit, skill, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Shield Resistance Amplifier",
-                                  "kineticDamageResistanceBonus",
-                                  skill.getModifiedItemAttr("hardeningBonus") * skill.level)
diff --git a/eos/effects/effect2056.py b/eos/effects/effect2056.py
deleted file mode 100644
index abb1ad0d7..000000000
--- a/eos/effects/effect2056.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# thermalShieldCompensationHardeningBonusGroupShieldAmp
-#
-# Used by:
-# Skill: Thermal Shield Compensation
-type = "passive"
-
-
-def handler(fit, skill, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Shield Resistance Amplifier",
-                                  "thermalDamageResistanceBonus",
-                                  skill.getModifiedItemAttr("hardeningBonus") * skill.level)
diff --git a/eos/effects/effect21.py b/eos/effects/effect21.py
deleted file mode 100644
index cba8f70bb..000000000
--- a/eos/effects/effect21.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shieldCapacityBonusOnline
-#
-# Used by:
-# Modules from group: Shield Extender (36 of 36)
-# Modules from group: Shield Resistance Amplifier (88 of 88)
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.ship.increaseItemAttr("shieldCapacity", module.getModifiedItemAttr("capacityBonus"))
diff --git a/eos/effects/effect2105.py b/eos/effects/effect2105.py
deleted file mode 100644
index 26e453172..000000000
--- a/eos/effects/effect2105.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# emArmorCompensationHardeningBonusGroupArmorCoating
-#
-# Used by:
-# Skill: EM Armor Compensation
-type = "passive"
-
-
-def handler(fit, skill, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Armor Coating",
-                                  "emDamageResistanceBonus", skill.getModifiedItemAttr("hardeningBonus") * skill.level)
diff --git a/eos/effects/effect2106.py b/eos/effects/effect2106.py
deleted file mode 100644
index 05511b42f..000000000
--- a/eos/effects/effect2106.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# explosiveArmorCompensationHardeningBonusGroupArmorCoating
-#
-# Used by:
-# Skill: Explosive Armor Compensation
-type = "passive"
-
-
-def handler(fit, skill, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Armor Coating",
-                                  "explosiveDamageResistanceBonus",
-                                  skill.getModifiedItemAttr("hardeningBonus") * skill.level)
diff --git a/eos/effects/effect2107.py b/eos/effects/effect2107.py
deleted file mode 100644
index 90df83fb9..000000000
--- a/eos/effects/effect2107.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# kineticArmorCompensationHardeningBonusGroupArmorCoating
-#
-# Used by:
-# Skill: Kinetic Armor Compensation
-type = "passive"
-
-
-def handler(fit, skill, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Armor Coating",
-                                  "kineticDamageResistanceBonus",
-                                  skill.getModifiedItemAttr("hardeningBonus") * skill.level)
diff --git a/eos/effects/effect2108.py b/eos/effects/effect2108.py
deleted file mode 100644
index 36790f342..000000000
--- a/eos/effects/effect2108.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# thermicArmorCompensationHardeningBonusGroupArmorCoating
-#
-# Used by:
-# Skill: Thermal Armor Compensation
-type = "passive"
-
-
-def handler(fit, skill, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Armor Coating",
-                                  "thermalDamageResistanceBonus",
-                                  skill.getModifiedItemAttr("hardeningBonus") * skill.level)
diff --git a/eos/effects/effect2109.py b/eos/effects/effect2109.py
deleted file mode 100644
index 837cf6912..000000000
--- a/eos/effects/effect2109.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# emArmorCompensationHardeningBonusGroupEnergized
-#
-# Used by:
-# Skill: EM Armor Compensation
-type = "passive"
-
-
-def handler(fit, skill, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Armor Plating Energized",
-                                  "emDamageResistanceBonus", skill.getModifiedItemAttr("hardeningBonus") * skill.level)
diff --git a/eos/effects/effect2110.py b/eos/effects/effect2110.py
deleted file mode 100644
index 556cbb7f2..000000000
--- a/eos/effects/effect2110.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# explosiveArmorCompensationHardeningBonusGroupEnergized
-#
-# Used by:
-# Skill: Explosive Armor Compensation
-type = "passive"
-
-
-def handler(fit, skill, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Armor Plating Energized",
-                                  "explosiveDamageResistanceBonus",
-                                  skill.getModifiedItemAttr("hardeningBonus") * skill.level)
diff --git a/eos/effects/effect2111.py b/eos/effects/effect2111.py
deleted file mode 100644
index 6300b21af..000000000
--- a/eos/effects/effect2111.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# kineticArmorCompensationHardeningBonusGroupEnergized
-#
-# Used by:
-# Skill: Kinetic Armor Compensation
-type = "passive"
-
-
-def handler(fit, skill, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Armor Plating Energized",
-                                  "kineticDamageResistanceBonus",
-                                  skill.getModifiedItemAttr("hardeningBonus") * skill.level)
diff --git a/eos/effects/effect2112.py b/eos/effects/effect2112.py
deleted file mode 100644
index 8f33c77d7..000000000
--- a/eos/effects/effect2112.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# thermicArmorCompensationHardeningBonusGroupEnergized
-#
-# Used by:
-# Skill: Thermal Armor Compensation
-type = "passive"
-
-
-def handler(fit, skill, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Armor Plating Energized",
-                                  "thermalDamageResistanceBonus",
-                                  skill.getModifiedItemAttr("hardeningBonus") * skill.level)
diff --git a/eos/effects/effect212.py b/eos/effects/effect212.py
deleted file mode 100644
index f4d9c0886..000000000
--- a/eos/effects/effect212.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# sensorUpgradesCpuNeedBonusPostPercentCpuLocationShipModulesRequiringSensorUpgrades
-#
-# Used by:
-# Implants named like: Zainou 'Gypsy' Electronics Upgrades EU (6 of 6)
-# Modules named like: Liquid Cooled Electronics (8 of 8)
-# Skill: Electronics Upgrades
-type = "passive"
-
-
-def handler(fit, container, context):
-    level = container.level if "skill" in context else 1
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Electronics Upgrades"),
-                                  "cpu", container.getModifiedItemAttr("cpuNeedBonus") * level)
diff --git a/eos/effects/effect2130.py b/eos/effects/effect2130.py
deleted file mode 100644
index 86e95036d..000000000
--- a/eos/effects/effect2130.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# smallHybridMaxRangeBonus
-#
-# Used by:
-# Ship: Catalyst
-# Ship: Cormorant
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Hybrid Turret"),
-                                  "maxRange", ship.getModifiedItemAttr("maxRangeBonus"))
diff --git a/eos/effects/effect2131.py b/eos/effects/effect2131.py
deleted file mode 100644
index 4c13361f6..000000000
--- a/eos/effects/effect2131.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# smallEnergyMaxRangeBonus
-#
-# Used by:
-# Ship: Coercer
-# Ship: Gold Magnate
-# Ship: Silver Magnate
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Energy Turret"),
-                                  "maxRange", ship.getModifiedItemAttr("maxRangeBonus"))
diff --git a/eos/effects/effect2132.py b/eos/effects/effect2132.py
deleted file mode 100644
index b94e016be..000000000
--- a/eos/effects/effect2132.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# smallProjectileMaxRangeBonus
-#
-# Used by:
-# Ship: Thrasher
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Projectile Turret"),
-                                  "maxRange", ship.getModifiedItemAttr("maxRangeBonus"))
diff --git a/eos/effects/effect2133.py b/eos/effects/effect2133.py
deleted file mode 100644
index cc26638ad..000000000
--- a/eos/effects/effect2133.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# energyTransferArrayMaxRangeBonus
-#
-# Used by:
-# Ship: Augoror
-# Ship: Osprey
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Remote Capacitor Transmitter",
-                                  "maxRange", ship.getModifiedItemAttr("maxRangeBonus2"))
diff --git a/eos/effects/effect2134.py b/eos/effects/effect2134.py
deleted file mode 100644
index 8c4ce976e..000000000
--- a/eos/effects/effect2134.py
+++ /dev/null
@@ -1,15 +0,0 @@
-# shieldTransporterMaxRangeBonus
-#
-# Used by:
-# Ships from group: Industrial Command Ship (2 of 2)
-# Ship: Osprey
-# Ship: Rorqual
-# Ship: Scythe
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Remote Shield Booster", "maxRange",
-                                  ship.getModifiedItemAttr("maxRangeBonus"))
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Ancillary Remote Shield Booster", "maxRange",
-                                  ship.getModifiedItemAttr("maxRangeBonus"))
diff --git a/eos/effects/effect2135.py b/eos/effects/effect2135.py
deleted file mode 100644
index 60f66763c..000000000
--- a/eos/effects/effect2135.py
+++ /dev/null
@@ -1,16 +0,0 @@
-# armorRepairProjectorMaxRangeBonus
-#
-# Used by:
-# Variations of ship: Navitas (2 of 2)
-# Ship: Augoror
-# Ship: Deacon
-# Ship: Exequror
-# Ship: Inquisitor
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Remote Armor Repairer", "maxRange",
-                                  src.getModifiedItemAttr("maxRangeBonus"))
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Ancillary Remote Armor Repairer", "maxRange",
-                                  src.getModifiedItemAttr("maxRangeBonus"))
diff --git a/eos/effects/effect214.py b/eos/effects/effect214.py
deleted file mode 100644
index d7a2004e4..000000000
--- a/eos/effects/effect214.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# targetingMaxTargetBonusModAddMaxLockedTargetsLocationChar
-#
-# Used by:
-# Skills named like: Target Management (2 of 2)
-type = "passive", "structure"
-
-
-def handler(fit, skill, context):
-    amount = skill.getModifiedItemAttr("maxTargetBonus") * skill.level
-    fit.extraAttributes.increase("maxTargetsLockedFromSkills", amount)
diff --git a/eos/effects/effect2143.py b/eos/effects/effect2143.py
deleted file mode 100644
index cb80fba62..000000000
--- a/eos/effects/effect2143.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# minmatarShipEwTargetPainterMC2
-#
-# Used by:
-# Ship: Huginn
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Target Painter",
-                                  "signatureRadiusBonus", ship.getModifiedItemAttr("shipBonusMC2"),
-                                  skill="Minmatar Cruiser")
diff --git a/eos/effects/effect2155.py b/eos/effects/effect2155.py
deleted file mode 100644
index c6fdde891..000000000
--- a/eos/effects/effect2155.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# eliteBonusCommandShipProjectileDamageCS1
-#
-# Used by:
-# Ship: Sleipnir
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Projectile Turret"),
-                                  "damageMultiplier", ship.getModifiedItemAttr("eliteBonusCommandShips1"),
-                                  skill="Command Ships")
diff --git a/eos/effects/effect2156.py b/eos/effects/effect2156.py
deleted file mode 100644
index 074b7aaad..000000000
--- a/eos/effects/effect2156.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# eliteBonusCommandShipProjectileFalloffCS2
-#
-# Used by:
-# Ship: Sleipnir
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Projectile Turret"),
-                                  "falloff", ship.getModifiedItemAttr("eliteBonusCommandShips2"), skill="Command Ships")
diff --git a/eos/effects/effect2157.py b/eos/effects/effect2157.py
deleted file mode 100644
index a14f6cd70..000000000
--- a/eos/effects/effect2157.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# eliteBonusCommandShipLaserDamageCS1
-#
-# Used by:
-# Ship: Absolution
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Energy Turret"),
-                                  "damageMultiplier", ship.getModifiedItemAttr("eliteBonusCommandShips1"),
-                                  skill="Command Ships")
diff --git a/eos/effects/effect2158.py b/eos/effects/effect2158.py
deleted file mode 100644
index 50b0624e1..000000000
--- a/eos/effects/effect2158.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# eliteBonusCommandShipLaserROFCS2
-#
-# Used by:
-# Ship: Absolution
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Energy Turret"),
-                                  "speed", ship.getModifiedItemAttr("eliteBonusCommandShips2"), skill="Command Ships")
diff --git a/eos/effects/effect2160.py b/eos/effects/effect2160.py
deleted file mode 100644
index a2a89d17d..000000000
--- a/eos/effects/effect2160.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# eliteBonusCommandShipHybridFalloffCS2
-#
-# Used by:
-# Ship: Astarte
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Hybrid Turret"),
-                                  "falloff", ship.getModifiedItemAttr("eliteBonusCommandShips2"), skill="Command Ships")
diff --git a/eos/effects/effect2161.py b/eos/effects/effect2161.py
deleted file mode 100644
index c26d77ef6..000000000
--- a/eos/effects/effect2161.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# eliteBonusCommandShipHybridOptimalCS1
-#
-# Used by:
-# Ship: Vulture
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Hybrid Turret"),
-                                  "maxRange", ship.getModifiedItemAttr("eliteBonusCommandShips1"),
-                                  skill="Command Ships")
diff --git a/eos/effects/effect2179.py b/eos/effects/effect2179.py
deleted file mode 100644
index 8dabc04f0..000000000
--- a/eos/effects/effect2179.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# shipBonusDroneHitpointsGC2
-#
-# Used by:
-# Ships named like: Stratios (2 of 2)
-# Ship: Vexor
-# Ship: Vexor Navy Issue
-type = "passive"
-
-
-def handler(fit, ship, context):
-    for type in ("shieldCapacity", "armorHP", "hp"):
-        fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Drones"),
-                                     type, ship.getModifiedItemAttr("shipBonusGC2"), skill="Gallente Cruiser")
diff --git a/eos/effects/effect2181.py b/eos/effects/effect2181.py
deleted file mode 100644
index b761c859b..000000000
--- a/eos/effects/effect2181.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipBonusDroneHitpointsFixedAC2
-#
-# Used by:
-# Variations of ship: Arbitrator (3 of 3)
-type = "passive"
-
-
-def handler(fit, ship, context):
-    for type in ("shieldCapacity", "armorHP", "hp"):
-        fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Drones"),
-                                     type, ship.getModifiedItemAttr("shipBonusAC2"), skill="Amarr Cruiser")
diff --git a/eos/effects/effect2186.py b/eos/effects/effect2186.py
deleted file mode 100644
index 9a591a4bc..000000000
--- a/eos/effects/effect2186.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# shipBonusDroneHitpointsGB2
-#
-# Used by:
-# Variations of ship: Dominix (3 of 3)
-# Ship: Nestor
-type = "passive"
-
-
-def handler(fit, ship, context):
-    for type in ("shieldCapacity", "armorHP", "hp"):
-        fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Drones"),
-                                     type, ship.getModifiedItemAttr("shipBonusGB2"), skill="Gallente Battleship")
diff --git a/eos/effects/effect2187.py b/eos/effects/effect2187.py
deleted file mode 100644
index 19ea8bdde..000000000
--- a/eos/effects/effect2187.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# shipBonusDroneDamageMultiplierGB2
-#
-# Used by:
-# Variations of ship: Dominix (3 of 3)
-# Ship: Nestor
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Drones"),
-                                 "damageMultiplier", ship.getModifiedItemAttr("shipBonusGB2"),
-                                 skill="Gallente Battleship")
diff --git a/eos/effects/effect2188.py b/eos/effects/effect2188.py
deleted file mode 100644
index 9585f7590..000000000
--- a/eos/effects/effect2188.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# shipBonusDroneDamageMultiplierGC2
-#
-# Used by:
-# Ships named like: Stratios (2 of 2)
-# Ship: Vexor
-# Ship: Vexor Navy Issue
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Drones"),
-                                 "damageMultiplier", ship.getModifiedItemAttr("shipBonusGC2"), skill="Gallente Cruiser")
diff --git a/eos/effects/effect2189.py b/eos/effects/effect2189.py
deleted file mode 100644
index 24e284817..000000000
--- a/eos/effects/effect2189.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusDroneDamageMultiplierAC2
-#
-# Used by:
-# Variations of ship: Arbitrator (3 of 3)
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Drones"),
-                                 "damageMultiplier", ship.getModifiedItemAttr("shipBonusAC2"), skill="Amarr Cruiser")
diff --git a/eos/effects/effect2200.py b/eos/effects/effect2200.py
deleted file mode 100644
index 310c19504..000000000
--- a/eos/effects/effect2200.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# eliteBonusInterdictorsMissileKineticDamage1
-#
-# Used by:
-# Ship: Flycatcher
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredChargeBoost(
-        lambda mod: mod.charge.requiresSkill("Light Missiles") or mod.charge.requiresSkill("Rockets"),
-        "kineticDamage", ship.getModifiedItemAttr("eliteBonusInterdictors1"), skill="Interdictors")
diff --git a/eos/effects/effect2201.py b/eos/effects/effect2201.py
deleted file mode 100644
index 2b7450e2b..000000000
--- a/eos/effects/effect2201.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# eliteBonusInterdictorsProjectileFalloff1
-#
-# Used by:
-# Ship: Sabre
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Projectile Turret"),
-                                  "falloff", ship.getModifiedItemAttr("eliteBonusInterdictors1"), skill="Interdictors")
diff --git a/eos/effects/effect2215.py b/eos/effects/effect2215.py
deleted file mode 100644
index e3710e611..000000000
--- a/eos/effects/effect2215.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# shipBonusPirateFrigateProjDamage
-#
-# Used by:
-# Ship: Chremoas
-# Ship: Dramiel
-# Ship: Sunesis
-# Ship: Svipul
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Projectile Turret"),
-                                  "damageMultiplier", ship.getModifiedItemAttr("shipBonusRole7"))
diff --git a/eos/effects/effect223.py b/eos/effects/effect223.py
deleted file mode 100644
index 143f84076..000000000
--- a/eos/effects/effect223.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# navigationVelocityBonusPostPercentMaxVelocityLocationShip
-#
-# Used by:
-# Implant: Low-grade Snake Alpha
-# Implant: Mid-grade Snake Alpha
-type = "passive"
-
-
-def handler(fit, implant, context):
-    fit.ship.boostItemAttr("maxVelocity", implant.getModifiedItemAttr("velocityBonus"))
diff --git a/eos/effects/effect2232.py b/eos/effects/effect2232.py
deleted file mode 100644
index bccd06a4a..000000000
--- a/eos/effects/effect2232.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# scanStrengthBonusPercentOnline
-#
-# Used by:
-# Modules from group: Signal Amplifier (7 of 7)
-type = "passive"
-
-
-def handler(fit, module, context):
-    for type in ("Gravimetric", "Magnetometric", "Radar", "Ladar"):
-        fit.ship.boostItemAttr("scan%sStrength" % type,
-                               module.getModifiedItemAttr("scan%sStrengthPercent" % type),
-                               stackingPenalties=True)
diff --git a/eos/effects/effect2249.py b/eos/effects/effect2249.py
deleted file mode 100644
index 0fc338bf7..000000000
--- a/eos/effects/effect2249.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusDroneMiningAmountAC2
-#
-# Used by:
-# Ship: Arbitrator
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Drones"),
-                                 "miningAmount", ship.getModifiedItemAttr("shipBonusAC2"), skill="Amarr Cruiser")
diff --git a/eos/effects/effect2250.py b/eos/effects/effect2250.py
deleted file mode 100644
index e1bbc1314..000000000
--- a/eos/effects/effect2250.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipBonusDroneMiningAmountGC2
-#
-# Used by:
-# Ship: Vexor
-# Ship: Vexor Navy Issue
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Mining Drone Operation"),
-                                 "miningAmount", ship.getModifiedItemAttr("shipBonusGC2"), skill="Gallente Cruiser")
diff --git a/eos/effects/effect2251.py b/eos/effects/effect2251.py
deleted file mode 100644
index 9a3b30089..000000000
--- a/eos/effects/effect2251.py
+++ /dev/null
@@ -1,14 +0,0 @@
-# commandshipMultiRelayEffect
-#
-# Used by:
-# Ships from group: Command Ship (8 of 8)
-# Ships from group: Industrial Command Ship (2 of 2)
-# Ship: Rorqual
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemIncrease(lambda mod: mod.item.requiresSkill("Leadership"), "maxGroupActive",
-                                     src.getModifiedItemAttr("maxGangModules"))
-    fit.modules.filteredItemIncrease(lambda mod: mod.item.requiresSkill("Leadership"), "maxGroupOnline",
-                                     src.getModifiedItemAttr("maxGangModules"))
diff --git a/eos/effects/effect2252.py b/eos/effects/effect2252.py
deleted file mode 100644
index 7ea8e593d..000000000
--- a/eos/effects/effect2252.py
+++ /dev/null
@@ -1,20 +0,0 @@
-# covertOpsAndReconOpsCloakModuleDelayBonus
-#
-# Used by:
-# Ships from group: Black Ops (5 of 5)
-# Ships from group: Blockade Runner (4 of 4)
-# Ships from group: Covert Ops (8 of 8)
-# Ships from group: Expedition Frigate (2 of 2)
-# Ships from group: Force Recon Ship (9 of 9)
-# Ships from group: Stealth Bomber (5 of 5)
-# Ships named like: Stratios (2 of 2)
-# Subsystems named like: Defensive Covert Reconfiguration (4 of 4)
-# Ship: Astero
-# Ship: Rabisu
-type = "passive"
-
-
-def handler(fit, container, context):
-    fit.modules.filteredItemForce(lambda mod: mod.item.requiresSkill("Cloaking"),
-                                  "moduleReactivationDelay",
-                                  container.getModifiedItemAttr("covertOpsAndReconOpsCloakModuleDelay"))
diff --git a/eos/effects/effect2253.py b/eos/effects/effect2253.py
deleted file mode 100644
index 14d838e74..000000000
--- a/eos/effects/effect2253.py
+++ /dev/null
@@ -1,17 +0,0 @@
-# covertOpsStealthBomberTargettingDelayBonus
-#
-# Used by:
-# Ships from group: Black Ops (5 of 5)
-# Ships from group: Stealth Bomber (5 of 5)
-# Ship: Caedes
-# Ship: Chremoas
-# Ship: Endurance
-# Ship: Etana
-# Ship: Rabisu
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemForce(lambda mod: mod.item.group.name == "Cloaking Device",
-                                  "cloakingTargetingDelay",
-                                  ship.getModifiedItemAttr("covertOpsStealthBomberTargettingDelay"))
diff --git a/eos/effects/effect2255.py b/eos/effects/effect2255.py
deleted file mode 100644
index 27517bdc0..000000000
--- a/eos/effects/effect2255.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# tractorBeamCan
-#
-# Used by:
-# Deployables from group: Mobile Tractor Unit (3 of 3)
-# Modules from group: Tractor Beam (4 of 4)
-type = "active"
-
-
-def handler(fit, module, context):
-    pass
diff --git a/eos/effects/effect227.py b/eos/effects/effect227.py
deleted file mode 100644
index acf8b25e3..000000000
--- a/eos/effects/effect227.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# accerationControlCapNeedBonusPostPercentCapacitorNeedLocationShipGroupAfterburner
-#
-# Used by:
-# Modules named like: Dynamic Fuel Valve (8 of 8)
-type = "passive"
-
-
-def handler(fit, container, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Propulsion Module",
-                                  "capacitorNeed", container.getModifiedItemAttr("capNeedBonus"))
diff --git a/eos/effects/effect2298.py b/eos/effects/effect2298.py
deleted file mode 100644
index d00f4e2b6..000000000
--- a/eos/effects/effect2298.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# scanStrengthBonusPercentPassive
-#
-# Used by:
-# Implants named like: High grade (20 of 66)
-type = "passive"
-
-
-def handler(fit, implant, context):
-    for type in ("Gravimetric", "Magnetometric", "Radar", "Ladar"):
-        sensorType = "scan{0}Strength".format(type)
-        sensorBoost = "scan{0}StrengthPercent".format(type)
-        if sensorBoost in implant.item.attributes:
-            fit.ship.boostItemAttr(sensorType, implant.getModifiedItemAttr(sensorBoost))
diff --git a/eos/effects/effect230.py b/eos/effects/effect230.py
deleted file mode 100644
index 1d1b9c309..000000000
--- a/eos/effects/effect230.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# afterburnerDurationBonusPostPercentDurationLocationShipModulesRequiringAfterburner
-#
-# Used by:
-# Implants named like: Eifyr and Co. 'Rogue' Afterburner AB (6 of 6)
-# Implant: Zor's Custom Navigation Link
-# Skill: Afterburner
-type = "passive"
-
-
-def handler(fit, container, context):
-    level = container.level if "skill" in context else 1
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Afterburner"),
-                                  "duration", container.getModifiedItemAttr("durationBonus") * level)
diff --git a/eos/effects/effect2302.py b/eos/effects/effect2302.py
deleted file mode 100644
index f563fac03..000000000
--- a/eos/effects/effect2302.py
+++ /dev/null
@@ -1,15 +0,0 @@
-# damageControl
-#
-# Used by:
-# Modules from group: Damage Control (22 of 27)
-type = "passive"
-
-
-def handler(fit, module, context):
-    for layer, attrPrefix in (('shield', 'shield'), ('armor', 'armor'), ('hull', '')):
-        for damageType in ('Kinetic', 'Thermal', 'Explosive', 'Em'):
-            bonus = "%s%sDamageResonance" % (attrPrefix, damageType)
-            bonus = "%s%s" % (bonus[0].lower(), bonus[1:])
-            booster = "%s%sDamageResonance" % (layer, damageType)
-            fit.ship.multiplyItemAttr(bonus, module.getModifiedItemAttr(booster),
-                                      stackingPenalties=True, penaltyGroup="preMul")
diff --git a/eos/effects/effect2305.py b/eos/effects/effect2305.py
deleted file mode 100644
index a7051eb62..000000000
--- a/eos/effects/effect2305.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# eliteReconBonusEnergyNeutAmount2
-#
-# Used by:
-# Ship: Curse
-# Ship: Pilgrim
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Neutralizer",
-                                  "energyNeutralizerAmount", ship.getModifiedItemAttr("eliteBonusReconShip2"),
-                                  skill="Recon Ships")
diff --git a/eos/effects/effect235.py b/eos/effects/effect235.py
deleted file mode 100644
index 8e8bd9cec..000000000
--- a/eos/effects/effect235.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# warpdriveoperationWarpCapacitorNeedBonusPostPercentWarpCapacitorNeedLocationShip
-#
-# Used by:
-# Implants named like: Eifyr and Co. 'Rogue' Warp Drive Operation WD (6 of 6)
-type = "passive"
-
-
-def handler(fit, implant, context):
-    fit.ship.boostItemAttr("warpCapacitorNeed", implant.getModifiedItemAttr("warpCapacitorNeedBonus"))
diff --git a/eos/effects/effect2354.py b/eos/effects/effect2354.py
deleted file mode 100644
index 502143ed2..000000000
--- a/eos/effects/effect2354.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# capitalRemoteArmorRepairerCapNeedBonusSkill
-#
-# Used by:
-# Variations of module: Capital Remote Repair Augmentor I (2 of 2)
-# Skill: Capital Remote Armor Repair Systems
-type = "passive"
-
-
-def handler(fit, container, context):
-    level = container.level if "skill" in context else 1
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Remote Armor Repair Systems"),
-                                  "capacitorNeed", container.getModifiedItemAttr("capNeedBonus") * level)
diff --git a/eos/effects/effect2355.py b/eos/effects/effect2355.py
deleted file mode 100644
index 7ae9b3710..000000000
--- a/eos/effects/effect2355.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# capitalRemoteShieldTransferCapNeedBonusSkill
-#
-# Used by:
-# Skill: Capital Shield Emission Systems
-type = "passive"
-
-
-def handler(fit, container, context):
-    level = container.level if "skill" in context else 1
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Shield Emission Systems"),
-                                  "capacitorNeed", container.getModifiedItemAttr("capNeedBonus") * level)
diff --git a/eos/effects/effect2356.py b/eos/effects/effect2356.py
deleted file mode 100644
index a33d1250d..000000000
--- a/eos/effects/effect2356.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# capitalRemoteEnergyTransferCapNeedBonusSkill
-#
-# Used by:
-# Skill: Capital Capacitor Emission Systems
-type = "passive"
-
-
-def handler(fit, skill, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Capacitor Emission Systems"),
-                                  "capacitorNeed", skill.getModifiedItemAttr("capNeedBonus") * skill.level)
diff --git a/eos/effects/effect2402.py b/eos/effects/effect2402.py
deleted file mode 100644
index e2952621f..000000000
--- a/eos/effects/effect2402.py
+++ /dev/null
@@ -1,14 +0,0 @@
-# skillSuperWeaponDmgBonus
-#
-# Used by:
-# Skill: Doomsday Operation
-type = "passive"
-
-
-def handler(fit, skill, context):
-    damageTypes = ("em", "explosive", "kinetic", "thermal")
-    for dmgType in damageTypes:
-        dmgAttr = "{0}Damage".format(dmgType)
-        fit.modules.filteredItemBoost(
-            lambda mod: mod.item.group.name == "Super Weapon" and dmgAttr in mod.itemModifiedAttributes,
-            dmgAttr, skill.getModifiedItemAttr("damageMultiplierBonus") * skill.level)
diff --git a/eos/effects/effect242.py b/eos/effects/effect242.py
deleted file mode 100644
index dc38ae5f8..000000000
--- a/eos/effects/effect242.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# accerationControlSpeedFBonusPostPercentSpeedFactorLocationShipGroupAfterburner
-#
-# Used by:
-# Implants named like: Eifyr and Co. 'Rogue' Acceleration Control AC (6 of 6)
-type = "passive"
-
-
-def handler(fit, implant, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Propulsion Module",
-                                  "speedFactor", implant.getModifiedItemAttr("speedFBonus"))
diff --git a/eos/effects/effect2422.py b/eos/effects/effect2422.py
deleted file mode 100644
index d7841ad64..000000000
--- a/eos/effects/effect2422.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# implantVelocityBonus
-#
-# 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):
-    fit.ship.boostItemAttr("maxVelocity", implant.getModifiedItemAttr("implantBonusVelocity"))
diff --git a/eos/effects/effect2432.py b/eos/effects/effect2432.py
deleted file mode 100644
index da1896d18..000000000
--- a/eos/effects/effect2432.py
+++ /dev/null
@@ -1,15 +0,0 @@
-# energyManagementCapacitorBonusPostPercentCapacityLocationShipGroupCapacitorCapacityBonus
-#
-# Used by:
-# Implants named like: Inherent Implants 'Squire' Capacitor Management EM (6 of 6)
-# Implants named like: Mindflood Booster (4 of 4)
-# Modules named like: Semiconductor Memory Cell (8 of 8)
-# Implant: Antipharmakon Aeolis
-# Implant: Genolution Core Augmentation CA-1
-# Skill: Capacitor Management
-type = "passive"
-
-
-def handler(fit, container, context):
-    level = container.level if "skill" in context else 1
-    fit.ship.boostItemAttr("capacitorCapacity", container.getModifiedItemAttr("capacitorCapacityBonus") * level)
diff --git a/eos/effects/effect244.py b/eos/effects/effect244.py
deleted file mode 100644
index 12ae33b27..000000000
--- a/eos/effects/effect244.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# highSpeedManuveringCapacitorNeedMultiplierPostPercentCapacitorNeedLocationShipModulesRequiringHighSpeedManuvering
-#
-# Used by:
-# Implants named like: Eifyr and Co. 'Rogue' High Speed Maneuvering HS (6 of 6)
-# Skill: High Speed Maneuvering
-type = "passive"
-
-
-def handler(fit, container, context):
-    level = container.level if "skill" in context else 1
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("High Speed Maneuvering"),
-                                  "capacitorNeed", container.getModifiedItemAttr("capNeedBonus") * level)
diff --git a/eos/effects/effect2444.py b/eos/effects/effect2444.py
deleted file mode 100644
index 7cba56603..000000000
--- a/eos/effects/effect2444.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# minerCpuUsageMultiplyPercent2
-#
-# Used by:
-# Variations of module: Mining Laser Upgrade I (5 of 5)
-# Module: Frostline 'Omnivore' Harvester Upgrade
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Mining"),
-                                  "cpu", module.getModifiedItemAttr("cpuPenaltyPercent"))
diff --git a/eos/effects/effect2445.py b/eos/effects/effect2445.py
deleted file mode 100644
index 666c030a6..000000000
--- a/eos/effects/effect2445.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# iceMinerCpuUsagePercent
-#
-# Used by:
-# 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"),
-                                  "cpu", module.getModifiedItemAttr("cpuPenaltyPercent"))
diff --git a/eos/effects/effect2456.py b/eos/effects/effect2456.py
deleted file mode 100644
index f5afa70b6..000000000
--- a/eos/effects/effect2456.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# miningUpgradeCPUPenaltyReductionModulesRequiringMiningUpgradePercent
-#
-# Used by:
-# Implants named like: Inherent Implants 'Highwall' Mining Upgrades MU (3 of 3)
-# Skill: Mining Upgrades
-type = "passive"
-
-
-def handler(fit, container, context):
-    level = container.level if "skill" in context else 1
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Mining Upgrades"),
-                                  "cpuPenaltyPercent",
-                                  container.getModifiedItemAttr("miningUpgradeCPUReductionBonus") * level)
diff --git a/eos/effects/effect2465.py b/eos/effects/effect2465.py
deleted file mode 100644
index cc3351844..000000000
--- a/eos/effects/effect2465.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# shipBonusArmorResistAB
-#
-# Used by:
-# Ship: Abaddon
-# Ship: Nestor
-type = "passive"
-
-
-def handler(fit, ship, context):
-    for type in ("Em", "Explosive", "Kinetic", "Thermal"):
-        fit.ship.boostItemAttr("armor{0}DamageResonance".format(type), ship.getModifiedItemAttr("shipBonusAB"),
-                               skill="Amarr Battleship")
diff --git a/eos/effects/effect2479.py b/eos/effects/effect2479.py
deleted file mode 100644
index 500775345..000000000
--- a/eos/effects/effect2479.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# iceHarvestCycleTimeModulesRequiringIceHarvestingOnline
-#
-# Used by:
-# Variations of module: Ice Harvester Upgrade I (5 of 5)
-# Module: Frostline 'Omnivore' Harvester Upgrade
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Ice Harvesting"),
-                                  "duration", module.getModifiedItemAttr("iceHarvestCycleBonus"))
diff --git a/eos/effects/effect2485.py b/eos/effects/effect2485.py
deleted file mode 100644
index 36c997118..000000000
--- a/eos/effects/effect2485.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# implantArmorHpBonus2
-#
-# 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"
-
-
-def handler(fit, implant, context):
-    fit.ship.boostItemAttr("armorHP", implant.getModifiedItemAttr("armorHpBonus2"))
diff --git a/eos/effects/effect2488.py b/eos/effects/effect2488.py
deleted file mode 100644
index 3a39e759f..000000000
--- a/eos/effects/effect2488.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# implantVelocityBonus2
-#
-# Used by:
-# Implant: Republic Special Ops Field Enhancer - Gamma
-type = "passive"
-
-
-def handler(fit, implant, context):
-    fit.ship.boostItemAttr("maxVelocity", implant.getModifiedItemAttr("velocityBonus2"))
diff --git a/eos/effects/effect2489.py b/eos/effects/effect2489.py
deleted file mode 100644
index c760a4b28..000000000
--- a/eos/effects/effect2489.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipBonusRemoteTrackingComputerFalloffMC
-#
-# Used by:
-# Ship: Scimitar
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Remote Tracking Computer",
-                                  "falloffEffectiveness", ship.getModifiedItemAttr("shipBonusMC"),
-                                  skill="Minmatar Cruiser")
diff --git a/eos/effects/effect2490.py b/eos/effects/effect2490.py
deleted file mode 100644
index 0c65a20f2..000000000
--- a/eos/effects/effect2490.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipBonusRemoteTrackingComputerFalloffGC2
-#
-# Used by:
-# Ship: Oneiros
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Remote Tracking Computer",
-                                  "falloffEffectiveness", ship.getModifiedItemAttr("shipBonusGC2"),
-                                  skill="Gallente Cruiser")
diff --git a/eos/effects/effect2491.py b/eos/effects/effect2491.py
deleted file mode 100644
index 1f257c03c..000000000
--- a/eos/effects/effect2491.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# ewSkillEcmBurstRangeBonus
-#
-# Used by:
-# Modules named like: Particle Dispersion Projector (8 of 8)
-# Skill: Long Distance Jamming
-type = "passive"
-
-
-def handler(fit, container, context):
-    level = container.level if "skill" in context else 1
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Burst Jammer",
-                                  "ecmBurstRange", container.getModifiedItemAttr("rangeSkillBonus") * level,
-                                  stackingPenalties=False if "skill" in context else True)
diff --git a/eos/effects/effect2492.py b/eos/effects/effect2492.py
deleted file mode 100644
index 0e836193a..000000000
--- a/eos/effects/effect2492.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# ewSkillEcmBurstCapNeedBonus
-#
-# Used by:
-# Implants named like: Zainou 'Gypsy' Electronic Warfare EW (6 of 6)
-# Modules named like: Signal Disruption Amplifier (8 of 8)
-# Skill: Electronic Warfare
-type = "passive"
-
-
-def handler(fit, container, context):
-    level = container.level if "skill" in context else 1
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Burst Jammer",
-                                  "capacitorNeed", container.getModifiedItemAttr("capNeedBonus") * level)
diff --git a/eos/effects/effect25.py b/eos/effects/effect25.py
deleted file mode 100644
index c998bcaa0..000000000
--- a/eos/effects/effect25.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# capacitorCapacityBonus
-#
-# Used by:
-# Modules from group: Capacitor Battery (30 of 30)
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.ship.increaseItemAttr("capacitorCapacity", ship.getModifiedItemAttr("capacitorBonus"))
diff --git a/eos/effects/effect2503.py b/eos/effects/effect2503.py
deleted file mode 100644
index 244003ecd..000000000
--- a/eos/effects/effect2503.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# shipHTTrackingBonusGB2
-#
-# Used by:
-# Ships named like: Megathron (3 of 3)
-# Ship: Marshal
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Large Hybrid Turret"),
-                                  "trackingSpeed", ship.getModifiedItemAttr("shipBonusGB2"),
-                                  skill="Gallente Battleship")
diff --git a/eos/effects/effect2504.py b/eos/effects/effect2504.py
deleted file mode 100644
index 77b58a6d6..000000000
--- a/eos/effects/effect2504.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# shipBonusHybridTrackingGF2
-#
-# Used by:
-# Ship: Ares
-# Ship: Federation Navy Comet
-# Ship: Pacifier
-# Ship: Tristan
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Hybrid Turret"),
-                                  "trackingSpeed", ship.getModifiedItemAttr("shipBonusGF2"), skill="Gallente Frigate")
diff --git a/eos/effects/effect2561.py b/eos/effects/effect2561.py
deleted file mode 100644
index 2031a3db3..000000000
--- a/eos/effects/effect2561.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# eliteBonusAssaultShipMissileVelocity1
-#
-# Used by:
-# Ship: Hawk
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"),
-                                    "maxVelocity", ship.getModifiedItemAttr("eliteBonusGunship1"),
-                                    skill="Assault Frigates")
diff --git a/eos/effects/effect2589.py b/eos/effects/effect2589.py
deleted file mode 100644
index 604e3e14b..000000000
--- a/eos/effects/effect2589.py
+++ /dev/null
@@ -1,14 +0,0 @@
-# modifyBoosterEffectChanceWithBoosterChanceBonusPostPercent
-#
-# Used by:
-# Implants named like: Eifyr and Co. 'Alchemist' Neurotoxin Recovery NR (2 of 2)
-# Skill: Neurotoxin Recovery
-type = "passive"
-
-
-def handler(fit, container, context):
-    level = container.level if "skill" in context else 1
-    for i in range(5):
-        attr = "boosterEffectChance{0}".format(i + 1)
-        fit.boosters.filteredItemBoost(lambda booster: attr in booster.itemModifiedAttributes,
-                                       attr, container.getModifiedItemAttr("boosterChanceBonus") * level)
diff --git a/eos/effects/effect26.py b/eos/effects/effect26.py
deleted file mode 100644
index 40a88a261..000000000
--- a/eos/effects/effect26.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# structureRepair
-#
-# Used by:
-# Modules from group: Hull Repair Unit (25 of 25)
-type = "active"
-runTime = "late"
-
-
-def handler(fit, module, context):
-    amount = module.getModifiedItemAttr("structureDamageAmount")
-    speed = module.getModifiedItemAttr("duration") / 1000.0
-    fit.extraAttributes.increase("hullRepair", amount / speed)
diff --git a/eos/effects/effect2602.py b/eos/effects/effect2602.py
deleted file mode 100644
index f69913dfd..000000000
--- a/eos/effects/effect2602.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# shipBonusEmShieldResistanceCB2
-#
-# Used by:
-# Ship: Rattlesnake
-# Ship: Rokh
-# Ship: Scorpion Navy Issue
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.ship.boostItemAttr("shieldEmDamageResonance", ship.getModifiedItemAttr("shipBonus2CB"),
-                           skill="Caldari Battleship")
diff --git a/eos/effects/effect2603.py b/eos/effects/effect2603.py
deleted file mode 100644
index 8c1459e98..000000000
--- a/eos/effects/effect2603.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# shipBonusExplosiveShieldResistanceCB2
-#
-# Used by:
-# Ship: Rattlesnake
-# Ship: Rokh
-# Ship: Scorpion Navy Issue
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.ship.boostItemAttr("shieldExplosiveDamageResonance", ship.getModifiedItemAttr("shipBonus2CB"),
-                           skill="Caldari Battleship")
diff --git a/eos/effects/effect2604.py b/eos/effects/effect2604.py
deleted file mode 100644
index 257628fe1..000000000
--- a/eos/effects/effect2604.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# shipBonusKineticShieldResistanceCB2
-#
-# Used by:
-# Ship: Rattlesnake
-# Ship: Rokh
-# Ship: Scorpion Navy Issue
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.ship.boostItemAttr("shieldKineticDamageResonance", ship.getModifiedItemAttr("shipBonus2CB"),
-                           skill="Caldari Battleship")
diff --git a/eos/effects/effect2605.py b/eos/effects/effect2605.py
deleted file mode 100644
index 96067063f..000000000
--- a/eos/effects/effect2605.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# shipBonusThermicShieldResistanceCB2
-#
-# Used by:
-# Ship: Rattlesnake
-# Ship: Rokh
-# Ship: Scorpion Navy Issue
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.ship.boostItemAttr("shieldThermalDamageResonance", ship.getModifiedItemAttr("shipBonus2CB"),
-                           skill="Caldari Battleship")
diff --git a/eos/effects/effect2611.py b/eos/effects/effect2611.py
deleted file mode 100644
index f0545ec68..000000000
--- a/eos/effects/effect2611.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# eliteBonusGunshipProjectileDamage1
-#
-# Used by:
-# Ship: Wolf
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Projectile Turret"),
-                                  "damageMultiplier", ship.getModifiedItemAttr("eliteBonusGunship1"),
-                                  skill="Assault Frigates")
diff --git a/eos/effects/effect2644.py b/eos/effects/effect2644.py
deleted file mode 100644
index 1ae8fe69a..000000000
--- a/eos/effects/effect2644.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# increaseSignatureRadiusOnline
-#
-# Used by:
-# Modules from group: Inertial Stabilizer (7 of 7)
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.ship.boostItemAttr("signatureRadius", module.getModifiedItemAttr("signatureRadiusBonus"), stackingPenalties=True)
diff --git a/eos/effects/effect2645.py b/eos/effects/effect2645.py
deleted file mode 100644
index 9b453a4c8..000000000
--- a/eos/effects/effect2645.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# scanResolutionMultiplierOnline
-#
-# Used by:
-# Modules from group: Warp Core Stabilizer (8 of 8)
-# Module: Target Spectrum Breaker
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.ship.multiplyItemAttr("scanResolution", module.getModifiedItemAttr("scanResolutionMultiplier"),
-                              stackingPenalties=True)
diff --git a/eos/effects/effect2646.py b/eos/effects/effect2646.py
deleted file mode 100644
index 96731483b..000000000
--- a/eos/effects/effect2646.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# maxTargetRangeBonus
-#
-# Used by:
-# Modules from group: Warp Core Stabilizer (8 of 8)
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.ship.boostItemAttr("maxTargetRange", module.getModifiedItemAttr("maxTargetRangeBonus"),
-                           stackingPenalties=True)
diff --git a/eos/effects/effect2647.py b/eos/effects/effect2647.py
deleted file mode 100644
index 178f96aa9..000000000
--- a/eos/effects/effect2647.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# eliteBonusHeavyGunshipHeavyMissileLaunhcerRof2
-#
-# Used by:
-# Ship: Cerberus
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Missile Launcher Heavy",
-                                  "speed", ship.getModifiedItemAttr("eliteBonusHeavyGunship2"),
-                                  skill="Heavy Assault Cruisers")
diff --git a/eos/effects/effect2648.py b/eos/effects/effect2648.py
deleted file mode 100644
index c3de080b1..000000000
--- a/eos/effects/effect2648.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# eliteBonusHeavyGunshipHeavyAssaultMissileLaunhcerRof2
-#
-# Used by:
-# Ship: Cerberus
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Missile Launcher Heavy Assault",
-                                  "speed", ship.getModifiedItemAttr("eliteBonusHeavyGunship2"),
-                                  skill="Heavy Assault Cruisers")
diff --git a/eos/effects/effect2649.py b/eos/effects/effect2649.py
deleted file mode 100644
index 27b7cefba..000000000
--- a/eos/effects/effect2649.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# eliteBonusHeavyGunshipAssaultMissileLaunhcerRof2
-#
-# Used by:
-# Ship: Cerberus
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Missile Launcher Rapid Light",
-                                  "speed", ship.getModifiedItemAttr("eliteBonusHeavyGunship2"),
-                                  skill="Heavy Assault Cruisers")
diff --git a/eos/effects/effect2670.py b/eos/effects/effect2670.py
deleted file mode 100644
index f79c16a57..000000000
--- a/eos/effects/effect2670.py
+++ /dev/null
@@ -1,19 +0,0 @@
-# sensorBoosterActivePercentage
-#
-# Used by:
-# Modules from group: Sensor Booster (16 of 16)
-type = "active"
-
-
-def handler(fit, module, context):
-    fit.ship.boostItemAttr("maxTargetRange", module.getModifiedItemAttr("maxTargetRangeBonus"),
-                           stackingPenalties=True)
-    fit.ship.boostItemAttr("scanResolution", module.getModifiedItemAttr("scanResolutionBonus"),
-                           stackingPenalties=True)
-
-    for scanType in ("Gravimetric", "Magnetometric", "Radar", "Ladar"):
-        fit.ship.boostItemAttr(
-            "scan{}Strength".format(scanType),
-            module.getModifiedItemAttr("scan{}StrengthPercent".format(scanType)),
-            stackingPenalties=True
-        )
diff --git a/eos/effects/effect2688.py b/eos/effects/effect2688.py
deleted file mode 100644
index e37290e63..000000000
--- a/eos/effects/effect2688.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# capNeedBonusEffectLasers
-#
-# Used by:
-# Modules named like: Energy Discharge Elutriation (8 of 8)
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Weapon",
-                                  "capacitorNeed", module.getModifiedItemAttr("capNeedBonus"))
diff --git a/eos/effects/effect2689.py b/eos/effects/effect2689.py
deleted file mode 100644
index 8f1cad753..000000000
--- a/eos/effects/effect2689.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# capNeedBonusEffectHybrids
-#
-# Used by:
-# Modules named like: Hybrid Discharge Elutriation (8 of 8)
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Hybrid Weapon",
-                                  "capacitorNeed", module.getModifiedItemAttr("capNeedBonus"))
diff --git a/eos/effects/effect2690.py b/eos/effects/effect2690.py
deleted file mode 100644
index 689898682..000000000
--- a/eos/effects/effect2690.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# cpuNeedBonusEffectLasers
-#
-# Used by:
-# Modules named like: Algid Energy Administrations Unit (8 of 8)
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Weapon",
-                                  "cpu", module.getModifiedItemAttr("cpuNeedBonus"))
diff --git a/eos/effects/effect2691.py b/eos/effects/effect2691.py
deleted file mode 100644
index b3e7d6c75..000000000
--- a/eos/effects/effect2691.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# cpuNeedBonusEffectHybrid
-#
-# Used by:
-# Modules named like: Algid Hybrid Administrations Unit (8 of 8)
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Hybrid Weapon",
-                                  "cpu", module.getModifiedItemAttr("cpuNeedBonus"))
diff --git a/eos/effects/effect2693.py b/eos/effects/effect2693.py
deleted file mode 100644
index dd5838c5a..000000000
--- a/eos/effects/effect2693.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# falloffBonusEffectLasers
-#
-# Used by:
-# Modules named like: Energy Ambit Extension (8 of 8)
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Weapon",
-                                  "falloff", module.getModifiedItemAttr("falloffBonus"),
-                                  stackingPenalties=True)
diff --git a/eos/effects/effect2694.py b/eos/effects/effect2694.py
deleted file mode 100644
index 94f3ab90b..000000000
--- a/eos/effects/effect2694.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# falloffBonusEffectHybrids
-#
-# Used by:
-# Modules named like: Hybrid Ambit Extension (8 of 8)
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Hybrid Weapon",
-                                  "falloff", module.getModifiedItemAttr("falloffBonus"),
-                                  stackingPenalties=True)
diff --git a/eos/effects/effect2695.py b/eos/effects/effect2695.py
deleted file mode 100644
index 0de580e18..000000000
--- a/eos/effects/effect2695.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# falloffBonusEffectProjectiles
-#
-# Used by:
-# Modules named like: Projectile Ambit Extension (8 of 8)
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Projectile Weapon",
-                                  "falloff", module.getModifiedItemAttr("falloffBonus"),
-                                  stackingPenalties=True)
diff --git a/eos/effects/effect2696.py b/eos/effects/effect2696.py
deleted file mode 100644
index 7f4126ad8..000000000
--- a/eos/effects/effect2696.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# maxRangeBonusEffectLasers
-#
-# Used by:
-# Modules named like: Energy Locus Coordinator (8 of 8)
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Weapon",
-                                  "maxRange", module.getModifiedItemAttr("maxRangeBonus"),
-                                  stackingPenalties=True)
diff --git a/eos/effects/effect2697.py b/eos/effects/effect2697.py
deleted file mode 100644
index 68f035cc6..000000000
--- a/eos/effects/effect2697.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# maxRangeBonusEffectHybrids
-#
-# Used by:
-# Modules named like: Hybrid Locus Coordinator (8 of 8)
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Hybrid Weapon",
-                                  "maxRange", module.getModifiedItemAttr("maxRangeBonus"),
-                                  stackingPenalties=True)
diff --git a/eos/effects/effect2698.py b/eos/effects/effect2698.py
deleted file mode 100644
index 5f433584c..000000000
--- a/eos/effects/effect2698.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# maxRangeBonusEffectProjectiles
-#
-# Used by:
-# Modules named like: Projectile Locus Coordinator (8 of 8)
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Projectile Weapon",
-                                  "maxRange", module.getModifiedItemAttr("maxRangeBonus"),
-                                  stackingPenalties=True)
diff --git a/eos/effects/effect27.py b/eos/effects/effect27.py
deleted file mode 100644
index 07c1926da..000000000
--- a/eos/effects/effect27.py
+++ /dev/null
@@ -1,15 +0,0 @@
-# armorRepair
-#
-# Used by:
-# Modules from group: Armor Repair Unit (108 of 108)
-runTime = "late"
-type = "active"
-
-
-def handler(fit, module, context):
-    amount = module.getModifiedItemAttr("armorDamageAmount")
-    speed = module.getModifiedItemAttr("duration") / 1000.0
-    rps = amount / speed
-    fit.extraAttributes.increase("armorRepair", rps)
-    fit.extraAttributes.increase("armorRepairPreSpool", rps)
-    fit.extraAttributes.increase("armorRepairFullSpool", rps)
diff --git a/eos/effects/effect2706.py b/eos/effects/effect2706.py
deleted file mode 100644
index addcabb17..000000000
--- a/eos/effects/effect2706.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# drawbackPowerNeedLasers
-#
-# Used by:
-# Modules from group: Rig Energy Weapon (56 of 56)
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Weapon",
-                                  "power", module.getModifiedItemAttr("drawback"))
diff --git a/eos/effects/effect2707.py b/eos/effects/effect2707.py
deleted file mode 100644
index 68a8c4233..000000000
--- a/eos/effects/effect2707.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# drawbackPowerNeedHybrids
-#
-# Used by:
-# Modules from group: Rig Hybrid Weapon (56 of 56)
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Hybrid Weapon",
-                                  "power", module.getModifiedItemAttr("drawback"))
diff --git a/eos/effects/effect2708.py b/eos/effects/effect2708.py
deleted file mode 100644
index 0f8490bfd..000000000
--- a/eos/effects/effect2708.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# drawbackPowerNeedProjectiles
-#
-# Used by:
-# Modules from group: Rig Projectile Weapon (40 of 40)
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Projectile Weapon",
-                                  "power", module.getModifiedItemAttr("drawback"))
diff --git a/eos/effects/effect271.py b/eos/effects/effect271.py
deleted file mode 100644
index 9d9ba7b72..000000000
--- a/eos/effects/effect271.py
+++ /dev/null
@@ -1,14 +0,0 @@
-# hullUpgradesArmorHpBonusPostPercentHpLocationShip
-#
-# Used by:
-# Implants named like: grade Slave (15 of 18)
-# Modules named like: Trimark Armor Pump (8 of 8)
-# Implant: Low-grade Snake Epsilon
-# Implant: Mid-grade Snake Epsilon
-# Skill: Hull Upgrades
-type = "passive"
-
-
-def handler(fit, container, context):
-    level = container.level if "skill" in context else 1
-    fit.ship.boostItemAttr("armorHP", (container.getModifiedItemAttr("armorHpBonus") or 0) * level)
diff --git a/eos/effects/effect2712.py b/eos/effects/effect2712.py
deleted file mode 100644
index 94c4fb0ff..000000000
--- a/eos/effects/effect2712.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# drawbackArmorHP
-#
-# Used by:
-# Modules from group: Rig Navigation (48 of 64)
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.ship.boostItemAttr("armorHP", module.getModifiedItemAttr("drawback"))
diff --git a/eos/effects/effect2713.py b/eos/effects/effect2713.py
deleted file mode 100644
index 659199ee1..000000000
--- a/eos/effects/effect2713.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# drawbackCPUOutput
-#
-# Used by:
-# Modules from group: Rig Drones (58 of 64)
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.ship.boostItemAttr("cpuOutput", module.getModifiedItemAttr("drawback"))
diff --git a/eos/effects/effect2714.py b/eos/effects/effect2714.py
deleted file mode 100644
index cb22a2523..000000000
--- a/eos/effects/effect2714.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# drawbackCPUNeedLaunchers
-#
-# Used by:
-# Modules from group: Rig Launcher (48 of 48)
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Missile Launcher Operation"),
-                                  "cpu", module.getModifiedItemAttr("drawback"))
diff --git a/eos/effects/effect2716.py b/eos/effects/effect2716.py
deleted file mode 100644
index 176bdd423..000000000
--- a/eos/effects/effect2716.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# drawbackSigRad
-#
-# Used by:
-# Modules from group: Rig Shield (72 of 72)
-# Modules named like: Optimizer (16 of 16)
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.ship.boostItemAttr("signatureRadius", module.getModifiedItemAttr("drawback"), stackingPenalties=True)
diff --git a/eos/effects/effect2717.py b/eos/effects/effect2717.py
deleted file mode 100644
index 8bdd806ae..000000000
--- a/eos/effects/effect2717.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# drawbackMaxVelocity
-#
-# Used by:
-# Modules from group: Rig Armor (48 of 72)
-# Modules from group: Rig Resource Processing (8 of 10)
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.ship.boostItemAttr("maxVelocity", module.getModifiedItemAttr("drawback"),
-                           stackingPenalties=True)
diff --git a/eos/effects/effect2718.py b/eos/effects/effect2718.py
deleted file mode 100644
index 84887a559..000000000
--- a/eos/effects/effect2718.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# drawbackShieldCapacity
-#
-# Used by:
-# 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/effect272.py b/eos/effects/effect272.py
deleted file mode 100644
index 79a48defa..000000000
--- a/eos/effects/effect272.py
+++ /dev/null
@@ -1,14 +0,0 @@
-# repairSystemsDurationBonusPostPercentDurationLocationShipModulesRequiringRepairSystems
-#
-# Used by:
-# Implants named like: Inherent Implants 'Noble' Repair Systems RS (6 of 6)
-# Modules named like: Nanobot Accelerator (8 of 8)
-# Implant: Numon Family Heirloom
-# Skill: Repair Systems
-type = "passive"
-
-
-def handler(fit, container, context):
-    level = container.level if "skill" in context else 1
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Repair Systems"),
-                                  "duration", container.getModifiedItemAttr("durationSkillBonus") * level)
diff --git a/eos/effects/effect2726.py b/eos/effects/effect2726.py
deleted file mode 100644
index f37896233..000000000
--- a/eos/effects/effect2726.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# miningClouds
-#
-# Used by:
-# Modules from group: Gas Cloud Harvester (5 of 5)
-type = "active"
-
-
-def handler(fit, module, context):
-    pass
diff --git a/eos/effects/effect2727.py b/eos/effects/effect2727.py
deleted file mode 100644
index 3491f2f44..000000000
--- a/eos/effects/effect2727.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# gasCloudHarvestingMaxGroupSkillLevel
-#
-# Used by:
-# Skill: Gas Cloud Harvesting
-type = "passive"
-
-
-def handler(fit, skill, context):
-    fit.modules.filteredItemIncrease(lambda mod: mod.item.group.name == "Gas Cloud Harvester",
-                                     "maxGroupActive", skill.level)
diff --git a/eos/effects/effect273.py b/eos/effects/effect273.py
deleted file mode 100644
index 2d59d3d3a..000000000
--- a/eos/effects/effect273.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# shieldUpgradesPowerNeedBonusPostPercentPowerLocationShipModulesRequiringShieldUpgrades
-#
-# Used by:
-# Implants named like: Zainou 'Gnome' Shield Upgrades SU (6 of 6)
-# Modules named like: Core Defense Charge Economizer (8 of 8)
-# Skill: Shield Upgrades
-type = "passive"
-
-
-def handler(fit, container, context):
-    level = container.level if "skill" in context else 1
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Upgrades"),
-                                  "power", container.getModifiedItemAttr("powerNeedBonus") * level)
diff --git a/eos/effects/effect2734.py b/eos/effects/effect2734.py
deleted file mode 100644
index 6d1640619..000000000
--- a/eos/effects/effect2734.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# shipECMScanStrengthBonusCF
-#
-# Used by:
-# Variations of ship: Griffin (3 of 3)
-type = "passive"
-
-
-def handler(fit, ship, context):
-    for type in ("Gravimetric", "Ladar", "Radar", "Magnetometric"):
-        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "ECM",
-                                      "scan{0}StrengthBonus".format(type),
-                                      ship.getModifiedItemAttr("shipBonusCF"), skill="Caldari Frigate")
diff --git a/eos/effects/effect2735.py b/eos/effects/effect2735.py
deleted file mode 100644
index 0620ca719..000000000
--- a/eos/effects/effect2735.py
+++ /dev/null
@@ -1,15 +0,0 @@
-# boosterArmorHpPenalty
-#
-# Used by:
-# Implants named like: Booster (12 of 35)
-type = "boosterSideEffect"
-
-# User-friendly name for the side effect
-displayName = "Armor Capacity"
-
-# Attribute that this effect targets
-attr = "boosterArmorHPPenalty"
-
-
-def handler(fit, booster, context):
-    fit.ship.boostItemAttr("armorHP", booster.getModifiedItemAttr(attr))
diff --git a/eos/effects/effect2736.py b/eos/effects/effect2736.py
deleted file mode 100644
index 32596c796..000000000
--- a/eos/effects/effect2736.py
+++ /dev/null
@@ -1,18 +0,0 @@
-# boosterArmorRepairAmountPenalty
-#
-# Used by:
-# Implants named like: Drop Booster (3 of 4)
-# Implants named like: Mindflood Booster (3 of 4)
-# Implants named like: Sooth Sayer Booster (3 of 4)
-type = "boosterSideEffect"
-
-# User-friendly name for the side effect
-displayName = "Armor Repair Amount"
-
-# Attribute that this effect targets
-attr = "boosterArmorRepairAmountPenalty"
-
-
-def handler(fit, booster, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Armor Repair Unit",
-                                  "armorDamageAmount", booster.getModifiedItemAttr(attr))
diff --git a/eos/effects/effect2737.py b/eos/effects/effect2737.py
deleted file mode 100644
index f93f04af9..000000000
--- a/eos/effects/effect2737.py
+++ /dev/null
@@ -1,15 +0,0 @@
-# boosterShieldCapacityPenalty
-#
-# Used by:
-# Implants from group: Booster (12 of 70)
-type = "boosterSideEffect"
-
-# User-friendly name for the side effect
-displayName = "Shield Capacity"
-
-# Attribute that this effect targets
-attr = "boosterShieldCapacityPenalty"
-
-
-def handler(fit, booster, context):
-    fit.ship.boostItemAttr("shieldCapacity", booster.getModifiedItemAttr(attr))
diff --git a/eos/effects/effect2739.py b/eos/effects/effect2739.py
deleted file mode 100644
index e62bef3f5..000000000
--- a/eos/effects/effect2739.py
+++ /dev/null
@@ -1,18 +0,0 @@
-# boosterTurretOptimalRangePenalty
-#
-# Used by:
-# Implants named like: Blue Pill Booster (3 of 5)
-# Implants named like: Mindflood Booster (3 of 4)
-# Implants named like: Sooth Sayer Booster (3 of 4)
-type = "boosterSideEffect"
-
-# User-friendly name for the side effect
-displayName = "Turret Optimal Range"
-
-# Attribute that this effect targets
-attr = "boosterTurretOptimalRangePenalty"
-
-
-def handler(fit, booster, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Gunnery"),
-                                  "maxRange", booster.getModifiedItemAttr(attr))
diff --git a/eos/effects/effect2741.py b/eos/effects/effect2741.py
deleted file mode 100644
index 636c49909..000000000
--- a/eos/effects/effect2741.py
+++ /dev/null
@@ -1,17 +0,0 @@
-# boosterTurretFalloffPenalty
-#
-# Used by:
-# Implants named like: Drop Booster (3 of 4)
-# Implants named like: X Instinct Booster (3 of 4)
-type = "boosterSideEffect"
-
-# User-friendly name for the side effect
-displayName = "Turret Falloff"
-
-# Attribute that this effect targets
-attr = "boosterTurretFalloffPenalty"
-
-
-def handler(fit, booster, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Gunnery"),
-                                  "falloff", booster.getModifiedItemAttr(attr))
diff --git a/eos/effects/effect2745.py b/eos/effects/effect2745.py
deleted file mode 100644
index 1f546f439..000000000
--- a/eos/effects/effect2745.py
+++ /dev/null
@@ -1,16 +0,0 @@
-# boosterCapacitorCapacityPenalty
-#
-# Used by:
-# Implants named like: Blue Pill Booster (3 of 5)
-# Implants named like: Exile Booster (3 of 4)
-type = "boosterSideEffect"
-
-# User-friendly name for the side effect
-displayName = "Cap Capacity"
-
-# Attribute that this effect targets
-attr = "boosterCapacitorCapacityPenalty"
-
-
-def handler(fit, booster, context):
-    fit.ship.boostItemAttr("capacitorCapacity", booster.getModifiedItemAttr(attr))
diff --git a/eos/effects/effect2746.py b/eos/effects/effect2746.py
deleted file mode 100644
index 83856e018..000000000
--- a/eos/effects/effect2746.py
+++ /dev/null
@@ -1,16 +0,0 @@
-# boosterMaxVelocityPenalty
-#
-# Used by:
-# Implants named like: Crash Booster (3 of 4)
-# Items from market group: Implants & Boosters > Booster > Booster Slot 02 (9 of 13)
-type = "boosterSideEffect"
-
-# User-friendly name for the side effect
-displayName = "Velocity"
-
-# Attribute that this effect targets
-attr = "boosterMaxVelocityPenalty"
-
-
-def handler(fit, booster, context):
-    fit.ship.boostItemAttr("maxVelocity", booster.getModifiedItemAttr(attr))
diff --git a/eos/effects/effect2747.py b/eos/effects/effect2747.py
deleted file mode 100644
index 77e71d373..000000000
--- a/eos/effects/effect2747.py
+++ /dev/null
@@ -1,17 +0,0 @@
-# boosterTurretTrackingPenalty
-#
-# Used by:
-# Implants named like: Exile Booster (3 of 4)
-# Implants named like: Frentix Booster (3 of 4)
-type = "boosterSideEffect"
-
-# User-friendly name for the side effect
-displayName = "Turret Tracking"
-
-# Attribute that this effect targets
-attr = "boosterTurretTrackingPenalty"
-
-
-def handler(fit, booster, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Gunnery"),
-                                  "trackingSpeed", booster.getModifiedItemAttr(attr))
diff --git a/eos/effects/effect2748.py b/eos/effects/effect2748.py
deleted file mode 100644
index c18a39346..000000000
--- a/eos/effects/effect2748.py
+++ /dev/null
@@ -1,17 +0,0 @@
-# boosterMissileVelocityPenalty
-#
-# Used by:
-# Implants named like: Crash Booster (3 of 4)
-# Implants named like: X Instinct Booster (3 of 4)
-type = "boosterSideEffect"
-
-# User-friendly name for the side effect
-displayName = "Missile Velocity"
-
-# Attribute that this effect targets
-attr = "boosterMissileVelocityPenalty"
-
-
-def handler(fit, booster, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"),
-                                    "maxVelocity", booster.getModifiedItemAttr(attr))
diff --git a/eos/effects/effect2749.py b/eos/effects/effect2749.py
deleted file mode 100644
index 873dd2968..000000000
--- a/eos/effects/effect2749.py
+++ /dev/null
@@ -1,16 +0,0 @@
-# boosterMissileExplosionVelocityPenalty
-#
-# Used by:
-# Implants named like: Blue Pill Booster (3 of 5)
-type = "boosterSideEffect"
-
-# User-friendly name for the side effect
-displayName = "Missile Explosion Velocity"
-
-# Attribute that this effect targets
-attr = "boosterAOEVelocityPenalty"
-
-
-def handler(fit, booster, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"),
-                                    "aoeVelocity", booster.getModifiedItemAttr(attr))
diff --git a/eos/effects/effect2756.py b/eos/effects/effect2756.py
deleted file mode 100644
index 1eaf7ef56..000000000
--- a/eos/effects/effect2756.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# shipBonusECMStrengthBonusCC
-#
-# Used by:
-# Ship: Blackbird
-type = "passive"
-
-
-def handler(fit, ship, context):
-    for type in ("Gravimetric", "Magnetometric", "Ladar", "Radar"):
-        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "ECM",
-                                      "scan{0}StrengthBonus".format(type), ship.getModifiedItemAttr("shipBonusCC"),
-                                      skill="Caldari Cruiser")
diff --git a/eos/effects/effect2757.py b/eos/effects/effect2757.py
deleted file mode 100644
index f9445babc..000000000
--- a/eos/effects/effect2757.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# salvaging
-#
-# Used by:
-# Modules from group: Salvager (3 of 3)
-type = "active"
-
-
-def handler(fit, module, context):
-    pass
diff --git a/eos/effects/effect2760.py b/eos/effects/effect2760.py
deleted file mode 100644
index 0714422d4..000000000
--- a/eos/effects/effect2760.py
+++ /dev/null
@@ -1,16 +0,0 @@
-# boosterModifyBoosterArmorPenalties
-#
-# Used by:
-# Implants named like: Eifyr and Co. 'Alchemist' Neurotoxin Control NC (2 of 2)
-# Implants named like: grade Edge (10 of 12)
-# Skill: Neurotoxin Control
-runTime = 'early'
-type = "passive"
-
-
-def handler(fit, container, context):
-    level = container.level if "skill" in context else 1
-    attrs = ("boosterArmorHPPenalty", "boosterArmorRepairAmountPenalty")
-    for attr in attrs:
-        fit.boosters.filteredItemBoost(lambda booster: True, attr,
-                                       container.getModifiedItemAttr("boosterAttributeModifier") * level)
diff --git a/eos/effects/effect2763.py b/eos/effects/effect2763.py
deleted file mode 100644
index 9e05f2cb0..000000000
--- a/eos/effects/effect2763.py
+++ /dev/null
@@ -1,17 +0,0 @@
-# boosterModifyBoosterShieldPenalty
-#
-# Used by:
-# Implants named like: Eifyr and Co. 'Alchemist' Neurotoxin Control NC (2 of 2)
-# Implants named like: grade Edge (10 of 12)
-# Skill: Neurotoxin Control
-type = "passive"
-
-
-def handler(fit, container, context):
-    level = container.level if "skill" in context else 1
-    attrs = ("boosterShieldBoostAmountPenalty", "boosterShieldCapacityPenalty", "shieldBoostMultiplier")
-    for attr in attrs:
-        # shieldBoostMultiplier can be positive (Blue Pill) and negative value (other boosters)
-        # We're interested in decreasing only side-effects
-        fit.boosters.filteredItemBoost(lambda booster: booster.getModifiedItemAttr(attr) < 0,
-                                       attr, container.getModifiedItemAttr("boosterAttributeModifier") * level)
diff --git a/eos/effects/effect2766.py b/eos/effects/effect2766.py
deleted file mode 100644
index 348cd192b..000000000
--- a/eos/effects/effect2766.py
+++ /dev/null
@@ -1,15 +0,0 @@
-# boosterModifyBoosterMaxVelocityAndCapacitorPenalty
-#
-# Used by:
-# Implants named like: Eifyr and Co. 'Alchemist' Neurotoxin Control NC (2 of 2)
-# Implants named like: grade Edge (10 of 12)
-# Skill: Neurotoxin Control
-type = "passive"
-
-
-def handler(fit, container, context):
-    level = container.level if "skill" in context else 1
-    attrs = ("boosterCapacitorCapacityPenalty", "boosterMaxVelocityPenalty")
-    for attr in attrs:
-        fit.boosters.filteredItemBoost(lambda booster: True, attr,
-                                       container.getModifiedItemAttr("boosterAttributeModifier") * level)
diff --git a/eos/effects/effect277.py b/eos/effects/effect277.py
deleted file mode 100644
index 2c281449c..000000000
--- a/eos/effects/effect277.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# tacticalshieldManipulationSkillBoostUniformityBonus
-#
-# Used by:
-# Skill: Tactical Shield Manipulation
-type = "passive"
-
-
-def handler(fit, skill, context):
-    fit.ship.increaseItemAttr("shieldUniformity", skill.getModifiedItemAttr("uniformityBonus") * skill.level)
diff --git a/eos/effects/effect2776.py b/eos/effects/effect2776.py
deleted file mode 100644
index 0c247422d..000000000
--- a/eos/effects/effect2776.py
+++ /dev/null
@@ -1,15 +0,0 @@
-# boosterModifyBoosterMissilePenalty
-#
-# Used by:
-# Implants named like: Eifyr and Co. 'Alchemist' Neurotoxin Control NC (2 of 2)
-# Implants named like: grade Edge (10 of 12)
-# Skill: Neurotoxin Control
-type = "passive"
-
-
-def handler(fit, container, context):
-    level = container.level if "skill" in context else 1
-    attrs = ("boosterAOEVelocityPenalty", "boosterMissileAOECloudPenalty", "boosterMissileVelocityPenalty")
-    for attr in attrs:
-        fit.boosters.filteredItemBoost(lambda booster: True, attr,
-                                       container.getModifiedItemAttr("boosterAttributeModifier") * level)
diff --git a/eos/effects/effect2778.py b/eos/effects/effect2778.py
deleted file mode 100644
index e016e57e8..000000000
--- a/eos/effects/effect2778.py
+++ /dev/null
@@ -1,15 +0,0 @@
-# boosterModifyBoosterTurretPenalty
-#
-# Used by:
-# Implants named like: Eifyr and Co. 'Alchemist' Neurotoxin Control NC (2 of 2)
-# Implants named like: grade Edge (10 of 12)
-# Skill: Neurotoxin Control
-type = "passive"
-
-
-def handler(fit, container, context):
-    level = container.level if "skill" in context else 1
-    attrs = ("boosterTurretFalloffPenalty", "boosterTurretOptimalRangePenalty", "boosterTurretTrackingPenalty")
-    for attr in attrs:
-        fit.boosters.filteredItemBoost(lambda booster: True, attr,
-                                       container.getModifiedItemAttr("boosterAttributeModifier") * level)
diff --git a/eos/effects/effect279.py b/eos/effects/effect279.py
deleted file mode 100644
index 6161d3fe0..000000000
--- a/eos/effects/effect279.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# shieldEmmisionSystemsCapNeedBonusPostPercentCapacitorNeedLocationShipModulesRequiringShieldEmmisionSystems
-#
-# Used by:
-# Implants named like: Zainou 'Gnome' Shield Emission Systems SE (6 of 6)
-# Skill: Shield Emission Systems
-type = "passive"
-
-
-def handler(fit, container, context):
-    level = container.level if "skill" in context else 1
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Emission Systems"),
-                                  "capacitorNeed", container.getModifiedItemAttr("capNeedBonus") * level)
diff --git a/eos/effects/effect2791.py b/eos/effects/effect2791.py
deleted file mode 100644
index 24da2f481..000000000
--- a/eos/effects/effect2791.py
+++ /dev/null
@@ -1,17 +0,0 @@
-# boosterMissileExplosionCloudPenaltyFixed
-#
-# Used by:
-# Implants named like: Exile Booster (3 of 4)
-# Implants named like: Mindflood Booster (3 of 4)
-type = "boosterSideEffect"
-
-# User-friendly name for the side effect
-displayName = "Missile Explosion Radius"
-
-# Attribute that this effect targets
-attr = "boosterMissileAOECloudPenalty"
-
-
-def handler(fit, booster, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"),
-                                    "aoeCloudSize", booster.getModifiedItemAttr(attr))
diff --git a/eos/effects/effect2792.py b/eos/effects/effect2792.py
deleted file mode 100644
index 3478f268f..000000000
--- a/eos/effects/effect2792.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# modifyArmorResonancePostPercentPassive
-#
-# Used by:
-# Modules named like: Anti Pump (32 of 32)
-type = "passive"
-
-
-def handler(fit, module, context):
-    for type in ("kinetic", "thermal", "explosive", "em"):
-        fit.ship.boostItemAttr("armor" + type.capitalize() + "DamageResonance",
-                               module.getModifiedItemAttr(type + "DamageResistanceBonus") or 0,
-                               stackingPenalties=True)
diff --git a/eos/effects/effect2794.py b/eos/effects/effect2794.py
deleted file mode 100644
index f762ce8f0..000000000
--- a/eos/effects/effect2794.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# salvagingAccessDifficultyBonusEffectPassive
-#
-# Used by:
-# Modules from group: Rig Resource Processing (8 of 10)
-# Implant: Poteque 'Prospector' Salvaging SV-905
-type = "passive"
-
-
-def handler(fit, container, context):
-    fit.modules.filteredItemIncrease(lambda mod: mod.item.requiresSkill("Salvaging"),
-                                     "accessDifficultyBonus", container.getModifiedItemAttr("accessDifficultyBonus"),
-                                     position="post")
diff --git a/eos/effects/effect2795.py b/eos/effects/effect2795.py
deleted file mode 100644
index dfb7b35a8..000000000
--- a/eos/effects/effect2795.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# modifyShieldResonancePostPercentPassive
-#
-# Used by:
-# Modules named like: Anti Screen Reinforcer (32 of 32)
-type = "passive"
-
-
-def handler(fit, module, context):
-    for type in ("kinetic", "thermal", "explosive", "em"):
-        fit.ship.boostItemAttr("shield" + type.capitalize() + "DamageResonance",
-                               module.getModifiedItemAttr(type + "DamageResistanceBonus") or 0,
-                               stackingPenalties=True)
diff --git a/eos/effects/effect2796.py b/eos/effects/effect2796.py
deleted file mode 100644
index abc1dddde..000000000
--- a/eos/effects/effect2796.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# massReductionBonusPassive
-#
-# Used by:
-# Modules from group: Rig Anchor (4 of 4)
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.ship.boostItemAttr("mass", module.getModifiedItemAttr("massBonusPercentage"), stackingPenalties=True)
diff --git a/eos/effects/effect2797.py b/eos/effects/effect2797.py
deleted file mode 100644
index 6a1b54d15..000000000
--- a/eos/effects/effect2797.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# projectileWeaponSpeedMultiplyPassive
-#
-# Used by:
-# Modules named like: Projectile Burst Aerator (8 of 8)
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.modules.filteredItemMultiply(lambda mod: mod.item.group.name == "Projectile Weapon",
-                                     "speed", module.getModifiedItemAttr("speedMultiplier"),
-                                     stackingPenalties=True)
diff --git a/eos/effects/effect2798.py b/eos/effects/effect2798.py
deleted file mode 100644
index 0060dafc8..000000000
--- a/eos/effects/effect2798.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# projectileWeaponDamageMultiplyPassive
-#
-# Used by:
-# Modules named like: Projectile Collision Accelerator (8 of 8)
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.modules.filteredItemMultiply(lambda mod: mod.item.group.name == "Projectile Weapon",
-                                     "damageMultiplier", module.getModifiedItemAttr("damageMultiplier"),
-                                     stackingPenalties=True)
diff --git a/eos/effects/effect2799.py b/eos/effects/effect2799.py
deleted file mode 100644
index 6c3c147bb..000000000
--- a/eos/effects/effect2799.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# missileLauncherSpeedMultiplierPassive
-#
-# Used by:
-# Modules named like: Bay Loading Accelerator (8 of 8)
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.modules.filteredItemMultiply(lambda mod: mod.item.requiresSkill("Missile Launcher Operation"),
-                                     "speed", module.getModifiedItemAttr("speedMultiplier"),
-                                     stackingPenalties=True)
diff --git a/eos/effects/effect2801.py b/eos/effects/effect2801.py
deleted file mode 100644
index bcee87d6b..000000000
--- a/eos/effects/effect2801.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# energyWeaponSpeedMultiplyPassive
-#
-# Used by:
-# Modules named like: Energy Burst Aerator (8 of 8)
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.modules.filteredItemMultiply(lambda mod: mod.item.group.name == "Energy Weapon",
-                                     "speed", module.getModifiedItemAttr("speedMultiplier"),
-                                     stackingPenalties=True)
diff --git a/eos/effects/effect2802.py b/eos/effects/effect2802.py
deleted file mode 100644
index 53dcbda89..000000000
--- a/eos/effects/effect2802.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# hybridWeaponDamageMultiplyPassive
-#
-# Used by:
-# Modules named like: Hybrid Collision Accelerator (8 of 8)
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.modules.filteredItemMultiply(lambda mod: mod.item.group.name == "Hybrid Weapon",
-                                     "damageMultiplier", module.getModifiedItemAttr("damageMultiplier"),
-                                     stackingPenalties=True)
diff --git a/eos/effects/effect2803.py b/eos/effects/effect2803.py
deleted file mode 100644
index 5e4cad460..000000000
--- a/eos/effects/effect2803.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# energyWeaponDamageMultiplyPassive
-#
-# Used by:
-# Modules named like: Energy Collision Accelerator (8 of 8)
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.modules.filteredItemMultiply(lambda mod: mod.item.group.name == "Energy Weapon",
-                                     "damageMultiplier", module.getModifiedItemAttr("damageMultiplier"),
-                                     stackingPenalties=True)
diff --git a/eos/effects/effect2804.py b/eos/effects/effect2804.py
deleted file mode 100644
index d40a2d630..000000000
--- a/eos/effects/effect2804.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# hybridWeaponSpeedMultiplyPassive
-#
-# Used by:
-# Modules named like: Hybrid Burst Aerator (8 of 8)
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.modules.filteredItemMultiply(lambda mod: mod.item.group.name == "Hybrid Weapon",
-                                     "speed", module.getModifiedItemAttr("speedMultiplier"),
-                                     stackingPenalties=True)
diff --git a/eos/effects/effect2805.py b/eos/effects/effect2805.py
deleted file mode 100644
index ab92bb560..000000000
--- a/eos/effects/effect2805.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# shipBonusLargeEnergyWeaponDamageAB2
-#
-# Used by:
-# Ship: Abaddon
-# Ship: Marshal
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Large Energy Turret"),
-                                  "damageMultiplier", ship.getModifiedItemAttr("shipBonusAB2"),
-                                  skill="Amarr Battleship")
diff --git a/eos/effects/effect2809.py b/eos/effects/effect2809.py
deleted file mode 100644
index b66bb9cac..000000000
--- a/eos/effects/effect2809.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipMissileAssaultMissileVelocityBonusCC2
-#
-# Used by:
-# Ship: Caracal
-# Ship: Osprey Navy Issue
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Assault Missiles"),
-                                    "maxVelocity", ship.getModifiedItemAttr("shipBonusCC2"), skill="Caldari Cruiser")
diff --git a/eos/effects/effect2810.py b/eos/effects/effect2810.py
deleted file mode 100644
index 8ff8a12c9..000000000
--- a/eos/effects/effect2810.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# eliteBonusHeavyGunshipAssaultMissileFlightTime1
-#
-# Used by:
-# Ship: Cerberus
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Assault Missiles"),
-                                    "explosionDelay", ship.getModifiedItemAttr("eliteBonusHeavyGunship1"),
-                                    skill="Heavy Assault Cruisers")
diff --git a/eos/effects/effect2812.py b/eos/effects/effect2812.py
deleted file mode 100644
index cc2d38e7a..000000000
--- a/eos/effects/effect2812.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# caldariShipECMBurstOptimalRangeCB3
-#
-# Used by:
-# Ship: Scorpion
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Burst Jammer",
-                                  "ecmBurstRange", ship.getModifiedItemAttr("shipBonusCB3"), skill="Caldari Battleship")
diff --git a/eos/effects/effect2837.py b/eos/effects/effect2837.py
deleted file mode 100644
index f965b45ae..000000000
--- a/eos/effects/effect2837.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# armorHPBonusAdd
-#
-# Used by:
-# Modules from group: Armor Reinforcer (51 of 51)
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.ship.increaseItemAttr("armorHP", module.getModifiedItemAttr("armorHPBonusAdd"))
diff --git a/eos/effects/effect2847.py b/eos/effects/effect2847.py
deleted file mode 100644
index 6e1df7bcf..000000000
--- a/eos/effects/effect2847.py
+++ /dev/null
@@ -1,15 +0,0 @@
-# trackingSpeedBonusPassiveRequiringGunneryTrackingSpeedBonus
-#
-# Used by:
-# Implants named like: Drop Booster (4 of 4)
-# Implants named like: Eifyr and Co. 'Gunslinger' Motion Prediction MR (6 of 6)
-# Implant: Antipharmakon Iokira
-# Implant: Ogdin's Eye Coordination Enhancer
-# Skill: Motion Prediction
-type = "passive"
-
-
-def handler(fit, container, context):
-    level = container.level if "skill" in context else 1
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Gunnery"),
-                                  "trackingSpeed", container.getModifiedItemAttr("trackingSpeedBonus") * level)
diff --git a/eos/effects/effect2848.py b/eos/effects/effect2848.py
deleted file mode 100644
index 3fb468dea..000000000
--- a/eos/effects/effect2848.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# accessDifficultyBonusModifierRequiringArchaelogy
-#
-# Used by:
-# Modules named like: Emission Scope Sharpener (8 of 8)
-# Implant: Poteque 'Prospector' Archaeology AC-905
-# Implant: Poteque 'Prospector' Environmental Analysis EY-1005
-type = "passive"
-
-
-def handler(fit, container, context):
-    fit.modules.filteredItemIncrease(lambda module: module.item.requiresSkill("Archaeology"),
-                                     "accessDifficultyBonus",
-                                     container.getModifiedItemAttr("accessDifficultyBonusModifier"), position="post")
diff --git a/eos/effects/effect2849.py b/eos/effects/effect2849.py
deleted file mode 100644
index 2094f08d3..000000000
--- a/eos/effects/effect2849.py
+++ /dev/null
@@ -1,14 +0,0 @@
-# accessDifficultyBonusModifierRequiringHacking
-#
-# Used by:
-# Modules named like: Memetic Algorithm Bank (8 of 8)
-# Implant: Neural Lace 'Blackglass' Net Intrusion 920-40
-# Implant: Poteque 'Prospector' Environmental Analysis EY-1005
-# Implant: Poteque 'Prospector' Hacking HC-905
-type = "passive"
-
-
-def handler(fit, container, context):
-    fit.modules.filteredItemIncrease(lambda c: c.item.requiresSkill("Hacking"),
-                                     "accessDifficultyBonus",
-                                     container.getModifiedItemAttr("accessDifficultyBonusModifier"), position="post")
diff --git a/eos/effects/effect2850.py b/eos/effects/effect2850.py
deleted file mode 100644
index d193ca6ef..000000000
--- a/eos/effects/effect2850.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# durationBonusForGroupAfterburner
-#
-# Used by:
-# Modules named like: Engine Thermal Shielding (8 of 8)
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Propulsion Module",
-                                  "duration", module.getModifiedItemAttr("durationBonus"))
diff --git a/eos/effects/effect2851.py b/eos/effects/effect2851.py
deleted file mode 100644
index 4934dc7cf..000000000
--- a/eos/effects/effect2851.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# missileDMGBonusPassive
-#
-# Used by:
-# Modules named like: Warhead Calefaction Catalyst (8 of 8)
-type = "passive"
-
-
-def handler(fit, container, context):
-    for dmgType in ("em", "kinetic", "explosive", "thermal"):
-        fit.modules.filteredChargeMultiply(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"),
-                                           "%sDamage" % dmgType,
-                                           container.getModifiedItemAttr("missileDamageMultiplierBonus"),
-                                           stackingPenalties=True)
diff --git a/eos/effects/effect2853.py b/eos/effects/effect2853.py
deleted file mode 100644
index 40d80376e..000000000
--- a/eos/effects/effect2853.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# cloakingTargetingDelayBonusLRSMCloakingPassive
-#
-# Used by:
-# Modules named like: Targeting Systems Stabilizer (8 of 8)
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.modules.filteredItemBoost(lambda module: module.item.requiresSkill("Cloaking"),
-                                  "cloakingTargetingDelay", module.getModifiedItemAttr("cloakingTargetingDelayBonus"))
diff --git a/eos/effects/effect2857.py b/eos/effects/effect2857.py
deleted file mode 100644
index 36e29c52d..000000000
--- a/eos/effects/effect2857.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# cynosuralGeneration
-#
-# Used by:
-# Modules from group: Cynosural Field Generator (2 of 2)
-type = "active"
-
-
-def handler(fit, module, context):
-    fit.ship.boostItemAttr("maxVelocity", module.getModifiedItemAttr("speedFactor"))
diff --git a/eos/effects/effect2865.py b/eos/effects/effect2865.py
deleted file mode 100644
index 5ffd1b9bb..000000000
--- a/eos/effects/effect2865.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# velocityBonusOnline
-#
-# Used by:
-# Modules from group: Entosis Link (6 of 6)
-# 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"),
-                           stackingPenalties=True)
diff --git a/eos/effects/effect2866.py b/eos/effects/effect2866.py
deleted file mode 100644
index b0e63322a..000000000
--- a/eos/effects/effect2866.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# biologyTimeBonusFixed
-#
-# Used by:
-# Implants named like: Eifyr and Co. 'Alchemist' Biology BY (2 of 2)
-# Skill: Biology
-type = "passive"
-
-
-def handler(fit, container, context):
-    level = container.level if "skill" in context else 1
-    fit.boosters.filteredItemBoost(lambda bst: True, "boosterDuration",
-                                   container.getModifiedItemAttr("durationBonus") * level)
diff --git a/eos/effects/effect2867.py b/eos/effects/effect2867.py
deleted file mode 100644
index cf8ec25b2..000000000
--- a/eos/effects/effect2867.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# sentryDroneDamageBonus
-#
-# Used by:
-# Modules named like: Sentry Damage Augmentor (8 of 8)
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Sentry Drone Interfacing"),
-                                 "damageMultiplier", module.getModifiedItemAttr("damageMultiplierBonus"),
-                                 stackingPenalties=True)
diff --git a/eos/effects/effect2868.py b/eos/effects/effect2868.py
deleted file mode 100644
index 49def1be7..000000000
--- a/eos/effects/effect2868.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# armorDamageAmountBonusCapitalArmorRepairers
-#
-# Used by:
-# Modules named like: Auxiliary Nano Pump (8 of 8)
-type = "passive"
-
-
-def handler(fit, implant, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Repair Systems"),
-                                  "armorDamageAmount", implant.getModifiedItemAttr("repairBonus"),
-                                  stackingPenalties=True)
diff --git a/eos/effects/effect287.py b/eos/effects/effect287.py
deleted file mode 100644
index 7c1cd7011..000000000
--- a/eos/effects/effect287.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# controlledBurstsCapNeedBonusPostPercentCapacitorNeedLocationShipModulesRequiringGunnery
-#
-# Used by:
-# Implants named like: Inherent Implants 'Lancer' Controlled Bursts CB (6 of 6)
-# Skill: Controlled Bursts
-type = "passive"
-
-
-def handler(fit, container, context):
-    level = container.level if "skill" in context else 1
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Gunnery"),
-                                  "capacitorNeed", container.getModifiedItemAttr("capNeedBonus") * level)
diff --git a/eos/effects/effect2872.py b/eos/effects/effect2872.py
deleted file mode 100644
index 350eabe4d..000000000
--- a/eos/effects/effect2872.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# missileVelocityBonusDefender
-#
-# Used by:
-# Implants named like: Zainou 'Snapshot' Defender Missiles DM (6 of 6)
-type = "passive"
-
-
-def handler(fit, container, context):
-    fit.modules.filteredChargeMultiply(lambda mod: mod.charge.requiresSkill("Defender Missiles"),
-                                       "maxVelocity", container.getModifiedItemAttr("missileVelocityBonus"))
diff --git a/eos/effects/effect2881.py b/eos/effects/effect2881.py
deleted file mode 100644
index c7f718062..000000000
--- a/eos/effects/effect2881.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# missileEMDmgBonusCruise3
-#
-# Used by:
-# Implants named like: Zainou 'Snapshot' Cruise Missiles CM (6 of 6)
-type = "passive"
-
-
-def handler(fit, implant, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Cruise Missiles"),
-                                    "emDamage", implant.getModifiedItemAttr("damageMultiplierBonus"))
diff --git a/eos/effects/effect2882.py b/eos/effects/effect2882.py
deleted file mode 100644
index 861799510..000000000
--- a/eos/effects/effect2882.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# missileExplosiveDmgBonusCruise3
-#
-# Used by:
-# Implants named like: Zainou 'Snapshot' Cruise Missiles CM (6 of 6)
-type = "passive"
-
-
-def handler(fit, container, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Cruise Missiles"),
-                                    "explosiveDamage", container.getModifiedItemAttr("damageMultiplierBonus"))
diff --git a/eos/effects/effect2883.py b/eos/effects/effect2883.py
deleted file mode 100644
index 7ce36c44b..000000000
--- a/eos/effects/effect2883.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# missileKineticDmgBonusCruise3
-#
-# Used by:
-# Implants named like: Zainou 'Snapshot' Cruise Missiles CM (6 of 6)
-type = "passive"
-
-
-def handler(fit, container, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Cruise Missiles"),
-                                    "kineticDamage", container.getModifiedItemAttr("damageMultiplierBonus"))
diff --git a/eos/effects/effect2884.py b/eos/effects/effect2884.py
deleted file mode 100644
index 47bd9feeb..000000000
--- a/eos/effects/effect2884.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# missileThermalDmgBonusCruise3
-#
-# Used by:
-# Implants named like: Zainou 'Snapshot' Cruise Missiles CM (6 of 6)
-type = "passive"
-
-
-def handler(fit, container, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Cruise Missiles"),
-                                    "thermalDamage", container.getModifiedItemAttr("damageMultiplierBonus"))
diff --git a/eos/effects/effect2885.py b/eos/effects/effect2885.py
deleted file mode 100644
index 015bad393..000000000
--- a/eos/effects/effect2885.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# gasHarvestingCycleTimeModulesRequiringGasCloudHarvesting
-#
-# Used by:
-# Implants named like: Eifyr and Co. 'Alchemist' Gas Harvesting GH (3 of 3)
-type = "passive"
-
-
-def handler(fit, implant, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Gas Cloud Harvesting"),
-                                  "duration", implant.getModifiedItemAttr("durationBonus"))
diff --git a/eos/effects/effect2887.py b/eos/effects/effect2887.py
deleted file mode 100644
index cf4d1e826..000000000
--- a/eos/effects/effect2887.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# missileEMDmgBonusRocket
-#
-# Used by:
-# Implants named like: Zainou 'Snapshot' Rockets RD (6 of 6)
-type = "passive"
-
-
-def handler(fit, implant, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Rockets"),
-                                    "emDamage", implant.getModifiedItemAttr("damageMultiplierBonus"))
diff --git a/eos/effects/effect2888.py b/eos/effects/effect2888.py
deleted file mode 100644
index 437d99761..000000000
--- a/eos/effects/effect2888.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# missileExplosiveDmgBonusRocket
-#
-# Used by:
-# Implants named like: Zainou 'Snapshot' Rockets RD (6 of 6)
-type = "passive"
-
-
-def handler(fit, container, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Rockets"),
-                                    "explosiveDamage", container.getModifiedItemAttr("damageMultiplierBonus"))
diff --git a/eos/effects/effect2889.py b/eos/effects/effect2889.py
deleted file mode 100644
index ab04fedf1..000000000
--- a/eos/effects/effect2889.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# missileKineticDmgBonusRocket
-#
-# Used by:
-# Implants named like: Zainou 'Snapshot' Rockets RD (6 of 6)
-type = "passive"
-
-
-def handler(fit, container, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Rockets"),
-                                    "kineticDamage", container.getModifiedItemAttr("damageMultiplierBonus"))
diff --git a/eos/effects/effect2890.py b/eos/effects/effect2890.py
deleted file mode 100644
index 20694a704..000000000
--- a/eos/effects/effect2890.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# missileThermalDmgBonusRocket
-#
-# Used by:
-# Implants named like: Zainou 'Snapshot' Rockets RD (6 of 6)
-type = "passive"
-
-
-def handler(fit, container, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Rockets"),
-                                    "thermalDamage", container.getModifiedItemAttr("damageMultiplierBonus"))
diff --git a/eos/effects/effect2891.py b/eos/effects/effect2891.py
deleted file mode 100644
index 82b69159a..000000000
--- a/eos/effects/effect2891.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# missileEMDmgBonusStandard
-#
-# Used by:
-# Implants named like: Zainou 'Snapshot' Light Missiles LM (6 of 6)
-type = "passive"
-
-
-def handler(fit, implant, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Light Missiles"),
-                                    "emDamage", implant.getModifiedItemAttr("damageMultiplierBonus"))
diff --git a/eos/effects/effect2892.py b/eos/effects/effect2892.py
deleted file mode 100644
index 67c75f102..000000000
--- a/eos/effects/effect2892.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# missileExplosiveDmgBonusStandard
-#
-# Used by:
-# Implants named like: Zainou 'Snapshot' Light Missiles LM (6 of 6)
-type = "passive"
-
-
-def handler(fit, container, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Light Missiles"),
-                                    "explosiveDamage", container.getModifiedItemAttr("damageMultiplierBonus"))
diff --git a/eos/effects/effect2893.py b/eos/effects/effect2893.py
deleted file mode 100644
index e8f3714fa..000000000
--- a/eos/effects/effect2893.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# missileKineticDmgBonusStandard
-#
-# Used by:
-# Implants named like: Zainou 'Snapshot' Light Missiles LM (6 of 6)
-type = "passive"
-
-
-def handler(fit, container, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Light Missiles"),
-                                    "kineticDamage", container.getModifiedItemAttr("damageMultiplierBonus"))
diff --git a/eos/effects/effect2894.py b/eos/effects/effect2894.py
deleted file mode 100644
index 49a8006e7..000000000
--- a/eos/effects/effect2894.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# missileThermalDmgBonusStandard
-#
-# Used by:
-# Implants named like: Zainou 'Snapshot' Light Missiles LM (6 of 6)
-type = "passive"
-
-
-def handler(fit, container, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Light Missiles"),
-                                    "thermalDamage", container.getModifiedItemAttr("damageMultiplierBonus"))
diff --git a/eos/effects/effect2899.py b/eos/effects/effect2899.py
deleted file mode 100644
index 35a8f634b..000000000
--- a/eos/effects/effect2899.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# missileEMDmgBonusHeavy
-#
-# Used by:
-# Implants named like: Zainou 'Snapshot' Heavy Missiles HM (6 of 6)
-type = "passive"
-
-
-def handler(fit, implant, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Missiles"),
-                                    "emDamage", implant.getModifiedItemAttr("damageMultiplierBonus"))
diff --git a/eos/effects/effect290.py b/eos/effects/effect290.py
deleted file mode 100644
index 7b53ea966..000000000
--- a/eos/effects/effect290.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# sharpshooterRangeSkillBonusPostPercentMaxRangeLocationShipModulesRequiringGunnery
-#
-# Used by:
-# Implants named like: Frentix Booster (4 of 4)
-# Implants named like: Zainou 'Deadeye' Sharpshooter ST (6 of 6)
-# Skill: Sharpshooter
-type = "passive"
-
-
-def handler(fit, container, context):
-    level = container.level if "skill" in context else 1
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Gunnery"),
-                                  "maxRange", container.getModifiedItemAttr("rangeSkillBonus") * level)
diff --git a/eos/effects/effect2900.py b/eos/effects/effect2900.py
deleted file mode 100644
index dc68d5aed..000000000
--- a/eos/effects/effect2900.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# missileExplosiveDmgBonusHeavy
-#
-# Used by:
-# Implants named like: Zainou 'Snapshot' Heavy Missiles HM (6 of 6)
-type = "passive"
-
-
-def handler(fit, container, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Missiles"),
-                                    "explosiveDamage", container.getModifiedItemAttr("damageMultiplierBonus"))
diff --git a/eos/effects/effect2901.py b/eos/effects/effect2901.py
deleted file mode 100644
index 56296feb1..000000000
--- a/eos/effects/effect2901.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# missileKineticDmgBonusHeavy
-#
-# Used by:
-# Implants named like: Zainou 'Snapshot' Heavy Missiles HM (6 of 6)
-type = "passive"
-
-
-def handler(fit, container, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Missiles"),
-                                    "kineticDamage", container.getModifiedItemAttr("damageMultiplierBonus"))
diff --git a/eos/effects/effect2902.py b/eos/effects/effect2902.py
deleted file mode 100644
index 5e4087e84..000000000
--- a/eos/effects/effect2902.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# missileThermalDmgBonusHeavy
-#
-# Used by:
-# Implants named like: Zainou 'Snapshot' Heavy Missiles HM (6 of 6)
-type = "passive"
-
-
-def handler(fit, container, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Missiles"),
-                                    "thermalDamage", container.getModifiedItemAttr("damageMultiplierBonus"))
diff --git a/eos/effects/effect2903.py b/eos/effects/effect2903.py
deleted file mode 100644
index 93b008b9a..000000000
--- a/eos/effects/effect2903.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# missileEMDmgBonusHAM
-#
-# Used by:
-# Implants named like: Zainou 'Snapshot' Heavy Assault Missiles AM (6 of 6)
-type = "passive"
-
-
-def handler(fit, implant, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Assault Missiles"),
-                                    "emDamage", implant.getModifiedItemAttr("damageMultiplierBonus"))
diff --git a/eos/effects/effect2904.py b/eos/effects/effect2904.py
deleted file mode 100644
index 8000c3df0..000000000
--- a/eos/effects/effect2904.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# missileExplosiveDmgBonusHAM
-#
-# Used by:
-# Implants named like: Zainou 'Snapshot' Heavy Assault Missiles AM (6 of 6)
-type = "passive"
-
-
-def handler(fit, container, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Assault Missiles"),
-                                    "explosiveDamage", container.getModifiedItemAttr("damageMultiplierBonus"))
diff --git a/eos/effects/effect2905.py b/eos/effects/effect2905.py
deleted file mode 100644
index 4a01de0bb..000000000
--- a/eos/effects/effect2905.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# missileKineticDmgBonusHAM
-#
-# Used by:
-# Implants named like: Zainou 'Snapshot' Heavy Assault Missiles AM (6 of 6)
-type = "passive"
-
-
-def handler(fit, container, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Assault Missiles"),
-                                    "kineticDamage", container.getModifiedItemAttr("damageMultiplierBonus"))
diff --git a/eos/effects/effect2906.py b/eos/effects/effect2906.py
deleted file mode 100644
index 13e2d3398..000000000
--- a/eos/effects/effect2906.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# missileThermalDmgBonusHAM
-#
-# Used by:
-# Implants named like: Zainou 'Snapshot' Heavy Assault Missiles AM (6 of 6)
-type = "passive"
-
-
-def handler(fit, container, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Assault Missiles"),
-                                    "thermalDamage", container.getModifiedItemAttr("damageMultiplierBonus"))
diff --git a/eos/effects/effect2907.py b/eos/effects/effect2907.py
deleted file mode 100644
index 82b228f3e..000000000
--- a/eos/effects/effect2907.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# missileEMDmgBonusTorpedo
-#
-# Used by:
-# Implants named like: Zainou 'Snapshot' Torpedoes TD (6 of 6)
-type = "passive"
-
-
-def handler(fit, implant, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Torpedoes"),
-                                    "emDamage", implant.getModifiedItemAttr("damageMultiplierBonus"))
diff --git a/eos/effects/effect2908.py b/eos/effects/effect2908.py
deleted file mode 100644
index 9611c2b22..000000000
--- a/eos/effects/effect2908.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# missileExplosiveDmgBonusTorpedo
-#
-# Used by:
-# Implants named like: Zainou 'Snapshot' Torpedoes TD (6 of 6)
-type = "passive"
-
-
-def handler(fit, container, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Torpedoes"),
-                                    "explosiveDamage", container.getModifiedItemAttr("damageMultiplierBonus"))
diff --git a/eos/effects/effect2909.py b/eos/effects/effect2909.py
deleted file mode 100644
index de8d92fb6..000000000
--- a/eos/effects/effect2909.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# missileKineticDmgBonusTorpedo
-#
-# Used by:
-# Implants named like: Zainou 'Snapshot' Torpedoes TD (6 of 6)
-type = "passive"
-
-
-def handler(fit, container, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Torpedoes"),
-                                    "kineticDamage", container.getModifiedItemAttr("damageMultiplierBonus"))
diff --git a/eos/effects/effect2910.py b/eos/effects/effect2910.py
deleted file mode 100644
index 22293eb06..000000000
--- a/eos/effects/effect2910.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# missileThermalDmgBonusTorpedo
-#
-# Used by:
-# Implants named like: Zainou 'Snapshot' Torpedoes TD (6 of 6)
-type = "passive"
-
-
-def handler(fit, container, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Torpedoes"),
-                                    "thermalDamage", container.getModifiedItemAttr("damageMultiplierBonus"))
diff --git a/eos/effects/effect2911.py b/eos/effects/effect2911.py
deleted file mode 100644
index aaa6af58a..000000000
--- a/eos/effects/effect2911.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# dataminerModuleDurationReduction
-#
-# Used by:
-# Implant: Poteque 'Prospector' Environmental Analysis EY-1005
-type = "passive"
-
-
-def handler(fit, implant, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Data Miners",
-                                  "duration", implant.getModifiedItemAttr("durationBonus"))
diff --git a/eos/effects/effect2967.py b/eos/effects/effect2967.py
deleted file mode 100644
index 3682128c1..000000000
--- a/eos/effects/effect2967.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# skillTriageModuleConsumptionQuantityBonus
-#
-# Used by:
-# Skill: Tactical Logistics Reconfiguration
-type = "passive"
-
-
-def handler(fit, skill, context):
-    amount = -skill.getModifiedItemAttr("consumptionQuantityBonus")
-    fit.modules.filteredItemIncrease(lambda mod: mod.item.requiresSkill(skill),
-                                     "consumptionQuantity", amount * skill.level)
diff --git a/eos/effects/effect2977.py b/eos/effects/effect2977.py
deleted file mode 100644
index e5f173bbe..000000000
--- a/eos/effects/effect2977.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# skillRemoteHullRepairSystemsCapNeedBonus
-#
-# Used by:
-# Skill: Remote Hull Repair Systems
-type = "passive"
-
-
-def handler(fit, skill, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Remote Hull Repair Systems"),
-                                  "capacitorNeed", skill.getModifiedItemAttr("capNeedBonus") * skill.level)
diff --git a/eos/effects/effect298.py b/eos/effects/effect298.py
deleted file mode 100644
index d28e30f76..000000000
--- a/eos/effects/effect298.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# surgicalStrikeFalloffBonusPostPercentFalloffLocationShipModulesRequiringGunnery
-#
-# Used by:
-# Implants named like: Sooth Sayer Booster (4 of 4)
-# Implants named like: Zainou 'Deadeye' Trajectory Analysis TA (6 of 6)
-# Skill: Trajectory Analysis
-type = "passive"
-
-
-def handler(fit, container, context):
-    level = container.level if "skill" in context else 1
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Gunnery"),
-                                  "falloff", container.getModifiedItemAttr("falloffBonus") * level)
diff --git a/eos/effects/effect2980.py b/eos/effects/effect2980.py
deleted file mode 100644
index 984efa65e..000000000
--- a/eos/effects/effect2980.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# skillCapitalRemoteHullRepairSystemsCapNeedBonus
-#
-# Used by:
-# Skill: Capital Remote Hull Repair Systems
-type = "passive"
-
-
-def handler(fit, skill, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Remote Hull Repair Systems"),
-                                  "capacitorNeed", skill.getModifiedItemAttr("capNeedBonus") * skill.level)
diff --git a/eos/effects/effect2982.py b/eos/effects/effect2982.py
deleted file mode 100644
index 77c687f34..000000000
--- a/eos/effects/effect2982.py
+++ /dev/null
@@ -1,33 +0,0 @@
-# skillRemoteECMDurationBonus
-#
-# Used by:
-# Skill: Burst Projector Operation
-type = "passive"
-
-
-def handler(fit, skill, context):
-    # We need to make sure that the attribute exists, otherwise we add attributes that don't belong.  See #927
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Burst Projector Operation") and
-                                              mod.item.getAttribute("duration"),
-                                  "duration",
-                                  skill.getModifiedItemAttr("projECMDurationBonus") * skill.level)
-
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Burst Projector Operation") and
-                                              mod.item.getAttribute("durationECMJammerBurstProjector"),
-                                  "durationECMJammerBurstProjector",
-                                  skill.getModifiedItemAttr("projECMDurationBonus") * skill.level)
-
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Burst Projector Operation") and
-                                              mod.item.getAttribute("durationTargetIlluminationBurstProjector"),
-                                  "durationTargetIlluminationBurstProjector",
-                                  skill.getModifiedItemAttr("projECMDurationBonus") * skill.level)
-
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Burst Projector Operation") and
-                                              mod.item.getAttribute("durationSensorDampeningBurstProjector"),
-                                  "durationSensorDampeningBurstProjector",
-                                  skill.getModifiedItemAttr("projECMDurationBonus") * skill.level)
-
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Burst Projector Operation") and
-                                              mod.item.getAttribute("durationWeaponDisruptionBurstProjector"),
-                                  "durationWeaponDisruptionBurstProjector",
-                                  skill.getModifiedItemAttr("projECMDurationBonus") * skill.level)
diff --git a/eos/effects/effect3001.py b/eos/effects/effect3001.py
deleted file mode 100644
index c0fedef1a..000000000
--- a/eos/effects/effect3001.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# overloadRofBonus
-#
-# Used by:
-# Modules from group: Missile Launcher Torpedo (22 of 22)
-# Items from market group: Ship Equipment > Turrets & Bays (429 of 883)
-# Module: Interdiction Sphere Launcher I
-type = "overheat"
-
-
-def handler(fit, module, context):
-    module.boostItemAttr("speed", module.getModifiedItemAttr("overloadRofBonus"))
diff --git a/eos/effects/effect3002.py b/eos/effects/effect3002.py
deleted file mode 100644
index e4ecde55c..000000000
--- a/eos/effects/effect3002.py
+++ /dev/null
@@ -1,21 +0,0 @@
-# overloadSelfDurationBonus
-#
-# Used by:
-# Modules from group: Ancillary Remote Shield Booster (4 of 4)
-# Modules from group: Capacitor Booster (59 of 59)
-# Modules from group: Energy Neutralizer (54 of 54)
-# Modules from group: Energy Nosferatu (54 of 54)
-# Modules from group: Hull Repair Unit (25 of 25)
-# Modules from group: Remote Armor Repairer (39 of 39)
-# Modules from group: Remote Capacitor Transmitter (41 of 41)
-# Modules from group: Remote Shield Booster (38 of 38)
-# Modules from group: Smart Bomb (118 of 118)
-# Modules from group: Warp Disrupt Field Generator (7 of 7)
-# Modules named like: Remote Repairer (56 of 56)
-# Module: Reactive Armor Hardener
-# Module: Target Spectrum Breaker
-type = "overheat"
-
-
-def handler(fit, module, context):
-    module.boostItemAttr("duration", module.getModifiedItemAttr("overloadSelfDurationBonus") or 0)
diff --git a/eos/effects/effect3024.py b/eos/effects/effect3024.py
deleted file mode 100644
index efc729b51..000000000
--- a/eos/effects/effect3024.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# eliteBonusCoverOpsBombExplosiveDmg1
-#
-# Used by:
-# Ship: Hound
-# Ship: Virtuoso
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Bomb Deployment"),
-                                    "explosiveDamage", ship.getModifiedItemAttr("eliteBonusCovertOps1"),
-                                    skill="Covert Ops")
diff --git a/eos/effects/effect3025.py b/eos/effects/effect3025.py
deleted file mode 100644
index 073b1ead3..000000000
--- a/eos/effects/effect3025.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# overloadSelfDamageBonus
-#
-# Used by:
-# Modules from group: Energy Weapon (101 of 214)
-# Modules from group: Hybrid Weapon (105 of 221)
-# Modules from group: Precursor Weapon (15 of 15)
-# Modules from group: Projectile Weapon (99 of 165)
-type = "overheat"
-
-
-def handler(fit, module, context):
-    module.boostItemAttr("damageMultiplier", module.getModifiedItemAttr("overloadDamageModifier"))
diff --git a/eos/effects/effect3026.py b/eos/effects/effect3026.py
deleted file mode 100644
index e44ec9270..000000000
--- a/eos/effects/effect3026.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# eliteBonusCoverOpsBombKineticDmg1
-#
-# Used by:
-# Ship: Manticore
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Bomb Deployment"),
-                                    "kineticDamage", ship.getModifiedItemAttr("eliteBonusCovertOps1"),
-                                    skill="Covert Ops")
diff --git a/eos/effects/effect3027.py b/eos/effects/effect3027.py
deleted file mode 100644
index 681231040..000000000
--- a/eos/effects/effect3027.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# eliteBonusCoverOpsBombThermalDmg1
-#
-# Used by:
-# Ship: Nemesis
-# Ship: Virtuoso
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Bomb Deployment"),
-                                    "thermalDamage", ship.getModifiedItemAttr("eliteBonusCovertOps1"),
-                                    skill="Covert Ops")
diff --git a/eos/effects/effect3028.py b/eos/effects/effect3028.py
deleted file mode 100644
index e9ac65114..000000000
--- a/eos/effects/effect3028.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# eliteBonusCoverOpsBombEmDmg1
-#
-# Used by:
-# Ship: Purifier
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Bomb Deployment"),
-                                    "emDamage", ship.getModifiedItemAttr("eliteBonusCovertOps1"), skill="Covert Ops")
diff --git a/eos/effects/effect3029.py b/eos/effects/effect3029.py
deleted file mode 100644
index 7e6cc6166..000000000
--- a/eos/effects/effect3029.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# overloadSelfEmHardeningBonus
-#
-# Used by:
-# Variations of module: Armor EM Hardener I (39 of 39)
-# Variations of module: EM Ward Field I (19 of 19)
-# Module: Civilian EM Ward Field
-type = "overheat"
-
-
-def handler(fit, module, context):
-    module.boostItemAttr("emDamageResistanceBonus", module.getModifiedItemAttr("overloadHardeningBonus"))
diff --git a/eos/effects/effect3030.py b/eos/effects/effect3030.py
deleted file mode 100644
index a97ab16fb..000000000
--- a/eos/effects/effect3030.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# overloadSelfThermalHardeningBonus
-#
-# Used by:
-# Variations of module: Armor Thermal Hardener I (39 of 39)
-# Variations of module: Thermal Dissipation Field I (19 of 19)
-# Module: Civilian Thermal Dissipation Field
-type = "overheat"
-
-
-def handler(fit, module, context):
-    module.boostItemAttr("thermalDamageResistanceBonus", module.getModifiedItemAttr("overloadHardeningBonus"))
diff --git a/eos/effects/effect3031.py b/eos/effects/effect3031.py
deleted file mode 100644
index 9762eaf14..000000000
--- a/eos/effects/effect3031.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# overloadSelfExplosiveHardeningBonus
-#
-# Used by:
-# Variations of module: Armor Explosive Hardener I (39 of 39)
-# Variations of module: Explosive Deflection Field I (19 of 19)
-# Module: Civilian Explosive Deflection Field
-type = "overheat"
-
-
-def handler(fit, module, context):
-    module.boostItemAttr("explosiveDamageResistanceBonus", module.getModifiedItemAttr("overloadHardeningBonus"))
diff --git a/eos/effects/effect3032.py b/eos/effects/effect3032.py
deleted file mode 100644
index 549ddf5e7..000000000
--- a/eos/effects/effect3032.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# overloadSelfKineticHardeningBonus
-#
-# Used by:
-# Variations of module: Armor Kinetic Hardener I (39 of 39)
-# Variations of module: Kinetic Deflection Field I (19 of 19)
-# Module: Civilian Kinetic Deflection Field
-type = "overheat"
-
-
-def handler(fit, module, context):
-    module.boostItemAttr("kineticDamageResistanceBonus", module.getModifiedItemAttr("overloadHardeningBonus"))
diff --git a/eos/effects/effect3035.py b/eos/effects/effect3035.py
deleted file mode 100644
index 59e6a1575..000000000
--- a/eos/effects/effect3035.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# overloadSelfHardeningInvulnerabilityBonus
-#
-# Used by:
-# Modules named like: Capital Flex Hardener (9 of 9)
-# Variations of module: Adaptive Invulnerability Field I (17 of 17)
-type = "overheat"
-
-
-def handler(fit, module, context):
-    for type in ("kinetic", "thermal", "explosive", "em"):
-        module.boostItemAttr("%sDamageResistanceBonus" % type,
-                             module.getModifiedItemAttr("overloadHardeningBonus"))
diff --git a/eos/effects/effect3036.py b/eos/effects/effect3036.py
deleted file mode 100644
index 4db900c9b..000000000
--- a/eos/effects/effect3036.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# skillBombDeploymentModuleReactivationDelayBonus
-#
-# Used by:
-# Skill: Bomb Deployment
-type = "passive"
-
-
-def handler(fit, skill, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Missile Launcher Bomb",
-                                  "moduleReactivationDelay", skill.getModifiedItemAttr("reactivationDelayBonus") * skill.level)
diff --git a/eos/effects/effect3046.py b/eos/effects/effect3046.py
deleted file mode 100644
index 24e833fb3..000000000
--- a/eos/effects/effect3046.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# modifyMaxVelocityOfShipPassive
-#
-# Used by:
-# Modules from group: Expanded Cargohold (7 of 7)
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.ship.multiplyItemAttr("maxVelocity", module.getModifiedItemAttr("maxVelocityModifier"), stackingPenalties=True)
diff --git a/eos/effects/effect3047.py b/eos/effects/effect3047.py
deleted file mode 100644
index 543cb488a..000000000
--- a/eos/effects/effect3047.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# structureHPMultiplyPassive
-#
-# Used by:
-# Modules from group: Expanded Cargohold (7 of 7)
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.ship.multiplyItemAttr("hp", module.getModifiedItemAttr("structureHPMultiplier"))
diff --git a/eos/effects/effect3061.py b/eos/effects/effect3061.py
deleted file mode 100644
index a4648cefa..000000000
--- a/eos/effects/effect3061.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# heatDamageBonus
-#
-# Used by:
-# Modules from group: Shield Boost Amplifier (25 of 25)
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Operation"),
-                                  "heatDamage", module.getModifiedItemAttr("heatDamageBonus"))
diff --git a/eos/effects/effect315.py b/eos/effects/effect315.py
deleted file mode 100644
index aae3f84a7..000000000
--- a/eos/effects/effect315.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# dronesSkillBoostMaxActiveDroneBonus
-#
-# Used by:
-# Skill: Drones
-type = "passive"
-
-
-def handler(fit, skill, context):
-    amount = skill.getModifiedItemAttr("maxActiveDroneBonus") * skill.level
-    fit.extraAttributes.increase("maxActiveDrones", amount)
diff --git a/eos/effects/effect3169.py b/eos/effects/effect3169.py
deleted file mode 100644
index 427290a3f..000000000
--- a/eos/effects/effect3169.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shieldTransportCpuNeedBonusEffect
-#
-# Used by:
-# Ships from group: Logistics (3 of 7)
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Emission Systems"), "cpu",
-                                  src.getModifiedItemAttr("shieldTransportCpuNeedBonus"))
diff --git a/eos/effects/effect3172.py b/eos/effects/effect3172.py
deleted file mode 100644
index a5cfb52fe..000000000
--- a/eos/effects/effect3172.py
+++ /dev/null
@@ -1,14 +0,0 @@
-# droneArmorDamageBonusEffect
-#
-# Used by:
-# Ships from group: Logistics (6 of 7)
-# Ship: Exequror
-# Ship: Scythe
-type = "passive"
-
-
-def handler(fit, ship, context):
-    # This is actually level-less bonus, anyway you have to train cruisers 5
-    # and will get 100% (20%/lvl as stated by description)
-    fit.drones.filteredItemBoost(lambda drone: drone.item.group.name == "Logistic Drone",
-                                 "armorDamageAmount", ship.getModifiedItemAttr("droneArmorDamageAmountBonus"))
diff --git a/eos/effects/effect3173.py b/eos/effects/effect3173.py
deleted file mode 100644
index 2f2d1e6c5..000000000
--- a/eos/effects/effect3173.py
+++ /dev/null
@@ -1,14 +0,0 @@
-# droneShieldBonusBonusEffect
-#
-# Used by:
-# Ships from group: Logistics (6 of 7)
-# Ship: Exequror
-# Ship: Scythe
-type = "passive"
-
-
-def handler(fit, ship, context):
-    # This is actually level-less bonus, anyway you have to train cruisers 5
-    # and will get 100% (20%/lvl as stated by description)
-    fit.drones.filteredItemBoost(lambda drone: drone.item.group.name == "Logistic Drone",
-                                 "shieldBonus", ship.getModifiedItemAttr("droneShieldBonusBonus"))
diff --git a/eos/effects/effect3174.py b/eos/effects/effect3174.py
deleted file mode 100644
index 781bf4794..000000000
--- a/eos/effects/effect3174.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# overloadSelfRangeBonus
-#
-# Used by:
-# Modules from group: Stasis Grappler (7 of 7)
-# Modules from group: Stasis Web (19 of 19)
-# Modules from group: Warp Scrambler (54 of 55)
-type = "overheat"
-
-
-def handler(fit, module, context):
-    module.boostItemAttr("maxRange", module.getModifiedItemAttr("overloadRangeBonus"),
-                         stackingPenalties=True)
diff --git a/eos/effects/effect3175.py b/eos/effects/effect3175.py
deleted file mode 100644
index cc5dbe3f6..000000000
--- a/eos/effects/effect3175.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# overloadSelfSpeedBonus
-#
-# Used by:
-# Modules from group: Propulsion Module (133 of 133)
-type = "overheat"
-
-
-def handler(fit, module, context):
-    module.boostItemAttr("speedFactor", module.getModifiedItemAttr("overloadSpeedFactorBonus"),
-                         stackingPenalties=True)
diff --git a/eos/effects/effect3182.py b/eos/effects/effect3182.py
deleted file mode 100644
index f39a5eed1..000000000
--- a/eos/effects/effect3182.py
+++ /dev/null
@@ -1,14 +0,0 @@
-# overloadSelfECMStrenghtBonus
-#
-# Used by:
-# Modules from group: Burst Jammer (11 of 11)
-# Modules from group: ECM (39 of 39)
-type = "overheat"
-
-
-def handler(fit, module, context):
-    if "projected" not in context:
-        for scanType in ("Gravimetric", "Magnetometric", "Radar", "Ladar"):
-            module.boostItemAttr("scan{0}StrengthBonus".format(scanType),
-                                 module.getModifiedItemAttr("overloadECMStrengthBonus"),
-                                 stackingPenalties=True)
diff --git a/eos/effects/effect3196.py b/eos/effects/effect3196.py
deleted file mode 100644
index 0386ad6e6..000000000
--- a/eos/effects/effect3196.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# thermodynamicsSkillDamageBonus
-#
-# Used by:
-# Skill: Thermodynamics
-type = "passive"
-
-
-def handler(fit, skill, context):
-    fit.modules.filteredItemBoost(lambda mod: "heatDamage" in mod.item.attributes, "heatDamage",
-                                  skill.getModifiedItemAttr("thermodynamicsHeatDamage") * skill.level)
diff --git a/eos/effects/effect3200.py b/eos/effects/effect3200.py
deleted file mode 100644
index c7a2a1049..000000000
--- a/eos/effects/effect3200.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# overloadSelfArmorDamageAmountDurationBonus
-#
-# Used by:
-# Modules from group: Ancillary Armor Repairer (7 of 7)
-# Modules from group: Armor Repair Unit (108 of 108)
-type = "overheat"
-
-
-def handler(fit, module, context):
-    module.boostItemAttr("duration", module.getModifiedItemAttr("overloadSelfDurationBonus"))
-    module.boostItemAttr("armorDamageAmount", module.getModifiedItemAttr("overloadArmorDamageAmount"),
-                         stackingPenalties=True)
diff --git a/eos/effects/effect3201.py b/eos/effects/effect3201.py
deleted file mode 100644
index 4706ccbca..000000000
--- a/eos/effects/effect3201.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# overloadSelfShieldBonusDurationBonus
-#
-# Used by:
-# Modules from group: Ancillary Shield Booster (8 of 8)
-# Modules from group: Shield Booster (97 of 97)
-type = "overheat"
-
-
-def handler(fit, module, context):
-    module.boostItemAttr("duration", module.getModifiedItemAttr("overloadSelfDurationBonus"))
-    module.boostItemAttr("shieldBonus", module.getModifiedItemAttr("overloadShieldBonus"), stackingPenalties=True)
diff --git a/eos/effects/effect3212.py b/eos/effects/effect3212.py
deleted file mode 100644
index a4cb02f67..000000000
--- a/eos/effects/effect3212.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# missileSkillFoFAoeCloudSizeBonus
-#
-# Used by:
-# Implants named like: Zainou 'Snapshot' Auto Targeting Explosion Radius FR (6 of 6)
-type = "passive"
-
-
-def handler(fit, container, context):
-    level = container.level if "skill" in context else 1
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("FoF Missiles"),
-                                    "aoeCloudSize", container.getModifiedItemAttr("aoeCloudSizeBonus") * level)
diff --git a/eos/effects/effect3234.py b/eos/effects/effect3234.py
deleted file mode 100644
index 4ff2ef7f2..000000000
--- a/eos/effects/effect3234.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipRocketExplosiveDmgAF
-#
-# Used by:
-# Ship: Anathema
-# Ship: Vengeance
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Rockets"),
-                                    "explosiveDamage", ship.getModifiedItemAttr("shipBonusAF"), skill="Amarr Frigate")
diff --git a/eos/effects/effect3235.py b/eos/effects/effect3235.py
deleted file mode 100644
index f3b178535..000000000
--- a/eos/effects/effect3235.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipRocketKineticDmgAF
-#
-# Used by:
-# Ship: Anathema
-# Ship: Vengeance
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Rockets"),
-                                    "kineticDamage", ship.getModifiedItemAttr("shipBonusAF"), skill="Amarr Frigate")
diff --git a/eos/effects/effect3236.py b/eos/effects/effect3236.py
deleted file mode 100644
index b937c6760..000000000
--- a/eos/effects/effect3236.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipRocketThermalDmgAF
-#
-# Used by:
-# Ship: Anathema
-# Ship: Vengeance
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Rockets"),
-                                    "thermalDamage", ship.getModifiedItemAttr("shipBonusAF"), skill="Amarr Frigate")
diff --git a/eos/effects/effect3237.py b/eos/effects/effect3237.py
deleted file mode 100644
index 440ae90cb..000000000
--- a/eos/effects/effect3237.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipRocketEmDmgAF
-#
-# Used by:
-# Ship: Anathema
-# Ship: Vengeance
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Rockets"),
-                                    "emDamage", ship.getModifiedItemAttr("shipBonusAF"), skill="Amarr Frigate")
diff --git a/eos/effects/effect3241.py b/eos/effects/effect3241.py
deleted file mode 100644
index d65a4a148..000000000
--- a/eos/effects/effect3241.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# eliteBonusGunshipArmorEmResistance1
-#
-# Used by:
-# Ship: Vengeance
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.ship.boostItemAttr("armorEmDamageResonance", ship.getModifiedItemAttr("eliteBonusGunship1"),
-                           skill="Assault Frigates")
diff --git a/eos/effects/effect3242.py b/eos/effects/effect3242.py
deleted file mode 100644
index ef7175b0b..000000000
--- a/eos/effects/effect3242.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# eliteBonusGunshipArmorThermalResistance1
-#
-# Used by:
-# Ship: Vengeance
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.ship.boostItemAttr("armorThermalDamageResonance", ship.getModifiedItemAttr("eliteBonusGunship1"),
-                           skill="Assault Frigates")
diff --git a/eos/effects/effect3243.py b/eos/effects/effect3243.py
deleted file mode 100644
index e9be2dd52..000000000
--- a/eos/effects/effect3243.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# eliteBonusGunshipArmorKineticResistance1
-#
-# Used by:
-# Ship: Vengeance
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.ship.boostItemAttr("armorKineticDamageResonance", ship.getModifiedItemAttr("eliteBonusGunship1"),
-                           skill="Assault Frigates")
diff --git a/eos/effects/effect3244.py b/eos/effects/effect3244.py
deleted file mode 100644
index 937dd7309..000000000
--- a/eos/effects/effect3244.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# eliteBonusGunshipArmorExplosiveResistance1
-#
-# Used by:
-# Ship: Vengeance
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.ship.boostItemAttr("armorExplosiveDamageResonance", ship.getModifiedItemAttr("eliteBonusGunship1"),
-                           skill="Assault Frigates")
diff --git a/eos/effects/effect3249.py b/eos/effects/effect3249.py
deleted file mode 100644
index 5822015f5..000000000
--- a/eos/effects/effect3249.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# shipCapRecharge2AF
-#
-# Used by:
-# Ship: Anathema
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.ship.boostItemAttr("rechargeRate", ship.getModifiedItemAttr("shipBonus2AF"), skill="Amarr Frigate")
diff --git a/eos/effects/effect3264.py b/eos/effects/effect3264.py
deleted file mode 100644
index e6b8f558b..000000000
--- a/eos/effects/effect3264.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# skillIndustrialReconfigurationConsumptionQuantityBonus
-#
-# Used by:
-# Skill: Industrial Reconfiguration
-type = "passive"
-
-
-def handler(fit, skill, context):
-    amount = -skill.getModifiedItemAttr("consumptionQuantityBonus")
-    fit.modules.filteredItemIncrease(lambda mod: mod.item.requiresSkill(skill),
-                                     "consumptionQuantity", amount * skill.level)
diff --git a/eos/effects/effect3267.py b/eos/effects/effect3267.py
deleted file mode 100644
index fd57fb534..000000000
--- a/eos/effects/effect3267.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipConsumptionQuantityBonusIndustrialReconfigurationORECapital1
-#
-# Used by:
-# Ship: Rorqual
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Industrial Reconfiguration"),
-                                  "consumptionQuantity", ship.getModifiedItemAttr("shipBonusORECapital1"),
-                                  skill="Capital Industrial Ships")
diff --git a/eos/effects/effect3297.py b/eos/effects/effect3297.py
deleted file mode 100644
index 925a33c92..000000000
--- a/eos/effects/effect3297.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipEnergyNeutralizerTransferAmountBonusAB
-#
-# Used by:
-# Ship: Bhaalgorn
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Neutralizer",
-                                  "energyNeutralizerAmount", ship.getModifiedItemAttr("shipBonusAB"),
-                                  skill="Amarr Battleship")
diff --git a/eos/effects/effect3298.py b/eos/effects/effect3298.py
deleted file mode 100644
index 4dfc4dc87..000000000
--- a/eos/effects/effect3298.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# shipEnergyNeutralizerTransferAmountBonusAC
-#
-# Used by:
-# Ship: Ashimmu
-# Ship: Vangel
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Neutralizer",
-                                  "energyNeutralizerAmount", ship.getModifiedItemAttr("shipBonusAC"),
-                                  skill="Amarr Cruiser")
diff --git a/eos/effects/effect3299.py b/eos/effects/effect3299.py
deleted file mode 100644
index 76b6c1f33..000000000
--- a/eos/effects/effect3299.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# shipEnergyNeutralizerTransferAmountBonusAF
-#
-# Used by:
-# Ship: Caedes
-# Ship: Cruor
-# Ship: Sentinel
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Neutralizer",
-                                  "energyNeutralizerAmount", ship.getModifiedItemAttr("shipBonusAF"),
-                                  skill="Amarr Frigate")
diff --git a/eos/effects/effect3313.py b/eos/effects/effect3313.py
deleted file mode 100644
index 0ab64f55e..000000000
--- a/eos/effects/effect3313.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# cloneVatMaxJumpCloneBonusSkillNew
-#
-# Used by:
-# Skill: Cloning Facility Operation
-type = "passive"
-
-
-def handler(fit, skill, context):
-    fit.ship.boostItemAttr("maxJumpClones", skill.getModifiedItemAttr("maxJumpClonesBonus") * skill.level)
diff --git a/eos/effects/effect3331.py b/eos/effects/effect3331.py
deleted file mode 100644
index c8492c130..000000000
--- a/eos/effects/effect3331.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# eliteBonusCommandShipArmorHP1
-#
-# Used by:
-# Ship: Damnation
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.ship.boostItemAttr("armorHP", ship.getModifiedItemAttr("eliteBonusCommandShips1"), skill="Command Ships")
diff --git a/eos/effects/effect3335.py b/eos/effects/effect3335.py
deleted file mode 100644
index 777c51ec0..000000000
--- a/eos/effects/effect3335.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# shipArmorEmResistanceMC2
-#
-# Used by:
-# Ship: Mimir
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.ship.boostItemAttr("armorEmDamageResonance", ship.getModifiedItemAttr("shipBonusMC2"), skill="Minmatar Cruiser")
diff --git a/eos/effects/effect3336.py b/eos/effects/effect3336.py
deleted file mode 100644
index f6ef4cfab..000000000
--- a/eos/effects/effect3336.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipArmorExplosiveResistanceMC2
-#
-# Used by:
-# Ship: Mimir
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.ship.boostItemAttr("armorExplosiveDamageResonance", ship.getModifiedItemAttr("shipBonusMC2"),
-                           skill="Minmatar Cruiser")
diff --git a/eos/effects/effect3339.py b/eos/effects/effect3339.py
deleted file mode 100644
index fe1303bd5..000000000
--- a/eos/effects/effect3339.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipArmorKineticResistanceMC2
-#
-# Used by:
-# Ship: Mimir
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.ship.boostItemAttr("armorKineticDamageResonance", ship.getModifiedItemAttr("shipBonusMC2"),
-                           skill="Minmatar Cruiser")
diff --git a/eos/effects/effect3340.py b/eos/effects/effect3340.py
deleted file mode 100644
index 85ca998f0..000000000
--- a/eos/effects/effect3340.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipArmorThermalResistanceMC2
-#
-# Used by:
-# Ship: Mimir
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.ship.boostItemAttr("armorThermalDamageResonance", ship.getModifiedItemAttr("shipBonusMC2"),
-                           skill="Minmatar Cruiser")
diff --git a/eos/effects/effect3343.py b/eos/effects/effect3343.py
deleted file mode 100644
index b5d232374..000000000
--- a/eos/effects/effect3343.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# eliteBonusHeavyInterdictorsProjectileFalloff1
-#
-# Used by:
-# Ship: Broadsword
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Projectile Turret"),
-                                  "falloff", ship.getModifiedItemAttr("eliteBonusHeavyInterdictors1"),
-                                  skill="Heavy Interdiction Cruisers")
diff --git a/eos/effects/effect3355.py b/eos/effects/effect3355.py
deleted file mode 100644
index 6f5239340..000000000
--- a/eos/effects/effect3355.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# eliteBonusHeavyInterdictorHeavyMissileVelocityBonus1
-#
-# Used by:
-# Ship: Onyx
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Missiles"),
-                                    "maxVelocity", ship.getModifiedItemAttr("eliteBonusHeavyInterdictors1"),
-                                    skill="Heavy Interdiction Cruisers")
diff --git a/eos/effects/effect3356.py b/eos/effects/effect3356.py
deleted file mode 100644
index ef0e91456..000000000
--- a/eos/effects/effect3356.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# eliteBonusHeavyInterdictorHeavyAssaultMissileVelocityBonus
-#
-# Used by:
-# Ship: Onyx
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Assault Missiles"),
-                                    "maxVelocity", ship.getModifiedItemAttr("eliteBonusHeavyInterdictors1"),
-                                    skill="Heavy Interdiction Cruisers")
diff --git a/eos/effects/effect3357.py b/eos/effects/effect3357.py
deleted file mode 100644
index aee02924c..000000000
--- a/eos/effects/effect3357.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# eliteBonusHeavyInterdictorLightMissileVelocityBonus
-#
-# Used by:
-# Ship: Onyx
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Light Missiles"),
-                                    "maxVelocity", ship.getModifiedItemAttr("eliteBonusHeavyInterdictors1"),
-                                    skill="Heavy Interdiction Cruisers")
diff --git a/eos/effects/effect3366.py b/eos/effects/effect3366.py
deleted file mode 100644
index ac0d80650..000000000
--- a/eos/effects/effect3366.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipRemoteSensorDampenerCapNeedGF
-#
-# Used by:
-# Ship: Keres
-# Ship: Maulus
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Sensor Dampener",
-                                  "capacitorNeed", ship.getModifiedItemAttr("shipBonusGF"), skill="Gallente Frigate")
diff --git a/eos/effects/effect3367.py b/eos/effects/effect3367.py
deleted file mode 100644
index 20e48def7..000000000
--- a/eos/effects/effect3367.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# eliteBonusElectronicAttackShipWarpScramblerMaxRange1
-#
-# Used by:
-# Ship: Keres
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Warp Scrambler",
-                                  "maxRange", ship.getModifiedItemAttr("eliteBonusElectronicAttackShip1"),
-                                  skill="Electronic Attack Ships")
diff --git a/eos/effects/effect3369.py b/eos/effects/effect3369.py
deleted file mode 100644
index 4b5fdb0fd..000000000
--- a/eos/effects/effect3369.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# eliteBonusElectronicAttackShipECMOptimalRange1
-#
-# Used by:
-# Ship: Kitsune
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "ECM",
-                                  "maxRange", ship.getModifiedItemAttr("eliteBonusElectronicAttackShip1"),
-                                  skill="Electronic Attack Ships")
diff --git a/eos/effects/effect3370.py b/eos/effects/effect3370.py
deleted file mode 100644
index 929219c96..000000000
--- a/eos/effects/effect3370.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# eliteBonusElectronicAttackShipStasisWebMaxRange1
-#
-# Used by:
-# Ship: Hyena
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Stasis Web",
-                                  "maxRange", ship.getModifiedItemAttr("eliteBonusElectronicAttackShip1"),
-                                  skill="Electronic Attack Ships")
diff --git a/eos/effects/effect3371.py b/eos/effects/effect3371.py
deleted file mode 100644
index 63e03d14d..000000000
--- a/eos/effects/effect3371.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# eliteBonusElectronicAttackShipWarpScramblerCapNeed2
-#
-# Used by:
-# Ship: Keres
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Warp Scrambler",
-                                  "capacitorNeed", ship.getModifiedItemAttr("eliteBonusElectronicAttackShip2"),
-                                  skill="Electronic Attack Ships")
diff --git a/eos/effects/effect3374.py b/eos/effects/effect3374.py
deleted file mode 100644
index 29dfc8f55..000000000
--- a/eos/effects/effect3374.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# eliteBonusElectronicAttackShipSignatureRadius2
-#
-# Used by:
-# Ship: Hyena
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.ship.boostItemAttr("signatureRadius", ship.getModifiedItemAttr("eliteBonusElectronicAttackShip2"),
-                           skill="Electronic Attack Ships")
diff --git a/eos/effects/effect3379.py b/eos/effects/effect3379.py
deleted file mode 100644
index 1f0adf21c..000000000
--- a/eos/effects/effect3379.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# implantHardwiringABcapacitorNeed
-#
-# Used by:
-# Implants named like: Eifyr and Co. 'Rogue' Fuel Conservation FC (6 of 6)
-type = "passive"
-
-
-def handler(fit, implant, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Afterburner"),
-                                  "capacitorNeed", implant.getModifiedItemAttr("capNeedBonus"))
diff --git a/eos/effects/effect3380.py b/eos/effects/effect3380.py
deleted file mode 100644
index 5a5878fd4..000000000
--- a/eos/effects/effect3380.py
+++ /dev/null
@@ -1,35 +0,0 @@
-# warpDisruptSphere
-#
-# Used by:
-# Modules from group: Warp Disrupt Field Generator (7 of 7)
-
-# warpDisruptSphere
-#
-# Used by:
-# Modules from group: Warp Disrupt Field Generator (7 of 7)
-from eos.const import FittingModuleState
-
-type = "projected", "active"
-runTime = "early"
-
-
-def handler(fit, module, context):
-
-    if "projected" in context:
-        fit.ship.increaseItemAttr("warpScrambleStatus", module.getModifiedItemAttr("warpScrambleStrength"))
-        if module.charge is not None and module.charge.ID == 45010:
-            for mod in fit.modules:
-                if not mod.isEmpty and mod.item.requiresSkill("High Speed Maneuvering") and mod.state > FittingModuleState.ONLINE:
-                    mod.state = FittingModuleState.ONLINE
-                if not mod.isEmpty and mod.item.requiresSkill("Micro Jump Drive Operation") and mod.state > FittingModuleState.ONLINE:
-                    mod.state = FittingModuleState.ONLINE
-    else:
-        if module.charge is None:
-            fit.ship.boostItemAttr("mass", module.getModifiedItemAttr("massBonusPercentage"))
-            fit.ship.boostItemAttr("signatureRadius", module.getModifiedItemAttr("signatureRadiusBonus"))
-            fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Propulsion Module",
-                                          "speedBoostFactor", module.getModifiedItemAttr("speedBoostFactorBonus"))
-            fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Propulsion Module",
-                                      "speedFactor", module.getModifiedItemAttr("speedFactorBonus"))
-
-        fit.ship.forceItemAttr("disallowAssistance", 1)
diff --git a/eos/effects/effect3392.py b/eos/effects/effect3392.py
deleted file mode 100644
index 0d20b2c44..000000000
--- a/eos/effects/effect3392.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# eliteBonusBlackOpsLargeEnergyTurretTracking1
-#
-# Used by:
-# Ship: Redeemer
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Large Energy Turret"),
-                                  "trackingSpeed", ship.getModifiedItemAttr("eliteBonusBlackOps1"), skill="Black Ops")
diff --git a/eos/effects/effect34.py b/eos/effects/effect34.py
deleted file mode 100644
index 491b73f0c..000000000
--- a/eos/effects/effect34.py
+++ /dev/null
@@ -1,15 +0,0 @@
-# projectileFired
-#
-# Used by:
-# Modules from group: Hybrid Weapon (221 of 221)
-# Modules from group: Projectile Weapon (165 of 165)
-type = 'active'
-
-
-def handler(fit, module, context):
-    rt = module.getModifiedItemAttr("reloadTime")
-    if not rt:
-        # Set reload time to 10 seconds
-        module.reloadTime = 10000
-    else:
-        module.reloadTime = rt
diff --git a/eos/effects/effect3403.py b/eos/effects/effect3403.py
deleted file mode 100644
index af6239d41..000000000
--- a/eos/effects/effect3403.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# eliteBonusBlackOpsCloakVelocity2
-#
-# Used by:
-# Ships from group: Black Ops (5 of 5)
-type = "passive"
-
-
-def handler(fit, ship, context):
-    if fit.extraAttributes["cloaked"]:
-        fit.ship.multiplyItemAttr("maxVelocity", ship.getModifiedItemAttr("eliteBonusBlackOps2"), skill="Black Ops")
diff --git a/eos/effects/effect3406.py b/eos/effects/effect3406.py
deleted file mode 100644
index 8fe20233c..000000000
--- a/eos/effects/effect3406.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# eliteBonusBlackOpsMaxVelocity1
-#
-# Used by:
-# Ship: Panther
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.ship.boostItemAttr("maxVelocity", ship.getModifiedItemAttr("eliteBonusBlackOps1"), skill="Black Ops")
diff --git a/eos/effects/effect3415.py b/eos/effects/effect3415.py
deleted file mode 100644
index 9b25bb56f..000000000
--- a/eos/effects/effect3415.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# eliteBonusViolatorsLargeEnergyTurretDamageRole1
-#
-# Used by:
-# Ship: Paladin
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Large Energy Turret"),
-                                  "damageMultiplier", ship.getModifiedItemAttr("eliteBonusViolatorsRole1"))
diff --git a/eos/effects/effect3416.py b/eos/effects/effect3416.py
deleted file mode 100644
index 932faef41..000000000
--- a/eos/effects/effect3416.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# eliteBonusViolatorsLargeHybridTurretDamageRole1
-#
-# Used by:
-# Ship: Kronos
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Large Hybrid Turret"),
-                                  "damageMultiplier", ship.getModifiedItemAttr("eliteBonusViolatorsRole1"))
diff --git a/eos/effects/effect3417.py b/eos/effects/effect3417.py
deleted file mode 100644
index b0166442e..000000000
--- a/eos/effects/effect3417.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# eliteBonusViolatorsLargeProjectileTurretDamageRole1
-#
-# Used by:
-# Ship: Vargur
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Large Projectile Turret"),
-                                  "damageMultiplier", ship.getModifiedItemAttr("eliteBonusViolatorsRole1"))
diff --git a/eos/effects/effect3424.py b/eos/effects/effect3424.py
deleted file mode 100644
index da791d457..000000000
--- a/eos/effects/effect3424.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# eliteBonusViolatorsLargeHybridTurretTracking1
-#
-# Used by:
-# Ship: Kronos
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Large Hybrid Turret"),
-                                  "trackingSpeed", ship.getModifiedItemAttr("eliteBonusViolators1"), skill="Marauders")
diff --git a/eos/effects/effect3425.py b/eos/effects/effect3425.py
deleted file mode 100644
index 708c6098c..000000000
--- a/eos/effects/effect3425.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# eliteBonusViolatorsLargeProjectileTurretTracking1
-#
-# Used by:
-# Ship: Vargur
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Large Projectile Turret"),
-                                  "trackingSpeed", ship.getModifiedItemAttr("eliteBonusViolators1"), skill="Marauders")
diff --git a/eos/effects/effect3427.py b/eos/effects/effect3427.py
deleted file mode 100644
index e6e49cbd3..000000000
--- a/eos/effects/effect3427.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# eliteBonusViolatorsTractorBeamMaxRangeRole2
-#
-# Used by:
-# Ships from group: Marauder (4 of 4)
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Tractor Beam",
-                                  "maxRange", ship.getModifiedItemAttr("eliteBonusViolatorsRole2"))
diff --git a/eos/effects/effect3439.py b/eos/effects/effect3439.py
deleted file mode 100644
index cf16508e5..000000000
--- a/eos/effects/effect3439.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# eliteBonusViolatorsEwTargetPainting1
-#
-# Used by:
-# Ship: Golem
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Target Painter",
-                                  "signatureRadiusBonus", ship.getModifiedItemAttr("eliteBonusViolators1"),
-                                  skill="Marauders")
diff --git a/eos/effects/effect3447.py b/eos/effects/effect3447.py
deleted file mode 100644
index 5cd2fade4..000000000
--- a/eos/effects/effect3447.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipBonusPTFalloffMB1
-#
-# Used by:
-# Ship: Marshal
-# Ship: Vargur
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Large Projectile Turret"),
-                                  "falloff", ship.getModifiedItemAttr("shipBonusMB"), skill="Minmatar Battleship")
diff --git a/eos/effects/effect3466.py b/eos/effects/effect3466.py
deleted file mode 100644
index b9d5bbf34..000000000
--- a/eos/effects/effect3466.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# eliteBonusElectronicAttackShipRechargeRate2
-#
-# Used by:
-# Ship: Sentinel
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.ship.boostItemAttr("rechargeRate", ship.getModifiedItemAttr("eliteBonusElectronicAttackShip2"),
-                           skill="Electronic Attack Ships")
diff --git a/eos/effects/effect3467.py b/eos/effects/effect3467.py
deleted file mode 100644
index bb5fa326e..000000000
--- a/eos/effects/effect3467.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# eliteBonusElectronicAttackShipCapacitorCapacity2
-#
-# Used by:
-# Ship: Kitsune
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.ship.boostItemAttr("capacitorCapacity", ship.getModifiedItemAttr("eliteBonusElectronicAttackShip2"),
-                           skill="Electronic Attack Ships")
diff --git a/eos/effects/effect3468.py b/eos/effects/effect3468.py
deleted file mode 100644
index 20a47e364..000000000
--- a/eos/effects/effect3468.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# eliteBonusHeavyInterdictorsWarpDisruptFieldGeneratorWarpScrambleRange2
-#
-# Used by:
-# Ships from group: Heavy Interdiction Cruiser (5 of 5)
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Warp Disrupt Field Generator",
-                                  "warpScrambleRange", ship.getModifiedItemAttr("eliteBonusHeavyInterdictors2"),
-                                  skill="Heavy Interdiction Cruisers")
diff --git a/eos/effects/effect3473.py b/eos/effects/effect3473.py
deleted file mode 100644
index 747b01bb9..000000000
--- a/eos/effects/effect3473.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# eliteBonusViolatorsTractorBeamMaxTractorVelocityRole3
-#
-# Used by:
-# Ships from group: Marauder (4 of 4)
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Tractor Beam",
-                                  "maxTractorVelocity", ship.getModifiedItemAttr("eliteBonusViolatorsRole3"))
diff --git a/eos/effects/effect3478.py b/eos/effects/effect3478.py
deleted file mode 100644
index ff1e9558a..000000000
--- a/eos/effects/effect3478.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipLaserDamagePirateBattleship
-#
-# Used by:
-# Ship: Bhaalgorn
-# Ship: Nightmare
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Large Energy Turret"),
-                                  "damageMultiplier", ship.getModifiedItemAttr("shipBonusRole7"))
diff --git a/eos/effects/effect3480.py b/eos/effects/effect3480.py
deleted file mode 100644
index ad820e01d..000000000
--- a/eos/effects/effect3480.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipTrackingBonusAB
-#
-# Used by:
-# Ship: Nightmare
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Large Energy Turret"),
-                                  "trackingSpeed", ship.getModifiedItemAttr("shipBonusAB2"), skill="Amarr Battleship")
diff --git a/eos/effects/effect3483.py b/eos/effects/effect3483.py
deleted file mode 100644
index 8e3662ced..000000000
--- a/eos/effects/effect3483.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# shipBonusMediumEnergyTurretDamagePirateFaction
-#
-# Used by:
-# Ship: Ashimmu
-# Ship: Fiend
-# Ship: Gnosis
-# Ship: Phantasm
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Energy Turret"),
-                                  "damageMultiplier", ship.getModifiedItemAttr("shipBonusRole7"))
diff --git a/eos/effects/effect3484.py b/eos/effects/effect3484.py
deleted file mode 100644
index d0c9a8e55..000000000
--- a/eos/effects/effect3484.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipBonusMediumEnergyTurretTrackingAC2
-#
-# Used by:
-# Ship: Fiend
-# Ship: Phantasm
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Energy Turret"),
-                                  "trackingSpeed", ship.getModifiedItemAttr("shipBonusAC2"), skill="Amarr Cruiser")
diff --git a/eos/effects/effect3487.py b/eos/effects/effect3487.py
deleted file mode 100644
index f4b2ccfca..000000000
--- a/eos/effects/effect3487.py
+++ /dev/null
@@ -1,15 +0,0 @@
-# shipBonusSmallEnergyTurretDamagePirateFaction
-#
-# Used by:
-# Ship: Caedes
-# Ship: Confessor
-# Ship: Cruor
-# Ship: Imp
-# Ship: Succubus
-# Ship: Sunesis
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Energy Turret"),
-                                  "damageMultiplier", ship.getModifiedItemAttr("shipBonusRole7"))
diff --git a/eos/effects/effect3489.py b/eos/effects/effect3489.py
deleted file mode 100644
index 76232e8f4..000000000
--- a/eos/effects/effect3489.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipBonusSmallEnergyTurretTracking2AF
-#
-# Used by:
-# Ship: Imp
-# Ship: Succubus
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Energy Turret"),
-                                  "trackingSpeed", ship.getModifiedItemAttr("shipBonus2AF"), skill="Amarr Frigate")
diff --git a/eos/effects/effect3493.py b/eos/effects/effect3493.py
deleted file mode 100644
index 1b10ac223..000000000
--- a/eos/effects/effect3493.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# rorqualCargoScanRangeBonus
-#
-# Used by:
-# Ship: Rorqual
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Cargo Scanner",
-                                  "cargoScanRange", ship.getModifiedItemAttr("cargoScannerRangeBonus"))
diff --git a/eos/effects/effect3494.py b/eos/effects/effect3494.py
deleted file mode 100644
index 1a49d68ce..000000000
--- a/eos/effects/effect3494.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# rorqualSurveyScannerRangeBonus
-#
-# Used by:
-# Ship: Rorqual
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Survey Scanner",
-                                  "surveyScanRange", ship.getModifiedItemAttr("surveyScannerRangeBonus"))
diff --git a/eos/effects/effect3495.py b/eos/effects/effect3495.py
deleted file mode 100644
index eb349db5c..000000000
--- a/eos/effects/effect3495.py
+++ /dev/null
@@ -1,15 +0,0 @@
-# shipCapPropulsionJamming
-#
-# Used by:
-# Ships from group: Interceptor (10 of 10)
-# Ship: Atron
-# Ship: Condor
-# Ship: Executioner
-# Ship: Slasher
-type = "passive"
-
-
-def handler(fit, ship, context):
-    groups = ("Stasis Web", "Warp Scrambler")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name in groups,
-                                  "capacitorNeed", ship.getModifiedItemAttr("eliteBonusInterceptorRole"))
diff --git a/eos/effects/effect3496.py b/eos/effects/effect3496.py
deleted file mode 100644
index 78313ac62..000000000
--- a/eos/effects/effect3496.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# setBonusThukker
-#
-# Used by:
-# Implants named like: grade Nomad (12 of 12)
-runTime = "early"
-type = "passive"
-
-
-def handler(fit, implant, context):
-    fit.appliedImplants.filteredItemMultiply(lambda mod: mod.item.group.name == "Cyberimplant",
-                                             "agilityBonus", implant.getModifiedItemAttr("implantSetThukker"))
diff --git a/eos/effects/effect3498.py b/eos/effects/effect3498.py
deleted file mode 100644
index a63079741..000000000
--- a/eos/effects/effect3498.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# setBonusSisters
-#
-# Used by:
-# Implants named like: grade Virtue (12 of 12)
-runTime = "early"
-type = "passive"
-
-
-def handler(fit, implant, context):
-    fit.appliedImplants.filteredItemMultiply(lambda mod: mod.item.group.name == "Cyberimplant",
-                                             "scanStrengthBonus", implant.getModifiedItemAttr("implantSetSisters"))
diff --git a/eos/effects/effect3499.py b/eos/effects/effect3499.py
deleted file mode 100644
index ffb9c754f..000000000
--- a/eos/effects/effect3499.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# setBonusSyndicate
-#
-# Used by:
-# Implants named like: grade Edge (12 of 12)
-runTime = "early"
-type = "passive"
-
-
-def handler(fit, implant, context):
-    fit.appliedImplants.filteredItemMultiply(lambda mod: mod.item.group.name == "Cyberimplant",
-                                             "boosterAttributeModifier",
-                                             implant.getModifiedItemAttr("implantSetSyndicate"))
diff --git a/eos/effects/effect3513.py b/eos/effects/effect3513.py
deleted file mode 100644
index 6db3789dd..000000000
--- a/eos/effects/effect3513.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# setBonusMordus
-#
-# Used by:
-# Implants named like: grade Centurion (12 of 12)
-runTime = "early"
-type = "passive"
-
-
-def handler(fit, implant, context):
-    fit.appliedImplants.filteredItemMultiply(lambda mod: mod.item.group.name == "Cyberimplant",
-                                             "rangeSkillBonus", implant.getModifiedItemAttr("implantSetMordus"))
diff --git a/eos/effects/effect3514.py b/eos/effects/effect3514.py
deleted file mode 100644
index d878926d0..000000000
--- a/eos/effects/effect3514.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# Interceptor2WarpScrambleRange
-#
-# Used by:
-# Ships from group: Interceptor (6 of 10)
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Warp Scrambler",
-                                  "maxRange", ship.getModifiedItemAttr("eliteBonusInterceptor2"), skill="Interceptors")
diff --git a/eos/effects/effect3519.py b/eos/effects/effect3519.py
deleted file mode 100644
index 72f944de7..000000000
--- a/eos/effects/effect3519.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# weaponUpgradesCpuNeedBonusPostPercentCpuLocationShipModulesRequiringBombLauncher
-#
-# Used by:
-# Skill: Weapon Upgrades
-type = "passive"
-
-
-def handler(fit, skill, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Bomb Deployment"),
-                                  "cpu", skill.getModifiedItemAttr("cpuNeedBonus") * skill.level)
diff --git a/eos/effects/effect3520.py b/eos/effects/effect3520.py
deleted file mode 100644
index 769b0327f..000000000
--- a/eos/effects/effect3520.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# skillAdvancedWeaponUpgradesPowerNeedBonusBombLaunchers
-#
-# Used by:
-# Skill: Advanced Weapon Upgrades
-type = "passive"
-
-
-def handler(fit, skill, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Bomb Deployment"),
-                                  "power", skill.getModifiedItemAttr("powerNeedBonus") * skill.level)
diff --git a/eos/effects/effect3526.py b/eos/effects/effect3526.py
deleted file mode 100644
index d6bda31b7..000000000
--- a/eos/effects/effect3526.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# cynosuralTheoryConsumptionBonus
-#
-# Used by:
-# Ships from group: Force Recon Ship (8 of 9)
-# Skill: Cynosural Field Theory
-type = "passive"
-
-
-def handler(fit, container, context):
-    level = container.level if "skill" in context else 1
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Cynosural Field Generator",
-                                  "consumptionQuantity",
-                                  container.getModifiedItemAttr("consumptionQuantityBonusPercentage") * level)
diff --git a/eos/effects/effect3530.py b/eos/effects/effect3530.py
deleted file mode 100644
index d5a92e778..000000000
--- a/eos/effects/effect3530.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# eliteBonusBlackOpsAgiliy1
-#
-# Used by:
-# Ship: Sin
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.ship.boostItemAttr("agility", ship.getModifiedItemAttr("eliteBonusBlackOps1"), skill="Black Ops")
diff --git a/eos/effects/effect3532.py b/eos/effects/effect3532.py
deleted file mode 100644
index 5cb2d9654..000000000
--- a/eos/effects/effect3532.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# skillJumpDriveConsumptionAmountBonusPercentage
-#
-# Used by:
-# Skill: Jump Fuel Conservation
-type = "passive"
-
-
-def handler(fit, skill, context):
-    fit.ship.boostItemAttr("jumpDriveConsumptionAmount",
-                           skill.getModifiedItemAttr("consumptionQuantityBonusPercentage") * skill.level)
diff --git a/eos/effects/effect3561.py b/eos/effects/effect3561.py
deleted file mode 100644
index 6a532270d..000000000
--- a/eos/effects/effect3561.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# ewSkillTrackingDisruptionTrackingSpeedBonus
-#
-# Used by:
-# Modules named like: Tracking Diagnostic Subroutines (8 of 8)
-# Skill: Weapon Destabilization
-type = "passive"
-
-
-def handler(fit, container, context):
-    level = container.level if "skill" in context else 1
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Weapon Disruptor",
-                                  "trackingSpeedBonus",
-                                  container.getModifiedItemAttr("scanSkillEwStrengthBonus") * level)
diff --git a/eos/effects/effect3568.py b/eos/effects/effect3568.py
deleted file mode 100644
index 87225755e..000000000
--- a/eos/effects/effect3568.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# eliteBonusLogisticsTrackingLinkMaxRangeBonus1
-#
-# Used by:
-# Ship: Scimitar
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Remote Tracking Computer",
-                                  "maxRangeBonus", ship.getModifiedItemAttr("eliteBonusLogistics1"),
-                                  skill="Logistics Cruisers")
diff --git a/eos/effects/effect3569.py b/eos/effects/effect3569.py
deleted file mode 100644
index f95e79062..000000000
--- a/eos/effects/effect3569.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# eliteBonusLogisticsTrackingLinkMaxRangeBonus2
-#
-# Used by:
-# Ship: Oneiros
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Remote Tracking Computer",
-                                  "maxRangeBonus", ship.getModifiedItemAttr("eliteBonusLogistics2"),
-                                  skill="Logistics Cruisers")
diff --git a/eos/effects/effect3570.py b/eos/effects/effect3570.py
deleted file mode 100644
index b79d6faf0..000000000
--- a/eos/effects/effect3570.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# eliteBonusLogisticsTrackingLinkTrackingSpeedBonus2
-#
-# Used by:
-# Ship: Oneiros
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Remote Tracking Computer",
-                                  "trackingSpeedBonus", ship.getModifiedItemAttr("eliteBonusLogistics2"),
-                                  skill="Logistics Cruisers")
diff --git a/eos/effects/effect3571.py b/eos/effects/effect3571.py
deleted file mode 100644
index dcb3c5d3a..000000000
--- a/eos/effects/effect3571.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# eliteBonusLogisticsTrackingLinkTrackingSpeedBonus1
-#
-# Used by:
-# Ship: Scimitar
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Remote Tracking Computer",
-                                  "trackingSpeedBonus", ship.getModifiedItemAttr("eliteBonusLogistics1"),
-                                  skill="Logistics Cruisers")
diff --git a/eos/effects/effect3586.py b/eos/effects/effect3586.py
deleted file mode 100644
index 0f218ec69..000000000
--- a/eos/effects/effect3586.py
+++ /dev/null
@@ -1,15 +0,0 @@
-# ewSkillSignalSuppressionScanResolutionBonus
-#
-# Used by:
-# Modules named like: Inverted Signal Field Projector (8 of 8)
-# Skill: Signal Suppression
-type = "passive"
-
-
-def handler(fit, container, context):
-    level = container.level if "skill" in context else 1
-    penalized = False if "skill" in context else True
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Sensor Dampener",
-                                  "scanResolutionBonus",
-                                  container.getModifiedItemAttr("scanSkillEwStrengthBonus") * level,
-                                  stackingPenalties=penalized)
diff --git a/eos/effects/effect3587.py b/eos/effects/effect3587.py
deleted file mode 100644
index 7d1afd2ed..000000000
--- a/eos/effects/effect3587.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipBonusEwRemoteSensorDampenerMaxTargetRangeBonusGC2
-#
-# Used by:
-# Variations of ship: Celestis (3 of 3)
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Sensor Dampener",
-                                  "maxTargetRangeBonus", ship.getModifiedItemAttr("shipBonusGC2"),
-                                  skill="Gallente Cruiser")
diff --git a/eos/effects/effect3588.py b/eos/effects/effect3588.py
deleted file mode 100644
index bbfd54a57..000000000
--- a/eos/effects/effect3588.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# shipBonusEwRemoteSensorDampenerMaxTargetRangeBonusGF2
-#
-# Used by:
-# Ship: Keres
-# Ship: Maulus
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Sensor Dampener",
-                                  "maxTargetRangeBonus", ship.getModifiedItemAttr("shipBonusGF2"),
-                                  skill="Gallente Frigate")
diff --git a/eos/effects/effect3589.py b/eos/effects/effect3589.py
deleted file mode 100644
index ede9c9d7e..000000000
--- a/eos/effects/effect3589.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# shipBonusEwRemoteSensorDampenerScanResolutionBonusGF2
-#
-# Used by:
-# Ship: Keres
-# Ship: Maulus
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Sensor Dampener",
-                                  "scanResolutionBonus", ship.getModifiedItemAttr("shipBonusGF2"),
-                                  skill="Gallente Frigate")
diff --git a/eos/effects/effect3590.py b/eos/effects/effect3590.py
deleted file mode 100644
index b8b1259dc..000000000
--- a/eos/effects/effect3590.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipBonusEwRemoteSensorDampenerScanResolutionBonusGC2
-#
-# Used by:
-# Variations of ship: Celestis (3 of 3)
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Sensor Dampener",
-                                  "scanResolutionBonus", ship.getModifiedItemAttr("shipBonusGC2"),
-                                  skill="Gallente Cruiser")
diff --git a/eos/effects/effect3591.py b/eos/effects/effect3591.py
deleted file mode 100644
index 534c3af7a..000000000
--- a/eos/effects/effect3591.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# ewSkillSignalSuppressionMaxTargetRangeBonus
-#
-# Used by:
-# Modules named like: Inverted Signal Field Projector (8 of 8)
-# Skill: Signal Suppression
-type = "passive"
-
-
-def handler(fit, container, context):
-    level = container.level if "skill" in context else 1
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Sensor Dampener",
-                                  "maxTargetRangeBonus",
-                                  container.getModifiedItemAttr("scanSkillEwStrengthBonus") * level)
diff --git a/eos/effects/effect3592.py b/eos/effects/effect3592.py
deleted file mode 100644
index df631889f..000000000
--- a/eos/effects/effect3592.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# eliteBonusJumpFreighterHullHP1
-#
-# Used by:
-# Ships from group: Jump Freighter (4 of 4)
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.ship.boostItemAttr("hp", ship.getModifiedItemAttr("eliteBonusJumpFreighter1"), skill="Jump Freighters")
diff --git a/eos/effects/effect3593.py b/eos/effects/effect3593.py
deleted file mode 100644
index 811dc7770..000000000
--- a/eos/effects/effect3593.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# eliteBonusJumpFreighterJumpDriveConsumptionAmount2
-#
-# Used by:
-# Ships from group: Jump Freighter (4 of 4)
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.ship.boostItemAttr("jumpDriveConsumptionAmount", ship.getModifiedItemAttr("eliteBonusJumpFreighter2"),
-                           skill="Jump Freighters")
diff --git a/eos/effects/effect3597.py b/eos/effects/effect3597.py
deleted file mode 100644
index c1d064018..000000000
--- a/eos/effects/effect3597.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# scriptSensorBoosterScanResolutionBonusBonus
-#
-# Used by:
-# Charges from group: Sensor Booster Script (3 of 3)
-# Charges from group: Sensor Dampener Script (2 of 2)
-type = "passive"
-
-
-def handler(fit, module, context):
-    module.boostItemAttr("scanResolutionBonus", module.getModifiedChargeAttr("scanResolutionBonusBonus"))
diff --git a/eos/effects/effect3598.py b/eos/effects/effect3598.py
deleted file mode 100644
index a74e9d0bc..000000000
--- a/eos/effects/effect3598.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# scriptSensorBoosterMaxTargetRangeBonusBonus
-#
-# Used by:
-# Charges from group: Sensor Booster Script (3 of 3)
-# Charges from group: Sensor Dampener Script (2 of 2)
-type = "passive"
-
-
-def handler(fit, module, context):
-    module.boostItemAttr("maxTargetRangeBonus", module.getModifiedChargeAttr("maxTargetRangeBonusBonus"))
diff --git a/eos/effects/effect3599.py b/eos/effects/effect3599.py
deleted file mode 100644
index ff256a748..000000000
--- a/eos/effects/effect3599.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# scriptTrackingComputerTrackingSpeedBonusBonus
-#
-# Used by:
-# Charges from group: Tracking Disruption Script (2 of 2)
-# Charges from group: Tracking Script (2 of 2)
-type = "passive"
-
-
-def handler(fit, module, context):
-    module.boostItemAttr("trackingSpeedBonus", module.getModifiedChargeAttr("trackingSpeedBonusBonus"))
diff --git a/eos/effects/effect3600.py b/eos/effects/effect3600.py
deleted file mode 100644
index c3b510a7b..000000000
--- a/eos/effects/effect3600.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# scriptTrackingComputerMaxRangeBonusBonus
-#
-# Used by:
-# Charges from group: Tracking Disruption Script (2 of 2)
-# Charges from group: Tracking Script (2 of 2)
-type = "passive"
-
-
-def handler(fit, module, context):
-    module.boostItemAttr("maxRangeBonus", module.getModifiedChargeAttr("maxRangeBonusBonus"))
diff --git a/eos/effects/effect3601.py b/eos/effects/effect3601.py
deleted file mode 100644
index 4c224a0ef..000000000
--- a/eos/effects/effect3601.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# scriptWarpDisruptionFieldGeneratorSetDisallowInEmpireSpace
-#
-# Used by:
-# Charges from group: Warp Disruption Script (2 of 2)
-type = "passive"
-
-
-def handler(fit, module, context):
-    module.forceItemAttr("disallowInEmpireSpace", module.getModifiedChargeAttr("disallowInEmpireSpace"))
diff --git a/eos/effects/effect3602.py b/eos/effects/effect3602.py
deleted file mode 100644
index 23361f87b..000000000
--- a/eos/effects/effect3602.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# scriptDurationBonus
-#
-# Used by:
-# Charges from group: Warp Disruption Script (2 of 2)
-type = "passive"
-
-
-def handler(fit, module, context):
-    module.boostItemAttr("duration", module.getModifiedChargeAttr("durationBonus"))
diff --git a/eos/effects/effect3617.py b/eos/effects/effect3617.py
deleted file mode 100644
index 34ee9918f..000000000
--- a/eos/effects/effect3617.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# scriptSignatureRadiusBonusBonus
-#
-# Used by:
-# Charges from group: Warp Disruption Script (2 of 2)
-type = "passive"
-runTime = "early"
-
-
-def handler(fit, module, context):
-    module.boostItemAttr("signatureRadiusBonus", module.getModifiedChargeAttr("signatureRadiusBonusBonus"))
diff --git a/eos/effects/effect3618.py b/eos/effects/effect3618.py
deleted file mode 100644
index dcf4a6c02..000000000
--- a/eos/effects/effect3618.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# scriptMassBonusPercentageBonus
-#
-# Used by:
-# Charges from group: Warp Disruption Script (2 of 2)
-type = "passive"
-runTime = "early"
-
-
-def handler(fit, module, context):
-    module.boostItemAttr("massBonusPercentage", module.getModifiedChargeAttr("massBonusPercentageBonus"))
diff --git a/eos/effects/effect3619.py b/eos/effects/effect3619.py
deleted file mode 100644
index 7ead7eb03..000000000
--- a/eos/effects/effect3619.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# scriptSpeedBoostFactorBonusBonus
-#
-# Used by:
-# Charges from group: Warp Disruption Script (2 of 2)
-type = "passive"
-runTime = "early"
-
-
-def handler(fit, module, context):
-    module.boostItemAttr("speedBoostFactorBonus", module.getModifiedChargeAttr("speedBoostFactorBonusBonus"))
diff --git a/eos/effects/effect3620.py b/eos/effects/effect3620.py
deleted file mode 100644
index f3d560d76..000000000
--- a/eos/effects/effect3620.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# scriptSpeedFactorBonusBonus
-#
-# Used by:
-# Charges from group: Warp Disruption Script (2 of 2)
-type = "passive"
-runTime = "early"
-
-
-def handler(fit, module, context):
-    module.boostItemAttr("speedFactorBonus", module.getModifiedChargeAttr("speedFactorBonusBonus"))
diff --git a/eos/effects/effect3648.py b/eos/effects/effect3648.py
deleted file mode 100644
index cc253590b..000000000
--- a/eos/effects/effect3648.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# scriptWarpScrambleRangeBonus
-#
-# Used by:
-# Charges from group: Warp Disruption Script (2 of 2)
-type = "passive"
-
-
-def handler(fit, module, context):
-    module.boostItemAttr("warpScrambleRange", module.getModifiedChargeAttr("warpScrambleRangeBonus"))
diff --git a/eos/effects/effect3649.py b/eos/effects/effect3649.py
deleted file mode 100644
index fd2aad0bb..000000000
--- a/eos/effects/effect3649.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# eliteBonusViolatorsLargeEnergyTurretDamage1
-#
-# Used by:
-# Ship: Paladin
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Large Energy Turret"),
-                                  "damageMultiplier", ship.getModifiedItemAttr("eliteBonusViolators1"),
-                                  skill="Marauders")
diff --git a/eos/effects/effect3650.py b/eos/effects/effect3650.py
deleted file mode 100644
index cd2c3cf5e..000000000
--- a/eos/effects/effect3650.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# ewGroupRsdMaxRangeBonus
-#
-# Used by:
-# Implants named like: grade Centurion (10 of 12)
-type = "passive"
-
-
-def handler(fit, implant, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Sensor Dampener",
-                                  "maxRange", implant.getModifiedItemAttr("rangeSkillBonus"))
diff --git a/eos/effects/effect3651.py b/eos/effects/effect3651.py
deleted file mode 100644
index a764367c0..000000000
--- a/eos/effects/effect3651.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# ewGroupTpMaxRangeBonus
-#
-# Used by:
-# Implants named like: grade Centurion (10 of 12)
-type = "passive"
-
-
-def handler(fit, implant, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Target Painter",
-                                  "maxRange", implant.getModifiedItemAttr("rangeSkillBonus"))
diff --git a/eos/effects/effect3652.py b/eos/effects/effect3652.py
deleted file mode 100644
index 5fcc86c66..000000000
--- a/eos/effects/effect3652.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# ewGroupTdMaxRangeBonus
-#
-# Used by:
-# Implants named like: grade Centurion (10 of 12)
-type = "passive"
-
-
-def handler(fit, implant, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Weapon Disruptor",
-                                  "maxRange", implant.getModifiedItemAttr("rangeSkillBonus"))
diff --git a/eos/effects/effect3653.py b/eos/effects/effect3653.py
deleted file mode 100644
index 11c4f01cb..000000000
--- a/eos/effects/effect3653.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# ewGroupEcmBurstMaxRangeBonus
-#
-# Used by:
-# Implants named like: grade Centurion (10 of 12)
-type = "passive"
-
-
-def handler(fit, implant, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Burst Projectors",
-                                  "maxRange", implant.getModifiedItemAttr("rangeSkillBonus"))
diff --git a/eos/effects/effect3655.py b/eos/effects/effect3655.py
deleted file mode 100644
index 284d5b3ca..000000000
--- a/eos/effects/effect3655.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# gunneryMaxRangeBonusOnline
-#
-# Used by:
-# Modules from group: Tracking Enhancer (10 of 10)
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Gunnery"),
-                                  "maxRange", module.getModifiedItemAttr("maxRangeBonus"),
-                                  stackingPenalties=True)
diff --git a/eos/effects/effect3656.py b/eos/effects/effect3656.py
deleted file mode 100644
index bec1111d7..000000000
--- a/eos/effects/effect3656.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# gunneryTrackingSpeedBonusOnline
-#
-# Used by:
-# Modules from group: Tracking Enhancer (10 of 10)
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Gunnery"),
-                                  "trackingSpeed", module.getModifiedItemAttr("trackingSpeedBonus"),
-                                  stackingPenalties=True)
diff --git a/eos/effects/effect3657.py b/eos/effects/effect3657.py
deleted file mode 100644
index 989f097a8..000000000
--- a/eos/effects/effect3657.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipScanResolutionBonusOnline
-#
-# Used by:
-# Modules from group: Signal Amplifier (7 of 7)
-# Structure Modules from group: Structure Signal Amplifier (2 of 2)
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.ship.boostItemAttr("scanResolution", module.getModifiedItemAttr("scanResolutionBonus"),
-                           stackingPenalties=True)
diff --git a/eos/effects/effect3659.py b/eos/effects/effect3659.py
deleted file mode 100644
index fb6a1520a..000000000
--- a/eos/effects/effect3659.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipMaxTargetRangeBonusOnline
-#
-# Used by:
-# Modules from group: Signal Amplifier (7 of 7)
-# Structure Modules from group: Structure Signal Amplifier (2 of 2)
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.ship.boostItemAttr("maxTargetRange", module.getModifiedItemAttr("maxTargetRangeBonus"),
-                           stackingPenalties=True)
diff --git a/eos/effects/effect3660.py b/eos/effects/effect3660.py
deleted file mode 100644
index f5ab7cb30..000000000
--- a/eos/effects/effect3660.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipMaxLockedTargetsBonusAddOnline
-#
-# Used by:
-# Modules from group: Signal Amplifier (7 of 7)
-# Structure Modules from group: Structure Signal Amplifier (2 of 2)
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.ship.increaseItemAttr("maxLockedTargets", module.getModifiedItemAttr("maxLockedTargetsBonus"))
diff --git a/eos/effects/effect3668.py b/eos/effects/effect3668.py
deleted file mode 100644
index 163574ba9..000000000
--- a/eos/effects/effect3668.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# miningLaserRangeBonus
-#
-# Used by:
-# Implants named like: grade Harvest (10 of 12)
-type = "passive"
-
-
-def handler(fit, implant, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Mining Laser",
-                                  "maxRange", implant.getModifiedItemAttr("maxRangeBonus"))
diff --git a/eos/effects/effect3669.py b/eos/effects/effect3669.py
deleted file mode 100644
index 9285d51b8..000000000
--- a/eos/effects/effect3669.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# frequencyMiningLaserMaxRangeBonus
-#
-# Used by:
-# Implants named like: grade Harvest (10 of 12)
-type = "passive"
-
-
-def handler(fit, implant, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Frequency Mining Laser",
-                                  "maxRange", implant.getModifiedItemAttr("maxRangeBonus"))
diff --git a/eos/effects/effect3670.py b/eos/effects/effect3670.py
deleted file mode 100644
index 781f523f4..000000000
--- a/eos/effects/effect3670.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# stripMinerMaxRangeBonus
-#
-# Used by:
-# Implants named like: grade Harvest (10 of 12)
-type = "passive"
-
-
-def handler(fit, implant, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Strip Miner",
-                                  "maxRange", implant.getModifiedItemAttr("maxRangeBonus"))
diff --git a/eos/effects/effect3671.py b/eos/effects/effect3671.py
deleted file mode 100644
index dbfd9f564..000000000
--- a/eos/effects/effect3671.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# gasHarvesterMaxRangeBonus
-#
-# Used by:
-# Implants named like: grade Harvest (10 of 12)
-type = "passive"
-
-
-def handler(fit, implant, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Gas Cloud Harvester",
-                                  "maxRange", implant.getModifiedItemAttr("maxRangeBonus"))
diff --git a/eos/effects/effect3672.py b/eos/effects/effect3672.py
deleted file mode 100644
index 0d5a83233..000000000
--- a/eos/effects/effect3672.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# setBonusOre
-#
-# Used by:
-# Implants named like: grade Harvest (12 of 12)
-runTime = "early"
-type = "passive"
-
-
-def handler(fit, implant, context):
-    fit.appliedImplants.filteredItemMultiply(lambda mod: mod.item.group.name == "Cyberimplant",
-                                             "maxRangeBonus", implant.getModifiedItemAttr("implantSetORE"))
diff --git a/eos/effects/effect3677.py b/eos/effects/effect3677.py
deleted file mode 100644
index cad976ce7..000000000
--- a/eos/effects/effect3677.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipBonusLargeEnergyTurretMaxRangeAB2
-#
-# Used by:
-# Ship: Apocalypse
-# Ship: Apocalypse Navy Issue
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Large Energy Turret"),
-                                  "maxRange", ship.getModifiedItemAttr("shipBonusAB2"), skill="Amarr Battleship")
diff --git a/eos/effects/effect3678.py b/eos/effects/effect3678.py
deleted file mode 100644
index 7fa846975..000000000
--- a/eos/effects/effect3678.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# eliteBonusJumpFreighterShieldHP1
-#
-# Used by:
-# Ship: Nomad
-# Ship: Rhea
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.ship.boostItemAttr("shieldCapacity", ship.getModifiedItemAttr("eliteBonusJumpFreighter1"),
-                           skill="Jump Freighters")
diff --git a/eos/effects/effect3679.py b/eos/effects/effect3679.py
deleted file mode 100644
index ecfe3e25a..000000000
--- a/eos/effects/effect3679.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# eliteBonusJumpFreighterArmorHP1
-#
-# Used by:
-# Ship: Anshar
-# Ship: Ark
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.ship.boostItemAttr("armorHP", ship.getModifiedItemAttr("eliteBonusJumpFreighter1"), skill="Jump Freighters")
diff --git a/eos/effects/effect3680.py b/eos/effects/effect3680.py
deleted file mode 100644
index 02d6f9eae..000000000
--- a/eos/effects/effect3680.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# freighterAgilityBonusC1
-#
-# Used by:
-# Ship: Rhea
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.ship.boostItemAttr("agility", ship.getModifiedItemAttr("freighterBonusC1"), skill="Caldari Freighter")
diff --git a/eos/effects/effect3681.py b/eos/effects/effect3681.py
deleted file mode 100644
index 99100cf31..000000000
--- a/eos/effects/effect3681.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# freighterAgilityBonusM1
-#
-# Used by:
-# Ship: Nomad
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.ship.boostItemAttr("agility", ship.getModifiedItemAttr("freighterBonusM1"), skill="Minmatar Freighter")
diff --git a/eos/effects/effect3682.py b/eos/effects/effect3682.py
deleted file mode 100644
index 54f7e1a62..000000000
--- a/eos/effects/effect3682.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# freighterAgilityBonusG1
-#
-# Used by:
-# Ship: Anshar
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.ship.boostItemAttr("agility", ship.getModifiedItemAttr("freighterBonusG1"), skill="Gallente Freighter")
diff --git a/eos/effects/effect3683.py b/eos/effects/effect3683.py
deleted file mode 100644
index 8aa4fa822..000000000
--- a/eos/effects/effect3683.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# freighterAgilityBonusA1
-#
-# Used by:
-# Ship: Ark
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.ship.boostItemAttr("agility", ship.getModifiedItemAttr("freighterBonusA1"), skill="Amarr Freighter")
diff --git a/eos/effects/effect3686.py b/eos/effects/effect3686.py
deleted file mode 100644
index b2c054606..000000000
--- a/eos/effects/effect3686.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# scriptTrackingComputerFalloffBonusBonus
-#
-# Used by:
-# Charges from group: Tracking Disruption Script (2 of 2)
-# Charges from group: Tracking Script (2 of 2)
-type = "passive"
-
-
-def handler(fit, module, context):
-    module.boostItemAttr("falloffBonus", module.getModifiedChargeAttr("falloffBonusBonus"))
diff --git a/eos/effects/effect3703.py b/eos/effects/effect3703.py
deleted file mode 100644
index b070d3b2c..000000000
--- a/eos/effects/effect3703.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipMissileLauncherSpeedBonusMC2
-#
-# Used by:
-# Ship: Bellicose
-type = "passive"
-
-
-def handler(fit, ship, context):
-    groups = ("Missile Launcher Rapid Light", "Missile Launcher Heavy", "Missile Launcher Heavy Assault")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name in groups,
-                                  "speed", ship.getModifiedItemAttr("shipBonusMC2"), skill="Minmatar Cruiser")
diff --git a/eos/effects/effect3705.py b/eos/effects/effect3705.py
deleted file mode 100644
index ab847b685..000000000
--- a/eos/effects/effect3705.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipHybridTurretROFBonusGC2
-#
-# Used by:
-# Ship: Exequror Navy Issue
-# Ship: Phobos
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Hybrid Turret"),
-                                  "speed", ship.getModifiedItemAttr("shipBonusGC2"), skill="Gallente Cruiser")
diff --git a/eos/effects/effect3706.py b/eos/effects/effect3706.py
deleted file mode 100644
index 9d45c3e24..000000000
--- a/eos/effects/effect3706.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusProjectileTrackingMC2
-#
-# Used by:
-# Ship: Stabber Fleet Issue
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Projectile Turret"),
-                                  "trackingSpeed", ship.getModifiedItemAttr("shipBonusMC2"), skill="Minmatar Cruiser")
diff --git a/eos/effects/effect3726.py b/eos/effects/effect3726.py
deleted file mode 100644
index d185a5002..000000000
--- a/eos/effects/effect3726.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# agilityMultiplierEffectPassive
-#
-# Used by:
-# Modules named like: Polycarbon Engine Housing (8 of 8)
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.ship.boostItemAttr("agility", module.getModifiedItemAttr("agilityBonus"), stackingPenalties=True)
diff --git a/eos/effects/effect3727.py b/eos/effects/effect3727.py
deleted file mode 100644
index 3d0b1c6d1..000000000
--- a/eos/effects/effect3727.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# velocityBonusPassive
-#
-# Used by:
-# Modules named like: Polycarbon Engine Housing (8 of 8)
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.ship.boostItemAttr("maxVelocity", module.getModifiedItemAttr("implantBonusVelocity"),
-                           stackingPenalties=True)
diff --git a/eos/effects/effect3739.py b/eos/effects/effect3739.py
deleted file mode 100644
index 9c4a20c03..000000000
--- a/eos/effects/effect3739.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# zColinOrcaTractorRangeBonus
-#
-# Used by:
-# Ships from group: Industrial Command Ship (2 of 2)
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Tractor Beam", "maxRange",
-                                  src.getModifiedItemAttr("roleBonusTractorBeamRange"))
diff --git a/eos/effects/effect3740.py b/eos/effects/effect3740.py
deleted file mode 100644
index 736643324..000000000
--- a/eos/effects/effect3740.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# zColinOrcaTractorVelocityBonus
-#
-# Used by:
-# Ships from group: Industrial Command Ship (2 of 2)
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Tractor Beam", "maxTractorVelocity",
-                                  ship.getModifiedItemAttr("roleBonusTractorBeamVelocity"))
diff --git a/eos/effects/effect3742.py b/eos/effects/effect3742.py
deleted file mode 100644
index 780548d08..000000000
--- a/eos/effects/effect3742.py
+++ /dev/null
@@ -1,15 +0,0 @@
-# cargoAndOreHoldCapacityBonusICS1
-#
-# Used by:
-# Ships from group: Industrial Command Ship (2 of 2)
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.ship.boostItemAttr("specialOreHoldCapacity",
-                           src.getModifiedItemAttr("shipBonusICS1"),
-                           skill="Industrial Command Ships")
-
-    fit.ship.boostItemAttr("capacity",
-                           src.getModifiedItemAttr("shipBonusICS1"),
-                           skill="Industrial Command Ships")
diff --git a/eos/effects/effect3744.py b/eos/effects/effect3744.py
deleted file mode 100644
index 0e1140e0e..000000000
--- a/eos/effects/effect3744.py
+++ /dev/null
@@ -1,18 +0,0 @@
-# miningForemanBurstBonusICS2
-#
-# Used by:
-# Ships from group: Industrial Command Ship (2 of 2)
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Mining Foreman"), "warfareBuff4Value",
-                                  src.getModifiedItemAttr("shipBonusICS2"), skill="Industrial Command Ships")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Mining Foreman"), "warfareBuff1Value",
-                                  src.getModifiedItemAttr("shipBonusICS2"), skill="Industrial Command Ships")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Mining Foreman"), "buffDuration",
-                                  src.getModifiedItemAttr("shipBonusICS2"), skill="Industrial Command Ships")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Mining Foreman"), "warfareBuff3Value",
-                                  src.getModifiedItemAttr("shipBonusICS2"), skill="Industrial Command Ships")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Mining Foreman"), "warfareBuff2Value",
-                                  src.getModifiedItemAttr("shipBonusICS2"), skill="Industrial Command Ships")
diff --git a/eos/effects/effect3745.py b/eos/effects/effect3745.py
deleted file mode 100644
index a1eb01fea..000000000
--- a/eos/effects/effect3745.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# zColinOrcaSurveyScannerBonus
-#
-# Used by:
-# Ships from group: Industrial Command Ship (2 of 2)
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Survey Scanner", "surveyScanRange",
-                                  src.getModifiedItemAttr("roleBonusSurveyScannerRange"))
diff --git a/eos/effects/effect3765.py b/eos/effects/effect3765.py
deleted file mode 100644
index 6e26dc922..000000000
--- a/eos/effects/effect3765.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# covertOpsStealthBomberSiegeMissileLauncherPowerNeedBonus
-#
-# Used by:
-# Ships from group: Stealth Bomber (5 of 5)
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemMultiply(lambda mod: mod.item.group.name == "Missile Launcher Torpedo",
-                                     "power", ship.getModifiedItemAttr("stealthBomberLauncherPower"))
diff --git a/eos/effects/effect3766.py b/eos/effects/effect3766.py
deleted file mode 100644
index 73157a691..000000000
--- a/eos/effects/effect3766.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# interceptorMWDSignatureRadiusBonus
-#
-# Used by:
-# Ships from group: Interceptor (10 of 10)
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("High Speed Maneuvering"),
-                                  "signatureRadiusBonus", ship.getModifiedItemAttr("eliteBonusInterceptor"),
-                                  skill="Interceptors")
diff --git a/eos/effects/effect3767.py b/eos/effects/effect3767.py
deleted file mode 100644
index af5122311..000000000
--- a/eos/effects/effect3767.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# eliteBonusCommandShipsHeavyMissileExplosionVelocityCS2
-#
-# Used by:
-# Ship: Claymore
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Missiles"),
-                                    "aoeVelocity", ship.getModifiedItemAttr("eliteBonusCommandShips2"),
-                                    skill="Command Ships")
diff --git a/eos/effects/effect3771.py b/eos/effects/effect3771.py
deleted file mode 100644
index 0b5d23866..000000000
--- a/eos/effects/effect3771.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# armorHPBonusAddPassive
-#
-# Used by:
-# Subsystems from group: Defensive Systems (9 of 12)
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.ship.increaseItemAttr("armorHP", module.getModifiedItemAttr("armorHPBonusAdd") or 0)
diff --git a/eos/effects/effect3773.py b/eos/effects/effect3773.py
deleted file mode 100644
index 33f3fc576..000000000
--- a/eos/effects/effect3773.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# hardPointModifierEffect
-#
-# Used by:
-# Subsystems from group: Offensive Systems (12 of 12)
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.ship.increaseItemAttr("turretSlotsLeft", module.getModifiedItemAttr("turretHardPointModifier"))
-    fit.ship.increaseItemAttr("launcherSlotsLeft", module.getModifiedItemAttr("launcherHardPointModifier"))
diff --git a/eos/effects/effect3774.py b/eos/effects/effect3774.py
deleted file mode 100644
index e4bfe2afb..000000000
--- a/eos/effects/effect3774.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# slotModifier
-#
-# Used by:
-# Items from category: Subsystem (48 of 48)
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.ship.increaseItemAttr("hiSlots", module.getModifiedItemAttr("hiSlotModifier"))
-    fit.ship.increaseItemAttr("medSlots", module.getModifiedItemAttr("medSlotModifier"))
-    fit.ship.increaseItemAttr("lowSlots", module.getModifiedItemAttr("lowSlotModifier"))
diff --git a/eos/effects/effect3782.py b/eos/effects/effect3782.py
deleted file mode 100644
index bbaaddd28..000000000
--- a/eos/effects/effect3782.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# powerOutputAddPassive
-#
-# Used by:
-# Subsystems from group: Offensive Systems (8 of 12)
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.ship.increaseItemAttr("powerOutput", module.getModifiedItemAttr("powerOutput"))
diff --git a/eos/effects/effect3783.py b/eos/effects/effect3783.py
deleted file mode 100644
index 16c38b5c8..000000000
--- a/eos/effects/effect3783.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# cpuOutputAddCpuOutputPassive
-#
-# Used by:
-# Subsystems from group: Offensive Systems (8 of 12)
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.ship.increaseItemAttr("cpuOutput", module.getModifiedItemAttr("cpuOutput"))
diff --git a/eos/effects/effect3797.py b/eos/effects/effect3797.py
deleted file mode 100644
index 704fa8177..000000000
--- a/eos/effects/effect3797.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# droneBandwidthAddPassive
-#
-# Used by:
-# Subsystems from group: Offensive Systems (12 of 12)
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.ship.increaseItemAttr("droneBandwidth", module.getModifiedItemAttr("droneBandwidth"))
diff --git a/eos/effects/effect3799.py b/eos/effects/effect3799.py
deleted file mode 100644
index 83222cb93..000000000
--- a/eos/effects/effect3799.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# droneCapacityAdddroneCapacityPassive
-#
-# Used by:
-# Subsystems from group: Offensive Systems (12 of 12)
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.ship.increaseItemAttr("droneCapacity", module.getModifiedItemAttr("droneCapacity"))
diff --git a/eos/effects/effect38.py b/eos/effects/effect38.py
deleted file mode 100644
index 898cd270f..000000000
--- a/eos/effects/effect38.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# empWave
-#
-# Used by:
-# Modules from group: Smart Bomb (118 of 118)
-type = "active"
-
-
-def handler(fit, module, context):
-    pass
diff --git a/eos/effects/effect3807.py b/eos/effects/effect3807.py
deleted file mode 100644
index 2b999329f..000000000
--- a/eos/effects/effect3807.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# maxTargetRangeAddPassive
-#
-# Used by:
-# Subsystems named like: Propulsion Interdiction Nullifier (4 of 4)
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.ship.increaseItemAttr("maxTargetRange", module.getModifiedItemAttr("maxTargetRange"))
diff --git a/eos/effects/effect3808.py b/eos/effects/effect3808.py
deleted file mode 100644
index 5282f3ce1..000000000
--- a/eos/effects/effect3808.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# signatureRadiusAddPassive
-#
-# Used by:
-# Subsystems from group: Defensive Systems (8 of 12)
-# Subsystems named like: Propulsion Interdiction Nullifier (4 of 4)
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.ship.increaseItemAttr("signatureRadius", module.getModifiedItemAttr("signatureRadius"))
diff --git a/eos/effects/effect3810.py b/eos/effects/effect3810.py
deleted file mode 100644
index 8d7ee24bd..000000000
--- a/eos/effects/effect3810.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# capacityAddPassive
-#
-# Used by:
-# Subsystems named like: Defensive Covert Reconfiguration (4 of 4)
-# Subsystem: Legion Defensive - Nanobot Injector
-type = "passive"
-
-
-def handler(fit, subsystem, context):
-    fit.ship.increaseItemAttr("capacity", subsystem.getModifiedItemAttr("cargoCapacityAdd") or 0)
diff --git a/eos/effects/effect3811.py b/eos/effects/effect3811.py
deleted file mode 100644
index 47cc811f5..000000000
--- a/eos/effects/effect3811.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# capacitorCapacityAddPassive
-#
-# Used by:
-# Items from category: Subsystem (20 of 48)
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.ship.increaseItemAttr("capacitorCapacity", module.getModifiedItemAttr("capacitorCapacity") or 0)
diff --git a/eos/effects/effect3831.py b/eos/effects/effect3831.py
deleted file mode 100644
index d5c520560..000000000
--- a/eos/effects/effect3831.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# shieldCapacityAddPassive
-#
-# Used by:
-# Subsystems from group: Defensive Systems (8 of 12)
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.ship.increaseItemAttr("shieldCapacity", module.getModifiedItemAttr("shieldCapacity"))
diff --git a/eos/effects/effect3857.py b/eos/effects/effect3857.py
deleted file mode 100644
index 4b0812554..000000000
--- a/eos/effects/effect3857.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# subsystemBonusAmarrPropulsionMaxVelocity
-#
-# Used by:
-# Subsystem: Legion Propulsion - Intercalated Nanofibers
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.ship.boostItemAttr("maxVelocity", module.getModifiedItemAttr("subsystemBonusAmarrPropulsion"),
-                           skill="Amarr Propulsion Systems")
diff --git a/eos/effects/effect3859.py b/eos/effects/effect3859.py
deleted file mode 100644
index b883e9b9d..000000000
--- a/eos/effects/effect3859.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# subsystemBonusCaldariPropulsionMaxVelocity
-#
-# Used by:
-# Subsystem: Tengu Propulsion - Chassis Optimization
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.ship.boostItemAttr("maxVelocity", src.getModifiedItemAttr("subsystemBonusCaldariPropulsion"),
-                           skill="Caldari Propulsion Systems")
diff --git a/eos/effects/effect3860.py b/eos/effects/effect3860.py
deleted file mode 100644
index d7101727d..000000000
--- a/eos/effects/effect3860.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# subsystemBonusMinmatarPropulsionMaxVelocity
-#
-# Used by:
-# Subsystem: Loki Propulsion - Intercalated Nanofibers
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.ship.boostItemAttr("maxVelocity", module.getModifiedItemAttr("subsystemBonusMinmatarPropulsion"),
-                           skill="Minmatar Propulsion Systems")
diff --git a/eos/effects/effect3861.py b/eos/effects/effect3861.py
deleted file mode 100644
index 1e9775eab..000000000
--- a/eos/effects/effect3861.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# subsystemBonusMinmatarPropulsionAfterburnerSpeedFactor
-#
-# Used by:
-# Subsystem: Loki Propulsion - Wake Limiter
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Afterburner"),
-                                  "speedFactor", module.getModifiedItemAttr("subsystemBonusMinmatarPropulsion"),
-                                  skill="Minmatar Propulsion Systems")
diff --git a/eos/effects/effect3863.py b/eos/effects/effect3863.py
deleted file mode 100644
index c97944920..000000000
--- a/eos/effects/effect3863.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# subsystemBonusCaldariPropulsionAfterburnerSpeedFactor
-#
-# Used by:
-# Subsystem: Tengu Propulsion - Fuel Catalyst
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Afterburner"),
-                                  "speedFactor", module.getModifiedItemAttr("subsystemBonusCaldariPropulsion"),
-                                  skill="Caldari Propulsion Systems")
diff --git a/eos/effects/effect3864.py b/eos/effects/effect3864.py
deleted file mode 100644
index 994733a04..000000000
--- a/eos/effects/effect3864.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# subsystemBonusAmarrPropulsionAfterburnerSpeedFactor
-#
-# Used by:
-# Subsystem: Legion Propulsion - Wake Limiter
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Afterburner"),
-                                  "speedFactor", module.getModifiedItemAttr("subsystemBonusAmarrPropulsion"),
-                                  skill="Amarr Propulsion Systems")
diff --git a/eos/effects/effect3865.py b/eos/effects/effect3865.py
deleted file mode 100644
index 426d8a119..000000000
--- a/eos/effects/effect3865.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# subsystemBonusAmarrPropulsion2Agility
-#
-# Used by:
-# Subsystem: Legion Propulsion - Intercalated Nanofibers
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.ship.boostItemAttr("agility", src.getModifiedItemAttr("subsystemBonusAmarrPropulsion2"),
-                           skill="Amarr Propulsion Systems")
diff --git a/eos/effects/effect3866.py b/eos/effects/effect3866.py
deleted file mode 100644
index c923e51bd..000000000
--- a/eos/effects/effect3866.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# subsystemBonusCaldariPropulsion2Agility
-#
-# Used by:
-# Subsystem: Tengu Propulsion - Chassis Optimization
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.ship.boostItemAttr("agility", src.getModifiedItemAttr("subsystemBonusCaldariPropulsion2"),
-                           skill="Caldari Propulsion Systems")
diff --git a/eos/effects/effect3867.py b/eos/effects/effect3867.py
deleted file mode 100644
index 5e060b092..000000000
--- a/eos/effects/effect3867.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# subsystemBonusGallentePropulsion2Agility
-#
-# Used by:
-# Subsystem: Proteus Propulsion - Hyperspatial Optimization
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.ship.boostItemAttr("agility", src.getModifiedItemAttr("subsystemBonusGallentePropulsion2"),
-                           skill="Gallente Propulsion Systems")
diff --git a/eos/effects/effect3868.py b/eos/effects/effect3868.py
deleted file mode 100644
index 1a01b509b..000000000
--- a/eos/effects/effect3868.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# subsystemBonusMinmatarPropulsion2Agility
-#
-# Used by:
-# Subsystem: Loki Propulsion - Intercalated Nanofibers
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.ship.boostItemAttr("agility", src.getModifiedItemAttr("subsystemBonusMinmatarPropulsion2"),
-                           skill="Minmatar Propulsion Systems")
diff --git a/eos/effects/effect3869.py b/eos/effects/effect3869.py
deleted file mode 100644
index 94bbfe321..000000000
--- a/eos/effects/effect3869.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# subsystemBonusMinmatarPropulsion2MWDPenalty
-#
-# Used by:
-# Subsystem: Loki Propulsion - Wake Limiter
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("High Speed Maneuvering"),
-                                  "signatureRadiusBonus", src.getModifiedItemAttr("subsystemBonusMinmatarPropulsion2"),
-                                  skill="Minmatar Propulsion Systems")
diff --git a/eos/effects/effect3872.py b/eos/effects/effect3872.py
deleted file mode 100644
index ceb76ccea..000000000
--- a/eos/effects/effect3872.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# subsystemBonusAmarrPropulsion2MWDPenalty
-#
-# Used by:
-# Subsystem: Legion Propulsion - Wake Limiter
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("High Speed Maneuvering"),
-                                  "signatureRadiusBonus", src.getModifiedItemAttr("subsystemBonusAmarrPropulsion2"),
-                                  skill="Amarr Propulsion Systems")
diff --git a/eos/effects/effect3875.py b/eos/effects/effect3875.py
deleted file mode 100644
index 7a9b3fed0..000000000
--- a/eos/effects/effect3875.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# subsystemBonusGallentePropulsionABMWDCapNeed
-#
-# Used by:
-# Subsystem: Proteus Propulsion - Localized Injectors
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Propulsion Module",
-                                  "capacitorNeed", module.getModifiedItemAttr("subsystemBonusGallentePropulsion"),
-                                  skill="Gallente Propulsion Systems")
diff --git a/eos/effects/effect3893.py b/eos/effects/effect3893.py
deleted file mode 100644
index 0266d09e8..000000000
--- a/eos/effects/effect3893.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# subsystemBonusMinmatarCoreScanStrengthLADAR
-#
-# Used by:
-# Subsystem: Loki Core - Dissolution Sequencer
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.ship.boostItemAttr("scanLadarStrength", src.getModifiedItemAttr("subsystemBonusMinmatarCore"),
-                           skill="Minmatar Core Systems")
diff --git a/eos/effects/effect3895.py b/eos/effects/effect3895.py
deleted file mode 100644
index 793b071ac..000000000
--- a/eos/effects/effect3895.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# subsystemBonusGallenteCoreScanStrengthMagnetometric
-#
-# Used by:
-# Subsystem: Proteus Core - Electronic Efficiency Gate
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.ship.boostItemAttr("scanMagnetometricStrength", src.getModifiedItemAttr("subsystemBonusGallenteCore"),
-                           skill="Gallente Core Systems")
diff --git a/eos/effects/effect3897.py b/eos/effects/effect3897.py
deleted file mode 100644
index b21cd5754..000000000
--- a/eos/effects/effect3897.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# subsystemBonusCaldariCoreScanStrengthGravimetric
-#
-# Used by:
-# Subsystem: Tengu Core - Electronic Efficiency Gate
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.ship.boostItemAttr("scanGravimetricStrength", src.getModifiedItemAttr("subsystemBonusCaldariCore"), skill="Caldari Core Systems")
diff --git a/eos/effects/effect39.py b/eos/effects/effect39.py
deleted file mode 100644
index 38b53c1fc..000000000
--- a/eos/effects/effect39.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# warpDisrupt
-#
-# Used by:
-# Modules named like: Warp Disruptor (28 of 28)
-type = "projected", "active"
-
-
-def handler(fit, module, context):
-    if "projected" in context:
-        fit.ship.increaseItemAttr("warpScrambleStatus", module.getModifiedItemAttr("warpScrambleStrength"))
diff --git a/eos/effects/effect3900.py b/eos/effects/effect3900.py
deleted file mode 100644
index 8c0c2bd82..000000000
--- a/eos/effects/effect3900.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# subsystemBonusAmarrCoreScanStrengthRADAR
-#
-# Used by:
-# Subsystem: Legion Core - Dissolution Sequencer
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.ship.boostItemAttr("scanRadarStrength", src.getModifiedItemAttr("subsystemBonusAmarrCore"),
-                           skill="Amarr Core Systems")
diff --git a/eos/effects/effect391.py b/eos/effects/effect391.py
deleted file mode 100644
index 965ade57d..000000000
--- a/eos/effects/effect391.py
+++ /dev/null
@@ -1,14 +0,0 @@
-# astrogeologyMiningAmountBonusPostPercentMiningAmountLocationShipModulesRequiringMining
-#
-# Used by:
-# Implants named like: Inherent Implants 'Highwall' Mining MX (3 of 3)
-# Implant: Michi's Excavation Augmentor
-# Skill: Astrogeology
-# Skill: Mining
-type = "passive"
-
-
-def handler(fit, container, context):
-    level = container.level if "skill" in context else 1
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Mining"),
-                                  "miningAmount", container.getModifiedItemAttr("miningAmountBonus") * level)
diff --git a/eos/effects/effect392.py b/eos/effects/effect392.py
deleted file mode 100644
index 3f01c5422..000000000
--- a/eos/effects/effect392.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# mechanicHullHpBonusPostPercentHpShip
-#
-# Used by:
-# Implants named like: Inherent Implants 'Noble' Mechanic MC (6 of 6)
-# Modules named like: Transverse Bulkhead (8 of 8)
-# Skill: Mechanics
-type = "passive"
-
-
-def handler(fit, container, context):
-    level = container.level if "skill" in context else 1
-    fit.ship.boostItemAttr("hp", container.getModifiedItemAttr("hullHpBonus") * level)
diff --git a/eos/effects/effect394.py b/eos/effects/effect394.py
deleted file mode 100644
index 6f68c7292..000000000
--- a/eos/effects/effect394.py
+++ /dev/null
@@ -1,17 +0,0 @@
-# navigationVelocityBonusPostPercentMaxVelocityShip
-#
-# Used by:
-# Modules from group: Rig Anchor (4 of 4)
-# Implants named like: Agency 'Overclocker' SB Dose (4 of 4)
-# Implants named like: grade Snake (16 of 18)
-# Modules named like: Auxiliary Thrusters (8 of 8)
-# Implant: Quafe Zero
-# Skill: Navigation
-type = "passive"
-
-
-def handler(fit, container, context):
-    level = container.level if "skill" in context else 1
-    amount = container.getModifiedItemAttr("velocityBonus") or 0
-    fit.ship.boostItemAttr("maxVelocity", amount * level,
-                           stackingPenalties="skill" not in context and "implant" not in context and "booster" not in context)
diff --git a/eos/effects/effect395.py b/eos/effects/effect395.py
deleted file mode 100644
index b2f81c56e..000000000
--- a/eos/effects/effect395.py
+++ /dev/null
@@ -1,17 +0,0 @@
-# evasiveManeuveringAgilityBonusPostPercentAgilityShip
-#
-# Used by:
-# Modules from group: Rig Anchor (4 of 4)
-# Implants named like: Eifyr and Co. 'Rogue' Evasive Maneuvering EM (6 of 6)
-# Implants named like: grade Nomad (10 of 12)
-# Modules named like: Low Friction Nozzle Joints (8 of 8)
-# Implant: Genolution Core Augmentation CA-4
-# Skill: Evasive Maneuvering
-# Skill: Spaceship Command
-type = "passive"
-
-
-def handler(fit, container, context):
-    level = container.level if "skill" in context else 1
-    fit.ship.boostItemAttr("agility", container.getModifiedItemAttr("agilityBonus") * level,
-                           stackingPenalties="skill" not in context and "implant" not in context)
diff --git a/eos/effects/effect3959.py b/eos/effects/effect3959.py
deleted file mode 100644
index 0ead0d3d7..000000000
--- a/eos/effects/effect3959.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# subsystemBonusAmarrDefensiveArmorRepairAmount
-#
-# Used by:
-# Subsystem: Legion Defensive - Covert Reconfiguration
-# Subsystem: Legion Defensive - Nanobot Injector
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Repair Systems"),
-                                  "armorDamageAmount", module.getModifiedItemAttr("subsystemBonusAmarrDefensive"),
-                                  skill="Amarr Defensive Systems")
diff --git a/eos/effects/effect396.py b/eos/effects/effect396.py
deleted file mode 100644
index 46d6f847e..000000000
--- a/eos/effects/effect396.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# energyGridUpgradesCpuNeedBonusPostPercentCpuLocationShipModulesRequiringEnergyGridUpgrades
-#
-# Used by:
-# Implants named like: Inherent Implants 'Squire' Energy Grid Upgrades EU (6 of 6)
-# Modules named like: Powergrid Subroutine Maximizer (8 of 8)
-# Skill: Energy Grid Upgrades
-type = "passive"
-
-
-def handler(fit, container, context):
-    level = container.level if "skill" in context else 1
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Energy Grid Upgrades"),
-                                  "cpu", container.getModifiedItemAttr("cpuNeedBonus") * level)
diff --git a/eos/effects/effect3961.py b/eos/effects/effect3961.py
deleted file mode 100644
index 6d9639e83..000000000
--- a/eos/effects/effect3961.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# subsystemBonusGallenteDefensiveArmorRepairAmount
-#
-# Used by:
-# Subsystem: Proteus Defensive - Covert Reconfiguration
-# Subsystem: Proteus Defensive - Nanobot Injector
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Repair Systems"),
-                                  "armorDamageAmount", module.getModifiedItemAttr("subsystemBonusGallenteDefensive"),
-                                  skill="Gallente Defensive Systems")
diff --git a/eos/effects/effect3962.py b/eos/effects/effect3962.py
deleted file mode 100644
index 0c43a70d4..000000000
--- a/eos/effects/effect3962.py
+++ /dev/null
@@ -1,15 +0,0 @@
-# subsystemBonusMinmatarDefensiveShieldArmorRepairAmount
-#
-# Used by:
-# Subsystem: Loki Defensive - Adaptive Defense Node
-# Subsystem: Loki Defensive - Covert Reconfiguration
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Repair Systems"),
-                                  "armorDamageAmount", src.getModifiedItemAttr("subsystemBonusMinmatarDefensive"),
-                                  skill="Minmatar Defensive Systems")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Operation"),
-                                  "shieldBonus", src.getModifiedItemAttr("subsystemBonusMinmatarDefensive"),
-                                  skill="Minmatar Defensive Systems")
diff --git a/eos/effects/effect3964.py b/eos/effects/effect3964.py
deleted file mode 100644
index ec7bff89c..000000000
--- a/eos/effects/effect3964.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# subsystemBonusCaldariDefensiveShieldBoostAmount
-#
-# Used by:
-# Subsystem: Tengu Defensive - Amplification Node
-# Subsystem: Tengu Defensive - Covert Reconfiguration
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Operation"),
-                                  "shieldBonus", module.getModifiedItemAttr("subsystemBonusCaldariDefensive"),
-                                  skill="Caldari Defensive Systems")
diff --git a/eos/effects/effect397.py b/eos/effects/effect397.py
deleted file mode 100644
index 7a6b5a0d5..000000000
--- a/eos/effects/effect397.py
+++ /dev/null
@@ -1,14 +0,0 @@
-# electronicsCpuOutputBonusPostPercentCpuOutputLocationShipGroupComputer
-#
-# Used by:
-# Implants named like: Zainou 'Gypsy' CPU Management EE (6 of 6)
-# Modules named like: Processor Overclocking Unit (8 of 8)
-# Subsystems named like: Core Electronic Efficiency Gate (2 of 2)
-# Implant: Genolution Core Augmentation CA-2
-# Skill: CPU Management
-type = "passive"
-
-
-def handler(fit, container, context):
-    level = container.level if "skill" in context else 1
-    fit.ship.boostItemAttr("cpuOutput", container.getModifiedItemAttr("cpuOutputBonus2") * level)
diff --git a/eos/effects/effect3976.py b/eos/effects/effect3976.py
deleted file mode 100644
index 50ce1043f..000000000
--- a/eos/effects/effect3976.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# subsystemBonusCaldariDefensiveShieldHP
-#
-# Used by:
-# Subsystem: Tengu Defensive - Supplemental Screening
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.ship.boostItemAttr("shieldCapacity", module.getModifiedItemAttr("subsystemBonusCaldariDefensive"),
-                           skill="Caldari Defensive Systems")
diff --git a/eos/effects/effect3979.py b/eos/effects/effect3979.py
deleted file mode 100644
index 5e0b76798..000000000
--- a/eos/effects/effect3979.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# subsystemBonusMinmatarDefensiveShieldArmorHP
-#
-# Used by:
-# Subsystem: Loki Defensive - Augmented Durability
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.ship.boostItemAttr("shieldCapacity", src.getModifiedItemAttr("subsystemBonusMinmatarDefensive"),
-                           skill="Minmatar Defensive Systems")
-    fit.ship.boostItemAttr("armorHP", src.getModifiedItemAttr("subsystemBonusMinmatarDefensive"),
-                           skill="Minmatar Defensive Systems")
diff --git a/eos/effects/effect3980.py b/eos/effects/effect3980.py
deleted file mode 100644
index e200be121..000000000
--- a/eos/effects/effect3980.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# subsystemBonusGallenteDefensiveArmorHP
-#
-# Used by:
-# Subsystem: Proteus Defensive - Augmented Plating
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.ship.boostItemAttr("armorHP", module.getModifiedItemAttr("subsystemBonusGallenteDefensive"),
-                           skill="Gallente Defensive Systems")
diff --git a/eos/effects/effect3982.py b/eos/effects/effect3982.py
deleted file mode 100644
index d28928667..000000000
--- a/eos/effects/effect3982.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# subsystemBonusAmarrDefensiveArmorHP
-#
-# Used by:
-# Subsystem: Legion Defensive - Augmented Plating
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.ship.boostItemAttr("armorHP", module.getModifiedItemAttr("subsystemBonusAmarrDefensive"),
-                           skill="Amarr Defensive Systems")
diff --git a/eos/effects/effect3992.py b/eos/effects/effect3992.py
deleted file mode 100644
index ffe1b6873..000000000
--- a/eos/effects/effect3992.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# systemShieldHP
-#
-# Used by:
-# Celestials named like: Pulsar Effect Beacon Class (6 of 6)
-runTime = "early"
-type = ("projected", "passive")
-
-
-def handler(fit, beacon, context):
-    fit.ship.multiplyItemAttr("shieldCapacity", beacon.getModifiedItemAttr("shieldCapacityMultiplier"))
diff --git a/eos/effects/effect3993.py b/eos/effects/effect3993.py
deleted file mode 100644
index b54077e9d..000000000
--- a/eos/effects/effect3993.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# systemTargetingRange
-#
-# Used by:
-# Celestials named like: Black Hole Effect Beacon Class (6 of 6)
-# Celestials named like: Magnetar Effect Beacon Class (6 of 6)
-runTime = "early"
-type = ("projected", "passive")
-
-
-def handler(fit, beacon, context):
-    fit.ship.multiplyItemAttr("maxTargetRange", beacon.getModifiedItemAttr("maxTargetRangeMultiplier"),
-                              stackingPenalties=True, penaltyGroup="postMul")
diff --git a/eos/effects/effect3995.py b/eos/effects/effect3995.py
deleted file mode 100644
index f00bb35be..000000000
--- a/eos/effects/effect3995.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# systemSignatureRadius
-#
-# Used by:
-# Celestials named like: Pulsar Effect Beacon Class (6 of 6)
-# Celestials named like: Wolf Rayet Effect Beacon Class (6 of 6)
-runTime = "early"
-type = ("projected", "passive")
-
-
-def handler(fit, beacon, context):
-    fit.ship.multiplyItemAttr("signatureRadius", beacon.getModifiedItemAttr("signatureRadiusMultiplier"),
-                              stackingPenalties=True, penaltyGroup="postMul")
diff --git a/eos/effects/effect3996.py b/eos/effects/effect3996.py
deleted file mode 100644
index 901d4f7f8..000000000
--- a/eos/effects/effect3996.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# systemArmorEmResistance
-#
-# Used by:
-# Celestials named like: Incursion Effect (2 of 2)
-# Celestials named like: Pulsar Effect Beacon Class (6 of 6)
-runTime = "early"
-type = ("projected", "passive")
-
-
-def handler(fit, beacon, context):
-    fit.ship.boostItemAttr("armorEmDamageResonance", beacon.getModifiedItemAttr("armorEmDamageResistanceBonus"),
-                           stackingPenalties=True)
diff --git a/eos/effects/effect3997.py b/eos/effects/effect3997.py
deleted file mode 100644
index ccd8104d5..000000000
--- a/eos/effects/effect3997.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# systemArmorExplosiveResistance
-#
-# Used by:
-# Celestials named like: Incursion Effect (2 of 2)
-# Celestials named like: Pulsar Effect Beacon Class (6 of 6)
-runTime = "early"
-type = ("projected", "passive")
-
-
-def handler(fit, beacon, context):
-    fit.ship.boostItemAttr("armorExplosiveDamageResonance",
-                           beacon.getModifiedItemAttr("armorExplosiveDamageResistanceBonus"),
-                           stackingPenalties=True)
diff --git a/eos/effects/effect3998.py b/eos/effects/effect3998.py
deleted file mode 100644
index 845b03da6..000000000
--- a/eos/effects/effect3998.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# systemArmorKineticResistance
-#
-# Used by:
-# Celestials named like: Incursion Effect (2 of 2)
-# Celestials named like: Pulsar Effect Beacon Class (6 of 6)
-runTime = "early"
-type = ("projected", "passive")
-
-
-def handler(fit, beacon, context):
-    fit.ship.boostItemAttr("armorKineticDamageResonance",
-                           beacon.getModifiedItemAttr("armorKineticDamageResistanceBonus"),
-                           stackingPenalties=True)
diff --git a/eos/effects/effect3999.py b/eos/effects/effect3999.py
deleted file mode 100644
index 0a5eb0be6..000000000
--- a/eos/effects/effect3999.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# systemArmorThermalResistance
-#
-# Used by:
-# Celestials named like: Incursion Effect (2 of 2)
-# Celestials named like: Pulsar Effect Beacon Class (6 of 6)
-runTime = "early"
-type = ("projected", "passive")
-
-
-def handler(fit, beacon, context):
-    fit.ship.boostItemAttr("armorThermalDamageResonance",
-                           beacon.getModifiedItemAttr("armorThermalDamageResistanceBonus"),
-                           stackingPenalties=True)
diff --git a/eos/effects/effect4.py b/eos/effects/effect4.py
deleted file mode 100644
index 808e2f1b0..000000000
--- a/eos/effects/effect4.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# shieldBoosting
-#
-# Used by:
-# Modules from group: Shield Booster (97 of 97)
-runTime = "late"
-type = "active"
-
-
-def handler(fit, module, context):
-    amount = module.getModifiedItemAttr("shieldBonus")
-    speed = module.getModifiedItemAttr("duration") / 1000.0
-    fit.extraAttributes.increase("shieldRepair", amount / speed)
diff --git a/eos/effects/effect4002.py b/eos/effects/effect4002.py
deleted file mode 100644
index 9870b420d..000000000
--- a/eos/effects/effect4002.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# systemMissileVelocity
-#
-# Used by:
-# Celestials named like: Black Hole Effect Beacon Class (6 of 6)
-runTime = "early"
-type = ("projected", "passive")
-
-
-def handler(fit, beacon, context):
-    fit.modules.filteredChargeMultiply(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"),
-                                       "maxVelocity", beacon.getModifiedItemAttr("missileVelocityMultiplier"),
-                                       stackingPenalties=True, penaltyGroup="postMul")
diff --git a/eos/effects/effect4003.py b/eos/effects/effect4003.py
deleted file mode 100644
index b10fbf8eb..000000000
--- a/eos/effects/effect4003.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# systemMaxVelocity
-#
-# Used by:
-# Celestials named like: Black Hole Effect Beacon Class (6 of 6)
-runTime = "early"
-type = ("projected", "passive")
-
-
-def handler(fit, beacon, context):
-    fit.ship.multiplyItemAttr("maxVelocity", beacon.getModifiedItemAttr("maxVelocityMultiplier"),
-                              stackingPenalties=True, penaltyGroup="postMul")
diff --git a/eos/effects/effect4016.py b/eos/effects/effect4016.py
deleted file mode 100644
index 3b701166a..000000000
--- a/eos/effects/effect4016.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# systemDamageMultiplierGunnery
-#
-# Used by:
-# Celestials named like: Magnetar Effect Beacon Class (6 of 6)
-runTime = "early"
-type = ("projected", "passive")
-
-
-def handler(fit, beacon, context):
-    fit.modules.filteredItemMultiply(lambda mod: mod.item.requiresSkill("Gunnery"),
-                                     "damageMultiplier", beacon.getModifiedItemAttr("damageMultiplierMultiplier"),
-                                     stackingPenalties=True)
diff --git a/eos/effects/effect4017.py b/eos/effects/effect4017.py
deleted file mode 100644
index ada3a084a..000000000
--- a/eos/effects/effect4017.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# systemDamageThermalMissiles
-#
-# Used by:
-# Celestials named like: Magnetar Effect Beacon Class (6 of 6)
-runTime = "early"
-type = ("projected", "passive")
-
-
-def handler(fit, beacon, context):
-    fit.modules.filteredChargeMultiply(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"),
-                                       "thermalDamage", beacon.getModifiedItemAttr("damageMultiplierMultiplier"),
-                                       stackingPenalties=True, penaltyGroup="postMul")
diff --git a/eos/effects/effect4018.py b/eos/effects/effect4018.py
deleted file mode 100644
index 6a9485f88..000000000
--- a/eos/effects/effect4018.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# systemDamageEmMissiles
-#
-# Used by:
-# Celestials named like: Magnetar Effect Beacon Class (6 of 6)
-runTime = "early"
-type = ("projected", "passive")
-
-
-def handler(fit, beacon, context):
-    fit.modules.filteredChargeMultiply(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"),
-                                       "emDamage", beacon.getModifiedItemAttr("damageMultiplierMultiplier"),
-                                       stackingPenalties=True, penaltyGroup="postMul")
diff --git a/eos/effects/effect4019.py b/eos/effects/effect4019.py
deleted file mode 100644
index da1cfab94..000000000
--- a/eos/effects/effect4019.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# systemDamageExplosiveMissiles
-#
-# Used by:
-# Celestials named like: Magnetar Effect Beacon Class (6 of 6)
-runTime = "early"
-type = ("projected", "passive")
-
-
-def handler(fit, beacon, context):
-    fit.modules.filteredChargeMultiply(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"),
-                                       "explosiveDamage", beacon.getModifiedItemAttr("damageMultiplierMultiplier"),
-                                       stackingPenalties=True, penaltyGroup="postMul")
diff --git a/eos/effects/effect4020.py b/eos/effects/effect4020.py
deleted file mode 100644
index 7609052aa..000000000
--- a/eos/effects/effect4020.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# systemDamageKineticMissiles
-#
-# Used by:
-# Celestials named like: Magnetar Effect Beacon Class (6 of 6)
-runTime = "early"
-type = ("projected", "passive")
-
-
-def handler(fit, beacon, context):
-    fit.modules.filteredChargeMultiply(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"),
-                                       "kineticDamage", beacon.getModifiedItemAttr("damageMultiplierMultiplier"),
-                                       stackingPenalties=True, penaltyGroup="postMul")
diff --git a/eos/effects/effect4021.py b/eos/effects/effect4021.py
deleted file mode 100644
index 6e4cac6f4..000000000
--- a/eos/effects/effect4021.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# systemDamageDrones
-#
-# Used by:
-# Celestials named like: Magnetar Effect Beacon Class (6 of 6)
-runTime = "early"
-type = ("projected", "passive")
-
-
-def handler(fit, beacon, context):
-    fit.drones.filteredItemMultiply(lambda drone: drone.item.requiresSkill("Drones"),
-                                    "damageMultiplier", beacon.getModifiedItemAttr("damageMultiplierMultiplier"),
-                                    stackingPenalties=True, penaltyGroup="postMul")
diff --git a/eos/effects/effect4022.py b/eos/effects/effect4022.py
deleted file mode 100644
index 6aff80eb7..000000000
--- a/eos/effects/effect4022.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# systemTracking
-#
-# Used by:
-# Celestials named like: Magnetar Effect Beacon Class (6 of 6)
-runTime = "early"
-type = ("projected", "passive")
-
-
-def handler(fit, module, context):
-    fit.modules.filteredItemMultiply(lambda mod: mod.item.requiresSkill("Gunnery"),
-                                     "trackingSpeed", module.getModifiedItemAttr("trackingSpeedMultiplier"),
-                                     stackingPenalties=True, penaltyGroup="postMul")
diff --git a/eos/effects/effect4023.py b/eos/effects/effect4023.py
deleted file mode 100644
index 3ea6fea6c..000000000
--- a/eos/effects/effect4023.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# systemAoeVelocity
-#
-# Used by:
-# Celestials named like: Black Hole Effect Beacon Class (6 of 6)
-runTime = "early"
-type = ("projected", "passive")
-
-
-def handler(fit, beacon, context):
-    fit.modules.filteredChargeMultiply(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"),
-                                       "aoeVelocity", beacon.getModifiedItemAttr("aoeVelocityMultiplier"))
diff --git a/eos/effects/effect4033.py b/eos/effects/effect4033.py
deleted file mode 100644
index 3b31dc178..000000000
--- a/eos/effects/effect4033.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# systemHeatDamage
-#
-# Used by:
-# Celestials named like: Red Giant Beacon Class (6 of 6)
-runTime = "early"
-type = ("projected", "passive")
-
-
-def handler(fit, module, context):
-    fit.modules.filteredItemMultiply(lambda mod: "heatDamage" in mod.itemModifiedAttributes,
-                                     "heatDamage", module.getModifiedItemAttr("heatDamageMultiplier"))
diff --git a/eos/effects/effect4034.py b/eos/effects/effect4034.py
deleted file mode 100644
index d70cb74d0..000000000
--- a/eos/effects/effect4034.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# systemOverloadArmor
-#
-# Used by:
-# Celestials named like: Red Giant Beacon Class (6 of 6)
-runTime = "early"
-type = ("projected", "passive")
-
-
-def handler(fit, module, context):
-    fit.modules.filteredItemMultiply(lambda mod: "overloadArmorDamageAmount" in mod.itemModifiedAttributes,
-                                     "overloadArmorDamageAmount", module.getModifiedItemAttr("overloadBonusMultiplier"))
diff --git a/eos/effects/effect4035.py b/eos/effects/effect4035.py
deleted file mode 100644
index 886aa6865..000000000
--- a/eos/effects/effect4035.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# systemOverloadDamageModifier
-#
-# Used by:
-# Celestials named like: Red Giant Beacon Class (6 of 6)
-runTime = "early"
-type = ("projected", "passive")
-
-
-def handler(fit, module, context):
-    fit.modules.filteredItemMultiply(lambda mod: "overloadDamageModifier" in mod.itemModifiedAttributes,
-                                     "overloadDamageModifier", module.getModifiedItemAttr("overloadBonusMultiplier"))
diff --git a/eos/effects/effect4036.py b/eos/effects/effect4036.py
deleted file mode 100644
index 7fe9d6e12..000000000
--- a/eos/effects/effect4036.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# systemOverloadDurationBonus
-#
-# Used by:
-# Celestials named like: Red Giant Beacon Class (6 of 6)
-runTime = "early"
-type = ("projected", "passive")
-
-
-def handler(fit, module, context):
-    fit.modules.filteredItemMultiply(lambda mod: "overloadDurationBonus" in mod.itemModifiedAttributes,
-                                     "overloadDurationBonus", module.getModifiedItemAttr("overloadBonusMultiplier"))
diff --git a/eos/effects/effect4037.py b/eos/effects/effect4037.py
deleted file mode 100644
index 06cd0a1e9..000000000
--- a/eos/effects/effect4037.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# systemOverloadEccmStrength
-#
-# Used by:
-# Celestials named like: Red Giant Beacon Class (6 of 6)
-runTime = "early"
-type = ("projected", "passive")
-
-
-def handler(fit, module, context):
-    fit.modules.filteredItemMultiply(lambda mod: "overloadECCMStrenghtBonus" in mod.itemModifiedAttributes,
-                                     "overloadECCMStrenghtBonus", module.getModifiedItemAttr("overloadBonusMultiplier"))
diff --git a/eos/effects/effect4038.py b/eos/effects/effect4038.py
deleted file mode 100644
index 8f71dd81c..000000000
--- a/eos/effects/effect4038.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# systemOverloadEcmStrength
-#
-# Used by:
-# Celestials named like: Red Giant Beacon Class (6 of 6)
-runTime = "early"
-type = ("projected", "passive")
-
-
-def handler(fit, module, context):
-    fit.modules.filteredItemMultiply(lambda mod: "overloadECMStrenghtBonus" in mod.itemModifiedAttributes,
-                                     "overloadECMStrenghtBonus", module.getModifiedItemAttr("overloadBonusMultiplier"))
diff --git a/eos/effects/effect4039.py b/eos/effects/effect4039.py
deleted file mode 100644
index 5d65dfc30..000000000
--- a/eos/effects/effect4039.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# systemOverloadHardening
-#
-# Used by:
-# Celestials named like: Red Giant Beacon Class (6 of 6)
-runTime = "early"
-type = ("projected", "passive")
-
-
-def handler(fit, module, context):
-    fit.modules.filteredItemMultiply(lambda mod: "overloadHardeningBonus" in mod.itemModifiedAttributes,
-                                     "overloadHardeningBonus", module.getModifiedItemAttr("overloadBonusMultiplier"))
diff --git a/eos/effects/effect4040.py b/eos/effects/effect4040.py
deleted file mode 100644
index 971440693..000000000
--- a/eos/effects/effect4040.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# systemOverloadRange
-#
-# Used by:
-# Celestials named like: Red Giant Beacon Class (6 of 6)
-runTime = "early"
-type = ("projected", "passive")
-
-
-def handler(fit, module, context):
-    fit.modules.filteredItemMultiply(lambda mod: "overloadRangeBonus" in mod.itemModifiedAttributes,
-                                     "overloadRangeBonus", module.getModifiedItemAttr("overloadBonusMultiplier"))
diff --git a/eos/effects/effect4041.py b/eos/effects/effect4041.py
deleted file mode 100644
index 139c684df..000000000
--- a/eos/effects/effect4041.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# systemOverloadRof
-#
-# Used by:
-# Celestials named like: Red Giant Beacon Class (6 of 6)
-runTime = "early"
-type = ("projected", "passive")
-
-
-def handler(fit, module, context):
-    fit.modules.filteredItemMultiply(lambda mod: "overloadRofBonus" in mod.itemModifiedAttributes,
-                                     "overloadRofBonus", module.getModifiedItemAttr("overloadBonusMultiplier"))
diff --git a/eos/effects/effect4042.py b/eos/effects/effect4042.py
deleted file mode 100644
index 397c9a00c..000000000
--- a/eos/effects/effect4042.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# systemOverloadSelfDuration
-#
-# Used by:
-# Celestials named like: Red Giant Beacon Class (6 of 6)
-runTime = "early"
-type = ("projected", "passive")
-
-
-def handler(fit, module, context):
-    fit.modules.filteredItemMultiply(lambda mod: "overloadSelfDurationBonus" in mod.itemModifiedAttributes,
-                                     "overloadSelfDurationBonus", module.getModifiedItemAttr("overloadBonusMultiplier"))
diff --git a/eos/effects/effect4043.py b/eos/effects/effect4043.py
deleted file mode 100644
index d468f3cd6..000000000
--- a/eos/effects/effect4043.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# systemOverloadShieldBonus
-#
-# Used by:
-# Celestials named like: Red Giant Beacon Class (6 of 6)
-runTime = "early"
-type = ("projected", "passive")
-
-
-def handler(fit, module, context):
-    fit.modules.filteredItemMultiply(lambda mod: "overloadShieldBonus" in mod.itemModifiedAttributes,
-                                     "overloadShieldBonus", module.getModifiedItemAttr("overloadBonusMultiplier"))
diff --git a/eos/effects/effect4044.py b/eos/effects/effect4044.py
deleted file mode 100644
index a766bbaa8..000000000
--- a/eos/effects/effect4044.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# systemOverloadSpeedFactor
-#
-# Used by:
-# Celestials named like: Red Giant Beacon Class (6 of 6)
-runTime = "early"
-type = ("projected", "passive")
-
-
-def handler(fit, module, context):
-    fit.modules.filteredItemMultiply(lambda mod: "overloadSpeedFactorBonus" in mod.itemModifiedAttributes,
-                                     "overloadSpeedFactorBonus", module.getModifiedItemAttr("overloadBonusMultiplier"))
diff --git a/eos/effects/effect4045.py b/eos/effects/effect4045.py
deleted file mode 100644
index 5ccdc6f78..000000000
--- a/eos/effects/effect4045.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# systemSmartBombRange
-#
-# Used by:
-# Celestials named like: Red Giant Beacon Class (6 of 6)
-runTime = "early"
-type = ("projected", "passive")
-
-
-def handler(fit, module, context):
-    fit.modules.filteredItemMultiply(lambda mod: mod.item.group.name == "Smart Bomb",
-                                     "empFieldRange", module.getModifiedItemAttr("empFieldRangeMultiplier"))
diff --git a/eos/effects/effect4046.py b/eos/effects/effect4046.py
deleted file mode 100644
index da11e810c..000000000
--- a/eos/effects/effect4046.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# systemSmartBombEmDamage
-#
-# Used by:
-# Celestials named like: Red Giant Beacon Class (6 of 6)
-runTime = "early"
-type = ("projected", "passive")
-
-
-def handler(fit, module, context):
-    fit.modules.filteredItemMultiply(lambda mod: mod.item.group.name == "Smart Bomb",
-                                     "emDamage", module.getModifiedItemAttr("smartbombDamageMultiplier"))
diff --git a/eos/effects/effect4047.py b/eos/effects/effect4047.py
deleted file mode 100644
index a12281fe2..000000000
--- a/eos/effects/effect4047.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# systemSmartBombThermalDamage
-#
-# Used by:
-# Celestials named like: Red Giant Beacon Class (6 of 6)
-runTime = "early"
-type = ("projected", "passive")
-
-
-def handler(fit, module, context):
-    fit.modules.filteredItemMultiply(lambda mod: mod.item.group.name == "Smart Bomb",
-                                     "thermalDamage", module.getModifiedItemAttr("smartbombDamageMultiplier"))
diff --git a/eos/effects/effect4048.py b/eos/effects/effect4048.py
deleted file mode 100644
index 1e7cf7c44..000000000
--- a/eos/effects/effect4048.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# systemSmartBombKineticDamage
-#
-# Used by:
-# Celestials named like: Red Giant Beacon Class (6 of 6)
-runTime = "early"
-type = ("projected", "passive")
-
-
-def handler(fit, module, context):
-    fit.modules.filteredItemMultiply(lambda mod: mod.item.group.name == "Smart Bomb",
-                                     "kineticDamage", module.getModifiedItemAttr("smartbombDamageMultiplier"))
diff --git a/eos/effects/effect4049.py b/eos/effects/effect4049.py
deleted file mode 100644
index d52964bca..000000000
--- a/eos/effects/effect4049.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# systemSmartBombExplosiveDamage
-#
-# Used by:
-# Celestials named like: Red Giant Beacon Class (6 of 6)
-runTime = "early"
-type = ("projected", "passive")
-
-
-def handler(fit, module, context):
-    fit.modules.filteredItemMultiply(lambda mod: mod.item.group.name == "Smart Bomb",
-                                     "explosiveDamage", module.getModifiedItemAttr("smartbombDamageMultiplier"))
diff --git a/eos/effects/effect4054.py b/eos/effects/effect4054.py
deleted file mode 100644
index d4fd39124..000000000
--- a/eos/effects/effect4054.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# systemSmallEnergyDamage
-#
-# Used by:
-# Celestials named like: Wolf Rayet Effect Beacon Class (6 of 6)
-runTime = "early"
-type = ("projected", "passive")
-
-
-def handler(fit, module, context):
-    fit.modules.filteredItemMultiply(lambda mod: mod.item.requiresSkill("Small Energy Turret"),
-                                     "damageMultiplier", module.getModifiedItemAttr("smallWeaponDamageMultiplier"),
-                                     stackingPenalties=True)
diff --git a/eos/effects/effect4055.py b/eos/effects/effect4055.py
deleted file mode 100644
index 089c03d46..000000000
--- a/eos/effects/effect4055.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# systemSmallProjectileDamage
-#
-# Used by:
-# Celestials named like: Wolf Rayet Effect Beacon Class (6 of 6)
-runTime = "early"
-type = ("projected", "passive")
-
-
-def handler(fit, module, context):
-    fit.modules.filteredItemMultiply(lambda mod: mod.item.requiresSkill("Small Projectile Turret"),
-                                     "damageMultiplier", module.getModifiedItemAttr("smallWeaponDamageMultiplier"),
-                                     stackingPenalties=True)
diff --git a/eos/effects/effect4056.py b/eos/effects/effect4056.py
deleted file mode 100644
index fedc2f2cf..000000000
--- a/eos/effects/effect4056.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# systemSmallHybridDamage
-#
-# Used by:
-# Celestials named like: Wolf Rayet Effect Beacon Class (6 of 6)
-runTime = "early"
-type = ("projected", "passive")
-
-
-def handler(fit, module, context):
-    fit.modules.filteredItemMultiply(lambda mod: mod.item.requiresSkill("Small Hybrid Turret"),
-                                     "damageMultiplier", module.getModifiedItemAttr("smallWeaponDamageMultiplier"),
-                                     stackingPenalties=True)
diff --git a/eos/effects/effect4057.py b/eos/effects/effect4057.py
deleted file mode 100644
index b49384777..000000000
--- a/eos/effects/effect4057.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# systemRocketEmDamage
-#
-# Used by:
-# Celestials named like: Wolf Rayet Effect Beacon Class (6 of 6)
-runTime = "early"
-type = ("projected", "passive")
-
-
-def handler(fit, beacon, context):
-    fit.modules.filteredChargeMultiply(lambda mod: mod.charge.requiresSkill("Rockets"),
-                                       "emDamage", beacon.getModifiedItemAttr("smallWeaponDamageMultiplier"),
-                                       stackingPenalties=True, penaltyGroup="postMul")
diff --git a/eos/effects/effect4058.py b/eos/effects/effect4058.py
deleted file mode 100644
index db6d6653e..000000000
--- a/eos/effects/effect4058.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# systemRocketExplosiveDamage
-#
-# Used by:
-# Celestials named like: Wolf Rayet Effect Beacon Class (6 of 6)
-runTime = "early"
-type = ("projected", "passive")
-
-
-def handler(fit, beacon, context):
-    fit.modules.filteredChargeMultiply(lambda mod: mod.charge.requiresSkill("Rockets"),
-                                       "explosiveDamage", beacon.getModifiedItemAttr("smallWeaponDamageMultiplier"),
-                                       stackingPenalties=True, penaltyGroup="postMul")
diff --git a/eos/effects/effect4059.py b/eos/effects/effect4059.py
deleted file mode 100644
index 3b539502c..000000000
--- a/eos/effects/effect4059.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# systemRocketKineticDamage
-#
-# Used by:
-# Celestials named like: Wolf Rayet Effect Beacon Class (6 of 6)
-runTime = "early"
-type = ("projected", "passive")
-
-
-def handler(fit, beacon, context):
-    fit.modules.filteredChargeMultiply(lambda mod: mod.charge.requiresSkill("Rockets"),
-                                       "kineticDamage", beacon.getModifiedItemAttr("smallWeaponDamageMultiplier"),
-                                       stackingPenalties=True, penaltyGroup="postMul")
diff --git a/eos/effects/effect4060.py b/eos/effects/effect4060.py
deleted file mode 100644
index db5f65c0f..000000000
--- a/eos/effects/effect4060.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# systemRocketThermalDamage
-#
-# Used by:
-# Celestials named like: Wolf Rayet Effect Beacon Class (6 of 6)
-runTime = "early"
-type = ("projected", "passive")
-
-
-def handler(fit, beacon, context):
-    fit.modules.filteredChargeMultiply(lambda mod: mod.charge.requiresSkill("Rockets"),
-                                       "thermalDamage", beacon.getModifiedItemAttr("smallWeaponDamageMultiplier"),
-                                       stackingPenalties=True, penaltyGroup="postMul")
diff --git a/eos/effects/effect4061.py b/eos/effects/effect4061.py
deleted file mode 100644
index db5e7d254..000000000
--- a/eos/effects/effect4061.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# systemStandardMissileThermalDamage
-#
-# Used by:
-# Celestials named like: Wolf Rayet Effect Beacon Class (6 of 6)
-runTime = "early"
-type = ("projected", "passive")
-
-
-def handler(fit, beacon, context):
-    fit.modules.filteredChargeMultiply(lambda mod: mod.charge.requiresSkill("Light Missiles"),
-                                       "thermalDamage", beacon.getModifiedItemAttr("smallWeaponDamageMultiplier"),
-                                       stackingPenalties=True, penaltyGroup="postMul")
diff --git a/eos/effects/effect4062.py b/eos/effects/effect4062.py
deleted file mode 100644
index 5e6102aef..000000000
--- a/eos/effects/effect4062.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# systemStandardMissileEmDamage
-#
-# Used by:
-# Celestials named like: Wolf Rayet Effect Beacon Class (6 of 6)
-runTime = "early"
-type = ("projected", "passive")
-
-
-def handler(fit, beacon, context):
-    fit.modules.filteredChargeMultiply(lambda mod: mod.charge.requiresSkill("Light Missiles"),
-                                       "emDamage", beacon.getModifiedItemAttr("smallWeaponDamageMultiplier"),
-                                       stackingPenalties=True, penaltyGroup="postMul")
diff --git a/eos/effects/effect4063.py b/eos/effects/effect4063.py
deleted file mode 100644
index c53978cf5..000000000
--- a/eos/effects/effect4063.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# systemStandardMissileExplosiveDamage
-#
-# Used by:
-# Celestials named like: Wolf Rayet Effect Beacon Class (6 of 6)
-runTime = "early"
-type = ("projected", "passive")
-
-
-def handler(fit, beacon, context):
-    fit.modules.filteredChargeMultiply(lambda mod: mod.charge.requiresSkill("Light Missiles"),
-                                       "explosiveDamage", beacon.getModifiedItemAttr("smallWeaponDamageMultiplier"),
-                                       stackingPenalties=True, penaltyGroup="postMul")
diff --git a/eos/effects/effect408.py b/eos/effects/effect408.py
deleted file mode 100644
index e7f214d19..000000000
--- a/eos/effects/effect408.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# largeProjectileTurretDamageMultiplierBonusPostPercentDamageMultiplierLocationShipModulesRequiringLargeProjectileTurret
-#
-# Used by:
-# Implants named like: Eifyr and Co. 'Gunslinger' Large Projectile Turret LP (6 of 6)
-# Skill: Large Projectile Turret
-type = "passive"
-
-
-def handler(fit, container, context):
-    level = container.level if "skill" in context else 1
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Large Projectile Turret"),
-                                  "damageMultiplier", container.getModifiedItemAttr("damageMultiplierBonus") * level)
diff --git a/eos/effects/effect4086.py b/eos/effects/effect4086.py
deleted file mode 100644
index da585583d..000000000
--- a/eos/effects/effect4086.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# systemArmorRepairAmount
-#
-# Used by:
-# Celestials named like: Cataclysmic Variable Effect Beacon Class (6 of 6)
-runTime = "early"
-type = ("projected", "passive")
-
-
-def handler(fit, module, context):
-    fit.modules.filteredItemMultiply(lambda mod: mod.item.requiresSkill("Repair Systems") or
-                                                 mod.item.requiresSkill("Capital Repair Systems"),
-                                     "armorDamageAmount", module.getModifiedItemAttr("armorDamageAmountMultiplier"),
-                                     stackingPenalties=True, penaltyGroup="postMul")
diff --git a/eos/effects/effect4088.py b/eos/effects/effect4088.py
deleted file mode 100644
index 4c18e8589..000000000
--- a/eos/effects/effect4088.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# systemArmorRemoteRepairAmount
-#
-# Used by:
-# Celestials named like: Cataclysmic Variable Effect Beacon Class (6 of 6)
-runTime = "early"
-type = ("projected", "passive")
-
-
-def handler(fit, module, context):
-    fit.modules.filteredItemMultiply(lambda mod: mod.item.requiresSkill("Remote Armor Repair Systems"),
-                                     "armorDamageAmount",
-                                     module.getModifiedItemAttr("armorDamageAmountMultiplierRemote"),
-                                     stackingPenalties=True)
diff --git a/eos/effects/effect4089.py b/eos/effects/effect4089.py
deleted file mode 100644
index c8dd29645..000000000
--- a/eos/effects/effect4089.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# systemShieldRemoteRepairAmount
-#
-# Used by:
-# Celestials named like: Cataclysmic Variable Effect Beacon Class (6 of 6)
-runTime = "early"
-type = ("projected", "passive")
-
-
-def handler(fit, module, context):
-    fit.modules.filteredItemMultiply(lambda mod: mod.item.requiresSkill("Shield Emission Systems"),
-                                     "shieldBonus", module.getModifiedItemAttr("shieldBonusMultiplierRemote"),
-                                     stackingPenalties=True, penaltyGroup="postMul")
diff --git a/eos/effects/effect4090.py b/eos/effects/effect4090.py
deleted file mode 100644
index 63a57c9e2..000000000
--- a/eos/effects/effect4090.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# systemCapacitorCapacity
-#
-# Used by:
-# Celestials named like: Cataclysmic Variable Effect Beacon Class (6 of 6)
-runTime = "early"
-type = ("projected", "passive")
-
-
-def handler(fit, beacon, context):
-    fit.ship.multiplyItemAttr("capacitorCapacity", beacon.getModifiedItemAttr("capacitorCapacityMultiplierSystem"))
diff --git a/eos/effects/effect4091.py b/eos/effects/effect4091.py
deleted file mode 100644
index dd89728ed..000000000
--- a/eos/effects/effect4091.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# systemCapacitorRecharge
-#
-# Used by:
-# Celestials named like: Cataclysmic Variable Effect Beacon Class (6 of 6)
-# Celestials named like: Pulsar Effect Beacon Class (6 of 6)
-runTime = "early"
-type = ("projected", "passive")
-
-
-def handler(fit, beacon, context):
-    fit.ship.multiplyItemAttr("rechargeRate", beacon.getModifiedItemAttr("rechargeRateMultiplier"))
diff --git a/eos/effects/effect4093.py b/eos/effects/effect4093.py
deleted file mode 100644
index 3af29dfee..000000000
--- a/eos/effects/effect4093.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# subsystemBonusAmarrOffensiveEnergyWeaponDamageMultiplier
-#
-# Used by:
-# Subsystem: Legion Offensive - Liquid Crystal Magnifiers
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Energy Turret"),
-                                  "damageMultiplier", module.getModifiedItemAttr("subsystemBonusAmarrOffensive"),
-                                  skill="Amarr Offensive Systems")
diff --git a/eos/effects/effect4104.py b/eos/effects/effect4104.py
deleted file mode 100644
index a2d51c087..000000000
--- a/eos/effects/effect4104.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# subsystemBonusCaldariOffensiveHybridWeaponMaxRange
-#
-# Used by:
-# Subsystem: Tengu Offensive - Magnetic Infusion Basin
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Hybrid Turret"),
-                                  "maxRange", module.getModifiedItemAttr("subsystemBonusCaldariOffensive"),
-                                  skill="Caldari Offensive Systems")
diff --git a/eos/effects/effect4106.py b/eos/effects/effect4106.py
deleted file mode 100644
index 67900a90b..000000000
--- a/eos/effects/effect4106.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# subsystemBonusGallenteOffensiveHybridWeaponFalloff
-#
-# Used by:
-# Subsystem: Proteus Offensive - Hybrid Encoding Platform
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Hybrid Turret"),
-                                  "falloff", module.getModifiedItemAttr("subsystemBonusGallenteOffensive"),
-                                  skill="Gallente Offensive Systems")
diff --git a/eos/effects/effect4114.py b/eos/effects/effect4114.py
deleted file mode 100644
index e97198498..000000000
--- a/eos/effects/effect4114.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# subsystemBonusMinmatarOffensiveProjectileWeaponFalloff
-#
-# Used by:
-# Subsystem: Loki Offensive - Projectile Scoping Array
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Projectile Turret"),
-                                  "falloff", module.getModifiedItemAttr("subsystemBonusMinmatarOffensive"),
-                                  skill="Minmatar Offensive Systems")
diff --git a/eos/effects/effect4115.py b/eos/effects/effect4115.py
deleted file mode 100644
index 4938c002a..000000000
--- a/eos/effects/effect4115.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# subsystemBonusMinmatarOffensiveProjectileWeaponMaxRange
-#
-# Used by:
-# Subsystem: Loki Offensive - Projectile Scoping Array
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Projectile Turret"),
-                                  "maxRange", module.getModifiedItemAttr("subsystemBonusMinmatarOffensive"),
-                                  skill="Minmatar Offensive Systems")
diff --git a/eos/effects/effect4122.py b/eos/effects/effect4122.py
deleted file mode 100644
index 7a7418ff2..000000000
--- a/eos/effects/effect4122.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# subsystemBonusCaldariOffensive1LauncherROF
-#
-# Used by:
-# Subsystem: Tengu Offensive - Accelerated Ejection Bay
-type = "passive"
-
-
-def handler(fit, src, context):
-    groups = ("Missile Launcher Heavy", "Missile Launcher Rapid Light", "Missile Launcher Heavy Assault")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name in groups,
-                                  "speed", src.getModifiedItemAttr("subsystemBonusCaldariOffensive"), skill="Caldari Offensive Systems")
diff --git a/eos/effects/effect4135.py b/eos/effects/effect4135.py
deleted file mode 100644
index 8e373b52d..000000000
--- a/eos/effects/effect4135.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# systemShieldEmResistance
-#
-# Used by:
-# Celestials named like: Wolf Rayet Effect Beacon Class (6 of 6)
-runTime = "early"
-type = ("projected", "passive")
-
-
-def handler(fit, beacon, context):
-    fit.ship.boostItemAttr("shieldEmDamageResonance", beacon.getModifiedItemAttr("shieldEmDamageResistanceBonus"),
-                           stackingPenalties=True)
diff --git a/eos/effects/effect4136.py b/eos/effects/effect4136.py
deleted file mode 100644
index cc52e5723..000000000
--- a/eos/effects/effect4136.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# systemShieldExplosiveResistance
-#
-# Used by:
-# Celestials named like: Wolf Rayet Effect Beacon Class (6 of 6)
-runTime = "early"
-type = ("projected", "passive")
-
-
-def handler(fit, beacon, context):
-    fit.ship.boostItemAttr("shieldExplosiveDamageResonance",
-                           beacon.getModifiedItemAttr("shieldExplosiveDamageResistanceBonus"),
-                           stackingPenalties=True)
diff --git a/eos/effects/effect4137.py b/eos/effects/effect4137.py
deleted file mode 100644
index 7671d6d13..000000000
--- a/eos/effects/effect4137.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# systemShieldKineticResistance
-#
-# Used by:
-# Celestials named like: Wolf Rayet Effect Beacon Class (6 of 6)
-runTime = "early"
-type = ("projected", "passive")
-
-
-def handler(fit, beacon, context):
-    fit.ship.boostItemAttr("shieldKineticDamageResonance",
-                           beacon.getModifiedItemAttr("shieldKineticDamageResistanceBonus"),
-                           stackingPenalties=True)
diff --git a/eos/effects/effect4138.py b/eos/effects/effect4138.py
deleted file mode 100644
index cd58fcdeb..000000000
--- a/eos/effects/effect4138.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# systemShieldThermalResistance
-#
-# Used by:
-# Celestials named like: Wolf Rayet Effect Beacon Class (6 of 6)
-runTime = "early"
-type = ("projected", "passive")
-
-
-def handler(fit, beacon, context):
-    fit.ship.boostItemAttr("shieldThermalDamageResonance",
-                           beacon.getModifiedItemAttr("shieldThermalDamageResistanceBonus"),
-                           stackingPenalties=True)
diff --git a/eos/effects/effect414.py b/eos/effects/effect414.py
deleted file mode 100644
index fc4a45d26..000000000
--- a/eos/effects/effect414.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# gunneryTurretSpeeBonusPostPercentSpeedLocationShipModulesRequiringGunnery
-#
-# Used by:
-# Implants named like: Inherent Implants 'Lancer' Gunnery RF (6 of 6)
-# Implant: Pashan's Turret Customization Mindlink
-# Skill: Gunnery
-type = "passive"
-
-
-def handler(fit, container, context):
-    level = container.level if "skill" in context else 1
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Gunnery"),
-                                  "speed", container.getModifiedItemAttr("turretSpeeBonus") * level)
diff --git a/eos/effects/effect4152.py b/eos/effects/effect4152.py
deleted file mode 100644
index 081431376..000000000
--- a/eos/effects/effect4152.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# subsystemBonusAmarrEngineeringHeatDamageReduction
-#
-# Used by:
-# Subsystem: Legion Core - Energy Parasitic Complex
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.modules.filteredItemBoost(lambda mod: True, "heatDamage",
-                                  module.getModifiedItemAttr("subsystemBonusAmarrCore"),
-                                  skill="Amarr Core Systems")
diff --git a/eos/effects/effect4153.py b/eos/effects/effect4153.py
deleted file mode 100644
index 187643ef3..000000000
--- a/eos/effects/effect4153.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# subsystemBonusCaldariEngineeringHeatDamageReduction
-#
-# Used by:
-# Subsystem: Tengu Core - Obfuscation Manifold
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.modules.filteredItemBoost(lambda mod: True, "heatDamage",
-                                  module.getModifiedItemAttr("subsystemBonusCaldariCore"),
-                                  skill="Caldari Core Systems")
diff --git a/eos/effects/effect4154.py b/eos/effects/effect4154.py
deleted file mode 100644
index d68012583..000000000
--- a/eos/effects/effect4154.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# subsystemBonusGallenteEngineeringHeatDamageReduction
-#
-# Used by:
-# Subsystem: Proteus Core - Friction Extension Processor
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.modules.filteredItemBoost(lambda mod: True, "heatDamage",
-                                  module.getModifiedItemAttr("subsystemBonusGallenteCore"),
-                                  skill="Gallente Core Systems")
diff --git a/eos/effects/effect4155.py b/eos/effects/effect4155.py
deleted file mode 100644
index 2af4c13ca..000000000
--- a/eos/effects/effect4155.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# subsystemBonusMinmatarEngineeringHeatDamageReduction
-#
-# Used by:
-# Subsystem: Loki Core - Immobility Drivers
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.modules.filteredItemBoost(lambda mod: True, "heatDamage",
-                                  module.getModifiedItemAttr("subsystemBonusMinmatarCore"),
-                                  skill="Minmatar Core Systems")
diff --git a/eos/effects/effect4158.py b/eos/effects/effect4158.py
deleted file mode 100644
index b3895bbec..000000000
--- a/eos/effects/effect4158.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# subsystemBonusCaldariCoreCapacitorCapacity
-#
-# Used by:
-# Subsystem: Tengu Core - Augmented Graviton Reactor
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.ship.boostItemAttr("capacitorCapacity", src.getModifiedItemAttr("subsystemBonusCaldariCore"),
-                           skill="Caldari Core Systems")
diff --git a/eos/effects/effect4159.py b/eos/effects/effect4159.py
deleted file mode 100644
index 373d62290..000000000
--- a/eos/effects/effect4159.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# subsystemBonusAmarrCoreCapacitorCapacity
-#
-# Used by:
-# Subsystem: Legion Core - Augmented Antimatter Reactor
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.ship.boostItemAttr("capacitorCapacity", src.getModifiedItemAttr("subsystemBonusAmarrCore"), skill="Amarr Core Systems")
diff --git a/eos/effects/effect4161.py b/eos/effects/effect4161.py
deleted file mode 100644
index 81724b690..000000000
--- a/eos/effects/effect4161.py
+++ /dev/null
@@ -1,14 +0,0 @@
-# baseMaxScanDeviationModifierRequiringAstrometrics
-#
-# Used by:
-# Implants named like: Poteque 'Prospector' Astrometric Pinpointing AP (3 of 3)
-# Skill: Astrometric Pinpointing
-# Skill: Astrometrics
-type = "passive"
-
-
-def handler(fit, container, context):
-    level = container.level if "skill" in context else 1
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Astrometrics"),
-                                    "baseMaxScanDeviation",
-                                    container.getModifiedItemAttr("maxScanDeviationModifier") * level)
diff --git a/eos/effects/effect4162.py b/eos/effects/effect4162.py
deleted file mode 100644
index 1c302d261..000000000
--- a/eos/effects/effect4162.py
+++ /dev/null
@@ -1,18 +0,0 @@
-# baseSensorStrengthModifierRequiringAstrometrics
-#
-# Used by:
-# Modules from group: Scan Probe Launcher (4 of 7)
-# Implants named like: Poteque 'Prospector' Astrometric Rangefinding AR (3 of 3)
-# Implants named like: grade Virtue (10 of 12)
-# Modules named like: Gravity Capacitor Upgrade (8 of 8)
-# Skill: Astrometric Rangefinding
-# Skill: Astrometrics
-type = "passive"
-
-
-def handler(fit, container, context):
-    level = container.level if "skill" in context else 1
-    penalized = False if "skill" in context or "implant" in context else True
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Astrometrics"),
-                                    "baseSensorStrength", container.getModifiedItemAttr("scanStrengthBonus") * level,
-                                    stackingPenalties=penalized)
diff --git a/eos/effects/effect4165.py b/eos/effects/effect4165.py
deleted file mode 100644
index 0e61528b2..000000000
--- a/eos/effects/effect4165.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipBonusScanProbeStrengthCF
-#
-# Used by:
-# Ship: Heron
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.group.name == "Scanner Probe",
-                                    "baseSensorStrength", ship.getModifiedItemAttr("shipBonusCF2"),
-                                    skill="Caldari Frigate")
diff --git a/eos/effects/effect4166.py b/eos/effects/effect4166.py
deleted file mode 100644
index 8caaf2411..000000000
--- a/eos/effects/effect4166.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipBonusScanProbeStrengthMF
-#
-# Used by:
-# Ship: Probe
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.group.name == "Scanner Probe",
-                                    "baseSensorStrength", ship.getModifiedItemAttr("shipBonusMF2"),
-                                    skill="Minmatar Frigate")
diff --git a/eos/effects/effect4167.py b/eos/effects/effect4167.py
deleted file mode 100644
index aed2e3d3a..000000000
--- a/eos/effects/effect4167.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipBonusScanProbeStrengthGF
-#
-# Used by:
-# Ship: Imicus
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.group.name == "Scanner Probe",
-                                    "baseSensorStrength", ship.getModifiedItemAttr("shipBonusGF2"),
-                                    skill="Gallente Frigate")
diff --git a/eos/effects/effect4168.py b/eos/effects/effect4168.py
deleted file mode 100644
index 77feea510..000000000
--- a/eos/effects/effect4168.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# eliteBonusCoverOpsScanProbeStrength2
-#
-# Used by:
-# Ships from group: Covert Ops (8 of 8)
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.group.name == "Scanner Probe",
-                                    "baseSensorStrength", ship.getModifiedItemAttr("eliteBonusCovertOps2"),
-                                    skill="Covert Ops")
diff --git a/eos/effects/effect4187.py b/eos/effects/effect4187.py
deleted file mode 100644
index b390e901e..000000000
--- a/eos/effects/effect4187.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipBonusStrategicCruiserAmarrHeatDamage
-#
-# Used by:
-# Ship: Legion
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: True, "heatDamage",
-                                  ship.getModifiedItemAttr("shipBonusStrategicCruiserAmarr1"),
-                                  skill="Amarr Strategic Cruiser")
diff --git a/eos/effects/effect4188.py b/eos/effects/effect4188.py
deleted file mode 100644
index 8edf19db3..000000000
--- a/eos/effects/effect4188.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipBonusStrategicCruiserCaldariHeatDamage
-#
-# Used by:
-# Ship: Tengu
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: True, "heatDamage",
-                                  ship.getModifiedItemAttr("shipBonusStrategicCruiserCaldari1"),
-                                  skill="Caldari Strategic Cruiser")
diff --git a/eos/effects/effect4189.py b/eos/effects/effect4189.py
deleted file mode 100644
index dc7f7bd80..000000000
--- a/eos/effects/effect4189.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipBonusStrategicCruiserGallenteHeatDamage
-#
-# Used by:
-# Ship: Proteus
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: True, "heatDamage",
-                                  ship.getModifiedItemAttr("shipBonusStrategicCruiserGallente1"),
-                                  skill="Gallente Strategic Cruiser")
diff --git a/eos/effects/effect4190.py b/eos/effects/effect4190.py
deleted file mode 100644
index f97b203cc..000000000
--- a/eos/effects/effect4190.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipBonusStrategicCruiserMinmatarHeatDamage
-#
-# Used by:
-# Ship: Loki
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: True, "heatDamage",
-                                  ship.getModifiedItemAttr("shipBonusStrategicCruiserMinmatar1"),
-                                  skill="Minmatar Strategic Cruiser")
diff --git a/eos/effects/effect4215.py b/eos/effects/effect4215.py
deleted file mode 100644
index 4062932dd..000000000
--- a/eos/effects/effect4215.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# subsystemBonusAmarrOffensive2EnergyWeaponCapacitorNeed
-#
-# Used by:
-# Subsystem: Legion Offensive - Liquid Crystal Magnifiers
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Energy Turret"),
-                                  "capacitorNeed", module.getModifiedItemAttr("subsystemBonusAmarrOffensive2"),
-                                  skill="Amarr Offensive Systems")
diff --git a/eos/effects/effect4216.py b/eos/effects/effect4216.py
deleted file mode 100644
index c3597aead..000000000
--- a/eos/effects/effect4216.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# subsystemBonusAmarrCore2EnergyVampireAmount
-#
-# Used by:
-# Subsystem: Legion Core - Energy Parasitic Complex
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Nosferatu", "powerTransferAmount",
-                                  src.getModifiedItemAttr("subsystemBonusAmarrCore2"), skill="Amarr Core Systems")
diff --git a/eos/effects/effect4217.py b/eos/effects/effect4217.py
deleted file mode 100644
index e9cd100c1..000000000
--- a/eos/effects/effect4217.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# subsystemBonusAmarrCore2EnergyDestabilizerAmount
-#
-# Used by:
-# Subsystem: Legion Core - Energy Parasitic Complex
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Neutralizer", "energyNeutralizerAmount",
-                                  src.getModifiedItemAttr("subsystemBonusAmarrCore2"), skill="Amarr Core Systems")
diff --git a/eos/effects/effect4248.py b/eos/effects/effect4248.py
deleted file mode 100644
index ba959521c..000000000
--- a/eos/effects/effect4248.py
+++ /dev/null
@@ -1,17 +0,0 @@
-# subsystemBonusCaldariOffensive2MissileLauncherKineticDamage
-#
-# Used by:
-# Subsystem: Tengu Offensive - Accelerated Ejection Bay
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Light Missiles"),
-                                    "kineticDamage", src.getModifiedItemAttr("subsystemBonusCaldariOffensive2"),
-                                    skill="Caldari Offensive Systems")
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Missiles"),
-                                    "kineticDamage", src.getModifiedItemAttr("subsystemBonusCaldariOffensive2"),
-                                    skill="Caldari Offensive Systems")
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Assault Missiles"),
-                                    "kineticDamage", src.getModifiedItemAttr("subsystemBonusCaldariOffensive2"),
-                                    skill="Caldari Offensive Systems")
diff --git a/eos/effects/effect4250.py b/eos/effects/effect4250.py
deleted file mode 100644
index 4f1abbb8d..000000000
--- a/eos/effects/effect4250.py
+++ /dev/null
@@ -1,20 +0,0 @@
-# subsystemBonusGallenteOffensiveDroneDamageHP
-#
-# Used by:
-# Subsystem: Proteus Offensive - Drone Synthesis Projector
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill("Drones"),
-                                 "armorHP", src.getModifiedItemAttr("subsystemBonusGallenteOffensive"),
-                                 skill="Gallente Offensive Systems")
-    fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill("Drones"),
-                                 "hp", src.getModifiedItemAttr("subsystemBonusGallenteOffensive"),
-                                 skill="Gallente Offensive Systems")
-    fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill("Drones"),
-                                 "damageMultiplier", src.getModifiedItemAttr("subsystemBonusGallenteOffensive"),
-                                 skill="Gallente Offensive Systems")
-    fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill("Drones"),
-                                 "shieldCapacity", src.getModifiedItemAttr("subsystemBonusGallenteOffensive"),
-                                 skill="Gallente Offensive Systems")
diff --git a/eos/effects/effect4251.py b/eos/effects/effect4251.py
deleted file mode 100644
index c68ff8976..000000000
--- a/eos/effects/effect4251.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# subsystemBonusMinmatarOffensive2ProjectileWeaponDamageMultiplier
-#
-# Used by:
-# Subsystem: Loki Offensive - Projectile Scoping Array
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Projectile Turret"),
-                                  "damageMultiplier", module.getModifiedItemAttr("subsystemBonusMinmatarOffensive2"),
-                                  skill="Minmatar Offensive Systems")
diff --git a/eos/effects/effect4256.py b/eos/effects/effect4256.py
deleted file mode 100644
index 29e71d306..000000000
--- a/eos/effects/effect4256.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# subsystemBonusMinmatarOffensive2MissileLauncherROF
-#
-# Used by:
-# Subsystem: Loki Offensive - Launcher Efficiency Configuration
-type = "passive"
-
-
-def handler(fit, src, context):
-    groups = ("Missile Launcher Heavy", "Missile Launcher Rapid Light", "Missile Launcher Heavy Assault")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name in groups,
-                                  "speed", src.getModifiedItemAttr("subsystemBonusMinmatarOffensive2"),
-                                  skill="Minmatar Offensive Systems")
diff --git a/eos/effects/effect4264.py b/eos/effects/effect4264.py
deleted file mode 100644
index d32fce7ac..000000000
--- a/eos/effects/effect4264.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# subsystemBonusMinmatarCoreCapacitorRecharge
-#
-# Used by:
-# Subsystem: Loki Core - Augmented Nuclear Reactor
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.ship.boostItemAttr("rechargeRate", src.getModifiedItemAttr("subsystemBonusMinmatarCore"),
-                           skill="Minmatar Core Systems")
diff --git a/eos/effects/effect4265.py b/eos/effects/effect4265.py
deleted file mode 100644
index 52c020b91..000000000
--- a/eos/effects/effect4265.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# subsystemBonusGallenteCoreCapacitorRecharge
-#
-# Used by:
-# Subsystem: Proteus Core - Augmented Fusion Reactor
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.ship.boostItemAttr("rechargeRate", src.getModifiedItemAttr("subsystemBonusGallenteCore"),
-                           skill="Gallente Core Systems")
diff --git a/eos/effects/effect4269.py b/eos/effects/effect4269.py
deleted file mode 100644
index 2374304e5..000000000
--- a/eos/effects/effect4269.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# subsystemBonusAmarrCore3ScanResolution
-#
-# Used by:
-# Subsystem: Legion Core - Dissolution Sequencer
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.ship.boostItemAttr("scanResolution", src.getModifiedItemAttr("subsystemBonusAmarrCore3"),
-                           skill="Amarr Core Systems")
diff --git a/eos/effects/effect4270.py b/eos/effects/effect4270.py
deleted file mode 100644
index 3fb57e5e6..000000000
--- a/eos/effects/effect4270.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# subsystemBonusMinmatarCore3ScanResolution
-#
-# Used by:
-# Subsystem: Loki Core - Dissolution Sequencer
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.ship.boostItemAttr("scanResolution", src.getModifiedItemAttr("subsystemBonusMinmatarCore3"),
-                           skill="Minmatar Core Systems")
diff --git a/eos/effects/effect4271.py b/eos/effects/effect4271.py
deleted file mode 100644
index 4aa3ad96c..000000000
--- a/eos/effects/effect4271.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# subsystemBonusCaldariCore2MaxTargetingRange
-#
-# Used by:
-# Subsystem: Tengu Core - Electronic Efficiency Gate
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.ship.boostItemAttr("maxTargetRange", src.getModifiedItemAttr("subsystemBonusCaldariCore2"), skill="Caldari Core Systems")
diff --git a/eos/effects/effect4272.py b/eos/effects/effect4272.py
deleted file mode 100644
index 9e2e880f4..000000000
--- a/eos/effects/effect4272.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# subsystemBonusGallenteCore2MaxTargetingRange
-#
-# Used by:
-# Subsystem: Proteus Core - Electronic Efficiency Gate
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.ship.boostItemAttr("maxTargetRange", src.getModifiedItemAttr("subsystemBonusGallenteCore2"),
-                           skill="Gallente Core Systems")
diff --git a/eos/effects/effect4273.py b/eos/effects/effect4273.py
deleted file mode 100644
index 0d93f558b..000000000
--- a/eos/effects/effect4273.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# subsystemBonusGallenteCore2WarpScrambleRange
-#
-# Used by:
-# Subsystem: Proteus Core - Friction Extension Processor
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Warp Scrambler", "maxRange",
-                                  src.getModifiedItemAttr("subsystemBonusGallenteCore2"), skill="Gallente Core Systems")
diff --git a/eos/effects/effect4274.py b/eos/effects/effect4274.py
deleted file mode 100644
index 1b05d6864..000000000
--- a/eos/effects/effect4274.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# subsystemBonusMinmatarCore2StasisWebifierRange
-#
-# Used by:
-# Subsystem: Loki Core - Immobility Drivers
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Stasis Web",
-                                  "maxRange", src.getModifiedItemAttr("subsystemBonusMinmatarCore2"), skill="Minmatar Core Systems")
diff --git a/eos/effects/effect4275.py b/eos/effects/effect4275.py
deleted file mode 100644
index 3e0d5f181..000000000
--- a/eos/effects/effect4275.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# subsystemBonusCaldariPropulsion2WarpSpeed
-#
-# Used by:
-# Subsystem: Tengu Propulsion - Interdiction Nullifier
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.ship.boostItemAttr("warpSpeedMultiplier", src.getModifiedItemAttr("subsystemBonusCaldariPropulsion2"),
-                           skill="Caldari Propulsion Systems")
diff --git a/eos/effects/effect4277.py b/eos/effects/effect4277.py
deleted file mode 100644
index f267ba0bd..000000000
--- a/eos/effects/effect4277.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# subsystemBonusGallentePropulsionWarpCapacitor
-#
-# Used by:
-# Subsystem: Proteus Propulsion - Interdiction Nullifier
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.ship.boostItemAttr("warpCapacitorNeed", src.getModifiedItemAttr("subsystemBonusGallentePropulsion"),
-                           skill="Gallente Propulsion Systems")
diff --git a/eos/effects/effect4278.py b/eos/effects/effect4278.py
deleted file mode 100644
index 043a3d962..000000000
--- a/eos/effects/effect4278.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# subsystemBonusGallentePropulsion2WarpSpeed
-#
-# Used by:
-# Subsystem: Proteus Propulsion - Interdiction Nullifier
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.ship.boostItemAttr("warpSpeedMultiplier", src.getModifiedItemAttr("subsystemBonusGallentePropulsion2"),
-                           skill="Gallente Propulsion Systems")
diff --git a/eos/effects/effect4280.py b/eos/effects/effect4280.py
deleted file mode 100644
index ce8ba7370..000000000
--- a/eos/effects/effect4280.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# systemAgility
-#
-# Used by:
-# Celestials named like: Black Hole Effect Beacon Class (6 of 6)
-runTime = "early"
-type = ("projected", "passive")
-
-
-def handler(fit, beacon, context):
-    fit.ship.multiplyItemAttr("agility", beacon.getModifiedItemAttr("agilityMultiplier"), stackingPenalties=True)
diff --git a/eos/effects/effect4282.py b/eos/effects/effect4282.py
deleted file mode 100644
index 23b44db1e..000000000
--- a/eos/effects/effect4282.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# subsystemBonusGallenteOffensive2HybridWeaponDamageMultiplier
-#
-# Used by:
-# Subsystem: Proteus Offensive - Hybrid Encoding Platform
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Hybrid Turret"),
-                                  "damageMultiplier", module.getModifiedItemAttr("subsystemBonusGallenteOffensive2"),
-                                  skill="Gallente Offensive Systems")
diff --git a/eos/effects/effect4283.py b/eos/effects/effect4283.py
deleted file mode 100644
index 830e6ae1b..000000000
--- a/eos/effects/effect4283.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# subsystemBonusCaldariOffensive2HybridWeaponDamageMultiplier
-#
-# Used by:
-# Subsystem: Tengu Offensive - Magnetic Infusion Basin
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Hybrid Turret"),
-                                  "damageMultiplier", module.getModifiedItemAttr("subsystemBonusCaldariOffensive2"),
-                                  skill="Caldari Offensive Systems")
diff --git a/eos/effects/effect4286.py b/eos/effects/effect4286.py
deleted file mode 100644
index 39804e030..000000000
--- a/eos/effects/effect4286.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# subsystemBonusAmarrOffensive2RemoteArmorRepairCapUse
-#
-# Used by:
-# Subsystem: Legion Offensive - Support Processor
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Remote Armor Repair Systems"), "capacitorNeed",
-                                  src.getModifiedItemAttr("subsystemBonusAmarrOffensive2"), skill="Amarr Offensive Systems")
diff --git a/eos/effects/effect4288.py b/eos/effects/effect4288.py
deleted file mode 100644
index 4fbccf015..000000000
--- a/eos/effects/effect4288.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# subsystemBonusGallenteOffensive2RemoteArmorRepairCapUse
-#
-# Used by:
-# Subsystem: Proteus Offensive - Support Processor
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Remote Armor Repair Systems"), "capacitorNeed",
-                                  src.getModifiedItemAttr("subsystemBonusGallenteOffensive2"), skill="Gallente Offensive Systems")
diff --git a/eos/effects/effect4290.py b/eos/effects/effect4290.py
deleted file mode 100644
index 451744d1a..000000000
--- a/eos/effects/effect4290.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# subsystemBonusMinmatarOffensive2RemoteRepCapUse
-#
-# Used by:
-# Subsystem: Loki Offensive - Support Processor
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Emission Systems") or mod.item.requiresSkill("Remote Armor Repair Systems"),
-                                  "capacitorNeed", src.getModifiedItemAttr("subsystemBonusMinmatarOffensive2"),
-                                  skill="Minmatar Offensive Systems")
diff --git a/eos/effects/effect4292.py b/eos/effects/effect4292.py
deleted file mode 100644
index 9d327606c..000000000
--- a/eos/effects/effect4292.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# subsystemBonusCaldariOffensive2RemoteShieldBoosterCapUse
-#
-# Used by:
-# Subsystem: Tengu Offensive - Support Processor
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Emission Systems"),
-                                  "capacitorNeed", src.getModifiedItemAttr("subsystemBonusCaldariOffensive2"),
-                                  skill="Caldari Offensive Systems")
diff --git a/eos/effects/effect4321.py b/eos/effects/effect4321.py
deleted file mode 100644
index afa67dbaa..000000000
--- a/eos/effects/effect4321.py
+++ /dev/null
@@ -1,18 +0,0 @@
-# subsystemBonusCaldariCore2ECMStrengthRange
-#
-# Used by:
-# Subsystem: Tengu Core - Obfuscation Manifold
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "ECM", "scanLadarStrengthBonus",
-                                  src.getModifiedItemAttr("subsystemBonusCaldariCore2"), skill="Caldari Core Systems")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "ECM", "scanRadarStrengthBonus",
-                                  src.getModifiedItemAttr("subsystemBonusCaldariCore2"), skill="Caldari Core Systems")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "ECM", "maxRange",
-                                  src.getModifiedItemAttr("subsystemBonusCaldariCore2"), skill="Caldari Core Systems")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "ECM", "scanGravimetricStrengthBonus",
-                                  src.getModifiedItemAttr("subsystemBonusCaldariCore2"), skill="Caldari Core Systems")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "ECM", "scanMagnetometricStrengthBonus",
-                                  src.getModifiedItemAttr("subsystemBonusCaldariCore2"), skill="Caldari Core Systems")
diff --git a/eos/effects/effect4327.py b/eos/effects/effect4327.py
deleted file mode 100644
index 26618a998..000000000
--- a/eos/effects/effect4327.py
+++ /dev/null
@@ -1,16 +0,0 @@
-# subsystemBonusAmarrOffensive3DroneDamageHP
-#
-# Used by:
-# Subsystem: Legion Offensive - Assault Optimization
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill("Drones"),
-                                 "hp", src.getModifiedItemAttr("subsystemBonusAmarrOffensive3"), skill="Amarr Offensive Systems")
-    fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill("Drones"),
-                                 "armorHP", src.getModifiedItemAttr("subsystemBonusAmarrOffensive3"), skill="Amarr Offensive Systems")
-    fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill("Drones"),
-                                 "shieldCapacity", src.getModifiedItemAttr("subsystemBonusAmarrOffensive3"), skill="Amarr Offensive Systems")
-    fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill("Drones"),
-                                 "damageMultiplier", src.getModifiedItemAttr("subsystemBonusAmarrOffensive3"), skill="Amarr Offensive Systems")
diff --git a/eos/effects/effect4330.py b/eos/effects/effect4330.py
deleted file mode 100644
index 7d001910c..000000000
--- a/eos/effects/effect4330.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# subsystemBonusAmarrOffensive3EnergyWeaponMaxRange
-#
-# Used by:
-# Subsystem: Legion Offensive - Liquid Crystal Magnifiers
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Energy Turret"),
-                                  "maxRange", module.getModifiedItemAttr("subsystemBonusAmarrOffensive3"),
-                                  skill="Amarr Offensive Systems")
diff --git a/eos/effects/effect4331.py b/eos/effects/effect4331.py
deleted file mode 100644
index dbe5e88db..000000000
--- a/eos/effects/effect4331.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# subsystemBonusCaldariOffensive3HMLHAMVelocity
-#
-# Used by:
-# Subsystem: Tengu Offensive - Accelerated Ejection Bay
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Missiles") or mod.charge.requiresSkill("Heavy Assault Missiles"),
-                                    "maxVelocity", src.getModifiedItemAttr("subsystemBonusCaldariOffensive3"),
-                                    skill="Caldari Offensive Systems")
diff --git a/eos/effects/effect4342.py b/eos/effects/effect4342.py
deleted file mode 100644
index 4417e41cb..000000000
--- a/eos/effects/effect4342.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# subsystemBonusMinmatarCore2MaxTargetingRange
-#
-# Used by:
-# Subsystem: Loki Core - Dissolution Sequencer
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.ship.boostItemAttr("maxTargetRange", src.getModifiedItemAttr("subsystemBonusMinmatarCore2"),
-                           skill="Minmatar Core Systems")
diff --git a/eos/effects/effect4343.py b/eos/effects/effect4343.py
deleted file mode 100644
index 855c5f401..000000000
--- a/eos/effects/effect4343.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# subsystemBonusAmarrCore2MaxTargetingRange
-#
-# Used by:
-# Subsystem: Legion Core - Dissolution Sequencer
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.ship.boostItemAttr("maxTargetRange", src.getModifiedItemAttr("subsystemBonusAmarrCore2"),
-                           skill="Amarr Core Systems")
diff --git a/eos/effects/effect4347.py b/eos/effects/effect4347.py
deleted file mode 100644
index 75e20dfca..000000000
--- a/eos/effects/effect4347.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# subsystemBonusGallenteOffensive3TurretTracking
-#
-# Used by:
-# Subsystem: Proteus Offensive - Drone Synthesis Projector
-# Subsystem: Proteus Offensive - Hybrid Encoding Platform
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Hybrid Turret"),
-                                  "trackingSpeed", module.getModifiedItemAttr("subsystemBonusGallenteOffensive3"),
-                                  skill="Gallente Offensive Systems")
diff --git a/eos/effects/effect4351.py b/eos/effects/effect4351.py
deleted file mode 100644
index 86f3f5476..000000000
--- a/eos/effects/effect4351.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# subsystemBonusMinmatarOffensive3TurretTracking
-#
-# Used by:
-# Subsystem: Loki Offensive - Projectile Scoping Array
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Projectile Turret"),
-                                  "trackingSpeed", module.getModifiedItemAttr("subsystemBonusMinmatarOffensive3"),
-                                  skill="Minmatar Offensive Systems")
diff --git a/eos/effects/effect4358.py b/eos/effects/effect4358.py
deleted file mode 100644
index 5300152bc..000000000
--- a/eos/effects/effect4358.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# ecmRangeBonusModuleEffect
-#
-# Used by:
-# Modules from group: ECM Stabilizer (6 of 6)
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "ECM",
-                                  "maxRange", module.getModifiedItemAttr("ecmRangeBonus"),
-                                  stackingPenalties=True)
diff --git a/eos/effects/effect4360.py b/eos/effects/effect4360.py
deleted file mode 100644
index 7eb49ec46..000000000
--- a/eos/effects/effect4360.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# subsystemBonusAmarrOffensiveMissileLauncherROF
-#
-# Used by:
-# Subsystem: Legion Offensive - Assault Optimization
-type = "passive"
-
-
-def handler(fit, src, context):
-    groups = ("Missile Launcher Heavy", "Missile Launcher Rapid Light", "Missile Launcher Heavy Assault")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name in groups,
-                                  "speed", src.getModifiedItemAttr("subsystemBonusAmarrOffensive"), skill="Amarr Offensive Systems")
diff --git a/eos/effects/effect4362.py b/eos/effects/effect4362.py
deleted file mode 100644
index ac51a389f..000000000
--- a/eos/effects/effect4362.py
+++ /dev/null
@@ -1,16 +0,0 @@
-# subsystemBonusAmarrOffensive2MissileDamage
-#
-# Used by:
-# Subsystem: Legion Offensive - Assault Optimization
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Missile Launcher Operation"),
-                                    "explosiveDamage", src.getModifiedItemAttr("subsystemBonusAmarrOffensive2"), skill="Amarr Offensive Systems")
-    fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Missile Launcher Operation"),
-                                    "kineticDamage", src.getModifiedItemAttr("subsystemBonusAmarrOffensive2"), skill="Amarr Offensive Systems")
-    fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Missile Launcher Operation"),
-                                    "emDamage", src.getModifiedItemAttr("subsystemBonusAmarrOffensive2"), skill="Amarr Offensive Systems")
-    fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Missile Launcher Operation"),
-                                    "thermalDamage", src.getModifiedItemAttr("subsystemBonusAmarrOffensive2"), skill="Amarr Offensive Systems")
diff --git a/eos/effects/effect4366.py b/eos/effects/effect4366.py
deleted file mode 100644
index 858d70ab9..000000000
--- a/eos/effects/effect4366.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusMediumHybridDmgCC2
-#
-# Used by:
-# Ship: Falcon
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Hybrid Turret"),
-                                  "damageMultiplier", ship.getModifiedItemAttr("shipBonusCC2"), skill="Caldari Cruiser")
diff --git a/eos/effects/effect4369.py b/eos/effects/effect4369.py
deleted file mode 100644
index cd29dad70..000000000
--- a/eos/effects/effect4369.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# subsystemBonusWarpBubbleImmune
-#
-# Used by:
-# Subsystems named like: Propulsion Interdiction Nullifier (4 of 4)
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.ship.forceItemAttr("warpBubbleImmune", module.getModifiedItemAttr("warpBubbleImmuneModifier"))
diff --git a/eos/effects/effect4370.py b/eos/effects/effect4370.py
deleted file mode 100644
index d046a9c67..000000000
--- a/eos/effects/effect4370.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# caldariShipEwFalloffRangeCC2
-#
-# Used by:
-# Ship: Blackbird
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "ECM",
-                                  "falloffEffectiveness", ship.getModifiedItemAttr("shipBonusCC2"),
-                                  skill="Caldari Cruiser")
diff --git a/eos/effects/effect4372.py b/eos/effects/effect4372.py
deleted file mode 100644
index 6e17fdbe1..000000000
--- a/eos/effects/effect4372.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# caldariShipEwFalloffRangeCB3
-#
-# Used by:
-# Ship: Scorpion
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "ECM",
-                                  "falloffEffectiveness", ship.getModifiedItemAttr("shipBonusCB3"),
-                                  skill="Caldari Battleship")
diff --git a/eos/effects/effect4373.py b/eos/effects/effect4373.py
deleted file mode 100644
index 8133970bc..000000000
--- a/eos/effects/effect4373.py
+++ /dev/null
@@ -1,40 +0,0 @@
-# subSystemBonusAmarrOffensiveCommandBursts
-#
-# Used by:
-# Subsystem: Legion Offensive - Support Processor
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Skirmish Command"),
-                                  "buffDuration", src.getModifiedItemAttr("subsystemBonusAmarrOffensive"), skill="Amarr Offensive Systems")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Skirmish Command"),
-                                  "warfareBuff2Value", src.getModifiedItemAttr("subsystemBonusAmarrOffensive"), skill="Amarr Offensive Systems")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Skirmish Command"),
-                                  "warfareBuff3Value", src.getModifiedItemAttr("subsystemBonusAmarrOffensive"), skill="Amarr Offensive Systems")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Skirmish Command"),
-                                  "warfareBuff1Value", src.getModifiedItemAttr("subsystemBonusAmarrOffensive"), skill="Amarr Offensive Systems")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Skirmish Command"),
-                                  "warfareBuff4Value", src.getModifiedItemAttr("subsystemBonusAmarrOffensive"), skill="Amarr Offensive Systems")
-
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Armored Command"),
-                                  "warfareBuff3Value", src.getModifiedItemAttr("subsystemBonusAmarrOffensive"), skill="Amarr Offensive Systems")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Armored Command"),
-                                  "warfareBuff1Value", src.getModifiedItemAttr("subsystemBonusAmarrOffensive"), skill="Amarr Offensive Systems")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Armored Command"),
-                                  "warfareBuff4Value", src.getModifiedItemAttr("subsystemBonusAmarrOffensive"), skill="Amarr Offensive Systems")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Armored Command"),
-                                  "warfareBuff2Value", src.getModifiedItemAttr("subsystemBonusAmarrOffensive"), skill="Amarr Offensive Systems")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Armored Command"),
-                                  "buffDuration", src.getModifiedItemAttr("subsystemBonusAmarrOffensive"), skill="Amarr Offensive Systems")
-
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Information Command"),
-                                  "warfareBuff3Value", src.getModifiedItemAttr("subsystemBonusAmarrOffensive"), skill="Amarr Offensive Systems")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Information Command"),
-                                  "warfareBuff1Value", src.getModifiedItemAttr("subsystemBonusAmarrOffensive"), skill="Amarr Offensive Systems")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Information Command"),
-                                  "warfareBuff2Value", src.getModifiedItemAttr("subsystemBonusAmarrOffensive"), skill="Amarr Offensive Systems")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Information Command"),
-                                  "buffDuration", src.getModifiedItemAttr("subsystemBonusAmarrOffensive"), skill="Amarr Offensive Systems")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Information Command"),
-                                  "warfareBuff4Value", src.getModifiedItemAttr("subsystemBonusAmarrOffensive"), skill="Amarr Offensive Systems")
diff --git a/eos/effects/effect4377.py b/eos/effects/effect4377.py
deleted file mode 100644
index a52c4046d..000000000
--- a/eos/effects/effect4377.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipBonusTorpedoVelocityGF2
-#
-# Used by:
-# Ship: Nemesis
-# Ship: Virtuoso
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Torpedoes"),
-                                    "maxVelocity", ship.getModifiedItemAttr("shipBonusGF2"), skill="Gallente Frigate")
diff --git a/eos/effects/effect4378.py b/eos/effects/effect4378.py
deleted file mode 100644
index cf5a4385a..000000000
--- a/eos/effects/effect4378.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusTorpedoVelocityMF2
-#
-# Used by:
-# Ship: Hound
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Torpedoes"),
-                                    "maxVelocity", ship.getModifiedItemAttr("shipBonusMF2"), skill="Minmatar Frigate")
diff --git a/eos/effects/effect4379.py b/eos/effects/effect4379.py
deleted file mode 100644
index 0109217d5..000000000
--- a/eos/effects/effect4379.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusTorpedoVelocity2AF
-#
-# Used by:
-# Ship: Purifier
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Torpedoes"),
-                                    "maxVelocity", ship.getModifiedItemAttr("shipBonus2AF"), skill="Amarr Frigate")
diff --git a/eos/effects/effect4380.py b/eos/effects/effect4380.py
deleted file mode 100644
index 5c779651b..000000000
--- a/eos/effects/effect4380.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusTorpedoVelocityCF2
-#
-# Used by:
-# Ship: Manticore
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Torpedoes"),
-                                    "maxVelocity", ship.getModifiedItemAttr("shipBonusCF2"), skill="Caldari Frigate")
diff --git a/eos/effects/effect4384.py b/eos/effects/effect4384.py
deleted file mode 100644
index 8f73c136a..000000000
--- a/eos/effects/effect4384.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# eliteReconBonusHeavyMissileVelocity
-#
-# Used by:
-# Ship: Rook
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Missiles"),
-                                    "maxVelocity", ship.getModifiedItemAttr("eliteBonusReconShip1"),
-                                    skill="Recon Ships")
diff --git a/eos/effects/effect4385.py b/eos/effects/effect4385.py
deleted file mode 100644
index fc223a167..000000000
--- a/eos/effects/effect4385.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# eliteReconBonusHeavyAssaultMissileVelocity
-#
-# Used by:
-# Ship: Rook
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Assault Missiles"),
-                                    "maxVelocity", ship.getModifiedItemAttr("eliteBonusReconShip1"),
-                                    skill="Recon Ships")
diff --git a/eos/effects/effect4393.py b/eos/effects/effect4393.py
deleted file mode 100644
index 358023fee..000000000
--- a/eos/effects/effect4393.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# shipBonusEliteCover2TorpedoThermalDamage
-#
-# Used by:
-# Ship: Nemesis
-# Ship: Virtuoso
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Torpedoes"),
-                                    "thermalDamage", ship.getModifiedItemAttr("eliteBonusCovertOps2"),
-                                    skill="Covert Ops")
diff --git a/eos/effects/effect4394.py b/eos/effects/effect4394.py
deleted file mode 100644
index 89697d829..000000000
--- a/eos/effects/effect4394.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusEliteCover2TorpedoEMDamage
-#
-# Used by:
-# Ship: Purifier
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Torpedoes"),
-                                    "emDamage", ship.getModifiedItemAttr("eliteBonusCovertOps2"), skill="Covert Ops")
diff --git a/eos/effects/effect4395.py b/eos/effects/effect4395.py
deleted file mode 100644
index 779189de1..000000000
--- a/eos/effects/effect4395.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# shipBonusEliteCover2TorpedoExplosiveDamage
-#
-# Used by:
-# Ship: Hound
-# Ship: Virtuoso
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Torpedoes"),
-                                    "explosiveDamage", ship.getModifiedItemAttr("eliteBonusCovertOps2"),
-                                    skill="Covert Ops")
diff --git a/eos/effects/effect4396.py b/eos/effects/effect4396.py
deleted file mode 100644
index 5ed5f7a69..000000000
--- a/eos/effects/effect4396.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipBonusEliteCover2TorpedoKineticDamage
-#
-# Used by:
-# Ship: Manticore
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Torpedoes"),
-                                    "kineticDamage", ship.getModifiedItemAttr("eliteBonusCovertOps2"),
-                                    skill="Covert Ops")
diff --git a/eos/effects/effect4397.py b/eos/effects/effect4397.py
deleted file mode 100644
index d7cd8a67e..000000000
--- a/eos/effects/effect4397.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusGFTorpedoExplosionVelocity
-#
-# Used by:
-# Ship: Nemesis
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Torpedoes"),
-                                    "aoeVelocity", ship.getModifiedItemAttr("shipBonusGF"), skill="Gallente Frigate")
diff --git a/eos/effects/effect4398.py b/eos/effects/effect4398.py
deleted file mode 100644
index c546c4716..000000000
--- a/eos/effects/effect4398.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipBonusMF1TorpedoExplosionVelocity
-#
-# Used by:
-# Ship: Hound
-# Ship: Virtuoso
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Torpedoes"),
-                                    "aoeVelocity", ship.getModifiedItemAttr("shipBonusMF"), skill="Minmatar Frigate")
diff --git a/eos/effects/effect4399.py b/eos/effects/effect4399.py
deleted file mode 100644
index 41a8b9db8..000000000
--- a/eos/effects/effect4399.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusCF1TorpedoExplosionVelocity
-#
-# Used by:
-# Ship: Manticore
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Torpedoes"),
-                                    "aoeVelocity", ship.getModifiedItemAttr("shipBonusCF"), skill="Caldari Frigate")
diff --git a/eos/effects/effect4400.py b/eos/effects/effect4400.py
deleted file mode 100644
index d3be58566..000000000
--- a/eos/effects/effect4400.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusAF1TorpedoExplosionVelocity
-#
-# Used by:
-# Ship: Purifier
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Torpedoes"),
-                                    "aoeVelocity", ship.getModifiedItemAttr("shipBonusAF"), skill="Amarr Frigate")
diff --git a/eos/effects/effect4413.py b/eos/effects/effect4413.py
deleted file mode 100644
index 7fe141ec6..000000000
--- a/eos/effects/effect4413.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusGF1TorpedoFlightTime
-#
-# Used by:
-# Ship: Nemesis
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Torpedoes"),
-                                    "explosionDelay", ship.getModifiedItemAttr("shipBonusGF"), skill="Gallente Frigate")
diff --git a/eos/effects/effect4415.py b/eos/effects/effect4415.py
deleted file mode 100644
index 539d8a205..000000000
--- a/eos/effects/effect4415.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipBonusMF1TorpedoFlightTime
-#
-# Used by:
-# Ship: Hound
-# Ship: Virtuoso
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Torpedoes"),
-                                    "explosionDelay", ship.getModifiedItemAttr("shipBonusMF"), skill="Minmatar Frigate")
diff --git a/eos/effects/effect4416.py b/eos/effects/effect4416.py
deleted file mode 100644
index 2f00bd515..000000000
--- a/eos/effects/effect4416.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusCF1TorpedoFlightTime
-#
-# Used by:
-# Ship: Manticore
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Torpedoes"),
-                                    "explosionDelay", ship.getModifiedItemAttr("shipBonusCF"), skill="Caldari Frigate")
diff --git a/eos/effects/effect4417.py b/eos/effects/effect4417.py
deleted file mode 100644
index 09b679710..000000000
--- a/eos/effects/effect4417.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusAF1TorpedoFlightTime
-#
-# Used by:
-# Ship: Purifier
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Torpedoes"),
-                                    "explosionDelay", ship.getModifiedItemAttr("shipBonusAF"), skill="Amarr Frigate")
diff --git a/eos/effects/effect4451.py b/eos/effects/effect4451.py
deleted file mode 100644
index 94069c92f..000000000
--- a/eos/effects/effect4451.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# ScanRadarStrengthModifierEffect
-#
-# Used by:
-# Implants named like: Low grade Grail (5 of 6)
-type = "passive"
-
-
-def handler(fit, implant, context):
-    fit.ship.increaseItemAttr("scanRadarStrength", implant.getModifiedItemAttr("scanRadarStrengthModifier"))
diff --git a/eos/effects/effect4452.py b/eos/effects/effect4452.py
deleted file mode 100644
index 43c9aeafd..000000000
--- a/eos/effects/effect4452.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# ScanLadarStrengthModifierEffect
-#
-# Used by:
-# Implants named like: Low grade Jackal (5 of 6)
-type = "passive"
-
-
-def handler(fit, implant, context):
-    fit.ship.increaseItemAttr("scanLadarStrength", implant.getModifiedItemAttr("scanLadarStrengthModifier"))
diff --git a/eos/effects/effect4453.py b/eos/effects/effect4453.py
deleted file mode 100644
index 64388c877..000000000
--- a/eos/effects/effect4453.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# ScanGravimetricStrengthModifierEffect
-#
-# Used by:
-# Implants named like: Low grade Talon (5 of 6)
-type = "passive"
-
-
-def handler(fit, implant, context):
-    fit.ship.increaseItemAttr("scanGravimetricStrength", implant.getModifiedItemAttr("scanGravimetricStrengthModifier"))
diff --git a/eos/effects/effect4454.py b/eos/effects/effect4454.py
deleted file mode 100644
index a4c66463f..000000000
--- a/eos/effects/effect4454.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# ScanMagnetometricStrengthModifierEffect
-#
-# Used by:
-# Implants named like: Low grade Spur (5 of 6)
-type = "passive"
-
-
-def handler(fit, implant, context):
-    fit.ship.increaseItemAttr("scanMagnetometricStrength",
-                              implant.getModifiedItemAttr("scanMagnetometricStrengthModifier"))
diff --git a/eos/effects/effect4456.py b/eos/effects/effect4456.py
deleted file mode 100644
index f73c4d6af..000000000
--- a/eos/effects/effect4456.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# federationsetbonus3
-#
-# Used by:
-# Implants named like: High grade Spur (6 of 6)
-type = "passive"
-runTime = "early"
-
-
-def handler(fit, implant, context):
-    fit.appliedImplants.filteredItemMultiply(lambda target: target.item.requiresSkill("Cybernetics"),
-                                             "scanMagnetometricStrengthPercent",
-                                             implant.getModifiedItemAttr("implantSetFederationNavy"))
diff --git a/eos/effects/effect4457.py b/eos/effects/effect4457.py
deleted file mode 100644
index bcd755f7f..000000000
--- a/eos/effects/effect4457.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# imperialsetbonus3
-#
-# Used by:
-# Implants named like: High grade Grail (6 of 6)
-type = "passive"
-runTime = "early"
-
-
-def handler(fit, implant, context):
-    fit.appliedImplants.filteredItemMultiply(lambda target: target.item.requiresSkill("Cybernetics"),
-                                             "scanRadarStrengthPercent",
-                                             implant.getModifiedItemAttr("implantSetImperialNavy"))
diff --git a/eos/effects/effect4458.py b/eos/effects/effect4458.py
deleted file mode 100644
index c4275fa9b..000000000
--- a/eos/effects/effect4458.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# republicsetbonus3
-#
-# Used by:
-# Implants named like: High grade Jackal (6 of 6)
-runTime = "early"
-type = "passive"
-
-
-def handler(fit, implant, context):
-    fit.appliedImplants.filteredItemMultiply(lambda target: target.item.requiresSkill("Cybernetics"),
-                                             "scanLadarStrengthPercent",
-                                             implant.getModifiedItemAttr("implantSetRepublicFleet"))
diff --git a/eos/effects/effect4459.py b/eos/effects/effect4459.py
deleted file mode 100644
index ee4d55f4b..000000000
--- a/eos/effects/effect4459.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# caldarisetbonus3
-#
-# Used by:
-# Implants named like: High grade Talon (6 of 6)
-runTime = "early"
-type = "passive"
-
-
-def handler(fit, implant, context):
-    fit.appliedImplants.filteredItemMultiply(lambda target: target.item.requiresSkill("Cybernetics"),
-                                             "scanGravimetricStrengthPercent",
-                                             implant.getModifiedItemAttr("implantSetCaldariNavy"))
diff --git a/eos/effects/effect446.py b/eos/effects/effect446.py
deleted file mode 100644
index d9209c608..000000000
--- a/eos/effects/effect446.py
+++ /dev/null
@@ -1,14 +0,0 @@
-# shieldManagementShieldCapacityBonusPostPercentCapacityLocationShipGroupShield
-#
-# Used by:
-# Implants named like: Zainou 'Gnome' Shield Management SM (6 of 6)
-# Modules named like: Core Defense Field Extender (8 of 8)
-# Implant: Genolution Core Augmentation CA-3
-# Implant: Sansha Modified 'Gnome' Implant
-# Skill: Shield Management
-type = "passive"
-
-
-def handler(fit, container, context):
-    level = container.level if "skill" in context else 1
-    fit.ship.boostItemAttr("shieldCapacity", container.getModifiedItemAttr("shieldCapacityBonus") * level)
diff --git a/eos/effects/effect4460.py b/eos/effects/effect4460.py
deleted file mode 100644
index fc14ae72d..000000000
--- a/eos/effects/effect4460.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# imperialsetLGbonus
-#
-# Used by:
-# Implants named like: Low grade Grail (6 of 6)
-type = "passive"
-runTime = "early"
-
-
-def handler(fit, implant, context):
-    fit.appliedImplants.filteredItemMultiply(lambda target: target.item.requiresSkill("Cybernetics"),
-                                             "scanRadarStrengthModifier",
-                                             implant.getModifiedItemAttr("implantSetLGImperialNavy"))
diff --git a/eos/effects/effect4461.py b/eos/effects/effect4461.py
deleted file mode 100644
index a393582ba..000000000
--- a/eos/effects/effect4461.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# federationsetLGbonus
-#
-# Used by:
-# Implants named like: Low grade Spur (6 of 6)
-type = "passive"
-runTime = "early"
-
-
-def handler(fit, implant, context):
-    fit.appliedImplants.filteredItemMultiply(lambda target: target.item.requiresSkill("Cybernetics"),
-                                             "scanMagnetometricStrengthModifier",
-                                             implant.getModifiedItemAttr("implantSetLGFederationNavy"))
diff --git a/eos/effects/effect4462.py b/eos/effects/effect4462.py
deleted file mode 100644
index ed684aa94..000000000
--- a/eos/effects/effect4462.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# caldarisetLGbonus
-#
-# Used by:
-# Implants named like: Low grade Talon (6 of 6)
-runTime = "early"
-type = "passive"
-
-
-def handler(fit, implant, context):
-    fit.appliedImplants.filteredItemMultiply(lambda target: target.item.requiresSkill("Cybernetics"),
-                                             "scanGravimetricStrengthModifier",
-                                             implant.getModifiedItemAttr("implantSetLGCaldariNavy"))
diff --git a/eos/effects/effect4463.py b/eos/effects/effect4463.py
deleted file mode 100644
index c853ebed7..000000000
--- a/eos/effects/effect4463.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# republicsetLGbonus
-#
-# Used by:
-# Implants named like: Low grade Jackal (6 of 6)
-runTime = "early"
-type = "passive"
-
-
-def handler(fit, implant, context):
-    fit.appliedImplants.filteredItemMultiply(lambda target: target.item.requiresSkill("Cybernetics"),
-                                             "scanLadarStrengthModifier",
-                                             implant.getModifiedItemAttr("implantSetLGRepublicFleet"))
diff --git a/eos/effects/effect4464.py b/eos/effects/effect4464.py
deleted file mode 100644
index d4eb0ef4a..000000000
--- a/eos/effects/effect4464.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipProjectileRofMF
-#
-# Used by:
-# Ship: Claw
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Projectile Turret"), "speed",
-                                  src.getModifiedItemAttr("shipBonusMF"), stackingPenalties=True, skill="Minmatar Frigate")
diff --git a/eos/effects/effect4471.py b/eos/effects/effect4471.py
deleted file mode 100644
index 410425e26..000000000
--- a/eos/effects/effect4471.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# shipBonusStasisMF2
-#
-# Used by:
-# Ship: Caedes
-# Ship: Cruor
-# Ship: Freki
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Stasis Web",
-                                  "maxRange", ship.getModifiedItemAttr("shipBonusMF2"), skill="Minmatar Frigate")
diff --git a/eos/effects/effect4472.py b/eos/effects/effect4472.py
deleted file mode 100644
index 4a236b998..000000000
--- a/eos/effects/effect4472.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipProjectileDmgMC
-#
-# Used by:
-# Ship: Mimir
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Projectile Turret"),
-                                  "damageMultiplier", ship.getModifiedItemAttr("shipBonusMC"), skill="Minmatar Cruiser")
diff --git a/eos/effects/effect4473.py b/eos/effects/effect4473.py
deleted file mode 100644
index 7b2c31830..000000000
--- a/eos/effects/effect4473.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipVelocityBonusATC1
-#
-# Used by:
-# Ship: Adrestia
-# Ship: Mimir
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.ship.boostItemAttr("maxVelocity", ship.getModifiedItemAttr("shipBonusATC1"))
diff --git a/eos/effects/effect4474.py b/eos/effects/effect4474.py
deleted file mode 100644
index 0cc9e309a..000000000
--- a/eos/effects/effect4474.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipMTMaxRangeBonusATC
-#
-# Used by:
-# Ship: Mimir
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Projectile Turret"),
-                                  "maxRange", ship.getModifiedItemAttr("shipBonusATC2"))
diff --git a/eos/effects/effect4475.py b/eos/effects/effect4475.py
deleted file mode 100644
index 199209b3a..000000000
--- a/eos/effects/effect4475.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipMTFalloffBonusATC
-#
-# Used by:
-# Ship: Mimir
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Projectile Turret"),
-                                  "falloff", ship.getModifiedItemAttr("shipBonusATC2"))
diff --git a/eos/effects/effect4476.py b/eos/effects/effect4476.py
deleted file mode 100644
index 737efa570..000000000
--- a/eos/effects/effect4476.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipMTFalloffBonusATF
-#
-# Used by:
-# Ship: Freki
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Projectile Turret"),
-                                  "falloff", ship.getModifiedItemAttr("shipBonusATF2"))
diff --git a/eos/effects/effect4477.py b/eos/effects/effect4477.py
deleted file mode 100644
index e59725ea0..000000000
--- a/eos/effects/effect4477.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipMTMaxRangeBonusATF
-#
-# Used by:
-# Ship: Freki
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Projectile Turret"),
-                                  "maxRange", ship.getModifiedItemAttr("shipBonusATF2"))
diff --git a/eos/effects/effect4478.py b/eos/effects/effect4478.py
deleted file mode 100644
index 2b3561611..000000000
--- a/eos/effects/effect4478.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusAfterburnerCapNeedATF
-#
-# Used by:
-# Ship: Freki
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Propulsion Module",
-                                  "capacitorNeed", ship.getModifiedItemAttr("shipBonusATF1"))
diff --git a/eos/effects/effect4479.py b/eos/effects/effect4479.py
deleted file mode 100644
index 4fc7124c5..000000000
--- a/eos/effects/effect4479.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipBonusSurveyProbeExplosionDelaySkillSurveyCovertOps3
-#
-# Used by:
-# Ships from group: Covert Ops (5 of 8)
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.group.name == "Survey Probe",
-                                    "explosionDelay", ship.getModifiedItemAttr("eliteBonusCovertOps3"),
-                                    skill="Covert Ops")
diff --git a/eos/effects/effect4482.py b/eos/effects/effect4482.py
deleted file mode 100644
index 99b829ab7..000000000
--- a/eos/effects/effect4482.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipETOptimalRange2AF
-#
-# Used by:
-# Ship: Imperial Navy Slicer
-# Ship: Pacifier
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Energy Turret"),
-                                  "maxRange", ship.getModifiedItemAttr("shipBonus2AF"), skill="Amarr Frigate")
diff --git a/eos/effects/effect4484.py b/eos/effects/effect4484.py
deleted file mode 100644
index 18a7dfc80..000000000
--- a/eos/effects/effect4484.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipPTurretFalloffBonusGB
-#
-# Used by:
-# Ship: Machariel
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Large Projectile Turret"),
-                                  "falloff", ship.getModifiedItemAttr("shipBonusGB"), skill="Gallente Battleship")
diff --git a/eos/effects/effect4485.py b/eos/effects/effect4485.py
deleted file mode 100644
index b0d4a1f79..000000000
--- a/eos/effects/effect4485.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusStasisWebSpeedFactorMB
-#
-# Used by:
-# Ship: Vindicator
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Stasis Web",
-                                  "speedFactor", ship.getModifiedItemAttr("shipBonusMB"), skill="Minmatar Battleship")
diff --git a/eos/effects/effect4489.py b/eos/effects/effect4489.py
deleted file mode 100644
index dfc06475e..000000000
--- a/eos/effects/effect4489.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# superWeaponAmarr
-#
-# Used by:
-# Module: 'Judgment' Electromagnetic Doomsday
-type = 'active'
-
-
-def handler(fit, module, context):
-    pass
diff --git a/eos/effects/effect4490.py b/eos/effects/effect4490.py
deleted file mode 100644
index a7ea155e2..000000000
--- a/eos/effects/effect4490.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# superWeaponCaldari
-#
-# Used by:
-# Module: 'Oblivion' Kinetic Doomsday
-type = 'active'
-
-
-def handler(fit, module, context):
-    pass
diff --git a/eos/effects/effect4491.py b/eos/effects/effect4491.py
deleted file mode 100644
index 21d330213..000000000
--- a/eos/effects/effect4491.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# superWeaponGallente
-#
-# Used by:
-# Module: 'Aurora Ominae' Thermal Doomsday
-type = 'active'
-
-
-def handler(fit, module, context):
-    pass
diff --git a/eos/effects/effect4492.py b/eos/effects/effect4492.py
deleted file mode 100644
index 25b0b57ef..000000000
--- a/eos/effects/effect4492.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# superWeaponMinmatar
-#
-# Used by:
-# Module: 'Gjallarhorn' Explosive Doomsday
-type = 'active'
-
-
-def handler(fit, module, context):
-    pass
diff --git a/eos/effects/effect4510.py b/eos/effects/effect4510.py
deleted file mode 100644
index 03a6c3198..000000000
--- a/eos/effects/effect4510.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipStasisWebStrengthBonusMC2
-#
-# Used by:
-# Ship: Victor
-# Ship: Vigilant
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Stasis Web",
-                                  "speedFactor", ship.getModifiedItemAttr("shipBonusMC2"), skill="Minmatar Cruiser")
diff --git a/eos/effects/effect4512.py b/eos/effects/effect4512.py
deleted file mode 100644
index ba5f3f80d..000000000
--- a/eos/effects/effect4512.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipPTurretFalloffBonusGC
-#
-# Used by:
-# Ship: Cynabal
-# Ship: Moracha
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Projectile Turret"),
-                                  "falloff", ship.getModifiedItemAttr("shipBonusGC"), skill="Gallente Cruiser")
diff --git a/eos/effects/effect4513.py b/eos/effects/effect4513.py
deleted file mode 100644
index 09822f202..000000000
--- a/eos/effects/effect4513.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipStasisWebStrengthBonusMF2
-#
-# Used by:
-# Ship: Daredevil
-# Ship: Virtuoso
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Stasis Web",
-                                  "speedFactor", ship.getModifiedItemAttr("shipBonusMF2"), skill="Minmatar Frigate")
diff --git a/eos/effects/effect4515.py b/eos/effects/effect4515.py
deleted file mode 100644
index 39ec4e71d..000000000
--- a/eos/effects/effect4515.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipFalloffBonusMF
-#
-# Used by:
-# Ship: Chremoas
-# Ship: Dramiel
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Projectile Turret"),
-                                  "falloff", ship.getModifiedItemAttr("shipBonusMF"), skill="Minmatar Frigate")
diff --git a/eos/effects/effect4516.py b/eos/effects/effect4516.py
deleted file mode 100644
index 61fefdc54..000000000
--- a/eos/effects/effect4516.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipHTurretFalloffBonusGC
-#
-# Used by:
-# Ship: Victor
-# Ship: Vigilant
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Hybrid Turret"),
-                                  "falloff", ship.getModifiedItemAttr("shipBonusGC"), skill="Gallente Cruiser")
diff --git a/eos/effects/effect4527.py b/eos/effects/effect4527.py
deleted file mode 100644
index 00532b254..000000000
--- a/eos/effects/effect4527.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# gunneryFalloffBonusOnline
-#
-# Used by:
-# Modules from group: Tracking Enhancer (10 of 10)
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Gunnery"),
-                                  "falloff", module.getModifiedItemAttr("falloffBonus"),
-                                  stackingPenalties=True)
diff --git a/eos/effects/effect4555.py b/eos/effects/effect4555.py
deleted file mode 100644
index 2c847d0c1..000000000
--- a/eos/effects/effect4555.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# capitalLauncherSkillCruiseCitadelEmDamage1
-#
-# Used by:
-# Skill: XL Cruise Missiles
-type = "passive"
-
-
-def handler(fit, skill, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("XL Cruise Missiles"),
-                                    "emDamage", skill.getModifiedItemAttr("damageMultiplierBonus") * skill.level)
diff --git a/eos/effects/effect4556.py b/eos/effects/effect4556.py
deleted file mode 100644
index 2b52bfcb3..000000000
--- a/eos/effects/effect4556.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# capitalLauncherSkillCruiseCitadelExplosiveDamage1
-#
-# Used by:
-# Skill: XL Cruise Missiles
-type = "passive"
-
-
-def handler(fit, skill, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("XL Cruise Missiles"),
-                                    "explosiveDamage", skill.getModifiedItemAttr("damageMultiplierBonus") * skill.level)
diff --git a/eos/effects/effect4557.py b/eos/effects/effect4557.py
deleted file mode 100644
index e51cad250..000000000
--- a/eos/effects/effect4557.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# capitalLauncherSkillCruiseCitadelKineticDamage1
-#
-# Used by:
-# Skill: XL Cruise Missiles
-type = "passive"
-
-
-def handler(fit, skill, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("XL Cruise Missiles"),
-                                    "kineticDamage", skill.getModifiedItemAttr("damageMultiplierBonus") * skill.level)
diff --git a/eos/effects/effect4558.py b/eos/effects/effect4558.py
deleted file mode 100644
index 097a6d2b2..000000000
--- a/eos/effects/effect4558.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# capitalLauncherSkillCruiseCitadelThermalDamage1
-#
-# Used by:
-# Skill: XL Cruise Missiles
-type = "passive"
-
-
-def handler(fit, skill, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("XL Cruise Missiles"),
-                                    "thermalDamage", skill.getModifiedItemAttr("damageMultiplierBonus") * skill.level)
diff --git a/eos/effects/effect4559.py b/eos/effects/effect4559.py
deleted file mode 100644
index ef6c60e3b..000000000
--- a/eos/effects/effect4559.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# gunneryMaxRangeFalloffTrackingSpeedBonus
-#
-# Used by:
-# Modules from group: Tracking Computer (11 of 11)
-type = "active"
-
-
-def handler(fit, module, context):
-    for attr in ("maxRange", "falloff", "trackingSpeed"):
-        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Gunnery"),
-                                      attr, module.getModifiedItemAttr("%sBonus" % attr),
-                                      stackingPenalties=True)
diff --git a/eos/effects/effect4575.py b/eos/effects/effect4575.py
deleted file mode 100644
index f9efed36c..000000000
--- a/eos/effects/effect4575.py
+++ /dev/null
@@ -1,114 +0,0 @@
-# industrialCoreEffect2
-#
-# Used by:
-# Variations of module: Industrial Core I (2 of 2)
-type = "active"
-runTime = "early"
-
-
-def handler(fit, src, context):
-    fit.extraAttributes["siege"] = True
-    fit.ship.boostItemAttr("maxVelocity", src.getModifiedItemAttr("speedFactor"), stackingPenalties=True)
-    fit.ship.multiplyItemAttr("mass", src.getModifiedItemAttr("siegeMassMultiplier"))
-    fit.ship.multiplyItemAttr("scanResolution",
-                              src.getModifiedItemAttr("scanResolutionMultiplier"),
-                              stackingPenalties=True)
-
-    #  Remote Shield Repper Bonuses
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Shield Emission Systems"),
-                                  "duration",
-                                  src.getModifiedItemAttr("industrialCoreRemoteLogisticsDurationBonus"),
-                                  )
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Shield Emission Systems"),
-                                  "maxRange",
-                                  src.getModifiedItemAttr("industrialCoreRemoteLogisticsRangeBonus"),
-                                  stackingPenalties=True
-                                  )
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Shield Emission Systems"),
-                                  "capacitorNeed",
-                                  src.getModifiedItemAttr("industrialCoreRemoteLogisticsDurationBonus")
-                                  )
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Shield Emission Systems"),
-                                  "falloffEffectiveness",
-                                  src.getModifiedItemAttr("industrialCoreRemoteLogisticsRangeBonus"),
-                                  stackingPenalties=True
-                                  )
-
-    #  Local Shield Repper Bonuses
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Shield Operation"),
-                                  "duration",
-                                  src.getModifiedItemAttr("industrialCoreLocalLogisticsDurationBonus"),
-                                  )
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Shield Operation"),
-                                  "shieldBonus",
-                                  src.getModifiedItemAttr("industrialCoreLocalLogisticsAmountBonus"),
-                                  stackingPenalties=True
-                                  )
-
-    # Mining Burst Bonuses
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Mining Foreman"),
-                                  "warfareBuff1Value",
-                                  src.getModifiedItemAttr("industrialCoreBonusMiningBurstStrength"),
-                                  )
-
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Mining Foreman"),
-                                  "warfareBuff2Value",
-                                  src.getModifiedItemAttr("industrialCoreBonusMiningBurstStrength"),
-                                  )
-
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Mining Foreman"),
-                                  "warfareBuff3Value",
-                                  src.getModifiedItemAttr("industrialCoreBonusMiningBurstStrength"),
-                                  )
-
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Mining Foreman"),
-                                  "warfareBuff4Value",
-                                  src.getModifiedItemAttr("industrialCoreBonusMiningBurstStrength"),
-                                  )
-
-    #  Command Burst Range Bonus
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Leadership"),
-                                  "maxRange",
-                                  src.getModifiedItemAttr("industrialCoreBonusCommandBurstRange"),
-                                  stackingPenalties=True
-                                  )
-
-    # Drone Bonuses
-    fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Ice Harvesting Drone Operation"),
-                                 "duration",
-                                 src.getModifiedItemAttr("industrialCoreBonusDroneIceHarvesting"),
-                                 )
-    fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Mining Drone Operation"),
-                                 "miningAmount",
-                                 src.getModifiedItemAttr("industrialCoreBonusDroneMining"),
-                                 )
-    fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Drones"),
-                                 "maxVelocity",
-                                 src.getModifiedItemAttr("industrialCoreBonusDroneVelocity"),
-                                 )
-
-    fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Drones"),
-                                 "damageMultiplier",
-                                 src.getModifiedItemAttr("industrialCoreBonusDroneDamageHP"),
-                                 stackingPenalties=True
-                                 )
-    fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Drones"),
-                                 "shieldCapacity",
-                                 src.getModifiedItemAttr("industrialCoreBonusDroneDamageHP"),
-                                 )
-    fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Drones"),
-                                 "armorHP",
-                                 src.getModifiedItemAttr("industrialCoreBonusDroneDamageHP"),
-                                 )
-    fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Drones"),
-                                 "hp",
-                                 src.getModifiedItemAttr("industrialCoreBonusDroneDamageHP"),
-                                 )
-
-    #  Todo: remote impedance (no reps, etc)
-    fit.ship.increaseItemAttr("warpScrambleStatus", src.getModifiedItemAttr("siegeModeWarpStatus"))
-    fit.ship.boostItemAttr("remoteRepairImpedance", src.getModifiedItemAttr("remoteRepairImpedanceBonus"))
-    fit.ship.increaseItemAttr("disallowTethering", src.getModifiedItemAttr("disallowTethering"))
-    fit.ship.boostItemAttr("sensorDampenerResistance", src.getModifiedItemAttr("sensorDampenerResistanceBonus"))
-    fit.ship.boostItemAttr("remoteAssistanceImpedance", src.getModifiedItemAttr("remoteAssistanceImpedanceBonus"))
-    fit.ship.increaseItemAttr("disallowDocking", src.getModifiedItemAttr("disallowDocking"))
diff --git a/eos/effects/effect4576.py b/eos/effects/effect4576.py
deleted file mode 100644
index b1c5b908d..000000000
--- a/eos/effects/effect4576.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# eliteBonusLogisticsTrackingLinkFalloffBonus1
-#
-# Used by:
-# Ship: Scimitar
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Remote Tracking Computer",
-                                  "falloffBonus", ship.getModifiedItemAttr("eliteBonusLogistics1"),
-                                  skill="Logistics Cruisers")
diff --git a/eos/effects/effect4577.py b/eos/effects/effect4577.py
deleted file mode 100644
index e13cef64b..000000000
--- a/eos/effects/effect4577.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# eliteBonusLogisticsTrackingLinkFalloffBonus2
-#
-# Used by:
-# Ship: Oneiros
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Remote Tracking Computer",
-                                  "falloffBonus", ship.getModifiedItemAttr("eliteBonusLogistics2"),
-                                  skill="Logistics Cruisers")
diff --git a/eos/effects/effect4579.py b/eos/effects/effect4579.py
deleted file mode 100644
index 7f060a291..000000000
--- a/eos/effects/effect4579.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# droneRigStasisWebSpeedFactorBonus
-#
-# Used by:
-# Modules named like: Stasis Drone Augmentor (8 of 8)
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.drones.filteredItemBoost(lambda drone: drone.item.group.name == "Stasis Webifying Drone",
-                                 "speedFactor", module.getModifiedItemAttr("webSpeedFactorBonus"))
diff --git a/eos/effects/effect4619.py b/eos/effects/effect4619.py
deleted file mode 100644
index 5f71d4b0f..000000000
--- a/eos/effects/effect4619.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusDroneDamageGF2
-#
-# Used by:
-# Ship: Utu
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Drones"),
-                                 "damageMultiplier", ship.getModifiedItemAttr("shipBonusGF2"), skill="Gallente Frigate")
diff --git a/eos/effects/effect4620.py b/eos/effects/effect4620.py
deleted file mode 100644
index 77fd29e73..000000000
--- a/eos/effects/effect4620.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipBonusWarpScramblerMaxRangeGF2
-#
-# Used by:
-# Ship: Garmur
-# Ship: Utu
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Warp Scrambler",
-                                  "maxRange", ship.getModifiedItemAttr("shipBonusGF2"), skill="Gallente Frigate")
diff --git a/eos/effects/effect4621.py b/eos/effects/effect4621.py
deleted file mode 100644
index d6dfc2597..000000000
--- a/eos/effects/effect4621.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# shipBonusHeatDamageATF1
-#
-# Used by:
-# Ship: Cambion
-# Ship: Etana
-# Ship: Utu
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: True, "heatDamage",
-                                  ship.getModifiedItemAttr("shipBonusATF1"))
diff --git a/eos/effects/effect4622.py b/eos/effects/effect4622.py
deleted file mode 100644
index e1312bf05..000000000
--- a/eos/effects/effect4622.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusSmallHybridMaxRangeATF2
-#
-# Used by:
-# Ship: Utu
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Hybrid Turret"),
-                                  "maxRange", ship.getModifiedItemAttr("shipBonusATF2"))
diff --git a/eos/effects/effect4623.py b/eos/effects/effect4623.py
deleted file mode 100644
index 5d0131952..000000000
--- a/eos/effects/effect4623.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusSmallHybridTrackingSpeedATF2
-#
-# Used by:
-# Ship: Utu
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Hybrid Turret"),
-                                  "trackingSpeed", ship.getModifiedItemAttr("shipBonusATF2"))
diff --git a/eos/effects/effect4624.py b/eos/effects/effect4624.py
deleted file mode 100644
index 9b6e8a4ec..000000000
--- a/eos/effects/effect4624.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusHybridTrackingATC2
-#
-# Used by:
-# Ship: Adrestia
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Hybrid Turret"),
-                                  "trackingSpeed", ship.getModifiedItemAttr("shipBonusATC2"))
diff --git a/eos/effects/effect4625.py b/eos/effects/effect4625.py
deleted file mode 100644
index b60d60618..000000000
--- a/eos/effects/effect4625.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusHybridFalloffATC2
-#
-# Used by:
-# Ship: Adrestia
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Hybrid Turret"),
-                                  "falloff", ship.getModifiedItemAttr("shipBonusATC2"))
diff --git a/eos/effects/effect4626.py b/eos/effects/effect4626.py
deleted file mode 100644
index 84afce09b..000000000
--- a/eos/effects/effect4626.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipBonusWarpScramblerMaxRangeGC2
-#
-# Used by:
-# Ship: Adrestia
-# Ship: Orthrus
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Warp Scrambler",
-                                  "maxRange", ship.getModifiedItemAttr("shipBonusGC2"), skill="Gallente Cruiser")
diff --git a/eos/effects/effect4635.py b/eos/effects/effect4635.py
deleted file mode 100644
index 0541914fc..000000000
--- a/eos/effects/effect4635.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# eliteBonusMaraudersCruiseAndTorpedoDamageRole1
-#
-# Used by:
-# Ship: Golem
-type = "passive"
-
-
-def handler(fit, ship, context):
-    damageTypes = ("em", "explosive", "kinetic", "thermal")
-    for damageType in damageTypes:
-        fit.modules.filteredChargeBoost(
-            lambda mod: mod.charge.requiresSkill("Cruise Missiles") or mod.charge.requiresSkill("Torpedoes"),
-            "{0}Damage".format(damageType), ship.getModifiedItemAttr("eliteBonusViolatorsRole1"))
diff --git a/eos/effects/effect4636.py b/eos/effects/effect4636.py
deleted file mode 100644
index 240b2f5ca..000000000
--- a/eos/effects/effect4636.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipBonusAoeVelocityCruiseAndTorpedoCB2
-#
-# Used by:
-# Ship: Golem
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredChargeBoost(
-        lambda mod: mod.charge.requiresSkill("Cruise Missiles") or mod.charge.requiresSkill("Torpedoes"),
-        "aoeVelocity", ship.getModifiedItemAttr("shipBonus2CB"), skill="Caldari Battleship")
diff --git a/eos/effects/effect4637.py b/eos/effects/effect4637.py
deleted file mode 100644
index e3b31c683..000000000
--- a/eos/effects/effect4637.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# shipCruiseAndTorpedoVelocityBonusCB3
-#
-# Used by:
-# Ship: Golem
-# Ship: Widow
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredChargeBoost(
-        lambda mod: mod.charge.requiresSkill("Cruise Missiles") or mod.charge.requiresSkill("Torpedoes"),
-        "maxVelocity", ship.getModifiedItemAttr("shipBonusCB3"), skill="Caldari Battleship")
diff --git a/eos/effects/effect4640.py b/eos/effects/effect4640.py
deleted file mode 100644
index d19155457..000000000
--- a/eos/effects/effect4640.py
+++ /dev/null
@@ -1,14 +0,0 @@
-# shipArmorEMAndExpAndkinAndThmResistanceAC2
-#
-# Used by:
-# Ships named like: Stratios (2 of 2)
-# Ship: Sacrilege
-# Ship: Vangel
-type = "passive"
-
-
-def handler(fit, ship, context):
-    damageTypes = ("Em", "Explosive", "Kinetic", "Thermal")
-    for damageType in damageTypes:
-        fit.ship.boostItemAttr("armor{0}DamageResonance".format(damageType), ship.getModifiedItemAttr("shipBonusAC2"),
-                               skill="Amarr Cruiser")
diff --git a/eos/effects/effect4643.py b/eos/effects/effect4643.py
deleted file mode 100644
index c75875c24..000000000
--- a/eos/effects/effect4643.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# shipHeavyAssaultMissileEMAndExpAndKinAndThmDmgAC1
-#
-# Used by:
-# Ship: Sacrilege
-type = "passive"
-
-
-def handler(fit, ship, context):
-    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("shipBonusAC"),
-                                        skill="Amarr Cruiser")
diff --git a/eos/effects/effect4645.py b/eos/effects/effect4645.py
deleted file mode 100644
index e3aa5470f..000000000
--- a/eos/effects/effect4645.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# eliteBonusHeavyGunshipHeavyAndHeavyAssaultAndAssaultMissileLauncherROF
-#
-# Used by:
-# Ship: Sacrilege
-type = "passive"
-
-
-def handler(fit, ship, context):
-    groups = ("Missile Launcher Rapid Light", "Missile Launcher Heavy Assault", "Missile Launcher Heavy")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name in groups,
-                                  "speed", ship.getModifiedItemAttr("eliteBonusHeavyGunship2"),
-                                  skill="Heavy Assault Cruisers")
diff --git a/eos/effects/effect4648.py b/eos/effects/effect4648.py
deleted file mode 100644
index 6fb22fc13..000000000
--- a/eos/effects/effect4648.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# eliteBonusBlackOpsECMGravAndLadarAndMagnetometricAndRadarStrength1
-#
-# Used by:
-# Ship: Widow
-type = "passive"
-
-
-def handler(fit, ship, context):
-    sensorTypes = ("Gravimetric", "Ladar", "Magnetometric", "Radar")
-    for type in sensorTypes:
-        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "ECM", "scan{0}StrengthBonus".format(type),
-                                      ship.getModifiedItemAttr("eliteBonusBlackOps1"), skill="Black Ops")
diff --git a/eos/effects/effect4649.py b/eos/effects/effect4649.py
deleted file mode 100644
index 755ca5cae..000000000
--- a/eos/effects/effect4649.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipCruiseAndSiegeLauncherROFBonus2CB
-#
-# Used by:
-# Ship: Widow
-type = "passive"
-
-
-def handler(fit, ship, context):
-    affectedGroups = ("Missile Launcher Cruise", "Missile Launcher Torpedo")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name in affectedGroups,
-                                  "speed", ship.getModifiedItemAttr("shipBonus2CB"), skill="Caldari Battleship")
diff --git a/eos/effects/effect4667.py b/eos/effects/effect4667.py
deleted file mode 100644
index 5b405a371..000000000
--- a/eos/effects/effect4667.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipBonusNoctisSalvageCycle
-#
-# Used by:
-# Ship: Noctis
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Salvaging"),
-                                  "duration", ship.getModifiedItemAttr("shipBonusOreIndustrial1"),
-                                  skill="ORE Industrial")
diff --git a/eos/effects/effect4668.py b/eos/effects/effect4668.py
deleted file mode 100644
index b9ea733b9..000000000
--- a/eos/effects/effect4668.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipBonusNoctisTractorCycle
-#
-# Used by:
-# Ship: Noctis
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Tractor Beam",
-                                  "duration", ship.getModifiedItemAttr("shipBonusOreIndustrial1"),
-                                  skill="ORE Industrial")
diff --git a/eos/effects/effect4669.py b/eos/effects/effect4669.py
deleted file mode 100644
index 28c2f237a..000000000
--- a/eos/effects/effect4669.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipBonusNoctisTractorVelocity
-#
-# Used by:
-# Ship: Noctis
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Tractor Beam",
-                                  "maxTractorVelocity", ship.getModifiedItemAttr("shipBonusOreIndustrial2"),
-                                  skill="ORE Industrial")
diff --git a/eos/effects/effect4670.py b/eos/effects/effect4670.py
deleted file mode 100644
index ab2254345..000000000
--- a/eos/effects/effect4670.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipBonusNoctisTractorRange
-#
-# Used by:
-# Ship: Noctis
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Tractor Beam",
-                                  "maxRange", ship.getModifiedItemAttr("shipBonusOreIndustrial2"),
-                                  skill="ORE Industrial")
diff --git a/eos/effects/effect4728.py b/eos/effects/effect4728.py
deleted file mode 100644
index 39c120f49..000000000
--- a/eos/effects/effect4728.py
+++ /dev/null
@@ -1,32 +0,0 @@
-# OffensiveDefensiveReduction
-#
-# Used by:
-# Celestials named like: Drifter Incursion (6 of 6)
-# Celestials named like: Incursion ship attributes effects (3 of 3)
-runTime = "early"
-type = ("projected", "passive")
-
-
-def handler(fit, beacon, context):
-    damages = ("em", "thermal", "kinetic", "explosive")
-    for damage in damages:
-        # Nerf missile damage
-        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"),
-                                        "{0}Damage".format(damage),
-                                        beacon.getModifiedItemAttr("systemEffectDamageReduction"))
-        # Nerf smartbomb damage
-        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Smart Bomb",
-                                      "{0}Damage".format(damage),
-                                      beacon.getModifiedItemAttr("systemEffectDamageReduction"))
-        # Nerf armor resistances
-        fit.ship.boostItemAttr("armor{0}DamageResonance".format(damage.capitalize()),
-                               beacon.getModifiedItemAttr("armor{0}DamageResistanceBonus".format(damage.capitalize())))
-        # Nerf shield resistances
-        fit.ship.boostItemAttr("shield{0}DamageResonance".format(damage.capitalize()),
-                               beacon.getModifiedItemAttr("shield{0}DamageResistanceBonus".format(damage.capitalize())))
-    # Nerf drone damage output
-    fit.drones.filteredItemBoost(lambda drone: True,
-                                 "damageMultiplier", beacon.getModifiedItemAttr("systemEffectDamageReduction"))
-    # Nerf turret damage output
-    fit.modules.filteredItemBoost(lambda module: module.item.requiresSkill("Gunnery"),
-                                  "damageMultiplier", beacon.getModifiedItemAttr("systemEffectDamageReduction"))
diff --git a/eos/effects/effect4760.py b/eos/effects/effect4760.py
deleted file mode 100644
index 050e87d91..000000000
--- a/eos/effects/effect4760.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# subsystemBonusCaldariPropulsionWarpCapacitor
-#
-# Used by:
-# Subsystem: Tengu Propulsion - Interdiction Nullifier
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.ship.boostItemAttr("warpCapacitorNeed", src.getModifiedItemAttr("subsystemBonusCaldariPropulsion"),
-                           skill="Caldari Propulsion Systems")
diff --git a/eos/effects/effect4775.py b/eos/effects/effect4775.py
deleted file mode 100644
index 529e6651e..000000000
--- a/eos/effects/effect4775.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipEnergyNeutralizerTransferAmountBonusAF2
-#
-# Used by:
-# Ship: Malice
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Neutralizer",
-                                  "energyNeutralizerAmount", ship.getModifiedItemAttr("shipBonus2AF"),
-                                  skill="Amarr Frigate")
diff --git a/eos/effects/effect4782.py b/eos/effects/effect4782.py
deleted file mode 100644
index 85f5ba924..000000000
--- a/eos/effects/effect4782.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusSmallEnergyWeaponOptimalRangeATF2
-#
-# Used by:
-# Ship: Malice
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Energy Turret"),
-                                  "maxRange", ship.getModifiedItemAttr("shipBonusATF2"))
diff --git a/eos/effects/effect4789.py b/eos/effects/effect4789.py
deleted file mode 100644
index 483f39915..000000000
--- a/eos/effects/effect4789.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusSmallEnergyTurretDamageATF1
-#
-# Used by:
-# Ship: Malice
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Energy Turret"),
-                                  "damageMultiplier", ship.getModifiedItemAttr("shipBonusATF1"))
diff --git a/eos/effects/effect4793.py b/eos/effects/effect4793.py
deleted file mode 100644
index bf2b11b02..000000000
--- a/eos/effects/effect4793.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusMissileLauncherHeavyROFATC1
-#
-# Used by:
-# Ship: Vangel
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Missile Launcher Heavy",
-                                  "speed", ship.getModifiedItemAttr("shipBonusATC1"))
diff --git a/eos/effects/effect4794.py b/eos/effects/effect4794.py
deleted file mode 100644
index cc18bb8ed..000000000
--- a/eos/effects/effect4794.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusMissileLauncherAssaultROFATC1
-#
-# Used by:
-# Ship: Vangel
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Missile Launcher Rapid Light",
-                                  "speed", ship.getModifiedItemAttr("shipBonusATC1"))
diff --git a/eos/effects/effect4795.py b/eos/effects/effect4795.py
deleted file mode 100644
index ae3dc443d..000000000
--- a/eos/effects/effect4795.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusMissileLauncherHeavyAssaultROFATC1
-#
-# Used by:
-# Ship: Vangel
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Missile Launcher Heavy Assault",
-                                  "speed", ship.getModifiedItemAttr("shipBonusATC1"))
diff --git a/eos/effects/effect4799.py b/eos/effects/effect4799.py
deleted file mode 100644
index dc9741208..000000000
--- a/eos/effects/effect4799.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# eliteBonusBlackOpsECMBurstGravAndLadarAndMagnetoAndRadar
-#
-# Used by:
-# Ship: Widow
-type = "passive"
-
-
-def handler(fit, ship, context):
-    sensorTypes = ("Gravimetric", "Ladar", "Magnetometric", "Radar")
-    for type in sensorTypes:
-        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Burst Jammer",
-                                      "scan{0}StrengthBonus".format(type),
-                                      ship.getModifiedItemAttr("eliteBonusBlackOps1"), skill="Black Ops")
diff --git a/eos/effects/effect48.py b/eos/effects/effect48.py
deleted file mode 100644
index 42dcaca89..000000000
--- a/eos/effects/effect48.py
+++ /dev/null
@@ -1,17 +0,0 @@
-# powerBooster
-#
-# Used by:
-# Modules from group: Capacitor Booster (59 of 59)
-type = "active"
-
-
-def handler(fit, module, context):
-    # Set reload time to 10 seconds
-    module.reloadTime = 10000
-    # Make so that reloads are always taken into account during clculations
-    module.forceReload = True
-
-    if module.charge is None:
-        return
-    capAmount = module.getModifiedChargeAttr("capacitorBonus") or 0
-    module.itemModifiedAttributes["capacitorNeed"] = -capAmount
diff --git a/eos/effects/effect4804.py b/eos/effects/effect4804.py
deleted file mode 100644
index 376039994..000000000
--- a/eos/effects/effect4804.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# dataMiningSkillBoostAccessDifficultyBonusAbsolutePercent
-#
-# Used by:
-# Skill: Archaeology
-# Skill: Hacking
-# Skill: Salvaging
-type = "passive"
-
-
-def handler(fit, skill, context):
-    fit.modules.filteredItemMultiply(lambda mod: mod.item.requiresSkill(skill), "accessDifficultyBonus",
-                                     skill.getModifiedItemAttr("accessDifficultyBonusAbsolutePercent") * skill.level)
diff --git a/eos/effects/effect4809.py b/eos/effects/effect4809.py
deleted file mode 100644
index 35bac7668..000000000
--- a/eos/effects/effect4809.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# ecmGravimetricStrengthBonusPercent
-#
-# Used by:
-# Modules from group: ECM Stabilizer (6 of 6)
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "ECM",
-                                  "scanGravimetricStrengthBonus", module.getModifiedItemAttr("ecmStrengthBonusPercent"),
-                                  stackingPenalties=True)
diff --git a/eos/effects/effect4810.py b/eos/effects/effect4810.py
deleted file mode 100644
index 1ff5830a8..000000000
--- a/eos/effects/effect4810.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# ecmLadarStrengthBonusPercent
-#
-# Used by:
-# Modules from group: ECM Stabilizer (6 of 6)
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "ECM",
-                                  "scanLadarStrengthBonus", module.getModifiedItemAttr("ecmStrengthBonusPercent"),
-                                  stackingPenalties=True)
diff --git a/eos/effects/effect4811.py b/eos/effects/effect4811.py
deleted file mode 100644
index 84eb6163d..000000000
--- a/eos/effects/effect4811.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# ecmMagnetometricStrengthBonusPercent
-#
-# Used by:
-# Modules from group: ECM Stabilizer (6 of 6)
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "ECM",
-                                  "scanMagnetometricStrengthBonus",
-                                  module.getModifiedItemAttr("ecmStrengthBonusPercent"),
-                                  stackingPenalties=True)
diff --git a/eos/effects/effect4812.py b/eos/effects/effect4812.py
deleted file mode 100644
index a70573cdc..000000000
--- a/eos/effects/effect4812.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# ecmRadarStrengthBonusPercent
-#
-# Used by:
-# Modules from group: ECM Stabilizer (6 of 6)
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "ECM",
-                                  "scanRadarStrengthBonus", module.getModifiedItemAttr("ecmStrengthBonusPercent"),
-                                  stackingPenalties=True)
diff --git a/eos/effects/effect4814.py b/eos/effects/effect4814.py
deleted file mode 100644
index b823680ed..000000000
--- a/eos/effects/effect4814.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# jumpPortalConsumptionBonusPercentSkill
-#
-# Used by:
-# Skill: Jump Portal Generation
-type = "passive"
-
-
-def handler(fit, skill, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill(skill), "consumptionQuantity",
-                                  skill.getModifiedItemAttr("consumptionQuantityBonusPercent") * skill.level)
diff --git a/eos/effects/effect4817.py b/eos/effects/effect4817.py
deleted file mode 100644
index ecf0ee4cf..000000000
--- a/eos/effects/effect4817.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# salvagerModuleDurationReduction
-#
-# Used by:
-# Implant: Poteque 'Prospector' Environmental Analysis EY-1005
-type = "passive"
-
-
-def handler(fit, implant, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Salvager",
-                                  "duration", implant.getModifiedItemAttr("durationBonus"))
diff --git a/eos/effects/effect4820.py b/eos/effects/effect4820.py
deleted file mode 100644
index 9bed34c1d..000000000
--- a/eos/effects/effect4820.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# bcLargeEnergyTurretPowerNeedBonus
-#
-# Used by:
-# Ship: Oracle
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemMultiply(lambda mod: mod.item.requiresSkill("Large Energy Turret"),
-                                     "power", ship.getModifiedItemAttr("bcLargeTurretPower"))
diff --git a/eos/effects/effect4821.py b/eos/effects/effect4821.py
deleted file mode 100644
index c35072878..000000000
--- a/eos/effects/effect4821.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# bcLargeHybridTurretPowerNeedBonus
-#
-# Used by:
-# Ship: Naga
-# Ship: Talos
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemMultiply(lambda mod: mod.item.requiresSkill("Large Hybrid Turret"),
-                                     "power", ship.getModifiedItemAttr("bcLargeTurretPower"))
diff --git a/eos/effects/effect4822.py b/eos/effects/effect4822.py
deleted file mode 100644
index c37e55b8f..000000000
--- a/eos/effects/effect4822.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# bcLargeProjectileTurretPowerNeedBonus
-#
-# Used by:
-# Ship: Tornado
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemMultiply(lambda mod: mod.item.requiresSkill("Large Projectile Turret"),
-                                     "power", ship.getModifiedItemAttr("bcLargeTurretPower"))
diff --git a/eos/effects/effect4823.py b/eos/effects/effect4823.py
deleted file mode 100644
index a59ed687e..000000000
--- a/eos/effects/effect4823.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# bcLargeEnergyTurretCPUNeedBonus
-#
-# Used by:
-# Ship: Oracle
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemMultiply(lambda mod: mod.item.requiresSkill("Large Energy Turret"),
-                                     "cpu", ship.getModifiedItemAttr("bcLargeTurretCPU"))
diff --git a/eos/effects/effect4824.py b/eos/effects/effect4824.py
deleted file mode 100644
index 299c31845..000000000
--- a/eos/effects/effect4824.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# bcLargeHybridTurretCPUNeedBonus
-#
-# Used by:
-# Ship: Naga
-# Ship: Talos
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemMultiply(lambda mod: mod.item.requiresSkill("Large Hybrid Turret"),
-                                     "cpu", ship.getModifiedItemAttr("bcLargeTurretCPU"))
diff --git a/eos/effects/effect4825.py b/eos/effects/effect4825.py
deleted file mode 100644
index fc0dfc50a..000000000
--- a/eos/effects/effect4825.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# bcLargeProjectileTurretCPUNeedBonus
-#
-# Used by:
-# Ship: Tornado
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemMultiply(lambda mod: mod.item.requiresSkill("Large Projectile Turret"),
-                                     "cpu", ship.getModifiedItemAttr("bcLargeTurretCPU"))
diff --git a/eos/effects/effect4826.py b/eos/effects/effect4826.py
deleted file mode 100644
index a4e3036f3..000000000
--- a/eos/effects/effect4826.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# bcLargeEnergyTurretCapacitorNeedBonus
-#
-# Used by:
-# Ship: Oracle
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemMultiply(lambda mod: mod.item.requiresSkill("Large Energy Turret"),
-                                     "capacitorNeed", ship.getModifiedItemAttr("bcLargeTurretCap"))
diff --git a/eos/effects/effect4827.py b/eos/effects/effect4827.py
deleted file mode 100644
index 04ea48c8f..000000000
--- a/eos/effects/effect4827.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# bcLargeHybridTurretCapacitorNeedBonus
-#
-# Used by:
-# Ship: Naga
-# Ship: Talos
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemMultiply(lambda mod: mod.item.requiresSkill("Large Hybrid Turret"),
-                                     "capacitorNeed", ship.getModifiedItemAttr("bcLargeTurretCap"))
diff --git a/eos/effects/effect485.py b/eos/effects/effect485.py
deleted file mode 100644
index 991640a10..000000000
--- a/eos/effects/effect485.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# energysystemsoperationCapRechargeBonusPostPercentRechargeRateLocationShipGroupCapacitor
-#
-# Used by:
-# Implants named like: Inherent Implants 'Squire' Capacitor Systems Operation EO (6 of 6)
-# Modules named like: Capacitor Control Circuit (8 of 8)
-# Implant: Genolution Core Augmentation CA-2
-# Skill: Capacitor Systems Operation
-type = "passive"
-
-
-def handler(fit, container, context):
-    level = container.level if "skill" in context else 1
-    fit.ship.boostItemAttr("rechargeRate", container.getModifiedItemAttr("capRechargeBonus") * level)
diff --git a/eos/effects/effect486.py b/eos/effects/effect486.py
deleted file mode 100644
index 919fc8b79..000000000
--- a/eos/effects/effect486.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# shieldOperationRechargeratebonusPostPercentRechargeRateLocationShipGroupShield
-#
-# Used by:
-# Implants named like: Zainou 'Gnome' Shield Operation SP (6 of 6)
-# Modules named like: Core Defense Field Purger (8 of 8)
-# Implant: Sansha Modified 'Gnome' Implant
-# Skill: Shield Operation
-type = "passive"
-
-
-def handler(fit, container, context):
-    level = container.level if "skill" in context else 1
-    fit.ship.boostItemAttr("shieldRechargeRate", container.getModifiedItemAttr("rechargeratebonus") * level)
diff --git a/eos/effects/effect4867.py b/eos/effects/effect4867.py
deleted file mode 100644
index 183356391..000000000
--- a/eos/effects/effect4867.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# setBonusChristmasPowergrid
-#
-# Used by:
-# Implants named like: Genolution Core Augmentation CA (4 of 4)
-runTime = "early"
-type = "passive"
-
-
-def handler(fit, implant, context):
-    fit.appliedImplants.filteredItemMultiply(lambda mod: mod.item.group.name == "Special Edition Implant",
-                                             "powerEngineeringOutputBonus",
-                                             implant.getModifiedItemAttr("implantSetChristmas"))
diff --git a/eos/effects/effect4868.py b/eos/effects/effect4868.py
deleted file mode 100644
index cb2a90ce1..000000000
--- a/eos/effects/effect4868.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# setBonusChristmasCapacitorCapacity
-#
-# Used by:
-# Implants named like: Genolution Core Augmentation CA (4 of 4)
-runTime = "early"
-type = "passive"
-
-
-def handler(fit, implant, context):
-    fit.appliedImplants.filteredItemMultiply(lambda mod: mod.item.group.name == "Special Edition Implant",
-                                             "capacitorCapacityBonus",
-                                             implant.getModifiedItemAttr("implantSetChristmas"))
diff --git a/eos/effects/effect4869.py b/eos/effects/effect4869.py
deleted file mode 100644
index 2c7d06990..000000000
--- a/eos/effects/effect4869.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# setBonusChristmasCPUOutput
-#
-# Used by:
-# Implants named like: Genolution Core Augmentation CA (4 of 4)
-runTime = "early"
-type = "passive"
-
-
-def handler(fit, implant, context):
-    fit.appliedImplants.filteredItemMultiply(lambda mod: mod.item.group.name == "Special Edition Implant",
-                                             "cpuOutputBonus2", implant.getModifiedItemAttr("implantSetChristmas"))
diff --git a/eos/effects/effect4871.py b/eos/effects/effect4871.py
deleted file mode 100644
index 39e0d41b4..000000000
--- a/eos/effects/effect4871.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# setBonusChristmasCapacitorRecharge2
-#
-# Used by:
-# Implants named like: Genolution Core Augmentation CA (4 of 4)
-runTime = "early"
-type = "passive"
-
-
-def handler(fit, implant, context):
-    fit.appliedImplants.filteredItemMultiply(lambda mod: mod.item.group.name == "Special Edition Implant",
-                                             "capRechargeBonus", implant.getModifiedItemAttr("implantSetChristmas"))
diff --git a/eos/effects/effect4896.py b/eos/effects/effect4896.py
deleted file mode 100644
index a2e993f1b..000000000
--- a/eos/effects/effect4896.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusDroneHitpointsGF2
-#
-# Used by:
-# Ship: Ishkur
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Drones"),
-                                 "hp", ship.getModifiedItemAttr("shipBonusGF2"), skill="Gallente Frigate")
diff --git a/eos/effects/effect4897.py b/eos/effects/effect4897.py
deleted file mode 100644
index 89cdf8e30..000000000
--- a/eos/effects/effect4897.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusDroneArmorHitpointsGF2
-#
-# Used by:
-# Ship: Ishkur
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Drones"),
-                                 "armorHP", ship.getModifiedItemAttr("shipBonusGF2"), skill="Gallente Frigate")
diff --git a/eos/effects/effect4898.py b/eos/effects/effect4898.py
deleted file mode 100644
index 4a4ca98ae..000000000
--- a/eos/effects/effect4898.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusDroneShieldHitpointsGF2
-#
-# Used by:
-# Ship: Ishkur
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Drones"),
-                                 "shieldCapacity", ship.getModifiedItemAttr("shipBonusGF2"), skill="Gallente Frigate")
diff --git a/eos/effects/effect490.py b/eos/effects/effect490.py
deleted file mode 100644
index a6c38728b..000000000
--- a/eos/effects/effect490.py
+++ /dev/null
@@ -1,14 +0,0 @@
-# engineeringPowerEngineeringOutputBonusPostPercentPowerOutputLocationShipGroupPowerCore
-#
-# Used by:
-# Implants named like: Inherent Implants 'Squire' Power Grid Management EG (6 of 6)
-# Modules named like: Ancillary Current Router (8 of 8)
-# Subsystems named like: Core Augmented Reactor (4 of 4)
-# Implant: Genolution Core Augmentation CA-1
-# Skill: Power Grid Management
-type = "passive"
-
-
-def handler(fit, container, context):
-    level = container.level if "skill" in context else 1
-    fit.ship.boostItemAttr("powerOutput", container.getModifiedItemAttr("powerEngineeringOutputBonus") * level)
diff --git a/eos/effects/effect4901.py b/eos/effects/effect4901.py
deleted file mode 100644
index b99ef42a4..000000000
--- a/eos/effects/effect4901.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipMissileSpeedBonusAF
-#
-# Used by:
-# Ship: Vengeance
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Missile Launcher Operation"),
-                                  "speed", ship.getModifiedItemAttr("shipBonus2AF"), skill="Amarr Frigate")
diff --git a/eos/effects/effect4902.py b/eos/effects/effect4902.py
deleted file mode 100644
index 2c5ce0bbc..000000000
--- a/eos/effects/effect4902.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# MWDSignatureRadiusRoleBonus
-#
-# Used by:
-# Ships from group: Assault Frigate (8 of 12)
-# Ships from group: Command Destroyer (4 of 4)
-# 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"),
-                                  "signatureRadiusBonus", ship.getModifiedItemAttr("MWDSignatureRadiusBonus"))
diff --git a/eos/effects/effect4906.py b/eos/effects/effect4906.py
deleted file mode 100644
index 2718a3789..000000000
--- a/eos/effects/effect4906.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# systemDamageFighters
-#
-# Used by:
-# Celestials named like: Magnetar Effect Beacon Class (6 of 6)
-runTime = "early"
-type = ("projected", "passive")
-
-
-def handler(fit, beacon, context):
-    fit.drones.filteredItemMultiply(lambda drone: drone.item.requiresSkill("Fighters"),
-                                    "damageMultiplier", beacon.getModifiedItemAttr("damageMultiplierMultiplier"),
-                                    stackingPenalties=True, penaltyGroup="postMul")
diff --git a/eos/effects/effect4911.py b/eos/effects/effect4911.py
deleted file mode 100644
index f66994415..000000000
--- a/eos/effects/effect4911.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# modifyShieldRechargeRatePassive
-#
-# Used by:
-# Modules named like: Processor Overclocking Unit (8 of 8)
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.ship.multiplyItemAttr("shieldRechargeRate", module.getModifiedItemAttr("shieldRechargeRateMultiplier"))
diff --git a/eos/effects/effect4921.py b/eos/effects/effect4921.py
deleted file mode 100644
index c8797d7d0..000000000
--- a/eos/effects/effect4921.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# microJumpDrive
-#
-# Used by:
-# Modules from group: Micro Jump Drive (2 of 2)
-type = "active"
-
-
-def handler(fit, module, context):
-    fit.ship.boostItemAttr("signatureRadius", module.getModifiedItemAttr("signatureRadiusBonusPercent"))
diff --git a/eos/effects/effect4923.py b/eos/effects/effect4923.py
deleted file mode 100644
index ec949212a..000000000
--- a/eos/effects/effect4923.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# skillMJDdurationBonus
-#
-# Used by:
-# Skill: Micro Jump Drive Operation
-type = "passive"
-
-
-def handler(fit, skill, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Micro Jump Drive Operation"),
-                                  "duration", skill.getModifiedItemAttr("durationBonus") * skill.level)
diff --git a/eos/effects/effect4928.py b/eos/effects/effect4928.py
deleted file mode 100644
index 25a4335a6..000000000
--- a/eos/effects/effect4928.py
+++ /dev/null
@@ -1,128 +0,0 @@
-# adaptiveArmorHardener
-#
-# Used by:
-# Module: Reactive Armor Hardener
-from logbook import Logger
-import eos.config
-
-pyfalog = Logger(__name__)
-
-runTime = "late"
-type = "active"
-
-
-def handler(fit, module, context):
-    damagePattern = fit.damagePattern
-    # pyfalog.debug("==============================")
-
-    static_adaptive_behavior = eos.config.settings['useStaticAdaptiveArmorHardener']
-
-    if (damagePattern.emAmount == damagePattern.thermalAmount == damagePattern.kineticAmount == damagePattern.explosiveAmount) and static_adaptive_behavior:
-        # pyfalog.debug("Setting adaptivearmorhardener resists to uniform profile.")
-        for attr in ("armorEmDamageResonance", "armorThermalDamageResonance", "armorKineticDamageResonance", "armorExplosiveDamageResonance"):
-            fit.ship.multiplyItemAttr(attr, module.getModifiedItemAttr(attr), stackingPenalties=True, penaltyGroup="preMul")
-        return
-
-    # Skip if there is no damage pattern. Example: projected ships or fleet boosters
-    if damagePattern:
-
-        # Populate a tuple with the damage profile modified by current armor resists.
-        baseDamageTaken = (
-            damagePattern.emAmount * fit.ship.getModifiedItemAttr('armorEmDamageResonance'),
-            damagePattern.thermalAmount * fit.ship.getModifiedItemAttr('armorThermalDamageResonance'),
-            damagePattern.kineticAmount * fit.ship.getModifiedItemAttr('armorKineticDamageResonance'),
-            damagePattern.explosiveAmount * fit.ship.getModifiedItemAttr('armorExplosiveDamageResonance'),
-        )
-        # pyfalog.debug("Damage Adjusted for Armor Resists: %f/%f/%f/%f" % (baseDamageTaken[0], baseDamageTaken[1], baseDamageTaken[2], baseDamageTaken[3]))
-
-        resistanceShiftAmount = module.getModifiedItemAttr(
-            'resistanceShiftAmount') / 100  # The attribute is in percent and we want a fraction
-        RAHResistance = [
-            module.getModifiedItemAttr('armorEmDamageResonance'),
-            module.getModifiedItemAttr('armorThermalDamageResonance'),
-            module.getModifiedItemAttr('armorKineticDamageResonance'),
-            module.getModifiedItemAttr('armorExplosiveDamageResonance'),
-        ]
-
-        # Simulate RAH cycles until the RAH either stops changing or enters a loop.
-        # The number of iterations is limited to prevent an infinite loop if something goes wrong.
-        cycleList = []
-        loopStart = -20
-        for num in range(50):
-            # pyfalog.debug("Starting cycle %d." % num)
-            # The strange order is to emulate the ingame sorting when different types have taken the same amount of damage.
-            # This doesn't take into account stacking penalties. In a few cases fitting a Damage Control causes an inaccurate result.
-            damagePattern_tuples = [
-                (0, baseDamageTaken[0] * RAHResistance[0], RAHResistance[0]),
-                (3, baseDamageTaken[3] * RAHResistance[3], RAHResistance[3]),
-                (2, baseDamageTaken[2] * RAHResistance[2], RAHResistance[2]),
-                (1, baseDamageTaken[1] * RAHResistance[1], RAHResistance[1]),
-            ]
-
-            # Sort the tuple to drop the highest damage value to the bottom
-            sortedDamagePattern_tuples = sorted(damagePattern_tuples, key=lambda damagePattern: damagePattern[1])
-
-            if sortedDamagePattern_tuples[2][1] == 0:
-                # One damage type: the top damage type takes from the other three
-                # Since the resistances not taking damage will end up going to the type taking damage we just do the whole thing at once.
-                change0 = 1 - sortedDamagePattern_tuples[0][2]
-                change1 = 1 - sortedDamagePattern_tuples[1][2]
-                change2 = 1 - sortedDamagePattern_tuples[2][2]
-                change3 = -(change0 + change1 + change2)
-            elif sortedDamagePattern_tuples[1][1] == 0:
-                # Two damage types: the top two damage types take from the other two
-                # Since the resistances not taking damage will end up going equally to the types taking damage we just do the whole thing at once.
-                change0 = 1 - sortedDamagePattern_tuples[0][2]
-                change1 = 1 - sortedDamagePattern_tuples[1][2]
-                change2 = -(change0 + change1) / 2
-                change3 = -(change0 + change1) / 2
-            else:
-                # Three or four damage types: the top two damage types take from the other two
-                change0 = min(resistanceShiftAmount, 1 - sortedDamagePattern_tuples[0][2])
-                change1 = min(resistanceShiftAmount, 1 - sortedDamagePattern_tuples[1][2])
-                change2 = -(change0 + change1) / 2
-                change3 = -(change0 + change1) / 2
-
-            RAHResistance[sortedDamagePattern_tuples[0][0]] = sortedDamagePattern_tuples[0][2] + change0
-            RAHResistance[sortedDamagePattern_tuples[1][0]] = sortedDamagePattern_tuples[1][2] + change1
-            RAHResistance[sortedDamagePattern_tuples[2][0]] = sortedDamagePattern_tuples[2][2] + change2
-            RAHResistance[sortedDamagePattern_tuples[3][0]] = sortedDamagePattern_tuples[3][2] + change3
-            # pyfalog.debug("Resistances shifted to %f/%f/%f/%f" % ( RAHResistance[0], RAHResistance[1], RAHResistance[2], RAHResistance[3]))
-
-            # See if the current RAH profile has been encountered before, indicating a loop.
-            for i, val in enumerate(cycleList):
-                tolerance = 1e-06
-                if abs(RAHResistance[0] - val[0]) <= tolerance and \
-                            abs(RAHResistance[1] - val[1]) <= tolerance and \
-                            abs(RAHResistance[2] - val[2]) <= tolerance and \
-                            abs(RAHResistance[3] - val[3]) <= tolerance:
-                    loopStart = i
-                    # pyfalog.debug("Loop found: %d-%d" % (loopStart, num))
-                    break
-            if loopStart >= 0:
-                break
-
-            cycleList.append(list(RAHResistance))
-
-        # if loopStart < 0:
-            # pyfalog.error("Reactive Armor Hardener failed to find equilibrium. Damage profile after armor: {0}/{1}/{2}/{3}".format(
-            #             baseDamageTaken[0], baseDamageTaken[1], baseDamageTaken[2], baseDamageTaken[3]))
-
-        # Average the profiles in the RAH loop, or the last 20 if it didn't find a loop.
-        loopCycles = cycleList[loopStart:]
-        numCycles = len(loopCycles)
-        average = [0, 0, 0, 0]
-        for cycle in loopCycles:
-            for i in range(4):
-                average[i] += cycle[i]
-
-        for i in range(4):
-            average[i] = round(average[i] / numCycles, 3)
-
-        # Set the new resistances
-        # pyfalog.debug("Setting new resist profile: %f/%f/%f/%f" % ( average[0], average[1], average[2],average[3]))
-        for i, attr in enumerate((
-                'armorEmDamageResonance', 'armorThermalDamageResonance', 'armorKineticDamageResonance',
-                'armorExplosiveDamageResonance')):
-            module.increaseItemAttr(attr, average[i] - module.getModifiedItemAttr(attr))
-            fit.ship.multiplyItemAttr(attr, average[i], stackingPenalties=True, penaltyGroup="preMul")
diff --git a/eos/effects/effect4934.py b/eos/effects/effect4934.py
deleted file mode 100644
index e4da7c41d..000000000
--- a/eos/effects/effect4934.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipArmorRepairingGF2
-#
-# Used by:
-# Ship: Incursus
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Repair Systems"),
-                                  "armorDamageAmount", ship.getModifiedItemAttr("shipBonusGF2"),
-                                  skill="Gallente Frigate")
diff --git a/eos/effects/effect4936.py b/eos/effects/effect4936.py
deleted file mode 100644
index 0cbbd439c..000000000
--- a/eos/effects/effect4936.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# fueledShieldBoosting
-#
-# Used by:
-# Modules from group: Ancillary Shield Booster (8 of 8)
-runTime = "late"
-type = "active"
-
-
-def handler(fit, module, context):
-    amount = module.getModifiedItemAttr("shieldBonus")
-    speed = module.getModifiedItemAttr("duration") / 1000.0
-    fit.extraAttributes.increase("shieldRepair", amount / speed)
diff --git a/eos/effects/effect494.py b/eos/effects/effect494.py
deleted file mode 100644
index f47c47264..000000000
--- a/eos/effects/effect494.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# warpDriveOperationWarpCapacitorNeedBonusPostPercentWarpCapacitorNeedLocationShipGroupPropulsion
-#
-# Used by:
-# Modules named like: Warp Core Optimizer (8 of 8)
-# Skill: Warp Drive Operation
-type = "passive"
-
-
-def handler(fit, container, context):
-    level = container.level if "skill" in context else 1
-    fit.ship.boostItemAttr("warpCapacitorNeed", container.getModifiedItemAttr("warpCapacitorNeedBonus") * level,
-                           stackingPenalties="skill" not in context)
diff --git a/eos/effects/effect4941.py b/eos/effects/effect4941.py
deleted file mode 100644
index 3ea6ddc9f..000000000
--- a/eos/effects/effect4941.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipHybridDamageBonusCF2
-#
-# Used by:
-# Ship: Griffin Navy Issue
-# Ship: Merlin
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Hybrid Turret"),
-                                  "damageMultiplier", ship.getModifiedItemAttr("shipBonusCF2"), skill="Caldari Frigate")
diff --git a/eos/effects/effect4942.py b/eos/effects/effect4942.py
deleted file mode 100644
index a9369bee5..000000000
--- a/eos/effects/effect4942.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# targetBreaker
-#
-# Used by:
-# Module: Target Spectrum Breaker
-type = "active"
-
-
-def handler(fit, module, context):
-    pass
diff --git a/eos/effects/effect4945.py b/eos/effects/effect4945.py
deleted file mode 100644
index 13cee98c8..000000000
--- a/eos/effects/effect4945.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# skillTargetBreakerDurationBonus2
-#
-# Used by:
-# Skill: Target Breaker Amplification
-type = "passive"
-
-
-def handler(fit, skill, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Target Breaker",
-                                  "duration", skill.getModifiedItemAttr("durationBonus") * skill.level)
diff --git a/eos/effects/effect4946.py b/eos/effects/effect4946.py
deleted file mode 100644
index 1bd8dbdfe..000000000
--- a/eos/effects/effect4946.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# skillTargetBreakerCapNeedBonus2
-#
-# Used by:
-# Skill: Target Breaker Amplification
-type = "passive"
-
-
-def handler(fit, skill, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Target Breaker",
-                                  "capacitorNeed", skill.getModifiedItemAttr("capNeedBonus") * skill.level)
diff --git a/eos/effects/effect4950.py b/eos/effects/effect4950.py
deleted file mode 100644
index be92006c9..000000000
--- a/eos/effects/effect4950.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusShieldBoosterMB1a
-#
-# Used by:
-# Ship: Maelstrom
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Operation"),
-                                  "shieldBonus", ship.getModifiedItemAttr("shipBonusMB"), skill="Minmatar Battleship")
diff --git a/eos/effects/effect4951.py b/eos/effects/effect4951.py
deleted file mode 100644
index 30432474d..000000000
--- a/eos/effects/effect4951.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# shieldBoostAmplifierPassiveBooster
-#
-# Used by:
-# Implants named like: Agency 'Hardshell' TB Dose (4 of 4)
-# Implants named like: Blue Pill Booster (5 of 5)
-# Implant: Antipharmakon Thureo
-type = "passive"
-
-
-def handler(fit, container, context):
-    fit.modules.filteredItemBoost(
-        lambda mod: mod.item.requiresSkill("Shield Operation") or mod.item.requiresSkill("Capital Shield Operation"),
-        "shieldBonus", container.getModifiedItemAttr("shieldBoostMultiplier"))
diff --git a/eos/effects/effect4961.py b/eos/effects/effect4961.py
deleted file mode 100644
index 707e2dbbb..000000000
--- a/eos/effects/effect4961.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# systemShieldRepairAmountShieldSkills
-#
-# Used by:
-# Celestials named like: Cataclysmic Variable Effect Beacon Class (6 of 6)
-runTime = "early"
-type = ("projected", "passive")
-
-
-def handler(fit, module, context):
-    fit.modules.filteredItemMultiply(lambda mod: mod.item.requiresSkill("Shield Operation") or
-                                                 mod.item.requiresSkill("Capital Shield Operation"),
-                                     "shieldBonus", module.getModifiedItemAttr("shieldBonusMultiplier"),
-                                     stackingPenalties=True, penaltyGroup="postMul")
diff --git a/eos/effects/effect4967.py b/eos/effects/effect4967.py
deleted file mode 100644
index 4840594c1..000000000
--- a/eos/effects/effect4967.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shieldBoosterDurationBonusShieldSkills
-#
-# Used by:
-# Modules named like: Core Defense Operational Solidifier (8 of 8)
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.modules.filteredItemBoost(
-        lambda mod: mod.item.requiresSkill("Shield Operation") or mod.item.requiresSkill("Capital Shield Operation"),
-        "duration", module.getModifiedItemAttr("durationSkillBonus"))
diff --git a/eos/effects/effect4970.py b/eos/effects/effect4970.py
deleted file mode 100644
index 4c9726ea9..000000000
--- a/eos/effects/effect4970.py
+++ /dev/null
@@ -1,20 +0,0 @@
-# boosterShieldBoostAmountPenaltyShieldSkills
-#
-# Used by:
-# Implants named like: Crash Booster (3 of 4)
-# Implants named like: Frentix Booster (3 of 4)
-# Implants named like: Mindflood Booster (3 of 4)
-type = "boosterSideEffect"
-
-# User-friendly name for the side effect
-displayName = "Shield Boost"
-
-# Attribute that this effect targets
-attr = "boosterShieldBoostAmountPenalty"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Operation"), "shieldBonus",
-                                  src.getModifiedItemAttr("boosterShieldBoostAmountPenalty"))
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Shield Operation"), "shieldBonus",
-                                  src.getModifiedItemAttr("boosterShieldBoostAmountPenalty"))
diff --git a/eos/effects/effect4972.py b/eos/effects/effect4972.py
deleted file mode 100644
index 1f9169e7e..000000000
--- a/eos/effects/effect4972.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# eliteBonusAssaultShipLightMissileROF
-#
-# Used by:
-# Ship: Cambion
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Missile Launcher Light",
-                                  "speed", ship.getModifiedItemAttr("eliteBonusGunship1"), skill="Assault Frigates")
diff --git a/eos/effects/effect4973.py b/eos/effects/effect4973.py
deleted file mode 100644
index 4d7622063..000000000
--- a/eos/effects/effect4973.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# eliteBonusAssaultShipRocketROF
-#
-# Used by:
-# Ship: Cambion
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Missile Launcher Rocket",
-                                  "speed", ship.getModifiedItemAttr("eliteBonusGunship1"), skill="Assault Frigates")
diff --git a/eos/effects/effect4974.py b/eos/effects/effect4974.py
deleted file mode 100644
index 4856571cf..000000000
--- a/eos/effects/effect4974.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# eliteBonusMarauderShieldBonus2a
-#
-# Used by:
-# Ship: Golem
-# Ship: Vargur
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Operation"),
-                                  "shieldBonus", ship.getModifiedItemAttr("eliteBonusViolators2"), skill="Marauders")
diff --git a/eos/effects/effect4975.py b/eos/effects/effect4975.py
deleted file mode 100644
index c07b02c44..000000000
--- a/eos/effects/effect4975.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusMissileKineticlATF2
-#
-# Used by:
-# Ship: Cambion
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"),
-                                    "kineticDamage", ship.getModifiedItemAttr("shipBonusATF2"))
diff --git a/eos/effects/effect4976.py b/eos/effects/effect4976.py
deleted file mode 100644
index 00ced0d4f..000000000
--- a/eos/effects/effect4976.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# skillReactiveArmorHardenerDurationBonus
-#
-# Used by:
-# Skill: Resistance Phasing
-type = "passive"
-
-
-def handler(fit, src, context):
-    lvl = src.level
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Armor Resistance Shift Hardener", "duration",
-                                  src.getModifiedItemAttr("durationBonus") * lvl)
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Resistance Phasing"), "duration",
-                                  src.getModifiedItemAttr("durationBonus") * lvl)
diff --git a/eos/effects/effect4989.py b/eos/effects/effect4989.py
deleted file mode 100644
index 9593201fc..000000000
--- a/eos/effects/effect4989.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# missileSkillAoeCloudSizeBonusAllIncludingCapitals
-#
-# Used by:
-# Implants named like: Crash Booster (4 of 4)
-type = "passive"
-
-
-def handler(fit, implant, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"),
-                                    "aoeCloudSize", implant.getModifiedItemAttr("aoeCloudSizeBonus"))
diff --git a/eos/effects/effect4990.py b/eos/effects/effect4990.py
deleted file mode 100644
index 4372da104..000000000
--- a/eos/effects/effect4990.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipEnergyTCapNeedBonusRookie
-#
-# Used by:
-# Ship: Hematos
-# Ship: Impairor
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Energy Turret"),
-                                  "capacitorNeed", ship.getModifiedItemAttr("rookieSETCapBonus"))
diff --git a/eos/effects/effect4991.py b/eos/effects/effect4991.py
deleted file mode 100644
index d32fd04e7..000000000
--- a/eos/effects/effect4991.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# shipSETDmgBonusRookie
-#
-# Used by:
-# Ship: Hematos
-# Ship: Immolator
-# Ship: Impairor
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Energy Turret"),
-                                  "damageMultiplier", ship.getModifiedItemAttr("rookieSETDamageBonus"))
diff --git a/eos/effects/effect4994.py b/eos/effects/effect4994.py
deleted file mode 100644
index 41cb429c6..000000000
--- a/eos/effects/effect4994.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# shipArmorEMResistanceRookie
-#
-# Used by:
-# Ship: Devoter
-# Ship: Gold Magnate
-# Ship: Impairor
-# Ship: Phobos
-# Ship: Silver Magnate
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.ship.boostItemAttr("armorEmDamageResonance", ship.getModifiedItemAttr("rookieArmorResistanceBonus"))
diff --git a/eos/effects/effect4995.py b/eos/effects/effect4995.py
deleted file mode 100644
index a3ffd9333..000000000
--- a/eos/effects/effect4995.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# shipArmorEXResistanceRookie
-#
-# Used by:
-# Ship: Devoter
-# Ship: Gold Magnate
-# Ship: Impairor
-# Ship: Phobos
-# Ship: Silver Magnate
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.ship.boostItemAttr("armorExplosiveDamageResonance", ship.getModifiedItemAttr("rookieArmorResistanceBonus"))
diff --git a/eos/effects/effect4996.py b/eos/effects/effect4996.py
deleted file mode 100644
index 9932056eb..000000000
--- a/eos/effects/effect4996.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# shipArmorKNResistanceRookie
-#
-# Used by:
-# Ship: Devoter
-# Ship: Gold Magnate
-# Ship: Impairor
-# Ship: Phobos
-# Ship: Silver Magnate
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.ship.boostItemAttr("armorKineticDamageResonance", ship.getModifiedItemAttr("rookieArmorResistanceBonus"))
diff --git a/eos/effects/effect4997.py b/eos/effects/effect4997.py
deleted file mode 100644
index 3c4a8f289..000000000
--- a/eos/effects/effect4997.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# shipArmorTHResistanceRookie
-#
-# Used by:
-# Ship: Devoter
-# Ship: Gold Magnate
-# Ship: Impairor
-# Ship: Phobos
-# Ship: Silver Magnate
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.ship.boostItemAttr("armorThermalDamageResonance", ship.getModifiedItemAttr("rookieArmorResistanceBonus"))
diff --git a/eos/effects/effect4999.py b/eos/effects/effect4999.py
deleted file mode 100644
index 417e8cc67..000000000
--- a/eos/effects/effect4999.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipHybridRangeBonusRookie
-#
-# Used by:
-# Ship: Ibis
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Hybrid Turret"),
-                                  "maxRange", ship.getModifiedItemAttr("rookieSHTOptimalBonus"))
diff --git a/eos/effects/effect50.py b/eos/effects/effect50.py
deleted file mode 100644
index bebf517a7..000000000
--- a/eos/effects/effect50.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# modifyShieldRechargeRate
-#
-# Used by:
-# 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 Recharger (4 of 4)
-# Modules named like: Flux Coil (12 of 12)
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.ship.multiplyItemAttr("shieldRechargeRate", module.getModifiedItemAttr("shieldRechargeRateMultiplier") or 1)
diff --git a/eos/effects/effect5000.py b/eos/effects/effect5000.py
deleted file mode 100644
index 4ab352344..000000000
--- a/eos/effects/effect5000.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipMissileKineticDamageRookie
-#
-# Used by:
-# Ship: Ibis
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"),
-                                    "kineticDamage", ship.getModifiedItemAttr("rookieMissileKinDamageBonus"))
diff --git a/eos/effects/effect5008.py b/eos/effects/effect5008.py
deleted file mode 100644
index 7005269f0..000000000
--- a/eos/effects/effect5008.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipShieldEMResistanceRookie
-#
-# Used by:
-# Ships from group: Heavy Interdiction Cruiser (3 of 5)
-# Ship: Ibis
-# Ship: Taipan
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.ship.boostItemAttr("shieldEmDamageResonance", ship.getModifiedItemAttr("rookieShieldResistBonus"))
diff --git a/eos/effects/effect5009.py b/eos/effects/effect5009.py
deleted file mode 100644
index fc80e979d..000000000
--- a/eos/effects/effect5009.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipShieldExplosiveResistanceRookie
-#
-# Used by:
-# Ships from group: Heavy Interdiction Cruiser (3 of 5)
-# Ship: Ibis
-# Ship: Taipan
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.ship.boostItemAttr("shieldExplosiveDamageResonance", ship.getModifiedItemAttr("rookieShieldResistBonus"))
diff --git a/eos/effects/effect5011.py b/eos/effects/effect5011.py
deleted file mode 100644
index 1d9a00d39..000000000
--- a/eos/effects/effect5011.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipShieldKineticResistanceRookie
-#
-# Used by:
-# Ships from group: Heavy Interdiction Cruiser (3 of 5)
-# Ship: Ibis
-# Ship: Taipan
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.ship.boostItemAttr("shieldKineticDamageResonance", ship.getModifiedItemAttr("rookieShieldResistBonus"))
diff --git a/eos/effects/effect5012.py b/eos/effects/effect5012.py
deleted file mode 100644
index 6b270aa7d..000000000
--- a/eos/effects/effect5012.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipShieldThermalResistanceRookie
-#
-# Used by:
-# Ships from group: Heavy Interdiction Cruiser (3 of 5)
-# Ship: Ibis
-# Ship: Taipan
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.ship.boostItemAttr("shieldThermalDamageResonance", ship.getModifiedItemAttr("rookieShieldResistBonus"))
diff --git a/eos/effects/effect5013.py b/eos/effects/effect5013.py
deleted file mode 100644
index 5603af34a..000000000
--- a/eos/effects/effect5013.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# shipSHTDmgBonusRookie
-#
-# Used by:
-# Ship: Velator
-# Ship: Violator
-# Ship: Virtuoso
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Hybrid Turret"),
-                                  "damageMultiplier", ship.getModifiedItemAttr("rookieSHTDamageBonus"))
diff --git a/eos/effects/effect5014.py b/eos/effects/effect5014.py
deleted file mode 100644
index 23c9a4b5b..000000000
--- a/eos/effects/effect5014.py
+++ /dev/null
@@ -1,14 +0,0 @@
-# shipBonusDroneDamageMultiplierRookie
-#
-# Used by:
-# Ship: Gnosis
-# Ship: Praxis
-# Ship: Sunesis
-# Ship: Taipan
-# Ship: Velator
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Drones"),
-                                 "damageMultiplier", ship.getModifiedItemAttr("rookieDroneBonus"))
diff --git a/eos/effects/effect5015.py b/eos/effects/effect5015.py
deleted file mode 100644
index 82fb26288..000000000
--- a/eos/effects/effect5015.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusEwRemoteSensorDampenerMaxTargetRangeBonusRookie
-#
-# Used by:
-# Ship: Velator
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Sensor Dampener",
-                                  "maxTargetRangeBonus", ship.getModifiedItemAttr("rookieDampStrengthBonus"))
diff --git a/eos/effects/effect5016.py b/eos/effects/effect5016.py
deleted file mode 100644
index 6cc41c30d..000000000
--- a/eos/effects/effect5016.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusEwRemoteSensorDampenerScanResolutionBonusRookie
-#
-# Used by:
-# Ship: Velator
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Sensor Dampener",
-                                  "scanResolutionBonus", ship.getModifiedItemAttr("rookieDampStrengthBonus"))
diff --git a/eos/effects/effect5017.py b/eos/effects/effect5017.py
deleted file mode 100644
index 91a18b03d..000000000
--- a/eos/effects/effect5017.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipArmorRepairingRookie
-#
-# Used by:
-# Ship: Velator
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Repair Systems"),
-                                  "armorDamageAmount", ship.getModifiedItemAttr("rookieArmorRepBonus"))
diff --git a/eos/effects/effect5018.py b/eos/effects/effect5018.py
deleted file mode 100644
index b0634e3f3..000000000
--- a/eos/effects/effect5018.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# shipVelocityBonusRookie
-#
-# Used by:
-# Ship: Reaper
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.ship.boostItemAttr("maxVelocity", ship.getModifiedItemAttr("rookieShipVelocityBonus"))
diff --git a/eos/effects/effect5019.py b/eos/effects/effect5019.py
deleted file mode 100644
index 92b3330dc..000000000
--- a/eos/effects/effect5019.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# minmatarShipEwTargetPainterRookie
-#
-# Used by:
-# Ship: Reaper
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Target Painter",
-                                  "signatureRadiusBonus", ship.getModifiedItemAttr("rookieTargetPainterStrengthBonus"))
diff --git a/eos/effects/effect5020.py b/eos/effects/effect5020.py
deleted file mode 100644
index 3646da72c..000000000
--- a/eos/effects/effect5020.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipSPTDmgBonusRookie
-#
-# Used by:
-# Ship: Echo
-# Ship: Reaper
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Projectile Turret"),
-                                  "damageMultiplier", ship.getModifiedItemAttr("rookieSPTDamageBonus"))
diff --git a/eos/effects/effect5021.py b/eos/effects/effect5021.py
deleted file mode 100644
index 55cf58a78..000000000
--- a/eos/effects/effect5021.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipShieldBoostRookie
-#
-# Used by:
-# Ship: Immolator
-# Ship: Reaper
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Operation"),
-                                  "shieldBonus", ship.getModifiedItemAttr("rookieShieldBoostBonus"))
diff --git a/eos/effects/effect5028.py b/eos/effects/effect5028.py
deleted file mode 100644
index 312932605..000000000
--- a/eos/effects/effect5028.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# shipECMScanStrengthBonusRookie
-#
-# Used by:
-# Ship: Ibis
-type = "passive"
-
-
-def handler(fit, ship, context):
-    for type in ("Gravimetric", "Ladar", "Radar", "Magnetometric"):
-        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "ECM",
-                                      "scan{0}StrengthBonus".format(type),
-                                      ship.getModifiedItemAttr("rookieECMStrengthBonus"))
diff --git a/eos/effects/effect5029.py b/eos/effects/effect5029.py
deleted file mode 100644
index 789754258..000000000
--- a/eos/effects/effect5029.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# shipBonusDroneMiningAmountRole
-#
-# Used by:
-# Ships from group: Industrial Command Ship (2 of 2)
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Mining Drone Operation"),
-                                 "miningAmount",
-                                 src.getModifiedItemAttr("roleBonusDroneMiningYield"),
-                                 )
diff --git a/eos/effects/effect5030.py b/eos/effects/effect5030.py
deleted file mode 100644
index 5e0be29e2..000000000
--- a/eos/effects/effect5030.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# shipBonusMiningDroneAmountPercentRookie
-#
-# Used by:
-# Ship: Gnosis
-# Ship: Praxis
-# Ship: Taipan
-# Ship: Velator
-type = "passive"
-
-
-def handler(fit, container, context):
-    fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Mining Drone Operation"),
-                                 "miningAmount", container.getModifiedItemAttr("rookieDroneBonus"))
diff --git a/eos/effects/effect5035.py b/eos/effects/effect5035.py
deleted file mode 100644
index 3862e2144..000000000
--- a/eos/effects/effect5035.py
+++ /dev/null
@@ -1,16 +0,0 @@
-# shipBonusDroneHitpointsRookie
-#
-# Used by:
-# Variations of ship: Procurer (2 of 2)
-# Ship: Gnosis
-# Ship: Praxis
-# Ship: Sunesis
-# Ship: Taipan
-# Ship: Velator
-type = "passive"
-
-
-def handler(fit, ship, context):
-    for type in ("shieldCapacity", "armorHP", "hp"):
-        fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Drones"),
-                                     type, ship.getModifiedItemAttr("rookieDroneBonus"))
diff --git a/eos/effects/effect5036.py b/eos/effects/effect5036.py
deleted file mode 100644
index c5cdf079c..000000000
--- a/eos/effects/effect5036.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusSalvageCycleAF
-#
-# Used by:
-# Ship: Magnate
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Salvaging"),
-                                  "duration", ship.getModifiedItemAttr("shipBonusAF"), skill="Amarr Frigate")
diff --git a/eos/effects/effect504.py b/eos/effects/effect504.py
deleted file mode 100644
index ba150045c..000000000
--- a/eos/effects/effect504.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# scoutDroneOperationDroneRangeBonusModAddDroneControlDistanceChar
-#
-# Used by:
-# Modules named like: Drone Control Range Augmentor (8 of 8)
-# Skills named like: Drone Avionics (2 of 2)
-type = "passive"
-
-
-def handler(fit, container, context):
-    level = container.level if "skill" in context else 1
-    amount = container.getModifiedItemAttr("droneRangeBonus") * level
-    fit.extraAttributes.increase("droneControlRange", amount)
diff --git a/eos/effects/effect5045.py b/eos/effects/effect5045.py
deleted file mode 100644
index 88802e78e..000000000
--- a/eos/effects/effect5045.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusSalvageCycleCF
-#
-# Used by:
-# Ship: Heron
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Salvaging"),
-                                  "duration", ship.getModifiedItemAttr("shipBonusCF"), skill="Caldari Frigate")
diff --git a/eos/effects/effect5048.py b/eos/effects/effect5048.py
deleted file mode 100644
index 60dd7e948..000000000
--- a/eos/effects/effect5048.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusSalvageCycleGF
-#
-# Used by:
-# Ship: Imicus
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Salvaging"),
-                                  "duration", ship.getModifiedItemAttr("shipBonusGF"), skill="Amarr Frigate")
diff --git a/eos/effects/effect5051.py b/eos/effects/effect5051.py
deleted file mode 100644
index 738c4e6eb..000000000
--- a/eos/effects/effect5051.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusSalvageCycleMF
-#
-# Used by:
-# Ship: Probe
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Salvaging"),
-                                  "duration", ship.getModifiedItemAttr("shipBonusMF"), skill="Minmatar Frigate")
diff --git a/eos/effects/effect5055.py b/eos/effects/effect5055.py
deleted file mode 100644
index 2b2cc75c8..000000000
--- a/eos/effects/effect5055.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# iceHarvesterDurationMultiplier
-#
-# Used by:
-# Ship: Endurance
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemMultiply(lambda mod: mod.item.requiresSkill("Ice Harvesting"),
-                                     "duration", ship.getModifiedItemAttr("iceHarvestCycleBonus"))
diff --git a/eos/effects/effect5058.py b/eos/effects/effect5058.py
deleted file mode 100644
index 13b45eb39..000000000
--- a/eos/effects/effect5058.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# miningYieldMultiplyPassive
-#
-# Used by:
-# Variations of ship: Venture (3 of 3)
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.modules.filteredItemMultiply(lambda mod: mod.item.requiresSkill("Mining"),
-                                     "miningAmount", module.getModifiedItemAttr("miningAmountMultiplier"))
diff --git a/eos/effects/effect5059.py b/eos/effects/effect5059.py
deleted file mode 100644
index 2e099cc24..000000000
--- a/eos/effects/effect5059.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipBonusIceHarvesterDurationORE3
-#
-# Used by:
-# Ships from group: Exhumer (3 of 3)
-# Ships from group: Mining Barge (3 of 3)
-type = "passive"
-
-
-def handler(fit, container, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Ice Harvesting"),
-                                  "duration", container.getModifiedItemAttr("shipBonusORE3"), skill="Mining Barge")
diff --git a/eos/effects/effect506.py b/eos/effects/effect506.py
deleted file mode 100644
index bdc5f5269..000000000
--- a/eos/effects/effect506.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# fuelConservationCapNeedBonusPostPercentCapacitorNeedLocationShipModulesRequiringAfterburner
-#
-# Used by:
-# Skill: Afterburner
-# Skill: Fuel Conservation
-type = "passive"
-
-
-def handler(fit, skill, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Afterburner"),
-                                  "capacitorNeed", skill.getModifiedItemAttr("capNeedBonus") * skill.level)
diff --git a/eos/effects/effect5066.py b/eos/effects/effect5066.py
deleted file mode 100644
index da9b2c09f..000000000
--- a/eos/effects/effect5066.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipBonusTargetPainterOptimalMF1
-#
-# Used by:
-# Ship: Hyena
-# Ship: Vigil
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Target Painting"),
-                                  "maxRange", ship.getModifiedItemAttr("shipBonusMF"), skill="Minmatar Frigate")
diff --git a/eos/effects/effect5067.py b/eos/effects/effect5067.py
deleted file mode 100644
index fccf39e52..000000000
--- a/eos/effects/effect5067.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# shipBonusOreHoldORE2
-#
-# Used by:
-# Variations of ship: Retriever (2 of 2)
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.ship.boostItemAttr("specialOreHoldCapacity", ship.getModifiedItemAttr("shipBonusORE2"), skill="Mining Barge")
diff --git a/eos/effects/effect5068.py b/eos/effects/effect5068.py
deleted file mode 100644
index 901026323..000000000
--- a/eos/effects/effect5068.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# shipBonusShieldCapacityORE2
-#
-# Used by:
-# Variations of ship: Procurer (2 of 2)
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.ship.boostItemAttr("shieldCapacity", ship.getModifiedItemAttr("shipBonusORE2"), skill="Mining Barge")
diff --git a/eos/effects/effect5069.py b/eos/effects/effect5069.py
deleted file mode 100644
index 97a255397..000000000
--- a/eos/effects/effect5069.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# mercoxitCrystalBonus
-#
-# Used by:
-# Module: Medium Mercoxit Mining Crystal Optimization I
-type = "passive"
-runTime = "early"
-
-
-def handler(fit, module, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Mercoxit Processing"),
-                                    "specialisationAsteroidYieldMultiplier",
-                                    module.getModifiedItemAttr("miningAmountBonus"))
diff --git a/eos/effects/effect507.py b/eos/effects/effect507.py
deleted file mode 100644
index ac11238db..000000000
--- a/eos/effects/effect507.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# longRangeTargetingMaxTargetRangeBonusPostPercentMaxTargetRangeLocationShipGroupElectronic
-#
-# Used by:
-# Implants named like: Zainou 'Gypsy' Long Range Targeting LT (6 of 6)
-# Skill: Long Range Targeting
-type = "passive"
-
-
-def handler(fit, container, context):
-    level = container.level if "skill" in context else 1
-    fit.ship.boostItemAttr("maxTargetRange", container.getModifiedItemAttr("maxTargetRangeBonus") * level)
diff --git a/eos/effects/effect5079.py b/eos/effects/effect5079.py
deleted file mode 100644
index c5a047761..000000000
--- a/eos/effects/effect5079.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipMissileKineticDamageCF2
-#
-# Used by:
-# Ship: Garmur
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"),
-                                    "kineticDamage", ship.getModifiedItemAttr("shipBonusCF2"), skill="Caldari Frigate")
diff --git a/eos/effects/effect508.py b/eos/effects/effect508.py
deleted file mode 100644
index c7ad6a186..000000000
--- a/eos/effects/effect508.py
+++ /dev/null
@@ -1,16 +0,0 @@
-# shipPDmgBonusMF
-#
-# Used by:
-# Ship: Cheetah
-# Ship: Freki
-# Ship: Republic Fleet Firetail
-# Ship: Rifter
-# Ship: Slasher
-# Ship: Stiletto
-# Ship: Wolf
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Projectile Turret"),
-                                  "damageMultiplier", ship.getModifiedItemAttr("shipBonusMF"), skill="Minmatar Frigate")
diff --git a/eos/effects/effect5080.py b/eos/effects/effect5080.py
deleted file mode 100644
index 1e884505d..000000000
--- a/eos/effects/effect5080.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# shipMissileVelocityCF
-#
-# Used by:
-# Ship: Caldari Navy Hookbill
-# Ship: Crow
-# Ship: Kestrel
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"),
-                                    "maxVelocity", ship.getModifiedItemAttr("shipBonusCF"), skill="Caldari Frigate")
diff --git a/eos/effects/effect5081.py b/eos/effects/effect5081.py
deleted file mode 100644
index 6a0c0e916..000000000
--- a/eos/effects/effect5081.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# maxTargetingRangeBonusPostPercentPassive
-#
-# Used by:
-# Modules named like: Ionic Field Projector (8 of 8)
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.ship.boostItemAttr("maxTargetRange", module.getModifiedItemAttr("maxTargetRangeBonus"),
-                           stackingPenalties=True)
diff --git a/eos/effects/effect5087.py b/eos/effects/effect5087.py
deleted file mode 100644
index 62058ca89..000000000
--- a/eos/effects/effect5087.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# shipBonusDroneHitpointsGF
-#
-# Used by:
-# Ship: Astero
-# Ship: Maulus Navy Issue
-# Ship: Tristan
-type = "passive"
-
-
-def handler(fit, ship, context):
-    for layer in ("shieldCapacity", "armorHP", "hp"):
-        fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Drones"),
-                                     layer, ship.getModifiedItemAttr("shipBonusGF"), skill="Gallente Frigate")
diff --git a/eos/effects/effect5090.py b/eos/effects/effect5090.py
deleted file mode 100644
index ced5d2799..000000000
--- a/eos/effects/effect5090.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipShieldBoostMF
-#
-# Used by:
-# Ship: Breacher
-# Ship: Jaguar
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Operation"),
-                                  "shieldBonus", ship.getModifiedItemAttr("shipBonusMF"), skill="Minmatar Frigate")
diff --git a/eos/effects/effect51.py b/eos/effects/effect51.py
deleted file mode 100644
index 95814ce8c..000000000
--- a/eos/effects/effect51.py
+++ /dev/null
@@ -1,14 +0,0 @@
-# modifyPowerRechargeRate
-#
-# Used by:
-# Modules from group: Capacitor Flux Coil (6 of 6)
-# 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 Power Relay (6 of 6)
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.ship.multiplyItemAttr("rechargeRate", module.getModifiedItemAttr("capacitorRechargeRateMultiplier"))
diff --git a/eos/effects/effect5103.py b/eos/effects/effect5103.py
deleted file mode 100644
index 61732a557..000000000
--- a/eos/effects/effect5103.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusShieldTransferCapNeedCF
-#
-# Used by:
-# Variations of ship: Bantam (2 of 2)
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Emission Systems"),
-                                  "capacitorNeed", ship.getModifiedItemAttr("shipBonusCF"), skill="Caldari Frigate")
diff --git a/eos/effects/effect5104.py b/eos/effects/effect5104.py
deleted file mode 100644
index 164975e92..000000000
--- a/eos/effects/effect5104.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusShieldTransferBoostAmountCF2
-#
-# Used by:
-# Variations of ship: Bantam (2 of 2)
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Emission Systems"),
-                                  "shieldBonus", ship.getModifiedItemAttr("shipBonusCF2"), skill="Caldari Frigate")
diff --git a/eos/effects/effect5105.py b/eos/effects/effect5105.py
deleted file mode 100644
index 3f164c524..000000000
--- a/eos/effects/effect5105.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusShieldTransferCapNeedMF
-#
-# Used by:
-# Variations of ship: Burst (2 of 2)
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Emission Systems"),
-                                  "capacitorNeed", ship.getModifiedItemAttr("shipBonusMF"), skill="Minmatar Frigate")
diff --git a/eos/effects/effect5106.py b/eos/effects/effect5106.py
deleted file mode 100644
index a1c552524..000000000
--- a/eos/effects/effect5106.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusShieldTransferBoostAmountMF2
-#
-# Used by:
-# Variations of ship: Burst (2 of 2)
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Emission Systems"),
-                                  "shieldBonus", ship.getModifiedItemAttr("shipBonusMF2"), skill="Minmatar Frigate")
diff --git a/eos/effects/effect5107.py b/eos/effects/effect5107.py
deleted file mode 100644
index b4bc7bbff..000000000
--- a/eos/effects/effect5107.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusRemoteArmorRepairCapNeedGF
-#
-# Used by:
-# Variations of ship: Navitas (2 of 2)
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Remote Armor Repair Systems"), "capacitorNeed",
-                                  src.getModifiedItemAttr("shipBonusGF"), skill="Gallente Frigate")
diff --git a/eos/effects/effect5108.py b/eos/effects/effect5108.py
deleted file mode 100644
index d1cba9063..000000000
--- a/eos/effects/effect5108.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipBonusRemoteArmorRepairAmountGF2
-#
-# Used by:
-# Variations of ship: Navitas (2 of 2)
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Remote Armor Repair Systems"),
-                                  "armorDamageAmount", src.getModifiedItemAttr("shipBonusGF2"),
-                                  skill="Gallente Frigate")
diff --git a/eos/effects/effect5109.py b/eos/effects/effect5109.py
deleted file mode 100644
index 41c5b3e47..000000000
--- a/eos/effects/effect5109.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipBonusRemoteArmorRepairCapNeedAF
-#
-# Used by:
-# Ship: Deacon
-# Ship: Inquisitor
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Remote Armor Repair Systems"), "capacitorNeed",
-                                  src.getModifiedItemAttr("shipBonusAF"), skill="Amarr Frigate")
diff --git a/eos/effects/effect511.py b/eos/effects/effect511.py
deleted file mode 100644
index ecac0f30c..000000000
--- a/eos/effects/effect511.py
+++ /dev/null
@@ -1,16 +0,0 @@
-# shipEnergyTCapNeedBonusAF
-#
-# Used by:
-# Ship: Crusader
-# Ship: Executioner
-# Ship: Gold Magnate
-# Ship: Punisher
-# Ship: Retribution
-# Ship: Silver Magnate
-# Ship: Tormentor
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Energy Turret"),
-                                  "capacitorNeed", ship.getModifiedItemAttr("shipBonus2AF"), skill="Amarr Frigate")
diff --git a/eos/effects/effect5110.py b/eos/effects/effect5110.py
deleted file mode 100644
index 68da161e5..000000000
--- a/eos/effects/effect5110.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipBonusRemoteArmorRepairAmount2AF
-#
-# Used by:
-# Ship: Deacon
-# Ship: Inquisitor
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Remote Armor Repair Systems"),
-                                  "armorDamageAmount", src.getModifiedItemAttr("shipBonus2AF"), skill="Amarr Frigate")
diff --git a/eos/effects/effect5111.py b/eos/effects/effect5111.py
deleted file mode 100644
index b98c308e0..000000000
--- a/eos/effects/effect5111.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipBonusDroneTrackingGF
-#
-# Used by:
-# Ship: Maulus Navy Issue
-# Ship: Tristan
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Drones"),
-                                 "trackingSpeed", ship.getModifiedItemAttr("shipBonusGF"), skill="Gallente Frigate")
diff --git a/eos/effects/effect5119.py b/eos/effects/effect5119.py
deleted file mode 100644
index e3df5259c..000000000
--- a/eos/effects/effect5119.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipBonusScanProbeStrength2AF
-#
-# Used by:
-# Ship: Magnate
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.group.name == "Scanner Probe",
-                                    "baseSensorStrength", ship.getModifiedItemAttr("shipBonus2AF"),
-                                    skill="Amarr Frigate")
diff --git a/eos/effects/effect512.py b/eos/effects/effect512.py
deleted file mode 100644
index d99426da0..000000000
--- a/eos/effects/effect512.py
+++ /dev/null
@@ -1,15 +0,0 @@
-# shipSHTDmgBonusGF
-#
-# Used by:
-# Variations of ship: Incursus (3 of 3)
-# Ship: Atron
-# Ship: Federation Navy Comet
-# Ship: Helios
-# Ship: Pacifier
-# Ship: Taranis
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Hybrid Turret"),
-                                  "damageMultiplier", ship.getModifiedItemAttr("shipBonusGF"), skill="Gallente Frigate")
diff --git a/eos/effects/effect5121.py b/eos/effects/effect5121.py
deleted file mode 100644
index b863b95ec..000000000
--- a/eos/effects/effect5121.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# energyTransferArrayTransferAmountBonus
-#
-# Used by:
-# Ship: Augoror
-# Ship: Osprey
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Remote Capacitor Transmitter",
-                                  "powerTransferAmount", ship.getModifiedItemAttr("energyTransferAmountBonus"))
diff --git a/eos/effects/effect5122.py b/eos/effects/effect5122.py
deleted file mode 100644
index 89d41277d..000000000
--- a/eos/effects/effect5122.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusShieldTransferCapneedMC1
-#
-# Used by:
-# Ship: Scythe
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Emission Systems"),
-                                  "capacitorNeed", ship.getModifiedItemAttr("shipBonusMC"), skill="Minmatar Cruiser")
diff --git a/eos/effects/effect5123.py b/eos/effects/effect5123.py
deleted file mode 100644
index d8d32bf66..000000000
--- a/eos/effects/effect5123.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusRemoteArmorRepairCapNeedAC1
-#
-# Used by:
-# Ship: Augoror
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Remote Armor Repair Systems"), "capacitorNeed",
-                                  src.getModifiedItemAttr("shipBonusAC"), skill="Amarr Cruiser")
diff --git a/eos/effects/effect5124.py b/eos/effects/effect5124.py
deleted file mode 100644
index b671bc196..000000000
--- a/eos/effects/effect5124.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusRemoteArmorRepairAmountAC2
-#
-# Used by:
-# Ship: Augoror
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Remote Armor Repair Systems"),
-                                  "armorDamageAmount", src.getModifiedItemAttr("shipBonusAC2"), skill="Amarr Cruiser")
diff --git a/eos/effects/effect5125.py b/eos/effects/effect5125.py
deleted file mode 100644
index ec701a318..000000000
--- a/eos/effects/effect5125.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipBonusRemoteArmorRepairAmountGC2
-#
-# Used by:
-# Ship: Exequror
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Remote Armor Repair Systems"),
-                                  "armorDamageAmount", src.getModifiedItemAttr("shipBonusGC2"),
-                                  skill="Gallente Cruiser")
diff --git a/eos/effects/effect5126.py b/eos/effects/effect5126.py
deleted file mode 100644
index 734821576..000000000
--- a/eos/effects/effect5126.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusShieldTransferBoostAmountCC2
-#
-# Used by:
-# Ship: Osprey
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Emission Systems"),
-                                  "shieldBonus", ship.getModifiedItemAttr("shipBonusCC2"), skill="Caldari Cruiser")
diff --git a/eos/effects/effect5127.py b/eos/effects/effect5127.py
deleted file mode 100644
index 901826281..000000000
--- a/eos/effects/effect5127.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusShieldTransferBoostAmountMC2
-#
-# Used by:
-# Ship: Scythe
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Emission Systems"),
-                                  "shieldBonus", ship.getModifiedItemAttr("shipBonusMC2"), skill="Minmatar Cruiser")
diff --git a/eos/effects/effect5128.py b/eos/effects/effect5128.py
deleted file mode 100644
index 2c87e50e9..000000000
--- a/eos/effects/effect5128.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusEwRemoteSensorDampenerOptimalBonusGC1
-#
-# Used by:
-# Ship: Celestis
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Sensor Dampener",
-                                  "maxRange", ship.getModifiedItemAttr("shipBonusGC"), skill="Gallente Cruiser")
diff --git a/eos/effects/effect5129.py b/eos/effects/effect5129.py
deleted file mode 100644
index e1f9fcb2d..000000000
--- a/eos/effects/effect5129.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# minmatarShipEwTargetPainterMC1
-#
-# Used by:
-# Ship: Bellicose
-# Ship: Rapier
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Target Painter",
-                                  "signatureRadiusBonus", ship.getModifiedItemAttr("shipBonusMC"),
-                                  skill="Minmatar Cruiser")
diff --git a/eos/effects/effect5131.py b/eos/effects/effect5131.py
deleted file mode 100644
index bda638ace..000000000
--- a/eos/effects/effect5131.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# shipMissileRofCC
-#
-# Used by:
-# Ships named like: Caracal (2 of 2)
-# Ship: Enforcer
-type = "passive"
-
-
-def handler(fit, ship, context):
-    groups = ("Missile Launcher Heavy", "Missile Launcher Rapid Light", "Missile Launcher Heavy Assault")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name in groups,
-                                  "speed", ship.getModifiedItemAttr("shipBonusCC"), skill="Caldari Cruiser")
diff --git a/eos/effects/effect5132.py b/eos/effects/effect5132.py
deleted file mode 100644
index 85f4a70f8..000000000
--- a/eos/effects/effect5132.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipPTurretFalloffBonusMC2
-#
-# Used by:
-# Ship: Enforcer
-# Ship: Stabber
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Projectile Turret"),
-                                  "falloff", ship.getModifiedItemAttr("shipBonusMC2"), skill="Minmatar Cruiser")
diff --git a/eos/effects/effect5133.py b/eos/effects/effect5133.py
deleted file mode 100644
index 1cc54e2c7..000000000
--- a/eos/effects/effect5133.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipHTDamageBonusCC
-#
-# Used by:
-# Ship: Moa
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Hybrid Turret"),
-                                  "damageMultiplier", ship.getModifiedItemAttr("shipBonusCC"), skill="Caldari Cruiser")
diff --git a/eos/effects/effect5136.py b/eos/effects/effect5136.py
deleted file mode 100644
index 8cdb47763..000000000
--- a/eos/effects/effect5136.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# shipMETCDamageBonusAC
-#
-# Used by:
-# Ship: Augoror Navy Issue
-# Ship: Enforcer
-# Ship: Maller
-# Ship: Omen Navy Issue
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Energy Turret"),
-                                  "damageMultiplier", ship.getModifiedItemAttr("shipBonusAC"), skill="Amarr Cruiser")
diff --git a/eos/effects/effect5139.py b/eos/effects/effect5139.py
deleted file mode 100644
index ca0981dc7..000000000
--- a/eos/effects/effect5139.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipMiningBonusOREfrig1
-#
-# Used by:
-# Variations of ship: Venture (3 of 3)
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Mining"),
-                                  "miningAmount", module.getModifiedItemAttr("shipBonusOREfrig1"),
-                                  skill="Mining Frigate")
diff --git a/eos/effects/effect514.py b/eos/effects/effect514.py
deleted file mode 100644
index 5ecc4f4a2..000000000
--- a/eos/effects/effect514.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# shipSETDmgBonusAF
-#
-# Used by:
-# Ship: Executioner
-# Ship: Gold Magnate
-# Ship: Silver Magnate
-# Ship: Tormentor
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Energy Turret"),
-                                  "damageMultiplier", ship.getModifiedItemAttr("shipBonusAF"), skill="Amarr Frigate")
diff --git a/eos/effects/effect5142.py b/eos/effects/effect5142.py
deleted file mode 100644
index c62e662e5..000000000
--- a/eos/effects/effect5142.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# GCHYieldMultiplyPassive
-#
-# Used by:
-# Ship: Prospect
-# Ship: Venture
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.modules.filteredItemMultiply(lambda mod: mod.item.group.name == "Gas Cloud Harvester",
-                                     "miningAmount", module.getModifiedItemAttr("miningAmountMultiplier"))
diff --git a/eos/effects/effect5153.py b/eos/effects/effect5153.py
deleted file mode 100644
index cc6e55c5d..000000000
--- a/eos/effects/effect5153.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipMissileVelocityPirateFactionRocket
-#
-# Used by:
-# Ship: Corax
-# Ship: Talwar
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Rockets"),
-                                    "maxVelocity", ship.getModifiedItemAttr("shipBonusRole7"))
diff --git a/eos/effects/effect5156.py b/eos/effects/effect5156.py
deleted file mode 100644
index 23749fa44..000000000
--- a/eos/effects/effect5156.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipGCHYieldBonusOREfrig2
-#
-# Used by:
-# Ship: Prospect
-# Ship: Venture
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Gas Cloud Harvester",
-                                  "duration", module.getModifiedItemAttr("shipBonusOREfrig2"), skill="Mining Frigate")
diff --git a/eos/effects/effect516.py b/eos/effects/effect516.py
deleted file mode 100644
index 00e4ac757..000000000
--- a/eos/effects/effect516.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# shipTCapNeedBonusAC
-#
-# Used by:
-# Ship: Devoter
-# Ship: Omen
-# Ship: Zealot
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Energy Turret"),
-                                  "capacitorNeed", ship.getModifiedItemAttr("shipBonusAC"), skill="Amarr Cruiser")
diff --git a/eos/effects/effect5162.py b/eos/effects/effect5162.py
deleted file mode 100644
index a8baab0f4..000000000
--- a/eos/effects/effect5162.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# skillReactiveArmorHardenerCapNeedBonus
-#
-# Used by:
-# Skill: Resistance Phasing
-type = "passive"
-
-
-def handler(fit, src, context):
-    lvl = src.level
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Armor Resistance Shift Hardener", "capacitorNeed",
-                                  src.getModifiedItemAttr("capNeedBonus") * lvl)
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Resistance Phasing"), "capacitorNeed",
-                                  src.getModifiedItemAttr("capNeedBonus") * lvl)
diff --git a/eos/effects/effect5165.py b/eos/effects/effect5165.py
deleted file mode 100644
index a9960c71a..000000000
--- a/eos/effects/effect5165.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipBonusDroneMWDboostrole
-#
-# Used by:
-# Ship: Algos
-# Ship: Dragoon
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Drones"),
-                                 "maxVelocity", ship.getModifiedItemAttr("shipBonusRole7"))
diff --git a/eos/effects/effect5168.py b/eos/effects/effect5168.py
deleted file mode 100644
index 1e9deef53..000000000
--- a/eos/effects/effect5168.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# droneSalvageBonus
-#
-# Used by:
-# Skill: Salvage Drone Operation
-type = "passive"
-
-
-def handler(fit, container, context):
-    fit.drones.filteredItemIncrease(lambda drone: drone.item.requiresSkill("Salvage Drone Operation"),
-                                    "accessDifficultyBonus",
-                                    container.getModifiedItemAttr("accessDifficultyBonus") * container.level)
diff --git a/eos/effects/effect5180.py b/eos/effects/effect5180.py
deleted file mode 100644
index 244f84e2a..000000000
--- a/eos/effects/effect5180.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# sensorCompensationSensorStrengthBonusGravimetric
-#
-# Used by:
-# Skill: Gravimetric Sensor Compensation
-type = "passive"
-
-
-def handler(fit, container, context):
-    fit.ship.boostItemAttr("scanGravimetricStrength",
-                           container.getModifiedItemAttr("sensorStrengthBonus") * container.level)
diff --git a/eos/effects/effect5181.py b/eos/effects/effect5181.py
deleted file mode 100644
index b046ce046..000000000
--- a/eos/effects/effect5181.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# sensorCompensationSensorStrengthBonusLadar
-#
-# Used by:
-# Skill: Ladar Sensor Compensation
-type = "passive"
-
-
-def handler(fit, container, context):
-    fit.ship.boostItemAttr("scanLadarStrength", container.getModifiedItemAttr("sensorStrengthBonus") * container.level)
diff --git a/eos/effects/effect5182.py b/eos/effects/effect5182.py
deleted file mode 100644
index 6306a2df6..000000000
--- a/eos/effects/effect5182.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# sensorCompensationSensorStrengthBonusMagnetometric
-#
-# Used by:
-# Skill: Magnetometric Sensor Compensation
-type = "passive"
-
-
-def handler(fit, container, context):
-    fit.ship.boostItemAttr("scanMagnetometricStrength",
-                           container.getModifiedItemAttr("sensorStrengthBonus") * container.level)
diff --git a/eos/effects/effect5183.py b/eos/effects/effect5183.py
deleted file mode 100644
index 2df326dca..000000000
--- a/eos/effects/effect5183.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# sensorCompensationSensorStrengthBonusRadar
-#
-# Used by:
-# Skill: Radar Sensor Compensation
-type = "passive"
-
-
-def handler(fit, container, context):
-    fit.ship.boostItemAttr("scanRadarStrength", container.getModifiedItemAttr("sensorStrengthBonus") * container.level)
diff --git a/eos/effects/effect5185.py b/eos/effects/effect5185.py
deleted file mode 100644
index e48b89b06..000000000
--- a/eos/effects/effect5185.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipEnergyVampireAmountBonusFixedAF2
-#
-# Used by:
-# Ship: Malice
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Nosferatu",
-                                  "powerTransferAmount", ship.getModifiedItemAttr("shipBonus2AF"),
-                                  skill="Amarr Frigate")
diff --git a/eos/effects/effect5187.py b/eos/effects/effect5187.py
deleted file mode 100644
index 0152e33bd..000000000
--- a/eos/effects/effect5187.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipBonusEwRemoteSensorDampenerFalloffBonusGC1
-#
-# Used by:
-# Ship: Celestis
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Sensor Dampener",
-                                  "falloffEffectiveness", ship.getModifiedItemAttr("shipBonusGC"),
-                                  skill="Gallente Cruiser")
diff --git a/eos/effects/effect5188.py b/eos/effects/effect5188.py
deleted file mode 100644
index 147d91b3c..000000000
--- a/eos/effects/effect5188.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# trackingSpeedBonusEffectHybrids
-#
-# Used by:
-# Modules named like: Hybrid Metastasis Adjuster (8 of 8)
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Hybrid Weapon",
-                                  "trackingSpeed", module.getModifiedItemAttr("trackingSpeedBonus"),
-                                  stackingPenalties=True)
diff --git a/eos/effects/effect5189.py b/eos/effects/effect5189.py
deleted file mode 100644
index da849e037..000000000
--- a/eos/effects/effect5189.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# trackingSpeedBonusEffectLasers
-#
-# Used by:
-# Modules named like: Energy Metastasis Adjuster (8 of 8)
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Weapon",
-                                  "trackingSpeed", module.getModifiedItemAttr("trackingSpeedBonus"),
-                                  stackingPenalties=True)
diff --git a/eos/effects/effect5190.py b/eos/effects/effect5190.py
deleted file mode 100644
index ed2c4d323..000000000
--- a/eos/effects/effect5190.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# trackingSpeedBonusEffectProjectiles
-#
-# Used by:
-# Modules named like: Projectile Metastasis Adjuster (8 of 8)
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Projectile Weapon",
-                                  "trackingSpeed", module.getModifiedItemAttr("trackingSpeedBonus"),
-                                  stackingPenalties=True)
diff --git a/eos/effects/effect5201.py b/eos/effects/effect5201.py
deleted file mode 100644
index f7bfd67ee..000000000
--- a/eos/effects/effect5201.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# armorUpgradesMassPenaltyReductionBonus
-#
-# 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/effect5205.py b/eos/effects/effect5205.py
deleted file mode 100644
index c901d1374..000000000
--- a/eos/effects/effect5205.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipSETTrackingBonusRookie
-#
-# Used by:
-# Ship: Immolator
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Energy Turret"),
-                                  "trackingSpeed", ship.getModifiedItemAttr("rookieSETTracking"))
diff --git a/eos/effects/effect5206.py b/eos/effects/effect5206.py
deleted file mode 100644
index 771ffbc65..000000000
--- a/eos/effects/effect5206.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipSETOptimalBonusRookie
-#
-# Used by:
-# Ship: Immolator
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Energy Turret"),
-                                  "maxRange", ship.getModifiedItemAttr("rookieSETOptimal"))
diff --git a/eos/effects/effect5207.py b/eos/effects/effect5207.py
deleted file mode 100644
index fbbe40fc0..000000000
--- a/eos/effects/effect5207.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipNOSTransferAmountBonusRookie
-#
-# Used by:
-# Ship: Hematos
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Nosferatu",
-                                  "powerTransferAmount", ship.getModifiedItemAttr("rookieNosDrain"))
diff --git a/eos/effects/effect5208.py b/eos/effects/effect5208.py
deleted file mode 100644
index 3a98a9e7c..000000000
--- a/eos/effects/effect5208.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipNeutDestabilizationAmountBonusRookie
-#
-# Used by:
-# Ship: Hematos
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Neutralizer",
-                                  "energyNeutralizerAmount", ship.getModifiedItemAttr("rookieNeutDrain"))
diff --git a/eos/effects/effect5209.py b/eos/effects/effect5209.py
deleted file mode 100644
index d8f5468c8..000000000
--- a/eos/effects/effect5209.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipWebVelocityBonusRookie
-#
-# Used by:
-# Ship: Hematos
-# Ship: Violator
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Stasis Web",
-                                  "speedFactor", ship.getModifiedItemAttr("rookieWebAmount"))
diff --git a/eos/effects/effect521.py b/eos/effects/effect521.py
deleted file mode 100644
index 644ee7a88..000000000
--- a/eos/effects/effect521.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipHRangeBonusCC
-#
-# Used by:
-# Ship: Eagle
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Hybrid Turret"),
-                                  "maxRange", ship.getModifiedItemAttr("shipBonusCC"), skill="Caldari Cruiser")
diff --git a/eos/effects/effect5212.py b/eos/effects/effect5212.py
deleted file mode 100644
index 0bb5910d9..000000000
--- a/eos/effects/effect5212.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipDroneMWDSpeedBonusRookie
-#
-# Used by:
-# Ship: Taipan
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.drones.filteredItemBoost(lambda mod: True,
-                                 "maxVelocity", ship.getModifiedItemAttr("rookieDroneMWDspeed"))
diff --git a/eos/effects/effect5213.py b/eos/effects/effect5213.py
deleted file mode 100644
index 998eb54e8..000000000
--- a/eos/effects/effect5213.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipRocketMaxVelocityBonusRookie
-#
-# Used by:
-# Ship: Taipan
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Rockets"),
-                                    "maxVelocity", ship.getModifiedItemAttr("rookieRocketVelocity"))
diff --git a/eos/effects/effect5214.py b/eos/effects/effect5214.py
deleted file mode 100644
index 9d3630a61..000000000
--- a/eos/effects/effect5214.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipLightMissileMaxVelocityBonusRookie
-#
-# Used by:
-# Ship: Taipan
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Light Missiles"),
-                                    "maxVelocity", ship.getModifiedItemAttr("rookieLightMissileVelocity"))
diff --git a/eos/effects/effect5215.py b/eos/effects/effect5215.py
deleted file mode 100644
index 48b2da45f..000000000
--- a/eos/effects/effect5215.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipSHTTrackingSpeedBonusRookie
-#
-# Used by:
-# Ship: Violator
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Hybrid Turret"),
-                                  "trackingSpeed", ship.getModifiedItemAttr("rookieSHTTracking"))
diff --git a/eos/effects/effect5216.py b/eos/effects/effect5216.py
deleted file mode 100644
index b4083f4d3..000000000
--- a/eos/effects/effect5216.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipSHTFalloffBonusRookie
-#
-# Used by:
-# Ship: Violator
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Hybrid Turret"),
-                                  "falloff", ship.getModifiedItemAttr("rookieSHTFalloff"))
diff --git a/eos/effects/effect5217.py b/eos/effects/effect5217.py
deleted file mode 100644
index c6a0bca15..000000000
--- a/eos/effects/effect5217.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipSPTTrackingSpeedBonusRookie
-#
-# Used by:
-# Ship: Echo
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Projectile Turret"),
-                                  "trackingSpeed", ship.getModifiedItemAttr("rookieSPTTracking"))
diff --git a/eos/effects/effect5218.py b/eos/effects/effect5218.py
deleted file mode 100644
index 0509c7dde..000000000
--- a/eos/effects/effect5218.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipSPTFalloffBonusRookie
-#
-# Used by:
-# Ship: Echo
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Projectile Turret"),
-                                  "falloff", ship.getModifiedItemAttr("rookieSPTFalloff"))
diff --git a/eos/effects/effect5219.py b/eos/effects/effect5219.py
deleted file mode 100644
index a7c289fea..000000000
--- a/eos/effects/effect5219.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipSPTOptimalRangeBonusRookie
-#
-# Used by:
-# Ship: Echo
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Projectile Turret"),
-                                  "maxRange", ship.getModifiedItemAttr("rookieSPTOptimal"))
diff --git a/eos/effects/effect5220.py b/eos/effects/effect5220.py
deleted file mode 100644
index f8c60bd63..000000000
--- a/eos/effects/effect5220.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipProjectileDmgPirateCruiser
-#
-# Used by:
-# Ship: Gnosis
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Projectile Turret"),
-                                  "damageMultiplier", ship.getModifiedItemAttr("shipBonusRole7"))
diff --git a/eos/effects/effect5221.py b/eos/effects/effect5221.py
deleted file mode 100644
index 4aff9d4a1..000000000
--- a/eos/effects/effect5221.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipHeavyAssaultMissileEMDmgPirateCruiser
-#
-# Used by:
-# Ship: Gnosis
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Assault Missiles"),
-                                    "emDamage", ship.getModifiedItemAttr("shipBonusRole7"))
diff --git a/eos/effects/effect5222.py b/eos/effects/effect5222.py
deleted file mode 100644
index bbc9b2a43..000000000
--- a/eos/effects/effect5222.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipHeavyAssaultMissileKinDmgPirateCruiser
-#
-# Used by:
-# Ship: Gnosis
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Assault Missiles"),
-                                    "kineticDamage", ship.getModifiedItemAttr("shipBonusRole7"))
diff --git a/eos/effects/effect5223.py b/eos/effects/effect5223.py
deleted file mode 100644
index 928d0a52c..000000000
--- a/eos/effects/effect5223.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipHeavyAssaultMissileThermDmgPirateCruiser
-#
-# Used by:
-# Ship: Gnosis
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Assault Missiles"),
-                                    "thermalDamage", ship.getModifiedItemAttr("shipBonusRole7"))
diff --git a/eos/effects/effect5224.py b/eos/effects/effect5224.py
deleted file mode 100644
index be21d8f51..000000000
--- a/eos/effects/effect5224.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipHeavyAssaultMissileExpDmgPirateCruiser
-#
-# Used by:
-# Ship: Gnosis
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Assault Missiles"),
-                                    "explosiveDamage", ship.getModifiedItemAttr("shipBonusRole7"))
diff --git a/eos/effects/effect5225.py b/eos/effects/effect5225.py
deleted file mode 100644
index 2b3003818..000000000
--- a/eos/effects/effect5225.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipHeavyMissileEMDmgPirateCruiser
-#
-# Used by:
-# Ship: Gnosis
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Missiles"),
-                                    "emDamage", ship.getModifiedItemAttr("shipBonusRole7"))
diff --git a/eos/effects/effect5226.py b/eos/effects/effect5226.py
deleted file mode 100644
index 73ca9bf7f..000000000
--- a/eos/effects/effect5226.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipHeavyMissileExpDmgPirateCruiser
-#
-# Used by:
-# Ship: Gnosis
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Missiles"),
-                                    "explosiveDamage", ship.getModifiedItemAttr("shipBonusRole7"))
diff --git a/eos/effects/effect5227.py b/eos/effects/effect5227.py
deleted file mode 100644
index e1efd07ec..000000000
--- a/eos/effects/effect5227.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipHeavyMissileKinDmgPirateCruiser
-#
-# Used by:
-# Ship: Gnosis
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Missiles"),
-                                    "kineticDamage", ship.getModifiedItemAttr("shipBonusRole7"))
diff --git a/eos/effects/effect5228.py b/eos/effects/effect5228.py
deleted file mode 100644
index 28990be6a..000000000
--- a/eos/effects/effect5228.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipHeavyMissileThermDmgPirateCruiser
-#
-# Used by:
-# Ship: Gnosis
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Missiles"),
-                                    "thermalDamage", ship.getModifiedItemAttr("shipBonusRole7"))
diff --git a/eos/effects/effect5229.py b/eos/effects/effect5229.py
deleted file mode 100644
index c57d3adff..000000000
--- a/eos/effects/effect5229.py
+++ /dev/null
@@ -1,14 +0,0 @@
-# shipScanProbeStrengthBonusPirateCruiser
-#
-# Used by:
-# Ships named like: Stratios (2 of 2)
-# Ship: Astero
-# Ship: Gnosis
-# Ship: Praxis
-# Ship: Sunesis
-type = "passive"
-
-
-def handler(fit, container, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Astrometrics"),
-                                    "baseSensorStrength", container.getModifiedItemAttr("shipBonusRole8"))
diff --git a/eos/effects/effect5230.py b/eos/effects/effect5230.py
deleted file mode 100644
index 04c2edac3..000000000
--- a/eos/effects/effect5230.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# modifyActiveShieldResonancePostPercent
-#
-# Used by:
-# Modules from group: Flex Shield Hardener (5 of 5)
-# Modules from group: Shield Hardener (97 of 97)
-type = "active"
-
-
-def handler(fit, module, context):
-    for damageType in ("kinetic", "thermal", "explosive", "em"):
-        fit.ship.boostItemAttr("shield" + damageType.capitalize() + "DamageResonance",
-                               module.getModifiedItemAttr(damageType + "DamageResistanceBonus"),
-                               stackingPenalties=True)
diff --git a/eos/effects/effect5231.py b/eos/effects/effect5231.py
deleted file mode 100644
index 6a6a9e571..000000000
--- a/eos/effects/effect5231.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# modifyActiveArmorResonancePostPercent
-#
-# Used by:
-# Modules from group: Armor Hardener (156 of 156)
-# Modules from group: Flex Armor Hardener (4 of 4)
-type = "active"
-
-
-def handler(fit, module, context):
-    for damageType in ("kinetic", "thermal", "explosive", "em"):
-        fit.ship.boostItemAttr("armor%sDamageResonance" % damageType.capitalize(),
-                               module.getModifiedItemAttr("%sDamageResistanceBonus" % damageType),
-                               stackingPenalties=True)
diff --git a/eos/effects/effect5234.py b/eos/effects/effect5234.py
deleted file mode 100644
index 2c03823e6..000000000
--- a/eos/effects/effect5234.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# shipSmallMissileExpDmgCF2
-#
-# Used by:
-# Ship: Caldari Navy Hookbill
-# Ship: Kestrel
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredChargeBoost(
-        lambda mod: mod.charge.requiresSkill("Rockets") or mod.charge.requiresSkill("Light Missiles"),
-        "explosiveDamage", ship.getModifiedItemAttr("shipBonusCF2"), skill="Caldari Frigate")
diff --git a/eos/effects/effect5237.py b/eos/effects/effect5237.py
deleted file mode 100644
index 9adc59089..000000000
--- a/eos/effects/effect5237.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipSmallMissileKinDmgCF2
-#
-# Used by:
-# Ship: Kestrel
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredChargeBoost(
-        lambda mod: mod.charge.requiresSkill("Rockets") or mod.charge.requiresSkill("Light Missiles"),
-        "kineticDamage", ship.getModifiedItemAttr("shipBonusCF2"), skill="Caldari Frigate")
diff --git a/eos/effects/effect5240.py b/eos/effects/effect5240.py
deleted file mode 100644
index e336853e6..000000000
--- a/eos/effects/effect5240.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# shipSmallMissileThermDmgCF2
-#
-# Used by:
-# Ship: Caldari Navy Hookbill
-# Ship: Kestrel
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredChargeBoost(
-        lambda mod: mod.charge.requiresSkill("Rockets") or mod.charge.requiresSkill("Light Missiles"),
-        "thermalDamage", ship.getModifiedItemAttr("shipBonusCF2"), skill="Caldari Frigate")
diff --git a/eos/effects/effect5243.py b/eos/effects/effect5243.py
deleted file mode 100644
index 3a08f5b10..000000000
--- a/eos/effects/effect5243.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# shipSmallMissileEMDmgCF2
-#
-# Used by:
-# Ship: Caldari Navy Hookbill
-# Ship: Kestrel
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredChargeBoost(
-        lambda mod: mod.charge.requiresSkill("Rockets") or mod.charge.requiresSkill("Light Missiles"),
-        "emDamage", ship.getModifiedItemAttr("shipBonusCF2"), skill="Caldari Frigate")
diff --git a/eos/effects/effect5259.py b/eos/effects/effect5259.py
deleted file mode 100644
index e7c05671c..000000000
--- a/eos/effects/effect5259.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# reconShipCloakCpuBonus1
-#
-# Used by:
-# Ships from group: Force Recon Ship (7 of 9)
-type = "passive"
-runTime = "early"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Cloaking Device",
-                                  "cpu", ship.getModifiedItemAttr("eliteBonusReconShip1"), skill="Recon Ships")
diff --git a/eos/effects/effect5260.py b/eos/effects/effect5260.py
deleted file mode 100644
index e34450131..000000000
--- a/eos/effects/effect5260.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# covertOpsCloakCpuPercentBonus1
-#
-# Used by:
-# Ships from group: Covert Ops (6 of 8)
-type = "passive"
-runTime = "early"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Cloaking"),
-                                  "cpu", ship.getModifiedItemAttr("eliteBonusCovertOps1"), skill="Covert Ops")
diff --git a/eos/effects/effect5261.py b/eos/effects/effect5261.py
deleted file mode 100644
index c3aa76e17..000000000
--- a/eos/effects/effect5261.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# CovertCloakCPUAddition
-#
-# Used by:
-# Modules named like: Covert Ops Cloaking Device II (2 of 2)
-# Module: Covert Cynosural Field Generator I
-type = "passive"
-
-
-def handler(fit, module, context):
-    module.increaseItemAttr("cpu", module.getModifiedItemAttr("covertCloakCPUAdd") or 0)
diff --git a/eos/effects/effect5262.py b/eos/effects/effect5262.py
deleted file mode 100644
index 3cbb0e7fb..000000000
--- a/eos/effects/effect5262.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# covertOpsCloakCpuPenalty
-#
-# Used by:
-# Subsystems from group: Defensive Systems (8 of 12)
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.modules.filteredItemIncrease(lambda mod: mod.item.requiresSkill("Cloaking"),
-                                     "covertCloakCPUAdd", module.getModifiedItemAttr("covertCloakCPUPenalty"))
diff --git a/eos/effects/effect5263.py b/eos/effects/effect5263.py
deleted file mode 100644
index aeaf0cc45..000000000
--- a/eos/effects/effect5263.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# covertCynoCpuPenalty
-#
-# Used by:
-# Subsystems from group: Defensive Systems (8 of 12)
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.modules.filteredItemIncrease(lambda mod: mod.item.requiresSkill("Cynosural Field Theory"),
-                                     "covertCloakCPUAdd", module.getModifiedItemAttr("covertCloakCPUPenalty"))
diff --git a/eos/effects/effect5264.py b/eos/effects/effect5264.py
deleted file mode 100644
index 737970c42..000000000
--- a/eos/effects/effect5264.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# warfareLinkCPUAddition
-#
-# Used by:
-# Modules from group: Command Burst (10 of 10)
-# Modules from group: Gang Coordinator (6 of 6)
-type = "passive"
-
-
-def handler(fit, module, context):
-    module.increaseItemAttr("cpu", module.getModifiedItemAttr("warfareLinkCPUAdd") or 0)
diff --git a/eos/effects/effect5265.py b/eos/effects/effect5265.py
deleted file mode 100644
index 894cc58df..000000000
--- a/eos/effects/effect5265.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# warfareLinkCpuPenalty
-#
-# Used by:
-# Subsystems from group: Offensive Systems (8 of 12)
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.modules.filteredItemIncrease(lambda mod: mod.item.requiresSkill("Leadership"),
-                                     "warfareLinkCPUAdd", module.getModifiedItemAttr("warfareLinkCPUPenalty"))
diff --git a/eos/effects/effect5266.py b/eos/effects/effect5266.py
deleted file mode 100644
index b153efbc3..000000000
--- a/eos/effects/effect5266.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# blockadeRunnerCloakCpuPercentBonus
-#
-# Used by:
-# Ships from group: Blockade Runner (4 of 4)
-type = "passive"
-runTime = "early"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Cloaking Device",
-                                  "cpu", ship.getModifiedItemAttr("eliteIndustrialCovertCloakBonus"),
-                                  skill="Transport Ships")
diff --git a/eos/effects/effect5267.py b/eos/effects/effect5267.py
deleted file mode 100644
index 1eba7dc3c..000000000
--- a/eos/effects/effect5267.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# drawbackRepairSystemsPGNeed
-#
-# Used by:
-# Modules named like: Auxiliary Nano Pump (6 of 8)
-# Modules named like: Nanobot Accelerator (6 of 8)
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Repair Systems"),
-                                  "power", module.getModifiedItemAttr("drawback"))
diff --git a/eos/effects/effect5268.py b/eos/effects/effect5268.py
deleted file mode 100644
index e5812f575..000000000
--- a/eos/effects/effect5268.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# drawbackCapRepPGNeed
-#
-# Used by:
-# Variations of module: Capital Auxiliary Nano Pump I (2 of 2)
-# Variations of module: Capital Nanobot Accelerator I (2 of 2)
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Repair Systems"),
-                                  "power", module.getModifiedItemAttr("drawback"))
diff --git a/eos/effects/effect527.py b/eos/effects/effect527.py
deleted file mode 100644
index fe05cb921..000000000
--- a/eos/effects/effect527.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipVelocityBonusMI
-#
-# Used by:
-# Variations of ship: Mammoth (2 of 2)
-# Ship: Hoarder
-# Ship: Prowler
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.ship.boostItemAttr("maxVelocity", ship.getModifiedItemAttr("shipBonusMI"), skill="Minmatar Industrial")
diff --git a/eos/effects/effect5275.py b/eos/effects/effect5275.py
deleted file mode 100644
index 79f9cf1e2..000000000
--- a/eos/effects/effect5275.py
+++ /dev/null
@@ -1,20 +0,0 @@
-# fueledArmorRepair
-#
-# Used by:
-# Modules from group: Ancillary Armor Repairer (7 of 7)
-runTime = "late"
-type = "active"
-
-
-def handler(fit, module, context):
-    if module.charge and module.charge.name == "Nanite Repair Paste":
-        multiplier = 3
-    else:
-        multiplier = 1
-
-    amount = module.getModifiedItemAttr("armorDamageAmount") * multiplier
-    speed = module.getModifiedItemAttr("duration") / 1000.0
-    rps = amount / speed
-    fit.extraAttributes.increase("armorRepair", rps)
-    fit.extraAttributes.increase("armorRepairPreSpool", rps)
-    fit.extraAttributes.increase("armorRepairFullSpool", rps)
diff --git a/eos/effects/effect529.py b/eos/effects/effect529.py
deleted file mode 100644
index 8e4dcae18..000000000
--- a/eos/effects/effect529.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipCargoBonusAI
-#
-# Used by:
-# Variations of ship: Sigil (2 of 2)
-# Ship: Bestower
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.ship.boostItemAttr("capacity", ship.getModifiedItemAttr("shipBonusAI"), skill="Amarr Industrial")
diff --git a/eos/effects/effect5293.py b/eos/effects/effect5293.py
deleted file mode 100644
index ae8265d4f..000000000
--- a/eos/effects/effect5293.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipLaserCapNeed2AD1
-#
-# Used by:
-# Ship: Coercer
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Energy Turret"),
-                                  "capacitorNeed", ship.getModifiedItemAttr("shipBonusAD1"), skill="Amarr Destroyer")
diff --git a/eos/effects/effect5294.py b/eos/effects/effect5294.py
deleted file mode 100644
index 03f58cb78..000000000
--- a/eos/effects/effect5294.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipLaserTracking2AD2
-#
-# Used by:
-# Ship: Coercer
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Energy Turret"),
-                                  "trackingSpeed", ship.getModifiedItemAttr("shipBonusAD2"), skill="Amarr Destroyer")
diff --git a/eos/effects/effect5295.py b/eos/effects/effect5295.py
deleted file mode 100644
index 3112585a8..000000000
--- a/eos/effects/effect5295.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusDroneDamageMultiplierAD1
-#
-# Used by:
-# Variations of ship: Dragoon (2 of 2)
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill("Drones"), "damageMultiplier",
-                                 src.getModifiedItemAttr("shipBonusAD1"), skill="Amarr Destroyer")
diff --git a/eos/effects/effect5300.py b/eos/effects/effect5300.py
deleted file mode 100644
index 4015c8f2e..000000000
--- a/eos/effects/effect5300.py
+++ /dev/null
@@ -1,14 +0,0 @@
-# shipBonusDroneHitpointsAD1
-#
-# Used by:
-# Variations of ship: Dragoon (2 of 2)
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill("Drones"), "shieldCapacity",
-                                 src.getModifiedItemAttr("shipBonusAD1"), skill="Amarr Destroyer")
-    fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill("Drones"), "hp",
-                                 src.getModifiedItemAttr("shipBonusAD1"), skill="Amarr Destroyer")
-    fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill("Drones"), "armorHP",
-                                 src.getModifiedItemAttr("shipBonusAD1"), skill="Amarr Destroyer")
diff --git a/eos/effects/effect5303.py b/eos/effects/effect5303.py
deleted file mode 100644
index ea35b9785..000000000
--- a/eos/effects/effect5303.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipHybridRange1CD1
-#
-# Used by:
-# Ship: Cormorant
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Hybrid Turret"),
-                                  "maxRange", ship.getModifiedItemAttr("shipBonusCD1"), skill="Caldari Destroyer")
diff --git a/eos/effects/effect5304.py b/eos/effects/effect5304.py
deleted file mode 100644
index 20dc8ef34..000000000
--- a/eos/effects/effect5304.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipHybridTrackingCD2
-#
-# Used by:
-# Ship: Cormorant
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Hybrid Turret"),
-                                  "trackingSpeed", ship.getModifiedItemAttr("shipBonusCD2"), skill="Caldari Destroyer")
diff --git a/eos/effects/effect5305.py b/eos/effects/effect5305.py
deleted file mode 100644
index efb861fb9..000000000
--- a/eos/effects/effect5305.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipBonusFrigateSizedMissileKineticDamageCD1
-#
-# Used by:
-# Ship: Corax
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Light Missiles"),
-                                    "kineticDamage", ship.getModifiedItemAttr("shipBonusCD1"),
-                                    skill="Caldari Destroyer")
diff --git a/eos/effects/effect5306.py b/eos/effects/effect5306.py
deleted file mode 100644
index 79de18da3..000000000
--- a/eos/effects/effect5306.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipRocketKineticDmgCD1
-#
-# Used by:
-# Ship: Corax
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Rockets"),
-                                    "kineticDamage", ship.getModifiedItemAttr("shipBonusCD1"),
-                                    skill="Caldari Destroyer")
diff --git a/eos/effects/effect5307.py b/eos/effects/effect5307.py
deleted file mode 100644
index 3513d9025..000000000
--- a/eos/effects/effect5307.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusAoeVelocityRocketsCD2
-#
-# Used by:
-# Ship: Corax
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Rockets"),
-                                    "aoeVelocity", ship.getModifiedItemAttr("shipBonusCD2"), skill="Caldari Destroyer")
diff --git a/eos/effects/effect5308.py b/eos/effects/effect5308.py
deleted file mode 100644
index c49324439..000000000
--- a/eos/effects/effect5308.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusAoeVelocityStandardMissilesCD2
-#
-# Used by:
-# Ship: Corax
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Light Missiles"),
-                                    "aoeVelocity", ship.getModifiedItemAttr("shipBonusCD2"), skill="Caldari Destroyer")
diff --git a/eos/effects/effect5309.py b/eos/effects/effect5309.py
deleted file mode 100644
index 69a04334d..000000000
--- a/eos/effects/effect5309.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipHybridFallOff1GD1
-#
-# Used by:
-# Ship: Catalyst
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Hybrid Turret"),
-                                  "falloff", ship.getModifiedItemAttr("shipBonusGD1"), skill="Gallente Destroyer")
diff --git a/eos/effects/effect5310.py b/eos/effects/effect5310.py
deleted file mode 100644
index 029dfaa35..000000000
--- a/eos/effects/effect5310.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipHybridTracking1GD2
-#
-# Used by:
-# Variations of ship: Catalyst (2 of 2)
-# Ship: Algos
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Hybrid Turret"),
-                                  "trackingSpeed", ship.getModifiedItemAttr("shipBonusGD2"), skill="Gallente Destroyer")
diff --git a/eos/effects/effect5311.py b/eos/effects/effect5311.py
deleted file mode 100644
index 28ba5adfc..000000000
--- a/eos/effects/effect5311.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusDroneDamageMultiplierGD1
-#
-# Used by:
-# Variations of ship: Algos (2 of 2)
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill("Drones"), "damageMultiplier",
-                                 src.getModifiedItemAttr("shipBonusGD1"), skill="Gallente Destroyer")
diff --git a/eos/effects/effect5316.py b/eos/effects/effect5316.py
deleted file mode 100644
index e82e28b1a..000000000
--- a/eos/effects/effect5316.py
+++ /dev/null
@@ -1,14 +0,0 @@
-# shipBonusDroneHitpointsGD1
-#
-# Used by:
-# Variations of ship: Algos (2 of 2)
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill("Drones"), "shieldCapacity",
-                                 src.getModifiedItemAttr("shipBonusGD1"), skill="Gallente Destroyer")
-    fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill("Drones"), "armorHP",
-                                 src.getModifiedItemAttr("shipBonusGD1"), skill="Gallente Destroyer")
-    fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill("Drones"), "hp",
-                                 src.getModifiedItemAttr("shipBonusGD1"), skill="Gallente Destroyer")
diff --git a/eos/effects/effect5317.py b/eos/effects/effect5317.py
deleted file mode 100644
index 171332da4..000000000
--- a/eos/effects/effect5317.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipProjectileDamageMD1
-#
-# Used by:
-# Variations of ship: Thrasher (2 of 2)
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Projectile Turret"),
-                                  "damageMultiplier", ship.getModifiedItemAttr("shipBonusMD1"),
-                                  skill="Minmatar Destroyer")
diff --git a/eos/effects/effect5318.py b/eos/effects/effect5318.py
deleted file mode 100644
index a2b7e2371..000000000
--- a/eos/effects/effect5318.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipProjectileTracking1MD2
-#
-# Used by:
-# Variations of ship: Thrasher (2 of 2)
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Projectile Turret"),
-                                  "trackingSpeed", ship.getModifiedItemAttr("shipBonusMD2"), skill="Minmatar Destroyer")
diff --git a/eos/effects/effect5319.py b/eos/effects/effect5319.py
deleted file mode 100644
index 28ce0aedb..000000000
--- a/eos/effects/effect5319.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipBonusFrigateSizedLightMissileExplosiveDamageMD1
-#
-# Used by:
-# Ship: Talwar
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Light Missiles"),
-                                    "explosiveDamage", ship.getModifiedItemAttr("shipBonusMD1"),
-                                    skill="Minmatar Destroyer")
diff --git a/eos/effects/effect5320.py b/eos/effects/effect5320.py
deleted file mode 100644
index 73c57b8aa..000000000
--- a/eos/effects/effect5320.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipRocketExplosiveDmgMD1
-#
-# Used by:
-# Ship: Talwar
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Rockets"),
-                                    "explosiveDamage", ship.getModifiedItemAttr("shipBonusMD1"),
-                                    skill="Minmatar Destroyer")
diff --git a/eos/effects/effect5321.py b/eos/effects/effect5321.py
deleted file mode 100644
index 2354f22a1..000000000
--- a/eos/effects/effect5321.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipBonusMWDSignatureRadiusMD2
-#
-# Used by:
-# Ship: Talwar
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("High Speed Maneuvering"),
-                                  "signatureRadiusBonus", ship.getModifiedItemAttr("shipBonusMD2"),
-                                  skill="Minmatar Destroyer")
diff --git a/eos/effects/effect5322.py b/eos/effects/effect5322.py
deleted file mode 100644
index 98ccf2fc8..000000000
--- a/eos/effects/effect5322.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipArmorEMResistance1ABC1
-#
-# Used by:
-# Variations of ship: Prophecy (2 of 2)
-# Ship: Absolution
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.ship.boostItemAttr("armorEmDamageResonance", ship.getModifiedItemAttr("shipBonusABC1"),
-                           skill="Amarr Battlecruiser")
diff --git a/eos/effects/effect5323.py b/eos/effects/effect5323.py
deleted file mode 100644
index f1a9d3a72..000000000
--- a/eos/effects/effect5323.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipArmorExplosiveResistance1ABC1
-#
-# Used by:
-# Variations of ship: Prophecy (2 of 2)
-# Ship: Absolution
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.ship.boostItemAttr("armorExplosiveDamageResonance", ship.getModifiedItemAttr("shipBonusABC1"),
-                           skill="Amarr Battlecruiser")
diff --git a/eos/effects/effect5324.py b/eos/effects/effect5324.py
deleted file mode 100644
index 191e50025..000000000
--- a/eos/effects/effect5324.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipArmorKineticResistance1ABC1
-#
-# Used by:
-# Variations of ship: Prophecy (2 of 2)
-# Ship: Absolution
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.ship.boostItemAttr("armorKineticDamageResonance", ship.getModifiedItemAttr("shipBonusABC1"),
-                           skill="Amarr Battlecruiser")
diff --git a/eos/effects/effect5325.py b/eos/effects/effect5325.py
deleted file mode 100644
index b03dffabe..000000000
--- a/eos/effects/effect5325.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipArmorThermResistance1ABC1
-#
-# Used by:
-# Variations of ship: Prophecy (2 of 2)
-# Ship: Absolution
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.ship.boostItemAttr("armorThermalDamageResonance", ship.getModifiedItemAttr("shipBonusABC1"),
-                           skill="Amarr Battlecruiser")
diff --git a/eos/effects/effect5326.py b/eos/effects/effect5326.py
deleted file mode 100644
index b93e05392..000000000
--- a/eos/effects/effect5326.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipBonusDroneDamageMultiplierABC2
-#
-# Used by:
-# Ship: Prophecy
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Drones"),
-                                 "damageMultiplier", ship.getModifiedItemAttr("shipBonusABC2"),
-                                 skill="Amarr Battlecruiser")
diff --git a/eos/effects/effect5331.py b/eos/effects/effect5331.py
deleted file mode 100644
index b1738a300..000000000
--- a/eos/effects/effect5331.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipBonusDroneHitpointsABC2
-#
-# Used by:
-# Ship: Prophecy
-type = "passive"
-
-
-def handler(fit, ship, context):
-    for layer in ("shieldCapacity", "armorHP", "hp"):
-        fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Drones"),
-                                     layer, ship.getModifiedItemAttr("shipBonusABC2"), skill="Amarr Battlecruiser")
diff --git a/eos/effects/effect5332.py b/eos/effects/effect5332.py
deleted file mode 100644
index e733f3709..000000000
--- a/eos/effects/effect5332.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipLaserCapABC1
-#
-# Used by:
-# Ship: Harbinger
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Energy Turret"),
-                                  "capacitorNeed", ship.getModifiedItemAttr("shipBonusABC1"),
-                                  skill="Amarr Battlecruiser")
diff --git a/eos/effects/effect5333.py b/eos/effects/effect5333.py
deleted file mode 100644
index c750cbd31..000000000
--- a/eos/effects/effect5333.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipLaserDamageBonusABC2
-#
-# Used by:
-# Ships named like: Harbinger (2 of 2)
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Energy Turret"),
-                                  "damageMultiplier", ship.getModifiedItemAttr("shipBonusABC2"),
-                                  skill="Amarr Battlecruiser")
diff --git a/eos/effects/effect5334.py b/eos/effects/effect5334.py
deleted file mode 100644
index 28f6a8c2e..000000000
--- a/eos/effects/effect5334.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipHybridOptimal1CBC1
-#
-# Used by:
-# Variations of ship: Ferox (2 of 2)
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Hybrid Turret"),
-                                  "maxRange", ship.getModifiedItemAttr("shipBonusCBC1"), skill="Caldari Battlecruiser")
diff --git a/eos/effects/effect5335.py b/eos/effects/effect5335.py
deleted file mode 100644
index 82fe621bc..000000000
--- a/eos/effects/effect5335.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# shipShieldEmResistance1CBC2
-#
-# Used by:
-# Ship: Drake
-# Ship: Nighthawk
-# Ship: Vulture
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.ship.boostItemAttr("shieldEmDamageResonance", ship.getModifiedItemAttr("shipBonusCBC2"),
-                           skill="Caldari Battlecruiser")
diff --git a/eos/effects/effect5336.py b/eos/effects/effect5336.py
deleted file mode 100644
index c3e3846de..000000000
--- a/eos/effects/effect5336.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# shipShieldExplosiveResistance1CBC2
-#
-# Used by:
-# Ship: Drake
-# Ship: Nighthawk
-# Ship: Vulture
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.ship.boostItemAttr("shieldExplosiveDamageResonance", ship.getModifiedItemAttr("shipBonusCBC2"),
-                           skill="Caldari Battlecruiser")
diff --git a/eos/effects/effect5337.py b/eos/effects/effect5337.py
deleted file mode 100644
index 8db3ea8be..000000000
--- a/eos/effects/effect5337.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# shipShieldKineticResistance1CBC2
-#
-# Used by:
-# Ship: Drake
-# Ship: Nighthawk
-# Ship: Vulture
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.ship.boostItemAttr("shieldKineticDamageResonance", ship.getModifiedItemAttr("shipBonusCBC2"),
-                           skill="Caldari Battlecruiser")
diff --git a/eos/effects/effect5338.py b/eos/effects/effect5338.py
deleted file mode 100644
index 4268d279f..000000000
--- a/eos/effects/effect5338.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# shipShieldThermalResistance1CBC2
-#
-# Used by:
-# Ship: Drake
-# Ship: Nighthawk
-# Ship: Vulture
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.ship.boostItemAttr("shieldThermalDamageResonance", ship.getModifiedItemAttr("shipBonusCBC2"),
-                           skill="Caldari Battlecruiser")
diff --git a/eos/effects/effect5339.py b/eos/effects/effect5339.py
deleted file mode 100644
index 4843ac63b..000000000
--- a/eos/effects/effect5339.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# shipBonusHeavyAssaultMissileKineticDamageCBC1
-#
-# Used by:
-# Ship: Drake
-# Ship: Nighthawk
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Assault Missiles"),
-                                    "kineticDamage", ship.getModifiedItemAttr("shipBonusCBC1"),
-                                    skill="Caldari Battlecruiser")
diff --git a/eos/effects/effect5340.py b/eos/effects/effect5340.py
deleted file mode 100644
index 83f591980..000000000
--- a/eos/effects/effect5340.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# shipBonusHeavyMissileKineticDamageCBC1
-#
-# Used by:
-# Ship: Drake
-# Ship: Nighthawk
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Missiles"),
-                                    "kineticDamage", ship.getModifiedItemAttr("shipBonusCBC1"),
-                                    skill="Caldari Battlecruiser")
diff --git a/eos/effects/effect5341.py b/eos/effects/effect5341.py
deleted file mode 100644
index d99d40c26..000000000
--- a/eos/effects/effect5341.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipHybridDmg1GBC1
-#
-# Used by:
-# Variations of ship: Brutix (3 of 3)
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Hybrid Turret"),
-                                  "damageMultiplier", ship.getModifiedItemAttr("shipBonusGBC1"),
-                                  skill="Gallente Battlecruiser")
diff --git a/eos/effects/effect5342.py b/eos/effects/effect5342.py
deleted file mode 100644
index 1c4ca9d09..000000000
--- a/eos/effects/effect5342.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# shipArmorRepairing1GBC2
-#
-# Used by:
-# Variations of ship: Myrmidon (2 of 2)
-# Ship: Astarte
-# Ship: Brutix
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Repair Systems"),
-                                  "armorDamageAmount", ship.getModifiedItemAttr("shipBonusGBC2"),
-                                  skill="Gallente Battlecruiser")
diff --git a/eos/effects/effect5343.py b/eos/effects/effect5343.py
deleted file mode 100644
index b1f3abe8e..000000000
--- a/eos/effects/effect5343.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipBonusDroneDamageMultiplierGBC1
-#
-# Used by:
-# Variations of ship: Myrmidon (2 of 2)
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Drones"),
-                                 "damageMultiplier", ship.getModifiedItemAttr("shipBonusGBC1"),
-                                 skill="Gallente Battlecruiser")
diff --git a/eos/effects/effect5348.py b/eos/effects/effect5348.py
deleted file mode 100644
index 36f77064e..000000000
--- a/eos/effects/effect5348.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipBonusDroneHitpointsGBC1
-#
-# Used by:
-# Variations of ship: Myrmidon (2 of 2)
-type = "passive"
-
-
-def handler(fit, ship, context):
-    for layer in ("shieldCapacity", "armorHP", "hp"):
-        fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Drones"),
-                                     layer, ship.getModifiedItemAttr("shipBonusGBC1"), skill="Gallente Battlecruiser")
diff --git a/eos/effects/effect5349.py b/eos/effects/effect5349.py
deleted file mode 100644
index 7622c3d1d..000000000
--- a/eos/effects/effect5349.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusHeavyMissileLauncherRofMBC2
-#
-# Used by:
-# Variations of ship: Cyclone (2 of 2)
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Missile Launcher Heavy",
-                                  "speed", ship.getModifiedItemAttr("shipBonusMBC2"), skill="Minmatar Battlecruiser")
diff --git a/eos/effects/effect5350.py b/eos/effects/effect5350.py
deleted file mode 100644
index 85820f30e..000000000
--- a/eos/effects/effect5350.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusHeavyAssaultMissileLauncherRofMBC2
-#
-# Used by:
-# Variations of ship: Cyclone (2 of 2)
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Missile Launcher Heavy Assault",
-                                  "speed", ship.getModifiedItemAttr("shipBonusMBC2"), skill="Minmatar Battlecruiser")
diff --git a/eos/effects/effect5351.py b/eos/effects/effect5351.py
deleted file mode 100644
index 5f9abe465..000000000
--- a/eos/effects/effect5351.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# shipShieldBoost1MBC1
-#
-# Used by:
-# Variations of ship: Cyclone (2 of 2)
-# Ship: Sleipnir
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Operation"),
-                                  "shieldBonus", ship.getModifiedItemAttr("shipBonusMBC1"),
-                                  skill="Minmatar Battlecruiser")
diff --git a/eos/effects/effect5352.py b/eos/effects/effect5352.py
deleted file mode 100644
index d1d2bb14d..000000000
--- a/eos/effects/effect5352.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipBonusProjectileDamageMBC1
-#
-# Used by:
-# Ships named like: Hurricane (2 of 2)
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Projectile Turret"),
-                                  "damageMultiplier", ship.getModifiedItemAttr("shipBonusMBC1"),
-                                  skill="Minmatar Battlecruiser")
diff --git a/eos/effects/effect5353.py b/eos/effects/effect5353.py
deleted file mode 100644
index da832307f..000000000
--- a/eos/effects/effect5353.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipProjectileRof1MBC2
-#
-# Used by:
-# Ship: Hurricane
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Projectile Turret"),
-                                  "speed", ship.getModifiedItemAttr("shipBonusMBC2"), skill="Minmatar Battlecruiser")
diff --git a/eos/effects/effect5354.py b/eos/effects/effect5354.py
deleted file mode 100644
index facc0461d..000000000
--- a/eos/effects/effect5354.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipLargeLaserCapABC1
-#
-# Used by:
-# Ship: Oracle
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Large Energy Turret"),
-                                  "capacitorNeed", ship.getModifiedItemAttr("shipBonusABC1"),
-                                  skill="Amarr Battlecruiser")
diff --git a/eos/effects/effect5355.py b/eos/effects/effect5355.py
deleted file mode 100644
index ced27165b..000000000
--- a/eos/effects/effect5355.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipLargeLaserDamageBonusABC2
-#
-# Used by:
-# Ship: Oracle
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Large Energy Turret"),
-                                  "damageMultiplier", ship.getModifiedItemAttr("shipBonusABC2"),
-                                  skill="Amarr Battlecruiser")
diff --git a/eos/effects/effect5356.py b/eos/effects/effect5356.py
deleted file mode 100644
index ec1572d8b..000000000
--- a/eos/effects/effect5356.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipHybridRangeBonusCBC1
-#
-# Used by:
-# Ship: Naga
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Large Hybrid Turret"),
-                                  "maxRange", ship.getModifiedItemAttr("shipBonusCBC1"), skill="Caldari Battlecruiser")
diff --git a/eos/effects/effect5357.py b/eos/effects/effect5357.py
deleted file mode 100644
index 50f4304ce..000000000
--- a/eos/effects/effect5357.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipHybridDamageBonusCBC2
-#
-# Used by:
-# Ship: Naga
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Large Hybrid Turret"),
-                                  "damageMultiplier", ship.getModifiedItemAttr("shipBonusCBC2"),
-                                  skill="Caldari Battlecruiser")
diff --git a/eos/effects/effect5358.py b/eos/effects/effect5358.py
deleted file mode 100644
index ed177a5c9..000000000
--- a/eos/effects/effect5358.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipLargeHybridTrackingBonusGBC1
-#
-# Used by:
-# Ship: Talos
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Large Hybrid Turret"),
-                                  "trackingSpeed", ship.getModifiedItemAttr("shipBonusGBC1"),
-                                  skill="Gallente Battlecruiser")
diff --git a/eos/effects/effect5359.py b/eos/effects/effect5359.py
deleted file mode 100644
index 7ae28ba58..000000000
--- a/eos/effects/effect5359.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipHybridDamageBonusGBC2
-#
-# Used by:
-# Ship: Talos
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Large Hybrid Turret"),
-                                  "damageMultiplier", ship.getModifiedItemAttr("shipBonusGBC2"),
-                                  skill="Gallente Battlecruiser")
diff --git a/eos/effects/effect536.py b/eos/effects/effect536.py
deleted file mode 100644
index 99c14306b..000000000
--- a/eos/effects/effect536.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# cpuMultiplierPostMulCpuOutputShip
-#
-# Used by:
-# Modules from group: CPU Enhancer (19 of 19)
-# Variations of structure module: Standup Co-Processor Array I (2 of 2)
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.ship.multiplyItemAttr("cpuOutput", module.getModifiedItemAttr("cpuMultiplier"))
diff --git a/eos/effects/effect5360.py b/eos/effects/effect5360.py
deleted file mode 100644
index 6df3698af..000000000
--- a/eos/effects/effect5360.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipProjectileRofBonusMBC1
-#
-# Used by:
-# Ship: Tornado
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Large Projectile Turret"),
-                                  "speed", ship.getModifiedItemAttr("shipBonusMBC1"), skill="Minmatar Battlecruiser")
diff --git a/eos/effects/effect5361.py b/eos/effects/effect5361.py
deleted file mode 100644
index cd9fc15ae..000000000
--- a/eos/effects/effect5361.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipProjectileFalloffBonusMBC2
-#
-# Used by:
-# Ship: Tornado
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Large Projectile Turret"),
-                                  "falloff", ship.getModifiedItemAttr("shipBonusMBC2"), skill="Minmatar Battlecruiser")
diff --git a/eos/effects/effect5364.py b/eos/effects/effect5364.py
deleted file mode 100644
index 8307ae2ee..000000000
--- a/eos/effects/effect5364.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# armorAllRepairSystemsAmountBonusPassive
-#
-# Used by:
-# Implants named like: Agency 'Hardshell' TB Dose (4 of 4)
-# Implants named like: Exile Booster (4 of 4)
-# Implant: Antipharmakon Kosybo
-type = "passive"
-
-
-def handler(fit, booster, context):
-    fit.modules.filteredItemBoost(
-        lambda mod: mod.item.requiresSkill("Repair Systems") or mod.item.requiresSkill("Capital Repair Systems"),
-        "armorDamageAmount", booster.getModifiedItemAttr("armorDamageAmountBonus") or 0)
diff --git a/eos/effects/effect5365.py b/eos/effects/effect5365.py
deleted file mode 100644
index 648b65203..000000000
--- a/eos/effects/effect5365.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# eliteBonusViolatorsRepairSystemsArmorDamageAmount2
-#
-# Used by:
-# Ship: Kronos
-# Ship: Paladin
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Repair Systems"),
-                                  "armorDamageAmount", ship.getModifiedItemAttr("eliteBonusViolators2"),
-                                  skill="Marauders")
diff --git a/eos/effects/effect5366.py b/eos/effects/effect5366.py
deleted file mode 100644
index c761ad921..000000000
--- a/eos/effects/effect5366.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusRepairSystemsBonusATC2
-#
-# Used by:
-# Ship: Vangel
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Repair Systems"),
-                                  "armorDamageAmount", ship.getModifiedItemAttr("shipBonusATC2"))
diff --git a/eos/effects/effect5367.py b/eos/effects/effect5367.py
deleted file mode 100644
index 09b2fc18d..000000000
--- a/eos/effects/effect5367.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipBonusRepairSystemsArmorRepairAmountGB2
-#
-# Used by:
-# Ship: Hyperion
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Repair Systems"),
-                                  "armorDamageAmount", ship.getModifiedItemAttr("shipBonusGB2"),
-                                  skill="Gallente Battleship")
diff --git a/eos/effects/effect5378.py b/eos/effects/effect5378.py
deleted file mode 100644
index e7046f2ad..000000000
--- a/eos/effects/effect5378.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipHeavyMissileAOECloudSizeCBC1
-#
-# Used by:
-# Ship: Drake Navy Issue
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Missiles"),
-                                    "aoeCloudSize", ship.getModifiedItemAttr("shipBonusCBC1"),
-                                    skill="Caldari Battlecruiser")
diff --git a/eos/effects/effect5379.py b/eos/effects/effect5379.py
deleted file mode 100644
index 2ef68bd9f..000000000
--- a/eos/effects/effect5379.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipHeavyAssaultMissileAOECloudSizeCBC1
-#
-# Used by:
-# Ship: Drake Navy Issue
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Assault Missiles"),
-                                    "aoeCloudSize", ship.getModifiedItemAttr("shipBonusCBC1"),
-                                    skill="Caldari Battlecruiser")
diff --git a/eos/effects/effect5380.py b/eos/effects/effect5380.py
deleted file mode 100644
index ee9309f0a..000000000
--- a/eos/effects/effect5380.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipHybridTrackingGBC2
-#
-# Used by:
-# Ship: Brutix Navy Issue
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Hybrid Turret"),
-                                  "trackingSpeed", ship.getModifiedItemAttr("shipBonusGBC2"),
-                                  skill="Gallente Battlecruiser")
diff --git a/eos/effects/effect5381.py b/eos/effects/effect5381.py
deleted file mode 100644
index f88ec12de..000000000
--- a/eos/effects/effect5381.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# shipEnergyTrackingABC1
-#
-# Used by:
-# Ship: Harbinger Navy Issue
-
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Energy Turret"),
-                                  "trackingSpeed", ship.getModifiedItemAttr("shipBonusABC1"),
-                                  skill="Amarr Battlecruiser")
diff --git a/eos/effects/effect5382.py b/eos/effects/effect5382.py
deleted file mode 100644
index 758ede0d7..000000000
--- a/eos/effects/effect5382.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipBonusMETOptimalAC2
-#
-# Used by:
-# Ship: Enforcer
-# Ship: Omen Navy Issue
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Energy Turret"),
-                                  "maxRange", ship.getModifiedItemAttr("shipBonusAC2"), skill="Amarr Cruiser")
diff --git a/eos/effects/effect5383.py b/eos/effects/effect5383.py
deleted file mode 100644
index 4fb493160..000000000
--- a/eos/effects/effect5383.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipMissileEMDamageCC
-#
-# Used by:
-# Ship: Orthrus
-# Ship: Osprey Navy Issue
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"),
-                                    "emDamage", ship.getModifiedItemAttr("shipBonusCC"), skill="Caldari Cruiser")
diff --git a/eos/effects/effect5384.py b/eos/effects/effect5384.py
deleted file mode 100644
index 175af5266..000000000
--- a/eos/effects/effect5384.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipMissileThermDamageCC
-#
-# Used by:
-# Ship: Orthrus
-# Ship: Osprey Navy Issue
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"),
-                                    "thermalDamage", ship.getModifiedItemAttr("shipBonusCC"), skill="Caldari Cruiser")
diff --git a/eos/effects/effect5385.py b/eos/effects/effect5385.py
deleted file mode 100644
index 4ba61cc88..000000000
--- a/eos/effects/effect5385.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipMissileExpDamageCC
-#
-# Used by:
-# Ship: Orthrus
-# Ship: Osprey Navy Issue
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"),
-                                    "explosiveDamage", ship.getModifiedItemAttr("shipBonusCC"), skill="Caldari Cruiser")
diff --git a/eos/effects/effect5386.py b/eos/effects/effect5386.py
deleted file mode 100644
index 2a9b2ef96..000000000
--- a/eos/effects/effect5386.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipMissileKinDamageCC2
-#
-# Used by:
-# Ship: Rook
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"),
-                                    "kineticDamage", ship.getModifiedItemAttr("shipBonusCC2"), skill="Caldari Cruiser")
diff --git a/eos/effects/effect5387.py b/eos/effects/effect5387.py
deleted file mode 100644
index f9cbb40c3..000000000
--- a/eos/effects/effect5387.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipHeavyAssaultMissileAOECloudSizeCC2
-#
-# Used by:
-# Ship: Caracal Navy Issue
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Assault Missiles"),
-                                    "aoeCloudSize", ship.getModifiedItemAttr("shipBonusCC2"), skill="Caldari Cruiser")
diff --git a/eos/effects/effect5388.py b/eos/effects/effect5388.py
deleted file mode 100644
index 971e15bae..000000000
--- a/eos/effects/effect5388.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipHeavyMissileAOECloudSizeCC2
-#
-# Used by:
-# Ship: Caracal Navy Issue
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Missiles"),
-                                    "aoeCloudSize", ship.getModifiedItemAttr("shipBonusCC2"), skill="Caldari Cruiser")
diff --git a/eos/effects/effect5389.py b/eos/effects/effect5389.py
deleted file mode 100644
index c33d4f02f..000000000
--- a/eos/effects/effect5389.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusDroneTrackingGC
-#
-# Used by:
-# Ship: Vexor Navy Issue
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Drones"),
-                                 "trackingSpeed", ship.getModifiedItemAttr("shipBonusGC"), skill="Gallente Cruiser")
diff --git a/eos/effects/effect5390.py b/eos/effects/effect5390.py
deleted file mode 100644
index 617b0a7a5..000000000
--- a/eos/effects/effect5390.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusDroneMWDboostGC
-#
-# Used by:
-# Ship: Vexor Navy Issue
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Drones"),
-                                 "maxVelocity", ship.getModifiedItemAttr("shipBonusGC"), skill="Gallente Cruiser")
diff --git a/eos/effects/effect5397.py b/eos/effects/effect5397.py
deleted file mode 100644
index 3169597ef..000000000
--- a/eos/effects/effect5397.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# baseMaxScanDeviationModifierModuleOnline2None
-#
-# Used by:
-# Variations of module: Scan Pinpointing Array I (2 of 2)
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Astrometrics"),
-                                    "baseMaxScanDeviation",
-                                    module.getModifiedItemAttr("maxScanDeviationModifierModule"),
-                                    stackingPenalties=True)
diff --git a/eos/effects/effect5398.py b/eos/effects/effect5398.py
deleted file mode 100644
index bf561c4a2..000000000
--- a/eos/effects/effect5398.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# systemScanDurationModuleModifier
-#
-# Used by:
-# Modules from group: Scanning Upgrade Time (2 of 2)
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Astrometrics"),
-                                  "duration", module.getModifiedItemAttr("scanDurationBonus"))
diff --git a/eos/effects/effect5399.py b/eos/effects/effect5399.py
deleted file mode 100644
index 5d64ab13a..000000000
--- a/eos/effects/effect5399.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# baseSensorStrengthModifierModule
-#
-# Used by:
-# Variations of module: Scan Rangefinding Array I (2 of 2)
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Astrometrics"),
-                                    "baseSensorStrength", module.getModifiedItemAttr("scanStrengthBonusModule"),
-                                    stackingPenalties=True)
diff --git a/eos/effects/effect5402.py b/eos/effects/effect5402.py
deleted file mode 100644
index a43ad0c44..000000000
--- a/eos/effects/effect5402.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipMissileHeavyAssaultVelocityABC2
-#
-# Used by:
-# Ship: Damnation
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Assault Missiles"),
-                                    "maxVelocity", ship.getModifiedItemAttr("shipBonusABC2"),
-                                    skill="Amarr Battlecruiser")
diff --git a/eos/effects/effect5403.py b/eos/effects/effect5403.py
deleted file mode 100644
index a2cfa0bef..000000000
--- a/eos/effects/effect5403.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipMissileHeavyVelocityABC2
-#
-# Used by:
-# Ship: Damnation
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Missiles"),
-                                    "maxVelocity", ship.getModifiedItemAttr("shipBonusABC2"),
-                                    skill="Amarr Battlecruiser")
diff --git a/eos/effects/effect5410.py b/eos/effects/effect5410.py
deleted file mode 100644
index 6517f6351..000000000
--- a/eos/effects/effect5410.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipLaserCap1ABC2
-#
-# Used by:
-# Ship: Absolution
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Energy Turret"),
-                                  "capacitorNeed", ship.getModifiedItemAttr("shipBonusABC2"),
-                                  skill="Amarr Battlecruiser")
diff --git a/eos/effects/effect5411.py b/eos/effects/effect5411.py
deleted file mode 100644
index 370f666b2..000000000
--- a/eos/effects/effect5411.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipMissileVelocityCD1
-#
-# Used by:
-# Ship: Flycatcher
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"),
-                                    "maxVelocity", ship.getModifiedItemAttr("shipBonusCD1"), skill="Caldari Destroyer")
diff --git a/eos/effects/effect5417.py b/eos/effects/effect5417.py
deleted file mode 100644
index 3825f9bb3..000000000
--- a/eos/effects/effect5417.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusDroneDamageMultiplierAB
-#
-# Used by:
-# Ship: Armageddon
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Drones"),
-                                 "damageMultiplier", ship.getModifiedItemAttr("shipBonusAB"), skill="Amarr Battleship")
diff --git a/eos/effects/effect5418.py b/eos/effects/effect5418.py
deleted file mode 100644
index 4753c8f3f..000000000
--- a/eos/effects/effect5418.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusDroneArmorHitPointsAB
-#
-# Used by:
-# Ship: Armageddon
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Drones"),
-                                 "armorHP", ship.getModifiedItemAttr("shipBonusAB"), skill="Amarr Battleship")
diff --git a/eos/effects/effect5419.py b/eos/effects/effect5419.py
deleted file mode 100644
index e0ed55589..000000000
--- a/eos/effects/effect5419.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusDroneShieldHitPointsAB
-#
-# Used by:
-# Ship: Armageddon
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Drones"),
-                                 "shieldCapacity", ship.getModifiedItemAttr("shipBonusAB"), skill="Amarr Battleship")
diff --git a/eos/effects/effect542.py b/eos/effects/effect542.py
deleted file mode 100644
index 84fb447cc..000000000
--- a/eos/effects/effect542.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipCapNeedBonusAB
-#
-# Used by:
-# Variations of ship: Armageddon (3 of 5)
-# Ship: Apocalypse Imperial Issue
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Large Energy Turret"),
-                                  "capacitorNeed", ship.getModifiedItemAttr("shipBonusAB"), skill="Amarr Battleship")
diff --git a/eos/effects/effect5420.py b/eos/effects/effect5420.py
deleted file mode 100644
index a37f00d0c..000000000
--- a/eos/effects/effect5420.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusDroneStructureHitPointsAB
-#
-# Used by:
-# Ship: Armageddon
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Drones"),
-                                 "hp", ship.getModifiedItemAttr("shipBonusAB"), skill="Amarr Battleship")
diff --git a/eos/effects/effect5424.py b/eos/effects/effect5424.py
deleted file mode 100644
index 51045e22f..000000000
--- a/eos/effects/effect5424.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipLargeHybridTurretRofGB
-#
-# Used by:
-# Ship: Megathron
-# Ship: Megathron Navy Issue
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Large Hybrid Turret"),
-                                  "speed", ship.getModifiedItemAttr("shipBonusGB"), skill="Gallente Battleship")
diff --git a/eos/effects/effect5427.py b/eos/effects/effect5427.py
deleted file mode 100644
index 8449ffc78..000000000
--- a/eos/effects/effect5427.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusDroneTrackingGB
-#
-# Used by:
-# Ship: Dominix
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Drones"),
-                                 "trackingSpeed", ship.getModifiedItemAttr("shipBonusGB"), skill="Gallente Battleship")
diff --git a/eos/effects/effect5428.py b/eos/effects/effect5428.py
deleted file mode 100644
index 197aba8ac..000000000
--- a/eos/effects/effect5428.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusDroneOptimalRangeGB
-#
-# Used by:
-# Ship: Dominix
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Drones"),
-                                 "maxRange", ship.getModifiedItemAttr("shipBonusGB"), skill="Gallente Battleship")
diff --git a/eos/effects/effect5429.py b/eos/effects/effect5429.py
deleted file mode 100644
index 844746ae1..000000000
--- a/eos/effects/effect5429.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipBonusMissileAoeVelocityMB2
-#
-# Used by:
-# Ship: Typhoon
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Torpedoes"),
-                                    "aoeVelocity", ship.getModifiedItemAttr("shipBonusMB2"),
-                                    skill="Minmatar Battleship")
diff --git a/eos/effects/effect5430.py b/eos/effects/effect5430.py
deleted file mode 100644
index 1bf11ce1a..000000000
--- a/eos/effects/effect5430.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipBonusAoeVelocityCruiseMissilesMB2
-#
-# Used by:
-# Ship: Typhoon
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Cruise Missiles"),
-                                    "aoeVelocity", ship.getModifiedItemAttr("shipBonusMB2"),
-                                    skill="Minmatar Battleship")
diff --git a/eos/effects/effect5431.py b/eos/effects/effect5431.py
deleted file mode 100644
index 0ec7b3b4c..000000000
--- a/eos/effects/effect5431.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipBonusLargeEnergyTurretTrackingAB
-#
-# Used by:
-# Ship: Apocalypse
-# Ship: Apocalypse Navy Issue
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Large Energy Turret"),
-                                  "trackingSpeed", ship.getModifiedItemAttr("shipBonusAB"), skill="Amarr Battleship")
diff --git a/eos/effects/effect5433.py b/eos/effects/effect5433.py
deleted file mode 100644
index 45610c4f9..000000000
--- a/eos/effects/effect5433.py
+++ /dev/null
@@ -1,15 +0,0 @@
-# hackingSkillVirusBonus
-#
-# Used by:
-# Modules named like: Memetic Algorithm Bank (8 of 8)
-# Implant: Neural Lace 'Blackglass' Net Intrusion 920-40
-# Implant: Poteque 'Prospector' Environmental Analysis EY-1005
-# Implant: Poteque 'Prospector' Hacking HC-905
-# Skill: Hacking
-type = "passive"
-
-
-def handler(fit, container, context):
-    level = container.level if "skill" in context else 1
-    fit.modules.filteredItemIncrease(lambda mod: mod.item.requiresSkill("Hacking"),
-                                     "virusCoherence", container.getModifiedItemAttr("virusCoherenceBonus") * level)
diff --git a/eos/effects/effect5437.py b/eos/effects/effect5437.py
deleted file mode 100644
index 9e383ba0a..000000000
--- a/eos/effects/effect5437.py
+++ /dev/null
@@ -1,14 +0,0 @@
-# archaeologySkillVirusBonus
-#
-# Used by:
-# Modules named like: Emission Scope Sharpener (8 of 8)
-# Implant: Poteque 'Prospector' Archaeology AC-905
-# Implant: Poteque 'Prospector' Environmental Analysis EY-1005
-# Skill: Archaeology
-type = "passive"
-
-
-def handler(fit, container, context):
-    level = container.level if "skill" in context else 1
-    fit.modules.filteredItemIncrease(lambda mod: mod.item.requiresSkill("Archaeology"),
-                                     "virusCoherence", container.getModifiedItemAttr("virusCoherenceBonus") * level)
diff --git a/eos/effects/effect5440.py b/eos/effects/effect5440.py
deleted file mode 100644
index 51c946fec..000000000
--- a/eos/effects/effect5440.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# systemStandardMissileKineticDamage
-#
-# Used by:
-# Celestials named like: Wolf Rayet Effect Beacon Class (6 of 6)
-runTime = "early"
-type = ("projected", "passive")
-
-
-def handler(fit, beacon, context):
-    fit.modules.filteredChargeMultiply(lambda mod: mod.charge.requiresSkill("Light Missiles"),
-                                       "kineticDamage", beacon.getModifiedItemAttr("smallWeaponDamageMultiplier"),
-                                       stackingPenalties=True, penaltyGroup="postMul")
diff --git a/eos/effects/effect5444.py b/eos/effects/effect5444.py
deleted file mode 100644
index ca8a1b166..000000000
--- a/eos/effects/effect5444.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipTorpedoAOECloudSize1CB
-#
-# Used by:
-# Ship: Raven Navy Issue
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Torpedoes"),
-                                    "aoeCloudSize", ship.getModifiedItemAttr("shipBonusCB"), skill="Caldari Battleship")
diff --git a/eos/effects/effect5445.py b/eos/effects/effect5445.py
deleted file mode 100644
index e1d7c2557..000000000
--- a/eos/effects/effect5445.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipCruiseMissileAOECloudSize1CB
-#
-# Used by:
-# Ship: Raven Navy Issue
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Cruise Missiles"),
-                                    "aoeCloudSize", ship.getModifiedItemAttr("shipBonusCB"), skill="Caldari Battleship")
diff --git a/eos/effects/effect5456.py b/eos/effects/effect5456.py
deleted file mode 100644
index 268e7d96a..000000000
--- a/eos/effects/effect5456.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipCruiseMissileROFCB
-#
-# Used by:
-# Ship: Scorpion Navy Issue
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Missile Launcher Cruise",
-                                  "speed", ship.getModifiedItemAttr("shipBonusCB"), skill="Caldari Battleship")
diff --git a/eos/effects/effect5457.py b/eos/effects/effect5457.py
deleted file mode 100644
index 22d81e5fa..000000000
--- a/eos/effects/effect5457.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipTorpedoROFCB
-#
-# Used by:
-# Ship: Scorpion Navy Issue
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Missile Launcher Torpedo",
-                                  "speed", ship.getModifiedItemAttr("shipBonusCB"), skill="Caldari Battleship")
diff --git a/eos/effects/effect5459.py b/eos/effects/effect5459.py
deleted file mode 100644
index 6307a9224..000000000
--- a/eos/effects/effect5459.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# hackingVirusStrengthBonus
-#
-# Used by:
-# Implant: Neural Lace 'Blackglass' Net Intrusion 920-40
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemIncrease(lambda mod: mod.item.requiresSkill("Hacking"), "virusStrength", src.getModifiedItemAttr("virusStrengthBonus"))
diff --git a/eos/effects/effect5460.py b/eos/effects/effect5460.py
deleted file mode 100644
index 0e60325db..000000000
--- a/eos/effects/effect5460.py
+++ /dev/null
@@ -1,20 +0,0 @@
-# minigameVirusStrengthBonus
-#
-# Used by:
-# Ships from group: Covert Ops (7 of 8)
-# Ships named like: Stratios (2 of 2)
-# Subsystems named like: Defensive Covert Reconfiguration (4 of 4)
-# Ship: Astero
-# Ship: Heron
-# Ship: Imicus
-# Ship: Magnate
-# Ship: Nestor
-# Ship: Probe
-type = "passive"
-
-
-def handler(fit, container, context):
-    level = container.level if "skill" in context else 1
-    fit.modules.filteredItemIncrease(
-        lambda mod: (mod.item.requiresSkill("Hacking") or mod.item.requiresSkill("Archaeology")),
-        "virusStrength", container.getModifiedItemAttr("virusStrengthBonus") * level)
diff --git a/eos/effects/effect5461.py b/eos/effects/effect5461.py
deleted file mode 100644
index 266c3776d..000000000
--- a/eos/effects/effect5461.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# shieldOperationRechargeratebonusPostPercentOnline
-#
-# Used by:
-# Modules from group: Shield Power Relay (6 of 6)
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.ship.boostItemAttr("shieldRechargeRate", module.getModifiedItemAttr("rechargeratebonus") or 0)
diff --git a/eos/effects/effect5468.py b/eos/effects/effect5468.py
deleted file mode 100644
index 2fccf4074..000000000
--- a/eos/effects/effect5468.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# shipBonusAgilityCI2
-#
-# Used by:
-# Ship: Badger
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.ship.boostItemAttr("agility", ship.getModifiedItemAttr("shipBonusCI2"), skill="Caldari Industrial")
diff --git a/eos/effects/effect5469.py b/eos/effects/effect5469.py
deleted file mode 100644
index 8273934e5..000000000
--- a/eos/effects/effect5469.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# shipBonusAgilityMI2
-#
-# Used by:
-# Ship: Wreathe
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.ship.boostItemAttr("agility", ship.getModifiedItemAttr("shipBonusMI2"), skill="Minmatar Industrial")
diff --git a/eos/effects/effect5470.py b/eos/effects/effect5470.py
deleted file mode 100644
index 3fc84bb06..000000000
--- a/eos/effects/effect5470.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# shipBonusAgilityGI2
-#
-# Used by:
-# Ship: Nereus
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.ship.boostItemAttr("agility", ship.getModifiedItemAttr("shipBonusGI2"), skill="Gallente Industrial")
diff --git a/eos/effects/effect5471.py b/eos/effects/effect5471.py
deleted file mode 100644
index 16c2537ad..000000000
--- a/eos/effects/effect5471.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# shipBonusAgilityAI2
-#
-# Used by:
-# Ship: Sigil
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.ship.boostItemAttr("agility", ship.getModifiedItemAttr("shipBonusAI2"), skill="Amarr Industrial")
diff --git a/eos/effects/effect5476.py b/eos/effects/effect5476.py
deleted file mode 100644
index 5c6af2abb..000000000
--- a/eos/effects/effect5476.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusOreCapacityGI2
-#
-# Used by:
-# Ship: Miasmos
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.ship.boostItemAttr("specialOreHoldCapacity", ship.getModifiedItemAttr("shipBonusGI2"),
-                           skill="Gallente Industrial")
diff --git a/eos/effects/effect5477.py b/eos/effects/effect5477.py
deleted file mode 100644
index 8bb93aaeb..000000000
--- a/eos/effects/effect5477.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusAmmoBayMI2
-#
-# Used by:
-# Ship: Hoarder
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.ship.boostItemAttr("specialAmmoHoldCapacity", ship.getModifiedItemAttr("shipBonusMI2"),
-                           skill="Minmatar Industrial")
diff --git a/eos/effects/effect5478.py b/eos/effects/effect5478.py
deleted file mode 100644
index dfac42672..000000000
--- a/eos/effects/effect5478.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusPICommoditiesHoldGI2
-#
-# Used by:
-# Ship: Epithal
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.ship.boostItemAttr("specialPlanetaryCommoditiesHoldCapacity", ship.getModifiedItemAttr("shipBonusGI2"),
-                           skill="Gallente Industrial")
diff --git a/eos/effects/effect5479.py b/eos/effects/effect5479.py
deleted file mode 100644
index 66a78e721..000000000
--- a/eos/effects/effect5479.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusMineralBayGI2
-#
-# Used by:
-# Ship: Kryos
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.ship.boostItemAttr("specialMineralHoldCapacity", ship.getModifiedItemAttr("shipBonusGI2"),
-                           skill="Gallente Industrial")
diff --git a/eos/effects/effect5480.py b/eos/effects/effect5480.py
deleted file mode 100644
index eb2ae35bc..000000000
--- a/eos/effects/effect5480.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# setBonusChristmasBonusVelocity
-#
-# Used by:
-# Implants named like: Genolution Core Augmentation CA (4 of 4)
-runTime = "early"
-type = "passive"
-
-
-def handler(fit, implant, context):
-    fit.appliedImplants.filteredItemMultiply(lambda mod: mod.item.group.name == "Special Edition Implant",
-                                             "implantBonusVelocity", implant.getModifiedItemAttr("implantSetChristmas"))
diff --git a/eos/effects/effect5482.py b/eos/effects/effect5482.py
deleted file mode 100644
index d8f472b50..000000000
--- a/eos/effects/effect5482.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# setBonusChristmasAgilityBonus
-#
-# Used by:
-# Implants named like: Genolution Core Augmentation CA (4 of 4)
-runTime = "early"
-type = "passive"
-
-
-def handler(fit, implant, context):
-    fit.appliedImplants.filteredItemMultiply(lambda mod: mod.item.group.name == "Special Edition Implant",
-                                             "agilityBonus", implant.getModifiedItemAttr("implantSetChristmas"))
diff --git a/eos/effects/effect5483.py b/eos/effects/effect5483.py
deleted file mode 100644
index e9212fe68..000000000
--- a/eos/effects/effect5483.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# setBonusChristmasShieldCapacityBonus
-#
-# Used by:
-# Implants named like: Genolution Core Augmentation CA (4 of 4)
-runTime = "early"
-type = "passive"
-
-
-def handler(fit, implant, context):
-    fit.appliedImplants.filteredItemMultiply(lambda mod: mod.item.group.name == "Special Edition Implant",
-                                             "shieldCapacityBonus", implant.getModifiedItemAttr("implantSetChristmas"))
diff --git a/eos/effects/effect5484.py b/eos/effects/effect5484.py
deleted file mode 100644
index b9eb11557..000000000
--- a/eos/effects/effect5484.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# setBonusChristmasArmorHPBonus2
-#
-# Used by:
-# Implants named like: Genolution Core Augmentation CA (4 of 4)
-runTime = "early"
-type = "passive"
-
-
-def handler(fit, implant, context):
-    fit.appliedImplants.filteredItemMultiply(lambda mod: mod.item.group.name == "Special Edition Implant",
-                                             "armorHpBonus2", implant.getModifiedItemAttr("implantSetChristmas"))
diff --git a/eos/effects/effect5485.py b/eos/effects/effect5485.py
deleted file mode 100644
index 1f7255f44..000000000
--- a/eos/effects/effect5485.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipSPTOptimalBonusMF
-#
-# Used by:
-# Ship: Chremoas
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Projectile Turret"),
-                                  "maxRange", ship.getModifiedItemAttr("shipBonusMF"), skill="Minmatar Frigate")
diff --git a/eos/effects/effect5486.py b/eos/effects/effect5486.py
deleted file mode 100644
index ef47a0f27..000000000
--- a/eos/effects/effect5486.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipBonusProjectileDamageMBC2
-#
-# Used by:
-# Ship: Sleipnir
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Projectile Turret"),
-                                  "damageMultiplier", ship.getModifiedItemAttr("shipBonusMBC2"),
-                                  skill="Minmatar Battlecruiser")
diff --git a/eos/effects/effect549.py b/eos/effects/effect549.py
deleted file mode 100644
index f6809435e..000000000
--- a/eos/effects/effect549.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# shipPTDmgBonusMB
-#
-# Used by:
-# Variations of ship: Tempest (3 of 4)
-# Ship: Machariel
-# Ship: Panther
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Large Projectile Turret"),
-                                  "damageMultiplier", ship.getModifiedItemAttr("shipBonusMB"),
-                                  skill="Minmatar Battleship")
diff --git a/eos/effects/effect5496.py b/eos/effects/effect5496.py
deleted file mode 100644
index d57f9df19..000000000
--- a/eos/effects/effect5496.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# eliteBonusCommandShipHAMRoFCS1
-#
-# Used by:
-# Ship: Claymore
-# Ship: Nighthawk
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Missile Launcher Heavy Assault",
-                                  "speed", ship.getModifiedItemAttr("eliteBonusCommandShips1"), skill="Command Ships")
diff --git a/eos/effects/effect5497.py b/eos/effects/effect5497.py
deleted file mode 100644
index 2907e0885..000000000
--- a/eos/effects/effect5497.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# eliteBonusCommandShipHMRoFCS1
-#
-# Used by:
-# Ship: Claymore
-# Ship: Nighthawk
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Missile Launcher Heavy",
-                                  "speed", ship.getModifiedItemAttr("eliteBonusCommandShips1"), skill="Command Ships")
diff --git a/eos/effects/effect5498.py b/eos/effects/effect5498.py
deleted file mode 100644
index 45b63167c..000000000
--- a/eos/effects/effect5498.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# eliteBonusCommandShipsHeavyAssaultMissileExplosionVelocityCS2
-#
-# Used by:
-# Ship: Claymore
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Assault Missiles"),
-                                    "aoeVelocity", ship.getModifiedItemAttr("eliteBonusCommandShips2"),
-                                    skill="Command Ships")
diff --git a/eos/effects/effect5499.py b/eos/effects/effect5499.py
deleted file mode 100644
index dc04674b7..000000000
--- a/eos/effects/effect5499.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# eliteBonusCommandShipsHeavyAssaultMissileExplosionRadiusCS2
-#
-# Used by:
-# Ship: Nighthawk
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Assault Missiles"),
-                                    "aoeCloudSize", ship.getModifiedItemAttr("eliteBonusCommandShips2"),
-                                    skill="Command Ships")
diff --git a/eos/effects/effect55.py b/eos/effects/effect55.py
deleted file mode 100644
index 65664fa77..000000000
--- a/eos/effects/effect55.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# targetHostiles
-#
-# Used by:
-# Modules from group: Automated Targeting System (6 of 6)
-type = "active"
-
-
-def handler(fit, module, context):
-    # This effect enables the ACTIVE state for auto targeting systems.
-    pass
diff --git a/eos/effects/effect550.py b/eos/effects/effect550.py
deleted file mode 100644
index db7ef2e93..000000000
--- a/eos/effects/effect550.py
+++ /dev/null
@@ -1,16 +0,0 @@
-# shipHTDmgBonusGB
-#
-# Used by:
-# Ship: Dominix Navy Issue
-# Ship: Hyperion
-# Ship: Kronos
-# Ship: Marshal
-# Ship: Megathron Federate Issue
-# Ship: Sin
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Large Hybrid Turret"),
-                                  "damageMultiplier", ship.getModifiedItemAttr("shipBonusGB"),
-                                  skill="Gallente Battleship")
diff --git a/eos/effects/effect5500.py b/eos/effects/effect5500.py
deleted file mode 100644
index 7200ea677..000000000
--- a/eos/effects/effect5500.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# eliteBonusCommandShipsHeavyMissileExplosionRadiusCS2
-#
-# Used by:
-# Ship: Nighthawk
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Missiles"),
-                                    "aoeCloudSize", ship.getModifiedItemAttr("eliteBonusCommandShips2"),
-                                    skill="Command Ships")
diff --git a/eos/effects/effect5501.py b/eos/effects/effect5501.py
deleted file mode 100644
index 5f491a84b..000000000
--- a/eos/effects/effect5501.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# eliteBonusCommandShipMediumHybridDamageCS2
-#
-# Used by:
-# Ship: Vulture
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Hybrid Turret"),
-                                  "damageMultiplier", ship.getModifiedItemAttr("eliteBonusCommandShips2"),
-                                  skill="Command Ships")
diff --git a/eos/effects/effect5502.py b/eos/effects/effect5502.py
deleted file mode 100644
index 5d855b11c..000000000
--- a/eos/effects/effect5502.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# eliteBonusCommandShipMediumHybridTrackingCS1
-#
-# Used by:
-# Ship: Eos
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Hybrid Turret"),
-                                  "trackingSpeed", ship.getModifiedItemAttr("eliteBonusCommandShips1"),
-                                  skill="Command Ships")
diff --git a/eos/effects/effect5503.py b/eos/effects/effect5503.py
deleted file mode 100644
index 7e359e3e0..000000000
--- a/eos/effects/effect5503.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# eliteBonusCommandShipHeavyDroneTrackingCS2
-#
-# Used by:
-# Ship: Eos
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Heavy Drone Operation"),
-                                 "trackingSpeed", ship.getModifiedItemAttr("eliteBonusCommandShips2"),
-                                 skill="Command Ships")
diff --git a/eos/effects/effect5504.py b/eos/effects/effect5504.py
deleted file mode 100644
index 8b105c48a..000000000
--- a/eos/effects/effect5504.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# eliteBonusCommandShipHeavyDroneVelocityCS2
-#
-# Used by:
-# Ship: Eos
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Heavy Drone Operation"),
-                                 "maxVelocity", ship.getModifiedItemAttr("eliteBonusCommandShips2"),
-                                 skill="Command Ships")
diff --git a/eos/effects/effect5505.py b/eos/effects/effect5505.py
deleted file mode 100644
index b7cec2d64..000000000
--- a/eos/effects/effect5505.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# eliteBonusCommandShipMediumHybridRoFCS1
-#
-# Used by:
-# Ship: Astarte
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Hybrid Turret"),
-                                  "speed", ship.getModifiedItemAttr("eliteBonusCommandShips1"), skill="Command Ships")
diff --git a/eos/effects/effect5514.py b/eos/effects/effect5514.py
deleted file mode 100644
index 866509be5..000000000
--- a/eos/effects/effect5514.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# eliteBonusCommandShipHeavyAssaultMissileDamageCS2
-#
-# Used by:
-# Ship: Damnation
-type = "passive"
-
-
-def handler(fit, ship, context):
-    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"), skill="Command Ships")
diff --git a/eos/effects/effect5521.py b/eos/effects/effect5521.py
deleted file mode 100644
index f6f10902c..000000000
--- a/eos/effects/effect5521.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# eliteBonusCommandShipHeavyMissileDamageCS2
-#
-# Used by:
-# Ship: Damnation
-type = "passive"
-
-
-def handler(fit, ship, context):
-    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"), skill="Command Ships")
diff --git a/eos/effects/effect553.py b/eos/effects/effect553.py
deleted file mode 100644
index 60c79d649..000000000
--- a/eos/effects/effect553.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipHTTrackingBonusGB
-#
-# Used by:
-# Ship: Vindicator
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Large Hybrid Turret"),
-                                  "trackingSpeed", ship.getModifiedItemAttr("shipBonusGB"), skill="Gallente Battleship")
diff --git a/eos/effects/effect5539.py b/eos/effects/effect5539.py
deleted file mode 100644
index adecc7914..000000000
--- a/eos/effects/effect5539.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusHMLKineticDamageAC
-#
-# Used by:
-# Ship: Sacrilege
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Missiles"),
-                                    "kineticDamage", ship.getModifiedItemAttr("shipBonusAC"), skill="Amarr Cruiser")
diff --git a/eos/effects/effect5540.py b/eos/effects/effect5540.py
deleted file mode 100644
index 464e8d6ac..000000000
--- a/eos/effects/effect5540.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusHMLEMDamageAC
-#
-# Used by:
-# Ship: Sacrilege
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Missiles"),
-                                    "emDamage", ship.getModifiedItemAttr("shipBonusAC"), skill="Amarr Cruiser")
diff --git a/eos/effects/effect5541.py b/eos/effects/effect5541.py
deleted file mode 100644
index 663ee7a44..000000000
--- a/eos/effects/effect5541.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusHMLThermDamageAC
-#
-# Used by:
-# Ship: Sacrilege
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Missiles"),
-                                    "thermalDamage", ship.getModifiedItemAttr("shipBonusAC"), skill="Amarr Cruiser")
diff --git a/eos/effects/effect5542.py b/eos/effects/effect5542.py
deleted file mode 100644
index c22b7f6ba..000000000
--- a/eos/effects/effect5542.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusHMLExploDamageAC
-#
-# Used by:
-# Ship: Sacrilege
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Missiles"),
-                                    "explosiveDamage", ship.getModifiedItemAttr("shipBonusAC"), skill="Amarr Cruiser")
diff --git a/eos/effects/effect5552.py b/eos/effects/effect5552.py
deleted file mode 100644
index 1275a2e99..000000000
--- a/eos/effects/effect5552.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipBonusHMLVelocityEliteBonusHeavyGunship1
-#
-# Used by:
-# Ship: Sacrilege
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Missiles"),
-                                    "maxVelocity", ship.getModifiedItemAttr("eliteBonusHeavyGunship1"),
-                                    skill="Heavy Assault Cruisers")
diff --git a/eos/effects/effect5553.py b/eos/effects/effect5553.py
deleted file mode 100644
index 59e546543..000000000
--- a/eos/effects/effect5553.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipBonusHAMVelocityEliteBonusHeavyGunship1
-#
-# Used by:
-# Ship: Sacrilege
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Assault Missiles"),
-                                    "maxVelocity", ship.getModifiedItemAttr("eliteBonusHeavyGunship1"),
-                                    skill="Heavy Assault Cruisers")
diff --git a/eos/effects/effect5554.py b/eos/effects/effect5554.py
deleted file mode 100644
index 622b593fd..000000000
--- a/eos/effects/effect5554.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipBonusArmorRepAmountGC2
-#
-# Used by:
-# Ship: Deimos
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Repair Systems"),
-                                  "armorDamageAmount", ship.getModifiedItemAttr("shipBonusGC2"),
-                                  skill="Gallente Cruiser")
diff --git a/eos/effects/effect5555.py b/eos/effects/effect5555.py
deleted file mode 100644
index 4f7113218..000000000
--- a/eos/effects/effect5555.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusHeavyDroneSpeedGC
-#
-# Used by:
-# Ship: Ishtar
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Heavy Drone Operation"),
-                                 "maxVelocity", ship.getModifiedItemAttr("shipBonusGC"), skill="Gallente Cruiser")
diff --git a/eos/effects/effect5556.py b/eos/effects/effect5556.py
deleted file mode 100644
index d306134b2..000000000
--- a/eos/effects/effect5556.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusHeavyDRoneTrackingGC
-#
-# Used by:
-# Ship: Ishtar
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Heavy Drone Operation"),
-                                 "trackingSpeed", ship.getModifiedItemAttr("shipBonusGC"), skill="Gallente Cruiser")
diff --git a/eos/effects/effect5557.py b/eos/effects/effect5557.py
deleted file mode 100644
index 7704bffed..000000000
--- a/eos/effects/effect5557.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipBonusSentryDroneOptimalRangeEliteBonusHeavyGunship2
-#
-# Used by:
-# Ship: Ishtar
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Sentry Drone Interfacing"),
-                                 "maxRange", ship.getModifiedItemAttr("eliteBonusHeavyGunship2"),
-                                 skill="Heavy Assault Cruisers")
diff --git a/eos/effects/effect5558.py b/eos/effects/effect5558.py
deleted file mode 100644
index aab03ea9e..000000000
--- a/eos/effects/effect5558.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipBonusSentryDroneTrackingEliteBonusHeavyGunship2
-#
-# Used by:
-# Ship: Ishtar
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Sentry Drone Interfacing"),
-                                 "trackingSpeed", ship.getModifiedItemAttr("eliteBonusHeavyGunship2"),
-                                 skill="Heavy Assault Cruisers")
diff --git a/eos/effects/effect5559.py b/eos/effects/effect5559.py
deleted file mode 100644
index 8acf3337a..000000000
--- a/eos/effects/effect5559.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusShieldBoostAmountMC2
-#
-# Used by:
-# Ship: Vagabond
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Operation"),
-                                  "shieldBonus", ship.getModifiedItemAttr("shipBonusMC2"), skill="Minmatar Cruiser")
diff --git a/eos/effects/effect5560.py b/eos/effects/effect5560.py
deleted file mode 100644
index 4f2dd193e..000000000
--- a/eos/effects/effect5560.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# roleBonusMarauderMJDRReactivationDelayBonus
-#
-# Used by:
-# Ships from group: Marauder (4 of 4)
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Micro Jump Drive",
-                                  "moduleReactivationDelay", ship.getModifiedItemAttr("roleBonusMarauder"))
diff --git a/eos/effects/effect5564.py b/eos/effects/effect5564.py
deleted file mode 100644
index e83045ae8..000000000
--- a/eos/effects/effect5564.py
+++ /dev/null
@@ -1,40 +0,0 @@
-# subSystemBonusCaldariOffensiveCommandBursts
-#
-# Used by:
-# Subsystem: Tengu Offensive - Support Processor
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Skirmish Command"),
-                                  "warfareBuff2Value", src.getModifiedItemAttr("subsystemBonusCaldariOffensive"), skill="Caldari Offensive Systems")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Skirmish Command"),
-                                  "warfareBuff4Value", src.getModifiedItemAttr("subsystemBonusCaldariOffensive"), skill="Caldari Offensive Systems")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Skirmish Command"),
-                                  "warfareBuff3Value", src.getModifiedItemAttr("subsystemBonusCaldariOffensive"), skill="Caldari Offensive Systems")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Skirmish Command"),
-                                  "warfareBuff1Value", src.getModifiedItemAttr("subsystemBonusCaldariOffensive"), skill="Caldari Offensive Systems")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Skirmish Command"),
-                                  "buffDuration", src.getModifiedItemAttr("subsystemBonusCaldariOffensive"), skill="Caldari Offensive Systems")
-
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Command"),
-                                  "buffDuration", src.getModifiedItemAttr("subsystemBonusCaldariOffensive"), skill="Caldari Offensive Systems")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Command"),
-                                  "warfareBuff1Value", src.getModifiedItemAttr("subsystemBonusCaldariOffensive"), skill="Caldari Offensive Systems")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Command"),
-                                  "warfareBuff3Value", src.getModifiedItemAttr("subsystemBonusCaldariOffensive"), skill="Caldari Offensive Systems")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Command"),
-                                  "warfareBuff2Value", src.getModifiedItemAttr("subsystemBonusCaldariOffensive"), skill="Caldari Offensive Systems")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Command"),
-                                  "warfareBuff4Value", src.getModifiedItemAttr("subsystemBonusCaldariOffensive"), skill="Caldari Offensive Systems")
-
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Information Command"),
-                                  "buffDuration", src.getModifiedItemAttr("subsystemBonusCaldariOffensive"), skill="Caldari Offensive Systems")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Information Command"),
-                                  "warfareBuff3Value", src.getModifiedItemAttr("subsystemBonusCaldariOffensive"), skill="Caldari Offensive Systems")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Information Command"),
-                                  "warfareBuff1Value", src.getModifiedItemAttr("subsystemBonusCaldariOffensive"), skill="Caldari Offensive Systems")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Information Command"),
-                                  "warfareBuff4Value", src.getModifiedItemAttr("subsystemBonusCaldariOffensive"), skill="Caldari Offensive Systems")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Information Command"),
-                                  "warfareBuff2Value", src.getModifiedItemAttr("subsystemBonusCaldariOffensive"), skill="Caldari Offensive Systems")
diff --git a/eos/effects/effect5568.py b/eos/effects/effect5568.py
deleted file mode 100644
index dfa14ae83..000000000
--- a/eos/effects/effect5568.py
+++ /dev/null
@@ -1,40 +0,0 @@
-# subSystemBonusGallenteOffensiveCommandBursts
-#
-# Used by:
-# Subsystem: Proteus Offensive - Support Processor
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Skirmish Command"),
-                                  "warfareBuff1Value", src.getModifiedItemAttr("subsystemBonusGallenteOffensive"), skill="Gallente Offensive Systems")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Skirmish Command"),
-                                  "warfareBuff4Value", src.getModifiedItemAttr("subsystemBonusGallenteOffensive"), skill="Gallente Offensive Systems")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Skirmish Command"),
-                                  "buffDuration", src.getModifiedItemAttr("subsystemBonusGallenteOffensive"), skill="Gallente Offensive Systems")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Skirmish Command"),
-                                  "warfareBuff2Value", src.getModifiedItemAttr("subsystemBonusGallenteOffensive"), skill="Gallente Offensive Systems")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Skirmish Command"),
-                                  "warfareBuff3Value", src.getModifiedItemAttr("subsystemBonusGallenteOffensive"), skill="Gallente Offensive Systems")
-
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Armored Command"),
-                                  "warfareBuff4Value", src.getModifiedItemAttr("subsystemBonusGallenteOffensive"), skill="Gallente Offensive Systems")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Armored Command"),
-                                  "warfareBuff1Value", src.getModifiedItemAttr("subsystemBonusGallenteOffensive"), skill="Gallente Offensive Systems")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Armored Command"),
-                                  "warfareBuff2Value", src.getModifiedItemAttr("subsystemBonusGallenteOffensive"), skill="Gallente Offensive Systems")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Armored Command"),
-                                  "buffDuration", src.getModifiedItemAttr("subsystemBonusGallenteOffensive"), skill="Gallente Offensive Systems")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Armored Command"),
-                                  "warfareBuff3Value", src.getModifiedItemAttr("subsystemBonusGallenteOffensive"), skill="Gallente Offensive Systems")
-
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Information Command"),
-                                  "warfareBuff3Value", src.getModifiedItemAttr("subsystemBonusGallenteOffensive"), skill="Gallente Offensive Systems")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Information Command"),
-                                  "warfareBuff1Value", src.getModifiedItemAttr("subsystemBonusGallenteOffensive"), skill="Gallente Offensive Systems")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Information Command"),
-                                  "warfareBuff2Value", src.getModifiedItemAttr("subsystemBonusGallenteOffensive"), skill="Gallente Offensive Systems")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Information Command"),
-                                  "buffDuration", src.getModifiedItemAttr("subsystemBonusGallenteOffensive"), skill="Gallente Offensive Systems")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Information Command"),
-                                  "warfareBuff4Value", src.getModifiedItemAttr("subsystemBonusGallenteOffensive"), skill="Gallente Offensive Systems")
diff --git a/eos/effects/effect5570.py b/eos/effects/effect5570.py
deleted file mode 100644
index 50586ca36..000000000
--- a/eos/effects/effect5570.py
+++ /dev/null
@@ -1,41 +0,0 @@
-# subSystemBonusMinmatarOffensiveCommandBursts
-#
-# Used by:
-# Subsystem: Loki Offensive - Support Processor
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Skirmish Command"),
-                                  "warfareBuff1Value", src.getModifiedItemAttr("subsystemBonusMinmatarOffensive"), skill="Minmatar Offensive Systems")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Skirmish Command"),
-                                  "warfareBuff2Value", src.getModifiedItemAttr("subsystemBonusMinmatarOffensive"), skill="Minmatar Offensive Systems")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Skirmish Command"),
-                                  "buffDuration", src.getModifiedItemAttr("subsystemBonusMinmatarOffensive"), skill="Minmatar Offensive Systems")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Skirmish Command"),
-                                  "warfareBuff4Value", src.getModifiedItemAttr("subsystemBonusMinmatarOffensive"), skill="Minmatar Offensive Systems")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Skirmish Command"),
-                                  "warfareBuff3Value", src.getModifiedItemAttr("subsystemBonusMinmatarOffensive"), skill="Minmatar Offensive Systems")
-
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Command"),
-                                  "warfareBuff3Value", src.getModifiedItemAttr("subsystemBonusMinmatarOffensive"), skill="Minmatar Offensive Systems")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Command"),
-                                  "warfareBuff2Value", src.getModifiedItemAttr("subsystemBonusMinmatarOffensive"), skill="Minmatar Offensive Systems")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Command"),
-                                  "buffDuration", src.getModifiedItemAttr("subsystemBonusMinmatarOffensive"), skill="Minmatar Offensive Systems")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Command"),
-                                  "warfareBuff4Value", src.getModifiedItemAttr("subsystemBonusMinmatarOffensive"), skill="Minmatar Offensive Systems")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Command"),
-                                  "war"
-                                  "fareBuff1Value", src.getModifiedItemAttr("subsystemBonusMinmatarOffensive"), skill="Minmatar Offensive Systems")
-
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Armored Command"),
-                                  "warfareBuff3Value", src.getModifiedItemAttr("subsystemBonusMinmatarOffensive"), skill="Minmatar Offensive Systems")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Armored Command"),
-                                  "warfareBuff4Value", src.getModifiedItemAttr("subsystemBonusMinmatarOffensive"), skill="Minmatar Offensive Systems")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Armored Command"),
-                                  "warfareBuff1Value", src.getModifiedItemAttr("subsystemBonusMinmatarOffensive"), skill="Minmatar Offensive Systems")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Armored Command"),
-                                  "buffDuration", src.getModifiedItemAttr("subsystemBonusMinmatarOffensive"), skill="Minmatar Offensive Systems")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Armored Command"),
-                                  "warfareBuff2Value", src.getModifiedItemAttr("subsystemBonusMinmatarOffensive"), skill="Minmatar Offensive Systems")
diff --git a/eos/effects/effect5572.py b/eos/effects/effect5572.py
deleted file mode 100644
index d7bc3fc46..000000000
--- a/eos/effects/effect5572.py
+++ /dev/null
@@ -1,18 +0,0 @@
-# eliteBonusCommandShipArmoredCS3
-#
-# Used by:
-# Ships from group: Command Ship (4 of 8)
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Armored Command"), "warfareBuff3Value",
-                                  src.getModifiedItemAttr("eliteBonusCommandShips3"), skill="Command Ships")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Armored Command"), "warfareBuff1Value",
-                                  src.getModifiedItemAttr("eliteBonusCommandShips3"), skill="Command Ships")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Armored Command"), "warfareBuff2Value",
-                                  src.getModifiedItemAttr("eliteBonusCommandShips3"), skill="Command Ships")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Armored Command"), "buffDuration",
-                                  src.getModifiedItemAttr("eliteBonusCommandShips3"), skill="Command Ships")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Armored Command"), "warfareBuff4Value",
-                                  src.getModifiedItemAttr("eliteBonusCommandShips3"), skill="Command Ships")
diff --git a/eos/effects/effect5573.py b/eos/effects/effect5573.py
deleted file mode 100644
index a17eb44dc..000000000
--- a/eos/effects/effect5573.py
+++ /dev/null
@@ -1,18 +0,0 @@
-# eliteBonusCommandShipSiegeCS3
-#
-# Used by:
-# Ships from group: Command Ship (4 of 8)
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Command"), "warfareBuff1Value",
-                                  src.getModifiedItemAttr("eliteBonusCommandShips3"), skill="Command Ships")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Command"), "warfareBuff4Value",
-                                  src.getModifiedItemAttr("eliteBonusCommandShips3"), skill="Command Ships")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Command"), "warfareBuff2Value",
-                                  src.getModifiedItemAttr("eliteBonusCommandShips3"), skill="Command Ships")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Command"), "buffDuration",
-                                  src.getModifiedItemAttr("eliteBonusCommandShips3"), skill="Command Ships")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Command"), "warfareBuff3Value",
-                                  src.getModifiedItemAttr("eliteBonusCommandShips3"), skill="Command Ships")
diff --git a/eos/effects/effect5574.py b/eos/effects/effect5574.py
deleted file mode 100644
index 345191164..000000000
--- a/eos/effects/effect5574.py
+++ /dev/null
@@ -1,18 +0,0 @@
-# eliteBonusCommandShipSkirmishCS3
-#
-# Used by:
-# Ships from group: Command Ship (4 of 8)
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Skirmish Command"), "warfareBuff2Value",
-                                  src.getModifiedItemAttr("eliteBonusCommandShips3"), skill="Command Ships")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Skirmish Command"), "warfareBuff1Value",
-                                  src.getModifiedItemAttr("eliteBonusCommandShips3"), skill="Command Ships")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Skirmish Command"), "warfareBuff3Value",
-                                  src.getModifiedItemAttr("eliteBonusCommandShips3"), skill="Command Ships")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Skirmish Command"), "warfareBuff4Value",
-                                  src.getModifiedItemAttr("eliteBonusCommandShips3"), skill="Command Ships")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Skirmish Command"), "buffDuration",
-                                  src.getModifiedItemAttr("eliteBonusCommandShips3"), skill="Command Ships")
diff --git a/eos/effects/effect5575.py b/eos/effects/effect5575.py
deleted file mode 100644
index 283cc76d6..000000000
--- a/eos/effects/effect5575.py
+++ /dev/null
@@ -1,18 +0,0 @@
-# eliteBonusCommandShipInformationCS3
-#
-# Used by:
-# Ships from group: Command Ship (4 of 8)
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Information Command"), "buffDuration",
-                                  src.getModifiedItemAttr("eliteBonusCommandShips3"), skill="Command Ships")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Information Command"), "warfareBuff3Value",
-                                  src.getModifiedItemAttr("eliteBonusCommandShips3"), skill="Command Ships")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Information Command"), "warfareBuff2Value",
-                                  src.getModifiedItemAttr("eliteBonusCommandShips3"), skill="Command Ships")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Information Command"), "warfareBuff1Value",
-                                  src.getModifiedItemAttr("eliteBonusCommandShips3"), skill="Command Ships")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Information Command"), "warfareBuff4Value",
-                                  src.getModifiedItemAttr("eliteBonusCommandShips3"), skill="Command Ships")
diff --git a/eos/effects/effect56.py b/eos/effects/effect56.py
deleted file mode 100644
index 2add2137d..000000000
--- a/eos/effects/effect56.py
+++ /dev/null
@@ -1,15 +0,0 @@
-# powerOutputMultiply
-#
-# Used by:
-# Modules from group: Capacitor Flux Coil (6 of 6)
-# 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)
-# Variations of structure module: Standup Reactor Control Unit I (2 of 2)
-type = "passive"
-
-
-def handler(fit, module, context):
-    # We default this to None as there are times when the source attribute doesn't exist (for example, Cap Power Relay).
-    # It will return 0 as it doesn't exist, which would nullify whatever the target attribute is
-    fit.ship.multiplyItemAttr("powerOutput", module.getModifiedItemAttr("powerOutputMultiplier", None))
diff --git a/eos/effects/effect5607.py b/eos/effects/effect5607.py
deleted file mode 100644
index c792ef48c..000000000
--- a/eos/effects/effect5607.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# capacitorEmissionSystemskill
-#
-# Used by:
-# Implants named like: Inherent Implants 'Squire' Capacitor Emission Systems ES (6 of 6)
-# Modules named like: Egress Port Maximizer (8 of 8)
-# Skill: Capacitor Emission Systems
-type = "passive"
-
-
-def handler(fit, container, context):
-    level = container.level if "skill" in context else 1
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capacitor Emission Systems"),
-                                  "capacitorNeed", container.getModifiedItemAttr("capNeedBonus") * level)
diff --git a/eos/effects/effect5610.py b/eos/effects/effect5610.py
deleted file mode 100644
index 795ddf9ef..000000000
--- a/eos/effects/effect5610.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipBonusLargeEnergyTurretMaxRangeAB
-#
-# Used by:
-# Ship: Marshal
-# Ship: Paladin
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Large Energy Turret"),
-                                  "maxRange", ship.getModifiedItemAttr("shipBonusAB"), skill="Amarr Battleship")
diff --git a/eos/effects/effect5611.py b/eos/effects/effect5611.py
deleted file mode 100644
index f8a66395d..000000000
--- a/eos/effects/effect5611.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusHTFalloffGB2
-#
-# Used by:
-# Ship: Kronos
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Large Hybrid Turret"),
-                                  "falloff", ship.getModifiedItemAttr("shipBonusGB2"), skill="Gallente Battleship")
diff --git a/eos/effects/effect5618.py b/eos/effects/effect5618.py
deleted file mode 100644
index f6c61b3b4..000000000
--- a/eos/effects/effect5618.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipBonusRHMLROF2CB
-#
-# Used by:
-# Ship: Raven
-# Ship: Widow
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Missile Launcher Rapid Heavy",
-                                  "speed", ship.getModifiedItemAttr("shipBonus2CB"), skill="Caldari Battleship")
diff --git a/eos/effects/effect5619.py b/eos/effects/effect5619.py
deleted file mode 100644
index a145864d6..000000000
--- a/eos/effects/effect5619.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusRHMLROFCB
-#
-# Used by:
-# Ship: Scorpion Navy Issue
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Missile Launcher Rapid Heavy",
-                                  "speed", ship.getModifiedItemAttr("shipBonusCB"), skill="Caldari Battleship")
diff --git a/eos/effects/effect562.py b/eos/effects/effect562.py
deleted file mode 100644
index e6dfd16a2..000000000
--- a/eos/effects/effect562.py
+++ /dev/null
@@ -1,17 +0,0 @@
-# shipHTDmgBonusfixedGC
-#
-# Used by:
-# Ship: Adrestia
-# Ship: Arazu
-# Ship: Deimos
-# Ship: Enforcer
-# Ship: Exequror Navy Issue
-# Ship: Guardian-Vexor
-# Ship: Thorax
-# Ship: Vexor
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Hybrid Turret"),
-                                  "damageMultiplier", ship.getModifiedItemAttr("shipBonusGC"), skill="Gallente Cruiser")
diff --git a/eos/effects/effect5620.py b/eos/effects/effect5620.py
deleted file mode 100644
index 1f972e2ea..000000000
--- a/eos/effects/effect5620.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusRHMLROFMB
-#
-# Used by:
-# Ship: Typhoon
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Missile Launcher Rapid Heavy",
-                                  "speed", ship.getModifiedItemAttr("shipBonusMB"), skill="Minmatar Battleship")
diff --git a/eos/effects/effect5621.py b/eos/effects/effect5621.py
deleted file mode 100644
index 34dc736d2..000000000
--- a/eos/effects/effect5621.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusCruiseROFMB
-#
-# Used by:
-# Ship: Typhoon
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Missile Launcher Cruise",
-                                  "speed", ship.getModifiedItemAttr("shipBonusMB"), skill="Minmatar Battleship")
diff --git a/eos/effects/effect5622.py b/eos/effects/effect5622.py
deleted file mode 100644
index 2695607ea..000000000
--- a/eos/effects/effect5622.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusTorpedoROFMB
-#
-# Used by:
-# Ship: Typhoon
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Missile Launcher Torpedo",
-                                  "speed", ship.getModifiedItemAttr("shipBonusMB"), skill="Minmatar Battleship")
diff --git a/eos/effects/effect5628.py b/eos/effects/effect5628.py
deleted file mode 100644
index 7a79cd089..000000000
--- a/eos/effects/effect5628.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusCruiseMissileEMDmgMB
-#
-# Used by:
-# Ship: Typhoon Fleet Issue
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Cruise Missiles"),
-                                    "emDamage", ship.getModifiedItemAttr("shipBonusMB"), skill="Minmatar Battleship")
diff --git a/eos/effects/effect5629.py b/eos/effects/effect5629.py
deleted file mode 100644
index 701dcf7e5..000000000
--- a/eos/effects/effect5629.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipBonusCruiseMissileThermDmgMB
-#
-# Used by:
-# Ship: Typhoon Fleet Issue
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Cruise Missiles"),
-                                    "thermalDamage", ship.getModifiedItemAttr("shipBonusMB"),
-                                    skill="Minmatar Battleship")
diff --git a/eos/effects/effect5630.py b/eos/effects/effect5630.py
deleted file mode 100644
index 33fa55ff9..000000000
--- a/eos/effects/effect5630.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipBonusCruiseMissileKineticDmgMB
-#
-# Used by:
-# Ship: Typhoon Fleet Issue
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Cruise Missiles"),
-                                    "kineticDamage", ship.getModifiedItemAttr("shipBonusMB"),
-                                    skill="Minmatar Battleship")
diff --git a/eos/effects/effect5631.py b/eos/effects/effect5631.py
deleted file mode 100644
index d4c413987..000000000
--- a/eos/effects/effect5631.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipBonusCruiseMissileExploDmgMB
-#
-# Used by:
-# Ship: Typhoon Fleet Issue
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Cruise Missiles"),
-                                    "explosiveDamage", ship.getModifiedItemAttr("shipBonusMB"),
-                                    skill="Minmatar Battleship")
diff --git a/eos/effects/effect5632.py b/eos/effects/effect5632.py
deleted file mode 100644
index 75ddfe45e..000000000
--- a/eos/effects/effect5632.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipBonusTorpedoMissileExploDmgMB
-#
-# Used by:
-# Ship: Typhoon Fleet Issue
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Torpedoes"),
-                                    "explosiveDamage", ship.getModifiedItemAttr("shipBonusMB"),
-                                    skill="Minmatar Battleship")
diff --git a/eos/effects/effect5633.py b/eos/effects/effect5633.py
deleted file mode 100644
index d0035967d..000000000
--- a/eos/effects/effect5633.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusTorpedoMissileEMDmgMB
-#
-# Used by:
-# Ship: Typhoon Fleet Issue
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Torpedoes"),
-                                    "emDamage", ship.getModifiedItemAttr("shipBonusMB"), skill="Minmatar Battleship")
diff --git a/eos/effects/effect5634.py b/eos/effects/effect5634.py
deleted file mode 100644
index ea7d1baff..000000000
--- a/eos/effects/effect5634.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipBonusTorpedoMissileThermDmgMB
-#
-# Used by:
-# Ship: Typhoon Fleet Issue
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Torpedoes"),
-                                    "thermalDamage", ship.getModifiedItemAttr("shipBonusMB"),
-                                    skill="Minmatar Battleship")
diff --git a/eos/effects/effect5635.py b/eos/effects/effect5635.py
deleted file mode 100644
index 34aaf86f6..000000000
--- a/eos/effects/effect5635.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipBonusTorpedoMissileKineticDmgMB
-#
-# Used by:
-# Ship: Typhoon Fleet Issue
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Torpedoes"),
-                                    "kineticDamage", ship.getModifiedItemAttr("shipBonusMB"),
-                                    skill="Minmatar Battleship")
diff --git a/eos/effects/effect5636.py b/eos/effects/effect5636.py
deleted file mode 100644
index 18cc901a9..000000000
--- a/eos/effects/effect5636.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusHeavyMissileEMDmgMB
-#
-# Used by:
-# Ship: Typhoon Fleet Issue
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Missiles"),
-                                    "emDamage", ship.getModifiedItemAttr("shipBonusMB"), skill="Minmatar Battleship")
diff --git a/eos/effects/effect5637.py b/eos/effects/effect5637.py
deleted file mode 100644
index d4406c6b6..000000000
--- a/eos/effects/effect5637.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipBonusHeavyMissileThermDmgMB
-#
-# Used by:
-# Ship: Typhoon Fleet Issue
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Missiles"),
-                                    "thermalDamage", ship.getModifiedItemAttr("shipBonusMB"),
-                                    skill="Minmatar Battleship")
diff --git a/eos/effects/effect5638.py b/eos/effects/effect5638.py
deleted file mode 100644
index 5e2f0da29..000000000
--- a/eos/effects/effect5638.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipBonusHeavyMissileKineticDmgMB
-#
-# Used by:
-# Ship: Typhoon Fleet Issue
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Missiles"),
-                                    "kineticDamage", ship.getModifiedItemAttr("shipBonusMB"),
-                                    skill="Minmatar Battleship")
diff --git a/eos/effects/effect5639.py b/eos/effects/effect5639.py
deleted file mode 100644
index 917596584..000000000
--- a/eos/effects/effect5639.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipBonusHeavyMissileExploDmgMB
-#
-# Used by:
-# Ship: Typhoon Fleet Issue
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Missiles"),
-                                    "explosiveDamage", ship.getModifiedItemAttr("shipBonusMB"),
-                                    skill="Minmatar Battleship")
diff --git a/eos/effects/effect5644.py b/eos/effects/effect5644.py
deleted file mode 100644
index 991b62c44..000000000
--- a/eos/effects/effect5644.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusMissileVelocityCC2
-#
-# Used by:
-# Ship: Cerberus
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"),
-                                    "maxVelocity", ship.getModifiedItemAttr("shipBonusCC2"), skill="Caldari Cruiser")
diff --git a/eos/effects/effect5647.py b/eos/effects/effect5647.py
deleted file mode 100644
index 74269721d..000000000
--- a/eos/effects/effect5647.py
+++ /dev/null
@@ -1,17 +0,0 @@
-# covertOpsCloakCPUPercentRoleBonus
-#
-# Used by:
-# Ships from group: Expedition Frigate (2 of 2)
-# Ship: Astero
-# Ship: Enforcer
-# Ship: Pacifier
-# Ship: Victor
-# Ship: Victorieux Luxury Yacht
-# Ship: Virtuoso
-type = "passive"
-runTime = "early"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Cloaking"),
-                                  "cpu", ship.getModifiedItemAttr("shipBonusRole7"))
diff --git a/eos/effects/effect5650.py b/eos/effects/effect5650.py
deleted file mode 100644
index 651595294..000000000
--- a/eos/effects/effect5650.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# shipArmorResistanceAF1
-#
-# Used by:
-# Ship: Malediction
-type = "passive"
-
-
-def handler(fit, ship, context):
-    damageTypes = ("Em", "Explosive", "Kinetic", "Thermal")
-    for damageType in damageTypes:
-        fit.ship.boostItemAttr("armor{0}DamageResonance".format(damageType), ship.getModifiedItemAttr("shipBonusAF"),
-                               skill="Amarr Frigate")
diff --git a/eos/effects/effect5657.py b/eos/effects/effect5657.py
deleted file mode 100644
index 301cc98c4..000000000
--- a/eos/effects/effect5657.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# Interceptor2ShieldResist
-#
-# Used by:
-# Ship: Raptor
-type = "passive"
-
-
-def handler(fit, ship, context):
-    damageTypes = ("Em", "Explosive", "Kinetic", "Thermal")
-    for damageType in damageTypes:
-        fit.ship.boostItemAttr("shield{0}DamageResonance".format(damageType),
-                               ship.getModifiedItemAttr("eliteBonusInterceptor2"), skill="Interceptors")
diff --git a/eos/effects/effect5673.py b/eos/effects/effect5673.py
deleted file mode 100644
index 9d4cfeb97..000000000
--- a/eos/effects/effect5673.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# interceptor2ProjectileDamage
-#
-# Used by:
-# Ship: Claw
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Projectile Turret"),
-                                  "damageMultiplier", ship.getModifiedItemAttr("eliteBonusInterceptor2"),
-                                  skill="Interceptors")
diff --git a/eos/effects/effect5676.py b/eos/effects/effect5676.py
deleted file mode 100644
index b471d2d1d..000000000
--- a/eos/effects/effect5676.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipBonusSmallMissileExplosionRadiusCD2
-#
-# Used by:
-# Ship: Flycatcher
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredChargeBoost(
-        lambda mod: mod.charge.requiresSkill("Rockets") or mod.charge.requiresSkill("Light Missiles"),
-        "aoeCloudSize", ship.getModifiedItemAttr("shipBonusCD2"), skill="Caldari Destroyer")
diff --git a/eos/effects/effect5688.py b/eos/effects/effect5688.py
deleted file mode 100644
index af169f934..000000000
--- a/eos/effects/effect5688.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusMissileVelocityAD2
-#
-# Used by:
-# Ship: Heretic
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"),
-                                    "maxVelocity", ship.getModifiedItemAttr("shipBonusAD2"), skill="Amarr Destroyer")
diff --git a/eos/effects/effect5695.py b/eos/effects/effect5695.py
deleted file mode 100644
index 7a1492fc8..000000000
--- a/eos/effects/effect5695.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# eliteBonusInterdictorsArmorResist1
-#
-# Used by:
-# Ship: Heretic
-type = "passive"
-
-
-def handler(fit, ship, context):
-    for damageType in ("Em", "Thermal", "Explosive", "Kinetic"):
-        fit.ship.boostItemAttr("armor%sDamageResonance" % damageType,
-                               ship.getModifiedItemAttr("eliteBonusInterdictors1"), skill="Interdictors")
diff --git a/eos/effects/effect57.py b/eos/effects/effect57.py
deleted file mode 100644
index 3c9aeea6d..000000000
--- a/eos/effects/effect57.py
+++ /dev/null
@@ -1,14 +0,0 @@
-# shieldCapacityMultiply
-#
-# Used by:
-# 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 named like: Flux Coil (12 of 12)
-type = "passive"
-
-
-def handler(fit, module, context):
-    # We default this to None as there are times when the source attribute doesn't exist (for example, Cap Power Relay).
-    # It will return 0 as it doesn't exist, which would nullify whatever the target attribute is
-    fit.ship.multiplyItemAttr("shieldCapacity", module.getModifiedItemAttr("shieldCapacityMultiplier", None))
diff --git a/eos/effects/effect5717.py b/eos/effects/effect5717.py
deleted file mode 100644
index ce351f428..000000000
--- a/eos/effects/effect5717.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# implantSetWarpSpeed
-#
-# Used by:
-# Implants named like: grade Ascendancy (12 of 12)
-runTime = "early"
-type = "passive"
-
-
-def handler(fit, implant, context):
-    fit.appliedImplants.filteredItemMultiply(lambda mod: mod.item.group.name == "Cyberimplant",
-                                             "WarpSBonus", implant.getModifiedItemAttr("implantSetWarpSpeed"))
diff --git a/eos/effects/effect5721.py b/eos/effects/effect5721.py
deleted file mode 100644
index 10451c94f..000000000
--- a/eos/effects/effect5721.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusMETOptimalRangePirateFaction
-#
-# Used by:
-# Ships named like: Stratios (2 of 2)
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Energy Turret"),
-                                  "maxRange", ship.getModifiedItemAttr("shipBonusRole7"))
diff --git a/eos/effects/effect5722.py b/eos/effects/effect5722.py
deleted file mode 100644
index 0124b48cd..000000000
--- a/eos/effects/effect5722.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipHybridOptimalGD1
-#
-# Used by:
-# Ship: Eris
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Hybrid Turret"),
-                                  "maxRange", ship.getModifiedItemAttr("shipBonusGD1"), skill="Gallente Destroyer")
diff --git a/eos/effects/effect5723.py b/eos/effects/effect5723.py
deleted file mode 100644
index 5107837b5..000000000
--- a/eos/effects/effect5723.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# eliteBonusInterdictorsMWDSigRadius2
-#
-# Used by:
-# Ships from group: Interdictor (4 of 4)
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("High Speed Maneuvering"),
-                                  "signatureRadiusBonus", ship.getModifiedItemAttr("eliteBonusInterdictors2"),
-                                  skill="Interdictors")
diff --git a/eos/effects/effect5724.py b/eos/effects/effect5724.py
deleted file mode 100644
index e6682472b..000000000
--- a/eos/effects/effect5724.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipSHTOptimalBonusGF
-#
-# Used by:
-# Ship: Ares
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Hybrid Turret"),
-                                  "maxRange", ship.getModifiedItemAttr("shipBonusGF"), skill="Gallente Frigate")
diff --git a/eos/effects/effect5725.py b/eos/effects/effect5725.py
deleted file mode 100644
index 3ac0e69fb..000000000
--- a/eos/effects/effect5725.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusRemoteRepairAmountPirateFaction
-#
-# Used by:
-# Ship: Nestor
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Remote Armor Repair Systems"),
-                                  "armorDamageAmount", ship.getModifiedItemAttr("shipBonusRole7"))
diff --git a/eos/effects/effect5726.py b/eos/effects/effect5726.py
deleted file mode 100644
index 680c7ef2d..000000000
--- a/eos/effects/effect5726.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusLETOptimalRangePirateFaction
-#
-# Used by:
-# Ship: Nestor
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Large Energy Turret"),
-                                  "maxRange", ship.getModifiedItemAttr("shipBonusRole7"))
diff --git a/eos/effects/effect5733.py b/eos/effects/effect5733.py
deleted file mode 100644
index 3bffe8e41..000000000
--- a/eos/effects/effect5733.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# eliteBonusMaraudersHeavyMissileDamageExpRole1
-#
-# Used by:
-# Ship: Golem
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Missiles"),
-                                    "explosiveDamage", ship.getModifiedItemAttr("eliteBonusViolatorsRole1"))
diff --git a/eos/effects/effect5734.py b/eos/effects/effect5734.py
deleted file mode 100644
index 68646cd8d..000000000
--- a/eos/effects/effect5734.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# eliteBonusMaraudersHeavyMissileDamageKinRole1
-#
-# Used by:
-# Ship: Golem
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Missiles"),
-                                    "kineticDamage", ship.getModifiedItemAttr("eliteBonusViolatorsRole1"))
diff --git a/eos/effects/effect5735.py b/eos/effects/effect5735.py
deleted file mode 100644
index 81a99b02c..000000000
--- a/eos/effects/effect5735.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# eliteBonusMaraudersHeavyMissileDamageEMRole1
-#
-# Used by:
-# Ship: Golem
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Missiles"),
-                                    "emDamage", ship.getModifiedItemAttr("eliteBonusViolatorsRole1"))
diff --git a/eos/effects/effect5736.py b/eos/effects/effect5736.py
deleted file mode 100644
index 70abcb387..000000000
--- a/eos/effects/effect5736.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# eliteBonusMaraudersHeavyMissileDamageThermRole1
-#
-# Used by:
-# Ship: Golem
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Missiles"),
-                                    "thermalDamage", ship.getModifiedItemAttr("eliteBonusViolatorsRole1"))
diff --git a/eos/effects/effect5737.py b/eos/effects/effect5737.py
deleted file mode 100644
index 26ccc7c2c..000000000
--- a/eos/effects/effect5737.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipScanProbeStrengthBonusPirateFaction
-#
-# Used by:
-# Ship: Nestor
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Astrometrics"),
-                                    "baseSensorStrength", ship.getModifiedItemAttr("shipBonusRole7"))
diff --git a/eos/effects/effect5738.py b/eos/effects/effect5738.py
deleted file mode 100644
index 7a8923b45..000000000
--- a/eos/effects/effect5738.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# shipBonusRemoteRepairRangePirateFaction2
-#
-# Used by:
-# Ship: Nestor
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Remote Armor Repair Systems"),
-                                  "maxRange", ship.getModifiedItemAttr("shipBonusRole8"))
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Remote Armor Repair Systems"),
-                                  "falloffEffectiveness", ship.getModifiedItemAttr("shipBonusRole8"))
diff --git a/eos/effects/effect5754.py b/eos/effects/effect5754.py
deleted file mode 100644
index fb217b93d..000000000
--- a/eos/effects/effect5754.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# overloadSelfTrackingModuleBonus
-#
-# Used by:
-# Modules named like: Tracking Computer (19 of 19)
-# Variations of module: Tracking Disruptor I (6 of 6)
-type = "overheat"
-
-
-def handler(fit, module, context):
-    module.boostItemAttr("maxRangeBonus", module.getModifiedItemAttr("overloadTrackingModuleStrengthBonus"))
-    module.boostItemAttr("falloffBonus", module.getModifiedItemAttr("overloadTrackingModuleStrengthBonus"))
-    module.boostItemAttr("trackingSpeedBonus", module.getModifiedItemAttr("overloadTrackingModuleStrengthBonus"))
diff --git a/eos/effects/effect5757.py b/eos/effects/effect5757.py
deleted file mode 100644
index 378e739b1..000000000
--- a/eos/effects/effect5757.py
+++ /dev/null
@@ -1,20 +0,0 @@
-# overloadSelfSensorModuleBonus
-#
-# Used by:
-# Modules from group: Remote Sensor Booster (8 of 8)
-# Modules from group: Sensor Booster (16 of 16)
-# Modules from group: Sensor Dampener (6 of 6)
-type = "overheat"
-
-
-def handler(fit, module, context):
-    module.boostItemAttr("maxTargetRangeBonus", module.getModifiedItemAttr("overloadSensorModuleStrengthBonus"))
-    module.boostItemAttr("scanResolutionBonus", module.getModifiedItemAttr("overloadSensorModuleStrengthBonus"),
-                         stackingPenalties=True)
-
-    for scanType in ("Gravimetric", "Magnetometric", "Radar", "Ladar"):
-        module.boostItemAttr(
-            "scan{}StrengthPercent".format(scanType),
-            module.getModifiedItemAttr("overloadSensorModuleStrengthBonus"),
-            stackingPenalties=True
-        )
diff --git a/eos/effects/effect5758.py b/eos/effects/effect5758.py
deleted file mode 100644
index 67b69fc55..000000000
--- a/eos/effects/effect5758.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# overloadSelfPainterBonus
-#
-# Used by:
-# Modules from group: Target Painter (8 of 8)
-type = "overheat"
-
-
-def handler(fit, module, context):
-    module.boostItemAttr("signatureRadiusBonus", module.getModifiedItemAttr("overloadPainterStrengthBonus") or 0)
diff --git a/eos/effects/effect5769.py b/eos/effects/effect5769.py
deleted file mode 100644
index 9e1ea724a..000000000
--- a/eos/effects/effect5769.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# repairDroneHullBonusBonus
-#
-# Used by:
-# Modules named like: Drone Repair Augmentor (8 of 8)
-# Skill: Repair Drone Operation
-type = "passive"
-
-
-def handler(fit, container, context):
-    level = container.level if "skill" in context else 1
-    fit.drones.filteredItemBoost(lambda drone: drone.item.group.name == "Logistic Drone",
-                                 "structureDamageAmount", container.getModifiedItemAttr("damageHP") * level)
diff --git a/eos/effects/effect5778.py b/eos/effects/effect5778.py
deleted file mode 100644
index 4661fbef0..000000000
--- a/eos/effects/effect5778.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipMissileRoFMF2
-#
-# Used by:
-# Ship: Breacher
-# Ship: Jaguar
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Missile Launcher Operation"),
-                                  "speed", ship.getModifiedItemAttr("shipBonusMF2"), skill="Minmatar Frigate")
diff --git a/eos/effects/effect5779.py b/eos/effects/effect5779.py
deleted file mode 100644
index abc07cbca..000000000
--- a/eos/effects/effect5779.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipBonusSPTFalloffMF2
-#
-# Used by:
-# Ship: Pacifier
-# Ship: Rifter
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Projectile Turret"),
-                                  "falloff", ship.getModifiedItemAttr("shipBonusMF2"), skill="Minmatar Frigate")
diff --git a/eos/effects/effect5793.py b/eos/effects/effect5793.py
deleted file mode 100644
index fbd6ae8af..000000000
--- a/eos/effects/effect5793.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# ewSkillTrackingDisruptionRangeDisruptionBonus
-#
-# Used by:
-# Modules named like: Tracking Diagnostic Subroutines (8 of 8)
-# Skill: Weapon Destabilization
-type = "passive"
-
-
-def handler(fit, container, context):
-    level = container.level if "skill" in context else 1
-    for attr in ("maxRangeBonus", "falloffBonus"):
-        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Weapon Disruption"),
-                                      attr, container.getModifiedItemAttr("scanSkillEwStrengthBonus") * level)
diff --git a/eos/effects/effect58.py b/eos/effects/effect58.py
deleted file mode 100644
index 91f3e6ed4..000000000
--- a/eos/effects/effect58.py
+++ /dev/null
@@ -1,15 +0,0 @@
-# capacitorCapacityMultiply
-#
-# Used by:
-# Modules from group: Capacitor Flux Coil (6 of 6)
-# Modules from group: Capacitor Power Relay (20 of 20)
-# Modules from group: Power Diagnostic System (23 of 23)
-# Modules from group: Propulsion Module (68 of 133)
-# Modules from group: Reactor Control Unit (22 of 22)
-type = "passive"
-
-
-def handler(fit, module, context):
-    # We default this to None as there are times when the source attribute doesn't exist (for example, Cap Power Relay).
-    # It will return 0 as it doesn't exist, which would nullify whatever the target attribute is
-    fit.ship.multiplyItemAttr("capacitorCapacity", module.getModifiedItemAttr("capacitorCapacityMultiplier", None))
diff --git a/eos/effects/effect5802.py b/eos/effects/effect5802.py
deleted file mode 100644
index f4a0fe196..000000000
--- a/eos/effects/effect5802.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusAfterburnerSpeedFactor2CB
-#
-# Used by:
-# Ship: Nightmare
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Afterburner"),
-                                  "speedFactor", module.getModifiedItemAttr("shipBonus2CB"), skill="Caldari Battleship")
diff --git a/eos/effects/effect5803.py b/eos/effects/effect5803.py
deleted file mode 100644
index 27fc5822c..000000000
--- a/eos/effects/effect5803.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusSentryDroneDamageMultiplierPirateFaction
-#
-# Used by:
-# Ship: Rattlesnake
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Sentry Drone Interfacing"),
-                                 "damageMultiplier", ship.getModifiedItemAttr("shipBonusRole7"))
diff --git a/eos/effects/effect5804.py b/eos/effects/effect5804.py
deleted file mode 100644
index 8f38f24ee..000000000
--- a/eos/effects/effect5804.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusHeavyDroneDamageMultiplierPirateFaction
-#
-# Used by:
-# Ship: Rattlesnake
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Heavy Drone Operation"),
-                                 "damageMultiplier", ship.getModifiedItemAttr("shipBonusRole7"))
diff --git a/eos/effects/effect5805.py b/eos/effects/effect5805.py
deleted file mode 100644
index 4cfd46da4..000000000
--- a/eos/effects/effect5805.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusSentryDroneHPPirateFaction
-#
-# Used by:
-# Ship: Rattlesnake
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Sentry Drone Interfacing"),
-                                 "hp", ship.getModifiedItemAttr("shipBonusRole7"))
diff --git a/eos/effects/effect5806.py b/eos/effects/effect5806.py
deleted file mode 100644
index bda4ffa41..000000000
--- a/eos/effects/effect5806.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusSentryDroneArmorHpPirateFaction
-#
-# Used by:
-# Ship: Rattlesnake
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Sentry Drone Interfacing"),
-                                 "armorHP", ship.getModifiedItemAttr("shipBonusRole7"))
diff --git a/eos/effects/effect5807.py b/eos/effects/effect5807.py
deleted file mode 100644
index d757d2ef0..000000000
--- a/eos/effects/effect5807.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusSentryDroneShieldHpPirateFaction
-#
-# Used by:
-# Ship: Rattlesnake
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Sentry Drone Interfacing"),
-                                 "shieldCapacity", ship.getModifiedItemAttr("shipBonusRole7"))
diff --git a/eos/effects/effect5808.py b/eos/effects/effect5808.py
deleted file mode 100644
index 6fd8b4d3d..000000000
--- a/eos/effects/effect5808.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusHeavyDroneShieldHpPirateFaction
-#
-# Used by:
-# Ship: Rattlesnake
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Heavy Drone Operation"),
-                                 "shieldCapacity", ship.getModifiedItemAttr("shipBonusRole7"))
diff --git a/eos/effects/effect5809.py b/eos/effects/effect5809.py
deleted file mode 100644
index 244690dca..000000000
--- a/eos/effects/effect5809.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusHeavyDroneArmorHpPirateFaction
-#
-# Used by:
-# Ship: Rattlesnake
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Heavy Drone Operation"),
-                                 "armorHP", ship.getModifiedItemAttr("shipBonusRole7"))
diff --git a/eos/effects/effect581.py b/eos/effects/effect581.py
deleted file mode 100644
index 13126e2a5..000000000
--- a/eos/effects/effect581.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# weaponUpgradesCpuNeedBonusPostPercentCpuLocationShipModulesRequiringGunnery
-#
-# Used by:
-# Implants named like: Zainou 'Gnome' Weapon Upgrades WU (6 of 6)
-# Skill: Weapon Upgrades
-type = "passive"
-
-
-def handler(fit, container, context):
-    level = container.level if "skill" in context else 1
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Gunnery"),
-                                  "cpu", container.getModifiedItemAttr("cpuNeedBonus") * level)
diff --git a/eos/effects/effect5810.py b/eos/effects/effect5810.py
deleted file mode 100644
index c05b7da76..000000000
--- a/eos/effects/effect5810.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusHeavyDroneHPPirateFaction
-#
-# Used by:
-# Ship: Rattlesnake
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Heavy Drone Operation"),
-                                 "hp", ship.getModifiedItemAttr("shipBonusRole7"))
diff --git a/eos/effects/effect5811.py b/eos/effects/effect5811.py
deleted file mode 100644
index 67a68211d..000000000
--- a/eos/effects/effect5811.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipBonusKineticMissileDamageGB2
-#
-# Used by:
-# Ship: Rattlesnake
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"),
-                                    "kineticDamage", ship.getModifiedItemAttr("shipBonusGB2"),
-                                    skill="Gallente Battleship")
diff --git a/eos/effects/effect5812.py b/eos/effects/effect5812.py
deleted file mode 100644
index 3903c3e7e..000000000
--- a/eos/effects/effect5812.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipBonusThermalMissileDamageGB2
-#
-# Used by:
-# Ship: Rattlesnake
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"),
-                                    "thermalDamage", ship.getModifiedItemAttr("shipBonusGB2"),
-                                    skill="Gallente Battleship")
diff --git a/eos/effects/effect5813.py b/eos/effects/effect5813.py
deleted file mode 100644
index b8c52da97..000000000
--- a/eos/effects/effect5813.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipBonusAfterburnerSpeedFactorCF2
-#
-# Used by:
-# Ship: Imp
-# Ship: Succubus
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Afterburner"),
-                                  "speedFactor", module.getModifiedItemAttr("shipBonusCF2"), skill="Caldari Frigate")
diff --git a/eos/effects/effect5814.py b/eos/effects/effect5814.py
deleted file mode 100644
index 8bd18e45a..000000000
--- a/eos/effects/effect5814.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipBonusKineticMissileDamageGF
-#
-# Used by:
-# Ship: Whiptail
-# Ship: Worm
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"),
-                                    "kineticDamage", ship.getModifiedItemAttr("shipBonusGF"), skill="Gallente Frigate")
diff --git a/eos/effects/effect5815.py b/eos/effects/effect5815.py
deleted file mode 100644
index 30d762728..000000000
--- a/eos/effects/effect5815.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipBonusThermalMissileDamageGF
-#
-# Used by:
-# Ship: Whiptail
-# Ship: Worm
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"),
-                                    "thermalDamage", ship.getModifiedItemAttr("shipBonusGF"), skill="Gallente Frigate")
diff --git a/eos/effects/effect5816.py b/eos/effects/effect5816.py
deleted file mode 100644
index 75451999c..000000000
--- a/eos/effects/effect5816.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipBonusLightDroneDamageMultiplierPirateFaction
-#
-# Used by:
-# Ship: Whiptail
-# Ship: Worm
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Light Drone Operation"),
-                                 "damageMultiplier", ship.getModifiedItemAttr("shipBonusRole7"))
diff --git a/eos/effects/effect5817.py b/eos/effects/effect5817.py
deleted file mode 100644
index 2511b9736..000000000
--- a/eos/effects/effect5817.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipBonusLightDroneHPPirateFaction
-#
-# Used by:
-# Ship: Whiptail
-# Ship: Worm
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Light Drone Operation"),
-                                 "hp", ship.getModifiedItemAttr("shipBonusRole7"))
diff --git a/eos/effects/effect5818.py b/eos/effects/effect5818.py
deleted file mode 100644
index 7f4706023..000000000
--- a/eos/effects/effect5818.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipBonusLightDroneArmorHPPirateFaction
-#
-# Used by:
-# Ship: Whiptail
-# Ship: Worm
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Light Drone Operation"),
-                                 "armorHP", ship.getModifiedItemAttr("shipBonusRole7"))
diff --git a/eos/effects/effect5819.py b/eos/effects/effect5819.py
deleted file mode 100644
index 0e7b7b147..000000000
--- a/eos/effects/effect5819.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipBonusLightDroneShieldHPPirateFaction
-#
-# Used by:
-# Ship: Whiptail
-# Ship: Worm
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Light Drone Operation"),
-                                 "shieldCapacity", ship.getModifiedItemAttr("shipBonusRole7"))
diff --git a/eos/effects/effect582.py b/eos/effects/effect582.py
deleted file mode 100644
index fa0994205..000000000
--- a/eos/effects/effect582.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# rapidFiringRofBonusPostPercentSpeedLocationShipModulesRequiringGunnery
-#
-# Used by:
-# Skill: Rapid Firing
-type = "passive"
-
-
-def handler(fit, skill, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Gunnery"),
-                                  "speed", skill.getModifiedItemAttr("rofBonus") * skill.level)
diff --git a/eos/effects/effect5820.py b/eos/effects/effect5820.py
deleted file mode 100644
index 6a4dbfe2f..000000000
--- a/eos/effects/effect5820.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipBonusAfterburnerSpeedFactorCC2
-#
-# Used by:
-# Ship: Fiend
-# Ship: Phantasm
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Afterburner"),
-                                  "speedFactor", module.getModifiedItemAttr("shipBonusCC2"), skill="Caldari Cruiser")
diff --git a/eos/effects/effect5821.py b/eos/effects/effect5821.py
deleted file mode 100644
index 627698037..000000000
--- a/eos/effects/effect5821.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipBonusMediumDroneDamageMultiplierPirateFaction
-#
-# Used by:
-# Ship: Chameleon
-# Ship: Gila
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Medium Drone Operation"),
-                                 "damageMultiplier", ship.getModifiedItemAttr("shipBonusRole7"))
diff --git a/eos/effects/effect5822.py b/eos/effects/effect5822.py
deleted file mode 100644
index 3a41ee95c..000000000
--- a/eos/effects/effect5822.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipBonusMediumDroneHPPirateFaction
-#
-# Used by:
-# Ship: Chameleon
-# Ship: Gila
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Medium Drone Operation"),
-                                 "hp", ship.getModifiedItemAttr("shipBonusRole7"))
diff --git a/eos/effects/effect5823.py b/eos/effects/effect5823.py
deleted file mode 100644
index 2d5373b43..000000000
--- a/eos/effects/effect5823.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipBonusMediumDroneArmorHPPirateFaction
-#
-# Used by:
-# Ship: Chameleon
-# Ship: Gila
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Medium Drone Operation"),
-                                 "armorHP", ship.getModifiedItemAttr("shipBonusRole7"))
diff --git a/eos/effects/effect5824.py b/eos/effects/effect5824.py
deleted file mode 100644
index 593009a33..000000000
--- a/eos/effects/effect5824.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipBonusMediumDroneShieldHPPirateFaction
-#
-# Used by:
-# Ship: Chameleon
-# Ship: Gila
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Medium Drone Operation"),
-                                 "shieldCapacity", ship.getModifiedItemAttr("shipBonusRole7"))
diff --git a/eos/effects/effect5825.py b/eos/effects/effect5825.py
deleted file mode 100644
index b4f538d2c..000000000
--- a/eos/effects/effect5825.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipBonusKineticMissileDamageGC2
-#
-# Used by:
-# Ship: Chameleon
-# Ship: Gila
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"),
-                                    "kineticDamage", ship.getModifiedItemAttr("shipBonusGC2"), skill="Gallente Cruiser")
diff --git a/eos/effects/effect5826.py b/eos/effects/effect5826.py
deleted file mode 100644
index e939aa4e6..000000000
--- a/eos/effects/effect5826.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# shipBonusThermalMissileDamageGC2
-#
-# Used by:
-# Ship: Chameleon
-# Ship: Gila
-
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"),
-                                    "thermalDamage", ship.getModifiedItemAttr("shipBonusGC2"), skill="Gallente Cruiser")
diff --git a/eos/effects/effect5827.py b/eos/effects/effect5827.py
deleted file mode 100644
index 9ef068a92..000000000
--- a/eos/effects/effect5827.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusTDOptimalBonusAF1
-#
-# Used by:
-# Ship: Crucifier
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Weapon Disruption"),
-                                  "maxRange", ship.getModifiedItemAttr("shipBonusAF"), skill="Amarr Frigate")
diff --git a/eos/effects/effect5829.py b/eos/effects/effect5829.py
deleted file mode 100644
index 4f6551231..000000000
--- a/eos/effects/effect5829.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipBonusMiningDurationORE3
-#
-# Used by:
-# Ships from group: Exhumer (3 of 3)
-# Ships from group: Mining Barge (3 of 3)
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Mining"),
-                                  "duration", ship.getModifiedItemAttr("shipBonusORE3"), skill="Mining Barge")
diff --git a/eos/effects/effect5832.py b/eos/effects/effect5832.py
deleted file mode 100644
index d29154f31..000000000
--- a/eos/effects/effect5832.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipBonusMiningIceHarvestingRangeORE2
-#
-# Used by:
-# Variations of ship: Covetor (2 of 2)
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(
-        lambda mod: mod.item.requiresSkill("Mining") or mod.item.requiresSkill("Ice Harvesting"),
-        "maxRange", ship.getModifiedItemAttr("shipBonusORE2"), skill="Mining Barge")
diff --git a/eos/effects/effect5839.py b/eos/effects/effect5839.py
deleted file mode 100644
index 33f370af1..000000000
--- a/eos/effects/effect5839.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# eliteBargeShieldResistance1
-#
-# Used by:
-# Ships from group: Exhumer (3 of 3)
-type = "passive"
-
-
-def handler(fit, ship, context):
-    for damageType in ("em", "thermal", "explosive", "kinetic"):
-        fit.ship.boostItemAttr("shield{}DamageResonance".format(damageType.capitalize()),
-                               ship.getModifiedItemAttr("eliteBonusBarge1"), skill="Exhumers")
diff --git a/eos/effects/effect584.py b/eos/effects/effect584.py
deleted file mode 100644
index 481ef2604..000000000
--- a/eos/effects/effect584.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# surgicalStrikeDamageMultiplierBonusPostPercentDamageMultiplierLocationShipModulesRequiringGunnery
-#
-# Used by:
-# Implants named like: Agency 'Pyrolancea' DB Dose (4 of 4)
-# Implants named like: Eifyr and Co. 'Gunslinger' Surgical Strike SS (6 of 6)
-# Implant: Standard Cerebral Accelerator
-type = "passive"
-
-
-def handler(fit, implant, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Gunnery"),
-                                  "damageMultiplier", implant.getModifiedItemAttr("damageMultiplierBonus"))
diff --git a/eos/effects/effect5840.py b/eos/effects/effect5840.py
deleted file mode 100644
index 6009d9542..000000000
--- a/eos/effects/effect5840.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# eliteBargeBonusMiningDurationBarge2
-#
-# Used by:
-# Ships from group: Exhumer (3 of 3)
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Mining"),
-                                  "duration", ship.getModifiedItemAttr("eliteBonusBarge2"), skill="Exhumers")
diff --git a/eos/effects/effect5852.py b/eos/effects/effect5852.py
deleted file mode 100644
index 5ca789728..000000000
--- a/eos/effects/effect5852.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# eliteBonusExpeditionMining1
-#
-# Used by:
-# Ship: Prospect
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Mining"),
-                                  "miningAmount", module.getModifiedItemAttr("eliteBonusExpedition1"),
-                                  skill="Expedition Frigates")
diff --git a/eos/effects/effect5853.py b/eos/effects/effect5853.py
deleted file mode 100644
index 711200e58..000000000
--- a/eos/effects/effect5853.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# eliteBonusExpeditionSigRadius2
-#
-# Used by:
-# Ship: Prospect
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.ship.boostItemAttr("signatureRadius", ship.getModifiedItemAttr("eliteBonusExpedition2"),
-                           skill="Expedition Frigates")
diff --git a/eos/effects/effect5862.py b/eos/effects/effect5862.py
deleted file mode 100644
index 855ce53f4..000000000
--- a/eos/effects/effect5862.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipMissileEMDamageCB
-#
-# Used by:
-# Ship: Barghest
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"),
-                                    "emDamage", ship.getModifiedItemAttr("shipBonusCB"), skill="Caldari Battleship")
diff --git a/eos/effects/effect5863.py b/eos/effects/effect5863.py
deleted file mode 100644
index 32d10f8f5..000000000
--- a/eos/effects/effect5863.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipMissileKinDamageCB
-#
-# Used by:
-# Ship: Barghest
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"),
-                                    "kineticDamage", ship.getModifiedItemAttr("shipBonusCB"),
-                                    skill="Caldari Battleship")
diff --git a/eos/effects/effect5864.py b/eos/effects/effect5864.py
deleted file mode 100644
index ccf2ec27e..000000000
--- a/eos/effects/effect5864.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipMissileThermDamageCB
-#
-# Used by:
-# Ship: Barghest
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"),
-                                    "thermalDamage", ship.getModifiedItemAttr("shipBonusCB"),
-                                    skill="Caldari Battleship")
diff --git a/eos/effects/effect5865.py b/eos/effects/effect5865.py
deleted file mode 100644
index 0d5a3a588..000000000
--- a/eos/effects/effect5865.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipMissileExploDamageCB
-#
-# Used by:
-# Ship: Barghest
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"),
-                                    "explosiveDamage", ship.getModifiedItemAttr("shipBonusCB"),
-                                    skill="Caldari Battleship")
diff --git a/eos/effects/effect5866.py b/eos/effects/effect5866.py
deleted file mode 100644
index a26ffadbe..000000000
--- a/eos/effects/effect5866.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusWarpScrambleMaxRangeGB
-#
-# Used by:
-# Ship: Barghest
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Warp Scrambler",
-                                  "maxRange", ship.getModifiedItemAttr("shipBonusGB"), skill="Gallente Battleship")
diff --git a/eos/effects/effect5867.py b/eos/effects/effect5867.py
deleted file mode 100644
index e7634c7ec..000000000
--- a/eos/effects/effect5867.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# shipBonusMissileExplosionDelayPirateFaction2
-#
-# Used by:
-# Ship: Barghest
-# Ship: Garmur
-# Ship: Orthrus
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"),
-                                    "explosionDelay", ship.getModifiedItemAttr("shipBonusRole8"))
diff --git a/eos/effects/effect5868.py b/eos/effects/effect5868.py
deleted file mode 100644
index 07f5bf171..000000000
--- a/eos/effects/effect5868.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# drawbackCargoCapacity
-#
-# Used by:
-# Modules named like: Transverse Bulkhead (8 of 8)
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.ship.boostItemAttr("capacity", module.getModifiedItemAttr("drawback"))
diff --git a/eos/effects/effect5869.py b/eos/effects/effect5869.py
deleted file mode 100644
index 826ff22ec..000000000
--- a/eos/effects/effect5869.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# eliteIndustrialWarpSpeedBonus1
-#
-# Used by:
-# Ships from group: Blockade Runner (4 of 4)
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.ship.boostItemAttr("warpSpeedMultiplier", ship.getModifiedItemAttr("eliteBonusIndustrial1"),
-                           skill="Transport Ships")
diff --git a/eos/effects/effect587.py b/eos/effects/effect587.py
deleted file mode 100644
index ce79c7ea8..000000000
--- a/eos/effects/effect587.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# surgicalStrikeDamageMultiplierBonusPostPercentDamageMultiplierLocationShipGroupEnergyWeapon
-#
-# Used by:
-# Skill: Surgical Strike
-type = "passive"
-
-
-def handler(fit, skill, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Weapon",
-                                  "damageMultiplier", skill.getModifiedItemAttr("damageMultiplierBonus") * skill.level)
diff --git a/eos/effects/effect5870.py b/eos/effects/effect5870.py
deleted file mode 100644
index 594102379..000000000
--- a/eos/effects/effect5870.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusShieldBoostCI2
-#
-# Used by:
-# Ship: Bustard
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Operation"),
-                                  "shieldBonus", ship.getModifiedItemAttr("shipBonusCI2"), skill="Caldari Industrial")
diff --git a/eos/effects/effect5871.py b/eos/effects/effect5871.py
deleted file mode 100644
index 628c261ab..000000000
--- a/eos/effects/effect5871.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusShieldBoostMI2
-#
-# Used by:
-# Ship: Mastodon
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Operation"),
-                                  "shieldBonus", ship.getModifiedItemAttr("shipBonusMI2"), skill="Minmatar Industrial")
diff --git a/eos/effects/effect5872.py b/eos/effects/effect5872.py
deleted file mode 100644
index 172163178..000000000
--- a/eos/effects/effect5872.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipBonusArmorRepairAI2
-#
-# Used by:
-# Ship: Impel
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Repair Systems"),
-                                  "armorDamageAmount", ship.getModifiedItemAttr("shipBonusAI2"),
-                                  skill="Amarr Industrial")
diff --git a/eos/effects/effect5873.py b/eos/effects/effect5873.py
deleted file mode 100644
index 3699a8b1e..000000000
--- a/eos/effects/effect5873.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipBonusArmorRepairGI2
-#
-# Used by:
-# Ship: Occator
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Repair Systems"),
-                                  "armorDamageAmount", ship.getModifiedItemAttr("shipBonusGI2"),
-                                  skill="Gallente Industrial")
diff --git a/eos/effects/effect5874.py b/eos/effects/effect5874.py
deleted file mode 100644
index 1cc16aab2..000000000
--- a/eos/effects/effect5874.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# eliteIndustrialFleetCapacity1
-#
-# Used by:
-# Ships from group: Deep Space Transport (4 of 4)
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.ship.boostItemAttr("fleetHangarCapacity", ship.getModifiedItemAttr("eliteBonusIndustrial1"),
-                           skill="Transport Ships")
diff --git a/eos/effects/effect588.py b/eos/effects/effect588.py
deleted file mode 100644
index 5cd9e697b..000000000
--- a/eos/effects/effect588.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# surgicalStrikeDamageMultiplierBonusPostPercentDamageMultiplierLocationShipGroupProjectileWeapon
-#
-# Used by:
-# Skill: Surgical Strike
-type = "passive"
-
-
-def handler(fit, skill, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Projectile Weapon",
-                                  "damageMultiplier", skill.getModifiedItemAttr("damageMultiplierBonus") * skill.level)
diff --git a/eos/effects/effect5881.py b/eos/effects/effect5881.py
deleted file mode 100644
index c21754443..000000000
--- a/eos/effects/effect5881.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# eliteIndustrialShieldResists2
-#
-# Used by:
-# Ship: Bustard
-# Ship: Mastodon
-type = "passive"
-
-
-def handler(fit, ship, context):
-    for damageType in ("em", "thermal", "explosive", "kinetic"):
-        fit.ship.boostItemAttr("shield{}DamageResonance".format(damageType.capitalize()),
-                               ship.getModifiedItemAttr("eliteBonusIndustrial2"), skill="Transport Ships")
diff --git a/eos/effects/effect5888.py b/eos/effects/effect5888.py
deleted file mode 100644
index fc4298590..000000000
--- a/eos/effects/effect5888.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# eliteIndustrialArmorResists2
-#
-# Used by:
-# Ship: Impel
-# Ship: Occator
-type = "passive"
-
-
-def handler(fit, ship, context):
-    for damageType in ("em", "thermal", "explosive", "kinetic"):
-        fit.ship.boostItemAttr("armor{}DamageResonance".format(damageType.capitalize()),
-                               ship.getModifiedItemAttr("eliteBonusIndustrial2"), skill="Transport Ships")
diff --git a/eos/effects/effect5889.py b/eos/effects/effect5889.py
deleted file mode 100644
index 2bfd6fe21..000000000
--- a/eos/effects/effect5889.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# eliteIndustrialABHeatBonus
-#
-# Used by:
-# Ships from group: Deep Space Transport (4 of 4)
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Afterburner"),
-                                  "overloadSpeedFactorBonus", ship.getModifiedItemAttr("roleBonusOverheatDST"))
diff --git a/eos/effects/effect589.py b/eos/effects/effect589.py
deleted file mode 100644
index 2ead8310e..000000000
--- a/eos/effects/effect589.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# surgicalStrikeDamageMultiplierBonusPostPercentDamageMultiplierLocationShipGroupHybridWeapon
-#
-# Used by:
-# Skill: Surgical Strike
-type = "passive"
-
-
-def handler(fit, skill, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Hybrid Weapon",
-                                  "damageMultiplier", skill.getModifiedItemAttr("damageMultiplierBonus") * skill.level)
diff --git a/eos/effects/effect5890.py b/eos/effects/effect5890.py
deleted file mode 100644
index 995b34fd8..000000000
--- a/eos/effects/effect5890.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# eliteIndustrialMWDHeatBonus
-#
-# Used by:
-# Ships from group: Deep Space Transport (4 of 4)
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("High Speed Maneuvering"),
-                                  "overloadSpeedFactorBonus", ship.getModifiedItemAttr("roleBonusOverheatDST"))
diff --git a/eos/effects/effect5891.py b/eos/effects/effect5891.py
deleted file mode 100644
index c0e4dec0c..000000000
--- a/eos/effects/effect5891.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# eliteIndustrialArmorHardenerHeatBonus
-#
-# Used by:
-# Ships from group: Deep Space Transport (4 of 4)
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Hull Upgrades"),
-                                  "overloadHardeningBonus", ship.getModifiedItemAttr("roleBonusOverheatDST"))
diff --git a/eos/effects/effect5892.py b/eos/effects/effect5892.py
deleted file mode 100644
index 7a7b3de70..000000000
--- a/eos/effects/effect5892.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# eliteIndustrialReactiveArmorHardenerHeatBonus
-#
-# Used by:
-# Ships from group: Deep Space Transport (4 of 4)
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Hull Upgrades"),
-                                  "overloadSelfDurationBonus", ship.getModifiedItemAttr("roleBonusOverheatDST"))
diff --git a/eos/effects/effect5893.py b/eos/effects/effect5893.py
deleted file mode 100644
index a90f769ac..000000000
--- a/eos/effects/effect5893.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# eliteIndustrialShieldHardenerHeatBonus
-#
-# Used by:
-# Ships from group: Deep Space Transport (4 of 4)
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Tactical Shield Manipulation"),
-                                  "overloadHardeningBonus", ship.getModifiedItemAttr("roleBonusOverheatDST"))
diff --git a/eos/effects/effect5896.py b/eos/effects/effect5896.py
deleted file mode 100644
index 73766a8a8..000000000
--- a/eos/effects/effect5896.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# eliteIndustrialShieldBoosterHeatBonus
-#
-# Used by:
-# Ships from group: Deep Space Transport (4 of 4)
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Operation"),
-                                  "overloadShieldBonus", ship.getModifiedItemAttr("roleBonusOverheatDST"))
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Operation"),
-                                  "overloadSelfDurationBonus", ship.getModifiedItemAttr("roleBonusOverheatDST"))
diff --git a/eos/effects/effect5899.py b/eos/effects/effect5899.py
deleted file mode 100644
index 5bb6ac8c6..000000000
--- a/eos/effects/effect5899.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# eliteIndustrialArmorRepairHeatBonus
-#
-# Used by:
-# Ships from group: Deep Space Transport (4 of 4)
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Repair Systems"),
-                                  "overloadArmorDamageAmount", ship.getModifiedItemAttr("roleBonusOverheatDST"))
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Repair Systems"),
-                                  "overloadSelfDurationBonus", ship.getModifiedItemAttr("roleBonusOverheatDST"))
diff --git a/eos/effects/effect59.py b/eos/effects/effect59.py
deleted file mode 100644
index 860f4c413..000000000
--- a/eos/effects/effect59.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# cargoCapacityMultiply
-#
-# Used by:
-# 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/effect590.py b/eos/effects/effect590.py
deleted file mode 100644
index 6db95e742..000000000
--- a/eos/effects/effect590.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# energyPulseWeaponsDurationBonusPostPercentDurationLocationShipModulesRequiringEnergyPulseWeapons
-#
-# Used by:
-# Implants named like: Inherent Implants 'Squire' Energy Pulse Weapons EP (6 of 6)
-# Skill: Energy Pulse Weapons
-type = "passive"
-
-
-def handler(fit, container, context):
-    level = container.level if "skill" in context else 1
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Energy Pulse Weapons"),
-                                  "duration", container.getModifiedItemAttr("durationBonus") * level)
diff --git a/eos/effects/effect5900.py b/eos/effects/effect5900.py
deleted file mode 100644
index 1350c3a85..000000000
--- a/eos/effects/effect5900.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# warpSpeedAddition
-#
-# Used by:
-# Modules from group: Warp Accelerator (3 of 3)
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.ship.increaseItemAttr("warpSpeedMultiplier", module.getModifiedItemAttr("warpSpeedAdd"))
diff --git a/eos/effects/effect5901.py b/eos/effects/effect5901.py
deleted file mode 100644
index 51ed0d68b..000000000
--- a/eos/effects/effect5901.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# roleBonusBulkheadCPU
-#
-# Used by:
-# Ships from group: Freighter (4 of 5)
-# Ships from group: Jump Freighter (4 of 4)
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Reinforced Bulkhead",
-                                  "cpu", ship.getModifiedItemAttr("cpuNeedBonus"))
diff --git a/eos/effects/effect5911.py b/eos/effects/effect5911.py
deleted file mode 100644
index 55e0cb883..000000000
--- a/eos/effects/effect5911.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# onlineJumpDriveConsumptionAmountBonusPercentage
-#
-# Used by:
-# Modules from group: Jump Drive Economizer (3 of 3)
-runTime = "early"
-type = ("projected", "passive")
-
-
-def handler(fit, module, context):
-    fit.ship.boostItemAttr("jumpDriveConsumptionAmount",
-                           module.getModifiedItemAttr("consumptionQuantityBonusPercentage"), stackingPenalties=True)
diff --git a/eos/effects/effect5912.py b/eos/effects/effect5912.py
deleted file mode 100644
index af78de47a..000000000
--- a/eos/effects/effect5912.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# systemRemoteCapTransmitterAmount
-#
-# Used by:
-# Celestials named like: Cataclysmic Variable Effect Beacon Class (6 of 6)
-runTime = "early"
-type = ("projected", "passive")
-
-
-def handler(fit, beacon, context):
-    fit.modules.filteredItemMultiply(lambda mod: mod.item.group.name == "Remote Capacitor Transmitter",
-                                     "powerTransferAmount", beacon.getModifiedItemAttr("energyTransferAmountBonus"),
-                                     stackingPenalties=True, penaltyGroup="postMul")
diff --git a/eos/effects/effect5913.py b/eos/effects/effect5913.py
deleted file mode 100644
index 05a3f91ab..000000000
--- a/eos/effects/effect5913.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# systemArmorHP
-#
-# Used by:
-# Celestials named like: Wolf Rayet Effect Beacon Class (6 of 6)
-runTime = "early"
-type = ("projected", "passive")
-
-
-def handler(fit, beacon, context):
-    fit.ship.multiplyItemAttr("armorHP", beacon.getModifiedItemAttr("armorHPMultiplier"))
diff --git a/eos/effects/effect5914.py b/eos/effects/effect5914.py
deleted file mode 100644
index a5ff4dbb0..000000000
--- a/eos/effects/effect5914.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# systemEnergyNeutMultiplier
-#
-# Used by:
-# Celestials named like: Pulsar Effect Beacon Class (6 of 6)
-runTime = "early"
-type = ("projected", "passive")
-
-
-def handler(fit, beacon, context):
-    fit.modules.filteredItemMultiply(lambda mod: mod.item.group.name == "Energy Neutralizer",
-                                     "energyNeutralizerAmount",
-                                     beacon.getModifiedItemAttr("energyWarfareStrengthMultiplier"),
-                                     stackingPenalties=True, penaltyGroup="postMul")
diff --git a/eos/effects/effect5915.py b/eos/effects/effect5915.py
deleted file mode 100644
index 0cb05180a..000000000
--- a/eos/effects/effect5915.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# systemEnergyVampireMultiplier
-#
-# Used by:
-# Celestials named like: Pulsar Effect Beacon Class (6 of 6)
-runTime = "early"
-type = ("projected", "passive")
-
-
-def handler(fit, beacon, context):
-    fit.modules.filteredItemMultiply(lambda mod: mod.item.group.name == "Energy Nosferatu",
-                                     "powerTransferAmount",
-                                     beacon.getModifiedItemAttr("energyWarfareStrengthMultiplier"),
-                                     stackingPenalties=True, penaltyGroup="postMul")
diff --git a/eos/effects/effect5916.py b/eos/effects/effect5916.py
deleted file mode 100644
index 11cc26d96..000000000
--- a/eos/effects/effect5916.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# systemDamageExplosiveBombs
-#
-# Used by:
-# Celestials named like: Red Giant Beacon Class (6 of 6)
-runTime = "early"
-type = ("projected", "passive")
-
-
-def handler(fit, beacon, context):
-    fit.modules.filteredChargeMultiply(lambda mod: mod.charge.requiresSkill("Bomb Deployment"),
-                                       "explosiveDamage", beacon.getModifiedItemAttr("smartbombDamageMultiplier"),
-                                       stackingPenalties=True, penaltyGroup="postMul")
diff --git a/eos/effects/effect5917.py b/eos/effects/effect5917.py
deleted file mode 100644
index 7fb67a6fb..000000000
--- a/eos/effects/effect5917.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# systemDamageKineticBombs
-#
-# Used by:
-# Celestials named like: Red Giant Beacon Class (6 of 6)
-runTime = "early"
-type = ("projected", "passive")
-
-
-def handler(fit, beacon, context):
-    fit.modules.filteredChargeMultiply(lambda mod: mod.charge.requiresSkill("Bomb Deployment"),
-                                       "kineticDamage", beacon.getModifiedItemAttr("smartbombDamageMultiplier"),
-                                       stackingPenalties=True, penaltyGroup="postMul")
diff --git a/eos/effects/effect5918.py b/eos/effects/effect5918.py
deleted file mode 100644
index 675b1adb5..000000000
--- a/eos/effects/effect5918.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# systemDamageThermalBombs
-#
-# Used by:
-# Celestials named like: Red Giant Beacon Class (6 of 6)
-runTime = "early"
-type = ("projected", "passive")
-
-
-def handler(fit, beacon, context):
-    fit.modules.filteredChargeMultiply(lambda mod: mod.charge.requiresSkill("Bomb Deployment"),
-                                       "thermalDamage", beacon.getModifiedItemAttr("smartbombDamageMultiplier"),
-                                       stackingPenalties=True, penaltyGroup="postMul")
diff --git a/eos/effects/effect5919.py b/eos/effects/effect5919.py
deleted file mode 100644
index e81ca6fd3..000000000
--- a/eos/effects/effect5919.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# systemDamageEMBombs
-#
-# Used by:
-# Celestials named like: Red Giant Beacon Class (6 of 6)
-runTime = "early"
-type = ("projected", "passive")
-
-
-def handler(fit, beacon, context):
-    fit.modules.filteredChargeMultiply(lambda mod: mod.charge.requiresSkill("Bomb Deployment"),
-                                       "emDamage", beacon.getModifiedItemAttr("smartbombDamageMultiplier"),
-                                       stackingPenalties=True, penaltyGroup="postMul")
diff --git a/eos/effects/effect5920.py b/eos/effects/effect5920.py
deleted file mode 100644
index e8e4e9b0c..000000000
--- a/eos/effects/effect5920.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# systemAoeCloudSize
-#
-# Used by:
-# Celestials named like: Magnetar Effect Beacon Class (6 of 6)
-runTime = "early"
-type = ("projected", "passive")
-
-
-def handler(fit, beacon, context):
-    fit.modules.filteredChargeMultiply(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"),
-                                       "aoeCloudSize", beacon.getModifiedItemAttr("aoeCloudSizeMultiplier"))
diff --git a/eos/effects/effect5921.py b/eos/effects/effect5921.py
deleted file mode 100644
index 898111db9..000000000
--- a/eos/effects/effect5921.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# systemTargetPainterMultiplier
-#
-# Used by:
-# Celestials named like: Magnetar Effect Beacon Class (6 of 6)
-runTime = "early"
-type = ("projected", "passive")
-
-
-def handler(fit, beacon, context):
-    fit.modules.filteredItemMultiply(lambda mod: mod.item.requiresSkill("Target Painting"),
-                                     "signatureRadiusBonus",
-                                     beacon.getModifiedItemAttr("targetPainterStrengthMultiplier"),
-                                     stackingPenalties=True, penaltyGroup="postMul")
diff --git a/eos/effects/effect5922.py b/eos/effects/effect5922.py
deleted file mode 100644
index f45dca921..000000000
--- a/eos/effects/effect5922.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# systemWebifierStrengthMultiplier
-#
-# Used by:
-# Celestials named like: Black Hole Effect Beacon Class (6 of 6)
-runTime = "early"
-type = ("projected", "passive")
-
-
-def handler(fit, beacon, context):
-    fit.modules.filteredItemMultiply(lambda mod: mod.item.group.name == "Stasis Web",
-                                     "speedFactor", beacon.getModifiedItemAttr("stasisWebStrengthMultiplier"),
-                                     stackingPenalties=True, penaltyGroup="postMul")
diff --git a/eos/effects/effect5923.py b/eos/effects/effect5923.py
deleted file mode 100644
index 333b3eb56..000000000
--- a/eos/effects/effect5923.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# systemNeutBombs
-#
-# Used by:
-# Celestials named like: Red Giant Beacon Class (6 of 6)
-runTime = "early"
-type = ("projected", "passive")
-
-
-def handler(fit, beacon, context):
-    fit.modules.filteredChargeMultiply(lambda mod: mod.charge.requiresSkill("Bomb Deployment"),
-                                       "energyNeutralizerAmount",
-                                       beacon.getModifiedItemAttr("smartbombDamageMultiplier"),
-                                       stackingPenalties=True, penaltyGroup="postMul")
diff --git a/eos/effects/effect5924.py b/eos/effects/effect5924.py
deleted file mode 100644
index 6d04ccf96..000000000
--- a/eos/effects/effect5924.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# systemGravimetricECMBomb
-#
-# Used by:
-# Celestials named like: Red Giant Beacon Class (6 of 6)
-runTime = "early"
-type = ("projected", "passive")
-
-
-def handler(fit, beacon, context):
-    fit.modules.filteredChargeMultiply(lambda mod: mod.charge.requiresSkill("Bomb Deployment"),
-                                       "scanGravimetricStrengthBonus",
-                                       beacon.getModifiedItemAttr("smartbombDamageMultiplier"),
-                                       stackingPenalties=True, penaltyGroup="postMul")
diff --git a/eos/effects/effect5925.py b/eos/effects/effect5925.py
deleted file mode 100644
index b5dfc2a98..000000000
--- a/eos/effects/effect5925.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# systemLadarECMBomb
-#
-# Used by:
-# Celestials named like: Red Giant Beacon Class (6 of 6)
-runTime = "early"
-type = ("projected", "passive")
-
-
-def handler(fit, beacon, context):
-    fit.modules.filteredChargeMultiply(lambda mod: mod.charge.requiresSkill("Bomb Deployment"),
-                                       "scanLadarStrengthBonus",
-                                       beacon.getModifiedItemAttr("smartbombDamageMultiplier"),
-                                       stackingPenalties=True, penaltyGroup="postMul")
diff --git a/eos/effects/effect5926.py b/eos/effects/effect5926.py
deleted file mode 100644
index a9a15ec79..000000000
--- a/eos/effects/effect5926.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# systemMagnetrometricECMBomb
-#
-# Used by:
-# Celestials named like: Red Giant Beacon Class (6 of 6)
-runTime = "early"
-type = ("projected", "passive")
-
-
-def handler(fit, beacon, context):
-    fit.modules.filteredChargeMultiply(lambda mod: mod.charge.requiresSkill("Bomb Deployment"),
-                                       "scanMagnetometricStrengthBonus",
-                                       beacon.getModifiedItemAttr("smartbombDamageMultiplier"),
-                                       stackingPenalties=True, penaltyGroup="postMul")
diff --git a/eos/effects/effect5927.py b/eos/effects/effect5927.py
deleted file mode 100644
index 444ae4fe7..000000000
--- a/eos/effects/effect5927.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# systemRadarECMBomb
-#
-# Used by:
-# Celestials named like: Red Giant Beacon Class (6 of 6)
-runTime = "early"
-type = ("projected", "passive")
-
-
-def handler(fit, beacon, context):
-    fit.modules.filteredChargeMultiply(lambda mod: mod.charge.requiresSkill("Bomb Deployment"),
-                                       "scanRadarStrengthBonus",
-                                       beacon.getModifiedItemAttr("smartbombDamageMultiplier"),
-                                       stackingPenalties=True, penaltyGroup="postMul")
diff --git a/eos/effects/effect5929.py b/eos/effects/effect5929.py
deleted file mode 100644
index f5800c070..000000000
--- a/eos/effects/effect5929.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# systemDroneTracking
-#
-# Used by:
-# Celestials named like: Magnetar Effect Beacon Class (6 of 6)
-runTime = "early"
-type = ("projected", "passive")
-
-
-def handler(fit, beacon, context):
-    fit.drones.filteredItemMultiply(lambda drone: True,
-                                    "trackingSpeed", beacon.getModifiedItemAttr("trackingSpeedMultiplier"),
-                                    stackingPenalties=True, penaltyGroup="postMul")
diff --git a/eos/effects/effect5934.py b/eos/effects/effect5934.py
deleted file mode 100644
index 4b3ee34cb..000000000
--- a/eos/effects/effect5934.py
+++ /dev/null
@@ -1,25 +0,0 @@
-# warpScrambleBlockMWDWithNPCEffect
-#
-# Used by:
-# Modules named like: Warp Scrambler (27 of 27)
-from eos.const import FittingModuleState
-
-runTime = "early"
-type = "projected", "active"
-
-
-def handler(fit, module, context):
-    if "projected" not in context:
-        return
-
-    fit.ship.increaseItemAttr("warpScrambleStatus", module.getModifiedItemAttr("warpScrambleStrength"))
-
-    # this is such a dirty hack
-    for mod in fit.modules:
-        if not mod.isEmpty and mod.state > FittingModuleState.ONLINE and (
-                mod.item.requiresSkill("Micro Jump Drive Operation") or
-                mod.item.requiresSkill("High Speed Maneuvering")
-        ):
-            mod.state = FittingModuleState.ONLINE
-        if not mod.isEmpty and mod.item.requiresSkill("Micro Jump Drive Operation") and mod.state > FittingModuleState.ONLINE:
-            mod.state = FittingModuleState.ONLINE
diff --git a/eos/effects/effect5938.py b/eos/effects/effect5938.py
deleted file mode 100644
index 6a10c458c..000000000
--- a/eos/effects/effect5938.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipBonusSmallMissileExplosionRadiusCF2
-#
-# Used by:
-# Ship: Crow
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredChargeBoost(
-        lambda mod: mod.charge.requiresSkill("Rockets") or mod.charge.requiresSkill("Light Missiles"),
-        "aoeCloudSize", ship.getModifiedItemAttr("shipBonusCF2"), skill="Caldari Frigate")
diff --git a/eos/effects/effect5939.py b/eos/effects/effect5939.py
deleted file mode 100644
index d272d6ec7..000000000
--- a/eos/effects/effect5939.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipRocketRoFBonusAF2
-#
-# Used by:
-# Ship: Malediction
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Missile Launcher Rocket",
-                                  "speed", ship.getModifiedItemAttr("shipBonus2AF"), skill="Amarr Frigate")
diff --git a/eos/effects/effect5940.py b/eos/effects/effect5940.py
deleted file mode 100644
index a01812c19..000000000
--- a/eos/effects/effect5940.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# eliteBonusInterdictorsSHTRoF1
-#
-# Used by:
-# Ship: Eris
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Hybrid Turret"),
-                                  "speed", ship.getModifiedItemAttr("eliteBonusInterdictors1"), skill="Interdictors")
diff --git a/eos/effects/effect5944.py b/eos/effects/effect5944.py
deleted file mode 100644
index 37b8abfc7..000000000
--- a/eos/effects/effect5944.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipMissileLauncherRoFAD1Fixed
-#
-# Used by:
-# Ship: Heretic
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Missile Launcher Operation"),
-                                  "speed", ship.getModifiedItemAttr("shipBonusAD1"), skill="Amarr Destroyer")
diff --git a/eos/effects/effect5945.py b/eos/effects/effect5945.py
deleted file mode 100644
index 48c480b67..000000000
--- a/eos/effects/effect5945.py
+++ /dev/null
@@ -1,16 +0,0 @@
-# cloakingPrototype
-#
-# Used by:
-# Modules named like: Prototype Cloaking Device I (2 of 2)
-type = "active"
-runTime = "early"
-
-
-# TODO: Rewrite this effect
-def handler(fit, module, context):
-    # Set flag which is used to determine if ship is cloaked or not
-    # This is used to apply cloak-only bonuses, like Black Ops' speed bonus
-    # Doesn't apply to covops cloaks
-    fit.extraAttributes["cloaked"] = True
-    # Apply speed penalty
-    fit.ship.multiplyItemAttr("maxVelocity", module.getModifiedItemAttr("maxVelocityModifier"))
diff --git a/eos/effects/effect5951.py b/eos/effects/effect5951.py
deleted file mode 100644
index a37a3e441..000000000
--- a/eos/effects/effect5951.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# drawbackWarpSpeed
-#
-# Used by:
-# Modules from group: Rig Anchor (4 of 4)
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.ship.boostItemAttr("warpSpeedMultiplier", module.getModifiedItemAttr("drawback"), stackingPenalties=True)
diff --git a/eos/effects/effect5956.py b/eos/effects/effect5956.py
deleted file mode 100644
index d8b44d2b8..000000000
--- a/eos/effects/effect5956.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipMETDamageBonusAC2
-#
-# Used by:
-# Ship: Devoter
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Energy Turret"),
-                                  "damageMultiplier", ship.getModifiedItemAttr("shipBonusAC2"), skill="Amarr Cruiser")
diff --git a/eos/effects/effect5957.py b/eos/effects/effect5957.py
deleted file mode 100644
index f671da4c6..000000000
--- a/eos/effects/effect5957.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# eliteBonusHeavyInterdictorsMETOptimal
-#
-# Used by:
-# Ship: Devoter
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Energy Turret"),
-                                  "maxRange", ship.getModifiedItemAttr("eliteBonusHeavyInterdictors1"),
-                                  skill="Heavy Interdiction Cruisers")
diff --git a/eos/effects/effect5958.py b/eos/effects/effect5958.py
deleted file mode 100644
index e6708839e..000000000
--- a/eos/effects/effect5958.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipHybridTrackingGC
-#
-# Used by:
-# Ship: Lachesis
-# Ship: Phobos
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Hybrid Turret"),
-                                  "trackingSpeed", ship.getModifiedItemAttr("shipBonusGC"), skill="Gallente Cruiser")
diff --git a/eos/effects/effect5959.py b/eos/effects/effect5959.py
deleted file mode 100644
index a257bc062..000000000
--- a/eos/effects/effect5959.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# eliteBonusHeavyInterdictorsHybridOptimal1
-#
-# Used by:
-# Ship: Phobos
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Hybrid Turret"),
-                                  "maxRange", ship.getModifiedItemAttr("eliteBonusHeavyInterdictors1"),
-                                  skill="Heavy Interdiction Cruisers")
diff --git a/eos/effects/effect596.py b/eos/effects/effect596.py
deleted file mode 100644
index 58c331911..000000000
--- a/eos/effects/effect596.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# ammoInfluenceRange
-#
-# Used by:
-# Items from category: Charge (587 of 949)
-type = "passive"
-
-
-def handler(fit, module, context):
-    module.multiplyItemAttr("maxRange", module.getModifiedChargeAttr("weaponRangeMultiplier"))
diff --git a/eos/effects/effect598.py b/eos/effects/effect598.py
deleted file mode 100644
index 093953c11..000000000
--- a/eos/effects/effect598.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# ammoSpeedMultiplier
-#
-# Used by:
-# Charges from group: Festival Charges (26 of 26)
-# Charges from group: Interdiction Probe (2 of 2)
-# Items from market group: Special Edition Assets > Special Edition Festival Assets (30 of 33)
-type = "passive"
-
-
-def handler(fit, module, context):
-    module.multiplyItemAttr("speed", module.getModifiedChargeAttr("speedMultiplier") or 1)
diff --git a/eos/effects/effect599.py b/eos/effects/effect599.py
deleted file mode 100644
index 4f4f5e86f..000000000
--- a/eos/effects/effect599.py
+++ /dev/null
@@ -1,14 +0,0 @@
-# ammoFallofMultiplier
-#
-# Used by:
-# Charges from group: Advanced Artillery Ammo (8 of 8)
-# Charges from group: Advanced Autocannon Ammo (8 of 8)
-# Charges from group: Advanced Beam Laser Crystal (8 of 8)
-# Charges from group: Advanced Blaster Charge (8 of 8)
-# Charges from group: Advanced Pulse Laser Crystal (8 of 8)
-# Charges from group: Advanced Railgun Charge (8 of 8)
-type = "passive"
-
-
-def handler(fit, module, context):
-    module.multiplyItemAttr("falloff", module.getModifiedChargeAttr("fallofMultiplier") or 1)
diff --git a/eos/effects/effect5994.py b/eos/effects/effect5994.py
deleted file mode 100644
index cdf18fee6..000000000
--- a/eos/effects/effect5994.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# resistanceKillerHullAll
-#
-# Used by:
-# Modules named like: Polarized (12 of 18)
-type = "passive"
-
-
-def handler(fit, module, context):
-    for dmgType in ('em', 'thermal', 'kinetic', 'explosive'):
-        tgtAttr = '{}DamageResonance'.format(dmgType)
-        fit.ship.forceItemAttr(tgtAttr, module.getModifiedItemAttr("resistanceKillerHull"))
diff --git a/eos/effects/effect5995.py b/eos/effects/effect5995.py
deleted file mode 100644
index c89b4d310..000000000
--- a/eos/effects/effect5995.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# resistanceKillerShieldArmorAll
-#
-# Used by:
-# Modules named like: Polarized (12 of 18)
-type = "passive"
-
-
-def handler(fit, module, context):
-    for layer in ('armor', 'shield'):
-        for dmgType in ('em', 'thermal', 'kinetic', 'explosive'):
-            tgtAttr = '{}{}DamageResonance'.format(layer, dmgType.capitalize())
-            fit.ship.forceItemAttr(tgtAttr, module.getModifiedItemAttr("resistanceKiller"))
diff --git a/eos/effects/effect5998.py b/eos/effects/effect5998.py
deleted file mode 100644
index 92df1ab36..000000000
--- a/eos/effects/effect5998.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# freighterSMACapacityBonusO1
-#
-# Used by:
-# Ship: Bowhead
-type = "passive"
-
-
-def handler(fit, ship, context):
-    # todo: stacking?
-    fit.ship.boostItemAttr("agility", ship.getModifiedItemAttr("freighterBonusO2"), skill="ORE Freighter",
-                           stackingPenalties=True)
diff --git a/eos/effects/effect60.py b/eos/effects/effect60.py
deleted file mode 100644
index 0b7618e97..000000000
--- a/eos/effects/effect60.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# structureHPMultiply
-#
-# Used by:
-# 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.multiplyItemAttr("hp", module.getModifiedItemAttr("structureHPMultiplier"))
diff --git a/eos/effects/effect600.py b/eos/effects/effect600.py
deleted file mode 100644
index 95033d743..000000000
--- a/eos/effects/effect600.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# ammoTrackingMultiplier
-#
-# Used by:
-# Items from category: Charge (182 of 949)
-# Charges from group: Projectile Ammo (128 of 128)
-type = "passive"
-
-
-def handler(fit, module, context):
-    module.multiplyItemAttr("trackingSpeed", module.getModifiedChargeAttr("trackingSpeedMultiplier"))
diff --git a/eos/effects/effect6001.py b/eos/effects/effect6001.py
deleted file mode 100644
index 740a25522..000000000
--- a/eos/effects/effect6001.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# freighterAgilityBonus2O2
-#
-# Used by:
-# Ship: Bowhead
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.ship.boostItemAttr("shipMaintenanceBayCapacity", ship.getModifiedItemAttr("freighterBonusO1"),
-                           skill="ORE Freighter")
diff --git a/eos/effects/effect6006.py b/eos/effects/effect6006.py
deleted file mode 100644
index ce45c042a..000000000
--- a/eos/effects/effect6006.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipSETDamageAmarrTacticalDestroyer1
-#
-# Used by:
-# Ship: Confessor
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Energy Turret"),
-                                  "damageMultiplier", ship.getModifiedItemAttr("shipBonusTacticalDestroyerAmarr1"),
-                                  skill="Amarr Tactical Destroyer")
diff --git a/eos/effects/effect6007.py b/eos/effects/effect6007.py
deleted file mode 100644
index 3cf50a439..000000000
--- a/eos/effects/effect6007.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipSETCapNeedAmarrTacticalDestroyer2
-#
-# Used by:
-# Ship: Confessor
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Energy Turret"),
-                                  "capacitorNeed", ship.getModifiedItemAttr("shipBonusTacticalDestroyerAmarr2"),
-                                  skill="Amarr Tactical Destroyer")
diff --git a/eos/effects/effect6008.py b/eos/effects/effect6008.py
deleted file mode 100644
index 60007905d..000000000
--- a/eos/effects/effect6008.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipHeatDamageAmarrTacticalDestroyer3
-#
-# Used by:
-# Ship: Confessor
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: True, "heatDamage",
-                                  ship.getModifiedItemAttr("shipBonusTacticalDestroyerAmarr3"),
-                                  skill="Amarr Tactical Destroyer")
diff --git a/eos/effects/effect6009.py b/eos/effects/effect6009.py
deleted file mode 100644
index b78379d9a..000000000
--- a/eos/effects/effect6009.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# probeLauncherCPUPercentRoleBonusT3
-#
-# Used by:
-# Ships from group: Strategic Cruiser (4 of 4)
-# Ships from group: Tactical Destroyer (4 of 4)
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Astrometrics"), "cpu", src.getModifiedItemAttr("roleBonusT3ProbeCPU"))
diff --git a/eos/effects/effect6010.py b/eos/effects/effect6010.py
deleted file mode 100644
index d6f46f428..000000000
--- a/eos/effects/effect6010.py
+++ /dev/null
@@ -1,14 +0,0 @@
-# shipModeMaxTargetRangePostDiv
-#
-# Used by:
-# Modules named like: Sharpshooter Mode (4 of 4)
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.ship.multiplyItemAttr(
-        "maxTargetRange",
-        1 / module.getModifiedItemAttr("modeMaxTargetRangePostDiv"),
-        stackingPenalties=True,
-        penaltyGroup="postDiv"
-    )
diff --git a/eos/effects/effect6011.py b/eos/effects/effect6011.py
deleted file mode 100644
index 4279bc167..000000000
--- a/eos/effects/effect6011.py
+++ /dev/null
@@ -1,15 +0,0 @@
-# shipModeSETOptimalRangePostDiv
-#
-# Used by:
-# Module: Confessor Sharpshooter Mode
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.modules.filteredItemMultiply(
-        lambda mod: mod.item.requiresSkill("Small Energy Turret"),
-        "maxRange",
-        1 / module.getModifiedItemAttr("modeMaxRangePostDiv"),
-        stackingPenalties=True,
-        penaltyGroup="postDiv"
-    )
diff --git a/eos/effects/effect6012.py b/eos/effects/effect6012.py
deleted file mode 100644
index 544eac1b2..000000000
--- a/eos/effects/effect6012.py
+++ /dev/null
@@ -1,15 +0,0 @@
-# shipModeScanStrengthPostDiv
-#
-# Used by:
-# Modules named like: Sharpshooter Mode (4 of 4)
-type = "passive"
-
-
-def handler(fit, module, context):
-    for scanType in ("Gravimetric", "Magnetometric", "Radar", "Ladar"):
-        fit.ship.multiplyItemAttr(
-            "scan{}Strength".format(scanType),
-            1 / (module.getModifiedItemAttr("mode{}StrengthPostDiv".format(scanType)) or 1),
-            stackingPenalties=True,
-            penaltyGroup="postDiv"
-        )
diff --git a/eos/effects/effect6014.py b/eos/effects/effect6014.py
deleted file mode 100644
index 7d3b69001..000000000
--- a/eos/effects/effect6014.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# modeSigRadiusPostDiv
-#
-# Used by:
-# Module: Confessor Defense Mode
-# Module: Jackdaw Defense Mode
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.ship.multiplyItemAttr("signatureRadius", 1 / module.getModifiedItemAttr("modeSignatureRadiusPostDiv"),
-                              stackingPenalties=True, penaltyGroup="postDiv")
diff --git a/eos/effects/effect6015.py b/eos/effects/effect6015.py
deleted file mode 100644
index f6a744c4d..000000000
--- a/eos/effects/effect6015.py
+++ /dev/null
@@ -1,20 +0,0 @@
-# modeArmorResonancePostDiv
-#
-# Used by:
-# Modules named like: Defense Mode (3 of 4)
-type = "passive"
-
-
-def handler(fit, module, context):
-    for srcResType, tgtResType in (
-            ("Em", "Em"),
-            ("Explosive", "Explosive"),
-            ("Kinetic", "Kinetic"),
-            ("Thermic", "Thermal")
-    ):
-        fit.ship.multiplyItemAttr(
-            "armor{0}DamageResonance".format(tgtResType),
-            1 / module.getModifiedItemAttr("mode{0}ResistancePostDiv".format(srcResType)),
-            stackingPenalties=True,
-            penaltyGroup="postDiv"
-        )
diff --git a/eos/effects/effect6016.py b/eos/effects/effect6016.py
deleted file mode 100644
index 485100a7a..000000000
--- a/eos/effects/effect6016.py
+++ /dev/null
@@ -1,14 +0,0 @@
-# modeAgilityPostDiv
-#
-# Used by:
-# Modules named like: Propulsion Mode (4 of 4)
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.ship.multiplyItemAttr(
-        "agility",
-        1 / module.getModifiedItemAttr("modeAgilityPostDiv"),
-        stackingPenalties=True,
-        penaltyGroup="postDiv"
-    )
diff --git a/eos/effects/effect6017.py b/eos/effects/effect6017.py
deleted file mode 100644
index 7a563dcef..000000000
--- a/eos/effects/effect6017.py
+++ /dev/null
@@ -1,14 +0,0 @@
-# modeVelocityPostDiv
-#
-# Used by:
-# Module: Jackdaw Propulsion Mode
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.ship.multiplyItemAttr(
-        "maxVelocity",
-        1 / module.getModifiedItemAttr("modeVelocityPostDiv"),
-        stackingPenalties=True,
-        penaltyGroup="postDiv"
-    )
diff --git a/eos/effects/effect602.py b/eos/effects/effect602.py
deleted file mode 100644
index 1f360a87a..000000000
--- a/eos/effects/effect602.py
+++ /dev/null
@@ -1,14 +0,0 @@
-# shipPTurretSpeedBonusMC
-#
-# Used by:
-# Variations of ship: Rupture (3 of 3)
-# Variations of ship: Stabber (3 of 3)
-# Ship: Enforcer
-# Ship: Huginn
-# Ship: Scythe Fleet Issue
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Projectile Turret"),
-                                  "speed", ship.getModifiedItemAttr("shipBonusMC"), skill="Minmatar Cruiser")
diff --git a/eos/effects/effect6020.py b/eos/effects/effect6020.py
deleted file mode 100644
index 9f7dab064..000000000
--- a/eos/effects/effect6020.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusEnergyNeutOptimalRS3
-#
-# Used by:
-# Ship: Pilgrim
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Neutralizer", "maxRange",
-                                  src.getModifiedItemAttr("eliteBonusReconShip3"), skill="Recon Ships")
diff --git a/eos/effects/effect6021.py b/eos/effects/effect6021.py
deleted file mode 100644
index 670f0c701..000000000
--- a/eos/effects/effect6021.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusEnergyNosOptimalRS3
-#
-# Used by:
-# Ship: Pilgrim
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Nosferatu", "maxRange",
-                                  src.getModifiedItemAttr("eliteBonusReconShip3"), skill="Recon Ships")
diff --git a/eos/effects/effect6025.py b/eos/effects/effect6025.py
deleted file mode 100644
index 921c8d7d2..000000000
--- a/eos/effects/effect6025.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# eliteReconBonusMHTOptimalRange1
-#
-# Used by:
-# Ship: Lachesis
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Hybrid Turret"),
-                                  "maxRange", ship.getModifiedItemAttr("eliteBonusReconShip1"), skill="Recon Ships")
diff --git a/eos/effects/effect6027.py b/eos/effects/effect6027.py
deleted file mode 100644
index 7d66fc0c5..000000000
--- a/eos/effects/effect6027.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# eliteReconBonusMPTdamage1
-#
-# Used by:
-# Ship: Huginn
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Projectile Turret"),
-                                  "damageMultiplier", ship.getModifiedItemAttr("eliteBonusReconShip1"),
-                                  skill="Recon Ships")
diff --git a/eos/effects/effect6032.py b/eos/effects/effect6032.py
deleted file mode 100644
index 54897ba12..000000000
--- a/eos/effects/effect6032.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# remoteCapacitorTransmitterPowerNeedBonusEffect
-#
-# Used by:
-# Ships from group: Logistics (3 of 7)
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Remote Capacitor Transmitter",
-                                  "power", ship.getModifiedItemAttr("powerTransferPowerNeedBonus"))
diff --git a/eos/effects/effect6036.py b/eos/effects/effect6036.py
deleted file mode 100644
index 30b0d22fb..000000000
--- a/eos/effects/effect6036.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipHeatDamageMinmatarTacticalDestroyer3
-#
-# Used by:
-# Ship: Svipul
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: True, "heatDamage",
-                                  ship.getModifiedItemAttr("shipBonusTacticalDestroyerMinmatar3"),
-                                  skill="Minmatar Tactical Destroyer")
diff --git a/eos/effects/effect6037.py b/eos/effects/effect6037.py
deleted file mode 100644
index 9c435c7de..000000000
--- a/eos/effects/effect6037.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipSPTDamageMinmatarTacticalDestroyer1
-#
-# Used by:
-# Ship: Svipul
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Projectile Turret"),
-                                  "damageMultiplier", ship.getModifiedItemAttr("shipBonusTacticalDestroyerMinmatar1"),
-                                  skill="Minmatar Tactical Destroyer")
diff --git a/eos/effects/effect6038.py b/eos/effects/effect6038.py
deleted file mode 100644
index 0668d5b00..000000000
--- a/eos/effects/effect6038.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipSPTOptimalMinmatarTacticalDestroyer2
-#
-# Used by:
-# Ship: Svipul
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Projectile Turret"),
-                                  "maxRange", ship.getModifiedItemAttr("shipBonusTacticalDestroyerMinmatar2"),
-                                  skill="Minmatar Tactical Destroyer")
diff --git a/eos/effects/effect6039.py b/eos/effects/effect6039.py
deleted file mode 100644
index 6e3563316..000000000
--- a/eos/effects/effect6039.py
+++ /dev/null
@@ -1,15 +0,0 @@
-# shipModeSPTTrackingPostDiv
-#
-# Used by:
-# Module: Svipul Sharpshooter Mode
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.modules.filteredItemMultiply(
-        lambda mod: mod.item.requiresSkill("Small Projectile Turret"),
-        "trackingSpeed",
-        1 / module.getModifiedItemAttr("modeTrackingPostDiv"),
-        stackingPenalties=True,
-        penaltyGroup="postDiv"
-    )
diff --git a/eos/effects/effect604.py b/eos/effects/effect604.py
deleted file mode 100644
index 7c138ffe0..000000000
--- a/eos/effects/effect604.py
+++ /dev/null
@@ -1,14 +0,0 @@
-# shipPTspeedBonusMB2
-#
-# Used by:
-# Variations of ship: Tempest (4 of 4)
-# Ship: Maelstrom
-# Ship: Marshal
-# Ship: Panther
-# Ship: Typhoon Fleet Issue
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Large Projectile Turret"),
-                                  "speed", ship.getModifiedItemAttr("shipBonusMB2"), skill="Minmatar Battleship")
diff --git a/eos/effects/effect6040.py b/eos/effects/effect6040.py
deleted file mode 100644
index f1aeca8eb..000000000
--- a/eos/effects/effect6040.py
+++ /dev/null
@@ -1,15 +0,0 @@
-# modeMWDSigRadiusPostDiv
-#
-# Used by:
-# Module: Svipul Defense Mode
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.modules.filteredItemMultiply(
-        lambda mod: mod.item.requiresSkill("High Speed Maneuvering"),
-        "signatureRadiusBonus",
-        1 / module.getModifiedItemAttr("modeMWDSigPenaltyPostDiv"),
-        stackingPenalties=True,
-        penaltyGroup="postDiv"
-    )
diff --git a/eos/effects/effect6041.py b/eos/effects/effect6041.py
deleted file mode 100644
index 7213168b0..000000000
--- a/eos/effects/effect6041.py
+++ /dev/null
@@ -1,21 +0,0 @@
-# modeShieldResonancePostDiv
-#
-# Used by:
-# Module: Jackdaw Defense Mode
-# Module: Svipul Defense Mode
-type = "passive"
-
-
-def handler(fit, module, context):
-    for srcResType, tgtResType in (
-            ("Em", "Em"),
-            ("Explosive", "Explosive"),
-            ("Kinetic", "Kinetic"),
-            ("Thermic", "Thermal")
-    ):
-        fit.ship.multiplyItemAttr(
-            "shield{0}DamageResonance".format(tgtResType),
-            1 / module.getModifiedItemAttr("mode{0}ResistancePostDiv".format(srcResType)),
-            stackingPenalties=True,
-            penaltyGroup="postDiv"
-        )
diff --git a/eos/effects/effect6045.py b/eos/effects/effect6045.py
deleted file mode 100644
index fde740a9a..000000000
--- a/eos/effects/effect6045.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusSentryDamageMultiplierGC3
-#
-# Used by:
-# Ship: Ishtar
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Sentry Drone Interfacing"),
-                                 "damageMultiplier", ship.getModifiedItemAttr("shipBonusGC3"), skill="Gallente Cruiser")
diff --git a/eos/effects/effect6046.py b/eos/effects/effect6046.py
deleted file mode 100644
index b2545b29f..000000000
--- a/eos/effects/effect6046.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusSentryHPGC3
-#
-# Used by:
-# Ship: Ishtar
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Sentry Drone Interfacing"),
-                                 "hp", ship.getModifiedItemAttr("shipBonusGC3"), skill="Gallente Cruiser")
diff --git a/eos/effects/effect6047.py b/eos/effects/effect6047.py
deleted file mode 100644
index e5795c26f..000000000
--- a/eos/effects/effect6047.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusSentryArmorHPGC3
-#
-# Used by:
-# Ship: Ishtar
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Sentry Drone Interfacing"),
-                                 "armorHP", ship.getModifiedItemAttr("shipBonusGC3"), skill="Gallente Cruiser")
diff --git a/eos/effects/effect6048.py b/eos/effects/effect6048.py
deleted file mode 100644
index 6161d241f..000000000
--- a/eos/effects/effect6048.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusSentryShieldHPGC3
-#
-# Used by:
-# Ship: Ishtar
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Sentry Drone Interfacing"),
-                                 "shieldCapacity", ship.getModifiedItemAttr("shipBonusGC3"), skill="Gallente Cruiser")
diff --git a/eos/effects/effect6051.py b/eos/effects/effect6051.py
deleted file mode 100644
index c25e35e5d..000000000
--- a/eos/effects/effect6051.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusLightDroneDamageMultiplierGC2
-#
-# Used by:
-# Ship: Ishtar
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Light Drone Operation"),
-                                 "damageMultiplier", ship.getModifiedItemAttr("shipBonusGC2"), skill="Gallente Cruiser")
diff --git a/eos/effects/effect6052.py b/eos/effects/effect6052.py
deleted file mode 100644
index df28d53e0..000000000
--- a/eos/effects/effect6052.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusMediumDroneDamageMultiplierGC2
-#
-# Used by:
-# Ship: Ishtar
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Medium Drone Operation"),
-                                 "damageMultiplier", ship.getModifiedItemAttr("shipBonusGC2"), skill="Gallente Cruiser")
diff --git a/eos/effects/effect6053.py b/eos/effects/effect6053.py
deleted file mode 100644
index f144bd698..000000000
--- a/eos/effects/effect6053.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusHeavyDroneDamageMultiplierGC2
-#
-# Used by:
-# Ship: Ishtar
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Heavy Drone Operation"),
-                                 "damageMultiplier", ship.getModifiedItemAttr("shipBonusGC2"), skill="Gallente Cruiser")
diff --git a/eos/effects/effect6054.py b/eos/effects/effect6054.py
deleted file mode 100644
index 8ddebf251..000000000
--- a/eos/effects/effect6054.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusHeavyDroneHPGC2
-#
-# Used by:
-# Ship: Ishtar
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Heavy Drone Operation"),
-                                 "hp", ship.getModifiedItemAttr("shipBonusGC2"), skill="Gallente Cruiser")
diff --git a/eos/effects/effect6055.py b/eos/effects/effect6055.py
deleted file mode 100644
index 296ebfce8..000000000
--- a/eos/effects/effect6055.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusHeavyDroneArmorHPGC2
-#
-# Used by:
-# Ship: Ishtar
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Heavy Drone Operation"),
-                                 "armorHP", ship.getModifiedItemAttr("shipBonusGC2"), skill="Gallente Cruiser")
diff --git a/eos/effects/effect6056.py b/eos/effects/effect6056.py
deleted file mode 100644
index 82e112d19..000000000
--- a/eos/effects/effect6056.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusHeavyDroneShieldHPGC2
-#
-# Used by:
-# Ship: Ishtar
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Heavy Drone Operation"),
-                                 "shieldCapacity", ship.getModifiedItemAttr("shipBonusGC2"), skill="Gallente Cruiser")
diff --git a/eos/effects/effect6057.py b/eos/effects/effect6057.py
deleted file mode 100644
index 3e2e48409..000000000
--- a/eos/effects/effect6057.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusMediumDroneShieldHPGC2
-#
-# Used by:
-# Ship: Ishtar
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Medium Drone Operation"),
-                                 "shieldCapacity", ship.getModifiedItemAttr("shipBonusGC2"), skill="Gallente Cruiser")
diff --git a/eos/effects/effect6058.py b/eos/effects/effect6058.py
deleted file mode 100644
index d3237a25b..000000000
--- a/eos/effects/effect6058.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusMediumDroneArmorHPGC2
-#
-# Used by:
-# Ship: Ishtar
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Medium Drone Operation"),
-                                 "armorHP", ship.getModifiedItemAttr("shipBonusGC2"), skill="Gallente Cruiser")
diff --git a/eos/effects/effect6059.py b/eos/effects/effect6059.py
deleted file mode 100644
index 719b2b507..000000000
--- a/eos/effects/effect6059.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusMediumDroneHPGC2
-#
-# Used by:
-# Ship: Ishtar
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Medium Drone Operation"),
-                                 "hp", ship.getModifiedItemAttr("shipBonusGC2"), skill="Gallente Cruiser")
diff --git a/eos/effects/effect6060.py b/eos/effects/effect6060.py
deleted file mode 100644
index 886f429a5..000000000
--- a/eos/effects/effect6060.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusLightDroneHPGC2
-#
-# Used by:
-# Ship: Ishtar
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Light Drone Operation"),
-                                 "hp", ship.getModifiedItemAttr("shipBonusGC2"), skill="Gallente Cruiser")
diff --git a/eos/effects/effect6061.py b/eos/effects/effect6061.py
deleted file mode 100644
index 244594dd1..000000000
--- a/eos/effects/effect6061.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusLightDroneArmorHPGC2
-#
-# Used by:
-# Ship: Ishtar
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Light Drone Operation"),
-                                 "armorHP", ship.getModifiedItemAttr("shipBonusGC2"), skill="Gallente Cruiser")
diff --git a/eos/effects/effect6062.py b/eos/effects/effect6062.py
deleted file mode 100644
index 5cead50c6..000000000
--- a/eos/effects/effect6062.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusLightDroneShieldHPGC2
-#
-# Used by:
-# Ship: Ishtar
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Light Drone Operation"),
-                                 "shieldCapacity", ship.getModifiedItemAttr("shipBonusGC2"), skill="Gallente Cruiser")
diff --git a/eos/effects/effect6063.py b/eos/effects/effect6063.py
deleted file mode 100644
index 11b5faa28..000000000
--- a/eos/effects/effect6063.py
+++ /dev/null
@@ -1,15 +0,0 @@
-# entosisLink
-#
-# Used by:
-# Modules from group: Entosis Link (6 of 6)
-type = "active"
-
-
-def handler(fit, module, context):
-    fit.ship.forceItemAttr("disallowAssistance", module.getModifiedItemAttr("disallowAssistance"))
-    for scanType in ("Gravimetric", "Magnetometric", "Radar", "Ladar"):
-        fit.ship.boostItemAttr(
-            "scan{}Strength".format(scanType),
-            module.getModifiedItemAttr("scan{}StrengthPercent".format(scanType)),
-            stackingPenalties=True
-        )
diff --git a/eos/effects/effect607.py b/eos/effects/effect607.py
deleted file mode 100644
index cb53716b2..000000000
--- a/eos/effects/effect607.py
+++ /dev/null
@@ -1,16 +0,0 @@
-# cloaking
-#
-# Used by:
-# Modules from group: Cloaking Device (10 of 14)
-type = "active"
-runTime = "early"
-
-
-# TODO: Rewrite this effect
-def handler(fit, module, context):
-    # Set flag which is used to determine if ship is cloaked or not
-    # This is used to apply cloak-only bonuses, like Black Ops' speed bonus
-    # Doesn't apply to covops cloaks
-    fit.extraAttributes["cloaked"] = True
-    # Apply speed penalty
-    fit.ship.multiplyItemAttr("maxVelocity", module.getModifiedItemAttr("maxVelocityModifier"))
diff --git a/eos/effects/effect6076.py b/eos/effects/effect6076.py
deleted file mode 100644
index 994a5bf74..000000000
--- a/eos/effects/effect6076.py
+++ /dev/null
@@ -1,15 +0,0 @@
-# shipModeMissileVelocityPostDiv
-#
-# Used by:
-# Module: Jackdaw Sharpshooter Mode
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.modules.filteredChargeMultiply(
-        lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"),
-        "maxVelocity",
-        1 / module.getModifiedItemAttr("modeMaxRangePostDiv"),
-        stackingPenalties=True,
-        penaltyGroup="postDiv"
-    )
diff --git a/eos/effects/effect6077.py b/eos/effects/effect6077.py
deleted file mode 100644
index afe1aa44d..000000000
--- a/eos/effects/effect6077.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipHeatDamageCaldariTacticalDestroyer3
-#
-# Used by:
-# Ship: Jackdaw
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: True, "heatDamage",
-                                  ship.getModifiedItemAttr("shipBonusTacticalDestroyerCaldari3"),
-                                  skill="Caldari Tactical Destroyer")
diff --git a/eos/effects/effect6083.py b/eos/effects/effect6083.py
deleted file mode 100644
index 3a21076cc..000000000
--- a/eos/effects/effect6083.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# shipSmallMissileDmgPirateFaction
-#
-# Used by:
-# Ship: Jackdaw
-# Ship: Sunesis
-type = "passive"
-
-
-def handler(fit, ship, context):
-    for damageType in ("em", "explosive", "kinetic", "thermal"):
-        fit.modules.filteredChargeBoost(
-            lambda mod: mod.charge.requiresSkill("Rockets") or mod.charge.requiresSkill("Light Missiles"),
-            "{0}Damage".format(damageType), ship.getModifiedItemAttr("shipBonusRole7"))
diff --git a/eos/effects/effect6085.py b/eos/effects/effect6085.py
deleted file mode 100644
index f0d7c2926..000000000
--- a/eos/effects/effect6085.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipMissileRoFCaldariTacticalDestroyer1
-#
-# Used by:
-# Ship: Jackdaw
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Missile Launcher Operation"),
-                                  "speed", ship.getModifiedItemAttr("shipBonusTacticalDestroyerCaldari1"),
-                                  skill="Caldari Tactical Destroyer")
diff --git a/eos/effects/effect6088.py b/eos/effects/effect6088.py
deleted file mode 100644
index 12e3673b4..000000000
--- a/eos/effects/effect6088.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# shipBonusHeavyAssaultMissileAllDamageMC2
-#
-# Used by:
-# Ship: Rapier
-# Ship: Scythe Fleet Issue
-type = "passive"
-
-
-def handler(fit, ship, context):
-    for damageType in ("em", "explosive", "kinetic", "thermal"):
-        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Assault Missiles"),
-                                        "{0}Damage".format(damageType), ship.getModifiedItemAttr("shipBonusMC2"),
-                                        skill="Minmatar Cruiser")
diff --git a/eos/effects/effect6093.py b/eos/effects/effect6093.py
deleted file mode 100644
index cd0e38e60..000000000
--- a/eos/effects/effect6093.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# shipBonusHeavyMissileAllDamageMC2
-#
-# Used by:
-# Ship: Rapier
-# Ship: Scythe Fleet Issue
-type = "passive"
-
-
-def handler(fit, ship, context):
-    for damageType in ("em", "explosive", "kinetic", "thermal"):
-        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Missiles"),
-                                        "{0}Damage".format(damageType), ship.getModifiedItemAttr("shipBonusMC2"),
-                                        skill="Minmatar Cruiser")
diff --git a/eos/effects/effect6096.py b/eos/effects/effect6096.py
deleted file mode 100644
index c00eb3939..000000000
--- a/eos/effects/effect6096.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# shipBonusLightMissileAllDamageMC2
-#
-# Used by:
-# Ship: Rapier
-# Ship: Scythe Fleet Issue
-type = "passive"
-
-
-def handler(fit, ship, context):
-    for damageType in ("em", "explosive", "kinetic", "thermal"):
-        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Light Missiles"),
-                                        "{0}Damage".format(damageType), ship.getModifiedItemAttr("shipBonusMC2"),
-                                        skill="Minmatar Cruiser")
diff --git a/eos/effects/effect6098.py b/eos/effects/effect6098.py
deleted file mode 100644
index 7dbed2442..000000000
--- a/eos/effects/effect6098.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipMissileReloadTimeCaldariTacticalDestroyer2
-#
-# Used by:
-# Ship: Jackdaw
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Missile Launcher Operation"),
-                                  "reloadTime", ship.getModifiedItemAttr("shipBonusTacticalDestroyerCaldari2"),
-                                  skill="Caldari Tactical Destroyer")
diff --git a/eos/effects/effect61.py b/eos/effects/effect61.py
deleted file mode 100644
index ea3811650..000000000
--- a/eos/effects/effect61.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# agilityBonus
-#
-# Used by:
-# Subsystems named like: Propulsion Interdiction Nullifier (4 of 4)
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.ship.increaseItemAttr("agility", src.getModifiedItemAttr("agilityBonusAdd"))
diff --git a/eos/effects/effect6104.py b/eos/effects/effect6104.py
deleted file mode 100644
index fae2e74ec..000000000
--- a/eos/effects/effect6104.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# entosisDurationMultiply
-#
-# Used by:
-# Items from market group: Ships > Capital Ships (31 of 40)
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemMultiply(lambda mod: mod.item.requiresSkill("Infomorph Psychology"),
-                                     "duration", ship.getModifiedItemAttr("entosisDurationMultiplier") or 1)
diff --git a/eos/effects/effect6110.py b/eos/effects/effect6110.py
deleted file mode 100644
index f04d47292..000000000
--- a/eos/effects/effect6110.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# missileVelocityBonusOnline
-#
-# Used by:
-# Modules from group: Missile Guidance Enhancer (3 of 3)
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"),
-                                    "maxVelocity", module.getModifiedItemAttr("missileVelocityBonus"),
-                                    stackingPenalties=True)
diff --git a/eos/effects/effect6111.py b/eos/effects/effect6111.py
deleted file mode 100644
index a23f9a2fe..000000000
--- a/eos/effects/effect6111.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# missileExplosionDelayBonusOnline
-#
-# Used by:
-# Modules from group: Missile Guidance Enhancer (3 of 3)
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"),
-                                    "explosionDelay", module.getModifiedItemAttr("explosionDelayBonus"),
-                                    stackingPenalties=True)
diff --git a/eos/effects/effect6112.py b/eos/effects/effect6112.py
deleted file mode 100644
index bbc42b61b..000000000
--- a/eos/effects/effect6112.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# missileAOECloudSizeBonusOnline
-#
-# Used by:
-# Modules from group: Missile Guidance Enhancer (3 of 3)
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"),
-                                    "aoeCloudSize", module.getModifiedItemAttr("aoeCloudSizeBonus"),
-                                    stackingPenalties=True)
diff --git a/eos/effects/effect6113.py b/eos/effects/effect6113.py
deleted file mode 100644
index 03ddd6715..000000000
--- a/eos/effects/effect6113.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# missileAOEVelocityBonusOnline
-#
-# Used by:
-# Modules from group: Missile Guidance Enhancer (3 of 3)
-# Module: ML-EKP 'Polybolos' Ballistic Control System
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"),
-                                    "aoeVelocity", module.getModifiedItemAttr("aoeVelocityBonus"),
-                                    stackingPenalties=True)
diff --git a/eos/effects/effect6128.py b/eos/effects/effect6128.py
deleted file mode 100644
index 12be7588b..000000000
--- a/eos/effects/effect6128.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# scriptMissileGuidanceComputerAOECloudSizeBonusBonus
-#
-# Used by:
-# Charges from group: Tracking Script (2 of 2)
-# Charges named like: Missile Script (4 of 4)
-type = "passive"
-
-
-def handler(fit, module, context):
-    module.boostItemAttr("aoeCloudSizeBonus", module.getModifiedChargeAttr("aoeCloudSizeBonusBonus"))
diff --git a/eos/effects/effect6129.py b/eos/effects/effect6129.py
deleted file mode 100644
index 800c91a08..000000000
--- a/eos/effects/effect6129.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# scriptMissileGuidanceComputerAOEVelocityBonusBonus
-#
-# Used by:
-# Charges from group: Tracking Script (2 of 2)
-# Charges named like: Missile Script (4 of 4)
-type = "passive"
-
-
-def handler(fit, module, context):
-    module.boostItemAttr("aoeVelocityBonus", module.getModifiedChargeAttr("aoeVelocityBonusBonus"))
diff --git a/eos/effects/effect6130.py b/eos/effects/effect6130.py
deleted file mode 100644
index 9867c0a84..000000000
--- a/eos/effects/effect6130.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# scriptMissileGuidanceComputerMissileVelocityBonusBonus
-#
-# Used by:
-# Charges named like: Missile Script (4 of 4)
-type = "passive"
-
-
-def handler(fit, module, context):
-    module.boostItemAttr("missileVelocityBonus", module.getModifiedChargeAttr("missileVelocityBonusBonus"))
diff --git a/eos/effects/effect6131.py b/eos/effects/effect6131.py
deleted file mode 100644
index 5f6b2e00b..000000000
--- a/eos/effects/effect6131.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# scriptMissileGuidanceComputerExplosionDelayBonusBonus
-#
-# Used by:
-# Charges named like: Missile Script (4 of 4)
-type = "passive"
-
-
-def handler(fit, module, context):
-    module.boostItemAttr("explosionDelayBonus", module.getModifiedChargeAttr("explosionDelayBonusBonus"))
diff --git a/eos/effects/effect6135.py b/eos/effects/effect6135.py
deleted file mode 100644
index a276fe2db..000000000
--- a/eos/effects/effect6135.py
+++ /dev/null
@@ -1,17 +0,0 @@
-# missileGuidanceComputerBonus4
-#
-# Used by:
-# Modules from group: Missile Guidance Computer (3 of 3)
-type = "active"
-
-
-def handler(fit, container, context):
-    for srcAttr, tgtAttr in (
-            ("aoeCloudSizeBonus", "aoeCloudSize"),
-            ("aoeVelocityBonus", "aoeVelocity"),
-            ("missileVelocityBonus", "maxVelocity"),
-            ("explosionDelayBonus", "explosionDelay"),
-    ):
-        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"),
-                                        tgtAttr, container.getModifiedItemAttr(srcAttr),
-                                        stackingPenalties=True)
diff --git a/eos/effects/effect6144.py b/eos/effects/effect6144.py
deleted file mode 100644
index f92b98aea..000000000
--- a/eos/effects/effect6144.py
+++ /dev/null
@@ -1,16 +0,0 @@
-# overloadSelfMissileGuidanceBonus5
-#
-# Used by:
-# Modules from group: Missile Guidance Computer (3 of 3)
-type = "overheat"
-
-
-def handler(fit, module, context):
-    for tgtAttr in (
-            "aoeCloudSizeBonus",
-            "explosionDelayBonus",
-            "missileVelocityBonus",
-            "maxVelocityModifier",
-            "aoeVelocityBonus"
-    ):
-        module.boostItemAttr(tgtAttr, module.getModifiedItemAttr("overloadTrackingModuleStrengthBonus"))
diff --git a/eos/effects/effect6148.py b/eos/effects/effect6148.py
deleted file mode 100644
index b5854c3fb..000000000
--- a/eos/effects/effect6148.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipHeatDamageGallenteTacticalDestroyer3
-#
-# Used by:
-# Ship: Hecate
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: True, "heatDamage",
-                                  ship.getModifiedItemAttr("shipBonusTacticalDestroyerGallente3"),
-                                  skill="Gallente Tactical Destroyer")
diff --git a/eos/effects/effect6149.py b/eos/effects/effect6149.py
deleted file mode 100644
index 64e164ab9..000000000
--- a/eos/effects/effect6149.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipSHTRoFGallenteTacticalDestroyer1
-#
-# Used by:
-# Ship: Hecate
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Hybrid Turret"),
-                                  "speed", ship.getModifiedItemAttr("shipBonusTacticalDestroyerGallente1"),
-                                  skill="Gallente Tactical Destroyer")
diff --git a/eos/effects/effect6150.py b/eos/effects/effect6150.py
deleted file mode 100644
index dfcd8d7f2..000000000
--- a/eos/effects/effect6150.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipSHTTrackingGallenteTacticalDestroyer2
-#
-# Used by:
-# Ship: Hecate
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Hybrid Turret"),
-                                  "trackingSpeed", ship.getModifiedItemAttr("shipBonusTacticalDestroyerGallente2"),
-                                  skill="Gallente Tactical Destroyer")
diff --git a/eos/effects/effect6151.py b/eos/effects/effect6151.py
deleted file mode 100644
index ae13c4b7d..000000000
--- a/eos/effects/effect6151.py
+++ /dev/null
@@ -1,18 +0,0 @@
-# modeHullResonancePostDiv
-#
-# Used by:
-# Module: Hecate Defense Mode
-type = "passive"
-
-
-def handler(fit, module, context):
-    for srcResType, tgtResType in (
-            ("Em", "em"),
-            ("Explosive", "explosive"),
-            ("Kinetic", "kinetic"),
-            ("Thermic", "thermal")
-    ):
-        fit.ship.multiplyItemAttr(
-            "{0}DamageResonance".format(tgtResType),
-            1 / module.getModifiedItemAttr("mode{0}ResistancePostDiv".format(srcResType))
-        )
diff --git a/eos/effects/effect6152.py b/eos/effects/effect6152.py
deleted file mode 100644
index 724cad5de..000000000
--- a/eos/effects/effect6152.py
+++ /dev/null
@@ -1,15 +0,0 @@
-# shipModeSHTOptimalRangePostDiv
-#
-# Used by:
-# Module: Hecate Sharpshooter Mode
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.modules.filteredItemMultiply(
-        lambda mod: mod.item.requiresSkill("Small Hybrid Turret"),
-        "maxRange",
-        1 / module.getModifiedItemAttr("modeMaxRangePostDiv"),
-        stackingPenalties=True,
-        penaltyGroup="postDiv"
-    )
diff --git a/eos/effects/effect6153.py b/eos/effects/effect6153.py
deleted file mode 100644
index 6d16ea720..000000000
--- a/eos/effects/effect6153.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# modeMWDCapPostDiv
-#
-# Used by:
-# Module: Hecate Propulsion Mode
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.modules.filteredItemMultiply(
-        lambda mod: mod.item.requiresSkill("High Speed Maneuvering"),
-        "capacitorNeed",
-        1 / module.getModifiedItemAttr("modeMWDCapPostDiv")
-    )
diff --git a/eos/effects/effect6154.py b/eos/effects/effect6154.py
deleted file mode 100644
index ad9ddf55e..000000000
--- a/eos/effects/effect6154.py
+++ /dev/null
@@ -1,15 +0,0 @@
-# modeMWDBoostPostDiv
-#
-# Used by:
-# Module: Hecate Propulsion Mode
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.modules.filteredItemMultiply(
-        lambda mod: mod.item.requiresSkill("High Speed Maneuvering"),
-        "speedFactor",
-        1 / module.getModifiedItemAttr("modeMWDVelocityPostDiv"),
-        stackingPenalties=True,
-        penaltyGroup="postDiv"
-    )
diff --git a/eos/effects/effect6155.py b/eos/effects/effect6155.py
deleted file mode 100644
index 58f61b557..000000000
--- a/eos/effects/effect6155.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# modeArmorRepDurationPostDiv
-#
-# Used by:
-# Module: Hecate Defense Mode
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.modules.filteredItemMultiply(
-        lambda mod: mod.item.requiresSkill("Repair Systems"),
-        "duration",
-        1 / module.getModifiedItemAttr("modeArmorRepDurationPostDiv")
-    )
diff --git a/eos/effects/effect6163.py b/eos/effects/effect6163.py
deleted file mode 100644
index c8744ddcf..000000000
--- a/eos/effects/effect6163.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# passiveSpeedLimit
-#
-# Used by:
-# Modules from group: Entosis Link (6 of 6)
-runtime = "late"
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.extraAttributes['speedLimit'] = src.getModifiedItemAttr("speedLimit")
diff --git a/eos/effects/effect6164.py b/eos/effects/effect6164.py
deleted file mode 100644
index 133fb7e7a..000000000
--- a/eos/effects/effect6164.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# systemMaxVelocityPercentage
-#
-# Used by:
-# Celestials named like: Drifter Incursion (6 of 6)
-runTime = "early"
-type = ("projected", "passive")
-
-
-def handler(fit, beacon, context):
-    fit.ship.boostItemAttr("maxVelocity", beacon.getModifiedItemAttr("maxVelocityMultiplier"), stackingPenalties=True)
diff --git a/eos/effects/effect6166.py b/eos/effects/effect6166.py
deleted file mode 100644
index 0a1050711..000000000
--- a/eos/effects/effect6166.py
+++ /dev/null
@@ -1,15 +0,0 @@
-# shipBonusWDFGnullPenalties
-#
-# Used by:
-# Ship: Fiend
-runTime = "early"
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Propulsion Jamming"),
-                                  "speedFactorBonus", ship.getModifiedItemAttr("shipBonusAT"))
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Propulsion Jamming"),
-                                  "speedBoostFactorBonus", ship.getModifiedItemAttr("shipBonusAT"))
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Propulsion Jamming"),
-                                  "massBonusPercentage", ship.getModifiedItemAttr("shipBonusAT"))
diff --git a/eos/effects/effect6170.py b/eos/effects/effect6170.py
deleted file mode 100644
index a382ed70a..000000000
--- a/eos/effects/effect6170.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# entosisCPUPenalty
-#
-# Used by:
-# Ships from group: Interceptor (10 of 10)
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemIncrease(lambda mod: mod.item.requiresSkill("Infomorph Psychology"),
-                                     "entosisCPUAdd", ship.getModifiedItemAttr("entosisCPUPenalty"))
diff --git a/eos/effects/effect6171.py b/eos/effects/effect6171.py
deleted file mode 100644
index a29e38f85..000000000
--- a/eos/effects/effect6171.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# entosisCPUAddition
-#
-# Used by:
-# Modules from group: Entosis Link (6 of 6)
-type = "passive"
-
-
-def handler(fit, module, context):
-    module.increaseItemAttr("cpu", module.getModifiedItemAttr("entosisCPUAdd"))
diff --git a/eos/effects/effect6172.py b/eos/effects/effect6172.py
deleted file mode 100644
index 3d0e9e2aa..000000000
--- a/eos/effects/effect6172.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# battlecruiserMETRange
-#
-# Used by:
-# Ships named like: Harbinger (2 of 2)
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Energy Turret"),
-                                  "maxRange", ship.getModifiedItemAttr("roleBonusCBC"))
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Energy Turret"),
-                                  "falloff", ship.getModifiedItemAttr("roleBonusCBC"))
diff --git a/eos/effects/effect6173.py b/eos/effects/effect6173.py
deleted file mode 100644
index 268704d82..000000000
--- a/eos/effects/effect6173.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# battlecruiserMHTRange
-#
-# Used by:
-# Ships named like: Brutix (2 of 2)
-# Ship: Ferox
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Hybrid Turret"),
-                                  "maxRange", ship.getModifiedItemAttr("roleBonusCBC"))
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Hybrid Turret"),
-                                  "falloff", ship.getModifiedItemAttr("roleBonusCBC"))
diff --git a/eos/effects/effect6174.py b/eos/effects/effect6174.py
deleted file mode 100644
index 57f8ebe4a..000000000
--- a/eos/effects/effect6174.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# battlecruiserMPTRange
-#
-# Used by:
-# Ships named like: Hurricane (2 of 2)
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Projectile Turret"),
-                                  "maxRange", ship.getModifiedItemAttr("roleBonusCBC"))
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Projectile Turret"),
-                                  "falloff", ship.getModifiedItemAttr("roleBonusCBC"))
diff --git a/eos/effects/effect6175.py b/eos/effects/effect6175.py
deleted file mode 100644
index a095cac39..000000000
--- a/eos/effects/effect6175.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# battlecruiserMissileRange
-#
-# Used by:
-# Ships named like: Drake (2 of 2)
-# Ship: Cyclone
-type = "passive"
-
-
-def handler(fit, skill, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"),
-                                    "maxVelocity", skill.getModifiedItemAttr("roleBonusCBC"))
diff --git a/eos/effects/effect6176.py b/eos/effects/effect6176.py
deleted file mode 100644
index 5d666f43a..000000000
--- a/eos/effects/effect6176.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# battlecruiserDroneSpeed
-#
-# Used by:
-# Ship: Myrmidon
-# Ship: Prophecy
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Drones"),
-                                 "maxVelocity", ship.getModifiedItemAttr("roleBonusCBC"))
diff --git a/eos/effects/effect6177.py b/eos/effects/effect6177.py
deleted file mode 100644
index 825685ea1..000000000
--- a/eos/effects/effect6177.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipHybridDmg1CBC2
-#
-# Used by:
-# Ship: Ferox
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Hybrid Turret"),
-                                  "damageMultiplier", ship.getModifiedItemAttr("shipBonusCBC2"),
-                                  skill="Caldari Battlecruiser")
diff --git a/eos/effects/effect6178.py b/eos/effects/effect6178.py
deleted file mode 100644
index e8cd08be7..000000000
--- a/eos/effects/effect6178.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipBonusProjectileTrackingMBC2
-#
-# Used by:
-# Ship: Hurricane Fleet Issue
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Projectile Turret"),
-                                  "trackingSpeed", ship.getModifiedItemAttr("shipBonusMBC2"),
-                                  skill="Minmatar Battlecruiser")
diff --git a/eos/effects/effect6184.py b/eos/effects/effect6184.py
deleted file mode 100644
index 6b414da7e..000000000
--- a/eos/effects/effect6184.py
+++ /dev/null
@@ -1,22 +0,0 @@
-# shipModuleRemoteCapacitorTransmitter
-#
-# Used by:
-# Modules from group: Remote Capacitor Transmitter (41 of 41)
-
-
-from eos.modifiedAttributeDict import ModifiedAttributeDict
-
-
-type = "projected", "active"
-runTime = "late"
-
-
-def handler(fit, src, context, **kwargs):
-    if "projected" in context:
-        amount = src.getModifiedItemAttr("powerTransferAmount")
-        duration = src.getModifiedItemAttr("duration")
-
-        if 'effect' in kwargs:
-            amount *= ModifiedAttributeDict.getResistance(fit, kwargs['effect'])
-
-        fit.addDrain(src, duration, -amount, 0)
diff --git a/eos/effects/effect6185.py b/eos/effects/effect6185.py
deleted file mode 100644
index 94839fdff..000000000
--- a/eos/effects/effect6185.py
+++ /dev/null
@@ -1,15 +0,0 @@
-# shipModuleRemoteHullRepairer
-#
-# Used by:
-# Modules from group: Remote Hull Repairer (8 of 8)
-
-type = "projected", "active"
-runTime = "late"
-
-
-def handler(fit, module, context):
-    if "projected" not in context:
-        return
-    bonus = module.getModifiedItemAttr("structureDamageAmount")
-    duration = module.getModifiedItemAttr("duration") / 1000.0
-    fit.extraAttributes.increase("hullRepair", bonus / duration)
diff --git a/eos/effects/effect6186.py b/eos/effects/effect6186.py
deleted file mode 100644
index 7c62a32c4..000000000
--- a/eos/effects/effect6186.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# shipModuleRemoteShieldBooster
-#
-# Used by:
-# Modules from group: Remote Shield Booster (38 of 38)
-type = "projected", "active"
-
-
-def handler(fit, container, context, **kwargs):
-    if "projected" in context:
-        bonus = container.getModifiedItemAttr("shieldBonus")
-        duration = container.getModifiedItemAttr("duration") / 1000.0
-        fit.extraAttributes.increase("shieldRepair", bonus / duration, **kwargs)
diff --git a/eos/effects/effect6187.py b/eos/effects/effect6187.py
deleted file mode 100644
index 2ee279d44..000000000
--- a/eos/effects/effect6187.py
+++ /dev/null
@@ -1,21 +0,0 @@
-# energyNeutralizerFalloff
-#
-# Used by:
-# Modules from group: Energy Neutralizer (54 of 54)
-from eos.const import FittingModuleState
-from eos.modifiedAttributeDict import ModifiedAttributeDict
-
-type = "active", "projected"
-
-
-def handler(fit, src, context, **kwargs):
-    if "projected" in context and ((hasattr(src, "state") and src.state >= FittingModuleState.ACTIVE) or
-                                   hasattr(src, "amountActive")):
-        amount = src.getModifiedItemAttr("energyNeutralizerAmount")
-
-        if 'effect' in kwargs:
-            amount *= ModifiedAttributeDict.getResistance(fit, kwargs['effect'])
-
-        time = src.getModifiedItemAttr("duration")
-
-        fit.addDrain(src, time, amount, 0)
diff --git a/eos/effects/effect6188.py b/eos/effects/effect6188.py
deleted file mode 100644
index 220792812..000000000
--- a/eos/effects/effect6188.py
+++ /dev/null
@@ -1,17 +0,0 @@
-# shipModuleRemoteArmorRepairer
-#
-# Used by:
-# Modules from group: Remote Armor Repairer (39 of 39)
-
-type = "projected", "active"
-runTime = "late"
-
-
-def handler(fit, container, context, **kwargs):
-    if "projected" in context:
-        bonus = container.getModifiedItemAttr("armorDamageAmount")
-        duration = container.getModifiedItemAttr("duration") / 1000.0
-        rps = bonus / duration
-        fit.extraAttributes.increase("armorRepair", rps)
-        fit.extraAttributes.increase("armorRepairPreSpool", rps)
-        fit.extraAttributes.increase("armorRepairFullSpool", rps)
diff --git a/eos/effects/effect6195.py b/eos/effects/effect6195.py
deleted file mode 100644
index ff05639dc..000000000
--- a/eos/effects/effect6195.py
+++ /dev/null
@@ -1,16 +0,0 @@
-# expeditionFrigateShieldResistance1
-#
-# Used by:
-# Ship: Endurance
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.ship.boostItemAttr("shieldThermalDamageResonance", src.getModifiedItemAttr("eliteBonusExpedition1"),
-                           skill="Expedition Frigates")
-    fit.ship.boostItemAttr("shieldKineticDamageResonance", src.getModifiedItemAttr("eliteBonusExpedition1"),
-                           skill="Expedition Frigates")
-    fit.ship.boostItemAttr("shieldExplosiveDamageResonance", src.getModifiedItemAttr("eliteBonusExpedition1"),
-                           skill="Expedition Frigates")
-    fit.ship.boostItemAttr("shieldEmDamageResonance", src.getModifiedItemAttr("eliteBonusExpedition1"),
-                           skill="Expedition Frigates")
diff --git a/eos/effects/effect6196.py b/eos/effects/effect6196.py
deleted file mode 100644
index 65889bd4d..000000000
--- a/eos/effects/effect6196.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# expeditionFrigateBonusIceHarvestingCycleTime2
-#
-# Used by:
-# Ship: Endurance
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Ice Harvesting"), "duration",
-                                  src.getModifiedItemAttr("eliteBonusExpedition2"), skill="Expedition Frigates")
diff --git a/eos/effects/effect6197.py b/eos/effects/effect6197.py
deleted file mode 100644
index 2d6414e61..000000000
--- a/eos/effects/effect6197.py
+++ /dev/null
@@ -1,21 +0,0 @@
-# energyNosferatuFalloff
-#
-# Used by:
-# Modules from group: Energy Nosferatu (54 of 54)
-from eos.modifiedAttributeDict import ModifiedAttributeDict
-
-type = "active", "projected"
-runTime = "late"
-
-
-def handler(fit, src, context, **kwargs):
-    amount = src.getModifiedItemAttr("powerTransferAmount")
-    time = src.getModifiedItemAttr("duration")
-
-    if 'effect' in kwargs and "projected" in context:
-        amount *= ModifiedAttributeDict.getResistance(fit, kwargs['effect'])
-
-    if "projected" in context:
-        fit.addDrain(src, time, amount, 0)
-    elif "module" in context:
-        src.itemModifiedAttributes.force("capacitorNeed", -amount)
diff --git a/eos/effects/effect6201.py b/eos/effects/effect6201.py
deleted file mode 100644
index 934766b11..000000000
--- a/eos/effects/effect6201.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# doomsdaySlash
-#
-# Used by:
-# Modules named like: Reaper (4 of 4)
-type = "active"
-
-
-def handler(fit, src, context):
-    pass
diff --git a/eos/effects/effect6208.py b/eos/effects/effect6208.py
deleted file mode 100644
index 0b96a9743..000000000
--- a/eos/effects/effect6208.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# microJumpPortalDrive
-#
-# Used by:
-# Module: Micro Jump Field Generator
-type = "active"
-
-
-def handler(fit, module, context):
-    fit.ship.boostItemAttr("signatureRadius", module.getModifiedItemAttr("signatureRadiusBonusPercent"),
-                           stackingPenalties=True)
diff --git a/eos/effects/effect6214.py b/eos/effects/effect6214.py
deleted file mode 100644
index 619d3e9e0..000000000
--- a/eos/effects/effect6214.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# roleBonusCDLinksPGReduction
-#
-# Used by:
-# Ships from group: Command Destroyer (4 of 4)
-# Ship: Porpoise
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Leadership"), "power",
-                                  src.getModifiedItemAttr("roleBonusCD"))
diff --git a/eos/effects/effect6216.py b/eos/effects/effect6216.py
deleted file mode 100644
index 284ed616e..000000000
--- a/eos/effects/effect6216.py
+++ /dev/null
@@ -1,22 +0,0 @@
-# structureEnergyNeutralizerFalloff
-#
-# Used by:
-# Structure Modules from group: Structure Energy Neutralizer (5 of 5)
-from eos.const import FittingModuleState
-from eos.modifiedAttributeDict import ModifiedAttributeDict
-
-type = "active", "projected"
-
-
-def handler(fit, src, context, **kwargs):
-    amount = 0
-    if "projected" in context:
-        if (hasattr(src, "state") and src.state >= FittingModuleState.ACTIVE) or hasattr(src, "amountActive"):
-            amount = src.getModifiedItemAttr("energyNeutralizerAmount")
-
-            if 'effect' in kwargs:
-                amount *= ModifiedAttributeDict.getResistance(fit, kwargs['effect'])
-
-            time = src.getModifiedItemAttr("duration")
-
-            fit.addDrain(src, time, amount, 0)
\ No newline at end of file
diff --git a/eos/effects/effect6222.py b/eos/effects/effect6222.py
deleted file mode 100644
index 4b342e0ec..000000000
--- a/eos/effects/effect6222.py
+++ /dev/null
@@ -1,20 +0,0 @@
-# structureWarpScrambleBlockMWDWithNPCEffect
-#
-# Used by:
-# Structure Modules from group: Structure Warp Scrambler (2 of 2)
-from eos.const import FittingModuleState
-
-# Not used by any item
-runTime = "early"
-type = "projected", "active"
-
-
-def handler(fit, module, context):
-    if "projected" in context:
-        fit.ship.increaseItemAttr("warpScrambleStatus", module.getModifiedItemAttr("warpScrambleStrength"))
-        if module.charge is not None and module.charge.ID == 47336:
-            for mod in fit.modules:
-                if not mod.isEmpty and mod.item.requiresSkill("High Speed Maneuvering") and mod.state > FittingModuleState.ONLINE:
-                    mod.state = FittingModuleState.ONLINE
-                if not mod.isEmpty and mod.item.requiresSkill("Micro Jump Drive Operation") and mod.state > FittingModuleState.ONLINE:
-                    mod.state = FittingModuleState.ONLINE
diff --git a/eos/effects/effect623.py b/eos/effects/effect623.py
deleted file mode 100644
index 79977637f..000000000
--- a/eos/effects/effect623.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# miningDroneOperationMiningAmountBonusPostPercentMiningDroneAmountPercentChar
-#
-# Used by:
-# Modules named like: Drone Mining Augmentor (8 of 8)
-# Skill: Mining Drone Operation
-type = "passive"
-
-
-def handler(fit, container, context):
-    level = container.level if "skill" in context else 1
-    fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Mining Drone Operation"),
-                                 "miningAmount",
-                                 container.getModifiedItemAttr("miningAmountBonus") * level)
diff --git a/eos/effects/effect6230.py b/eos/effects/effect6230.py
deleted file mode 100644
index f6141a967..000000000
--- a/eos/effects/effect6230.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusEnergyNeutOptimalRS1
-#
-# Used by:
-# Ship: Curse
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Neutralizer", "maxRange",
-                                  src.getModifiedItemAttr("eliteBonusReconShip1"), skill="Recon Ships")
diff --git a/eos/effects/effect6232.py b/eos/effects/effect6232.py
deleted file mode 100644
index 8299434e6..000000000
--- a/eos/effects/effect6232.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusEnergyNeutFalloffRS2
-#
-# Used by:
-# Ship: Pilgrim
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Neutralizer", "falloffEffectiveness",
-                                  src.getModifiedItemAttr("eliteBonusReconShip2"), skill="Recon Ships")
diff --git a/eos/effects/effect6233.py b/eos/effects/effect6233.py
deleted file mode 100644
index 47434368d..000000000
--- a/eos/effects/effect6233.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusEnergyNeutFalloffRS3
-#
-# Used by:
-# Ship: Curse
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Neutralizer", "falloffEffectiveness",
-                                  src.getModifiedItemAttr("eliteBonusReconShip3"), skill="Recon Ships")
diff --git a/eos/effects/effect6234.py b/eos/effects/effect6234.py
deleted file mode 100644
index 8eaf6c305..000000000
--- a/eos/effects/effect6234.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusEnergyNosOptimalRS1
-#
-# Used by:
-# Ship: Curse
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Nosferatu", "maxRange",
-                                  src.getModifiedItemAttr("eliteBonusReconShip1"), skill="Recon Ships")
diff --git a/eos/effects/effect6237.py b/eos/effects/effect6237.py
deleted file mode 100644
index 372b2f1c3..000000000
--- a/eos/effects/effect6237.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusEnergyNosFalloffRS2
-#
-# Used by:
-# Ship: Pilgrim
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Nosferatu", "falloffEffectiveness",
-                                  src.getModifiedItemAttr("eliteBonusReconShip2"), skill="Recon Ships")
diff --git a/eos/effects/effect6238.py b/eos/effects/effect6238.py
deleted file mode 100644
index d02b92b95..000000000
--- a/eos/effects/effect6238.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusEnergyNosFalloffRS3
-#
-# Used by:
-# Ship: Curse
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Nosferatu", "falloffEffectiveness",
-                                  src.getModifiedItemAttr("eliteBonusReconShip3"), skill="Recon Ships")
diff --git a/eos/effects/effect6239.py b/eos/effects/effect6239.py
deleted file mode 100644
index 094e01713..000000000
--- a/eos/effects/effect6239.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# miningFrigateBonusIceHarvestingCycleTime2
-#
-# Used by:
-# Ship: Endurance
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Ice Harvesting"), "duration",
-                                  src.getModifiedItemAttr("shipBonusOREfrig2"), skill="Mining Frigate")
diff --git a/eos/effects/effect6241.py b/eos/effects/effect6241.py
deleted file mode 100644
index 9f515fe44..000000000
--- a/eos/effects/effect6241.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusEnergyNeutFalloffAD1
-#
-# Used by:
-# Ship: Dragoon
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Neutralizer", "falloffEffectiveness",
-                                  src.getModifiedItemAttr("shipBonusAD1"), skill="Amarr Destroyer")
diff --git a/eos/effects/effect6242.py b/eos/effects/effect6242.py
deleted file mode 100644
index de8d4804c..000000000
--- a/eos/effects/effect6242.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusEnergyNeutOptimalAD2
-#
-# Used by:
-# Ship: Dragoon
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Neutralizer", "maxRange",
-                                  src.getModifiedItemAttr("shipBonusAD2"), skill="Amarr Destroyer")
diff --git a/eos/effects/effect6245.py b/eos/effects/effect6245.py
deleted file mode 100644
index 7d7e516b8..000000000
--- a/eos/effects/effect6245.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusEnergyNosOptimalAD2
-#
-# Used by:
-# Ship: Dragoon
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Nosferatu", "maxRange",
-                                  src.getModifiedItemAttr("shipBonusAD2"), skill="Amarr Destroyer")
diff --git a/eos/effects/effect6246.py b/eos/effects/effect6246.py
deleted file mode 100644
index 1de9dcb6f..000000000
--- a/eos/effects/effect6246.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusEnergyNosFalloffAD1
-#
-# Used by:
-# Ship: Dragoon
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Nosferatu", "falloffEffectiveness",
-                                  src.getModifiedItemAttr("shipBonusAD1"), skill="Amarr Destroyer")
diff --git a/eos/effects/effect6253.py b/eos/effects/effect6253.py
deleted file mode 100644
index c8a3351dc..000000000
--- a/eos/effects/effect6253.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusEnergyNeutOptimalAB
-#
-# Used by:
-# Ship: Armageddon
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Neutralizer", "maxRange",
-                                  src.getModifiedItemAttr("shipBonusAB"), skill="Amarr Battleship")
diff --git a/eos/effects/effect6256.py b/eos/effects/effect6256.py
deleted file mode 100644
index 7540842ce..000000000
--- a/eos/effects/effect6256.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusEnergyNeutFalloffAB2
-#
-# Used by:
-# Ship: Armageddon
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Neutralizer", "falloffEffectiveness",
-                                  src.getModifiedItemAttr("shipBonusAB2"), skill="Amarr Battleship")
diff --git a/eos/effects/effect6257.py b/eos/effects/effect6257.py
deleted file mode 100644
index a3075262c..000000000
--- a/eos/effects/effect6257.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusEnergyNosOptimalAB
-#
-# Used by:
-# Ship: Armageddon
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Nosferatu", "maxRange",
-                                  src.getModifiedItemAttr("shipBonusAB"), skill="Amarr Battleship")
diff --git a/eos/effects/effect6260.py b/eos/effects/effect6260.py
deleted file mode 100644
index 153506b06..000000000
--- a/eos/effects/effect6260.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusEnergyNosFalloffAB2
-#
-# Used by:
-# Ship: Armageddon
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Nosferatu", "falloffEffectiveness",
-                                  src.getModifiedItemAttr("shipBonusAB2"), skill="Amarr Battleship")
diff --git a/eos/effects/effect6267.py b/eos/effects/effect6267.py
deleted file mode 100644
index f78e0b1ea..000000000
--- a/eos/effects/effect6267.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipBonusEnergyNeutOptimalEAF1
-#
-# Used by:
-# Ship: Sentinel
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Neutralizer", "maxRange",
-                                  src.getModifiedItemAttr("eliteBonusElectronicAttackShip1"),
-                                  skill="Electronic Attack Ships")
diff --git a/eos/effects/effect627.py b/eos/effects/effect627.py
deleted file mode 100644
index 2d953deb4..000000000
--- a/eos/effects/effect627.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# powerIncrease
-#
-# Used by:
-# Modules from group: Auxiliary Power Core (5 of 5)
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.ship.increaseItemAttr("powerOutput", module.getModifiedItemAttr("powerIncrease"))
diff --git a/eos/effects/effect6272.py b/eos/effects/effect6272.py
deleted file mode 100644
index 54a1a972a..000000000
--- a/eos/effects/effect6272.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipBonusEnergyNeutFalloffEAF3
-#
-# Used by:
-# Ship: Sentinel
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Neutralizer", "falloffEffectiveness",
-                                  src.getModifiedItemAttr("eliteBonusElectronicAttackShip3"),
-                                  skill="Electronic Attack Ships")
diff --git a/eos/effects/effect6273.py b/eos/effects/effect6273.py
deleted file mode 100644
index 0de8a02d8..000000000
--- a/eos/effects/effect6273.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipBonusEnergyNosOptimalEAF1
-#
-# Used by:
-# Ship: Sentinel
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Nosferatu", "maxRange",
-                                  src.getModifiedItemAttr("eliteBonusElectronicAttackShip1"),
-                                  skill="Electronic Attack Ships")
diff --git a/eos/effects/effect6278.py b/eos/effects/effect6278.py
deleted file mode 100644
index 74f6b4ceb..000000000
--- a/eos/effects/effect6278.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipBonusEnergyNosFalloffEAF3
-#
-# Used by:
-# Ship: Sentinel
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Nosferatu", "falloffEffectiveness",
-                                  src.getModifiedItemAttr("eliteBonusElectronicAttackShip3"),
-                                  skill="Electronic Attack Ships")
diff --git a/eos/effects/effect6281.py b/eos/effects/effect6281.py
deleted file mode 100644
index f85f88f75..000000000
--- a/eos/effects/effect6281.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusEnergyNeutOptimalAF2
-#
-# Used by:
-# Ship: Malice
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Neutralizer", "maxRange",
-                                  src.getModifiedItemAttr("shipBonus2AF"), skill="Amarr Frigate")
diff --git a/eos/effects/effect6285.py b/eos/effects/effect6285.py
deleted file mode 100644
index f2f20904d..000000000
--- a/eos/effects/effect6285.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusEnergyNeutFalloffAF3
-#
-# Used by:
-# Ship: Malice
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Neutralizer", "falloffEffectiveness",
-                                  src.getModifiedItemAttr("shipBonus3AF"), skill="Amarr Frigate")
diff --git a/eos/effects/effect6287.py b/eos/effects/effect6287.py
deleted file mode 100644
index 4b6adf6f8..000000000
--- a/eos/effects/effect6287.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusEnergyNosOptimalAF2
-#
-# Used by:
-# Ship: Malice
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Nosferatu", "maxRange",
-                                  src.getModifiedItemAttr("shipBonus2AF"), skill="Amarr Frigate")
diff --git a/eos/effects/effect6291.py b/eos/effects/effect6291.py
deleted file mode 100644
index 9316fbb76..000000000
--- a/eos/effects/effect6291.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusEnergyNosFalloffAF3
-#
-# Used by:
-# Ship: Malice
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Nosferatu", "falloffEffectiveness",
-                                  src.getModifiedItemAttr("shipBonus3AF"), skill="Amarr Frigate")
diff --git a/eos/effects/effect6294.py b/eos/effects/effect6294.py
deleted file mode 100644
index 10d1d5291..000000000
--- a/eos/effects/effect6294.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusEnergyNeutOptimalAC1
-#
-# Used by:
-# Ship: Vangel
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Neutralizer", "maxRange",
-                                  src.getModifiedItemAttr("shipBonusAC"), skill="Amarr Cruiser")
diff --git a/eos/effects/effect6299.py b/eos/effects/effect6299.py
deleted file mode 100644
index fe991894d..000000000
--- a/eos/effects/effect6299.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusEnergyNeutFalloffAC3
-#
-# Used by:
-# Ship: Vangel
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Neutralizer", "falloffEffectiveness",
-                                  src.getModifiedItemAttr("shipBonusAC3"), skill="Amarr Cruiser")
diff --git a/eos/effects/effect63.py b/eos/effects/effect63.py
deleted file mode 100644
index 25039f35f..000000000
--- a/eos/effects/effect63.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# armorHPMultiply
-#
-# Used by:
-# Modules from group: Armor Coating (202 of 202)
-# Modules from group: Armor Plating Energized (187 of 187)
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.ship.multiplyItemAttr("armorHP", module.getModifiedItemAttr("armorHPMultiplier"))
diff --git a/eos/effects/effect6300.py b/eos/effects/effect6300.py
deleted file mode 100644
index d2c101bbd..000000000
--- a/eos/effects/effect6300.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusEnergyNosOptimalAC1
-#
-# Used by:
-# Ship: Vangel
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Nosferatu", "maxRange",
-                                  src.getModifiedItemAttr("shipBonusAC"), skill="Amarr Cruiser")
diff --git a/eos/effects/effect6301.py b/eos/effects/effect6301.py
deleted file mode 100644
index 355b6e22c..000000000
--- a/eos/effects/effect6301.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# shipBonusNosOptimalFalloffAC2
-#
-# Used by:
-# Ship: Rabisu
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Nosferatu", "falloffEffectiveness",
-                                  src.getModifiedItemAttr("shipBonusAC2"), skill="Amarr Cruiser")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Nosferatu", "maxRange",
-                                  src.getModifiedItemAttr("shipBonusAC2"), skill="Amarr Cruiser")
diff --git a/eos/effects/effect6305.py b/eos/effects/effect6305.py
deleted file mode 100644
index 5bc01aab7..000000000
--- a/eos/effects/effect6305.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusEnergyNosFalloffAC3
-#
-# Used by:
-# Ship: Vangel
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Nosferatu", "falloffEffectiveness",
-                                  src.getModifiedItemAttr("shipBonusAC3"), skill="Amarr Cruiser")
diff --git a/eos/effects/effect6307.py b/eos/effects/effect6307.py
deleted file mode 100644
index cb804bcc1..000000000
--- a/eos/effects/effect6307.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusThermMissileDmgMD1
-#
-# Used by:
-# Ship: Bifrost
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"), "thermalDamage",
-                                    src.getModifiedItemAttr("shipBonusMD1"), skill="Minmatar Destroyer")
diff --git a/eos/effects/effect6308.py b/eos/effects/effect6308.py
deleted file mode 100644
index cab979332..000000000
--- a/eos/effects/effect6308.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusEMMissileDmgMD1
-#
-# Used by:
-# Ship: Bifrost
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"), "emDamage",
-                                    src.getModifiedItemAttr("shipBonusMD1"), skill="Minmatar Destroyer")
diff --git a/eos/effects/effect6309.py b/eos/effects/effect6309.py
deleted file mode 100644
index ece38cb4e..000000000
--- a/eos/effects/effect6309.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusKineticMissileDmgMD1
-#
-# Used by:
-# Ship: Bifrost
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"), "kineticDamage",
-                                    src.getModifiedItemAttr("shipBonusMD1"), skill="Minmatar Destroyer")
diff --git a/eos/effects/effect6310.py b/eos/effects/effect6310.py
deleted file mode 100644
index b6b2dd692..000000000
--- a/eos/effects/effect6310.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipBonusExplosiveMissileDmgMD1
-#
-# Used by:
-# Ship: Bifrost
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"),
-                                    "explosiveDamage", src.getModifiedItemAttr("shipBonusMD1"),
-                                    skill="Minmatar Destroyer")
diff --git a/eos/effects/effect6315.py b/eos/effects/effect6315.py
deleted file mode 100644
index b33bdfa02..000000000
--- a/eos/effects/effect6315.py
+++ /dev/null
@@ -1,19 +0,0 @@
-# eliteBonusCommandDestroyerSkirmish1
-#
-# Used by:
-# Ship: Bifrost
-# Ship: Magus
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Skirmish Command"), "warfareBuff3Value",
-                                  src.getModifiedItemAttr("eliteBonusCommandDestroyer1"), skill="Command Destroyers")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Skirmish Command"), "buffDuration",
-                                  src.getModifiedItemAttr("eliteBonusCommandDestroyer1"), skill="Command Destroyers")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Skirmish Command"), "warfareBuff1Value",
-                                  src.getModifiedItemAttr("eliteBonusCommandDestroyer1"), skill="Command Destroyers")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Skirmish Command"), "warfareBuff4Value",
-                                  src.getModifiedItemAttr("eliteBonusCommandDestroyer1"), skill="Command Destroyers")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Skirmish Command"), "warfareBuff2Value",
-                                  src.getModifiedItemAttr("eliteBonusCommandDestroyer1"), skill="Command Destroyers")
diff --git a/eos/effects/effect6316.py b/eos/effects/effect6316.py
deleted file mode 100644
index 03c2e2b8e..000000000
--- a/eos/effects/effect6316.py
+++ /dev/null
@@ -1,19 +0,0 @@
-# eliteBonusCommandDestroyerShield1
-#
-# Used by:
-# Ship: Bifrost
-# Ship: Stork
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Command"), "warfareBuff3Value",
-                                  src.getModifiedItemAttr("eliteBonusCommandDestroyer1"), skill="Command Destroyers")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Command"), "buffDuration",
-                                  src.getModifiedItemAttr("eliteBonusCommandDestroyer1"), skill="Command Destroyers")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Command"), "warfareBuff1Value",
-                                  src.getModifiedItemAttr("eliteBonusCommandDestroyer1"), skill="Command Destroyers")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Command"), "warfareBuff4Value",
-                                  src.getModifiedItemAttr("eliteBonusCommandDestroyer1"), skill="Command Destroyers")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Command"), "warfareBuff2Value",
-                                  src.getModifiedItemAttr("eliteBonusCommandDestroyer1"), skill="Command Destroyers")
diff --git a/eos/effects/effect6317.py b/eos/effects/effect6317.py
deleted file mode 100644
index 1b9aa7af9..000000000
--- a/eos/effects/effect6317.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# eliteBonusCommandDestroyerMJFGspool2
-#
-# Used by:
-# Ships from group: Command Destroyer (4 of 4)
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Micro Jump Drive Operation"), "duration",
-                                  src.getModifiedItemAttr("eliteBonusCommandDestroyer2"), skill="Command Destroyers")
diff --git a/eos/effects/effect6318.py b/eos/effects/effect6318.py
deleted file mode 100644
index 526ad3caf..000000000
--- a/eos/effects/effect6318.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusEMShieldResistanceMD2
-#
-# Used by:
-# Ship: Bifrost
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.ship.boostItemAttr("shieldEmDamageResonance", src.getModifiedItemAttr("shipBonusMD2"),
-                           skill="Minmatar Destroyer")
diff --git a/eos/effects/effect6319.py b/eos/effects/effect6319.py
deleted file mode 100644
index 81c08cc47..000000000
--- a/eos/effects/effect6319.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusKineticShieldResistanceMD2
-#
-# Used by:
-# Ship: Bifrost
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.ship.boostItemAttr("shieldKineticDamageResonance", src.getModifiedItemAttr("shipBonusMD2"),
-                           skill="Minmatar Destroyer")
diff --git a/eos/effects/effect6320.py b/eos/effects/effect6320.py
deleted file mode 100644
index 5d41685a0..000000000
--- a/eos/effects/effect6320.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusThermalShieldResistanceMD2
-#
-# Used by:
-# Ship: Bifrost
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.ship.boostItemAttr("shieldThermalDamageResonance", src.getModifiedItemAttr("shipBonusMD2"),
-                           skill="Minmatar Destroyer")
diff --git a/eos/effects/effect6321.py b/eos/effects/effect6321.py
deleted file mode 100644
index b9f93788b..000000000
--- a/eos/effects/effect6321.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusExplosiveShieldResistanceMD2
-#
-# Used by:
-# Ship: Bifrost
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.ship.boostItemAttr("shieldExplosiveDamageResonance", src.getModifiedItemAttr("shipBonusMD2"),
-                           skill="Minmatar Destroyer")
diff --git a/eos/effects/effect6322.py b/eos/effects/effect6322.py
deleted file mode 100644
index e9003c77d..000000000
--- a/eos/effects/effect6322.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# scriptscanGravimetricStrengthBonusBonus
-#
-# Used by:
-# Charges from group: Structure ECM script (4 of 4)
-type = "passive"
-runTime = "early"
-
-
-def handler(fit, src, context, *args, **kwargs):
-    src.boostItemAttr("scanGravimetricStrengthBonus", src.getModifiedChargeAttr("scanGravimetricStrengthBonusBonus"))
diff --git a/eos/effects/effect6323.py b/eos/effects/effect6323.py
deleted file mode 100644
index 9300e4cca..000000000
--- a/eos/effects/effect6323.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# scriptscanLadarStrengthBonusBonus
-#
-# Used by:
-# Charges from group: Structure ECM script (4 of 4)
-type = "passive"
-runTime = "early"
-
-
-def handler(fit, src, context, *args, **kwargs):
-    src.boostItemAttr("scanLadarStrengthBonus", src.getModifiedChargeAttr("scanLadarStrengthBonusBonus"))
diff --git a/eos/effects/effect6324.py b/eos/effects/effect6324.py
deleted file mode 100644
index 99e18d3c3..000000000
--- a/eos/effects/effect6324.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# scriptscanMagnetometricStrengthBonusBonus
-#
-# Used by:
-# Charges from group: Structure ECM script (4 of 4)
-type = "passive"
-runTime = "early"
-
-
-def handler(fit, src, context, *args, **kwargs):
-    src.boostItemAttr("scanMagnetometricStrengthBonus", src.getModifiedChargeAttr("scanMagnetometricStrengthBonusBonus"))
diff --git a/eos/effects/effect6325.py b/eos/effects/effect6325.py
deleted file mode 100644
index d747d6510..000000000
--- a/eos/effects/effect6325.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# scriptscanRadarStrengthBonusBonus
-#
-# Used by:
-# Charges from group: Structure ECM script (4 of 4)
-type = "passive"
-runTime = "early"
-
-
-def handler(fit, src, context, *args, **kwargs):
-    src.boostItemAttr("scanRadarStrengthBonus", src.getModifiedChargeAttr("scanRadarStrengthBonusBonus"))
diff --git a/eos/effects/effect6326.py b/eos/effects/effect6326.py
deleted file mode 100644
index 514c58b4d..000000000
--- a/eos/effects/effect6326.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusThermalMissileDamageCD1
-#
-# Used by:
-# Ship: Stork
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"), "thermalDamage",
-                                    src.getModifiedItemAttr("shipBonusCD1"), skill="Caldari Destroyer")
diff --git a/eos/effects/effect6327.py b/eos/effects/effect6327.py
deleted file mode 100644
index db491c2b4..000000000
--- a/eos/effects/effect6327.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusEMMissileDamageCD1
-#
-# Used by:
-# Ship: Stork
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"), "emDamage",
-                                    src.getModifiedItemAttr("shipBonusCD1"), skill="Caldari Destroyer")
diff --git a/eos/effects/effect6328.py b/eos/effects/effect6328.py
deleted file mode 100644
index 3f47a32e2..000000000
--- a/eos/effects/effect6328.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusKineticMissileDamageCD1
-#
-# Used by:
-# Ship: Stork
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"), "kineticDamage",
-                                    src.getModifiedItemAttr("shipBonusCD1"), skill="Caldari Destroyer")
diff --git a/eos/effects/effect6329.py b/eos/effects/effect6329.py
deleted file mode 100644
index b7c2293f7..000000000
--- a/eos/effects/effect6329.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipBonusExplosiveMissileDamageCD1
-#
-# Used by:
-# Ship: Stork
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"),
-                                    "explosiveDamage", src.getModifiedItemAttr("shipBonusCD1"),
-                                    skill="Caldari Destroyer")
diff --git a/eos/effects/effect6330.py b/eos/effects/effect6330.py
deleted file mode 100644
index 059c76dfd..000000000
--- a/eos/effects/effect6330.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusShieldEMResistanceCD2
-#
-# Used by:
-# Ship: Stork
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.ship.boostItemAttr("shieldEmDamageResonance", src.getModifiedItemAttr("shipBonusCD2"),
-                           skill="Caldari Destroyer")
diff --git a/eos/effects/effect6331.py b/eos/effects/effect6331.py
deleted file mode 100644
index b4c5042f5..000000000
--- a/eos/effects/effect6331.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusShieldThermalResistanceCD2
-#
-# Used by:
-# Ship: Stork
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.ship.boostItemAttr("shieldThermalDamageResonance", src.getModifiedItemAttr("shipBonusCD2"),
-                           skill="Caldari Destroyer")
diff --git a/eos/effects/effect6332.py b/eos/effects/effect6332.py
deleted file mode 100644
index 11f8a77d8..000000000
--- a/eos/effects/effect6332.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusShieldKineticResistanceCD2
-#
-# Used by:
-# Ship: Stork
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.ship.boostItemAttr("shieldKineticDamageResonance", src.getModifiedItemAttr("shipBonusCD2"),
-                           skill="Caldari Destroyer")
diff --git a/eos/effects/effect6333.py b/eos/effects/effect6333.py
deleted file mode 100644
index 70944c9f2..000000000
--- a/eos/effects/effect6333.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusShieldExplosiveResistanceCD2
-#
-# Used by:
-# Ship: Stork
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.ship.boostItemAttr("shieldExplosiveDamageResonance", src.getModifiedItemAttr("shipBonusCD2"),
-                           skill="Caldari Destroyer")
diff --git a/eos/effects/effect6334.py b/eos/effects/effect6334.py
deleted file mode 100644
index 2f17453b2..000000000
--- a/eos/effects/effect6334.py
+++ /dev/null
@@ -1,19 +0,0 @@
-# eliteBonusCommandDestroyerInfo1
-#
-# Used by:
-# Ship: Pontifex
-# Ship: Stork
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Information Command"), "warfareBuff1Value",
-                                  src.getModifiedItemAttr("eliteBonusCommandDestroyer1"), skill="Command Destroyers")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Information Command"), "warfareBuff3Value",
-                                  src.getModifiedItemAttr("eliteBonusCommandDestroyer1"), skill="Command Destroyers")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Information Command"), "warfareBuff2Value",
-                                  src.getModifiedItemAttr("eliteBonusCommandDestroyer1"), skill="Command Destroyers")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Information Command"), "buffDuration",
-                                  src.getModifiedItemAttr("eliteBonusCommandDestroyer1"), skill="Command Destroyers")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Information Command"), "warfareBuff4Value",
-                                  src.getModifiedItemAttr("eliteBonusCommandDestroyer1"), skill="Command Destroyers")
diff --git a/eos/effects/effect6335.py b/eos/effects/effect6335.py
deleted file mode 100644
index 2359565c0..000000000
--- a/eos/effects/effect6335.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusKineticArmorResistanceAD2
-#
-# Used by:
-# Ship: Pontifex
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.ship.boostItemAttr("armorKineticDamageResonance", src.getModifiedItemAttr("shipBonusAD2"),
-                           skill="Amarr Destroyer")
diff --git a/eos/effects/effect6336.py b/eos/effects/effect6336.py
deleted file mode 100644
index 3a1d5f206..000000000
--- a/eos/effects/effect6336.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusThermalArmorResistanceAD2
-#
-# Used by:
-# Ship: Pontifex
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.ship.boostItemAttr("armorThermalDamageResonance", src.getModifiedItemAttr("shipBonusAD2"),
-                           skill="Amarr Destroyer")
diff --git a/eos/effects/effect6337.py b/eos/effects/effect6337.py
deleted file mode 100644
index 745d64420..000000000
--- a/eos/effects/effect6337.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# shipBonusEMArmorResistanceAD2
-#
-# Used by:
-# Ship: Pontifex
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.ship.boostItemAttr("armorEmDamageResonance", src.getModifiedItemAttr("shipBonusAD2"), skill="Amarr Destroyer")
diff --git a/eos/effects/effect6338.py b/eos/effects/effect6338.py
deleted file mode 100644
index a1e2cc1c8..000000000
--- a/eos/effects/effect6338.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusExplosiveArmorResistanceAD2
-#
-# Used by:
-# Ship: Pontifex
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.ship.boostItemAttr("armorExplosiveDamageResonance", src.getModifiedItemAttr("shipBonusAD2"),
-                           skill="Amarr Destroyer")
diff --git a/eos/effects/effect6339.py b/eos/effects/effect6339.py
deleted file mode 100644
index 83df03351..000000000
--- a/eos/effects/effect6339.py
+++ /dev/null
@@ -1,19 +0,0 @@
-# eliteBonusCommandDestroyerArmored1
-#
-# Used by:
-# Ship: Magus
-# Ship: Pontifex
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Armored Command"), "warfareBuff2Value",
-                                  src.getModifiedItemAttr("eliteBonusCommandDestroyer1"), skill="Command Destroyers")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Armored Command"), "warfareBuff3Value",
-                                  src.getModifiedItemAttr("eliteBonusCommandDestroyer1"), skill="Command Destroyers")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Armored Command"), "buffDuration",
-                                  src.getModifiedItemAttr("eliteBonusCommandDestroyer1"), skill="Command Destroyers")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Armored Command"), "warfareBuff4Value",
-                                  src.getModifiedItemAttr("eliteBonusCommandDestroyer1"), skill="Command Destroyers")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Armored Command"), "warfareBuff1Value",
-                                  src.getModifiedItemAttr("eliteBonusCommandDestroyer1"), skill="Command Destroyers")
diff --git a/eos/effects/effect6340.py b/eos/effects/effect6340.py
deleted file mode 100644
index 48b4afc6a..000000000
--- a/eos/effects/effect6340.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusKineticArmorResistanceGD2
-#
-# Used by:
-# Ship: Magus
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.ship.boostItemAttr("armorKineticDamageResonance", src.getModifiedItemAttr("shipBonusGD2"),
-                           skill="Gallente Destroyer")
diff --git a/eos/effects/effect6341.py b/eos/effects/effect6341.py
deleted file mode 100644
index 0c7feb03a..000000000
--- a/eos/effects/effect6341.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusEMArmorResistanceGD2
-#
-# Used by:
-# Ship: Magus
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.ship.boostItemAttr("armorEmDamageResonance", src.getModifiedItemAttr("shipBonusGD2"),
-                           skill="Gallente Destroyer")
diff --git a/eos/effects/effect6342.py b/eos/effects/effect6342.py
deleted file mode 100644
index 722d1b044..000000000
--- a/eos/effects/effect6342.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusThermalArmorResistanceGD2
-#
-# Used by:
-# Ship: Magus
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.ship.boostItemAttr("armorThermalDamageResonance", src.getModifiedItemAttr("shipBonusGD2"),
-                           skill="Gallente Destroyer")
diff --git a/eos/effects/effect6343.py b/eos/effects/effect6343.py
deleted file mode 100644
index 37c731132..000000000
--- a/eos/effects/effect6343.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusExplosiveArmorResistanceGD2
-#
-# Used by:
-# Ship: Magus
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.ship.boostItemAttr("armorExplosiveDamageResonance", src.getModifiedItemAttr("shipBonusGD2"),
-                           skill="Gallente Destroyer")
diff --git a/eos/effects/effect6350.py b/eos/effects/effect6350.py
deleted file mode 100644
index bdef8ba12..000000000
--- a/eos/effects/effect6350.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# shipSmallMissileKinDmgCF3
-#
-# Used by:
-# Ship: Caldari Navy Hookbill
-
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredChargeBoost(
-        lambda mod: mod.charge.requiresSkill("Light Missiles") or mod.charge.requiresSkill("Rockets"), "kineticDamage",
-        src.getModifiedItemAttr("shipBonus3CF"), skill="Caldari Frigate")
diff --git a/eos/effects/effect6351.py b/eos/effects/effect6351.py
deleted file mode 100644
index e78580e80..000000000
--- a/eos/effects/effect6351.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipMissileKinDamageCC3
-#
-# Used by:
-# Ship: Osprey Navy Issue
-
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"), "kineticDamage",
-                                    src.getModifiedItemAttr("shipBonusCC3"), skill="Caldari Cruiser")
diff --git a/eos/effects/effect6352.py b/eos/effects/effect6352.py
deleted file mode 100644
index 02e61cf78..000000000
--- a/eos/effects/effect6352.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# roleBonusWDRange
-#
-# Used by:
-# Ship: Crucifier Navy Issue
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Weapon Disruption"), "falloffEffectiveness",
-                                  src.getModifiedItemAttr("roleBonus"))
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Weapon Disruption"), "maxRange",
-                                  src.getModifiedItemAttr("roleBonus"))
diff --git a/eos/effects/effect6353.py b/eos/effects/effect6353.py
deleted file mode 100644
index c16985002..000000000
--- a/eos/effects/effect6353.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# roleBonusWDCapCPU
-#
-# Used by:
-# Ship: Crucifier Navy Issue
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Weapon Disruption"), "cpu",
-                                  src.getModifiedItemAttr("roleBonus"))
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Weapon Disruption"), "capacitorNeed",
-                                  src.getModifiedItemAttr("roleBonus"))
diff --git a/eos/effects/effect6354.py b/eos/effects/effect6354.py
deleted file mode 100644
index d7955172b..000000000
--- a/eos/effects/effect6354.py
+++ /dev/null
@@ -1,22 +0,0 @@
-# shipBonusEwWeaponDisruptionStrengthAF2
-#
-# Used by:
-# Variations of ship: Crucifier (3 of 3)
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Weapon Disruption"), "trackingSpeedBonus",
-                                  src.getModifiedItemAttr("shipBonus2AF"), skill="Amarr Frigate")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Weapon Disruption"), "explosionDelayBonus",
-                                  src.getModifiedItemAttr("shipBonus2AF"), skill="Amarr Frigate")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Weapon Disruption"), "maxRangeBonus",
-                                  src.getModifiedItemAttr("shipBonus2AF"), skill="Amarr Frigate")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Weapon Disruption"), "falloffBonus",
-                                  src.getModifiedItemAttr("shipBonus2AF"), skill="Amarr Frigate")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Weapon Disruption"), "missileVelocityBonus",
-                                  src.getModifiedItemAttr("shipBonus2AF"), skill="Amarr Frigate")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Weapon Disruption"), "aoeVelocityBonus",
-                                  src.getModifiedItemAttr("shipBonus2AF"), skill="Amarr Frigate")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Weapon Disruption"), "aoeCloudSizeBonus",
-                                  src.getModifiedItemAttr("shipBonus2AF"), skill="Amarr Frigate")
diff --git a/eos/effects/effect6355.py b/eos/effects/effect6355.py
deleted file mode 100644
index 3b8c77525..000000000
--- a/eos/effects/effect6355.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# roleBonusECMCapCPU
-#
-# Used by:
-# Ship: Griffin Navy Issue
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "ECM", "capacitorNeed",
-                                  src.getModifiedItemAttr("roleBonus"))
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "ECM", "cpu", src.getModifiedItemAttr("roleBonus"))
diff --git a/eos/effects/effect6356.py b/eos/effects/effect6356.py
deleted file mode 100644
index a981b4f94..000000000
--- a/eos/effects/effect6356.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# roleBonusECMRange
-#
-# Used by:
-# Ship: Griffin Navy Issue
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "ECM", "falloffEffectiveness",
-                                  src.getModifiedItemAttr("roleBonus"))
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "ECM", "maxRange",
-                                  src.getModifiedItemAttr("roleBonus"))
diff --git a/eos/effects/effect6357.py b/eos/effects/effect6357.py
deleted file mode 100644
index 0c82717b2..000000000
--- a/eos/effects/effect6357.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusJustScramblerRangeGF2
-#
-# Used by:
-# Ship: Maulus Navy Issue
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Navigation"), "maxRange",
-                                  src.getModifiedItemAttr("shipBonusGF2"), skill="Gallente Frigate")
diff --git a/eos/effects/effect6358.py b/eos/effects/effect6358.py
deleted file mode 100644
index 7be57333b..000000000
--- a/eos/effects/effect6358.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# roleBonusJustScramblerStrength
-#
-# Used by:
-# Ship: Maulus Navy Issue
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemIncrease(lambda mod: mod.item.requiresSkill("Navigation"),
-                                     "warpScrambleStrength", ship.getModifiedItemAttr("roleBonus"))
diff --git a/eos/effects/effect6359.py b/eos/effects/effect6359.py
deleted file mode 100644
index 3e7de55ef..000000000
--- a/eos/effects/effect6359.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusAoeVelocityRocketsMF
-#
-# Used by:
-# Ship: Vigil Fleet Issue
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Rockets"), "aoeVelocity",
-                                    src.getModifiedItemAttr("shipBonusMF"), skill="Minmatar Frigate")
diff --git a/eos/effects/effect6360.py b/eos/effects/effect6360.py
deleted file mode 100644
index 0508f7f78..000000000
--- a/eos/effects/effect6360.py
+++ /dev/null
@@ -1,14 +0,0 @@
-# shipRocketEMThermKinDmgMF2
-#
-# Used by:
-# Ship: Vigil Fleet Issue
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Rockets"), "emDamage",
-                                    src.getModifiedItemAttr("shipBonusMF2"), skill="Minmatar Frigate")
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Rockets"), "thermalDamage",
-                                    src.getModifiedItemAttr("shipBonusMF2"), skill="Minmatar Frigate")
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Rockets"), "kineticDamage",
-                                    src.getModifiedItemAttr("shipBonusMF2"), skill="Minmatar Frigate")
diff --git a/eos/effects/effect6361.py b/eos/effects/effect6361.py
deleted file mode 100644
index 022036560..000000000
--- a/eos/effects/effect6361.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipRocketExpDmgMF3
-#
-# Used by:
-# Ship: Vigil Fleet Issue
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Rockets"), "explosiveDamage",
-                                    src.getModifiedItemAttr("shipBonus3MF"), skill="Minmatar Frigate")
diff --git a/eos/effects/effect6362.py b/eos/effects/effect6362.py
deleted file mode 100644
index c08aa135f..000000000
--- a/eos/effects/effect6362.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# roleBonusStasisRange
-#
-# Used by:
-# Ship: Vigil Fleet Issue
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Stasis Web", "maxRange",
-                                  src.getModifiedItemAttr("roleBonus"))
diff --git a/eos/effects/effect6368.py b/eos/effects/effect6368.py
deleted file mode 100644
index 94e282490..000000000
--- a/eos/effects/effect6368.py
+++ /dev/null
@@ -1,15 +0,0 @@
-# shieldTransporterFalloffBonus
-#
-# Used by:
-# Variations of ship: Bantam (2 of 2)
-# Variations of ship: Burst (2 of 2)
-# Ship: Osprey
-# Ship: Scythe
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Remote Shield Booster", "falloffEffectiveness",
-                                  src.getModifiedItemAttr("falloffBonus"))
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Ancillary Remote Shield Booster",
-                                  "falloffEffectiveness", src.getModifiedItemAttr("falloffBonus"))
diff --git a/eos/effects/effect6369.py b/eos/effects/effect6369.py
deleted file mode 100644
index 23a27ca85..000000000
--- a/eos/effects/effect6369.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipShieldTransferFalloffMC2
-#
-# Used by:
-# Ship: Scimitar
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Emission Systems"), "falloffEffectiveness",
-                                  src.getModifiedItemAttr("shipBonusMC2"), skill="Minmatar Cruiser")
diff --git a/eos/effects/effect6370.py b/eos/effects/effect6370.py
deleted file mode 100644
index 64acc7099..000000000
--- a/eos/effects/effect6370.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipShieldTransferFalloffCC1
-#
-# Used by:
-# Ship: Basilisk
-# Ship: Etana
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Emission Systems"), "falloffEffectiveness",
-                                  src.getModifiedItemAttr("shipBonusCC"), skill="Caldari Cruiser")
diff --git a/eos/effects/effect6371.py b/eos/effects/effect6371.py
deleted file mode 100644
index 956f3158e..000000000
--- a/eos/effects/effect6371.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipRemoteArmorFalloffGC1
-#
-# Used by:
-# Ship: Oneiros
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Remote Armor Repair Systems"),
-                                  "falloffEffectiveness", src.getModifiedItemAttr("shipBonusGC"),
-                                  skill="Gallente Cruiser")
diff --git a/eos/effects/effect6372.py b/eos/effects/effect6372.py
deleted file mode 100644
index 8b86803ea..000000000
--- a/eos/effects/effect6372.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipRemoteArmorFalloffAC2
-#
-# Used by:
-# Ship: Guardian
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Remote Armor Repair Systems"),
-                                  "falloffEffectiveness", src.getModifiedItemAttr("shipBonusAC2"),
-                                  skill="Amarr Cruiser")
diff --git a/eos/effects/effect6373.py b/eos/effects/effect6373.py
deleted file mode 100644
index 6fe69d3b4..000000000
--- a/eos/effects/effect6373.py
+++ /dev/null
@@ -1,16 +0,0 @@
-# armorRepairProjectorFalloffBonus
-#
-# Used by:
-# Variations of ship: Navitas (2 of 2)
-# Ship: Augoror
-# Ship: Deacon
-# Ship: Exequror
-# Ship: Inquisitor
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Remote Armor Repairer", "falloffEffectiveness",
-                                  src.getModifiedItemAttr("falloffBonus"))
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Ancillary Remote Armor Repairer",
-                                  "falloffEffectiveness", src.getModifiedItemAttr("falloffBonus"))
diff --git a/eos/effects/effect6374.py b/eos/effects/effect6374.py
deleted file mode 100644
index 532f3e28e..000000000
--- a/eos/effects/effect6374.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# droneHullRepairBonusEffect
-#
-# Used by:
-# Ships from group: Logistics (6 of 7)
-# Ship: Exequror
-# Ship: Scythe
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.drones.filteredItemBoost(lambda drone: drone.item.group.name == "Logistic Drone", "structureDamageAmount",
-                                 src.getModifiedItemAttr("droneArmorDamageAmountBonus"))
diff --git a/eos/effects/effect6377.py b/eos/effects/effect6377.py
deleted file mode 100644
index ceb9a3d09..000000000
--- a/eos/effects/effect6377.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# eliteBonusLogiFrigArmorRepSpeedCap1
-#
-# Used by:
-# Ship: Deacon
-# Ship: Thalia
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Remote Armor Repair Systems"), "capacitorNeed",
-                                  src.getModifiedItemAttr("eliteBonusLogiFrig1"), skill="Logistics Frigates")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Remote Armor Repair Systems"), "duration",
-                                  src.getModifiedItemAttr("eliteBonusLogiFrig1"), skill="Logistics Frigates")
diff --git a/eos/effects/effect6378.py b/eos/effects/effect6378.py
deleted file mode 100644
index 8f2e8b53d..000000000
--- a/eos/effects/effect6378.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# eliteBonusLogiFrigShieldRepSpeedCap1
-#
-# Used by:
-# Ship: Kirin
-# Ship: Scalpel
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Emission Systems"), "duration",
-                                  src.getModifiedItemAttr("eliteBonusLogiFrig1"), skill="Logistics Frigates")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Emission Systems"), "capacitorNeed",
-                                  src.getModifiedItemAttr("eliteBonusLogiFrig1"), skill="Logistics Frigates")
diff --git a/eos/effects/effect6379.py b/eos/effects/effect6379.py
deleted file mode 100644
index 99453cb57..000000000
--- a/eos/effects/effect6379.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# eliteBonusLogiFrigArmorHP2
-#
-# Used by:
-# Ship: Deacon
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.ship.boostItemAttr("armorHP", src.getModifiedItemAttr("eliteBonusLogiFrig2"), skill="Logistics Frigates")
diff --git a/eos/effects/effect6380.py b/eos/effects/effect6380.py
deleted file mode 100644
index b99cde37f..000000000
--- a/eos/effects/effect6380.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# eliteBonusLogiFrigShieldHP2
-#
-# Used by:
-# Ship: Kirin
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.ship.boostItemAttr("shieldCapacity", src.getModifiedItemAttr("eliteBonusLogiFrig2"), skill="Logistics Frigates")
diff --git a/eos/effects/effect6381.py b/eos/effects/effect6381.py
deleted file mode 100644
index 3f4de996a..000000000
--- a/eos/effects/effect6381.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# eliteBonusLogiFrigSignature2
-#
-# Used by:
-# Ship: Scalpel
-# Ship: Thalia
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.ship.boostItemAttr("signatureRadius", src.getModifiedItemAttr("eliteBonusLogiFrig2"),
-                           skill="Logistics Frigates")
diff --git a/eos/effects/effect6384.py b/eos/effects/effect6384.py
deleted file mode 100644
index 3a8a9ab52..000000000
--- a/eos/effects/effect6384.py
+++ /dev/null
@@ -1,15 +0,0 @@
-# overloadSelfMissileGuidanceModuleBonus
-#
-# Used by:
-# Variations of module: Guidance Disruptor I (6 of 6)
-type = "overheat"
-
-
-def handler(fit, module, context):
-    for tgtAttr in (
-            "aoeCloudSizeBonus",
-            "explosionDelayBonus",
-            "missileVelocityBonus",
-            "aoeVelocityBonus"
-    ):
-        module.boostItemAttr(tgtAttr, module.getModifiedItemAttr("overloadTrackingModuleStrengthBonus"))
diff --git a/eos/effects/effect6385.py b/eos/effects/effect6385.py
deleted file mode 100644
index 4ddfb60b1..000000000
--- a/eos/effects/effect6385.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# ignoreCloakVelocityPenalty
-#
-# Used by:
-# Ship: Endurance
-type = "passive"
-runTime = "early"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemForce(lambda mod: mod.item.group.name == "Cloaking Device",
-                                  "maxVelocityModifier", src.getModifiedItemAttr("velocityPenaltyReduction"))
diff --git a/eos/effects/effect6386.py b/eos/effects/effect6386.py
deleted file mode 100644
index 71c4a3dc9..000000000
--- a/eos/effects/effect6386.py
+++ /dev/null
@@ -1,18 +0,0 @@
-# ewSkillGuidanceDisruptionBonus
-#
-# Used by:
-# Modules named like: Tracking Diagnostic Subroutines (8 of 8)
-# Skill: Weapon Destabilization
-type = "passive"
-
-
-def handler(fit, src, context):
-    level = src.level if "skill" in context else 1
-    for attr in (
-            "explosionDelayBonus",
-            "aoeVelocityBonus",
-            "aoeCloudSizeBonus",
-            "missileVelocityBonus"
-    ):
-        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Weapon Disruption"),
-                                      attr, src.getModifiedItemAttr("scanSkillEwStrengthBonus") * level)
diff --git a/eos/effects/effect6395.py b/eos/effects/effect6395.py
deleted file mode 100644
index 6ac7ea077..000000000
--- a/eos/effects/effect6395.py
+++ /dev/null
@@ -1,22 +0,0 @@
-# shipBonusEwWeaponDisruptionStrengthAC1
-#
-# Used by:
-# Variations of ship: Arbitrator (3 of 3)
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Weapon Disruption"), "missileVelocityBonus",
-                                  src.getModifiedItemAttr("shipBonusAC"), skill="Amarr Cruiser")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Weapon Disruption"), "aoeVelocityBonus",
-                                  src.getModifiedItemAttr("shipBonusAC"), skill="Amarr Cruiser")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Weapon Disruption"), "maxRangeBonus",
-                                  src.getModifiedItemAttr("shipBonusAC"), skill="Amarr Cruiser")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Weapon Disruption"), "explosionDelayBonus",
-                                  src.getModifiedItemAttr("shipBonusAC"), skill="Amarr Cruiser")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Weapon Disruption"), "aoeCloudSizeBonus",
-                                  src.getModifiedItemAttr("shipBonusAC"), skill="Amarr Cruiser")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Weapon Disruption"), "trackingSpeedBonus",
-                                  src.getModifiedItemAttr("shipBonusAC"), skill="Amarr Cruiser")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Weapon Disruption"), "falloffBonus",
-                                  src.getModifiedItemAttr("shipBonusAC"), skill="Amarr Cruiser")
diff --git a/eos/effects/effect6396.py b/eos/effects/effect6396.py
deleted file mode 100644
index 114a831b6..000000000
--- a/eos/effects/effect6396.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# skillStructureMissileDamageBonus
-#
-# Used by:
-# Skill: Structure Missile Systems
-type = "passive", "structure"
-
-
-def handler(fit, src, context):
-    groups = ("Structure Anti-Capital Missile", "Structure Anti-Subcapital Missile", "Structure Guided Bomb")
-    for damageType in ("em", "thermal", "explosive", "kinetic"):
-        fit.modules.filteredChargeBoost(lambda mod: mod.charge.group.name in groups,
-                                        "%sDamage" % damageType, src.getModifiedItemAttr("damageMultiplierBonus"),
-                                        skill="Structure Missile Systems")
diff --git a/eos/effects/effect6400.py b/eos/effects/effect6400.py
deleted file mode 100644
index ee898cbc0..000000000
--- a/eos/effects/effect6400.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# skillStructureElectronicSystemsCapNeedBonus
-#
-# Used by:
-# Skill: Structure Electronic Systems
-type = "passive", "structure"
-
-
-def handler(fit, src, context):
-    groups = ("Structure Warp Scrambler", "Structure Disruption Battery", "Structure Stasis Webifier")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name in groups,
-                                  "capacitorNeed", src.getModifiedItemAttr("capNeedBonus"),
-                                  skill="Structure Electronic Systems")
diff --git a/eos/effects/effect6401.py b/eos/effects/effect6401.py
deleted file mode 100644
index c58dea119..000000000
--- a/eos/effects/effect6401.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# skillStructureEngineeringSystemsCapNeedBonus
-#
-# Used by:
-# Skill: Structure Engineering Systems
-type = "passive", "structure"
-
-
-def handler(fit, src, context):
-    groups = ("Structure Energy Neutralizer", "Structure Area Denial Module")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name in groups,
-                                  "capacitorNeed", src.getModifiedItemAttr("capNeedBonus"),
-                                  skill="Structure Engineering Systems")
diff --git a/eos/effects/effect6402.py b/eos/effects/effect6402.py
deleted file mode 100644
index 11045a7c2..000000000
--- a/eos/effects/effect6402.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# structureRigAoeVelocityBonusSingleTargetMissiles
-#
-# Used by:
-# Structure Modules named like: Standup Set Missile (6 of 8)
-type = "passive"
-
-
-def handler(fit, src, context):
-    groups = ("Structure Anti-Subcapital Missile", "Structure Anti-Capital Missile")
-
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.group.name in groups,
-                                  "aoeVelocity", src.getModifiedItemAttr("structureRigMissileExploVeloBonus"),
-                                  stackingPenalties=True)
diff --git a/eos/effects/effect6403.py b/eos/effects/effect6403.py
deleted file mode 100644
index 51103c3a8..000000000
--- a/eos/effects/effect6403.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# structureRigVelocityBonusSingleTargetMissiles
-#
-# Used by:
-# Structure Modules named like: Standup Set Missile (6 of 8)
-type = "passive"
-
-
-def handler(fit, src, context):
-    groups = ("Structure Anti-Subcapital Missile", "Structure Anti-Capital Missile")
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.group.name in groups,
-                                  "maxVelocity", src.getModifiedItemAttr("structureRigMissileVelocityBonus"),
-                                  stackingPenalties=True)
diff --git a/eos/effects/effect6404.py b/eos/effects/effect6404.py
deleted file mode 100644
index 55a835155..000000000
--- a/eos/effects/effect6404.py
+++ /dev/null
@@ -1,16 +0,0 @@
-# structureRigNeutralizerMaxRangeFalloffEffectiveness
-#
-# Used by:
-# Structure Modules from group: Structure Combat Rig XL - Energy Neutralizer and EW (2 of 2)
-# Structure Modules named like: Standup Set Energy Neutralizer (4 of 6)
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Structure Energy Neutralizer",
-                                  "maxRange", src.getModifiedItemAttr("structureRigEwarOptimalBonus"),
-                                  stackingPenalties=True)
-
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Structure Energy Neutralizer",
-                                  "falloffEffectiveness", src.getModifiedItemAttr("structureRigEwarFalloffBonus"),
-                                  stackingPenalties=True)
diff --git a/eos/effects/effect6405.py b/eos/effects/effect6405.py
deleted file mode 100644
index 89a2ffec0..000000000
--- a/eos/effects/effect6405.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# structureRigNeutralizerCapacitorNeed
-#
-# Used by:
-# Structure Modules from group: Structure Combat Rig XL - Energy Neutralizer and EW (2 of 2)
-# Structure Modules named like: Standup Set Energy Neutralizer (4 of 6)
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Structure Energy Neutralizer",
-                                  "capacitorNeed", src.getModifiedItemAttr("structureRigEwarCapUseBonus"),
-                                  stackingPenalties=True)
diff --git a/eos/effects/effect6406.py b/eos/effects/effect6406.py
deleted file mode 100644
index 679e4c29e..000000000
--- a/eos/effects/effect6406.py
+++ /dev/null
@@ -1,22 +0,0 @@
-# structureRigEWMaxRangeFalloff
-#
-# Used by:
-# Structure Modules from group: Structure Combat Rig M - EW projection (2 of 2)
-# Structure Modules named like: Standup Set EW (4 of 4)
-type = "passive"
-
-
-def handler(fit, src, context):
-    groups = ("Structure ECM Battery", "Structure Disruption Battery")
-
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name in groups,
-                                  "falloff", src.getModifiedItemAttr("structureRigEwarFalloffBonus"),
-                                  stackingPenalties=True)
-
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name in groups,
-                                  "maxRange", src.getModifiedItemAttr("structureRigEwarOptimalBonus"),
-                                  stackingPenalties=True)
-
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name in groups,
-                                  "falloffEffectiveness", src.getModifiedItemAttr("structureRigEwarFalloffBonus"),
-                                  stackingPenalties=True)
diff --git a/eos/effects/effect6407.py b/eos/effects/effect6407.py
deleted file mode 100644
index caaacb6ea..000000000
--- a/eos/effects/effect6407.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# structureRigEWCapacitorNeed
-#
-# Used by:
-# Structure Modules from group: Structure Combat Rig M - EW Cap Reduction (2 of 2)
-# Structure Modules named like: Standup Set EW (4 of 4)
-type = "passive"
-
-
-def handler(fit, src, context):
-    groups = ("Structure ECM Battery", "Structure Disruption Battery")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name in groups,
-                                  "capacitorNeed", src.getModifiedItemAttr("structureRigEwarCapUseBonus"),
-                                  stackingPenalties=True)
diff --git a/eos/effects/effect6408.py b/eos/effects/effect6408.py
deleted file mode 100644
index 452af580d..000000000
--- a/eos/effects/effect6408.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# structureRigMaxTargets
-#
-# Used by:
-# Structure Modules from group: Structure Combat Rig XL - Doomsday and Targeting (2 of 2)
-# Structure Modules named like: Standup Set Target (4 of 4)
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.extraAttributes.increase("maxTargetsLockedFromSkills", src.getModifiedItemAttr("structureRigMaxTargetBonus"))
diff --git a/eos/effects/effect6409.py b/eos/effects/effect6409.py
deleted file mode 100644
index 26a8ebd58..000000000
--- a/eos/effects/effect6409.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# structureRigSensorResolution
-#
-# Used by:
-# Structure Modules from group: Structure Combat Rig L - Max Targets and Sensor Boosting (2 of 2)
-# Structure Modules from group: Structure Combat Rig M - Boosted Sensors (2 of 2)
-# Structure Modules from group: Structure Combat Rig XL - Doomsday and Targeting (2 of 2)
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.ship.boostItemAttr("scanResolution", src.getModifiedItemAttr("structureRigScanResBonus"),
-                           stackingPenalties=True)
diff --git a/eos/effects/effect6410.py b/eos/effects/effect6410.py
deleted file mode 100644
index a6fedf168..000000000
--- a/eos/effects/effect6410.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# structureRigExplosionRadiusBonusAoEMissiles
-#
-# Used by:
-# Structure Modules from group: Structure Combat Rig L - AoE Launcher Application and Projection (2 of 2)
-# Structure Modules from group: Structure Combat Rig XL - Missile and AoE Missile (2 of 2)
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.group.name == "Structure Guided Bomb",
-                                    "aoeCloudSize", src.getModifiedItemAttr("structureRigMissileExplosionRadiusBonus"),
-                                    stackingPenalties=True)
diff --git a/eos/effects/effect6411.py b/eos/effects/effect6411.py
deleted file mode 100644
index 38985d031..000000000
--- a/eos/effects/effect6411.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# structureRigVelocityBonusAoeMissiles
-#
-# Used by:
-# Structure Modules from group: Structure Combat Rig L - AoE Launcher Application and Projection (2 of 2)
-# Structure Modules from group: Structure Combat Rig XL - Missile and AoE Missile (2 of 2)
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.group.name == "Structure Guided Bomb",
-                                    "maxVelocity", src.getModifiedItemAttr("structureRigMissileVelocityBonus"),
-                                    stackingPenalties=True)
diff --git a/eos/effects/effect6412.py b/eos/effects/effect6412.py
deleted file mode 100644
index 5373add73..000000000
--- a/eos/effects/effect6412.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# structureRigPDBmaxRange
-#
-# Used by:
-# Structure Modules from group: Structure Combat Rig L - Point Defense Battery Application and Projection (2 of 2)
-# Structure Modules from group: Structure Combat Rig XL - Doomsday and Targeting (2 of 2)
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Structure Area Denial Module",
-                                  "empFieldRange", src.getModifiedItemAttr("structureRigPDRangeBonus"),
-                                  stackingPenalties=True)
diff --git a/eos/effects/effect6413.py b/eos/effects/effect6413.py
deleted file mode 100644
index eb1ee6167..000000000
--- a/eos/effects/effect6413.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# structureRigPDBCapacitorNeed
-#
-# Used by:
-# Structure Modules from group: Structure Combat Rig L - Point Defense Battery Application and Projection (2 of 2)
-# Structure Modules from group: Structure Combat Rig XL - Doomsday and Targeting (2 of 2)
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Structure Area Denial Module",
-                                  "capacitorNeed", src.getModifiedItemAttr("structureRigPDCapUseBonus"),
-                                  stackingPenalties=True)
diff --git a/eos/effects/effect6417.py b/eos/effects/effect6417.py
deleted file mode 100644
index f81301110..000000000
--- a/eos/effects/effect6417.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# structureRigDoomsdayDamageLoss
-#
-# Used by:
-# Structure Modules from group: Structure Combat Rig XL - Doomsday and Targeting (2 of 2)
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemIncrease(lambda mod: mod.item.group.name == "Structure Doomsday Weapon",
-                                     "lightningWeaponDamageLossTarget",
-                                     src.getModifiedItemAttr("structureRigDoomsdayDamageLossTargetBonus"))
diff --git a/eos/effects/effect6422.py b/eos/effects/effect6422.py
deleted file mode 100644
index cc60e1986..000000000
--- a/eos/effects/effect6422.py
+++ /dev/null
@@ -1,17 +0,0 @@
-# remoteSensorDampFalloff
-#
-# Used by:
-# Modules from group: Sensor Dampener (6 of 6)
-# Starbases from group: Sensor Dampening Battery (3 of 3)
-type = "projected", "active"
-
-
-def handler(fit, module, context, *args, **kwargs):
-    if "projected" not in context:
-        return
-
-    fit.ship.boostItemAttr("maxTargetRange", module.getModifiedItemAttr("maxTargetRangeBonus"),
-                           stackingPenalties=True, *args, **kwargs)
-
-    fit.ship.boostItemAttr("scanResolution", module.getModifiedItemAttr("scanResolutionBonus"),
-                           stackingPenalties=True, *args, **kwargs)
diff --git a/eos/effects/effect6423.py b/eos/effects/effect6423.py
deleted file mode 100644
index a48eb6e78..000000000
--- a/eos/effects/effect6423.py
+++ /dev/null
@@ -1,18 +0,0 @@
-# shipModuleGuidanceDisruptor
-#
-# Used by:
-# Variations of module: Guidance Disruptor I (6 of 6)
-type = "active", "projected"
-
-
-def handler(fit, module, context, *args, **kwargs):
-    if "projected" in context:
-        for srcAttr, tgtAttr in (
-                ("aoeCloudSizeBonus", "aoeCloudSize"),
-                ("aoeVelocityBonus", "aoeVelocity"),
-                ("missileVelocityBonus", "maxVelocity"),
-                ("explosionDelayBonus", "explosionDelay"),
-        ):
-            fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"),
-                                            tgtAttr, module.getModifiedItemAttr(srcAttr),
-                                            stackingPenalties=True, *args, **kwargs)
diff --git a/eos/effects/effect6424.py b/eos/effects/effect6424.py
deleted file mode 100644
index 2c04a4a6e..000000000
--- a/eos/effects/effect6424.py
+++ /dev/null
@@ -1,18 +0,0 @@
-# shipModuleTrackingDisruptor
-#
-# Used by:
-# Variations of module: Tracking Disruptor I (6 of 6)
-type = "projected", "active"
-
-
-def handler(fit, module, context, *args, **kwargs):
-    if "projected" in context:
-        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Gunnery"),
-                                      "trackingSpeed", module.getModifiedItemAttr("trackingSpeedBonus"),
-                                      stackingPenalties=True, *args, **kwargs)
-        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Gunnery"),
-                                      "maxRange", module.getModifiedItemAttr("maxRangeBonus"),
-                                      stackingPenalties=True, *args, **kwargs)
-        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Gunnery"),
-                                      "falloff", module.getModifiedItemAttr("falloffBonus"),
-                                      stackingPenalties=True, *args, **kwargs)
diff --git a/eos/effects/effect6425.py b/eos/effects/effect6425.py
deleted file mode 100644
index 0e80806ca..000000000
--- a/eos/effects/effect6425.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# remoteTargetPaintFalloff
-#
-# Used by:
-# Modules from group: Target Painter (8 of 8)
-type = "projected", "active"
-
-
-def handler(fit, container, context, *args, **kwargs):
-    if "projected" in context:
-        fit.ship.boostItemAttr("signatureRadius", container.getModifiedItemAttr("signatureRadiusBonus"),
-                               stackingPenalties=True, *args, **kwargs)
diff --git a/eos/effects/effect6426.py b/eos/effects/effect6426.py
deleted file mode 100644
index c50e08141..000000000
--- a/eos/effects/effect6426.py
+++ /dev/null
@@ -1,14 +0,0 @@
-# remoteWebifierFalloff
-#
-# Used by:
-# Modules from group: Stasis Grappler (7 of 7)
-# Modules from group: Stasis Web (19 of 19)
-# Starbases from group: Stasis Webification Battery (3 of 3)
-type = "active", "projected"
-
-
-def handler(fit, module, context, *args, **kwargs):
-    if "projected" not in context:
-        return
-    fit.ship.boostItemAttr("maxVelocity", module.getModifiedItemAttr("speedFactor"),
-                           stackingPenalties=True, *args, **kwargs)
diff --git a/eos/effects/effect6427.py b/eos/effects/effect6427.py
deleted file mode 100644
index a649c80e4..000000000
--- a/eos/effects/effect6427.py
+++ /dev/null
@@ -1,22 +0,0 @@
-# remoteSensorBoostFalloff
-#
-# Used by:
-# Modules from group: Remote Sensor Booster (8 of 8)
-type = "projected", "active"
-
-
-def handler(fit, module, context):
-    if "projected" not in context:
-        return
-
-    fit.ship.boostItemAttr("maxTargetRange", module.getModifiedItemAttr("maxTargetRangeBonus"),
-                           stackingPenalties=True)
-    fit.ship.boostItemAttr("scanResolution", module.getModifiedItemAttr("scanResolutionBonus"),
-                           stackingPenalties=True)
-
-    for scanType in ("Gravimetric", "Magnetometric", "Radar", "Ladar"):
-        fit.ship.boostItemAttr(
-            "scan{}Strength".format(scanType),
-            module.getModifiedItemAttr("scan{}StrengthPercent".format(scanType)),
-            stackingPenalties=True
-        )
diff --git a/eos/effects/effect6428.py b/eos/effects/effect6428.py
deleted file mode 100644
index 698307183..000000000
--- a/eos/effects/effect6428.py
+++ /dev/null
@@ -1,18 +0,0 @@
-# shipModuleRemoteTrackingComputer
-#
-# Used by:
-# Modules from group: Remote Tracking Computer (8 of 8)
-type = "projected", "active"
-
-
-def handler(fit, module, context, **kwargs):
-    if "projected" in context:
-        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Gunnery"),
-                                      "trackingSpeed", module.getModifiedItemAttr("trackingSpeedBonus"),
-                                      stackingPenalties=True, **kwargs)
-        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Gunnery"),
-                                      "maxRange", module.getModifiedItemAttr("maxRangeBonus"),
-                                      stackingPenalties=True, **kwargs)
-        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Gunnery"),
-                                      "falloff", module.getModifiedItemAttr("falloffBonus"),
-                                      stackingPenalties=True, **kwargs)
diff --git a/eos/effects/effect6431.py b/eos/effects/effect6431.py
deleted file mode 100644
index c6dde777e..000000000
--- a/eos/effects/effect6431.py
+++ /dev/null
@@ -1,23 +0,0 @@
-# fighterAbilityMissiles
-#
-# Used by:
-# Items from category: Fighter (48 of 82)
-# Fighters from group: Light Fighter (32 of 32)
-"""
-Since fighter abilities do not have any sort of item entity in the EVE database, we must derive the abilities from the
-effects, and thus this effect file contains some custom information useful only to fighters.
-"""
-# User-friendly name for the ability
-displayName = "Missile Attack"
-
-# Attribute prefix that this ability targets
-prefix = "fighterAbilityMissiles"
-
-type = "active"
-
-# This flag is required for effects that use charges in order to properly calculate reload time
-hasCharges = True
-
-
-def handler(fit, src, context):
-    pass
diff --git a/eos/effects/effect6434.py b/eos/effects/effect6434.py
deleted file mode 100644
index 28b68d089..000000000
--- a/eos/effects/effect6434.py
+++ /dev/null
@@ -1,26 +0,0 @@
-# fighterAbilityEnergyNeutralizer
-#
-# Used by:
-# Fighters named like: Cenobite (4 of 4)
-"""
-Since fighter abilities do not have any sort of item entity in the EVE database, we must derive the abilities from the
-effects, and thus this effect file contains some custom information useful only to fighters.
-"""
-# User-friendly name for the ability
-from eos.modifiedAttributeDict import ModifiedAttributeDict
-
-displayName = "Energy Neutralizer"
-prefix = "fighterAbilityEnergyNeutralizer"
-type = "active", "projected"
-grouped = True
-
-
-def handler(fit, src, context, **kwargs):
-    if "projected" in context:
-        amount = src.getModifiedItemAttr("{}Amount".format(prefix)) * src.amountActive
-        time = src.getModifiedItemAttr("{}Duration".format(prefix))
-
-        if 'effect' in kwargs:
-            amount *= ModifiedAttributeDict.getResistance(fit, kwargs['effect'])
-
-        fit.addDrain(src, time, amount, 0)
diff --git a/eos/effects/effect6435.py b/eos/effects/effect6435.py
deleted file mode 100644
index 640cff4c0..000000000
--- a/eos/effects/effect6435.py
+++ /dev/null
@@ -1,21 +0,0 @@
-# fighterAbilityStasisWebifier
-#
-# Used by:
-# Fighters named like: Dromi (4 of 4)
-"""
-Since fighter abilities do not have any sort of item entity in the EVE database, we must derive the abilities from the
-effects, and thus this effect file contains some custom information useful only to fighters.
-"""
-
-# User-friendly name for the ability
-displayName = "Stasis Webifier"
-prefix = "fighterAbilityStasisWebifier"
-type = "active", "projected"
-grouped = True
-
-
-def handler(fit, src, context):
-    if "projected" not in context:
-        return
-    fit.ship.boostItemAttr("maxVelocity", src.getModifiedItemAttr("{}SpeedPenalty".format(prefix)) * src.amountActive,
-                           stackingPenalties=True)
diff --git a/eos/effects/effect6436.py b/eos/effects/effect6436.py
deleted file mode 100644
index e62c34de7..000000000
--- a/eos/effects/effect6436.py
+++ /dev/null
@@ -1,20 +0,0 @@
-# fighterAbilityWarpDisruption
-#
-# Used by:
-# Fighters named like: Siren (4 of 4)
-"""
-Since fighter abilities do not have any sort of item entity in the EVE database, we must derive the abilities from the
-effects, and thus this effect file contains some custom information useful only to fighters.
-"""
-
-# User-friendly name for the ability
-displayName = "Warp Disruption"
-prefix = "fighterAbilityWarpDisruption"
-type = "active", "projected"
-grouped = True
-
-
-def handler(fit, src, context):
-    if "projected" not in context:
-        return
-    fit.ship.increaseItemAttr("warpScrambleStatus", src.getModifiedItemAttr("{}PointStrength".format(prefix)) * src.amountActive)
diff --git a/eos/effects/effect6437.py b/eos/effects/effect6437.py
deleted file mode 100644
index cfc9c21db..000000000
--- a/eos/effects/effect6437.py
+++ /dev/null
@@ -1,29 +0,0 @@
-# fighterAbilityECM
-#
-# Used by:
-# Fighters named like: Scarab (4 of 4)
-"""
-Since fighter abilities do not have any sort of item entity in the EVE database, we must derive the abilities from the
-effects, and thus this effect file contains some custom information useful only to fighters.
-"""
-from eos.modifiedAttributeDict import ModifiedAttributeDict
-
-# User-friendly name for the ability
-displayName = "ECM"
-
-prefix = "fighterAbilityECM"
-
-type = "projected", "active"
-grouped = True
-
-
-def handler(fit, module, context, **kwargs):
-    if "projected" not in context:
-        return
-    # jam formula: 1 - (1- (jammer str/ship str))^(# of jam mods with same str))
-    strModifier = 1 - (module.getModifiedItemAttr("{}Strength{}".format(prefix, fit.scanType)) * module.amountActive) / fit.scanStrength
-
-    if 'effect' in kwargs:
-        strModifier *= ModifiedAttributeDict.getResistance(fit, kwargs['effect'])
-
-    fit.ecmProjectedStr *= strModifier
diff --git a/eos/effects/effect6439.py b/eos/effects/effect6439.py
deleted file mode 100644
index 151effaaa..000000000
--- a/eos/effects/effect6439.py
+++ /dev/null
@@ -1,40 +0,0 @@
-# fighterAbilityEvasiveManeuvers
-#
-# Used by:
-# Fighters from group: Light Fighter (16 of 32)
-"""
-Since fighter abilities do not have any sort of item entity in the EVE database, we must derive the abilities from the
-effects, and thus this effect file contains some custom information useful only to fighters.
-"""
-# User-friendly name for the ability
-displayName = "Evasive Maneuvers"
-
-prefix = "fighterAbilityEvasiveManeuvers"
-
-# Is ability applied to the fighter squad as a whole, or per fighter?
-grouped = True
-
-type = "active"
-runTime = "late"
-
-
-def handler(fit, container, context):
-    container.boostItemAttr("maxVelocity",
-                            container.getModifiedItemAttr("fighterAbilityEvasiveManeuversSpeedBonus"))
-    container.boostItemAttr("signatureRadius",
-                            container.getModifiedItemAttr("fighterAbilityEvasiveManeuversSignatureRadiusBonus"),
-                            stackingPenalties=True)
-
-    # These may not have stacking penalties, but there's nothing else that affects the attributes yet to check.
-    container.multiplyItemAttr("shieldEmDamageResonance",
-                               container.getModifiedItemAttr("fighterAbilityEvasiveManeuversEmResonance"),
-                               stackingPenalties=True)
-    container.multiplyItemAttr("shieldThermalDamageResonance",
-                               container.getModifiedItemAttr("fighterAbilityEvasiveManeuversThermResonance"),
-                               stackingPenalties=True)
-    container.multiplyItemAttr("shieldKineticDamageResonance",
-                               container.getModifiedItemAttr("fighterAbilityEvasiveManeuversKinResonance"),
-                               stackingPenalties=True)
-    container.multiplyItemAttr("shieldExplosiveDamageResonance",
-                               container.getModifiedItemAttr("fighterAbilityEvasiveManeuversExpResonance"),
-                               stackingPenalties=True)
diff --git a/eos/effects/effect6441.py b/eos/effects/effect6441.py
deleted file mode 100644
index d9cfdbe47..000000000
--- a/eos/effects/effect6441.py
+++ /dev/null
@@ -1,24 +0,0 @@
-# fighterAbilityMicroWarpDrive
-#
-# Used by:
-# Items from category: Fighter (48 of 82)
-"""
-Since fighter abilities do not have any sort of item entity in the EVE database, we must derive the abilities from the
-effects, and thus this effect file contains some custom information useful only to fighters.
-"""
-# User-friendly name for the ability
-displayName = "Microwarpdrive"
-
-# Is ability applied to the fighter squad as a whole, or per fighter?
-grouped = True
-
-type = "active"
-runTime = "late"
-
-
-def handler(fit, module, context):
-    module.boostItemAttr("maxVelocity", module.getModifiedItemAttr("fighterAbilityMicroWarpDriveSpeedBonus"),
-                         stackingPenalties=True)
-    module.boostItemAttr("signatureRadius",
-                         module.getModifiedItemAttr("fighterAbilityMicroWarpDriveSignatureRadiusBonus"),
-                         stackingPenalties=True)
diff --git a/eos/effects/effect6443.py b/eos/effects/effect6443.py
deleted file mode 100644
index 44cf69af7..000000000
--- a/eos/effects/effect6443.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# pointDefense
-#
-# Used by:
-# Structure Modules from group: Structure Area Denial Module (2 of 2)
-type = 'active'
-
-
-def handler(fit, module, context):
-    pass
diff --git a/eos/effects/effect6447.py b/eos/effects/effect6447.py
deleted file mode 100644
index 81987466e..000000000
--- a/eos/effects/effect6447.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# lightningWeapon
-#
-# Used by:
-# Structure Module: Standup Arcing Vorton Projector I
-type = 'active'
-
-
-def handler(fit, module, context):
-    pass
diff --git a/eos/effects/effect6448.py b/eos/effects/effect6448.py
deleted file mode 100644
index 59686c5e1..000000000
--- a/eos/effects/effect6448.py
+++ /dev/null
@@ -1,18 +0,0 @@
-# structureMissileGuidanceEnhancer
-#
-# Used by:
-# Variations of structure module: Standup Missile Guidance Enhancer I (2 of 2)
-type = "passive"
-
-
-def handler(fit, container, context):
-    missileGroups = ("Structure Anti-Capital Missile", "Structure Anti-Subcapital Missile")
-    for srcAttr, tgtAttr in (
-            ("aoeCloudSizeBonus", "aoeCloudSize"),
-            ("aoeVelocityBonus", "aoeVelocity"),
-            ("missileVelocityBonus", "maxVelocity"),
-            ("explosionDelayBonus", "explosionDelay"),
-    ):
-        fit.modules.filteredChargeBoost(lambda mod: mod.charge.group.name in missileGroups,
-                                        tgtAttr, container.getModifiedItemAttr(srcAttr),
-                                        stackingPenalties=True)
diff --git a/eos/effects/effect6449.py b/eos/effects/effect6449.py
deleted file mode 100644
index bce3a7a74..000000000
--- a/eos/effects/effect6449.py
+++ /dev/null
@@ -1,20 +0,0 @@
-# structureBallisticControlSystem
-#
-# Used by:
-# Variations of structure module: Standup Ballistic Control System I (2 of 2)
-type = "passive"
-
-
-def handler(fit, module, context):
-    missileGroups = ("Structure Anti-Capital Missile", "Structure Anti-Subcapital Missile")
-
-    for dmgType in ("em", "kinetic", "explosive", "thermal"):
-        fit.modules.filteredChargeMultiply(lambda mod: mod.charge.group.name in missileGroups,
-                                           "%sDamage" % dmgType,
-                                           module.getModifiedItemAttr("missileDamageMultiplierBonus"),
-                                           stackingPenalties=True)
-
-    launcherGroups = ("Structure XL Missile Launcher", "Structure Multirole Missile Launcher")
-    fit.modules.filteredItemMultiply(lambda mod: mod.item.group.name in launcherGroups,
-                                     "speed", module.getModifiedItemAttr("speedMultiplier"),
-                                     stackingPenalties=True)
diff --git a/eos/effects/effect6465.py b/eos/effects/effect6465.py
deleted file mode 100644
index d0a028f48..000000000
--- a/eos/effects/effect6465.py
+++ /dev/null
@@ -1,20 +0,0 @@
-# fighterAbilityAttackM
-#
-# Used by:
-# Items from category: Fighter (50 of 82)
-# Fighters from group: Heavy Fighter (34 of 34)
-"""
-Since fighter abilities do not have any sort of item entity in the EVE database, we must derive the abilities from the
-effects, and thus this effect file contains some custom information useful only to fighters.
-"""
-# User-friendly name for the ability
-displayName = "Turret Attack"
-
-# Attribute prefix that this ability targets
-prefix = "fighterAbilityAttackMissile"
-
-type = "active"
-
-
-def handler(fit, src, context):
-    pass
diff --git a/eos/effects/effect6470.py b/eos/effects/effect6470.py
deleted file mode 100644
index 3ab1e4010..000000000
--- a/eos/effects/effect6470.py
+++ /dev/null
@@ -1,19 +0,0 @@
-# remoteECMFalloff
-#
-# Used by:
-# Modules from group: ECM (39 of 39)
-# Starbases from group: Electronic Warfare Battery (12 of 12)
-from eos.modifiedAttributeDict import ModifiedAttributeDict
-
-type = "projected", "active"
-
-
-def handler(fit, module, context, **kwargs):
-    if "projected" in context:
-        # jam formula: 1 - (1- (jammer str/ship str))^(# of jam mods with same str))
-        strModifier = 1 - module.getModifiedItemAttr("scan{0}StrengthBonus".format(fit.scanType)) / fit.scanStrength
-
-        if 'effect' in kwargs:
-            strModifier *= ModifiedAttributeDict.getResistance(fit, kwargs['effect'])
-
-        fit.ecmProjectedStr *= strModifier
diff --git a/eos/effects/effect6472.py b/eos/effects/effect6472.py
deleted file mode 100644
index b97beb097..000000000
--- a/eos/effects/effect6472.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# doomsdayBeamDOT
-#
-# Used by:
-# Modules named like: Lance (4 of 4)
-type = "active"
-
-
-def handler(fit, src, context):
-    pass
diff --git a/eos/effects/effect6473.py b/eos/effects/effect6473.py
deleted file mode 100644
index 3e92fb8f6..000000000
--- a/eos/effects/effect6473.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# doomsdayConeDOT
-#
-# Used by:
-# Module: Bosonic Field Generator
-type = "active"
-
-
-def handler(fit, src, context):
-    pass
diff --git a/eos/effects/effect6474.py b/eos/effects/effect6474.py
deleted file mode 100644
index 4e0fcc1dd..000000000
--- a/eos/effects/effect6474.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# doomsdayHOG
-#
-# Used by:
-# Module: Gravitational Transportation Field Oscillator
-type = "active"
-
-
-def handler(fit, src, context):
-    pass
diff --git a/eos/effects/effect6475.py b/eos/effects/effect6475.py
deleted file mode 100644
index ece92271a..000000000
--- a/eos/effects/effect6475.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# structureRigDoomsdayTargetAmountBonus
-#
-# Used by:
-# Structure Modules from group: Structure Combat Rig XL - Doomsday and Targeting (2 of 2)
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemIncrease(lambda mod: mod.item.group.name == "Structure Doomsday Weapon",
-                                     "lightningWeaponTargetAmount",
-                                     src.getModifiedItemAttr("structureRigDoomsdayTargetAmountBonus"))
diff --git a/eos/effects/effect6476.py b/eos/effects/effect6476.py
deleted file mode 100644
index eb143b14b..000000000
--- a/eos/effects/effect6476.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# doomsdayAOEWeb
-#
-# Used by:
-# Module: Stasis Webification Burst Projector
-# Structure Module: Standup Stasis Webification Burst Projector
-type = "active", "projected"
-
-
-def handler(fit, module, context, *args, **kwargs):
-    if "projected" not in context:
-        return
-    fit.ship.boostItemAttr("maxVelocity", module.getModifiedItemAttr("speedFactor"),
-                           stackingPenalties=True, *args, **kwargs)
diff --git a/eos/effects/effect6477.py b/eos/effects/effect6477.py
deleted file mode 100644
index 6f9cd2f5e..000000000
--- a/eos/effects/effect6477.py
+++ /dev/null
@@ -1,22 +0,0 @@
-# doomsdayAOENeut
-#
-# Used by:
-# Module: Energy Neutralization Burst Projector
-# Structure Module: Standup Energy Neutralization Burst Projector
-from eos.const import FittingModuleState
-from eos.modifiedAttributeDict import ModifiedAttributeDict
-
-type = "active", "projected"
-
-
-def handler(fit, src, context, **kwargs):
-    if "projected" in context and ((hasattr(src, "state") and src.state >= FittingModuleState.ACTIVE) or
-                                   hasattr(src, "amountActive")):
-        amount = src.getModifiedItemAttr("energyNeutralizerAmount")
-
-        if 'effect' in kwargs:
-            amount *= ModifiedAttributeDict.getResistance(fit, kwargs['effect'])
-
-        time = src.getModifiedItemAttr("duration")
-
-        fit.addDrain(src, time, amount, 0)
diff --git a/eos/effects/effect6478.py b/eos/effects/effect6478.py
deleted file mode 100644
index 1c039c23c..000000000
--- a/eos/effects/effect6478.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# doomsdayAOEPaint
-#
-# Used by:
-# Module: Target Illumination Burst Projector
-# Structure Module: Standup Target Illumination Burst Projector
-type = "projected", "active"
-
-
-def handler(fit, container, context, *args, **kwargs):
-    if "projected" in context:
-        fit.ship.boostItemAttr("signatureRadius", container.getModifiedItemAttr("signatureRadiusBonus"),
-                               stackingPenalties=True, *args, **kwargs)
diff --git a/eos/effects/effect6479.py b/eos/effects/effect6479.py
deleted file mode 100644
index 5ee1f31c9..000000000
--- a/eos/effects/effect6479.py
+++ /dev/null
@@ -1,30 +0,0 @@
-# doomsdayAOETrack
-#
-# Used by:
-# Module: Weapon Disruption Burst Projector
-# Structure Module: Standup Weapon Disruption Burst Projector
-
-type = "active", "projected"
-
-
-def handler(fit, module, context, *args, **kwargs):
-    if "projected" in context:
-        for srcAttr, tgtAttr in (
-                ("aoeCloudSizeBonus", "aoeCloudSize"),
-                ("aoeVelocityBonus", "aoeVelocity"),
-                ("missileVelocityBonus", "maxVelocity"),
-                ("explosionDelayBonus", "explosionDelay"),
-        ):
-            fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"),
-                                            tgtAttr, module.getModifiedItemAttr(srcAttr),
-                                            stackingPenalties=True, *args, **kwargs)
-
-        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Gunnery"),
-                                      "trackingSpeed", module.getModifiedItemAttr("trackingSpeedBonus"),
-                                      stackingPenalties=True, *args, **kwargs)
-        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Gunnery"),
-                                      "maxRange", module.getModifiedItemAttr("maxRangeBonus"),
-                                      stackingPenalties=True, *args, **kwargs)
-        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Gunnery"),
-                                      "falloff", module.getModifiedItemAttr("falloffBonus"),
-                                      stackingPenalties=True, *args, **kwargs)
diff --git a/eos/effects/effect6481.py b/eos/effects/effect6481.py
deleted file mode 100644
index ab55bf185..000000000
--- a/eos/effects/effect6481.py
+++ /dev/null
@@ -1,17 +0,0 @@
-# doomsdayAOEDamp
-#
-# Used by:
-# Module: Sensor Dampening Burst Projector
-# Structure Module: Standup Sensor Dampening Burst Projector
-type = "projected", "active"
-
-
-def handler(fit, module, context, *args, **kwargs):
-    if "projected" not in context:
-        return
-
-    fit.ship.boostItemAttr("maxTargetRange", module.getModifiedItemAttr("maxTargetRangeBonus"),
-                           stackingPenalties=True, *args, **kwargs)
-
-    fit.ship.boostItemAttr("scanResolution", module.getModifiedItemAttr("scanResolutionBonus"),
-                           stackingPenalties=True, *args, **kwargs)
diff --git a/eos/effects/effect6482.py b/eos/effects/effect6482.py
deleted file mode 100644
index 8d79e289d..000000000
--- a/eos/effects/effect6482.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# doomsdayAOEBubble
-#
-# Used by:
-# Module: Warp Disruption Burst Projector
-# Structure Module: Standup Warp Disruption Burst Projector
-type = "projected", "active"
-
-
-def handler(fit, module, context):
-    return
diff --git a/eos/effects/effect6484.py b/eos/effects/effect6484.py
deleted file mode 100644
index c2de4f4f5..000000000
--- a/eos/effects/effect6484.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# emergencyHullEnergizer
-#
-# Used by:
-# Variations of module: Capital Emergency Hull Energizer I (5 of 5)
-type = "active"
-runtime = "late"
-
-
-def handler(fit, src, context):
-    for dmgType in ('em', 'thermal', 'kinetic', 'explosive'):
-        fit.ship.multiplyItemAttr('{}DamageResonance'.format(dmgType),
-                                  src.getModifiedItemAttr("hull{}DamageResonance".format(dmgType.title())),
-                                  stackingPenalties=True, penaltyGroup="postMul")
diff --git a/eos/effects/effect6485.py b/eos/effects/effect6485.py
deleted file mode 100644
index 03763fd5a..000000000
--- a/eos/effects/effect6485.py
+++ /dev/null
@@ -1,22 +0,0 @@
-# fighterAbilityLaunchBomb
-#
-# Used by:
-# Fighters from group: Heavy Fighter (16 of 34)
-"""
-Since fighter abilities do not have any sort of item entity in the EVE database, we must derive the abilities from the
-effects, and thus this effect file contains some custom information useful only to fighters.
-"""
-# User-friendly name for the ability
-displayName = "Bomb"
-
-# Attribute prefix that this ability targets
-prefix = "fighterAbilityLaunchBomb"
-
-type = "active"
-
-# This flag is required for effects that use charges in order to properly calculate reload time
-hasCharges = True
-
-
-def handler(fit, src, context):
-    pass
diff --git a/eos/effects/effect6487.py b/eos/effects/effect6487.py
deleted file mode 100644
index 874cbf0d7..000000000
--- a/eos/effects/effect6487.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# modifyEnergyWarfareResistance
-#
-# Used by:
-# Modules from group: Capacitor Battery (30 of 30)
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.ship.boostItemAttr("energyWarfareResistance",
-                           module.getModifiedItemAttr("energyWarfareResistanceBonus"),
-                           stackingPenalties=True)
diff --git a/eos/effects/effect6488.py b/eos/effects/effect6488.py
deleted file mode 100644
index 467c7edef..000000000
--- a/eos/effects/effect6488.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# scriptSensorBoosterSensorStrengthBonusBonus
-#
-# Used by:
-# Charges from group: Sensor Booster Script (3 of 3)
-type = "active"
-
-
-def handler(fit, module, context):
-    for scanType in ("Gravimetric", "Magnetometric", "Radar", "Ladar"):
-        module.boostItemAttr("scan{}StrengthPercent".format(scanType),
-                             module.getModifiedChargeAttr("sensorStrengthBonusBonus"))
diff --git a/eos/effects/effect6501.py b/eos/effects/effect6501.py
deleted file mode 100644
index 3b85fee4a..000000000
--- a/eos/effects/effect6501.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusDreadnoughtA1DamageBonus
-#
-# Used by:
-# Ship: Revelation
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Energy Turret"), "damageMultiplier",
-                                  src.getModifiedItemAttr("shipBonusDreadnoughtA1"), skill="Amarr Dreadnought")
diff --git a/eos/effects/effect6502.py b/eos/effects/effect6502.py
deleted file mode 100644
index 207c827f0..000000000
--- a/eos/effects/effect6502.py
+++ /dev/null
@@ -1,16 +0,0 @@
-# shipBonusDreadnoughtA2ArmorResists
-#
-# Used by:
-# Ship: Revelation
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.ship.boostItemAttr("armorExplosiveDamageResonance", src.getModifiedItemAttr("shipBonusDreadnoughtA2"),
-                           skill="Amarr Dreadnought")
-    fit.ship.boostItemAttr("armorEmDamageResonance", src.getModifiedItemAttr("shipBonusDreadnoughtA2"),
-                           skill="Amarr Dreadnought")
-    fit.ship.boostItemAttr("armorThermalDamageResonance", src.getModifiedItemAttr("shipBonusDreadnoughtA2"),
-                           skill="Amarr Dreadnought")
-    fit.ship.boostItemAttr("armorKineticDamageResonance", src.getModifiedItemAttr("shipBonusDreadnoughtA2"),
-                           skill="Amarr Dreadnought")
diff --git a/eos/effects/effect6503.py b/eos/effects/effect6503.py
deleted file mode 100644
index 1571c46bf..000000000
--- a/eos/effects/effect6503.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusDreadnoughtA3CapNeed
-#
-# Used by:
-# Ship: Revelation
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Energy Turret"), "capacitorNeed",
-                                  src.getModifiedItemAttr("shipBonusDreadnoughtA3"), skill="Amarr Dreadnought")
diff --git a/eos/effects/effect6504.py b/eos/effects/effect6504.py
deleted file mode 100644
index 9d06fd5db..000000000
--- a/eos/effects/effect6504.py
+++ /dev/null
@@ -1,32 +0,0 @@
-# shipBonusDreadnoughtC1DamageBonus
-#
-# Used by:
-# Ship: Phoenix
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("XL Torpedoes"), "thermalDamage",
-                                    src.getModifiedItemAttr("shipBonusDreadnoughtC1"), skill="Caldari Dreadnought")
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("XL Cruise Missiles"), "kineticDamage",
-                                    src.getModifiedItemAttr("shipBonusDreadnoughtC1"), skill="Caldari Dreadnought")
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Torpedoes"), "emDamage",
-                                    src.getModifiedItemAttr("shipBonusDreadnoughtC1"), skill="Caldari Dreadnought")
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Torpedoes"), "explosiveDamage",
-                                    src.getModifiedItemAttr("shipBonusDreadnoughtC1"), skill="Caldari Dreadnought")
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("XL Cruise Missiles"), "explosiveDamage",
-                                    src.getModifiedItemAttr("shipBonusDreadnoughtC1"), skill="Caldari Dreadnought")
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("XL Cruise Missiles"), "thermalDamage",
-                                    src.getModifiedItemAttr("shipBonusDreadnoughtC1"), skill="Caldari Dreadnought")
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Torpedoes"), "thermalDamage",
-                                    src.getModifiedItemAttr("shipBonusDreadnoughtC1"), skill="Caldari Dreadnought")
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("XL Torpedoes"), "emDamage",
-                                    src.getModifiedItemAttr("shipBonusDreadnoughtC1"), skill="Caldari Dreadnought")
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Torpedoes"), "kineticDamage",
-                                    src.getModifiedItemAttr("shipBonusDreadnoughtC1"), skill="Caldari Dreadnought")
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("XL Torpedoes"), "kineticDamage",
-                                    src.getModifiedItemAttr("shipBonusDreadnoughtC1"), skill="Caldari Dreadnought")
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("XL Torpedoes"), "explosiveDamage",
-                                    src.getModifiedItemAttr("shipBonusDreadnoughtC1"), skill="Caldari Dreadnought")
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("XL Cruise Missiles"), "emDamage",
-                                    src.getModifiedItemAttr("shipBonusDreadnoughtC1"), skill="Caldari Dreadnought")
diff --git a/eos/effects/effect6505.py b/eos/effects/effect6505.py
deleted file mode 100644
index 6a533902c..000000000
--- a/eos/effects/effect6505.py
+++ /dev/null
@@ -1,16 +0,0 @@
-# shipBonusDreadnoughtC2ShieldResists
-#
-# Used by:
-# Variations of ship: Phoenix (2 of 2)
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.ship.boostItemAttr("shieldThermalDamageResonance", src.getModifiedItemAttr("shipBonusDreadnoughtC2"),
-                           skill="Caldari Dreadnought")
-    fit.ship.boostItemAttr("shieldKineticDamageResonance", src.getModifiedItemAttr("shipBonusDreadnoughtC2"),
-                           skill="Caldari Dreadnought")
-    fit.ship.boostItemAttr("shieldEmDamageResonance", src.getModifiedItemAttr("shipBonusDreadnoughtC2"),
-                           skill="Caldari Dreadnought")
-    fit.ship.boostItemAttr("shieldExplosiveDamageResonance", src.getModifiedItemAttr("shipBonusDreadnoughtC2"),
-                           skill="Caldari Dreadnought")
diff --git a/eos/effects/effect6506.py b/eos/effects/effect6506.py
deleted file mode 100644
index d6d5b9074..000000000
--- a/eos/effects/effect6506.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusDreadnoughtG1DamageBonus
-#
-# Used by:
-# Ship: Moros
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Hybrid Turret"), "damageMultiplier",
-                                  src.getModifiedItemAttr("shipBonusDreadnoughtG1"), skill="Gallente Dreadnought")
diff --git a/eos/effects/effect6507.py b/eos/effects/effect6507.py
deleted file mode 100644
index b109e3e30..000000000
--- a/eos/effects/effect6507.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusDreadnoughtG2ROFBonus
-#
-# Used by:
-# Variations of ship: Moros (2 of 2)
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Hybrid Turret"), "speed",
-                                  src.getModifiedItemAttr("shipBonusDreadnoughtG2"), skill="Gallente Dreadnought")
diff --git a/eos/effects/effect6508.py b/eos/effects/effect6508.py
deleted file mode 100644
index 39b99c0f5..000000000
--- a/eos/effects/effect6508.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusDreadnoughtG3RepairTime
-#
-# Used by:
-# Ship: Moros
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Repair Systems"), "duration",
-                                  src.getModifiedItemAttr("shipBonusDreadnoughtG3"), skill="Gallente Dreadnought")
diff --git a/eos/effects/effect6509.py b/eos/effects/effect6509.py
deleted file mode 100644
index c1de5b9f4..000000000
--- a/eos/effects/effect6509.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusDreadnoughtM1DamageBonus
-#
-# Used by:
-# Ship: Naglfar
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Projectile Turret"), "damageMultiplier",
-                                  src.getModifiedItemAttr("shipBonusDreadnoughtM1"), skill="Minmatar Dreadnought")
diff --git a/eos/effects/effect6510.py b/eos/effects/effect6510.py
deleted file mode 100644
index c183f3c7b..000000000
--- a/eos/effects/effect6510.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusDreadnoughtM2ROFBonus
-#
-# Used by:
-# Ship: Naglfar
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Projectile Turret"), "speed",
-                                  src.getModifiedItemAttr("shipBonusDreadnoughtM2"), skill="Minmatar Dreadnought")
diff --git a/eos/effects/effect6511.py b/eos/effects/effect6511.py
deleted file mode 100644
index 0e5ca87f9..000000000
--- a/eos/effects/effect6511.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusDreadnoughtM3RepairTime
-#
-# Used by:
-# Ship: Naglfar
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Shield Operation"), "duration",
-                                  src.getModifiedItemAttr("shipBonusDreadnoughtM2"), skill="Minmatar Dreadnought")
diff --git a/eos/effects/effect6513.py b/eos/effects/effect6513.py
deleted file mode 100644
index 93d3dd847..000000000
--- a/eos/effects/effect6513.py
+++ /dev/null
@@ -1,19 +0,0 @@
-# doomsdayAOEECM
-#
-# Used by:
-# Module: ECM Jammer Burst Projector
-# Structure Module: Standup ECM Jammer Burst Projector
-from eos.modifiedAttributeDict import ModifiedAttributeDict
-
-type = "projected", "active"
-
-
-def handler(fit, module, context, **kwargs):
-    if "projected" in context:
-        # jam formula: 1 - (1- (jammer str/ship str))^(# of jam mods with same str))
-        strModifier = 1 - module.getModifiedItemAttr("scan{0}StrengthBonus".format(fit.scanType)) / fit.scanStrength
-
-        if 'effect' in kwargs:
-            strModifier *= ModifiedAttributeDict.getResistance(fit, kwargs['effect'])
-
-        fit.ecmProjectedStr *= strModifier
diff --git a/eos/effects/effect6526.py b/eos/effects/effect6526.py
deleted file mode 100644
index 2ae2102d6..000000000
--- a/eos/effects/effect6526.py
+++ /dev/null
@@ -1,16 +0,0 @@
-# shipBonusForceAuxiliaryA1RemoteRepairAndCapAmount
-#
-# Used by:
-# Ship: Apostle
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capacitor Emission Systems") or
-                                              mod.item.requiresSkill("Capital Capacitor Emission Systems"),
-                                  "powerTransferAmount", src.getModifiedItemAttr("shipBonusForceAuxiliaryA1"),
-                                  skill="Amarr Carrier")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Remote Armor Repair Systems") or
-                                              mod.item.requiresSkill("Capital Remote Armor Repair Systems"),
-                                  "armorDamageAmount", src.getModifiedItemAttr("shipBonusForceAuxiliaryA1"),
-                                  skill="Amarr Carrier")
diff --git a/eos/effects/effect6527.py b/eos/effects/effect6527.py
deleted file mode 100644
index 38dc7efd9..000000000
--- a/eos/effects/effect6527.py
+++ /dev/null
@@ -1,16 +0,0 @@
-# shipBonusForceAuxiliaryA2ArmorResists
-#
-# Used by:
-# Ship: Apostle
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.ship.boostItemAttr("armorKineticDamageResonance", src.getModifiedItemAttr("shipBonusForceAuxiliaryA2"),
-                           skill="Amarr Carrier")
-    fit.ship.boostItemAttr("armorExplosiveDamageResonance", src.getModifiedItemAttr("shipBonusForceAuxiliaryA2"),
-                           skill="Amarr Carrier")
-    fit.ship.boostItemAttr("armorEmDamageResonance", src.getModifiedItemAttr("shipBonusForceAuxiliaryA2"),
-                           skill="Amarr Carrier")
-    fit.ship.boostItemAttr("armorThermalDamageResonance", src.getModifiedItemAttr("shipBonusForceAuxiliaryA2"),
-                           skill="Amarr Carrier")
diff --git a/eos/effects/effect6533.py b/eos/effects/effect6533.py
deleted file mode 100644
index 824f57069..000000000
--- a/eos/effects/effect6533.py
+++ /dev/null
@@ -1,23 +0,0 @@
-# shipBonusForceAuxiliaryA4WarfareLinksBonus
-#
-# Used by:
-# Ship: Apostle
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Armored Command") or
-                                              mod.item.requiresSkill("Information Command"),
-                                  "warfareBuff4Value", src.getModifiedItemAttr("shipBonusForceAuxiliaryA4"), skill="Amarr Carrier")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Armored Command") or
-                                              mod.item.requiresSkill("Information Command"),
-                                  "warfareBuff3Value", src.getModifiedItemAttr("shipBonusForceAuxiliaryA4"), skill="Amarr Carrier")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Armored Command") or
-                                              mod.item.requiresSkill("Information Command"),
-                                  "warfareBuff1Value", src.getModifiedItemAttr("shipBonusForceAuxiliaryA4"), skill="Amarr Carrier")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Armored Command") or
-                                              mod.item.requiresSkill("Information Command"),
-                                  "buffDuration", src.getModifiedItemAttr("shipBonusForceAuxiliaryA4"), skill="Amarr Carrier")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Armored Command") or
-                                              mod.item.requiresSkill("Information Command"),
-                                  "warfareBuff2Value", src.getModifiedItemAttr("shipBonusForceAuxiliaryA4"), skill="Amarr Carrier")
diff --git a/eos/effects/effect6534.py b/eos/effects/effect6534.py
deleted file mode 100644
index df5b5181b..000000000
--- a/eos/effects/effect6534.py
+++ /dev/null
@@ -1,23 +0,0 @@
-# shipBonusForceAuxiliaryM4WarfareLinksBonus
-#
-# Used by:
-# Ship: Lif
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(
-        lambda mod: mod.item.requiresSkill("Skirmish Command") or mod.item.requiresSkill("Shield Command"),
-        "warfareBuff3Value", src.getModifiedItemAttr("shipBonusForceAuxiliaryM4"), skill="Minmatar Carrier")
-    fit.modules.filteredItemBoost(
-        lambda mod: mod.item.requiresSkill("Skirmish Command") or mod.item.requiresSkill("Shield Command"),
-        "warfareBuff2Value", src.getModifiedItemAttr("shipBonusForceAuxiliaryM4"), skill="Minmatar Carrier")
-    fit.modules.filteredItemBoost(
-        lambda mod: mod.item.requiresSkill("Skirmish Command") or mod.item.requiresSkill("Shield Command"),
-        "warfareBuff1Value", src.getModifiedItemAttr("shipBonusForceAuxiliaryM4"), skill="Minmatar Carrier")
-    fit.modules.filteredItemBoost(
-        lambda mod: mod.item.requiresSkill("Skirmish Command") or mod.item.requiresSkill("Shield Command"),
-        "buffDuration", src.getModifiedItemAttr("shipBonusForceAuxiliaryM4"), skill="Minmatar Carrier")
-    fit.modules.filteredItemBoost(
-        lambda mod: mod.item.requiresSkill("Skirmish Command") or mod.item.requiresSkill("Shield Command"),
-        "warfareBuff4Value", src.getModifiedItemAttr("shipBonusForceAuxiliaryM4"), skill="Minmatar Carrier")
diff --git a/eos/effects/effect6535.py b/eos/effects/effect6535.py
deleted file mode 100644
index 63efca50e..000000000
--- a/eos/effects/effect6535.py
+++ /dev/null
@@ -1,23 +0,0 @@
-# shipBonusForceAuxiliaryG4WarfareLinksBonus
-#
-# Used by:
-# Ship: Ninazu
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(
-        lambda mod: mod.item.requiresSkill("Skirmish Command") or mod.item.requiresSkill("Armored Command"),
-        "warfareBuff3Value", src.getModifiedItemAttr("shipBonusForceAuxiliaryG4"), skill="Gallente Carrier")
-    fit.modules.filteredItemBoost(
-        lambda mod: mod.item.requiresSkill("Skirmish Command") or mod.item.requiresSkill("Armored Command"),
-        "warfareBuff4Value", src.getModifiedItemAttr("shipBonusForceAuxiliaryG4"), skill="Gallente Carrier")
-    fit.modules.filteredItemBoost(
-        lambda mod: mod.item.requiresSkill("Skirmish Command") or mod.item.requiresSkill("Armored Command"),
-        "buffDuration", src.getModifiedItemAttr("shipBonusForceAuxiliaryG4"), skill="Gallente Carrier")
-    fit.modules.filteredItemBoost(
-        lambda mod: mod.item.requiresSkill("Skirmish Command") or mod.item.requiresSkill("Armored Command"),
-        "warfareBuff2Value", src.getModifiedItemAttr("shipBonusForceAuxiliaryG4"), skill="Gallente Carrier")
-    fit.modules.filteredItemBoost(
-        lambda mod: mod.item.requiresSkill("Skirmish Command") or mod.item.requiresSkill("Armored Command"),
-        "warfareBuff1Value", src.getModifiedItemAttr("shipBonusForceAuxiliaryG4"), skill="Gallente Carrier")
diff --git a/eos/effects/effect6536.py b/eos/effects/effect6536.py
deleted file mode 100644
index fda300de2..000000000
--- a/eos/effects/effect6536.py
+++ /dev/null
@@ -1,23 +0,0 @@
-# shipBonusForceAuxiliaryC4WarfareLinksBonus
-#
-# Used by:
-# Ship: Minokawa
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(
-        lambda mod: mod.item.requiresSkill("Shield Command") or mod.item.requiresSkill("Information Command"),
-        "warfareBuff3Value", src.getModifiedItemAttr("shipBonusForceAuxiliaryC4"), skill="Caldari Carrier")
-    fit.modules.filteredItemBoost(
-        lambda mod: mod.item.requiresSkill("Shield Command") or mod.item.requiresSkill("Information Command"),
-        "warfareBuff4Value", src.getModifiedItemAttr("shipBonusForceAuxiliaryC4"), skill="Caldari Carrier")
-    fit.modules.filteredItemBoost(
-        lambda mod: mod.item.requiresSkill("Shield Command") or mod.item.requiresSkill("Information Command"),
-        "warfareBuff2Value", src.getModifiedItemAttr("shipBonusForceAuxiliaryC4"), skill="Caldari Carrier")
-    fit.modules.filteredItemBoost(
-        lambda mod: mod.item.requiresSkill("Shield Command") or mod.item.requiresSkill("Information Command"),
-        "buffDuration", src.getModifiedItemAttr("shipBonusForceAuxiliaryC4"), skill="Caldari Carrier")
-    fit.modules.filteredItemBoost(
-        lambda mod: mod.item.requiresSkill("Shield Command") or mod.item.requiresSkill("Information Command"),
-        "warfareBuff1Value", src.getModifiedItemAttr("shipBonusForceAuxiliaryC4"), skill="Caldari Carrier")
diff --git a/eos/effects/effect6537.py b/eos/effects/effect6537.py
deleted file mode 100644
index d141e771a..000000000
--- a/eos/effects/effect6537.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusRole1CommandBurstCPUBonus
-#
-# Used by:
-# Ships from group: Force Auxiliary (6 of 6)
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Leadership"), "cpu",
-                                  src.getModifiedItemAttr("shipBonusRole1"))
diff --git a/eos/effects/effect6545.py b/eos/effects/effect6545.py
deleted file mode 100644
index 952cbb532..000000000
--- a/eos/effects/effect6545.py
+++ /dev/null
@@ -1,19 +0,0 @@
-# shipBonusForceAuxiliaryC1RemoteBoostAndCapAmount
-#
-# Used by:
-# Ship: Minokawa
-type = "passive"
-
-
-def handler(fit, src, context):
-    if src.getModifiedItemAttr("shipBonusForceAuxiliaryC1") is None:
-        return  # See GH Issue 1321
-
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capacitor Emission Systems") or
-                                              mod.item.requiresSkill("Capital Capacitor Emission Systems"),
-                                  "powerTransferAmount", src.getModifiedItemAttr("shipBonusForceAuxiliaryC1"),
-                                  skill="Caldari Carrier")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Emission Systems") or
-                                              mod.item.requiresSkill("Capital Shield Emission Systems"),
-                                  "shieldBonus", src.getModifiedItemAttr("shipBonusForceAuxiliaryC1"),
-                                  skill="Caldari Carrier")
diff --git a/eos/effects/effect6546.py b/eos/effects/effect6546.py
deleted file mode 100644
index b18ae263a..000000000
--- a/eos/effects/effect6546.py
+++ /dev/null
@@ -1,16 +0,0 @@
-# shipBonusForceAuxiliaryC2ShieldResists
-#
-# Used by:
-# Variations of ship: Minokawa (2 of 2)
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.ship.boostItemAttr("shieldEmDamageResonance", src.getModifiedItemAttr("shipBonusForceAuxiliaryC2"),
-                           skill="Caldari Carrier")
-    fit.ship.boostItemAttr("shieldExplosiveDamageResonance", src.getModifiedItemAttr("shipBonusForceAuxiliaryC2"),
-                           skill="Caldari Carrier")
-    fit.ship.boostItemAttr("shieldKineticDamageResonance", src.getModifiedItemAttr("shipBonusForceAuxiliaryC2"),
-                           skill="Caldari Carrier")
-    fit.ship.boostItemAttr("shieldThermalDamageResonance", src.getModifiedItemAttr("shipBonusForceAuxiliaryC2"),
-                           skill="Caldari Carrier")
diff --git a/eos/effects/effect6548.py b/eos/effects/effect6548.py
deleted file mode 100644
index 3ae370e41..000000000
--- a/eos/effects/effect6548.py
+++ /dev/null
@@ -1,16 +0,0 @@
-# shipBonusForceAuxiliaryG1RemoteCycleTime
-#
-# Used by:
-# Ship: Ninazu
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Emission Systems") or
-                                              mod.item.requiresSkill("Capital Shield Emission Systems"),
-                                  "duration", src.getModifiedItemAttr("shipBonusForceAuxiliaryG1"),
-                                  skill="Gallente Carrier")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Remote Armor Repair Systems") or
-                                              mod.item.requiresSkill("Capital Remote Armor Repair Systems"),
-                                  "duration", src.getModifiedItemAttr("shipBonusForceAuxiliaryG1"),
-                                  skill="Gallente Carrier")
diff --git a/eos/effects/effect6549.py b/eos/effects/effect6549.py
deleted file mode 100644
index bdbefdd49..000000000
--- a/eos/effects/effect6549.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# shipBonusForceAuxiliaryG2LocalRepairAmount
-#
-# Used by:
-# Ship: Ninazu
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Repair Systems"), "armorDamageAmount",
-                                  src.getModifiedItemAttr("shipBonusForceAuxiliaryG2"), skill="Gallente Carrier")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Repair Systems"), "armorDamageAmount",
-                                  src.getModifiedItemAttr("shipBonusForceAuxiliaryG2"), skill="Gallente Carrier")
diff --git a/eos/effects/effect6551.py b/eos/effects/effect6551.py
deleted file mode 100644
index 71d8d8e07..000000000
--- a/eos/effects/effect6551.py
+++ /dev/null
@@ -1,17 +0,0 @@
-# shipBonusForceAuxiliaryM1RemoteDuration
-#
-# Used by:
-# Ship: Lif
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Emission Systems") or
-                                              mod.item.requiresSkill("Capital Shield Emission Systems"),
-                                  "duration", src.getModifiedItemAttr("shipBonusForceAuxiliaryM1"),
-                                  skill="Minmatar Carrier")
-
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Remote Armor Repair Systems") or
-                                              mod.item.requiresSkill("Capital Remote Armor Repair Systems"),
-                                  "duration", src.getModifiedItemAttr("shipBonusForceAuxiliaryM1"),
-                                  skill="Minmatar Carrier")
diff --git a/eos/effects/effect6552.py b/eos/effects/effect6552.py
deleted file mode 100644
index 2bff2d794..000000000
--- a/eos/effects/effect6552.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# shipBonusForceAuxiliaryM2LocalBoostAmount
-#
-# Used by:
-# Ship: Lif
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Shield Operation"), "shieldBonus",
-                                  src.getModifiedItemAttr("shipBonusForceAuxiliaryM2"), skill="Minmatar Carrier")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Operation"), "shieldBonus",
-                                  src.getModifiedItemAttr("shipBonusForceAuxiliaryM2"), skill="Minmatar Carrier")
diff --git a/eos/effects/effect6555.py b/eos/effects/effect6555.py
deleted file mode 100644
index 9c7f9e777..000000000
--- a/eos/effects/effect6555.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# moduleBonusDroneNavigationComputer
-#
-# Used by:
-# Modules from group: Drone Navigation Computer (8 of 8)
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"), "maxVelocity",
-                                   src.getModifiedItemAttr("speedFactor"), stackingPenalties=True)
-    fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill("Drones"), "maxVelocity",
-                                 src.getModifiedItemAttr("speedFactor"), stackingPenalties=True)
diff --git a/eos/effects/effect6556.py b/eos/effects/effect6556.py
deleted file mode 100644
index e3a87f990..000000000
--- a/eos/effects/effect6556.py
+++ /dev/null
@@ -1,21 +0,0 @@
-# moduleBonusDroneDamageAmplifier
-#
-# Used by:
-# Modules from group: Drone Damage Modules (11 of 11)
-# Modules named like: C3 'Hivaa Saitsuo' Ballistic Control System (2 of 2)
-# Module: Abyssal Ballistic Control System
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"),
-                                   "fighterAbilityMissilesDamageMultiplier",
-                                   src.getModifiedItemAttr("droneDamageBonus"), stackingPenalties=True)
-    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"),
-                                   "fighterAbilityAttackTurretDamageMultiplier",
-                                   src.getModifiedItemAttr("droneDamageBonus"), stackingPenalties=True)
-    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"),
-                                   "fighterAbilityAttackMissileDamageMultiplier",
-                                   src.getModifiedItemAttr("droneDamageBonus"), stackingPenalties=True)
-    fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill("Drones"), "damageMultiplier",
-                                 src.getModifiedItemAttr("droneDamageBonus"), stackingPenalties=True)
diff --git a/eos/effects/effect6557.py b/eos/effects/effect6557.py
deleted file mode 100644
index d589475bd..000000000
--- a/eos/effects/effect6557.py
+++ /dev/null
@@ -1,43 +0,0 @@
-# moduleBonusOmnidirectionalTrackingLink
-#
-# Used by:
-# Modules from group: Drone Tracking Modules (10 of 10)
-type = "active"
-
-
-def handler(fit, src, context):
-    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"),
-                                   "fighterAbilityAttackTurretRangeFalloff", src.getModifiedItemAttr("falloffBonus"),
-                                   stackingPenalties=True)
-    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"),
-                                   "fighterAbilityMissilesExplosionVelocity",
-                                   src.getModifiedItemAttr("aoeVelocityBonus"), stackingPenalties=True)
-    fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill("Drones"), "trackingSpeed",
-                                 src.getModifiedItemAttr("trackingSpeedBonus"), stackingPenalties=True)
-    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"),
-                                   "fighterAbilityAttackMissileExplosionRadius",
-                                   src.getModifiedItemAttr("aoeCloudSizeBonus"), stackingPenalties=True)
-    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"),
-                                   "fighterAbilityAttackTurretTrackingSpeed",
-                                   src.getModifiedItemAttr("trackingSpeedBonus"), stackingPenalties=True)
-    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"),
-                                   "fighterAbilityMissilesExplosionRadius",
-                                   src.getModifiedItemAttr("aoeCloudSizeBonus"), stackingPenalties=True)
-    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"), "fighterAbilityMissilesRange",
-                                   src.getModifiedItemAttr("maxRangeBonus"), stackingPenalties=True)
-    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"),
-                                   "fighterAbilityAttackMissileRangeOptimal", src.getModifiedItemAttr("maxRangeBonus"),
-                                   stackingPenalties=True)
-    fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill("Drones"), "falloff",
-                                 src.getModifiedItemAttr("falloffBonus"), stackingPenalties=True)
-    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"),
-                                   "fighterAbilityAttackMissileExplosionVelocity",
-                                   src.getModifiedItemAttr("aoeVelocityBonus"), stackingPenalties=True)
-    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"),
-                                   "fighterAbilityAttackMissileRangeFalloff", src.getModifiedItemAttr("falloffBonus"),
-                                   stackingPenalties=True)
-    fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill("Drones"), "maxRange",
-                                 src.getModifiedItemAttr("maxRangeBonus"), stackingPenalties=True)
-    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"),
-                                   "fighterAbilityAttackTurretRangeOptimal", src.getModifiedItemAttr("maxRangeBonus"),
-                                   stackingPenalties=True)
diff --git a/eos/effects/effect6558.py b/eos/effects/effect6558.py
deleted file mode 100644
index cb4d4b21e..000000000
--- a/eos/effects/effect6558.py
+++ /dev/null
@@ -1,14 +0,0 @@
-# moduleBonusOmnidirectionalTrackingLinkOverload
-#
-# Used by:
-# Modules from group: Drone Tracking Modules (10 of 10)
-type = "overheat"
-
-
-def handler(fit, module, context):
-    overloadBonus = module.getModifiedItemAttr("overloadTrackingModuleStrengthBonus")
-    module.boostItemAttr("maxRangeBonus", overloadBonus)
-    module.boostItemAttr("falloffBonus", overloadBonus)
-    module.boostItemAttr("trackingSpeedBonus", overloadBonus)
-    module.boostItemAttr("aoeCloudSizeBonus", overloadBonus)
-    module.boostItemAttr("aoeVelocityBonus", overloadBonus)
diff --git a/eos/effects/effect6559.py b/eos/effects/effect6559.py
deleted file mode 100644
index c6e8884e5..000000000
--- a/eos/effects/effect6559.py
+++ /dev/null
@@ -1,43 +0,0 @@
-# moduleBonusOmnidirectionalTrackingEnhancer
-#
-# Used by:
-# Modules from group: Drone Tracking Enhancer (10 of 10)
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"),
-                                   "fighterAbilityAttackMissileExplosionRadius",
-                                   src.getModifiedItemAttr("aoeCloudSizeBonus"), stackingPenalties=True)
-    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"),
-                                   "fighterAbilityAttackMissileRangeOptimal", src.getModifiedItemAttr("maxRangeBonus"),
-                                   stackingPenalties=True)
-    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"),
-                                   "fighterAbilityAttackTurretRangeFalloff", src.getModifiedItemAttr("falloffBonus"),
-                                   stackingPenalties=True)
-    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"),
-                                   "fighterAbilityMissilesExplosionRadius",
-                                   src.getModifiedItemAttr("aoeCloudSizeBonus"), stackingPenalties=True)
-    fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill("Drones"), "falloff",
-                                 src.getModifiedItemAttr("falloffBonus"), stackingPenalties=True)
-    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"),
-                                   "fighterAbilityAttackMissileRangeFalloff", src.getModifiedItemAttr("falloffBonus"),
-                                   stackingPenalties=True)
-    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"),
-                                   "fighterAbilityAttackTurretTrackingSpeed",
-                                   src.getModifiedItemAttr("trackingSpeedBonus"), stackingPenalties=True)
-    fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill("Drones"), "maxRange",
-                                 src.getModifiedItemAttr("maxRangeBonus"), stackingPenalties=True)
-    fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill("Drones"), "trackingSpeed",
-                                 src.getModifiedItemAttr("trackingSpeedBonus"), stackingPenalties=True)
-    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"),
-                                   "fighterAbilityAttackTurretRangeOptimal", src.getModifiedItemAttr("maxRangeBonus"),
-                                   stackingPenalties=True)
-    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"),
-                                   "fighterAbilityMissilesExplosionVelocity",
-                                   src.getModifiedItemAttr("aoeVelocityBonus"), stackingPenalties=True)
-    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"),
-                                   "fighterAbilityAttackMissileExplosionVelocity",
-                                   src.getModifiedItemAttr("aoeVelocityBonus"), stackingPenalties=True)
-    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"), "fighterAbilityMissilesRange",
-                                   src.getModifiedItemAttr("maxRangeBonus"), stackingPenalties=True)
diff --git a/eos/effects/effect6560.py b/eos/effects/effect6560.py
deleted file mode 100644
index 4d22c78ae..000000000
--- a/eos/effects/effect6560.py
+++ /dev/null
@@ -1,18 +0,0 @@
-# skillBonusFighters
-#
-# Used by:
-# Skill: Fighters
-type = "passive"
-
-
-def handler(fit, src, context):
-    lvl = src.level
-    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"),
-                                   "fighterAbilityAttackMissileDamageMultiplier",
-                                   src.getModifiedItemAttr("damageMultiplierBonus") * lvl)
-    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"),
-                                   "fighterAbilityAttackTurretDamageMultiplier",
-                                   src.getModifiedItemAttr("damageMultiplierBonus") * lvl)
-    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"),
-                                   "fighterAbilityMissilesDamageMultiplier",
-                                   src.getModifiedItemAttr("damageMultiplierBonus") * lvl)
diff --git a/eos/effects/effect6561.py b/eos/effects/effect6561.py
deleted file mode 100644
index d41e21428..000000000
--- a/eos/effects/effect6561.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# skillBonusLightFighters
-#
-# Used by:
-# Skill: Light Fighters
-type = "passive"
-
-
-def handler(fit, src, context):
-    lvl = src.level
-    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Light Fighters"), "maxVelocity",
-                                   src.getModifiedItemAttr("maxVelocityBonus") * lvl)
diff --git a/eos/effects/effect6562.py b/eos/effects/effect6562.py
deleted file mode 100644
index d6758f279..000000000
--- a/eos/effects/effect6562.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# skillBonusSupportFightersShield
-#
-# Used by:
-# Skill: Support Fighters
-type = "passive"
-
-
-def handler(fit, src, context):
-    lvl = src.level
-    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Support Fighters"), "shieldCapacity",
-                                   src.getModifiedItemAttr("shieldBonus") * lvl)
diff --git a/eos/effects/effect6563.py b/eos/effects/effect6563.py
deleted file mode 100644
index 7c19ebb2d..000000000
--- a/eos/effects/effect6563.py
+++ /dev/null
@@ -1,18 +0,0 @@
-# skillBonusHeavyFighters
-#
-# Used by:
-# Skill: Heavy Fighters
-type = "passive"
-
-
-def handler(fit, src, context):
-    lvl = src.level
-    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Heavy Fighters"),
-                                   "fighterAbilityMissilesDamageMultiplier",
-                                   src.getModifiedItemAttr("damageMultiplierBonus") * lvl)
-    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Heavy Fighters"),
-                                   "fighterAbilityAttackMissileDamageMultiplier",
-                                   src.getModifiedItemAttr("damageMultiplierBonus") * lvl)
-    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Heavy Fighters"),
-                                   "fighterAbilityAttackTurretDamageMultiplier",
-                                   src.getModifiedItemAttr("damageMultiplierBonus") * lvl)
diff --git a/eos/effects/effect6565.py b/eos/effects/effect6565.py
deleted file mode 100644
index 195835283..000000000
--- a/eos/effects/effect6565.py
+++ /dev/null
@@ -1,24 +0,0 @@
-# citadelRigBonus
-#
-# Used by:
-# Structures from group: Citadel (9 of 9)
-type = "passive"
-runTime = "early"
-
-
-def handler(fit, src, context):
-
-    for attr in [
-        "structureRigDoomsdayDamageLossTargetBonus",
-        "structureRigScanResBonus",
-        "structureRigPDRangeBonus",
-        "structureRigPDCapUseBonus",
-        "structureRigMissileExploVeloBonus",
-        "structureRigMissileVelocityBonus",
-        "structureRigEwarOptimalBonus",
-        "structureRigEwarFalloffBonus",
-        "structureRigEwarCapUseBonus",
-        "structureRigMissileExplosionRadiusBonus"
-    ]:
-        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Jury Rigging"),
-                                  attr, src.getModifiedItemAttr("structureRoleBonus"))
diff --git a/eos/effects/effect6566.py b/eos/effects/effect6566.py
deleted file mode 100644
index e79f21515..000000000
--- a/eos/effects/effect6566.py
+++ /dev/null
@@ -1,21 +0,0 @@
-# moduleBonusFighterSupportUnit
-#
-# Used by:
-# Modules from group: Fighter Support Unit (8 of 8)
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.fighters.filteredItemMultiply(lambda mod: mod.item.requiresSkill("Fighters"), "shieldCapacity",
-                                   src.getModifiedItemAttr("fighterBonusShieldCapacityPercent"))
-    fit.fighters.filteredItemMultiply(lambda mod: mod.item.requiresSkill("Fighters"), "maxVelocity",
-                                   src.getModifiedItemAttr("fighterBonusVelocityPercent"), stackingPenalties=True, penaltyGroup="postMul")
-    fit.fighters.filteredItemMultiply(lambda mod: mod.item.requiresSkill("Fighters"),
-                                   "fighterAbilityAttackMissileDuration",
-                                   src.getModifiedItemAttr("fighterBonusROFPercent"), stackingPenalties=True, penaltyGroup="postMul")
-    fit.fighters.filteredItemMultiply(lambda mod: mod.item.requiresSkill("Fighters"), "fighterAbilityAttackTurretDuration",
-                                   src.getModifiedItemAttr("fighterBonusROFPercent"), stackingPenalties=True, penaltyGroup="postMul")
-    fit.fighters.filteredItemMultiply(lambda mod: mod.item.requiresSkill("Fighters"), "fighterAbilityMissilesDuration",
-                                   src.getModifiedItemAttr("fighterBonusROFPercent"), stackingPenalties=True, penaltyGroup="postMul")
-    fit.fighters.filteredItemMultiply(lambda mod: mod.item.requiresSkill("Fighters"), "shieldRechargeRate",
-                                   src.getModifiedItemAttr("fighterBonusShieldRechargePercent"))
diff --git a/eos/effects/effect6567.py b/eos/effects/effect6567.py
deleted file mode 100644
index fb58a5928..000000000
--- a/eos/effects/effect6567.py
+++ /dev/null
@@ -1,29 +0,0 @@
-# moduleBonusNetworkedSensorArray
-#
-# Used by:
-# Module: Networked Sensor Array
-type = "active"
-
-
-def handler(fit, src, context):
-    fit.ship.boostItemAttr("scanResolution", src.getModifiedItemAttr("scanResolutionBonus"), stackingPenalties=True)
-
-    for scanType in ('Magnetometric', 'Ladar', 'Gravimetric', 'Radar'):
-        attr = "scan{}Strength".format(scanType)
-        bonus = src.getModifiedItemAttr("scan{}StrengthPercent".format(scanType))
-        fit.ship.boostItemAttr(attr, bonus, stackingPenalties=True)
-        fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"), attr, bonus,
-                                       stackingPenalties=True)
-
-    # EW cap need increase
-    groups = [
-        'Burst Jammer',
-        'Weapon Disruptor',
-        'ECM',
-        'Stasis Grappler',
-        'Sensor Dampener',
-        'Target Painter']
-
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name in groups or
-                                              mod.item.requiresSkill("Propulsion Jamming"),
-                                  "capacitorNeed", src.getModifiedItemAttr("ewCapacitorNeedBonus"))
diff --git a/eos/effects/effect657.py b/eos/effects/effect657.py
deleted file mode 100644
index fe8b37aa4..000000000
--- a/eos/effects/effect657.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# agilityMultiplierEffect
-#
-# Used by:
-# 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",
-                           module.getModifiedItemAttr("agilityMultiplier"),
-                           stackingPenalties=True)
diff --git a/eos/effects/effect6570.py b/eos/effects/effect6570.py
deleted file mode 100644
index 8cf44cbe8..000000000
--- a/eos/effects/effect6570.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# skillBonusFighterHangarManagement
-#
-# Used by:
-# Skill: Fighter Hangar Management
-type = "passive"
-
-
-def handler(fit, src, context):
-    lvl = src.level
-    fit.ship.boostItemAttr("fighterCapacity", src.getModifiedItemAttr("skillBonusFighterHangarSize") * lvl)
diff --git a/eos/effects/effect6571.py b/eos/effects/effect6571.py
deleted file mode 100644
index 9077ff379..000000000
--- a/eos/effects/effect6571.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# skillBonusCapitalAutocannonSpecialization
-#
-# Used by:
-# Skill: Capital Autocannon Specialization
-type = "passive"
-
-
-def handler(fit, src, context):
-    lvl = src.level
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Autocannon Specialization"),
-                                  "damageMultiplier", src.getModifiedItemAttr("damageMultiplierBonus") * lvl)
diff --git a/eos/effects/effect6572.py b/eos/effects/effect6572.py
deleted file mode 100644
index 3a2f7b5c9..000000000
--- a/eos/effects/effect6572.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# skillBonusCapitalArtillerySpecialization
-#
-# Used by:
-# Skill: Capital Artillery Specialization
-type = "passive"
-
-
-def handler(fit, src, context):
-    lvl = src.level
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Artillery Specialization"),
-                                  "damageMultiplier", src.getModifiedItemAttr("damageMultiplierBonus") * lvl)
diff --git a/eos/effects/effect6573.py b/eos/effects/effect6573.py
deleted file mode 100644
index 41d923389..000000000
--- a/eos/effects/effect6573.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# skillBonusCapitalBlasterSpecialization
-#
-# Used by:
-# Skill: Capital Blaster Specialization
-type = "passive"
-
-
-def handler(fit, src, context):
-    lvl = src.level
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Blaster Specialization"),
-                                  "damageMultiplier", src.getModifiedItemAttr("damageMultiplierBonus") * lvl)
diff --git a/eos/effects/effect6574.py b/eos/effects/effect6574.py
deleted file mode 100644
index 98d17a9bb..000000000
--- a/eos/effects/effect6574.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# skillBonusCapitalRailgunSpecialization
-#
-# Used by:
-# Skill: Capital Railgun Specialization
-type = "passive"
-
-
-def handler(fit, src, context):
-    lvl = src.level
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Railgun Specialization"),
-                                  "damageMultiplier", src.getModifiedItemAttr("damageMultiplierBonus") * lvl)
diff --git a/eos/effects/effect6575.py b/eos/effects/effect6575.py
deleted file mode 100644
index 514eb5b2a..000000000
--- a/eos/effects/effect6575.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# skillBonusCapitalPulseLaserSpecialization
-#
-# Used by:
-# Skill: Capital Pulse Laser Specialization
-type = "passive"
-
-
-def handler(fit, src, context):
-    lvl = src.level
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Pulse Laser Specialization"),
-                                  "damageMultiplier", src.getModifiedItemAttr("damageMultiplierBonus") * lvl)
diff --git a/eos/effects/effect6576.py b/eos/effects/effect6576.py
deleted file mode 100644
index 82ff0a0c1..000000000
--- a/eos/effects/effect6576.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# skillBonusCapitalBeamLaserSpecialization
-#
-# Used by:
-# Skill: Capital Beam Laser Specialization
-type = "passive"
-
-
-def handler(fit, src, context):
-    lvl = src.level
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Beam Laser Specialization"),
-                                  "damageMultiplier", src.getModifiedItemAttr("damageMultiplierBonus") * lvl)
diff --git a/eos/effects/effect6577.py b/eos/effects/effect6577.py
deleted file mode 100644
index cc51709e3..000000000
--- a/eos/effects/effect6577.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# skillBonusXLCruiseMissileSpecialization
-#
-# Used by:
-# Skill: XL Cruise Missile Specialization
-type = "passive"
-
-
-def handler(fit, src, context):
-    lvl = src.level
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("XL Cruise Missile Specialization"), "speed",
-                                  src.getModifiedItemAttr("rofBonus") * lvl)
diff --git a/eos/effects/effect6578.py b/eos/effects/effect6578.py
deleted file mode 100644
index 7393d111e..000000000
--- a/eos/effects/effect6578.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# skillBonusXLTorpedoSpecialization
-#
-# Used by:
-# Skill: XL Torpedo Specialization
-type = "passive"
-
-
-def handler(fit, src, context):
-    lvl = src.level
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("XL Torpedo Specialization"), "speed",
-                                  src.getModifiedItemAttr("rofBonus") * lvl)
diff --git a/eos/effects/effect6580.py b/eos/effects/effect6580.py
deleted file mode 100644
index e54c5ef47..000000000
--- a/eos/effects/effect6580.py
+++ /dev/null
@@ -1,14 +0,0 @@
-# shipBonusRole2LogisticDroneRepAmountBonus
-#
-# Used by:
-# Ships from group: Force Auxiliary (5 of 6)
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill("Repair Drone Operation"), "structureDamageAmount",
-                                 src.getModifiedItemAttr("shipBonusRole2"))
-    fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill("Repair Drone Operation"), "armorDamageAmount",
-                                 src.getModifiedItemAttr("shipBonusRole2"))
-    fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill("Repair Drone Operation"), "shieldBonus",
-                                 src.getModifiedItemAttr("shipBonusRole2"))
diff --git a/eos/effects/effect6581.py b/eos/effects/effect6581.py
deleted file mode 100644
index 3474de594..000000000
--- a/eos/effects/effect6581.py
+++ /dev/null
@@ -1,76 +0,0 @@
-# moduleBonusTriageModule
-#
-# Used by:
-# Variations of module: Triage Module I (2 of 2)
-type = "active"
-runTime = "early"
-
-
-def handler(fit, src, context):
-    # Remote effect bonuses (duration / amount / range / fallout)
-    for skill, amtAttr, stack in (
-            ("Capital Remote Armor Repair Systems", "armorDamageAmount", True),
-            ("Capital Shield Emission Systems", "shieldBonus", True),
-            ("Capital Capacitor Emission Systems", "powerTransferAmount", False),
-            ("Capital Remote Hull Repair Systems", "structureDamageAmount", False)):
-        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill(skill), "duration",
-                                      src.getModifiedItemAttr("siegeRemoteLogisticsDurationBonus"))
-        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill(skill), amtAttr,
-                                      src.getModifiedItemAttr("siegeRemoteLogisticsAmountBonus"),
-                                      stackingPenalties=stack)
-        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill(skill), "maxRange",
-                                      src.getModifiedItemAttr("siegeRemoteLogisticsRangeBonus"), stackingPenalties=True)
-        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill(skill), "falloffEffectiveness",
-                                      src.getModifiedItemAttr("siegeRemoteLogisticsRangeBonus"), stackingPenalties=True)
-
-    # Local armor/shield rep effects (duration / amoutn)
-    for skill, amtAttr in (
-            ("Capital Shield Operation", "shieldBonus"),
-            ("Capital Repair Systems", "armorDamageAmount")):
-        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill(skill), "duration",
-                                      src.getModifiedItemAttr("siegeLocalLogisticsDurationBonus"))
-        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill(skill), amtAttr,
-                                      src.getModifiedItemAttr("siegeLocalLogisticsAmountBonus"))
-
-    # Speed bonus
-    fit.ship.boostItemAttr("maxVelocity", src.getModifiedItemAttr("speedFactor"), stackingPenalties=True)
-
-    # Scan resolution multiplier
-    fit.ship.multiplyItemAttr("scanResolution", src.getModifiedItemAttr("scanResolutionMultiplier"),
-                              stackingPenalties=True)
-
-    # Mass multiplier
-    fit.ship.multiplyItemAttr("mass", src.getModifiedItemAttr("siegeMassMultiplier"), stackingPenalties=True)
-
-    # Max locked targets
-    fit.ship.increaseItemAttr("maxLockedTargets", src.getModifiedItemAttr("maxLockedTargetsBonus"))
-
-    # EW cap need increase
-    groups = [
-        'Burst Jammer',
-        'Weapon Disruptor',
-        'ECM',
-        'Stasis Grappler',
-        'Sensor Dampener',
-        'Target Painter']
-
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name in groups or
-                                              mod.item.requiresSkill("Propulsion Jamming"),
-                                  "capacitorNeed", src.getModifiedItemAttr("ewCapacitorNeedBonus"))
-
-    # todo: test for April 2016 release
-    # Block EWAR & projected effects
-    fit.ship.forceItemAttr("disallowOffensiveModifiers", src.getModifiedItemAttr("disallowOffensiveModifiers"))
-    fit.ship.forceItemAttr("disallowAssistance", src.getModifiedItemAttr("disallowAssistance"))
-
-    # new in April 2016 release
-    fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill("Drones"), "damageMultiplier",
-                                 src.getModifiedItemAttr("droneDamageBonus"), stackingPenalties=True)
-
-    fit.ship.increaseItemAttr("warpScrambleStatus", src.getModifiedItemAttr("siegeModeWarpStatus"))
-    fit.ship.boostItemAttr("sensorDampenerResistance", src.getModifiedItemAttr("sensorDampenerResistanceBonus"))
-    fit.ship.boostItemAttr("remoteAssistanceImpedance", src.getModifiedItemAttr("remoteAssistanceImpedanceBonus"))
-    fit.ship.boostItemAttr("remoteRepairImpedance", src.getModifiedItemAttr("remoteRepairImpedanceBonus"))
-
-    fit.ship.forceItemAttr("disallowTethering", src.getModifiedItemAttr("disallowTethering"))
-    fit.ship.forceItemAttr("disallowDocking", src.getModifiedItemAttr("disallowDocking"))
diff --git a/eos/effects/effect6582.py b/eos/effects/effect6582.py
deleted file mode 100644
index c63e33440..000000000
--- a/eos/effects/effect6582.py
+++ /dev/null
@@ -1,64 +0,0 @@
-# moduleBonusSiegeModule
-#
-# Used by:
-# Variations of module: Siege Module I (2 of 2)
-type = "active"
-runTime = "early"
-
-
-def handler(fit, src, context):
-    # Turrets
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Energy Turret") or
-                                              mod.item.requiresSkill("Capital Hybrid Turret") or
-                                              mod.item.requiresSkill("Capital Projectile Turret"),
-                                  "damageMultiplier", src.getModifiedItemAttr("siegeTurretDamageBonus"))
-
-    # Missiles
-    for type in ("kinetic", "thermal", "explosive", "em"):
-        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("XL Torpedoes") or
-                                                    mod.charge.requiresSkill("XL Cruise Missiles") or
-                                                    mod.charge.requiresSkill("Torpedoes"),
-                                        "%sDamage" % type, src.getModifiedItemAttr("siegeMissileDamageBonus"))
-
-    # Reppers
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Shield Operation") or
-                                              mod.item.requiresSkill("Capital Repair Systems"),
-                                  "duration", src.getModifiedItemAttr("siegeLocalLogisticsDurationBonus"))
-
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Shield Operation"),
-                                  "shieldBonus", src.getModifiedItemAttr("siegeLocalLogisticsAmountBonus"),
-                                  stackingPenalties=True)
-
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Repair Systems"),
-                                  "armorDamageAmount", src.getModifiedItemAttr("siegeLocalLogisticsAmountBonus"),
-                                  stackingPenalties=True)
-
-    # Speed penalty
-    fit.ship.boostItemAttr("maxVelocity", src.getModifiedItemAttr("speedFactor"))
-
-    # Mass
-    fit.ship.multiplyItemAttr("mass", src.getModifiedItemAttr("siegeMassMultiplier"),
-                              stackingPenalties=True, penaltyGroup="postMul")
-
-    # @ todo: test for April 2016 release
-    # Block Hostile EWAR and friendly effects
-    fit.ship.forceItemAttr("disallowOffensiveModifiers", src.getModifiedItemAttr("disallowOffensiveModifiers"))
-    fit.ship.forceItemAttr("disallowAssistance", src.getModifiedItemAttr("disallowAssistance"))
-
-    # new in April 2016 release
-    # missile ROF bonus
-    for group in ("Missile Launcher XL Torpedo", "Missile Launcher Rapid Torpedo", "Missile Launcher XL Cruise"):
-        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == group, "speed",
-                                      src.getModifiedItemAttr("siegeLauncherROFBonus"))
-
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Torpedoes"), "maxVelocity",
-                                    src.getModifiedItemAttr("siegeTorpedoVelocityBonus"), stackingPenalties=True)
-
-    fit.ship.increaseItemAttr("warpScrambleStatus", src.getModifiedItemAttr("siegeModeWarpStatus"))
-    fit.ship.boostItemAttr("remoteRepairImpedance", src.getModifiedItemAttr("remoteRepairImpedanceBonus"))
-    fit.ship.boostItemAttr("sensorDampenerResistance", src.getModifiedItemAttr("sensorDampenerResistanceBonus"))
-    fit.ship.boostItemAttr("remoteAssistanceImpedance", src.getModifiedItemAttr("remoteAssistanceImpedanceBonus"))
-    fit.ship.boostItemAttr("weaponDisruptionResistance", src.getModifiedItemAttr("weaponDisruptionResistanceBonus"))
-
-    fit.ship.forceItemAttr("disallowDocking", src.getModifiedItemAttr("disallowDocking"))
-    fit.ship.forceItemAttr("disallowTethering", src.getModifiedItemAttr("disallowTethering"))
diff --git a/eos/effects/effect6591.py b/eos/effects/effect6591.py
deleted file mode 100644
index caee35c38..000000000
--- a/eos/effects/effect6591.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipBonusSupercarrierA3WarpStrength
-#
-# Used by:
-# Ship: Aeon
-# Ship: Revenant
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.ship.increaseItemAttr("warpScrambleStatus", src.getModifiedItemAttr("shipBonusSupercarrierA3"),
-                              skill="Amarr Carrier")
diff --git a/eos/effects/effect6592.py b/eos/effects/effect6592.py
deleted file mode 100644
index 9a18457fd..000000000
--- a/eos/effects/effect6592.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipBonusSupercarrierC3WarpStrength
-#
-# Used by:
-# Ship: Revenant
-# Ship: Wyvern
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.ship.increaseItemAttr("warpScrambleStatus", src.getModifiedItemAttr("shipBonusSupercarrierC3"),
-                              skill="Caldari Carrier")
diff --git a/eos/effects/effect6593.py b/eos/effects/effect6593.py
deleted file mode 100644
index 5c361a79e..000000000
--- a/eos/effects/effect6593.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusSupercarrierG3WarpStrength
-#
-# Used by:
-# Variations of ship: Nyx (2 of 2)
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.ship.increaseItemAttr("warpScrambleStatus", src.getModifiedItemAttr("shipBonusSupercarrierG3"),
-                              skill="Gallente Carrier")
diff --git a/eos/effects/effect6594.py b/eos/effects/effect6594.py
deleted file mode 100644
index dd652f578..000000000
--- a/eos/effects/effect6594.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipBonusSupercarrierM3WarpStrength
-#
-# Used by:
-# Ship: Hel
-# Ship: Vendetta
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.ship.increaseItemAttr("warpScrambleStatus", src.getModifiedItemAttr("shipBonusSupercarrierM3"),
-                              skill="Minmatar Carrier")
diff --git a/eos/effects/effect6595.py b/eos/effects/effect6595.py
deleted file mode 100644
index 31981bba6..000000000
--- a/eos/effects/effect6595.py
+++ /dev/null
@@ -1,23 +0,0 @@
-# shipBonusCarrierA4WarfareLinksBonus
-#
-# Used by:
-# Ship: Archon
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(
-        lambda mod: mod.item.requiresSkill("Armored Command") or mod.item.requiresSkill("Information Command"),
-        "buffDuration", src.getModifiedItemAttr("shipBonusCarrierA4"), skill="Amarr Carrier")
-    fit.modules.filteredItemBoost(
-        lambda mod: mod.item.requiresSkill("Armored Command") or mod.item.requiresSkill("Information Command"),
-        "warfareBuff3Value", src.getModifiedItemAttr("shipBonusCarrierA4"), skill="Amarr Carrier")
-    fit.modules.filteredItemBoost(
-        lambda mod: mod.item.requiresSkill("Armored Command") or mod.item.requiresSkill("Information Command"),
-        "warfareBuff1Value", src.getModifiedItemAttr("shipBonusCarrierA4"), skill="Amarr Carrier")
-    fit.modules.filteredItemBoost(
-        lambda mod: mod.item.requiresSkill("Armored Command") or mod.item.requiresSkill("Information Command"),
-        "warfareBuff4Value", src.getModifiedItemAttr("shipBonusCarrierA4"), skill="Amarr Carrier")
-    fit.modules.filteredItemBoost(
-        lambda mod: mod.item.requiresSkill("Armored Command") or mod.item.requiresSkill("Information Command"),
-        "warfareBuff2Value", src.getModifiedItemAttr("shipBonusCarrierA4"), skill="Amarr Carrier")
diff --git a/eos/effects/effect6596.py b/eos/effects/effect6596.py
deleted file mode 100644
index 4e19f6916..000000000
--- a/eos/effects/effect6596.py
+++ /dev/null
@@ -1,23 +0,0 @@
-# shipBonusCarrierC4WarfareLinksBonus
-#
-# Used by:
-# Ship: Chimera
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(
-        lambda mod: mod.item.requiresSkill("Shield Command") or mod.item.requiresSkill("Information Command"),
-        "warfareBuff2Value", src.getModifiedItemAttr("shipBonusCarrierC4"), skill="Caldari Carrier")
-    fit.modules.filteredItemBoost(
-        lambda mod: mod.item.requiresSkill("Shield Command") or mod.item.requiresSkill("Information Command"),
-        "buffDuration", src.getModifiedItemAttr("shipBonusCarrierC4"), skill="Caldari Carrier")
-    fit.modules.filteredItemBoost(
-        lambda mod: mod.item.requiresSkill("Shield Command") or mod.item.requiresSkill("Information Command"),
-        "warfareBuff3Value", src.getModifiedItemAttr("shipBonusCarrierC4"), skill="Caldari Carrier")
-    fit.modules.filteredItemBoost(
-        lambda mod: mod.item.requiresSkill("Shield Command") or mod.item.requiresSkill("Information Command"),
-        "warfareBuff4Value", src.getModifiedItemAttr("shipBonusCarrierC4"), skill="Caldari Carrier")
-    fit.modules.filteredItemBoost(
-        lambda mod: mod.item.requiresSkill("Shield Command") or mod.item.requiresSkill("Information Command"),
-        "warfareBuff1Value", src.getModifiedItemAttr("shipBonusCarrierC4"), skill="Caldari Carrier")
diff --git a/eos/effects/effect6597.py b/eos/effects/effect6597.py
deleted file mode 100644
index 05eb85c60..000000000
--- a/eos/effects/effect6597.py
+++ /dev/null
@@ -1,23 +0,0 @@
-# shipBonusCarrierG4WarfareLinksBonus
-#
-# Used by:
-# Ship: Thanatos
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(
-        lambda mod: mod.item.requiresSkill("Skirmish Command") or mod.item.requiresSkill("Armored Command"),
-        "warfareBuff2Value", src.getModifiedItemAttr("shipBonusCarrierG4"), skill="Gallente Carrier")
-    fit.modules.filteredItemBoost(
-        lambda mod: mod.item.requiresSkill("Skirmish Command") or mod.item.requiresSkill("Armored Command"),
-        "warfareBuff3Value", src.getModifiedItemAttr("shipBonusCarrierG4"), skill="Gallente Carrier")
-    fit.modules.filteredItemBoost(
-        lambda mod: mod.item.requiresSkill("Skirmish Command") or mod.item.requiresSkill("Armored Command"),
-        "warfareBuff4Value", src.getModifiedItemAttr("shipBonusCarrierG4"), skill="Gallente Carrier")
-    fit.modules.filteredItemBoost(
-        lambda mod: mod.item.requiresSkill("Skirmish Command") or mod.item.requiresSkill("Armored Command"),
-        "buffDuration", src.getModifiedItemAttr("shipBonusCarrierG4"), skill="Gallente Carrier")
-    fit.modules.filteredItemBoost(
-        lambda mod: mod.item.requiresSkill("Skirmish Command") or mod.item.requiresSkill("Armored Command"),
-        "warfareBuff1Value", src.getModifiedItemAttr("shipBonusCarrierG4"), skill="Gallente Carrier")
diff --git a/eos/effects/effect6598.py b/eos/effects/effect6598.py
deleted file mode 100644
index 11592c9df..000000000
--- a/eos/effects/effect6598.py
+++ /dev/null
@@ -1,23 +0,0 @@
-# shipBonusCarrierM4WarfareLinksBonus
-#
-# Used by:
-# Ship: Nidhoggur
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(
-        lambda mod: mod.item.requiresSkill("Skirmish Command") or mod.item.requiresSkill("Shield Command"),
-        "warfareBuff4Value", src.getModifiedItemAttr("shipBonusCarrierM4"), skill="Minmatar Carrier")
-    fit.modules.filteredItemBoost(
-        lambda mod: mod.item.requiresSkill("Skirmish Command") or mod.item.requiresSkill("Shield Command"),
-        "warfareBuff2Value", src.getModifiedItemAttr("shipBonusCarrierM4"), skill="Minmatar Carrier")
-    fit.modules.filteredItemBoost(
-        lambda mod: mod.item.requiresSkill("Skirmish Command") or mod.item.requiresSkill("Shield Command"),
-        "warfareBuff3Value", src.getModifiedItemAttr("shipBonusCarrierM4"), skill="Minmatar Carrier")
-    fit.modules.filteredItemBoost(
-        lambda mod: mod.item.requiresSkill("Skirmish Command") or mod.item.requiresSkill("Shield Command"),
-        "warfareBuff1Value", src.getModifiedItemAttr("shipBonusCarrierM4"), skill="Minmatar Carrier")
-    fit.modules.filteredItemBoost(
-        lambda mod: mod.item.requiresSkill("Skirmish Command") or mod.item.requiresSkill("Shield Command"),
-        "buffDuration", src.getModifiedItemAttr("shipBonusCarrierM4"), skill="Minmatar Carrier")
diff --git a/eos/effects/effect6599.py b/eos/effects/effect6599.py
deleted file mode 100644
index ebda73d9d..000000000
--- a/eos/effects/effect6599.py
+++ /dev/null
@@ -1,16 +0,0 @@
-# shipBonusCarrierA1ArmorResists
-#
-# Used by:
-# Ship: Archon
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.ship.boostItemAttr("armorKineticDamageResonance", src.getModifiedItemAttr("shipBonusCarrierA1"),
-                           skill="Amarr Carrier")
-    fit.ship.boostItemAttr("armorEmDamageResonance", src.getModifiedItemAttr("shipBonusCarrierA1"),
-                           skill="Amarr Carrier")
-    fit.ship.boostItemAttr("armorExplosiveDamageResonance", src.getModifiedItemAttr("shipBonusCarrierA1"),
-                           skill="Amarr Carrier")
-    fit.ship.boostItemAttr("armorThermalDamageResonance", src.getModifiedItemAttr("shipBonusCarrierA1"),
-                           skill="Amarr Carrier")
diff --git a/eos/effects/effect660.py b/eos/effects/effect660.py
deleted file mode 100644
index 4b745afd2..000000000
--- a/eos/effects/effect660.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# missileEMDmgBonus
-#
-# Used by:
-# Skills named like: Missiles (5 of 7)
-# Skill: Rockets
-# Skill: Torpedoes
-type = "passive"
-
-
-def handler(fit, skill, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill(skill),
-                                    "emDamage", skill.getModifiedItemAttr("damageMultiplierBonus") * skill.level)
diff --git a/eos/effects/effect6600.py b/eos/effects/effect6600.py
deleted file mode 100644
index 4b8cd7101..000000000
--- a/eos/effects/effect6600.py
+++ /dev/null
@@ -1,16 +0,0 @@
-# shipBonusCarrierC1ShieldResists
-#
-# Used by:
-# Ship: Chimera
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.ship.boostItemAttr("shieldThermalDamageResonance", src.getModifiedItemAttr("shipBonusCarrierC1"),
-                           skill="Caldari Carrier")
-    fit.ship.boostItemAttr("shieldEmDamageResonance", src.getModifiedItemAttr("shipBonusCarrierC1"),
-                           skill="Caldari Carrier")
-    fit.ship.boostItemAttr("shieldKineticDamageResonance", src.getModifiedItemAttr("shipBonusCarrierC1"),
-                           skill="Caldari Carrier")
-    fit.ship.boostItemAttr("shieldExplosiveDamageResonance", src.getModifiedItemAttr("shipBonusCarrierC1"),
-                           skill="Caldari Carrier")
diff --git a/eos/effects/effect6601.py b/eos/effects/effect6601.py
deleted file mode 100644
index e17ff621a..000000000
--- a/eos/effects/effect6601.py
+++ /dev/null
@@ -1,17 +0,0 @@
-# shipBonusCarrierG1FighterDamage
-#
-# Used by:
-# Ship: Thanatos
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"),
-                                   "fighterAbilityMissilesDamageMultiplier",
-                                   src.getModifiedItemAttr("shipBonusCarrierG1"), skill="Gallente Carrier")
-    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"),
-                                   "fighterAbilityAttackTurretDamageMultiplier",
-                                   src.getModifiedItemAttr("shipBonusCarrierG1"), skill="Gallente Carrier")
-    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"),
-                                   "fighterAbilityAttackMissileDamageMultiplier",
-                                   src.getModifiedItemAttr("shipBonusCarrierG1"), skill="Gallente Carrier")
diff --git a/eos/effects/effect6602.py b/eos/effects/effect6602.py
deleted file mode 100644
index 218947805..000000000
--- a/eos/effects/effect6602.py
+++ /dev/null
@@ -1,17 +0,0 @@
-# shipBonusCarrierM1FighterDamage
-#
-# Used by:
-# Ship: Nidhoggur
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"),
-                                   "fighterAbilityAttackMissileDamageMultiplier",
-                                   src.getModifiedItemAttr("shipBonusCarrierM1"), skill="Minmatar Carrier")
-    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"),
-                                   "fighterAbilityMissilesDamageMultiplier",
-                                   src.getModifiedItemAttr("shipBonusCarrierM1"), skill="Minmatar Carrier")
-    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"),
-                                   "fighterAbilityAttackTurretDamageMultiplier",
-                                   src.getModifiedItemAttr("shipBonusCarrierM1"), skill="Minmatar Carrier")
diff --git a/eos/effects/effect6603.py b/eos/effects/effect6603.py
deleted file mode 100644
index 1c1900cba..000000000
--- a/eos/effects/effect6603.py
+++ /dev/null
@@ -1,18 +0,0 @@
-# shipBonusSupercarrierA1FighterDamage
-#
-# Used by:
-# Ship: Aeon
-# Ship: Revenant
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"),
-                                   "fighterAbilityMissilesDamageMultiplier",
-                                   src.getModifiedItemAttr("shipBonusSupercarrierA1"), skill="Amarr Carrier")
-    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"),
-                                   "fighterAbilityAttackMissileDamageMultiplier",
-                                   src.getModifiedItemAttr("shipBonusSupercarrierA1"), skill="Amarr Carrier")
-    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"),
-                                   "fighterAbilityAttackTurretDamageMultiplier",
-                                   src.getModifiedItemAttr("shipBonusSupercarrierA1"), skill="Amarr Carrier")
diff --git a/eos/effects/effect6604.py b/eos/effects/effect6604.py
deleted file mode 100644
index 680e6ac24..000000000
--- a/eos/effects/effect6604.py
+++ /dev/null
@@ -1,18 +0,0 @@
-# shipBonusSupercarrierC1FighterDamage
-#
-# Used by:
-# Ship: Revenant
-# Ship: Wyvern
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"),
-                                   "fighterAbilityMissilesDamageMultiplier",
-                                   src.getModifiedItemAttr("shipBonusSupercarrierC1"), skill="Caldari Carrier")
-    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"),
-                                   "fighterAbilityAttackTurretDamageMultiplier",
-                                   src.getModifiedItemAttr("shipBonusSupercarrierC1"), skill="Caldari Carrier")
-    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"),
-                                   "fighterAbilityAttackMissileDamageMultiplier",
-                                   src.getModifiedItemAttr("shipBonusSupercarrierC1"), skill="Caldari Carrier")
diff --git a/eos/effects/effect6605.py b/eos/effects/effect6605.py
deleted file mode 100644
index 835a0f3fc..000000000
--- a/eos/effects/effect6605.py
+++ /dev/null
@@ -1,17 +0,0 @@
-# shipBonusSupercarrierG1FighterDamage
-#
-# Used by:
-# Variations of ship: Nyx (2 of 2)
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"),
-                                   "fighterAbilityAttackTurretDamageMultiplier",
-                                   src.getModifiedItemAttr("shipBonusSupercarrierG1"), skill="Gallente Carrier")
-    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"),
-                                   "fighterAbilityMissilesDamageMultiplier",
-                                   src.getModifiedItemAttr("shipBonusSupercarrierG1"), skill="Gallente Carrier")
-    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"),
-                                   "fighterAbilityAttackMissileDamageMultiplier",
-                                   src.getModifiedItemAttr("shipBonusSupercarrierG1"), skill="Gallente Carrier")
diff --git a/eos/effects/effect6606.py b/eos/effects/effect6606.py
deleted file mode 100644
index 072aa2573..000000000
--- a/eos/effects/effect6606.py
+++ /dev/null
@@ -1,17 +0,0 @@
-# shipBonusSupercarrierM1FighterDamage
-#
-# Used by:
-# Ship: Hel
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"),
-                                   "fighterAbilityAttackMissileDamageMultiplier",
-                                   src.getModifiedItemAttr("shipBonusSupercarrierM1"), skill="Minmatar Carrier")
-    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"),
-                                   "fighterAbilityMissilesDamageMultiplier",
-                                   src.getModifiedItemAttr("shipBonusSupercarrierM1"), skill="Minmatar Carrier")
-    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"),
-                                   "fighterAbilityAttackTurretDamageMultiplier",
-                                   src.getModifiedItemAttr("shipBonusSupercarrierM1"), skill="Minmatar Carrier")
diff --git a/eos/effects/effect6607.py b/eos/effects/effect6607.py
deleted file mode 100644
index fdc2f24bc..000000000
--- a/eos/effects/effect6607.py
+++ /dev/null
@@ -1,23 +0,0 @@
-# shipBonusSupercarrierA5WarfareLinksBonus
-#
-# Used by:
-# Ship: Aeon
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(
-        lambda mod: mod.item.requiresSkill("Armored Command") or mod.item.requiresSkill("Information Command"),
-        "warfareBuff4Value", src.getModifiedItemAttr("shipBonusSupercarrierA5"), skill="Amarr Carrier")
-    fit.modules.filteredItemBoost(
-        lambda mod: mod.item.requiresSkill("Armored Command") or mod.item.requiresSkill("Information Command"),
-        "warfareBuff3Value", src.getModifiedItemAttr("shipBonusSupercarrierA5"), skill="Amarr Carrier")
-    fit.modules.filteredItemBoost(
-        lambda mod: mod.item.requiresSkill("Armored Command") or mod.item.requiresSkill("Information Command"),
-        "buffDuration", src.getModifiedItemAttr("shipBonusSupercarrierA5"), skill="Amarr Carrier")
-    fit.modules.filteredItemBoost(
-        lambda mod: mod.item.requiresSkill("Armored Command") or mod.item.requiresSkill("Information Command"),
-        "warfareBuff2Value", src.getModifiedItemAttr("shipBonusSupercarrierA5"), skill="Amarr Carrier")
-    fit.modules.filteredItemBoost(
-        lambda mod: mod.item.requiresSkill("Armored Command") or mod.item.requiresSkill("Information Command"),
-        "warfareBuff1Value", src.getModifiedItemAttr("shipBonusSupercarrierA5"), skill="Amarr Carrier")
diff --git a/eos/effects/effect6608.py b/eos/effects/effect6608.py
deleted file mode 100644
index 5ff00b1ca..000000000
--- a/eos/effects/effect6608.py
+++ /dev/null
@@ -1,23 +0,0 @@
-# shipBonusSupercarrierC5WarfareLinksBonus
-#
-# Used by:
-# Ship: Wyvern
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(
-        lambda mod: mod.item.requiresSkill("Shield Command") or mod.item.requiresSkill("Information Command"),
-        "buffDuration", src.getModifiedItemAttr("shipBonusSupercarrierC5"), skill="Caldari Carrier")
-    fit.modules.filteredItemBoost(
-        lambda mod: mod.item.requiresSkill("Shield Command") or mod.item.requiresSkill("Information Command"),
-        "warfareBuff2Value", src.getModifiedItemAttr("shipBonusSupercarrierC5"), skill="Caldari Carrier")
-    fit.modules.filteredItemBoost(
-        lambda mod: mod.item.requiresSkill("Shield Command") or mod.item.requiresSkill("Information Command"),
-        "warfareBuff1Value", src.getModifiedItemAttr("shipBonusSupercarrierC5"), skill="Caldari Carrier")
-    fit.modules.filteredItemBoost(
-        lambda mod: mod.item.requiresSkill("Shield Command") or mod.item.requiresSkill("Information Command"),
-        "warfareBuff4Value", src.getModifiedItemAttr("shipBonusSupercarrierC5"), skill="Caldari Carrier")
-    fit.modules.filteredItemBoost(
-        lambda mod: mod.item.requiresSkill("Shield Command") or mod.item.requiresSkill("Information Command"),
-        "warfareBuff3Value", src.getModifiedItemAttr("shipBonusSupercarrierC5"), skill="Caldari Carrier")
diff --git a/eos/effects/effect6609.py b/eos/effects/effect6609.py
deleted file mode 100644
index aa6d4d1e2..000000000
--- a/eos/effects/effect6609.py
+++ /dev/null
@@ -1,23 +0,0 @@
-# shipBonusSupercarrierG5WarfareLinksBonus
-#
-# Used by:
-# Ship: Nyx
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(
-        lambda mod: mod.item.requiresSkill("Skirmish Command") or mod.item.requiresSkill("Armored Command"),
-        "warfareBuff2Value", src.getModifiedItemAttr("shipBonusSupercarrierG5"), skill="Gallente Carrier")
-    fit.modules.filteredItemBoost(
-        lambda mod: mod.item.requiresSkill("Skirmish Command") or mod.item.requiresSkill("Armored Command"),
-        "buffDuration", src.getModifiedItemAttr("shipBonusSupercarrierG5"), skill="Gallente Carrier")
-    fit.modules.filteredItemBoost(
-        lambda mod: mod.item.requiresSkill("Skirmish Command") or mod.item.requiresSkill("Armored Command"),
-        "warfareBuff1Value", src.getModifiedItemAttr("shipBonusSupercarrierG5"), skill="Gallente Carrier")
-    fit.modules.filteredItemBoost(
-        lambda mod: mod.item.requiresSkill("Skirmish Command") or mod.item.requiresSkill("Armored Command"),
-        "warfareBuff3Value", src.getModifiedItemAttr("shipBonusSupercarrierG5"), skill="Gallente Carrier")
-    fit.modules.filteredItemBoost(
-        lambda mod: mod.item.requiresSkill("Skirmish Command") or mod.item.requiresSkill("Armored Command"),
-        "warfareBuff4Value", src.getModifiedItemAttr("shipBonusSupercarrierG5"), skill="Gallente Carrier")
diff --git a/eos/effects/effect661.py b/eos/effects/effect661.py
deleted file mode 100644
index 6f12347b3..000000000
--- a/eos/effects/effect661.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# missileExplosiveDmgBonus
-#
-# Used by:
-# Skills named like: Missiles (5 of 7)
-# Skill: Rockets
-# Skill: Torpedoes
-type = "passive"
-
-
-def handler(fit, skill, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill(skill),
-                                    "explosiveDamage", skill.getModifiedItemAttr("damageMultiplierBonus") * skill.level)
diff --git a/eos/effects/effect6610.py b/eos/effects/effect6610.py
deleted file mode 100644
index 403b6c6a7..000000000
--- a/eos/effects/effect6610.py
+++ /dev/null
@@ -1,23 +0,0 @@
-# shipBonusSupercarrierM5WarfareLinksBonus
-#
-# Used by:
-# Ship: Hel
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(
-        lambda mod: mod.item.requiresSkill("Skirmish Command") or mod.item.requiresSkill("Shield Command"),
-        "warfareBuff4Value", src.getModifiedItemAttr("shipBonusSupercarrierM5"), skill="Minmatar Carrier")
-    fit.modules.filteredItemBoost(
-        lambda mod: mod.item.requiresSkill("Skirmish Command") or mod.item.requiresSkill("Shield Command"),
-        "warfareBuff1Value", src.getModifiedItemAttr("shipBonusSupercarrierM5"), skill="Minmatar Carrier")
-    fit.modules.filteredItemBoost(
-        lambda mod: mod.item.requiresSkill("Skirmish Command") or mod.item.requiresSkill("Shield Command"),
-        "warfareBuff3Value", src.getModifiedItemAttr("shipBonusSupercarrierM5"), skill="Minmatar Carrier")
-    fit.modules.filteredItemBoost(
-        lambda mod: mod.item.requiresSkill("Skirmish Command") or mod.item.requiresSkill("Shield Command"),
-        "buffDuration", src.getModifiedItemAttr("shipBonusSupercarrierM5"), skill="Minmatar Carrier")
-    fit.modules.filteredItemBoost(
-        lambda mod: mod.item.requiresSkill("Skirmish Command") or mod.item.requiresSkill("Shield Command"),
-        "warfareBuff2Value", src.getModifiedItemAttr("shipBonusSupercarrierM5"), skill="Minmatar Carrier")
diff --git a/eos/effects/effect6611.py b/eos/effects/effect6611.py
deleted file mode 100644
index 832a17eff..000000000
--- a/eos/effects/effect6611.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusSupercarrierC2AfterburnerBonus
-#
-# Used by:
-# Ship: Revenant
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Afterburner"), "speedFactor",
-                                  src.getModifiedItemAttr("shipBonusSupercarrierC2"), skill="Caldari Carrier")
diff --git a/eos/effects/effect6612.py b/eos/effects/effect6612.py
deleted file mode 100644
index ef805c824..000000000
--- a/eos/effects/effect6612.py
+++ /dev/null
@@ -1,14 +0,0 @@
-# shipBonusSupercarrierA2FighterApplicationBonus
-#
-# Used by:
-# Ship: Revenant
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"),
-                                   "fighterAbilityMissilesExplosionVelocity",
-                                   src.getModifiedItemAttr("shipBonusSupercarrierA2"), skill="Amarr Carrier")
-    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"),
-                                   "fighterAbilityAttackMissileExplosionVelocity",
-                                   src.getModifiedItemAttr("shipBonusSupercarrierA2"), skill="Amarr Carrier")
diff --git a/eos/effects/effect6613.py b/eos/effects/effect6613.py
deleted file mode 100644
index 05dcff6a1..000000000
--- a/eos/effects/effect6613.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusSupercarrierRole1NumWarfareLinks
-#
-# Used by:
-# Ships from group: Supercarrier (6 of 6)
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemIncrease(lambda mod: mod.item.requiresSkill("Leadership"), "maxGroupActive",
-                                     src.getModifiedItemAttr("shipBonusRole1"))
diff --git a/eos/effects/effect6614.py b/eos/effects/effect6614.py
deleted file mode 100644
index 283256d6c..000000000
--- a/eos/effects/effect6614.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# shipBonusSupercarrierRole2ArmorShieldModuleBonus
-#
-# Used by:
-# Ships from group: Supercarrier (6 of 6)
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Hull Upgrades"), "armorHPBonusAdd",
-                                  src.getModifiedItemAttr("shipBonusRole2"))
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Upgrades"), "capacityBonus",
-                                  src.getModifiedItemAttr("shipBonusRole2"))
diff --git a/eos/effects/effect6615.py b/eos/effects/effect6615.py
deleted file mode 100644
index 49c41fdd6..000000000
--- a/eos/effects/effect6615.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipBonusSupercarrierA4BurstProjectorBonus
-#
-# Used by:
-# Ship: Aeon
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Burst Projector Operation"),
-                                  "durationWeaponDisruptionBurstProjector",
-                                  src.getModifiedItemAttr("shipBonusSupercarrierA4"), skill="Amarr Carrier")
diff --git a/eos/effects/effect6616.py b/eos/effects/effect6616.py
deleted file mode 100644
index ce70f80f2..000000000
--- a/eos/effects/effect6616.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipBonusSupercarrierC4BurstProjectorBonus
-#
-# Used by:
-# Ship: Wyvern
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Burst Projector Operation"),
-                                  "durationECMJammerBurstProjector", src.getModifiedItemAttr("shipBonusSupercarrierC4"),
-                                  skill="Caldari Carrier")
diff --git a/eos/effects/effect6617.py b/eos/effects/effect6617.py
deleted file mode 100644
index 74b6a3ba6..000000000
--- a/eos/effects/effect6617.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipBonusSupercarrierG4BurstProjectorBonus
-#
-# Used by:
-# Ship: Nyx
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Burst Projector Operation"),
-                                  "durationSensorDampeningBurstProjector",
-                                  src.getModifiedItemAttr("shipBonusSupercarrierG4"), skill="Gallente Carrier")
diff --git a/eos/effects/effect6618.py b/eos/effects/effect6618.py
deleted file mode 100644
index d75b19a16..000000000
--- a/eos/effects/effect6618.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipBonusSupercarrierM4BurstProjectorBonus
-#
-# Used by:
-# Ship: Hel
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Burst Projector Operation"),
-                                  "durationTargetIlluminationBurstProjector",
-                                  src.getModifiedItemAttr("shipBonusSupercarrierM4"), skill="Minmatar Carrier")
diff --git a/eos/effects/effect6619.py b/eos/effects/effect6619.py
deleted file mode 100644
index fdfc77d94..000000000
--- a/eos/effects/effect6619.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusCarrierRole1NumWarfareLinks
-#
-# Used by:
-# Ships from group: Carrier (4 of 4)
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemIncrease(lambda mod: mod.item.requiresSkill("Leadership"), "maxGroupActive",
-                                     src.getModifiedItemAttr("shipBonusRole1"))
diff --git a/eos/effects/effect662.py b/eos/effects/effect662.py
deleted file mode 100644
index 162e5beb6..000000000
--- a/eos/effects/effect662.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# missileThermalDmgBonus
-#
-# Used by:
-# Skills named like: Missiles (5 of 7)
-# Skill: Rockets
-# Skill: Torpedoes
-type = "passive"
-
-
-def handler(fit, skill, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill(skill),
-                                    "thermalDamage", skill.getModifiedItemAttr("damageMultiplierBonus") * skill.level)
diff --git a/eos/effects/effect6620.py b/eos/effects/effect6620.py
deleted file mode 100644
index 8ba0cc3fc..000000000
--- a/eos/effects/effect6620.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusDreadnoughtC3ReloadBonus
-#
-# Used by:
-# Ship: Phoenix
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Missile Launcher Operation"), "reloadTime",
-                                  src.getModifiedItemAttr("shipBonusDreadnoughtC3"), skill="Caldari Dreadnought")
diff --git a/eos/effects/effect6621.py b/eos/effects/effect6621.py
deleted file mode 100644
index 4eafbff18..000000000
--- a/eos/effects/effect6621.py
+++ /dev/null
@@ -1,16 +0,0 @@
-# shipBonusSupercarrierA2ArmorResists
-#
-# Used by:
-# Ship: Aeon
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.ship.boostItemAttr("armorExplosiveDamageResonance", src.getModifiedItemAttr("shipBonusSupercarrierA2"),
-                           skill="Amarr Carrier")
-    fit.ship.boostItemAttr("armorEmDamageResonance", src.getModifiedItemAttr("shipBonusSupercarrierA2"),
-                           skill="Amarr Carrier")
-    fit.ship.boostItemAttr("armorThermalDamageResonance", src.getModifiedItemAttr("shipBonusSupercarrierA2"),
-                           skill="Amarr Carrier")
-    fit.ship.boostItemAttr("armorKineticDamageResonance", src.getModifiedItemAttr("shipBonusSupercarrierA2"),
-                           skill="Amarr Carrier")
diff --git a/eos/effects/effect6622.py b/eos/effects/effect6622.py
deleted file mode 100644
index 5f9e36e9b..000000000
--- a/eos/effects/effect6622.py
+++ /dev/null
@@ -1,16 +0,0 @@
-# shipBonusSupercarrierC2ShieldResists
-#
-# Used by:
-# Ship: Wyvern
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.ship.boostItemAttr("shieldThermalDamageResonance", src.getModifiedItemAttr("shipBonusSupercarrierC2"),
-                           skill="Caldari Carrier")
-    fit.ship.boostItemAttr("shieldEmDamageResonance", src.getModifiedItemAttr("shipBonusSupercarrierC2"),
-                           skill="Caldari Carrier")
-    fit.ship.boostItemAttr("shieldKineticDamageResonance", src.getModifiedItemAttr("shipBonusSupercarrierC2"),
-                           skill="Caldari Carrier")
-    fit.ship.boostItemAttr("shieldExplosiveDamageResonance", src.getModifiedItemAttr("shipBonusSupercarrierC2"),
-                           skill="Caldari Carrier")
diff --git a/eos/effects/effect6623.py b/eos/effects/effect6623.py
deleted file mode 100644
index 5b23ff737..000000000
--- a/eos/effects/effect6623.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusSupercarrierG2FighterHitpoints
-#
-# Used by:
-# Variations of ship: Nyx (2 of 2)
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"), "shieldCapacity",
-                                   src.getModifiedItemAttr("shipBonusSupercarrierG2"), skill="Gallente Carrier")
diff --git a/eos/effects/effect6624.py b/eos/effects/effect6624.py
deleted file mode 100644
index d908f242c..000000000
--- a/eos/effects/effect6624.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipBonusSupercarrierM2FighterVelocity
-#
-# Used by:
-# Ship: Hel
-# Ship: Vendetta
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"), "maxVelocity",
-                                   src.getModifiedItemAttr("shipBonusSupercarrierM2"), skill="Minmatar Carrier")
diff --git a/eos/effects/effect6625.py b/eos/effects/effect6625.py
deleted file mode 100644
index 02228b9c6..000000000
--- a/eos/effects/effect6625.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# shipBonusCarrierA2SupportFighterBonus
-#
-# Used by:
-# Ship: Archon
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Support Fighters"), "fighterSquadronOrbitRange",
-                                   src.getModifiedItemAttr("shipBonusCarrierA2"), skill="Amarr Carrier")
-    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Support Fighters"),
-                                   "fighterAbilityEnergyNeutralizerOptimalRange",
-                                   src.getModifiedItemAttr("shipBonusCarrierA2"), skill="Amarr Carrier")
diff --git a/eos/effects/effect6626.py b/eos/effects/effect6626.py
deleted file mode 100644
index ff46a2d1d..000000000
--- a/eos/effects/effect6626.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# shipBonusCarrierC2SupportFighterBonus
-#
-# Used by:
-# Ship: Chimera
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Support Fighters"), "fighterSquadronOrbitRange",
-                                   src.getModifiedItemAttr("shipBonusCarrierC2"), skill="Caldari Carrier")
-    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Support Fighters"),
-                                   "fighterAbilityECMRangeOptimal", src.getModifiedItemAttr("shipBonusCarrierC2"),
-                                   skill="Caldari Carrier")
diff --git a/eos/effects/effect6627.py b/eos/effects/effect6627.py
deleted file mode 100644
index e3bfe9f1f..000000000
--- a/eos/effects/effect6627.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# shipBonusCarrierG2SupportFighterBonus
-#
-# Used by:
-# Ship: Thanatos
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Support Fighters"), "fighterSquadronOrbitRange",
-                                   src.getModifiedItemAttr("shipBonusCarrierG2"), skill="Gallente Carrier")
-    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Support Fighters"),
-                                   "fighterAbilityWarpDisruptionRange", src.getModifiedItemAttr("shipBonusCarrierG2"),
-                                   skill="Gallente Carrier")
diff --git a/eos/effects/effect6628.py b/eos/effects/effect6628.py
deleted file mode 100644
index e28ccbfef..000000000
--- a/eos/effects/effect6628.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# shipBonusCarrierM2SupportFighterBonus
-#
-# Used by:
-# Ship: Nidhoggur
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Support Fighters"), "fighterSquadronOrbitRange",
-                                   src.getModifiedItemAttr("shipBonusCarrierM2"), skill="Minmatar Carrier")
-    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Support Fighters"),
-                                   "fighterAbilityStasisWebifierOptimalRange",
-                                   src.getModifiedItemAttr("shipBonusCarrierM2"), skill="Minmatar Carrier")
diff --git a/eos/effects/effect6629.py b/eos/effects/effect6629.py
deleted file mode 100644
index d2c313dca..000000000
--- a/eos/effects/effect6629.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# scriptResistanceBonusBonus
-#
-# Used by:
-# Charges named like: Resistance Script (8 of 8)
-type = "passive"
-
-
-def handler(fit, src, context):
-    src.boostItemAttr("emDamageResistanceBonus", src.getModifiedChargeAttr("emDamageResistanceBonusBonus"))
-    src.boostItemAttr("explosiveDamageResistanceBonus",
-                      src.getModifiedChargeAttr("explosiveDamageResistanceBonusBonus"))
-    src.boostItemAttr("kineticDamageResistanceBonus", src.getModifiedChargeAttr("kineticDamageResistanceBonusBonus"))
-    src.boostItemAttr("thermalDamageResistanceBonus", src.getModifiedChargeAttr("thermalDamageResistanceBonusBonus"))
diff --git a/eos/effects/effect6634.py b/eos/effects/effect6634.py
deleted file mode 100644
index 92ec95b48..000000000
--- a/eos/effects/effect6634.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusTitanA1DamageBonus
-#
-# Used by:
-# Ship: Avatar
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Energy Turret"), "damageMultiplier",
-                                  src.getModifiedItemAttr("shipBonusTitanA1"), skill="Amarr Titan")
diff --git a/eos/effects/effect6635.py b/eos/effects/effect6635.py
deleted file mode 100644
index 08ea4ea52..000000000
--- a/eos/effects/effect6635.py
+++ /dev/null
@@ -1,14 +0,0 @@
-# shipBonusTitanC1KinDamageBonus
-#
-# Used by:
-# Ship: Leviathan
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("XL Torpedoes"), "kineticDamage",
-                                    src.getModifiedItemAttr("shipBonusTitanC1"), skill="Caldari Titan")
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("XL Cruise Missiles"), "kineticDamage",
-                                    src.getModifiedItemAttr("shipBonusTitanC1"), skill="Caldari Titan")
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Torpedoes"), "kineticDamage",
-                                    src.getModifiedItemAttr("shipBonusTitanC1"), skill="Caldari Titan")
diff --git a/eos/effects/effect6636.py b/eos/effects/effect6636.py
deleted file mode 100644
index e44f41f53..000000000
--- a/eos/effects/effect6636.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusTitanG1DamageBonus
-#
-# Used by:
-# Ship: Erebus
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Hybrid Turret"), "damageMultiplier",
-                                  src.getModifiedItemAttr("shipBonusTitanG1"), skill="Gallente Titan")
diff --git a/eos/effects/effect6637.py b/eos/effects/effect6637.py
deleted file mode 100644
index 538a0d8fc..000000000
--- a/eos/effects/effect6637.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusTitanM1DamageBonus
-#
-# Used by:
-# Ship: Ragnarok
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Projectile Turret"), "damageMultiplier",
-                                  src.getModifiedItemAttr("shipBonusTitanM1"), skill="Minmatar Titan")
diff --git a/eos/effects/effect6638.py b/eos/effects/effect6638.py
deleted file mode 100644
index 52ce60bda..000000000
--- a/eos/effects/effect6638.py
+++ /dev/null
@@ -1,14 +0,0 @@
-# shipBonusTitanC2ROFBonus
-#
-# Used by:
-# Variations of ship: Leviathan (2 of 2)
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Missile Launcher XL Cruise", "speed",
-                                  src.getModifiedItemAttr("shipBonusTitanC2"), skill="Caldari Titan")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Missile Launcher Rapid Torpedo", "speed",
-                                  src.getModifiedItemAttr("shipBonusTitanC2"), skill="Caldari Titan")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Missile Launcher XL Torpedo", "speed",
-                                  src.getModifiedItemAttr("shipBonusTitanC2"), skill="Caldari Titan")
diff --git a/eos/effects/effect6639.py b/eos/effects/effect6639.py
deleted file mode 100644
index b24c555c9..000000000
--- a/eos/effects/effect6639.py
+++ /dev/null
@@ -1,14 +0,0 @@
-# shipBonusSupercarrierA4FighterApplicationBonus
-#
-# Used by:
-# Ship: Revenant
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"),
-                                   "fighterAbilityMissilesExplosionRadius",
-                                   src.getModifiedItemAttr("shipBonusSupercarrierA4"), skill="Amarr Carrier")
-    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"),
-                                   "fighterAbilityAttackMissileExplosionRadius",
-                                   src.getModifiedItemAttr("shipBonusSupercarrierA4"), skill="Amarr Carrier")
diff --git a/eos/effects/effect6640.py b/eos/effects/effect6640.py
deleted file mode 100644
index 5931b824b..000000000
--- a/eos/effects/effect6640.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusRole1NumWarfareLinks
-#
-# Used by:
-# Ships from group: Titan (7 of 7)
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemIncrease(lambda mod: mod.item.requiresSkill("Leadership"), "maxGroupActive",
-                                     src.getModifiedItemAttr("shipBonusRole1"))
diff --git a/eos/effects/effect6641.py b/eos/effects/effect6641.py
deleted file mode 100644
index 1c07545cb..000000000
--- a/eos/effects/effect6641.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# shipBonusRole2ArmorPlates&ShieldExtendersBonus
-#
-# Used by:
-# Ships from group: Titan (7 of 7)
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Hull Upgrades"), "armorHPBonusAdd",
-                                  src.getModifiedItemAttr("shipBonusRole2"))
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Upgrades"), "capacityBonus",
-                                  src.getModifiedItemAttr("shipBonusRole2"))
diff --git a/eos/effects/effect6642.py b/eos/effects/effect6642.py
deleted file mode 100644
index 89e206f6d..000000000
--- a/eos/effects/effect6642.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# skillBonusDoomsdayRapidFiring
-#
-# Used by:
-# Skill: Doomsday Rapid Firing
-type = "passive"
-
-
-def handler(fit, src, context):
-    lvl = src.level
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Doomsday Operation"), "duration",
-                                  src.getModifiedItemAttr("rofBonus") * lvl)
diff --git a/eos/effects/effect6647.py b/eos/effects/effect6647.py
deleted file mode 100644
index f89d421c4..000000000
--- a/eos/effects/effect6647.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# shipBonusTitanA3WarpStrength
-#
-# Used by:
-# Variations of ship: Avatar (2 of 2)
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.ship.increaseItemAttr("warpScrambleStatus", src.getModifiedItemAttr("shipBonusTitanA3"), skill="Amarr Titan")
diff --git a/eos/effects/effect6648.py b/eos/effects/effect6648.py
deleted file mode 100644
index 2932f5fc1..000000000
--- a/eos/effects/effect6648.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# shipBonusTitanC3WarpStrength
-#
-# Used by:
-# Variations of ship: Leviathan (2 of 2)
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.ship.increaseItemAttr("warpScrambleStatus", src.getModifiedItemAttr("shipBonusTitanC3"), skill="Caldari Titan")
diff --git a/eos/effects/effect6649.py b/eos/effects/effect6649.py
deleted file mode 100644
index 460e39b5d..000000000
--- a/eos/effects/effect6649.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusTitanG3WarpStrength
-#
-# Used by:
-# Variations of ship: Erebus (2 of 2)
-# Ship: Komodo
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.ship.increaseItemAttr("warpScrambleStatus", src.getModifiedItemAttr("shipBonusTitanG3"), skill="Gallente Titan")
diff --git a/eos/effects/effect6650.py b/eos/effects/effect6650.py
deleted file mode 100644
index 2a56e6404..000000000
--- a/eos/effects/effect6650.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# shipBonusTitanM3WarpStrength
-#
-# Used by:
-# Ships from group: Titan (3 of 7)
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.ship.increaseItemAttr("warpScrambleStatus", src.getModifiedItemAttr("shipBonusTitanM3"), skill="Minmatar Titan")
diff --git a/eos/effects/effect6651.py b/eos/effects/effect6651.py
deleted file mode 100644
index a1697eec7..000000000
--- a/eos/effects/effect6651.py
+++ /dev/null
@@ -1,24 +0,0 @@
-# shipModuleAncillaryRemoteArmorRepairer
-#
-# Used by:
-# Modules from group: Ancillary Remote Armor Repairer (4 of 4)
-
-type = "projected", "active"
-runTime = "late"
-
-
-def handler(fit, module, context, **kwargs):
-    if "projected" not in context:
-        return
-
-    if module.charge and module.charge.name == "Nanite Repair Paste":
-        multiplier = 3
-    else:
-        multiplier = 1
-
-    amount = module.getModifiedItemAttr("armorDamageAmount") * multiplier
-    speed = module.getModifiedItemAttr("duration") / 1000.0
-    rps = amount / speed
-    fit.extraAttributes.increase("armorRepair", rps)
-    fit.extraAttributes.increase("armorRepairPreSpool", rps)
-    fit.extraAttributes.increase("armorRepairFullSpool", rps)
diff --git a/eos/effects/effect6652.py b/eos/effects/effect6652.py
deleted file mode 100644
index dc135bc0a..000000000
--- a/eos/effects/effect6652.py
+++ /dev/null
@@ -1,15 +0,0 @@
-# shipModuleAncillaryRemoteShieldBooster
-#
-# Used by:
-# Modules from group: Ancillary Remote Shield Booster (4 of 4)
-
-type = "projected", "active"
-runTime = "late"
-
-
-def handler(fit, module, context, **kwargs):
-    if "projected" not in context:
-        return
-    amount = module.getModifiedItemAttr("shieldBonus")
-    speed = module.getModifiedItemAttr("duration") / 1000.0
-    fit.extraAttributes.increase("shieldRepair", amount / speed, **kwargs)
diff --git a/eos/effects/effect6653.py b/eos/effects/effect6653.py
deleted file mode 100644
index 93084ad75..000000000
--- a/eos/effects/effect6653.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusTitanA2CapNeed
-#
-# Used by:
-# Ship: Avatar
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Energy Turret"), "capacitorNeed",
-                                  src.getModifiedItemAttr("shipBonusTitanA2"), skill="Amarr Titan")
diff --git a/eos/effects/effect6654.py b/eos/effects/effect6654.py
deleted file mode 100644
index 87c12394d..000000000
--- a/eos/effects/effect6654.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusTitanG2ROFBonus
-#
-# Used by:
-# Variations of ship: Erebus (2 of 2)
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Hybrid Turret"), "speed",
-                                  src.getModifiedItemAttr("shipBonusTitanG2"), skill="Gallente Titan")
diff --git a/eos/effects/effect6655.py b/eos/effects/effect6655.py
deleted file mode 100644
index 477698082..000000000
--- a/eos/effects/effect6655.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusTitanM2ROFBonus
-#
-# Used by:
-# Ship: Ragnarok
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Projectile Turret"), "speed",
-                                  src.getModifiedItemAttr("shipBonusTitanM2"), skill="Minmatar Titan")
diff --git a/eos/effects/effect6656.py b/eos/effects/effect6656.py
deleted file mode 100644
index 02023dc88..000000000
--- a/eos/effects/effect6656.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusRole3XLTorpdeoVelocityBonus
-#
-# Used by:
-# Variations of ship: Leviathan (2 of 2)
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Torpedoes"), "maxVelocity",
-                                    src.getModifiedItemAttr("shipBonusRole3"))
diff --git a/eos/effects/effect6657.py b/eos/effects/effect6657.py
deleted file mode 100644
index 13c64f8f2..000000000
--- a/eos/effects/effect6657.py
+++ /dev/null
@@ -1,26 +0,0 @@
-# shipBonusTitanC5AllDamageBonus
-#
-# Used by:
-# Ship: Leviathan
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Torpedoes"), "emDamage",
-                                    src.getModifiedItemAttr("shipBonusTitanC5"), skill="Caldari Titan")
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Torpedoes"), "explosiveDamage",
-                                    src.getModifiedItemAttr("shipBonusTitanC5"), skill="Caldari Titan")
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Torpedoes"), "thermalDamage",
-                                    src.getModifiedItemAttr("shipBonusTitanC5"), skill="Caldari Titan")
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("XL Cruise Missiles"), "explosiveDamage",
-                                    src.getModifiedItemAttr("shipBonusTitanC5"), skill="Caldari Titan")
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("XL Cruise Missiles"), "thermalDamage",
-                                    src.getModifiedItemAttr("shipBonusTitanC5"), skill="Caldari Titan")
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("XL Cruise Missiles"), "emDamage",
-                                    src.getModifiedItemAttr("shipBonusTitanC5"), skill="Caldari Titan")
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("XL Torpedoes"), "thermalDamage",
-                                    src.getModifiedItemAttr("shipBonusTitanC5"), skill="Caldari Titan")
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("XL Torpedoes"), "emDamage",
-                                    src.getModifiedItemAttr("shipBonusTitanC5"), skill="Caldari Titan")
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("XL Torpedoes"), "explosiveDamage",
-                                    src.getModifiedItemAttr("shipBonusTitanC5"), skill="Caldari Titan")
diff --git a/eos/effects/effect6658.py b/eos/effects/effect6658.py
deleted file mode 100644
index 09f0bd008..000000000
--- a/eos/effects/effect6658.py
+++ /dev/null
@@ -1,72 +0,0 @@
-# moduleBonusBastionModule
-#
-# Used by:
-# Module: Bastion Module I
-type = "active"
-runTime = "early"
-
-
-def handler(fit, src, context):
-    # Resistances
-    for layer, attrPrefix in (('shield', 'shield'), ('armor', 'armor'), ('hull', '')):
-        for damageType in ('Kinetic', 'Thermal', 'Explosive', 'Em'):
-            bonus = "%s%sDamageResonance" % (attrPrefix, damageType)
-            bonus = "%s%s" % (bonus[0].lower(), bonus[1:])
-            booster = "%s%sDamageResonance" % (layer, damageType)
-            penalize = False if layer == 'hull' else True
-            fit.ship.multiplyItemAttr(bonus, src.getModifiedItemAttr(booster),
-                                      stackingPenalties=penalize, penaltyGroup="preMul")
-
-    # Turrets
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Large Energy Turret") or
-                                              mod.item.requiresSkill("Large Hybrid Turret") or
-                                              mod.item.requiresSkill("Large Projectile Turret"),
-                                  "maxRange", src.getModifiedItemAttr("maxRangeBonus"),
-                                  stackingPenalties=True)
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Large Energy Turret") or
-                                              mod.item.requiresSkill("Large Hybrid Turret") or
-                                              mod.item.requiresSkill("Large Projectile Turret"),
-                                  "falloff", src.getModifiedItemAttr("falloffBonus"),
-                                  stackingPenalties=True)
-
-    # Missiles
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Torpedoes") or
-                                                mod.charge.requiresSkill("Cruise Missiles") or
-                                                mod.charge.requiresSkill("Heavy Missiles"),
-                                    "maxVelocity", src.getModifiedItemAttr("missileVelocityBonus"))
-
-    # Tanking
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Repair Systems"),
-                                  "armorDamageAmount", src.getModifiedItemAttr("armorDamageAmountBonus"),
-                                  stackingPenalties=True)
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Operation"),
-                                  "shieldBonus", src.getModifiedItemAttr("shieldBoostMultiplier"),
-                                  stackingPenalties=True)
-
-    # Speed penalty
-    fit.ship.boostItemAttr("maxVelocity", src.getModifiedItemAttr("speedFactor"))
-
-    # @todo: test these for April 2016 release
-    # Max locked targets
-    fit.ship.forceItemAttr("maxLockedTargets", src.getModifiedItemAttr("maxLockedTargets"))
-
-    # Block Hostile ewar
-    fit.ship.forceItemAttr("disallowOffensiveModifiers", src.getModifiedItemAttr("disallowOffensiveModifiers"))
-
-    # new with April 2016 release
-    for scanType in ('Magnetometric', 'Ladar', 'Gravimetric', 'Radar'):
-        fit.ship.boostItemAttr("scan{}Strength".format(scanType),
-                               src.getModifiedItemAttr("scan{}StrengthPercent".format(scanType)),
-                               stackingPenalties=True)
-
-    fit.ship.boostItemAttr("remoteRepairImpedance", src.getModifiedItemAttr("remoteRepairImpedanceBonus"))
-    fit.ship.boostItemAttr("remoteAssistanceImpedance", src.getModifiedItemAttr("remoteAssistanceImpedanceBonus"))
-    fit.ship.boostItemAttr("sensorDampenerResistance", src.getModifiedItemAttr("sensorDampenerResistanceBonus"))
-    fit.modules.filteredItemIncrease(lambda mod: mod.item.requiresSkill("Micro Jump Drive Operation"),
-                                     "activationBlocked", src.getModifiedItemAttr("activationBlockedStrenght"))
-    fit.ship.boostItemAttr("targetPainterResistance", src.getModifiedItemAttr("targetPainterResistanceBonus"))
-    fit.ship.boostItemAttr("weaponDisruptionResistance", src.getModifiedItemAttr("weaponDisruptionResistanceBonus"))
-    fit.ship.increaseItemAttr("warpScrambleStatus", src.getModifiedItemAttr("siegeModeWarpStatus"))
-
-    fit.ship.forceItemAttr("disallowDocking", src.getModifiedItemAttr("disallowDocking"))
-    fit.ship.forceItemAttr("disallowTethering", src.getModifiedItemAttr("disallowTethering"))
diff --git a/eos/effects/effect6661.py b/eos/effects/effect6661.py
deleted file mode 100644
index 63d22459a..000000000
--- a/eos/effects/effect6661.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusCarrierM3FighterVelocity
-#
-# Used by:
-# Ship: Nidhoggur
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"), "maxVelocity",
-                                   src.getModifiedItemAttr("shipBonusCarrierM3"), skill="Minmatar Carrier")
diff --git a/eos/effects/effect6662.py b/eos/effects/effect6662.py
deleted file mode 100644
index 4ad0965d0..000000000
--- a/eos/effects/effect6662.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusCarrierG3FighterHitpoints
-#
-# Used by:
-# Ship: Thanatos
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"), "shieldCapacity",
-                                   src.getModifiedItemAttr("shipBonusCarrierG3"), skill="Gallente Carrier")
diff --git a/eos/effects/effect6663.py b/eos/effects/effect6663.py
deleted file mode 100644
index d832d432b..000000000
--- a/eos/effects/effect6663.py
+++ /dev/null
@@ -1,22 +0,0 @@
-# skillBonusDroneInterfacing
-#
-# Used by:
-# Skill: Drone Interfacing
-type = "passive"
-
-
-def handler(fit, src, context):
-    lvl = src.level if "skill" in context else 1
-    fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill("Drones"), "damageMultiplier",
-                                 src.getModifiedItemAttr("damageMultiplierBonus") * lvl)
-    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"),
-                                   "fighterAbilityAttackMissileDamageMultiplier",
-                                   src.getModifiedItemAttr("damageMultiplierBonus") * lvl)
-    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"),
-                                   "fighterAbilityAttackTurretDamageMultiplier",
-                                   src.getModifiedItemAttr("damageMultiplierBonus") * lvl)
-    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"),
-                                   "fighterAbilityMissilesDamageMultiplier",
-                                   src.getModifiedItemAttr("damageMultiplierBonus") * lvl)
-    fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Mining Drone Operation"), "miningDroneAmountPercent",
-                                 src.getModifiedItemAttr("miningAmountBonus") * lvl)
diff --git a/eos/effects/effect6664.py b/eos/effects/effect6664.py
deleted file mode 100644
index ea0738dc1..000000000
--- a/eos/effects/effect6664.py
+++ /dev/null
@@ -1,19 +0,0 @@
-# skillBonusDroneSharpshooting
-#
-# Used by:
-# Skill: Drone Sharpshooting
-type = "passive"
-
-
-def handler(fit, src, context):
-    lvl = src.level if "skill" in context else 1
-    fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill("Drones"), "maxRange",
-                                 src.getModifiedItemAttr("rangeSkillBonus") * lvl)
-    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"), "fighterAbilityMissilesRange",
-                                   src.getModifiedItemAttr("rangeSkillBonus") * lvl)
-    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"),
-                                   "fighterAbilityAttackTurretRangeOptimal",
-                                   src.getModifiedItemAttr("rangeSkillBonus") * lvl)
-    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"),
-                                   "fighterAbilityAttackMissileRangeOptimal",
-                                   src.getModifiedItemAttr("rangeSkillBonus") * lvl)
diff --git a/eos/effects/effect6665.py b/eos/effects/effect6665.py
deleted file mode 100644
index f36e82a3f..000000000
--- a/eos/effects/effect6665.py
+++ /dev/null
@@ -1,17 +0,0 @@
-# skillBonusDroneDurability
-#
-# Used by:
-# Skill: Drone Durability
-type = "passive"
-
-
-def handler(fit, src, context):
-    lvl = src.level if "skill" in context else 1
-    fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill("Drones"), "hp",
-                                 src.getModifiedItemAttr("hullHpBonus") * lvl)
-    fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill("Drones"), "armorHP",
-                                 src.getModifiedItemAttr("armorHpBonus") * lvl)
-    fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill("Drones"), "shieldCapacity",
-                                 src.getModifiedItemAttr("shieldCapacityBonus") * lvl)
-    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"), "shieldCapacity",
-                                   src.getModifiedItemAttr("shieldCapacityBonus") * lvl)
diff --git a/eos/effects/effect6667.py b/eos/effects/effect6667.py
deleted file mode 100644
index 4f5dd8bc5..000000000
--- a/eos/effects/effect6667.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# skillBonusDroneNavigation
-#
-# Used by:
-# Skill: Drone Navigation
-type = "passive"
-
-
-def handler(fit, src, context):
-    lvl = src.level if "skill" in context else 1
-    fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill("Drones"), "maxVelocity",
-                                 src.getModifiedItemAttr("maxVelocityBonus") * lvl)
-    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"), "maxVelocity",
-                                   src.getModifiedItemAttr("maxVelocityBonus") * lvl)
diff --git a/eos/effects/effect6669.py b/eos/effects/effect6669.py
deleted file mode 100644
index 754bbf2f1..000000000
--- a/eos/effects/effect6669.py
+++ /dev/null
@@ -1,17 +0,0 @@
-# moduleBonusCapitalDroneDurabilityEnhancer
-#
-# Used by:
-# Variations of module: Capital Drone Durability Enhancer I (2 of 2)
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill("Drones"), "armorHP",
-                                 src.getModifiedItemAttr("hullHpBonus"))
-    fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill("Drones"), "hp",
-                                 src.getModifiedItemAttr("hullHpBonus"))
-    fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill("Drones"), "shieldCapacity",
-                                 src.getModifiedItemAttr("hullHpBonus"))
-    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"), "shieldCapacity",
-                                   src.getModifiedItemAttr("hullHpBonus"))
-    fit.ship.boostItemAttr("cpuOutput", src.getModifiedItemAttr("drawback"))
diff --git a/eos/effects/effect6670.py b/eos/effects/effect6670.py
deleted file mode 100644
index 68be67520..000000000
--- a/eos/effects/effect6670.py
+++ /dev/null
@@ -1,19 +0,0 @@
-# moduleBonusCapitalDroneScopeChip
-#
-# Used by:
-# Variations of module: Capital Drone Scope Chip I (2 of 2)
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill("Drones"), "maxRange",
-                                 src.getModifiedItemAttr("rangeSkillBonus"), stackingPenalties=True)
-    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"), "fighterAbilityMissilesRange",
-                                   src.getModifiedItemAttr("rangeSkillBonus"), stackingPenalties=True)
-    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"),
-                                   "fighterAbilityAttackTurretRangeOptimal", src.getModifiedItemAttr("rangeSkillBonus"),
-                                   stackingPenalties=True)
-    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"),
-                                   "fighterAbilityAttackMissileRangeOptimal",
-                                   src.getModifiedItemAttr("rangeSkillBonus"), stackingPenalties=True)
-    fit.ship.boostItemAttr("cpuOutput", src.getModifiedItemAttr("drawback"))
diff --git a/eos/effects/effect6671.py b/eos/effects/effect6671.py
deleted file mode 100644
index c98e00110..000000000
--- a/eos/effects/effect6671.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# moduleBonusCapitalDroneSpeedAugmentor
-#
-# Used by:
-# Variations of module: Capital Drone Speed Augmentor I (2 of 2)
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill("Drones"), "maxVelocity",
-                                 src.getModifiedItemAttr("droneMaxVelocityBonus"), stackingPenalties=True)
-    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"), "maxVelocity",
-                                   src.getModifiedItemAttr("droneMaxVelocityBonus"), stackingPenalties=True)
-    fit.ship.boostItemAttr("cpuOutput", src.getModifiedItemAttr("drawback"))
diff --git a/eos/effects/effect6672.py b/eos/effects/effect6672.py
deleted file mode 100644
index dcbc93d39..000000000
--- a/eos/effects/effect6672.py
+++ /dev/null
@@ -1,17 +0,0 @@
-runTime = "early"
-type = "passive"
-
-
-def handler(fit, module, context):
-    secModifier = module.getModifiedItemAttr("securityModifier")
-    module.multiplyItemAttr("structureRigDoomsdayDamageLossTargetBonus", secModifier)
-    module.multiplyItemAttr("structureRigScanResBonus", secModifier)
-    module.multiplyItemAttr("structureRigPDRangeBonus", secModifier)
-    module.multiplyItemAttr("structureRigPDCapUseBonus", secModifier)
-    module.multiplyItemAttr("structureRigMissileExploVeloBonus", secModifier)
-    module.multiplyItemAttr("structureRigMissileVelocityBonus", secModifier)
-    module.multiplyItemAttr("structureRigEwarOptimalBonus", secModifier)
-    module.multiplyItemAttr("structureRigEwarFalloffBonus", secModifier)
-    module.multiplyItemAttr("structureRigEwarCapUseBonus", secModifier)
-    module.multiplyItemAttr("structureRigMissileExplosionRadiusBonus", secModifier)
-    module.multiplyItemAttr("structureRigMaxTargetRangeBonus", secModifier)
diff --git a/eos/effects/effect6679.py b/eos/effects/effect6679.py
deleted file mode 100644
index e5c0d43c1..000000000
--- a/eos/effects/effect6679.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# skillStructureDoomsdayDurationBonus
-#
-# Used by:
-# Skill: Structure Doomsday Operation
-type = "passive", "structure"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Structure Doomsday Weapon",
-                                  "duration", src.getModifiedItemAttr("durationBonus"),
-                                  skill="Structure Doomsday Operation")
diff --git a/eos/effects/effect668.py b/eos/effects/effect668.py
deleted file mode 100644
index 4de267555..000000000
--- a/eos/effects/effect668.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# missileKineticDmgBonus2
-#
-# Used by:
-# Skills named like: Missiles (5 of 7)
-# Skill: Rockets
-# Skill: Torpedoes
-type = "passive"
-
-
-def handler(fit, skill, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill(skill),
-                                    "kineticDamage", skill.getModifiedItemAttr("damageMultiplierBonus") * skill.level)
diff --git a/eos/effects/effect6681.py b/eos/effects/effect6681.py
deleted file mode 100644
index 86889e55e..000000000
--- a/eos/effects/effect6681.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusRole3NumWarfareLinks
-#
-# Used by:
-# Ships from group: Force Auxiliary (6 of 6)
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemIncrease(lambda mod: mod.item.requiresSkill("Leadership"), "maxGroupActive",
-                                     src.getModifiedItemAttr("shipBonusRole3"))
diff --git a/eos/effects/effect6682.py b/eos/effects/effect6682.py
deleted file mode 100644
index 30040db35..000000000
--- a/eos/effects/effect6682.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# structureModuleEffectStasisWebifier
-#
-# Used by:
-# Structure Modules from group: Structure Stasis Webifier (2 of 2)
-type = "active", "projected"
-
-
-def handler(fit, module, context, *args, **kwargs):
-    if "projected" not in context:
-        return
-    fit.ship.boostItemAttr("maxVelocity", module.getModifiedItemAttr("speedFactor"),
-                           stackingPenalties=True, *args, **kwargs)
diff --git a/eos/effects/effect6683.py b/eos/effects/effect6683.py
deleted file mode 100644
index d89abe4b3..000000000
--- a/eos/effects/effect6683.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# structureModuleEffectTargetPainter
-#
-# Used by:
-# Variations of structure module: Standup Target Painter I (2 of 2)
-type = "projected", "active"
-
-
-def handler(fit, container, context, *args, **kwargs):
-    if "projected" in context:
-        fit.ship.boostItemAttr("signatureRadius", container.getModifiedItemAttr("signatureRadiusBonus"),
-                               stackingPenalties=True, *args, **kwargs)
diff --git a/eos/effects/effect6684.py b/eos/effects/effect6684.py
deleted file mode 100644
index 23cd49378..000000000
--- a/eos/effects/effect6684.py
+++ /dev/null
@@ -1,17 +0,0 @@
-# structureModuleEffectRemoteSensorDampener
-#
-# Used by:
-# Variations of structure module: Standup Remote Sensor Dampener I (2 of 2)
-
-type = "projected", "active"
-
-
-def handler(fit, module, context, *args, **kwargs):
-    if "projected" not in context:
-        return
-
-    fit.ship.boostItemAttr("maxTargetRange", module.getModifiedItemAttr("maxTargetRangeBonus"),
-                           stackingPenalties=True, *args, **kwargs)
-
-    fit.ship.boostItemAttr("scanResolution", module.getModifiedItemAttr("scanResolutionBonus"),
-                           stackingPenalties=True, *args, **kwargs)
diff --git a/eos/effects/effect6685.py b/eos/effects/effect6685.py
deleted file mode 100644
index a2725fb5e..000000000
--- a/eos/effects/effect6685.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# structureModuleEffectECM
-#
-# Used by:
-# Structure Modules from group: Structure ECM Battery (3 of 3)
-type = "projected", "active"
-
-
-def handler(fit, module, context):
-    if "projected" in context:
-        # jam formula: 1 - (1- (jammer str/ship str))^(# of jam mods with same str))
-        strModifier = 1 - module.getModifiedItemAttr("scan{0}StrengthBonus".format(fit.scanType)) / fit.scanStrength
-
-        fit.ecmProjectedStr *= strModifier
diff --git a/eos/effects/effect6686.py b/eos/effects/effect6686.py
deleted file mode 100644
index ff3f705ab..000000000
--- a/eos/effects/effect6686.py
+++ /dev/null
@@ -1,29 +0,0 @@
-# structureModuleEffectWeaponDisruption
-#
-# Used by:
-# Variations of structure module: Standup Weapon Disruptor I (2 of 2)
-
-type = "active", "projected"
-
-
-def handler(fit, module, context, *args, **kwargs):
-    if "projected" in context:
-        for srcAttr, tgtAttr in (
-                ("aoeCloudSizeBonus", "aoeCloudSize"),
-                ("aoeVelocityBonus", "aoeVelocity"),
-                ("missileVelocityBonus", "maxVelocity"),
-                ("explosionDelayBonus", "explosionDelay"),
-        ):
-            fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"),
-                                            tgtAttr, module.getModifiedItemAttr(srcAttr),
-                                            stackingPenalties=True, *args, **kwargs)
-
-        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Gunnery"),
-                                      "trackingSpeed", module.getModifiedItemAttr("trackingSpeedBonus"),
-                                      stackingPenalties=True, *args, **kwargs)
-        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Gunnery"),
-                                      "maxRange", module.getModifiedItemAttr("maxRangeBonus"),
-                                      stackingPenalties=True, *args, **kwargs)
-        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Gunnery"),
-                                      "falloff", module.getModifiedItemAttr("falloffBonus"),
-                                      stackingPenalties=True, *args, **kwargs)
diff --git a/eos/effects/effect6687.py b/eos/effects/effect6687.py
deleted file mode 100644
index e74505c96..000000000
--- a/eos/effects/effect6687.py
+++ /dev/null
@@ -1,15 +0,0 @@
-# npcEntityRemoteArmorRepairer
-#
-# Used by:
-# Drones named like: Armor Maintenance Bot (6 of 6)
-type = "projected", "active"
-
-
-def handler(fit, container, context):
-    if "projected" in context:
-        bonus = container.getModifiedItemAttr("armorDamageAmount")
-        duration = container.getModifiedItemAttr("duration") / 1000.0
-        rps = bonus / duration
-        fit.extraAttributes.increase("armorRepair", rps)
-        fit.extraAttributes.increase("armorRepairPreSpool", rps)
-        fit.extraAttributes.increase("armorRepairFullSpool", rps)
diff --git a/eos/effects/effect6688.py b/eos/effects/effect6688.py
deleted file mode 100644
index 35e49b9d5..000000000
--- a/eos/effects/effect6688.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# npcEntityRemoteShieldBooster
-#
-# Used by:
-# Drones named like: Shield Maintenance Bot (6 of 6)
-type = "projected", "active"
-
-
-def handler(fit, container, context):
-    if "projected" in context:
-        bonus = container.getModifiedItemAttr("shieldBonus")
-        duration = container.getModifiedItemAttr("duration") / 1000.0
-        fit.extraAttributes.increase("shieldRepair", bonus / duration)
diff --git a/eos/effects/effect6689.py b/eos/effects/effect6689.py
deleted file mode 100644
index b3d935bc9..000000000
--- a/eos/effects/effect6689.py
+++ /dev/null
@@ -1,14 +0,0 @@
-# npcEntityRemoteHullRepairer
-#
-# Used by:
-# Drones named like: Hull Maintenance Bot (6 of 6)
-type = "projected", "active"
-runTime = "late"
-
-
-def handler(fit, module, context):
-    if "projected" not in context:
-        return
-    bonus = module.getModifiedItemAttr("structureDamageAmount")
-    duration = module.getModifiedItemAttr("duration") / 1000.0
-    fit.extraAttributes.increase("hullRepair", bonus / duration)
diff --git a/eos/effects/effect6690.py b/eos/effects/effect6690.py
deleted file mode 100644
index ca4b34de7..000000000
--- a/eos/effects/effect6690.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# remoteWebifierEntity
-#
-# Used by:
-# Drones from group: Stasis Webifying Drone (3 of 3)
-type = "active", "projected"
-
-
-def handler(fit, module, context, *args, **kwargs):
-    if "projected" not in context:
-        return
-    fit.ship.boostItemAttr("maxVelocity", module.getModifiedItemAttr("speedFactor"),
-                           stackingPenalties=True, *args, **kwargs)
diff --git a/eos/effects/effect6691.py b/eos/effects/effect6691.py
deleted file mode 100644
index ade55d190..000000000
--- a/eos/effects/effect6691.py
+++ /dev/null
@@ -1,20 +0,0 @@
-# entityEnergyNeutralizerFalloff
-#
-# Used by:
-# Drones from group: Energy Neutralizer Drone (3 of 3)
-from eos.const import FittingModuleState
-from eos.modifiedAttributeDict import ModifiedAttributeDict
-
-type = "active", "projected"
-
-
-def handler(fit, src, context, **kwargs):
-    if "projected" in context and ((hasattr(src, "state") and src.state >= FittingModuleState.ACTIVE) or
-                                   hasattr(src, "amountActive")):
-        amount = src.getModifiedItemAttr("energyNeutralizerAmount")
-        time = src.getModifiedItemAttr("energyNeutralizerDuration")
-
-        if 'effect' in kwargs:
-            amount *= ModifiedAttributeDict.getResistance(fit, kwargs['effect'])
-
-        fit.addDrain(src, time, amount, 0)
diff --git a/eos/effects/effect6692.py b/eos/effects/effect6692.py
deleted file mode 100644
index 07b8c9169..000000000
--- a/eos/effects/effect6692.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# remoteTargetPaintEntity
-#
-# Used by:
-# Drones named like: TP (3 of 3)
-type = "projected", "active"
-
-
-def handler(fit, container, context, *args, **kwargs):
-    if "projected" in context:
-        fit.ship.boostItemAttr("signatureRadius", container.getModifiedItemAttr("signatureRadiusBonus"),
-                               stackingPenalties=True, *args, **kwargs)
diff --git a/eos/effects/effect6693.py b/eos/effects/effect6693.py
deleted file mode 100644
index 642b55411..000000000
--- a/eos/effects/effect6693.py
+++ /dev/null
@@ -1,16 +0,0 @@
-# remoteSensorDampEntity
-#
-# Used by:
-# Drones named like: SD (3 of 3)
-type = "projected", "active"
-
-
-def handler(fit, module, context, *args, **kwargs):
-    if "projected" not in context:
-        return
-
-    fit.ship.boostItemAttr("maxTargetRange", module.getModifiedItemAttr("maxTargetRangeBonus"),
-                           stackingPenalties=True, *args, **kwargs)
-
-    fit.ship.boostItemAttr("scanResolution", module.getModifiedItemAttr("scanResolutionBonus"),
-                           stackingPenalties=True, *args, **kwargs)
diff --git a/eos/effects/effect6694.py b/eos/effects/effect6694.py
deleted file mode 100644
index 28661af18..000000000
--- a/eos/effects/effect6694.py
+++ /dev/null
@@ -1,18 +0,0 @@
-# npcEntityWeaponDisruptor
-#
-# Used by:
-# Drones named like: TD (3 of 3)
-type = "projected", "active"
-
-
-def handler(fit, module, context, *args, **kwargs):
-    if "projected" in context:
-        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Gunnery"),
-                                      "trackingSpeed", module.getModifiedItemAttr("trackingSpeedBonus"),
-                                      stackingPenalties=True, *args, **kwargs)
-        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Gunnery"),
-                                      "maxRange", module.getModifiedItemAttr("maxRangeBonus"),
-                                      stackingPenalties=True, *args, **kwargs)
-        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Gunnery"),
-                                      "falloff", module.getModifiedItemAttr("falloffBonus"),
-                                      stackingPenalties=True, *args, **kwargs)
diff --git a/eos/effects/effect6695.py b/eos/effects/effect6695.py
deleted file mode 100644
index 9e382a641..000000000
--- a/eos/effects/effect6695.py
+++ /dev/null
@@ -1,18 +0,0 @@
-# entityECMFalloff
-#
-# Used by:
-# Drones named like: EC (3 of 3)
-from eos.modifiedAttributeDict import ModifiedAttributeDict
-
-type = "projected", "active"
-
-
-def handler(fit, module, context, **kwargs):
-    if "projected" in context:
-        # jam formula: 1 - (1- (jammer str/ship str))^(# of jam mods with same str))
-        strModifier = 1 - module.getModifiedItemAttr("scan{0}StrengthBonus".format(fit.scanType)) / fit.scanStrength
-
-        if 'effect' in kwargs:
-            strModifier *= ModifiedAttributeDict.getResistance(fit, kwargs['effect'])
-
-        fit.ecmProjectedStr *= strModifier
diff --git a/eos/effects/effect6697.py b/eos/effects/effect6697.py
deleted file mode 100644
index 312e04d7a..000000000
--- a/eos/effects/effect6697.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# rigDrawbackReductionArmor
-#
-# Used by:
-# Skill: Armor Rigging
-type = "passive"
-
-
-def handler(fit, src, context):
-    lvl = src.level
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Rig Armor", "drawback",
-                                  src.getModifiedItemAttr("rigDrawbackBonus") * lvl)
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Rig Resource Processing", "drawback",
-                                  src.getModifiedItemAttr("rigDrawbackBonus") * lvl)
diff --git a/eos/effects/effect6698.py b/eos/effects/effect6698.py
deleted file mode 100644
index 679e381eb..000000000
--- a/eos/effects/effect6698.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# rigDrawbackReductionAstronautics
-#
-# Used by:
-# Skill: Astronautics Rigging
-type = "passive"
-
-
-def handler(fit, src, context):
-    lvl = src.level
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Rig Navigation", "drawback",
-                                  src.getModifiedItemAttr("rigDrawbackBonus") * lvl)
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Rig Anchor", "drawback",
-                                  src.getModifiedItemAttr("rigDrawbackBonus") * lvl)
diff --git a/eos/effects/effect6699.py b/eos/effects/effect6699.py
deleted file mode 100644
index 1761fae59..000000000
--- a/eos/effects/effect6699.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# rigDrawbackReductionDrones
-#
-# Used by:
-# Skill: Drones Rigging
-type = "passive"
-
-
-def handler(fit, src, context):
-    lvl = src.level
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Rig Drones", "drawback",
-                                  src.getModifiedItemAttr("rigDrawbackBonus") * lvl)
diff --git a/eos/effects/effect67.py b/eos/effects/effect67.py
deleted file mode 100644
index 1351132dd..000000000
--- a/eos/effects/effect67.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# miningLaser
-#
-# Used by:
-# Modules from group: Frequency Mining Laser (3 of 3)
-# Modules from group: Mining Laser (15 of 15)
-# Modules from group: Strip Miner (5 of 5)
-# Module: Citizen Miner
-type = 'active'
-
-
-def handler(fit, module, context):
-    # Set reload time to 1 second
-    module.reloadTime = 1000
diff --git a/eos/effects/effect670.py b/eos/effects/effect670.py
deleted file mode 100644
index 6a3165c0a..000000000
--- a/eos/effects/effect670.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# antiWarpScramblingPassive
-#
-# Used by:
-# Modules from group: Warp Core Stabilizer (8 of 8)
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.ship.increaseItemAttr("warpScrambleStatus", module.getModifiedItemAttr("warpScrambleStrength"))
diff --git a/eos/effects/effect6700.py b/eos/effects/effect6700.py
deleted file mode 100644
index 7e27b8d0b..000000000
--- a/eos/effects/effect6700.py
+++ /dev/null
@@ -1,15 +0,0 @@
-# rigDrawbackReductionElectronic
-#
-# Used by:
-# Skill: Electronic Superiority Rigging
-type = "passive"
-
-
-def handler(fit, src, context):
-    lvl = src.level
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Rig Electronic Systems", "drawback",
-                                  src.getModifiedItemAttr("rigDrawbackBonus") * lvl)
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Rig Scanning", "drawback",
-                                  src.getModifiedItemAttr("rigDrawbackBonus") * lvl)
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Rig Targeting", "drawback",
-                                  src.getModifiedItemAttr("rigDrawbackBonus") * lvl)
diff --git a/eos/effects/effect6701.py b/eos/effects/effect6701.py
deleted file mode 100644
index c6c339041..000000000
--- a/eos/effects/effect6701.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# rigDrawbackReductionProjectile
-#
-# Used by:
-# Skill: Projectile Weapon Rigging
-type = "passive"
-
-
-def handler(fit, src, context):
-    lvl = src.level
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Rig Projectile Weapon", "drawback",
-                                  src.getModifiedItemAttr("rigDrawbackBonus") * lvl)
diff --git a/eos/effects/effect6702.py b/eos/effects/effect6702.py
deleted file mode 100644
index 9d99e3513..000000000
--- a/eos/effects/effect6702.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# rigDrawbackReductionEnergyWeapon
-#
-# Used by:
-# Skill: Energy Weapon Rigging
-type = "passive"
-
-
-def handler(fit, src, context):
-    lvl = src.level
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Rig Energy Weapon", "drawback",
-                                  src.getModifiedItemAttr("rigDrawbackBonus") * lvl)
diff --git a/eos/effects/effect6703.py b/eos/effects/effect6703.py
deleted file mode 100644
index b7ffc0955..000000000
--- a/eos/effects/effect6703.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# rigDrawbackReductionHybrid
-#
-# Used by:
-# Skill: Hybrid Weapon Rigging
-type = "passive"
-
-
-def handler(fit, src, context):
-    lvl = src.level
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Rig Hybrid Weapon", "drawback",
-                                  src.getModifiedItemAttr("rigDrawbackBonus") * lvl)
diff --git a/eos/effects/effect6704.py b/eos/effects/effect6704.py
deleted file mode 100644
index 04276c9b9..000000000
--- a/eos/effects/effect6704.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# rigDrawbackReductionLauncher
-#
-# Used by:
-# Skill: Launcher Rigging
-type = "passive"
-
-
-def handler(fit, src, context):
-    lvl = src.level
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Rig Launcher", "drawback",
-                                  src.getModifiedItemAttr("rigDrawbackBonus") * lvl)
diff --git a/eos/effects/effect6705.py b/eos/effects/effect6705.py
deleted file mode 100644
index fa2f75f88..000000000
--- a/eos/effects/effect6705.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# rigDrawbackReductionShield
-#
-# Used by:
-# Skill: Shield Rigging
-type = "passive"
-
-
-def handler(fit, src, context):
-    lvl = src.level
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Rig Shield", "drawback",
-                                  src.getModifiedItemAttr("rigDrawbackBonus") * lvl)
diff --git a/eos/effects/effect6706.py b/eos/effects/effect6706.py
deleted file mode 100644
index 853626c7d..000000000
--- a/eos/effects/effect6706.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# setBonusAsklepian
-#
-# Used by:
-# Implants named like: grade Asklepian (18 of 18)
-runTime = "early"
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.appliedImplants.filteredItemMultiply(lambda mod: mod.item.requiresSkill("Cybernetics"),
-                                             "armorRepairBonus", src.getModifiedItemAttr("implantSetSerpentis2"))
diff --git a/eos/effects/effect6708.py b/eos/effects/effect6708.py
deleted file mode 100644
index 725c43f33..000000000
--- a/eos/effects/effect6708.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# armorRepairAmountBonusSubcap
-#
-# Used by:
-# Implants named like: grade Asklepian (15 of 18)
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Repair Systems"),
-                                  "armorDamageAmount", src.getModifiedItemAttr("armorRepairBonus"))
diff --git a/eos/effects/effect6709.py b/eos/effects/effect6709.py
deleted file mode 100644
index 4144b30b4..000000000
--- a/eos/effects/effect6709.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusRole1CapitalHybridDamageBonus
-#
-# Used by:
-# Ship: Vehement
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Hybrid Turret"),
-                                  "damageMultiplier", ship.getModifiedItemAttr("shipBonusRole1"))
diff --git a/eos/effects/effect6710.py b/eos/effects/effect6710.py
deleted file mode 100644
index c822336ba..000000000
--- a/eos/effects/effect6710.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusDreadnoughtM1WebStrengthBonus
-#
-# Used by:
-# Ship: Vehement
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Stasis Web", "speedFactor",
-                                  src.getModifiedItemAttr("shipBonusDreadnoughtM1"), skill="Minmatar Dreadnought")
diff --git a/eos/effects/effect6711.py b/eos/effects/effect6711.py
deleted file mode 100644
index c79148d3e..000000000
--- a/eos/effects/effect6711.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusRole3CapitalHybridDamageBonus
-#
-# Used by:
-# Ship: Vanquisher
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Hybrid Turret"), "damageMultiplier",
-                                  src.getModifiedItemAttr("shipBonusRole3"))
diff --git a/eos/effects/effect6712.py b/eos/effects/effect6712.py
deleted file mode 100644
index 54ba011c7..000000000
--- a/eos/effects/effect6712.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusTitanM1WebStrengthBonus
-#
-# Used by:
-# Ship: Vanquisher
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Stasis Web", "speedFactor",
-                                  src.getModifiedItemAttr("shipBonusTitanM1"), skill="Minmatar Titan")
diff --git a/eos/effects/effect6713.py b/eos/effects/effect6713.py
deleted file mode 100644
index 534d7357c..000000000
--- a/eos/effects/effect6713.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipBonusSupercarrierM1BurstProjectorWebBonus
-#
-# Used by:
-# Ship: Hel
-# Ship: Vendetta
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Burst Projector Operation"), "speedFactor",
-                                  src.getModifiedItemAttr("shipBonusSupercarrierM1"), skill="Minmatar Carrier")
diff --git a/eos/effects/effect6714.py b/eos/effects/effect6714.py
deleted file mode 100644
index f21b89391..000000000
--- a/eos/effects/effect6714.py
+++ /dev/null
@@ -1,18 +0,0 @@
-# ECMBurstJammer
-#
-# Used by:
-# Modules from group: Burst Jammer (11 of 11)
-from eos.modifiedAttributeDict import ModifiedAttributeDict
-
-type = "projected", "active"
-
-
-def handler(fit, module, context, **kwargs):
-    if "projected" in context:
-        # jam formula: 1 - (1- (jammer str/ship str))^(# of jam mods with same str))
-        strModifier = 1 - module.getModifiedItemAttr("scan{0}StrengthBonus".format(fit.scanType)) / fit.scanStrength
-
-        if 'effect' in kwargs:
-            strModifier *= ModifiedAttributeDict.getResistance(fit, kwargs['effect'])
-
-        fit.ecmProjectedStr *= strModifier
diff --git a/eos/effects/effect6717.py b/eos/effects/effect6717.py
deleted file mode 100644
index f2dfdf612..000000000
--- a/eos/effects/effect6717.py
+++ /dev/null
@@ -1,16 +0,0 @@
-# roleBonusIceOreMiningDurationCap
-#
-# Used by:
-# Variations of ship: Covetor (2 of 2)
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Mining"), "capacitorNeed",
-                                  src.getModifiedItemAttr("miningDurationRoleBonus"))
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Mining"), "duration",
-                                  src.getModifiedItemAttr("miningDurationRoleBonus"))
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Ice Harvesting"), "duration",
-                                  src.getModifiedItemAttr("miningDurationRoleBonus"))
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Ice Harvesting"), "capacitorNeed",
-                                  src.getModifiedItemAttr("miningDurationRoleBonus"))
diff --git a/eos/effects/effect6720.py b/eos/effects/effect6720.py
deleted file mode 100644
index 77cc9a69d..000000000
--- a/eos/effects/effect6720.py
+++ /dev/null
@@ -1,14 +0,0 @@
-# shipBonusDroneRepairMC1
-#
-# Used by:
-# Ship: Rabisu
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill("Drones"), "shieldBonus",
-                                 src.getModifiedItemAttr("shipBonusMC"), skill="Minmatar Cruiser")
-    fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill("Drones"), "structureDamageAmount",
-                                 src.getModifiedItemAttr("shipBonusMC"), skill="Minmatar Cruiser")
-    fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill("Drones"), "armorDamageAmount",
-                                 src.getModifiedItemAttr("shipBonusMC"), skill="Minmatar Cruiser")
diff --git a/eos/effects/effect6721.py b/eos/effects/effect6721.py
deleted file mode 100644
index cacbd4478..000000000
--- a/eos/effects/effect6721.py
+++ /dev/null
@@ -1,16 +0,0 @@
-# eliteBonusLogisticRemoteArmorRepairOptimalFalloff1
-#
-# Used by:
-# Ship: Rabisu
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Remote Armor Repair Systems"),
-                                  "falloffEffectiveness",
-                                  src.getModifiedItemAttr("eliteBonusLogistics1"),
-                                  skill="Logistics Cruisers")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Remote Armor Repair Systems"),
-                                  "maxRange",
-                                  src.getModifiedItemAttr("eliteBonusLogistics1"),
-                                  skill="Logistics Cruisers")
diff --git a/eos/effects/effect6722.py b/eos/effects/effect6722.py
deleted file mode 100644
index fae8acfac..000000000
--- a/eos/effects/effect6722.py
+++ /dev/null
@@ -1,14 +0,0 @@
-# roleBonusRemoteArmorRepairOptimalFalloff
-#
-# Used by:
-# Ship: Rabisu
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Remote Armor Repair Systems"),
-                                  "falloffEffectiveness",
-                                  src.getModifiedItemAttr("roleBonusRepairRange"))
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Remote Armor Repair Systems"),
-                                  "maxRange",
-                                  src.getModifiedItemAttr("roleBonusRepairRange"))
diff --git a/eos/effects/effect6723.py b/eos/effects/effect6723.py
deleted file mode 100644
index ac83921f0..000000000
--- a/eos/effects/effect6723.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusCloakCpuMC2
-#
-# Used by:
-# Ship: Rabisu
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Cloaking"), "cpu",
-                                  src.getModifiedItemAttr("shipBonusMC2"), skill="Minmatar Cruiser")
diff --git a/eos/effects/effect6724.py b/eos/effects/effect6724.py
deleted file mode 100644
index 5c9b24c1c..000000000
--- a/eos/effects/effect6724.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# eliteBonusLogisticRemoteArmorRepairDuration3
-#
-# Used by:
-# Ship: Rabisu
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Remote Armor Repair Systems"), "duration",
-                                  src.getModifiedItemAttr("eliteBonusLogistics3"), skill="Logistics Cruisers")
diff --git a/eos/effects/effect6725.py b/eos/effects/effect6725.py
deleted file mode 100644
index 9c6f67d13..000000000
--- a/eos/effects/effect6725.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusSETFalloffAF2
-#
-# Used by:
-# Ship: Caedes
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Energy Turret"), "falloff",
-                                  src.getModifiedItemAttr("shipBonus2AF"), skill="Amarr Frigate")
diff --git a/eos/effects/effect6726.py b/eos/effects/effect6726.py
deleted file mode 100644
index fe201e1df..000000000
--- a/eos/effects/effect6726.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusCloakCpuMF1
-#
-# Used by:
-# Ship: Caedes
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Cloaking"), "cpu",
-                                  src.getModifiedItemAttr("shipBonusMF"), skill="Minmatar Frigate")
diff --git a/eos/effects/effect6727.py b/eos/effects/effect6727.py
deleted file mode 100644
index 8c142334a..000000000
--- a/eos/effects/effect6727.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# eliteBonusCoverOpsNOSNeutFalloff1
-#
-# Used by:
-# Ship: Caedes
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name in ("Energy Nosferatu", "Energy Neutralizer"),
-                                  "falloffEffectiveness", src.getModifiedItemAttr("eliteBonusCovertOps1"),
-                                  stackingPenalties=True, skill="Covert Ops")
diff --git a/eos/effects/effect6730.py b/eos/effects/effect6730.py
deleted file mode 100644
index 70478fa71..000000000
--- a/eos/effects/effect6730.py
+++ /dev/null
@@ -1,16 +0,0 @@
-# moduleBonusMicrowarpdrive
-#
-# Used by:
-# Modules from group: Propulsion Module (68 of 133)
-type = "active"
-runTime = "late"
-
-
-def handler(fit, module, context):
-    fit.ship.increaseItemAttr("mass", module.getModifiedItemAttr("massAddition"))
-    speedBoost = module.getModifiedItemAttr("speedFactor")
-    mass = fit.ship.getModifiedItemAttr("mass")
-    thrust = module.getModifiedItemAttr("speedBoostFactor")
-    fit.ship.boostItemAttr("maxVelocity", speedBoost * thrust / mass)
-    fit.ship.boostItemAttr("signatureRadius", module.getModifiedItemAttr("signatureRadiusBonus"),
-                           stackingPenalties=True)
diff --git a/eos/effects/effect6731.py b/eos/effects/effect6731.py
deleted file mode 100644
index 71f4c96b1..000000000
--- a/eos/effects/effect6731.py
+++ /dev/null
@@ -1,14 +0,0 @@
-# moduleBonusAfterburner
-#
-# Used by:
-# Modules from group: Propulsion Module (65 of 133)
-type = "active"
-runTime = "late"
-
-
-def handler(fit, module, context):
-    fit.ship.increaseItemAttr("mass", module.getModifiedItemAttr("massAddition"))
-    speedBoost = module.getModifiedItemAttr("speedFactor")
-    mass = fit.ship.getModifiedItemAttr("mass")
-    thrust = module.getModifiedItemAttr("speedBoostFactor")
-    fit.ship.boostItemAttr("maxVelocity", speedBoost * thrust / mass)
diff --git a/eos/effects/effect6732.py b/eos/effects/effect6732.py
deleted file mode 100644
index c7cf29ce3..000000000
--- a/eos/effects/effect6732.py
+++ /dev/null
@@ -1,25 +0,0 @@
-# moduleBonusWarfareLinkArmor
-#
-# Used by:
-# Variations of module: Armor Command Burst I (2 of 2)
-
-"""
-Some documentation:
-When the fit is calculated, we gather up all the gang effects and stick them onto the fit. We don't run the actual
-effect yet, only give the fit details so that it can run the effect at a later time. We need to do this so that we can
-only run the strongest effect. When we are done, one of the last things that we do with the fit is to loop through those
-bonuses and actually run the effect. To do this, we have a special argument passed into the effect handler that tells it
-which warfareBuffID to run (shouldn't need this right now, but better safe than sorry)
-"""
-
-type = "active", "gang"
-
-
-def handler(fit, module, context, **kwargs):
-    for x in range(1, 5):
-        if module.getModifiedChargeAttr("warfareBuff{}ID".format(x)):
-            value = module.getModifiedItemAttr("warfareBuff{}Value".format(x))
-            id = module.getModifiedChargeAttr("warfareBuff{}ID".format(x))
-
-            if id:
-                fit.addCommandBonus(id, value, module, kwargs['effect'])
diff --git a/eos/effects/effect6733.py b/eos/effects/effect6733.py
deleted file mode 100644
index 45cd0ac6f..000000000
--- a/eos/effects/effect6733.py
+++ /dev/null
@@ -1,16 +0,0 @@
-# moduleBonusWarfareLinkShield
-#
-# Used by:
-# Variations of module: Shield Command Burst I (2 of 2)
-
-type = "active", "gang"
-
-
-def handler(fit, module, context, **kwargs):
-    for x in range(1, 5):
-        if module.getModifiedChargeAttr("warfareBuff{}ID".format(x)):
-            value = module.getModifiedItemAttr("warfareBuff{}Value".format(x))
-            id = module.getModifiedChargeAttr("warfareBuff{}ID".format(x))
-
-            if id:
-                fit.addCommandBonus(id, value, module, kwargs['effect'])
diff --git a/eos/effects/effect6734.py b/eos/effects/effect6734.py
deleted file mode 100644
index fc400c791..000000000
--- a/eos/effects/effect6734.py
+++ /dev/null
@@ -1,16 +0,0 @@
-# moduleBonusWarfareLinkSkirmish
-#
-# Used by:
-# Variations of module: Skirmish Command Burst I (2 of 2)
-
-type = "active", "gang"
-
-
-def handler(fit, module, context, **kwargs):
-    for x in range(1, 5):
-        if module.getModifiedChargeAttr("warfareBuff{}ID".format(x)):
-            value = module.getModifiedItemAttr("warfareBuff{}Value".format(x))
-            id = module.getModifiedChargeAttr("warfareBuff{}ID".format(x))
-
-            if id:
-                fit.addCommandBonus(id, value, module, kwargs['effect'])
diff --git a/eos/effects/effect6735.py b/eos/effects/effect6735.py
deleted file mode 100644
index dd1e1111b..000000000
--- a/eos/effects/effect6735.py
+++ /dev/null
@@ -1,16 +0,0 @@
-# moduleBonusWarfareLinkInfo
-#
-# Used by:
-# Variations of module: Information Command Burst I (2 of 2)
-
-type = "active", "gang"
-
-
-def handler(fit, module, context, **kwargs):
-    for x in range(1, 5):
-        if module.getModifiedChargeAttr("warfareBuff{}ID".format(x)):
-            value = module.getModifiedItemAttr("warfareBuff{}Value".format(x))
-            id = module.getModifiedChargeAttr("warfareBuff{}ID".format(x))
-
-            if id:
-                fit.addCommandBonus(id, value, module, kwargs['effect'])
diff --git a/eos/effects/effect6736.py b/eos/effects/effect6736.py
deleted file mode 100644
index 55876bc34..000000000
--- a/eos/effects/effect6736.py
+++ /dev/null
@@ -1,16 +0,0 @@
-# moduleBonusWarfareLinkMining
-#
-# Used by:
-# Variations of module: Mining Foreman Burst I (2 of 2)
-
-type = "active", "gang"
-
-
-def handler(fit, module, context, **kwargs):
-    for x in range(1, 5):
-        if module.getModifiedChargeAttr("warfareBuff{}ID".format(x)):
-            value = module.getModifiedItemAttr("warfareBuff{}Value".format(x))
-            id = module.getModifiedChargeAttr("warfareBuff{}ID".format(x))
-
-            if id:
-                fit.addCommandBonus(id, value, module, kwargs['effect'])
diff --git a/eos/effects/effect6737.py b/eos/effects/effect6737.py
deleted file mode 100644
index b0998fbb4..000000000
--- a/eos/effects/effect6737.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# chargeBonusWarfareCharge
-#
-# Used by:
-# Items from market group: Ammunition & Charges > Command Burst Charges (15 of 15)
-type = "active"
-
-
-def handler(fit, module, context):
-    for x in range(1, 4):
-        value = module.getModifiedChargeAttr("warfareBuff{}Multiplier".format(x))
-        module.multiplyItemAttr("warfareBuff{}Value".format(x), value)
diff --git a/eos/effects/effect675.py b/eos/effects/effect675.py
deleted file mode 100644
index 9fcfb86fe..000000000
--- a/eos/effects/effect675.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# weaponUpgradesCpuNeedBonusPostPercentCpuLocationShipModulesRequiringEnergyPulseWeapons
-#
-# Used by:
-# Skill: Weapon Upgrades
-type = "passive"
-
-
-def handler(fit, skill, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Energy Pulse Weapons"),
-                                  "cpu", skill.getModifiedItemAttr("cpuNeedBonus") * skill.level)
diff --git a/eos/effects/effect6753.py b/eos/effects/effect6753.py
deleted file mode 100644
index 741de5ba4..000000000
--- a/eos/effects/effect6753.py
+++ /dev/null
@@ -1,15 +0,0 @@
-# moduleTitanEffectGenerator
-#
-# Used by:
-# Modules from group: Titan Phenomena Generator (4 of 4)
-type = "active", "gang"
-
-
-def handler(fit, module, context, **kwargs):
-    for x in range(1, 5):
-        if module.getModifiedItemAttr("warfareBuff{}ID".format(x)):
-            value = module.getModifiedItemAttr("warfareBuff{}Value".format(x))
-            id = module.getModifiedItemAttr("warfareBuff{}ID".format(x))
-
-            if id:
-                fit.addCommandBonus(id, value, module, kwargs['effect'])
diff --git a/eos/effects/effect6762.py b/eos/effects/effect6762.py
deleted file mode 100644
index fe8cdff5a..000000000
--- a/eos/effects/effect6762.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# miningDroneSpecBonus
-#
-# Used by:
-# Skill: Mining Drone Specialization
-type = "passive"
-
-
-def handler(fit, src, context):
-    lvl = src.level
-    fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill("Mining Drone Specialization"), "miningAmount",
-                                 src.getModifiedItemAttr("miningAmountBonus") * lvl)
-    fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill("Mining Drone Specialization"), "maxVelocity",
-                                 src.getModifiedItemAttr("maxVelocityBonus") * lvl)
diff --git a/eos/effects/effect6763.py b/eos/effects/effect6763.py
deleted file mode 100644
index 9cd10d66a..000000000
--- a/eos/effects/effect6763.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# iceHarvestingDroneOperationDurationBonus
-#
-# Used by:
-# Modules named like: Drone Mining Augmentor (8 of 8)
-# Skill: Ice Harvesting Drone Operation
-type = "passive"
-
-
-def handler(fit, src, context):
-    lvl = src.level if "skill" in context else 1
-    fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill("Ice Harvesting Drone Operation"), "duration", src.getModifiedItemAttr("rofBonus") * lvl)
diff --git a/eos/effects/effect6764.py b/eos/effects/effect6764.py
deleted file mode 100644
index 18af9f3b1..000000000
--- a/eos/effects/effect6764.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# iceHarvestingDroneSpecBonus
-#
-# Used by:
-# Skill: Ice Harvesting Drone Specialization
-type = "passive"
-
-
-def handler(fit, src, context):
-    lvl = src.level
-    fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill("Ice Harvesting Drone Specialization"), "duration",
-                                 src.getModifiedItemAttr("rofBonus") * lvl)
-    fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill("Ice Harvesting Drone Specialization"),
-                                 "maxVelocity", src.getModifiedItemAttr("maxVelocityBonus") * lvl)
diff --git a/eos/effects/effect6765.py b/eos/effects/effect6765.py
deleted file mode 100644
index b127ae30d..000000000
--- a/eos/effects/effect6765.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# spatialPhenomenaGenerationDurationBonus
-#
-# Used by:
-# Skill: Spatial Phenomena Generation
-type = "passive"
-
-
-def handler(fit, src, context):
-    lvl = src.level
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Spatial Phenomena Generation"), "buffDuration",
-                                  src.getModifiedItemAttr("durationBonus") * lvl)
diff --git a/eos/effects/effect6766.py b/eos/effects/effect6766.py
deleted file mode 100644
index 887644ece..000000000
--- a/eos/effects/effect6766.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# commandProcessorEffect
-#
-# Used by:
-# Modules named like: Command Processor I (4 of 4)
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemIncrease(lambda mod: mod.item.requiresSkill("Leadership"), "maxGroupActive",
-                                     src.getModifiedItemAttr("maxGangModules"))
-    fit.modules.filteredItemIncrease(lambda mod: mod.item.requiresSkill("Leadership"), "maxGroupOnline",
-                                     src.getModifiedItemAttr("maxGangModules"))
diff --git a/eos/effects/effect6769.py b/eos/effects/effect6769.py
deleted file mode 100644
index 5500e8578..000000000
--- a/eos/effects/effect6769.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# commandBurstAoEBonus
-#
-# Used by:
-# Skill: Fleet Command
-# Skill: Leadership
-# Skill: Wing Command
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Leadership"), "maxRange",
-                                  src.getModifiedItemAttr("areaOfEffectBonus") * src.level)
diff --git a/eos/effects/effect677.py b/eos/effects/effect677.py
deleted file mode 100644
index d64e19944..000000000
--- a/eos/effects/effect677.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# weaponUpgradesCpuNeedBonusPostPercentCpuLocationShipModulesRequiringMissileLauncherOperation
-#
-# Used by:
-# Implants named like: Zainou 'Gnome' Launcher CPU Efficiency LE (6 of 6)
-# Skill: Weapon Upgrades
-type = "passive"
-
-
-def handler(fit, container, context):
-    level = container.level if "skill" in context else 1
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Missile Launcher Operation"),
-                                  "cpu", container.getModifiedItemAttr("cpuNeedBonus") * level)
diff --git a/eos/effects/effect6770.py b/eos/effects/effect6770.py
deleted file mode 100644
index 171dfbbb2..000000000
--- a/eos/effects/effect6770.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# armoredCommandDurationBonus
-#
-# Used by:
-# Skill: Armored Command
-type = "passive"
-
-
-def handler(fit, src, context):
-    lvl = src.level
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Armored Command"), "buffDuration",
-                                  src.getModifiedItemAttr("durationBonus") * lvl)
diff --git a/eos/effects/effect6771.py b/eos/effects/effect6771.py
deleted file mode 100644
index a7425a974..000000000
--- a/eos/effects/effect6771.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shieldCommandDurationBonus
-#
-# Used by:
-# Skill: Shield Command
-type = "passive"
-
-
-def handler(fit, src, context):
-    lvl = src.level
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Command"), "buffDuration",
-                                  src.getModifiedItemAttr("durationBonus") * lvl)
diff --git a/eos/effects/effect6772.py b/eos/effects/effect6772.py
deleted file mode 100644
index f5a7dc351..000000000
--- a/eos/effects/effect6772.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# informationCommandDurationBonus
-#
-# Used by:
-# Skill: Information Command
-type = "passive"
-
-
-def handler(fit, src, context):
-    lvl = src.level
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Information Command"), "buffDuration",
-                                  src.getModifiedItemAttr("durationBonus") * lvl)
diff --git a/eos/effects/effect6773.py b/eos/effects/effect6773.py
deleted file mode 100644
index 7b42437e1..000000000
--- a/eos/effects/effect6773.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# skirmishCommandDurationBonus
-#
-# Used by:
-# Skill: Skirmish Command
-type = "passive"
-
-
-def handler(fit, src, context):
-    lvl = src.level
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Skirmish Command"), "buffDuration",
-                                  src.getModifiedItemAttr("durationBonus") * lvl)
diff --git a/eos/effects/effect6774.py b/eos/effects/effect6774.py
deleted file mode 100644
index 14a290d2e..000000000
--- a/eos/effects/effect6774.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# miningForemanDurationBonus
-#
-# Used by:
-# Skill: Mining Foreman
-type = "passive"
-
-
-def handler(fit, src, context):
-    lvl = src.level
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Mining Foreman"), "buffDuration",
-                                  src.getModifiedItemAttr("durationBonus") * lvl)
diff --git a/eos/effects/effect6776.py b/eos/effects/effect6776.py
deleted file mode 100644
index 6bc5e365e..000000000
--- a/eos/effects/effect6776.py
+++ /dev/null
@@ -1,17 +0,0 @@
-# armoredCommandStrengthBonus
-#
-# Used by:
-# Skill: Armored Command Specialist
-type = "passive"
-
-
-def handler(fit, src, context):
-    lvl = src.level
-    fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Armored Command"), "warfareBuff1Multiplier",
-                                    src.getModifiedItemAttr("commandStrengthBonus") * lvl)
-    fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Armored Command"), "warfareBuff2Multiplier",
-                                    src.getModifiedItemAttr("commandStrengthBonus") * lvl)
-    fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Armored Command"), "warfareBuff4Multiplier",
-                                    src.getModifiedItemAttr("commandStrengthBonus") * lvl)
-    fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Armored Command"), "warfareBuff3Multiplier",
-                                    src.getModifiedItemAttr("commandStrengthBonus") * lvl)
diff --git a/eos/effects/effect6777.py b/eos/effects/effect6777.py
deleted file mode 100644
index b95fe66df..000000000
--- a/eos/effects/effect6777.py
+++ /dev/null
@@ -1,17 +0,0 @@
-# shieldCommandStrengthBonus
-#
-# Used by:
-# Skill: Shield Command Specialist
-type = "passive"
-
-
-def handler(fit, src, context):
-    lvl = src.level
-    fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Shield Command"), "warfareBuff3Multiplier",
-                                    src.getModifiedItemAttr("commandStrengthBonus") * lvl)
-    fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Shield Command"), "warfareBuff1Multiplier",
-                                    src.getModifiedItemAttr("commandStrengthBonus") * lvl)
-    fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Shield Command"), "warfareBuff2Multiplier",
-                                    src.getModifiedItemAttr("commandStrengthBonus") * lvl)
-    fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Shield Command"), "warfareBuff4Multiplier",
-                                    src.getModifiedItemAttr("commandStrengthBonus") * lvl)
diff --git a/eos/effects/effect6778.py b/eos/effects/effect6778.py
deleted file mode 100644
index e4431bee0..000000000
--- a/eos/effects/effect6778.py
+++ /dev/null
@@ -1,17 +0,0 @@
-# informationCommandStrengthBonus
-#
-# Used by:
-# Skill: Information Command Specialist
-type = "passive"
-
-
-def handler(fit, src, context):
-    lvl = src.level
-    fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Information Command"), "warfareBuff2Multiplier",
-                                    src.getModifiedItemAttr("commandStrengthBonus") * lvl)
-    fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Information Command"), "warfareBuff1Multiplier",
-                                    src.getModifiedItemAttr("commandStrengthBonus") * lvl)
-    fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Information Command"), "warfareBuff3Multiplier",
-                                    src.getModifiedItemAttr("commandStrengthBonus") * lvl)
-    fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Information Command"), "warfareBuff4Multiplier",
-                                    src.getModifiedItemAttr("commandStrengthBonus") * lvl)
diff --git a/eos/effects/effect6779.py b/eos/effects/effect6779.py
deleted file mode 100644
index 7963755df..000000000
--- a/eos/effects/effect6779.py
+++ /dev/null
@@ -1,17 +0,0 @@
-# skirmishCommandStrengthBonus
-#
-# Used by:
-# Skill: Skirmish Command Specialist
-type = "passive"
-
-
-def handler(fit, src, context):
-    lvl = src.level
-    fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Skirmish Command"), "warfareBuff3Multiplier",
-                                    src.getModifiedItemAttr("commandStrengthBonus") * lvl)
-    fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Skirmish Command"), "warfareBuff4Multiplier",
-                                    src.getModifiedItemAttr("commandStrengthBonus") * lvl)
-    fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Skirmish Command"), "warfareBuff1Multiplier",
-                                    src.getModifiedItemAttr("commandStrengthBonus") * lvl)
-    fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Skirmish Command"), "warfareBuff2Multiplier",
-                                    src.getModifiedItemAttr("commandStrengthBonus") * lvl)
diff --git a/eos/effects/effect6780.py b/eos/effects/effect6780.py
deleted file mode 100644
index e7af57839..000000000
--- a/eos/effects/effect6780.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# miningForemanStrengthBonus
-#
-# Used by:
-# Skill: Mining Director
-type = "passive"
-
-
-def handler(fit, src, context):
-    lvl = src.level
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Mining Foreman"), "warfareBuff4Value", src.getModifiedItemAttr("commandStrengthBonus") * lvl)
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Mining Foreman"), "warfareBuff3Value", src.getModifiedItemAttr("commandStrengthBonus") * lvl)
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Mining Foreman"), "warfareBuff2Value", src.getModifiedItemAttr("commandStrengthBonus") * lvl)
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Mining Foreman"), "warfareBuff1Value", src.getModifiedItemAttr("commandStrengthBonus") * lvl)
diff --git a/eos/effects/effect6782.py b/eos/effects/effect6782.py
deleted file mode 100644
index c0207bef4..000000000
--- a/eos/effects/effect6782.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# commandBurstReloadTimeBonus
-#
-# Used by:
-# Skill: Command Burst Specialist
-type = "passive"
-
-
-def handler(fit, src, context):
-    lvl = src.level
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Leadership"),
-                                  "reloadTime",
-                                  src.getModifiedItemAttr("reloadTimeBonus") * lvl)
diff --git a/eos/effects/effect6783.py b/eos/effects/effect6783.py
deleted file mode 100644
index f69aecd01..000000000
--- a/eos/effects/effect6783.py
+++ /dev/null
@@ -1,18 +0,0 @@
-# commandBurstAoERoleBonus
-#
-# Used by:
-# Ships from group: Carrier (4 of 4)
-# Ships from group: Combat Battlecruiser (14 of 14)
-# Ships from group: Command Ship (8 of 8)
-# Ships from group: Force Auxiliary (6 of 6)
-# Ships from group: Supercarrier (6 of 6)
-# Ships from group: Titan (7 of 7)
-# Subsystems named like: Offensive Support Processor (4 of 4)
-# Ship: Orca
-# Ship: Rorqual
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Leadership"), "maxRange",
-                                  src.getModifiedItemAttr("roleBonusCommandBurstAoERange"))
diff --git a/eos/effects/effect6786.py b/eos/effects/effect6786.py
deleted file mode 100644
index 1a61286b7..000000000
--- a/eos/effects/effect6786.py
+++ /dev/null
@@ -1,18 +0,0 @@
-# shieldCommandBurstBonusICS3
-#
-# Used by:
-# Ship: Orca
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Command"), "warfareBuff4Multiplier",
-                                  src.getModifiedItemAttr("shipBonusICS3"), skill="Industrial Command Ships")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Command"), "warfareBuff1Multiplier",
-                                  src.getModifiedItemAttr("shipBonusICS3"), skill="Industrial Command Ships")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Command"), "warfareBuff2Multiplier",
-                                  src.getModifiedItemAttr("shipBonusICS3"), skill="Industrial Command Ships")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Command"), "warfareBuff3Multiplier",
-                                  src.getModifiedItemAttr("shipBonusICS3"), skill="Industrial Command Ships")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Command"), "buffDuration",
-                                  src.getModifiedItemAttr("shipBonusICS3"), skill="Industrial Command Ships")
diff --git a/eos/effects/effect6787.py b/eos/effects/effect6787.py
deleted file mode 100644
index 8b06c6dec..000000000
--- a/eos/effects/effect6787.py
+++ /dev/null
@@ -1,37 +0,0 @@
-# shipBonusDroneHPDamageMiningICS4
-#
-# Used by:
-# Ships from group: Industrial Command Ship (2 of 2)
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Drones"),
-                                 "damageMultiplier",
-                                 src.getModifiedItemAttr("shipBonusICS4"),
-                                 skill="Industrial Command Ships"
-                                 )
-
-    fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Drones"),
-                                 "shieldCapacity",
-                                 src.getModifiedItemAttr("shipBonusICS4"),
-                                 skill="Industrial Command Ships"
-                                 )
-
-    fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Drones"),
-                                 "armorHP",
-                                 src.getModifiedItemAttr("shipBonusICS4"),
-                                 skill="Industrial Command Ships"
-                                 )
-
-    fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Drones"),
-                                 "hp",
-                                 src.getModifiedItemAttr("shipBonusICS4"),
-                                 skill="Industrial Command Ships"
-                                 )
-
-    fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Mining Drone Operation"),
-                                 "miningAmount",
-                                 src.getModifiedItemAttr("shipBonusICS4"),
-                                 skill="Industrial Command Ships"
-                                 )
diff --git a/eos/effects/effect6788.py b/eos/effects/effect6788.py
deleted file mode 100644
index 4119b36c7..000000000
--- a/eos/effects/effect6788.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# shipBonusDroneIceHarvestingICS5
-#
-# Used by:
-# Ships from group: Industrial Command Ship (2 of 2)
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Ice Harvesting Drone Operation"),
-                                 "duration",
-                                 src.getModifiedItemAttr("shipBonusICS5"),
-                                 skill="Industrial Command Ships"
-                                 )
diff --git a/eos/effects/effect6789.py b/eos/effects/effect6789.py
deleted file mode 100644
index f6c5137bd..000000000
--- a/eos/effects/effect6789.py
+++ /dev/null
@@ -1,18 +0,0 @@
-# industrialBonusDroneDamage
-#
-# Used by:
-# Ships from group: Blockade Runner (4 of 4)
-# Ships from group: Deep Space Transport (4 of 4)
-# Ships from group: Exhumer (3 of 3)
-# Ships from group: Industrial (17 of 17)
-# Ships from group: Industrial Command Ship (2 of 2)
-# Ships from group: Mining Barge (3 of 3)
-# Variations of ship: Venture (3 of 3)
-# Ship: Rorqual
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Drones"),
-                                 "damageMultiplier",
-                                 src.getModifiedItemAttr("industrialBonusDroneDamage"))
diff --git a/eos/effects/effect6790.py b/eos/effects/effect6790.py
deleted file mode 100644
index b45241f9f..000000000
--- a/eos/effects/effect6790.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusDroneIceHarvestingRole
-#
-# Used by:
-# Ship: Orca
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill("Ice Harvesting Drone Operation"), "duration",
-                                 src.getModifiedItemAttr("roleBonusDroneIceHarvestingSpeed"))
diff --git a/eos/effects/effect6792.py b/eos/effects/effect6792.py
deleted file mode 100644
index 8cd53cd81..000000000
--- a/eos/effects/effect6792.py
+++ /dev/null
@@ -1,37 +0,0 @@
-# shipBonusDroneHPDamageMiningORECapital4
-#
-# Used by:
-# Ship: Rorqual
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Drones"),
-                                 "damageMultiplier",
-                                 src.getModifiedItemAttr("shipBonusORECapital4"),
-                                 skill="Capital Industrial Ships"
-                                 )
-
-    fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Drones"),
-                                 "shieldCapacity",
-                                 src.getModifiedItemAttr("shipBonusORECapital4"),
-                                 skill="Capital Industrial Ships"
-                                 )
-
-    fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Drones"),
-                                 "armorHP",
-                                 src.getModifiedItemAttr("shipBonusORECapital4"),
-                                 skill="Capital Industrial Ships"
-                                 )
-
-    fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Drones"),
-                                 "hp",
-                                 src.getModifiedItemAttr("shipBonusORECapital4"),
-                                 skill="Capital Industrial Ships"
-                                 )
-
-    fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Mining Drone Operation"),
-                                 "miningAmount",
-                                 src.getModifiedItemAttr("shipBonusORECapital4"),
-                                 skill="Capital Industrial Ships"
-                                 )
diff --git a/eos/effects/effect6793.py b/eos/effects/effect6793.py
deleted file mode 100644
index 29d55819e..000000000
--- a/eos/effects/effect6793.py
+++ /dev/null
@@ -1,18 +0,0 @@
-# miningForemanBurstBonusORECapital2
-#
-# Used by:
-# Ship: Rorqual
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Mining Foreman"), "warfareBuff1Value",
-                                  src.getModifiedItemAttr("shipBonusORECapital2"), skill="Capital Industrial Ships")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Mining Foreman"), "warfareBuff2Value",
-                                  src.getModifiedItemAttr("shipBonusORECapital2"), skill="Capital Industrial Ships")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Mining Foreman"), "warfareBuff4Value",
-                                  src.getModifiedItemAttr("shipBonusORECapital2"), skill="Capital Industrial Ships")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Mining Foreman"), "warfareBuff3Value",
-                                  src.getModifiedItemAttr("shipBonusORECapital2"), skill="Capital Industrial Ships")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Mining Foreman"), "buffDuration",
-                                  src.getModifiedItemAttr("shipBonusORECapital2"), skill="Capital Industrial Ships")
diff --git a/eos/effects/effect6794.py b/eos/effects/effect6794.py
deleted file mode 100644
index 8ad4a3462..000000000
--- a/eos/effects/effect6794.py
+++ /dev/null
@@ -1,18 +0,0 @@
-# shieldCommandBurstBonusORECapital3
-#
-# Used by:
-# Ship: Rorqual
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Command"), "warfareBuff4Value",
-                                  src.getModifiedItemAttr("shipBonusORECapital3"), skill="Capital Industrial Ships")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Command"), "buffDuration",
-                                  src.getModifiedItemAttr("shipBonusORECapital3"), skill="Capital Industrial Ships")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Command"), "warfareBuff1Value",
-                                  src.getModifiedItemAttr("shipBonusORECapital3"), skill="Capital Industrial Ships")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Command"), "warfareBuff3Value",
-                                  src.getModifiedItemAttr("shipBonusORECapital3"), skill="Capital Industrial Ships")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Command"), "warfareBuff2Value",
-                                  src.getModifiedItemAttr("shipBonusORECapital3"), skill="Capital Industrial Ships")
diff --git a/eos/effects/effect6795.py b/eos/effects/effect6795.py
deleted file mode 100644
index 754ea3fe6..000000000
--- a/eos/effects/effect6795.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# shipBonusDroneIceHarvestingORECapital5
-#
-# Used by:
-# Ship: Rorqual
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Ice Harvesting Drone Operation"),
-                                 "duration",
-                                 src.getModifiedItemAttr("shipBonusORECapital5"),
-                                 skill="Capital Industrial Ships"
-                                 )
diff --git a/eos/effects/effect6796.py b/eos/effects/effect6796.py
deleted file mode 100644
index 8ce7e5d6d..000000000
--- a/eos/effects/effect6796.py
+++ /dev/null
@@ -1,15 +0,0 @@
-# shipModeSHTDamagePostDiv
-#
-# Used by:
-# Module: Hecate Sharpshooter Mode
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.modules.filteredItemMultiply(
-        lambda mod: mod.item.requiresSkill("Small Hybrid Turret"),
-        "damageMultiplier",
-        1 / module.getModifiedItemAttr("modeDamageBonusPostDiv"),
-        stackingPenalties=True,
-        penaltyGroup="postDiv"
-    )
diff --git a/eos/effects/effect6797.py b/eos/effects/effect6797.py
deleted file mode 100644
index 788237c03..000000000
--- a/eos/effects/effect6797.py
+++ /dev/null
@@ -1,15 +0,0 @@
-# shipModeSPTDamagePostDiv
-#
-# Used by:
-# Module: Svipul Sharpshooter Mode
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.modules.filteredItemMultiply(
-        lambda mod: mod.item.requiresSkill("Small Projectile Turret"),
-        "damageMultiplier",
-        1 / module.getModifiedItemAttr("modeDamageBonusPostDiv"),
-        stackingPenalties=True,
-        penaltyGroup="postDiv"
-    )
diff --git a/eos/effects/effect6798.py b/eos/effects/effect6798.py
deleted file mode 100644
index 83c827795..000000000
--- a/eos/effects/effect6798.py
+++ /dev/null
@@ -1,15 +0,0 @@
-# shipModeSETDamagePostDiv
-#
-# Used by:
-# Module: Confessor Sharpshooter Mode
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.modules.filteredItemMultiply(
-        lambda mod: mod.item.requiresSkill("Small Energy Turret"),
-        "damageMultiplier",
-        1 / module.getModifiedItemAttr("modeDamageBonusPostDiv"),
-        stackingPenalties=True,
-        penaltyGroup="postDiv"
-    )
diff --git a/eos/effects/effect6799.py b/eos/effects/effect6799.py
deleted file mode 100644
index 31df33c3a..000000000
--- a/eos/effects/effect6799.py
+++ /dev/null
@@ -1,15 +0,0 @@
-# shipModeSmallMissileDamagePostDiv
-#
-# Used by:
-# Module: Jackdaw Sharpshooter Mode
-type = "passive"
-
-
-def handler(fit, module, context):
-    types = ("thermal", "em", "explosive", "kinetic")
-    for type in types:
-        fit.modules.filteredChargeMultiply(lambda mod: mod.charge.requiresSkill("Rockets") or mod.charge.requiresSkill("Light Missiles"),
-                                           "{}Damage".format(type),
-                                           1 / module.getModifiedItemAttr("modeDamageBonusPostDiv"),
-                                           stackingPenalties=True,
-                                           penaltyGroup="postDiv")
diff --git a/eos/effects/effect6800.py b/eos/effects/effect6800.py
deleted file mode 100644
index 891b84a82..000000000
--- a/eos/effects/effect6800.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# modeDampTDResistsPostDiv
-#
-# Used by:
-# Modules named like: Sharpshooter Mode (4 of 4)
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.ship.multiplyItemAttr("weaponDisruptionResistance", 1 / module.getModifiedItemAttr("modeEwarResistancePostDiv"))
-    fit.ship.multiplyItemAttr("sensorDampenerResistance", 1 / module.getModifiedItemAttr("modeEwarResistancePostDiv"))
diff --git a/eos/effects/effect6801.py b/eos/effects/effect6801.py
deleted file mode 100644
index fdc4a67d3..000000000
--- a/eos/effects/effect6801.py
+++ /dev/null
@@ -1,16 +0,0 @@
-# modeMWDandABBoostPostDiv
-#
-# Used by:
-# Module: Confessor Propulsion Mode
-# Module: Svipul Propulsion Mode
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.modules.filteredItemMultiply(
-        lambda mod: mod.item.requiresSkill("High Speed Maneuvering") or mod.item.requiresSkill("Afterburner"),
-        "speedFactor",
-        1 / module.getModifiedItemAttr("modeVelocityPostDiv"),
-        stackingPenalties=True,
-        penaltyGroup="postDiv"
-    )
diff --git a/eos/effects/effect6807.py b/eos/effects/effect6807.py
deleted file mode 100644
index b318f11cb..000000000
--- a/eos/effects/effect6807.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# invulnerabilityCoreDurationBonus
-#
-# Used by:
-# Skill: Invulnerability Core Operation
-type = "passive"
-
-
-def handler(fit, src, context):
-    lvl = src.level
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Invulnerability Core Operation"), "buffDuration",
-                                  src.getModifiedItemAttr("durationBonus") * lvl)
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Invulnerability Core Operation"), "duration",
-                                  src.getModifiedItemAttr("durationBonus") * lvl)
diff --git a/eos/effects/effect6844.py b/eos/effects/effect6844.py
deleted file mode 100644
index 137e31f44..000000000
--- a/eos/effects/effect6844.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# skillMultiplierDefenderMissileVelocity
-#
-# Used by:
-# Skill: Defender Missiles
-type = "passive"
-
-
-def handler(fit, skill, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Defender Missiles"),
-                                    "maxVelocity", skill.getModifiedItemAttr("missileVelocityBonus") * skill.level)
diff --git a/eos/effects/effect6845.py b/eos/effects/effect6845.py
deleted file mode 100644
index cd2c1e733..000000000
--- a/eos/effects/effect6845.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusCommandDestroyerRole1DefenderBonus
-#
-# Used by:
-# Ships from group: Command Destroyer (4 of 4)
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Defender Missiles"),
-                                  "moduleReactivationDelay", ship.getModifiedItemAttr("shipBonusRole1"))
diff --git a/eos/effects/effect6851.py b/eos/effects/effect6851.py
deleted file mode 100644
index d21771a03..000000000
--- a/eos/effects/effect6851.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusRole3CapitalEnergyDamageBonus
-#
-# Used by:
-# Ship: Chemosh
-# Ship: Molok
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Energy Turret"), "damageMultiplier", src.getModifiedItemAttr("shipBonusRole3"))
diff --git a/eos/effects/effect6852.py b/eos/effects/effect6852.py
deleted file mode 100644
index c026e376e..000000000
--- a/eos/effects/effect6852.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusTitanM1WebRangeBonus
-#
-# Used by:
-# Ship: Molok
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Stasis Web",
-                                  "maxRange", src.getModifiedItemAttr("shipBonusTitanM1"), skill="Minmatar Titan")
diff --git a/eos/effects/effect6853.py b/eos/effects/effect6853.py
deleted file mode 100644
index 596439814..000000000
--- a/eos/effects/effect6853.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# shipBonusTitanA1EnergyWarfareAmountBonus
-#
-# Used by:
-# Ship: Molok
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Nosferatu",
-                                  "powerTransferAmount", src.getModifiedItemAttr("shipBonusTitanA1"), skill="Amarr Titan")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Neutralizer",
-                                  "energyNeutralizerAmount", src.getModifiedItemAttr("shipBonusTitanA1"), skill="Amarr Titan")
diff --git a/eos/effects/effect6855.py b/eos/effects/effect6855.py
deleted file mode 100644
index 86e7725ac..000000000
--- a/eos/effects/effect6855.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# shipBonusDreadnoughtA1EnergyWarfareAmountBonus
-#
-# Used by:
-# Ship: Chemosh
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Nosferatu",
-                                  "powerTransferAmount", src.getModifiedItemAttr("shipBonusDreadnoughtA1"), skill="Amarr Dreadnought")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Neutralizer",
-                                  "energyNeutralizerAmount", src.getModifiedItemAttr("shipBonusDreadnoughtA1"), skill="Amarr Dreadnought")
diff --git a/eos/effects/effect6856.py b/eos/effects/effect6856.py
deleted file mode 100644
index f79762142..000000000
--- a/eos/effects/effect6856.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusDreadnoughtM1WebRangeBonus
-#
-# Used by:
-# Ship: Chemosh
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Stasis Web",
-                                  "maxRange", src.getModifiedItemAttr("shipBonusDreadnoughtM1"), skill="Minmatar Dreadnought")
diff --git a/eos/effects/effect6857.py b/eos/effects/effect6857.py
deleted file mode 100644
index f3a1d2a62..000000000
--- a/eos/effects/effect6857.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# shipBonusForceAuxiliaryA1NosferatuRangeBonus
-#
-# Used by:
-# Ship: Dagon
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Nosferatu",
-                                  "maxRange", src.getModifiedItemAttr("shipBonusForceAuxiliaryA1"), skill="Amarr Carrier")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Nosferatu",
-                                  "falloffEffectiveness", src.getModifiedItemAttr("shipBonusForceAuxiliaryA1"), skill="Amarr Carrier")
diff --git a/eos/effects/effect6858.py b/eos/effects/effect6858.py
deleted file mode 100644
index 113c0e899..000000000
--- a/eos/effects/effect6858.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusForceAuxiliaryA1NosferatuDrainAmount
-#
-# Used by:
-# Ship: Dagon
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Nosferatu",
-                                  "powerTransferAmount", src.getModifiedItemAttr("shipBonusForceAuxiliaryA1"), skill="Amarr Carrier")
diff --git a/eos/effects/effect6859.py b/eos/effects/effect6859.py
deleted file mode 100644
index 1d67fbb4b..000000000
--- a/eos/effects/effect6859.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusRole4NosferatuCPUBonus
-#
-# Used by:
-# Ship: Dagon
-# Ship: Rabisu
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Nosferatu", "cpu", src.getModifiedItemAttr("shipBonusRole4"))
diff --git a/eos/effects/effect6860.py b/eos/effects/effect6860.py
deleted file mode 100644
index 5e87c2241..000000000
--- a/eos/effects/effect6860.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusRole5RemoteArmorRepairPowergridBonus
-#
-# Used by:
-# Ships from group: Logistics (3 of 7)
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Remote Armor Repair Systems"), "power",
-                                  src.getModifiedItemAttr("shipBonusRole5"))
diff --git a/eos/effects/effect6861.py b/eos/effects/effect6861.py
deleted file mode 100644
index 8e33eb7a0..000000000
--- a/eos/effects/effect6861.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# shipBonusRole5CapitalRemoteArmorRepairPowergridBonus
-#
-# Used by:
-# Ship: Dagon
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Remote Armor Repair Systems"), "power", src.getModifiedItemAttr("shipBonusRole5"))
diff --git a/eos/effects/effect6862.py b/eos/effects/effect6862.py
deleted file mode 100644
index fd4dca81a..000000000
--- a/eos/effects/effect6862.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusForceAuxiliaryM1RemoteArmorRepairDuration
-#
-# Used by:
-# Ship: Dagon
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Remote Armor Repair Systems"),
-                                  "duration", src.getModifiedItemAttr("shipBonusForceAuxiliaryM1"), skill="Minmatar Carrier")
diff --git a/eos/effects/effect6865.py b/eos/effects/effect6865.py
deleted file mode 100644
index 1a25a973a..000000000
--- a/eos/effects/effect6865.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# eliteBonusCoverOpsWarpVelocity1
-#
-# Used by:
-# Ship: Pacifier
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.ship.boostItemAttr("warpSpeedMultiplier", src.getModifiedItemAttr("eliteBonusCovertOps1"), skill="Covert Ops")
diff --git a/eos/effects/effect6866.py b/eos/effects/effect6866.py
deleted file mode 100644
index 0b41b4185..000000000
--- a/eos/effects/effect6866.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# shipBonusSmallMissileFlightTimeCF1
-#
-# Used by:
-# Ship: Pacifier
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Rockets"),
-                                    "explosionDelay", src.getModifiedItemAttr("shipBonusCF"), skill="Caldari Frigate")
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Light Missiles"),
-                                    "explosionDelay", src.getModifiedItemAttr("shipBonusCF"), skill="Caldari Frigate")
diff --git a/eos/effects/effect6867.py b/eos/effects/effect6867.py
deleted file mode 100644
index 86ac5f332..000000000
--- a/eos/effects/effect6867.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusSPTRoFMF
-#
-# Used by:
-# Ship: Pacifier
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Projectile Turret"),
-                                  "speed", src.getModifiedItemAttr("shipBonusMF"), skill="Minmatar Frigate")
diff --git a/eos/effects/effect6871.py b/eos/effects/effect6871.py
deleted file mode 100644
index 16d1b65c5..000000000
--- a/eos/effects/effect6871.py
+++ /dev/null
@@ -1,23 +0,0 @@
-# concordSecStatusTankBonus
-#
-# Used by:
-# Ship: Enforcer
-# Ship: Marshal
-# Ship: Pacifier
-type = "passive"
-
-
-def handler(fit, src, context):
-
-    # Get pilot sec status bonus directly here, instead of going through the intermediary effects
-    # via https://forums.eveonline.com/default.aspx?g=posts&t=515826
-    try:
-        bonus = max(0, min(50.0, (src.parent.character.secStatus * 10)))
-    except:
-        bonus = None
-
-    if bonus is not None:
-        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Repair Systems"),
-                                  "armorDamageAmount", bonus, stackingPenalties=True)
-        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Operation"),
-                                  "shieldBonus", bonus, stackingPenalties=True)
diff --git a/eos/effects/effect6872.py b/eos/effects/effect6872.py
deleted file mode 100644
index abbf4f6c6..000000000
--- a/eos/effects/effect6872.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# eliteReconStasisWebBonus1
-#
-# Used by:
-# Ship: Enforcer
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Stasis Web", "maxRange", src.getModifiedItemAttr("eliteBonusReconShip1"), skill="Recon Ships")
diff --git a/eos/effects/effect6873.py b/eos/effects/effect6873.py
deleted file mode 100644
index 909c577a1..000000000
--- a/eos/effects/effect6873.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# eliteBonusReconWarpVelocity3
-#
-# Used by:
-# Ship: Enforcer
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.ship.boostItemAttr("warpSpeedMultiplier", src.getModifiedItemAttr("eliteBonusReconShip3"), skill="Recon Ships")
diff --git a/eos/effects/effect6874.py b/eos/effects/effect6874.py
deleted file mode 100644
index a8d76a49e..000000000
--- a/eos/effects/effect6874.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# shipBonusMedMissileFlightTimeCC2
-#
-# Used by:
-# Ship: Enforcer
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Missiles"),
-                                    "explosionDelay", src.getModifiedItemAttr("shipBonusCC2"), skill="Caldari Cruiser")
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Assault Missiles"),
-                                    "explosionDelay", src.getModifiedItemAttr("shipBonusCC2"), skill="Caldari Cruiser")
diff --git a/eos/effects/effect6877.py b/eos/effects/effect6877.py
deleted file mode 100644
index b3f824494..000000000
--- a/eos/effects/effect6877.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# eliteBonusBlackOpsWarpVelocity1
-#
-# Used by:
-# Ship: Marshal
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.ship.boostItemAttr("warpSpeedMultiplier", src.getModifiedItemAttr("eliteBonusBlackOps1"), stackingPenalties=True, skill="Black Ops")
diff --git a/eos/effects/effect6878.py b/eos/effects/effect6878.py
deleted file mode 100644
index 67519dc01..000000000
--- a/eos/effects/effect6878.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# eliteBonusBlackOpsScramblerRange4
-#
-# Used by:
-# Ship: Marshal
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Warp Scrambler", "maxRange",
-                                  src.getModifiedItemAttr("eliteBonusBlackOps4"), stackingPenalties=True, skill="Black Ops")
diff --git a/eos/effects/effect6879.py b/eos/effects/effect6879.py
deleted file mode 100644
index c1ea901de..000000000
--- a/eos/effects/effect6879.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# eliteBonusBlackOpsWebRange3
-#
-# Used by:
-# Ship: Marshal
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Stasis Web", "maxRange",
-                                  src.getModifiedItemAttr("eliteBonusBlackOps3"), stackingPenalties=True, skill="Black Ops")
diff --git a/eos/effects/effect6880.py b/eos/effects/effect6880.py
deleted file mode 100644
index a64adde8d..000000000
--- a/eos/effects/effect6880.py
+++ /dev/null
@@ -1,14 +0,0 @@
-# shipBonusLauncherRoF2CB
-#
-# Used by:
-# Ship: Marshal
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Missile Launcher Cruise", "speed",
-                                  src.getModifiedItemAttr("shipBonus2CB"), skill="Caldari Battleship")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Missile Launcher Torpedo", "speed",
-                                  src.getModifiedItemAttr("shipBonus2CB"), skill="Caldari Battleship")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Missile Launcher Rapid Heavy", "speed",
-                                  src.getModifiedItemAttr("shipBonus2CB"), skill="Caldari Battleship")
diff --git a/eos/effects/effect6881.py b/eos/effects/effect6881.py
deleted file mode 100644
index 9108bddbe..000000000
--- a/eos/effects/effect6881.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# shipBonusLargeMissileFlightTimeCB1
-#
-# Used by:
-# Ship: Marshal
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Torpedoes"), "explosionDelay",
-                                    src.getModifiedItemAttr("shipBonusCB"), skill="Caldari Battleship")
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Cruise Missiles"), "explosionDelay",
-                                    src.getModifiedItemAttr("shipBonusCB"), skill="Caldari Battleship")
diff --git a/eos/effects/effect6883.py b/eos/effects/effect6883.py
deleted file mode 100644
index 00531404a..000000000
--- a/eos/effects/effect6883.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# shipBonusForceAuxiliaryM2LocalRepairAmount
-#
-# Used by:
-# Ship: Dagon
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Repair Systems"),
-                                  "armorDamageAmount", src.getModifiedItemAttr("shipBonusForceAuxiliaryM2"), skill="Minmatar Carrier")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Repair Systems"),
-                                  "armorDamageAmount", src.getModifiedItemAttr("shipBonusForceAuxiliaryM2"), skill="Minmatar Carrier")
diff --git a/eos/effects/effect6894.py b/eos/effects/effect6894.py
deleted file mode 100644
index 52c427fa1..000000000
--- a/eos/effects/effect6894.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# subsystemEnergyNeutFittingReduction
-#
-# Used by:
-# Subsystem: Legion Core - Energy Parasitic Complex
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name in ("Energy Nosferatu", "Energy Neutralizer"),
-    "cpu", src.getModifiedItemAttr("subsystemEnergyNeutFittingReduction"))
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name in ("Energy Nosferatu", "Energy Neutralizer"),
-                                  "power", src.getModifiedItemAttr("subsystemEnergyNeutFittingReduction"))
diff --git a/eos/effects/effect6895.py b/eos/effects/effect6895.py
deleted file mode 100644
index ea3567a27..000000000
--- a/eos/effects/effect6895.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# subsystemMETFittingReduction
-#
-# Used by:
-# Subsystem: Legion Offensive - Liquid Crystal Magnifiers
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Energy Turret"),
-                                  "cpu", src.getModifiedItemAttr("subsystemMETFittingReduction"))
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Energy Turret"),
-                                  "power", src.getModifiedItemAttr("subsystemMETFittingReduction"))
diff --git a/eos/effects/effect6896.py b/eos/effects/effect6896.py
deleted file mode 100644
index 29aaec123..000000000
--- a/eos/effects/effect6896.py
+++ /dev/null
@@ -1,14 +0,0 @@
-# subsystemMHTFittingReduction
-#
-# Used by:
-# Subsystem: Proteus Offensive - Drone Synthesis Projector
-# Subsystem: Proteus Offensive - Hybrid Encoding Platform
-# Subsystem: Tengu Offensive - Magnetic Infusion Basin
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Hybrid Turret"),
-                                  "cpu", src.getModifiedItemAttr("subsystemMHTFittingReduction"))
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Hybrid Turret"),
-                                  "power", src.getModifiedItemAttr("subsystemMHTFittingReduction"))
diff --git a/eos/effects/effect6897.py b/eos/effects/effect6897.py
deleted file mode 100644
index 7660239b8..000000000
--- a/eos/effects/effect6897.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# subsystemMPTFittingReduction
-#
-# Used by:
-# Subsystem: Loki Offensive - Projectile Scoping Array
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Projectile Turret"),
-                                  "power", src.getModifiedItemAttr("subsystemMPTFittingReduction"))
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Projectile Turret"),
-                                  "cpu", src.getModifiedItemAttr("subsystemMPTFittingReduction"))
diff --git a/eos/effects/effect6898.py b/eos/effects/effect6898.py
deleted file mode 100644
index 070407bca..000000000
--- a/eos/effects/effect6898.py
+++ /dev/null
@@ -1,14 +0,0 @@
-# subsystemMRARFittingReduction
-#
-# Used by:
-# Subsystems named like: Offensive Support Processor (3 of 4)
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Remote Armor Repair Systems") and
-                                              mod.getModifiedItemAttr('mediumRemoteRepFittingMultiplier', 0) == 1,
-                                  "cpu", src.getModifiedItemAttr("subsystemMRARFittingReduction"))
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Remote Armor Repair Systems") and
-                                              mod.getModifiedItemAttr('mediumRemoteRepFittingMultiplier', 0) == 1,
-                                  "power", src.getModifiedItemAttr("subsystemMRARFittingReduction"))
diff --git a/eos/effects/effect6899.py b/eos/effects/effect6899.py
deleted file mode 100644
index 98185b770..000000000
--- a/eos/effects/effect6899.py
+++ /dev/null
@@ -1,15 +0,0 @@
-# subsystemMRSBFittingReduction
-#
-# Used by:
-# Subsystem: Loki Offensive - Support Processor
-# Subsystem: Tengu Offensive - Support Processor
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Emission Systems") and
-                                              mod.getModifiedItemAttr('mediumRemoteRepFittingMultiplier', 0) == 1,
-                                  "cpu", src.getModifiedItemAttr("subsystemMRSBFittingReduction"))
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Emission Systems") and
-                                              mod.getModifiedItemAttr('mediumRemoteRepFittingMultiplier', 0) == 1,
-                                  "power", src.getModifiedItemAttr("subsystemMRSBFittingReduction"))
diff --git a/eos/effects/effect6900.py b/eos/effects/effect6900.py
deleted file mode 100644
index 299536c2a..000000000
--- a/eos/effects/effect6900.py
+++ /dev/null
@@ -1,15 +0,0 @@
-# subsystemMMissileFittingReduction
-#
-# Used by:
-# Subsystem: Legion Offensive - Assault Optimization
-# Subsystem: Loki Offensive - Launcher Efficiency Configuration
-# Subsystem: Tengu Offensive - Accelerated Ejection Bay
-type = "passive"
-
-
-def handler(fit, src, context):
-    groups = ("Missile Launcher Heavy", "Missile Launcher Rapid Light", "Missile Launcher Heavy Assault")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name in groups,
-                                  "cpu", src.getModifiedItemAttr("subsystemMMissileFittingReduction"))
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name in groups,
-                                  "power", src.getModifiedItemAttr("subsystemMMissileFittingReduction"))
diff --git a/eos/effects/effect6908.py b/eos/effects/effect6908.py
deleted file mode 100644
index d245c16ca..000000000
--- a/eos/effects/effect6908.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipBonusStrategicCruiserCaldariNaniteRepairTime2
-#
-# Used by:
-# Ship: Tengu
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: True, "moduleRepairRate",
-                                  ship.getModifiedItemAttr("shipBonusStrategicCruiserCaldari2"),
-                                  skill="Caldari Strategic Cruiser")
diff --git a/eos/effects/effect6909.py b/eos/effects/effect6909.py
deleted file mode 100644
index 3f15088b8..000000000
--- a/eos/effects/effect6909.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipBonusStrategicCruiserAmarrNaniteRepairTime2
-#
-# Used by:
-# Ship: Legion
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: True, "moduleRepairRate",
-                                  ship.getModifiedItemAttr("shipBonusStrategicCruiserAmarr2"),
-                                  skill="Amarr Strategic Cruiser")
diff --git a/eos/effects/effect6910.py b/eos/effects/effect6910.py
deleted file mode 100644
index 0652e251e..000000000
--- a/eos/effects/effect6910.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipBonusStrategicCruiserGallenteNaniteRepairTime2
-#
-# Used by:
-# Ship: Proteus
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: True, "moduleRepairRate",
-                                  ship.getModifiedItemAttr("shipBonusStrategicCruiserGallente2"),
-                                  skill="Gallente Strategic Cruiser")
diff --git a/eos/effects/effect6911.py b/eos/effects/effect6911.py
deleted file mode 100644
index 9fe7b88c9..000000000
--- a/eos/effects/effect6911.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipBonusStrategicCruiserMinmatarNaniteRepairTime2
-#
-# Used by:
-# Ship: Loki
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: True, "moduleRepairRate",
-                                  ship.getModifiedItemAttr("shipBonusStrategicCruiserMinmatar2"),
-                                  skill="Minmatar Strategic Cruiser")
diff --git a/eos/effects/effect6920.py b/eos/effects/effect6920.py
deleted file mode 100644
index c2b7db0ed..000000000
--- a/eos/effects/effect6920.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# structureHPBonusAddPassive
-#
-# Used by:
-# Subsystems named like: Defensive Covert Reconfiguration (4 of 4)
-# Subsystem: Loki Defensive - Adaptive Defense Node
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.ship.increaseItemAttr("hp", module.getModifiedItemAttr("structureHPBonusAdd") or 0)
diff --git a/eos/effects/effect6921.py b/eos/effects/effect6921.py
deleted file mode 100644
index a7f2c9f58..000000000
--- a/eos/effects/effect6921.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# subSystemBonusAmarrDefensive2ScanProbeStrength
-#
-# Used by:
-# Subsystem: Legion Defensive - Covert Reconfiguration
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Astrometrics"),
-                                    "baseSensorStrength", src.getModifiedItemAttr("subsystemBonusAmarrDefensive2"),
-                                    skill="Amarr Defensive Systems")
diff --git a/eos/effects/effect6923.py b/eos/effects/effect6923.py
deleted file mode 100644
index 49ae9388a..000000000
--- a/eos/effects/effect6923.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# subsystemBonusMinmatarOffensive1HMLHAMVelo
-#
-# Used by:
-# Subsystem: Loki Offensive - Launcher Efficiency Configuration
-type = "passive"
-
-
-def handler(fit, container, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Missiles") or mod.charge.requiresSkill("Heavy Assault Missiles"),
-                                  "maxVelocity", container.getModifiedItemAttr("subsystemBonusMinmatarOffensive"),
-                                  skill="Minmatar Offensive Systems")
diff --git a/eos/effects/effect6924.py b/eos/effects/effect6924.py
deleted file mode 100644
index 7dd2cde86..000000000
--- a/eos/effects/effect6924.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# subsystemBonusMinmatarOffensive3MissileExpVelo
-#
-# Used by:
-# Subsystem: Loki Offensive - Launcher Efficiency Configuration
-type = "passive"
-
-
-def handler(fit, container, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"),
-                                  "aoeVelocity", container.getModifiedItemAttr("subsystemBonusMinmatarOffensive3"),
-                                  skill="Minmatar Offensive Systems")
diff --git a/eos/effects/effect6925.py b/eos/effects/effect6925.py
deleted file mode 100644
index 72b7e628d..000000000
--- a/eos/effects/effect6925.py
+++ /dev/null
@@ -1,14 +0,0 @@
-# subsystemBonusGallenteOffensive2DroneVeloTracking
-#
-# Used by:
-# Subsystem: Proteus Offensive - Drone Synthesis Projector
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill("Drones"),
-                                 "maxVelocity", src.getModifiedItemAttr("subsystemBonusGallenteOffensive2"),
-                                 skill="Gallente Offensive Systems")
-    fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill("Drones"),
-                                 "trackingSpeed", src.getModifiedItemAttr("subsystemBonusGallenteOffensive2"),
-                                 skill="Gallente Offensive Systems")
diff --git a/eos/effects/effect6926.py b/eos/effects/effect6926.py
deleted file mode 100644
index 76c076a0f..000000000
--- a/eos/effects/effect6926.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# subsystemBonusAmarrPropulsionWarpCapacitor
-#
-# Used by:
-# Subsystem: Legion Propulsion - Interdiction Nullifier
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.ship.boostItemAttr("warpCapacitorNeed", src.getModifiedItemAttr("subsystemBonusAmarrPropulsion"), skill="Amarr Propulsion Systems")
diff --git a/eos/effects/effect6927.py b/eos/effects/effect6927.py
deleted file mode 100644
index f7f965c59..000000000
--- a/eos/effects/effect6927.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# subsystemBonusMinmatarPropulsionWarpCapacitor
-#
-# Used by:
-# Subsystem: Loki Propulsion - Interdiction Nullifier
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.ship.boostItemAttr("warpCapacitorNeed", src.getModifiedItemAttr("subsystemBonusMinmatarPropulsion"),
-                           skill="Minmatar Propulsion Systems")
diff --git a/eos/effects/effect6928.py b/eos/effects/effect6928.py
deleted file mode 100644
index e089fdf80..000000000
--- a/eos/effects/effect6928.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# subsystemBonusCaldariPropulsion2PropModHeatBenefit
-#
-# Used by:
-# Subsystem: Tengu Propulsion - Fuel Catalyst
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Afterburner") or mod.item.requiresSkill("High Speed Maneuvering"),
-                                  "overloadSpeedFactorBonus", src.getModifiedItemAttr("subsystemBonusCaldariPropulsion2"),
-                                  skill="Caldari Propulsion Systems")
diff --git a/eos/effects/effect6929.py b/eos/effects/effect6929.py
deleted file mode 100644
index 96dc20bb4..000000000
--- a/eos/effects/effect6929.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# subsystemBonusGallentePropulsion2PropModHeatBenefit
-#
-# Used by:
-# Subsystem: Proteus Propulsion - Localized Injectors
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Afterburner") or mod.item.requiresSkill("High Speed Maneuvering"),
-                                  "overloadSpeedFactorBonus", src.getModifiedItemAttr("subsystemBonusGallentePropulsion2"),
-                                  skill="Gallente Propulsion Systems")
diff --git a/eos/effects/effect6930.py b/eos/effects/effect6930.py
deleted file mode 100644
index a4f8215f8..000000000
--- a/eos/effects/effect6930.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# subsystemBonusAmarrCore2EnergyResistance
-#
-# Used by:
-# Subsystem: Legion Core - Augmented Antimatter Reactor
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.ship.boostItemAttr("energyWarfareResistance", src.getModifiedItemAttr("subsystemBonusAmarrCore2"), skill="Amarr Core Systems")
diff --git a/eos/effects/effect6931.py b/eos/effects/effect6931.py
deleted file mode 100644
index c2f93a623..000000000
--- a/eos/effects/effect6931.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# subsystemBonusMinmatarCore2EnergyResistance
-#
-# Used by:
-# Subsystem: Loki Core - Augmented Nuclear Reactor
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.ship.boostItemAttr("energyWarfareResistance", src.getModifiedItemAttr("subsystemBonusMinmatarCore2"),
-                           skill="Minmatar Core Systems")
diff --git a/eos/effects/effect6932.py b/eos/effects/effect6932.py
deleted file mode 100644
index 1a3c834c2..000000000
--- a/eos/effects/effect6932.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# subsystemBonusGallenteCore2EnergyResistance
-#
-# Used by:
-# Subsystem: Proteus Core - Augmented Fusion Reactor
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.ship.boostItemAttr("energyWarfareResistance", src.getModifiedItemAttr("subsystemBonusGallenteCore2"),
-                           skill="Gallente Core Systems")
diff --git a/eos/effects/effect6933.py b/eos/effects/effect6933.py
deleted file mode 100644
index 9a2d0c415..000000000
--- a/eos/effects/effect6933.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# subsystemBonusCaldariCore2EnergyResistance
-#
-# Used by:
-# Subsystem: Tengu Core - Augmented Graviton Reactor
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.ship.boostItemAttr("energyWarfareResistance", src.getModifiedItemAttr("subsystemBonusCaldariCore2"),
-                           skill="Caldari Core Systems")
diff --git a/eos/effects/effect6934.py b/eos/effects/effect6934.py
deleted file mode 100644
index 52840f0b1..000000000
--- a/eos/effects/effect6934.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipMaxLockedTargetsBonusAddPassive
-#
-# Used by:
-# Subsystems named like: Core Dissolution Sequencer (2 of 2)
-# Subsystems named like: Core Electronic Efficiency Gate (2 of 2)
-# Subsystems named like: Offensive Support Processor (4 of 4)
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.ship.increaseItemAttr("maxLockedTargets", src.getModifiedItemAttr("maxLockedTargetsBonus"))
diff --git a/eos/effects/effect6935.py b/eos/effects/effect6935.py
deleted file mode 100644
index 0d74c77e5..000000000
--- a/eos/effects/effect6935.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# subsystemBonusAmarrCore3EnergyWarHeatBonus
-#
-# Used by:
-# Subsystem: Legion Core - Energy Parasitic Complex
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name in ("Energy Nosferatu", "Energy Neutralizer"), "overloadSelfDurationBonus",
-                                  src.getModifiedItemAttr("subsystemBonusAmarrCore3"), skill="Amarr Core Systems")
diff --git a/eos/effects/effect6936.py b/eos/effects/effect6936.py
deleted file mode 100644
index b9233bacb..000000000
--- a/eos/effects/effect6936.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# subsystemBonusMinmatarCore3StasisWebHeatBonus
-#
-# Used by:
-# Subsystem: Loki Core - Immobility Drivers
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Stasis Web",
-                                  "overloadRangeBonus", src.getModifiedItemAttr("subsystemBonusMinmatarCore3"),
-                                  skill="Minmatar Core Systems")
diff --git a/eos/effects/effect6937.py b/eos/effects/effect6937.py
deleted file mode 100644
index 9060dac39..000000000
--- a/eos/effects/effect6937.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# subsystemBonusGallenteCore3WarpScramHeatBonus
-#
-# Used by:
-# Subsystem: Proteus Core - Friction Extension Processor
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Warp Scrambler", "overloadRangeBonus",
-                                  src.getModifiedItemAttr("subsystemBonusGallenteCore3"), skill="Gallente Core Systems")
diff --git a/eos/effects/effect6938.py b/eos/effects/effect6938.py
deleted file mode 100644
index c17c23ea2..000000000
--- a/eos/effects/effect6938.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# subsystemBonusCaldariCore3ECMHeatBonus
-#
-# Used by:
-# Subsystem: Tengu Core - Obfuscation Manifold
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "ECM", "overloadECMStrengthBonus",
-                                  src.getModifiedItemAttr("subsystemBonusCaldariCore3"), skill="Caldari Core Systems")
diff --git a/eos/effects/effect6939.py b/eos/effects/effect6939.py
deleted file mode 100644
index 20459415a..000000000
--- a/eos/effects/effect6939.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# subsystemBonusAmarrDefensive2HardenerHeat
-#
-# Used by:
-# Subsystem: Legion Defensive - Augmented Plating
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Hull Upgrades"), "overloadSelfDurationBonus",
-                                  src.getModifiedItemAttr("subsystemBonusAmarrDefensive2"), skill="Amarr Defensive Systems")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Hull Upgrades"), "overloadHardeningBonus",
-                                  src.getModifiedItemAttr("subsystemBonusAmarrDefensive2"), skill="Amarr Defensive Systems")
diff --git a/eos/effects/effect6940.py b/eos/effects/effect6940.py
deleted file mode 100644
index d4c2f7e1d..000000000
--- a/eos/effects/effect6940.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# subsystemBonusGallenteDefensive2HardenerHeat
-#
-# Used by:
-# Subsystem: Proteus Defensive - Augmented Plating
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Hull Upgrades"), "overloadHardeningBonus",
-                                  src.getModifiedItemAttr("subsystemBonusGallenteDefensive2"), skill="Gallente Defensive Systems")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Hull Upgrades"), "overloadSelfDurationBonus",
-                                  src.getModifiedItemAttr("subsystemBonusGallenteDefensive2"), skill="Gallente Defensive Systems")
diff --git a/eos/effects/effect6941.py b/eos/effects/effect6941.py
deleted file mode 100644
index 259f761eb..000000000
--- a/eos/effects/effect6941.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# subsystemBonusCaldariDefensive2HardenerHeat
-#
-# Used by:
-# Subsystem: Tengu Defensive - Supplemental Screening
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Tactical Shield Manipulation"),
-                                  "overloadHardeningBonus", src.getModifiedItemAttr("subsystemBonusCaldariDefensive2"),
-                                  skill="Caldari Defensive Systems")
diff --git a/eos/effects/effect6942.py b/eos/effects/effect6942.py
deleted file mode 100644
index f87466071..000000000
--- a/eos/effects/effect6942.py
+++ /dev/null
@@ -1,14 +0,0 @@
-# subsystemBonusMinmatarDefensive2HardenerHeat
-#
-# Used by:
-# Subsystem: Loki Defensive - Augmented Durability
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Hull Upgrades"), "overloadSelfDurationBonus",
-                                  src.getModifiedItemAttr("subsystemBonusMinmatarDefensive2"), skill="Minmatar Defensive Systems")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Hull Upgrades"), "overloadHardeningBonus",
-                                  src.getModifiedItemAttr("subsystemBonusMinmatarDefensive2"), skill="Minmatar Defensive Systems")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Tactical Shield Manipulation"), "overloadHardeningBonus",
-                                  src.getModifiedItemAttr("subsystemBonusMinmatarDefensive2"), skill="Minmatar Defensive Systems")
diff --git a/eos/effects/effect6943.py b/eos/effects/effect6943.py
deleted file mode 100644
index e4c0bf66e..000000000
--- a/eos/effects/effect6943.py
+++ /dev/null
@@ -1,15 +0,0 @@
-# subsystemBonusAmarrDefensive3ArmorRepHeat
-#
-# Used by:
-# Subsystem: Legion Defensive - Covert Reconfiguration
-# Subsystem: Legion Defensive - Nanobot Injector
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Repair Systems"),
-                                  "overloadSelfDurationBonus", src.getModifiedItemAttr("subsystemBonusAmarrDefensive3"),
-                                  skill="Amarr Defensive Systems")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Repair Systems"),
-                                  "overloadArmorDamageAmount", src.getModifiedItemAttr("subsystemBonusAmarrDefensive3"),
-                                  skill="Amarr Defensive Systems")
diff --git a/eos/effects/effect6944.py b/eos/effects/effect6944.py
deleted file mode 100644
index 1f2e9d309..000000000
--- a/eos/effects/effect6944.py
+++ /dev/null
@@ -1,15 +0,0 @@
-# subsystemBonusGallenteDefensive3ArmorRepHeat
-#
-# Used by:
-# Subsystem: Proteus Defensive - Covert Reconfiguration
-# Subsystem: Proteus Defensive - Nanobot Injector
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Repair Systems"),
-                                  "overloadSelfDurationBonus", src.getModifiedItemAttr("subsystemBonusGallenteDefensive3"),
-                                  skill="Gallente Defensive Systems")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Repair Systems"),
-                                  "overloadArmorDamageAmount", src.getModifiedItemAttr("subsystemBonusGallenteDefensive3"),
-                                  skill="Gallente Defensive Systems")
diff --git a/eos/effects/effect6945.py b/eos/effects/effect6945.py
deleted file mode 100644
index a18f076f1..000000000
--- a/eos/effects/effect6945.py
+++ /dev/null
@@ -1,15 +0,0 @@
-# subsystemBonusCaldariDefensive3ShieldBoostHeat
-#
-# Used by:
-# Subsystem: Tengu Defensive - Amplification Node
-# Subsystem: Tengu Defensive - Covert Reconfiguration
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Operation"),
-                                  "overloadShieldBonus", src.getModifiedItemAttr("subsystemBonusCaldariDefensive3"),
-                                  skill="Caldari Defensive Systems")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Operation"),
-                                  "overloadSelfDurationBonus", src.getModifiedItemAttr("subsystemBonusCaldariDefensive3"),
-                                  skill="Caldari Defensive Systems")
diff --git a/eos/effects/effect6946.py b/eos/effects/effect6946.py
deleted file mode 100644
index fe6c0e1ee..000000000
--- a/eos/effects/effect6946.py
+++ /dev/null
@@ -1,15 +0,0 @@
-# subsystemBonusMinmatarDefensive3LocalRepHeat
-#
-# Used by:
-# Subsystem: Loki Defensive - Adaptive Defense Node
-# Subsystem: Loki Defensive - Covert Reconfiguration
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Repair Systems") or mod.item.requiresSkill("Shield Operation"),
-                                  "overloadArmorDamageAmount", src.getModifiedItemAttr("subsystemBonusMinmatarDefensive3"),
-                                  skill="Minmatar Defensive Systems")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Repair Systems") or mod.item.requiresSkill("Shield Operation"),
-                                  "overloadSelfDurationBonus", src.getModifiedItemAttr("subsystemBonusMinmatarDefensive3"),
-                                  skill="Minmatar Defensive Systems")
diff --git a/eos/effects/effect6947.py b/eos/effects/effect6947.py
deleted file mode 100644
index 828d383a2..000000000
--- a/eos/effects/effect6947.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# subSystemBonusCaldariDefensive2ScanProbeStrength
-#
-# Used by:
-# Subsystem: Tengu Defensive - Covert Reconfiguration
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Astrometrics"),
-                                    "baseSensorStrength", src.getModifiedItemAttr("subsystemBonusCaldariDefensive2"),
-                                    skill="Caldari Defensive Systems")
diff --git a/eos/effects/effect6949.py b/eos/effects/effect6949.py
deleted file mode 100644
index e5e7955d8..000000000
--- a/eos/effects/effect6949.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# subSystemBonusGallenteDefensive2ScanProbeStrength
-#
-# Used by:
-# Subsystem: Proteus Defensive - Covert Reconfiguration
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Astrometrics"), "baseSensorStrength",
-                                    src.getModifiedItemAttr("subsystemBonusGallenteDefensive2"), skill="Gallente Defensive Systems")
diff --git a/eos/effects/effect6951.py b/eos/effects/effect6951.py
deleted file mode 100644
index 8879074a6..000000000
--- a/eos/effects/effect6951.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# subSystemBonusMinmatarDefensive2ScanProbeStrength
-#
-# Used by:
-# Subsystem: Loki Defensive - Covert Reconfiguration
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Astrometrics"), "baseSensorStrength",
-                                    src.getModifiedItemAttr("subsystemBonusMinmatarDefensive2"), skill="Minmatar Defensive Systems")
diff --git a/eos/effects/effect6953.py b/eos/effects/effect6953.py
deleted file mode 100644
index b5d4c577c..000000000
--- a/eos/effects/effect6953.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# mediumRemoteRepFittingAdjustment
-#
-# Used by:
-# Variations of module: Medium Remote Armor Repairer I (12 of 12)
-# Variations of module: Medium Remote Shield Booster I (11 of 11)
-# Module: Medium Ancillary Remote Armor Repairer
-# Module: Medium Ancillary Remote Shield Booster
-type = "passive"
-
-
-def handler(fit, module, context):
-    module.multiplyItemAttr("power", module.getModifiedItemAttr("mediumRemoteRepFittingMultiplier"))
-    module.multiplyItemAttr("cpu", module.getModifiedItemAttr("mediumRemoteRepFittingMultiplier"))
diff --git a/eos/effects/effect6954.py b/eos/effects/effect6954.py
deleted file mode 100644
index 8549a57bf..000000000
--- a/eos/effects/effect6954.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# subsystemBonusCommandBurstFittingReduction
-#
-# Used by:
-# Subsystems named like: Offensive Support Processor (4 of 4)
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Leadership"), "power",
-                                  src.getModifiedItemAttr("subsystemCommandBurstFittingReduction"))
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Leadership"), "cpu",
-                                  src.getModifiedItemAttr("subsystemCommandBurstFittingReduction"))
diff --git a/eos/effects/effect6955.py b/eos/effects/effect6955.py
deleted file mode 100644
index ab3a9f867..000000000
--- a/eos/effects/effect6955.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# subsystemRemoteShieldBoostFalloffBonus
-#
-# Used by:
-# Subsystem: Loki Offensive - Support Processor
-# Subsystem: Tengu Offensive - Support Processor
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name in ("Remote Shield Booster", "Ancillary Remote Shield Booster"),
-                                  "falloffEffectiveness", src.getModifiedItemAttr("remoteShieldBoosterFalloffBonus"))
diff --git a/eos/effects/effect6956.py b/eos/effects/effect6956.py
deleted file mode 100644
index 6112559c3..000000000
--- a/eos/effects/effect6956.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# subsystemRemoteArmorRepairerOptimalBonus
-#
-# Used by:
-# Subsystems named like: Offensive Support Processor (3 of 4)
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name in ("Remote Armor Repairer", "Ancillary Remote Armor Repairer"),
-                                  "maxRange", src.getModifiedItemAttr("remoteArmorRepairerOptimalBonus"))
diff --git a/eos/effects/effect6957.py b/eos/effects/effect6957.py
deleted file mode 100644
index 20ac549af..000000000
--- a/eos/effects/effect6957.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# subsystemRemoteArmorRepairerFalloffBonus
-#
-# Used by:
-# Subsystems named like: Offensive Support Processor (3 of 4)
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name in ("Remote Armor Repairer", "Ancillary Remote Armor Repairer"),
-                                  "falloffEffectiveness", src.getModifiedItemAttr("remoteArmorRepairerFalloffBonus"))
diff --git a/eos/effects/effect6958.py b/eos/effects/effect6958.py
deleted file mode 100644
index d7e603aab..000000000
--- a/eos/effects/effect6958.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# subsystemBonusAmarrOffensive3RemoteArmorRepairHeat
-#
-# Used by:
-# Subsystem: Legion Offensive - Support Processor
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Remote Armor Repair Systems"), "overloadSelfDurationBonus",
-                                  src.getModifiedItemAttr("subsystemBonusAmarrOffensive3"), skill="Amarr Offensive Systems")
diff --git a/eos/effects/effect6959.py b/eos/effects/effect6959.py
deleted file mode 100644
index 651810140..000000000
--- a/eos/effects/effect6959.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# subsystemBonusGallenteOffensive3RemoteArmorRepairHeat
-#
-# Used by:
-# Subsystem: Proteus Offensive - Support Processor
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Remote Armor Repair Systems"), "overloadSelfDurationBonus",
-                                  src.getModifiedItemAttr("subsystemBonusGallenteOffensive3"), skill="Gallente Offensive Systems")
diff --git a/eos/effects/effect6960.py b/eos/effects/effect6960.py
deleted file mode 100644
index 44a471a6d..000000000
--- a/eos/effects/effect6960.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# subsystemBonusCaldariOffensive3RemoteShieldBoosterHeat
-#
-# Used by:
-# Subsystem: Tengu Offensive - Support Processor
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Emission Systems"),
-                                  "overloadSelfDurationBonus", src.getModifiedItemAttr("subsystemBonusCaldariOffensive3"),
-                                  skill="Caldari Offensive Systems")
diff --git a/eos/effects/effect6961.py b/eos/effects/effect6961.py
deleted file mode 100644
index a88a2907d..000000000
--- a/eos/effects/effect6961.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# subsystemBonusMinmatarOffensive3RemoteRepHeat
-#
-# Used by:
-# Subsystem: Loki Offensive - Support Processor
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Emission Systems") or mod.item.requiresSkill("Remote Armor Repair Systems"),
-                                  "overloadSelfDurationBonus", src.getModifiedItemAttr("subsystemBonusMinmatarOffensive3"),
-                                  skill="Minmatar Offensive Systems")
diff --git a/eos/effects/effect6962.py b/eos/effects/effect6962.py
deleted file mode 100644
index bc59ac952..000000000
--- a/eos/effects/effect6962.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# subsystemBonusAmarrPropulsion2WarpSpeed
-#
-# Used by:
-# Subsystem: Legion Propulsion - Interdiction Nullifier
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.ship.boostItemAttr("warpSpeedMultiplier", src.getModifiedItemAttr("subsystemBonusAmarrPropulsion2"),
-                           skill="Amarr Propulsion Systems")
diff --git a/eos/effects/effect6963.py b/eos/effects/effect6963.py
deleted file mode 100644
index d8d8262ca..000000000
--- a/eos/effects/effect6963.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# subsystemBonusMinmatarPropulsion2WarpSpeed
-#
-# Used by:
-# Subsystem: Loki Propulsion - Interdiction Nullifier
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.ship.boostItemAttr("warpSpeedMultiplier", src.getModifiedItemAttr("subsystemBonusMinmatarPropulsion2"),
-                           skill="Minmatar Propulsion Systems")
diff --git a/eos/effects/effect6964.py b/eos/effects/effect6964.py
deleted file mode 100644
index 33f4dc718..000000000
--- a/eos/effects/effect6964.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# subsystemBonusGallentePropulsionWarpSpeed
-#
-# Used by:
-# Subsystem: Proteus Propulsion - Hyperspatial Optimization
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.ship.boostItemAttr("baseWarpSpeed", module.getModifiedItemAttr("subsystemBonusGallentePropulsion"),
-                           skill="Gallente Propulsion Systems")
diff --git a/eos/effects/effect6981.py b/eos/effects/effect6981.py
deleted file mode 100644
index 7e8745859..000000000
--- a/eos/effects/effect6981.py
+++ /dev/null
@@ -1,20 +0,0 @@
-# shipBonusTitanG1KinThermDamageBonus
-#
-# Used by:
-# Ship: Komodo
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Torpedoes"), "thermalDamage",
-                                  src.getModifiedItemAttr("shipBonusTitanG1"), skill="Gallente Titan")
-    fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Torpedoes"), "kineticDamage",
-                                  src.getModifiedItemAttr("shipBonusTitanG1"), skill="Gallente Titan")
-    fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("XL Torpedoes"), "thermalDamage",
-                                  src.getModifiedItemAttr("shipBonusTitanG1"), skill="Gallente Titan")
-    fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("XL Torpedoes"), "kineticDamage",
-                                  src.getModifiedItemAttr("shipBonusTitanG1"), skill="Gallente Titan")
-    fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("XL Cruise Missiles"), "thermalDamage",
-                                  src.getModifiedItemAttr("shipBonusTitanG1"), skill="Gallente Titan")
-    fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("XL Cruise Missiles"), "kineticDamage",
-                                  src.getModifiedItemAttr("shipBonusTitanG1"), skill="Gallente Titan")
diff --git a/eos/effects/effect6982.py b/eos/effects/effect6982.py
deleted file mode 100644
index d98b44d4b..000000000
--- a/eos/effects/effect6982.py
+++ /dev/null
@@ -1,20 +0,0 @@
-# shipBonusTitanG2EMExplosiveDamageBonus
-#
-# Used by:
-# Ship: Komodo
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Torpedoes"), "explosiveDamage",
-                                  src.getModifiedItemAttr("shipBonusTitanG2"), skill="Gallente Titan")
-    fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Torpedoes"), "emDamage",
-                                  src.getModifiedItemAttr("shipBonusTitanG2"), skill="Gallente Titan")
-    fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("XL Torpedoes"), "emDamage",
-                                  src.getModifiedItemAttr("shipBonusTitanG2"), skill="Gallente Titan")
-    fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("XL Torpedoes"), "explosiveDamage",
-                                  src.getModifiedItemAttr("shipBonusTitanG2"), skill="Gallente Titan")
-    fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("XL Cruise Missiles"), "emDamage",
-                                  src.getModifiedItemAttr("shipBonusTitanG2"), skill="Gallente Titan")
-    fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("XL Cruise Missiles"), "explosiveDamage",
-                                  src.getModifiedItemAttr("shipBonusTitanG2"), skill="Gallente Titan")
diff --git a/eos/effects/effect6983.py b/eos/effects/effect6983.py
deleted file mode 100644
index 2216bea00..000000000
--- a/eos/effects/effect6983.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# shipBonusTitanC1ShieldResists
-#
-# Used by:
-# Ship: Komodo
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.ship.boostItemAttr("shieldKineticDamageResonance", src.getModifiedItemAttr("shipBonusTitanC1"), skill="Caldari Titan")
-    fit.ship.boostItemAttr("shieldEmDamageResonance", src.getModifiedItemAttr("shipBonusTitanC1"), skill="Caldari Titan")
-    fit.ship.boostItemAttr("shieldExplosiveDamageResonance", src.getModifiedItemAttr("shipBonusTitanC1"), skill="Caldari Titan")
-    fit.ship.boostItemAttr("shieldThermalDamageResonance", src.getModifiedItemAttr("shipBonusTitanC1"), skill="Caldari Titan")
diff --git a/eos/effects/effect6984.py b/eos/effects/effect6984.py
deleted file mode 100644
index 4daa1d80e..000000000
--- a/eos/effects/effect6984.py
+++ /dev/null
@@ -1,17 +0,0 @@
-# shipBonusRole4FighterDamageAndHitpoints
-#
-# Used by:
-# Ship: Caiman
-# Ship: Komodo
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"), "shieldCapacity",
-                                   src.getModifiedItemAttr("shipBonusRole4"))
-    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"), "fighterAbilityAttackTurretDamageMultiplier",
-                                   src.getModifiedItemAttr("shipBonusRole4"))
-    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"), "fighterAbilityAttackMissileDamageMultiplier",
-                                   src.getModifiedItemAttr("shipBonusRole4"))
-    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"), "fighterAbilityMissilesDamageMultiplier",
-                                   src.getModifiedItemAttr("shipBonusRole4"))
diff --git a/eos/effects/effect6985.py b/eos/effects/effect6985.py
deleted file mode 100644
index e79593c44..000000000
--- a/eos/effects/effect6985.py
+++ /dev/null
@@ -1,20 +0,0 @@
-# shipBonusDreadnoughtG1KinThermDamageBonus
-#
-# Used by:
-# Ship: Caiman
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Torpedoes"), "kineticDamage",
-                                  src.getModifiedItemAttr("shipBonusDreadnoughtG1"), skill="Gallente Dreadnought")
-    fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Torpedoes"), "thermalDamage",
-                                  src.getModifiedItemAttr("shipBonusDreadnoughtG1"), skill="Gallente Dreadnought")
-    fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("XL Torpedoes"), "kineticDamage",
-                                  src.getModifiedItemAttr("shipBonusDreadnoughtG1"), skill="Gallente Dreadnought")
-    fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("XL Torpedoes"), "thermalDamage",
-                                  src.getModifiedItemAttr("shipBonusDreadnoughtG1"), skill="Gallente Dreadnought")
-    fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("XL Cruise Missiles"), "thermalDamage",
-                                  src.getModifiedItemAttr("shipBonusDreadnoughtG1"), skill="Gallente Dreadnought")
-    fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("XL Cruise Missiles"), "kineticDamage",
-                                  src.getModifiedItemAttr("shipBonusDreadnoughtG1"), skill="Gallente Dreadnought")
diff --git a/eos/effects/effect6986.py b/eos/effects/effect6986.py
deleted file mode 100644
index 08c87ce85..000000000
--- a/eos/effects/effect6986.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusForceAuxiliaryG1RemoteShieldBoostAmount
-#
-# Used by:
-# Ship: Loggerhead
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Shield Emission Systems"), "shieldBonus",
-                                  src.getModifiedItemAttr("shipBonusForceAuxiliaryG1"), skill="Gallente Carrier")
diff --git a/eos/effects/effect6987.py b/eos/effects/effect6987.py
deleted file mode 100644
index 100056f61..000000000
--- a/eos/effects/effect6987.py
+++ /dev/null
@@ -1,20 +0,0 @@
-# shipBonusRole2LogisticDroneRepAmountAndHitpointBonus
-#
-# Used by:
-# Ship: Loggerhead
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill("Repair Drone Operation"),
-                                    "structureDamageAmount", src.getModifiedItemAttr("shipBonusRole2"))
-    fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill("Repair Drone Operation"),
-                                    "shieldBonus", src.getModifiedItemAttr("shipBonusRole2"))
-    fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill("Repair Drone Operation"),
-                                    "armorDamageAmount", src.getModifiedItemAttr("shipBonusRole2"))
-    fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill("Repair Drone Operation"),
-                                    "armorHP", src.getModifiedItemAttr("shipBonusRole2"))
-    fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill("Repair Drone Operation"),
-                                    "shieldCapacity", src.getModifiedItemAttr("shipBonusRole2"))
-    fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill("Repair Drone Operation"),
-                                    "hp", src.getModifiedItemAttr("shipBonusRole2"))
diff --git a/eos/effects/effect699.py b/eos/effects/effect699.py
deleted file mode 100644
index 5401527b9..000000000
--- a/eos/effects/effect699.py
+++ /dev/null
@@ -1,15 +0,0 @@
-# signatureAnalysisScanResolutionBonusPostPercentScanResolutionShip
-#
-# Used by:
-# Implants named like: Zainou 'Gypsy' Signature Analysis SA (6 of 6)
-# Modules named like: Targeting System Subcontroller (8 of 8)
-# Implant: Quafe Zero
-# Skill: Signature Analysis
-type = "passive"
-
-
-def handler(fit, container, context):
-    level = container.level if "skill" in context else 1
-    penalized = False if "skill" in context or "implant" in context or "booster" in context else True
-    fit.ship.boostItemAttr("scanResolution", container.getModifiedItemAttr("scanResolutionBonus") * level,
-                           stackingPenalties=penalized)
diff --git a/eos/effects/effect6992.py b/eos/effects/effect6992.py
deleted file mode 100644
index bbec67fbd..000000000
--- a/eos/effects/effect6992.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# roleBonusMHTDamage1
-#
-# Used by:
-# Ship: Victor
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Hybrid Turret"), "damageMultiplier", src.getModifiedItemAttr("shipBonusRole1"))
diff --git a/eos/effects/effect6993.py b/eos/effects/effect6993.py
deleted file mode 100644
index 19645f49e..000000000
--- a/eos/effects/effect6993.py
+++ /dev/null
@@ -1,21 +0,0 @@
-# roleBonus2BoosterPenaltyReduction
-#
-# Used by:
-# Ship: Victor
-# Ship: Virtuoso
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.boosters.filteredItemBoost(lambda mod: mod.item.group.name == "Booster", "boosterMissileAOECloudPenalty", src.getModifiedItemAttr("shipBonusRole2"))
-    fit.boosters.filteredItemBoost(lambda mod: mod.item.group.name == "Booster", "boosterCapacitorCapacityPenalty", src.getModifiedItemAttr("shipBonusRole2"))
-    fit.boosters.filteredItemBoost(lambda mod: mod.item.group.name == "Booster", "boosterAOEVelocityPenalty", src.getModifiedItemAttr("shipBonusRole2"))
-    fit.boosters.filteredItemBoost(lambda mod: mod.item.group.name == "Booster", "boosterArmorRepairAmountPenalty", src.getModifiedItemAttr("shipBonusRole2"))
-    fit.boosters.filteredItemBoost(lambda mod: mod.item.group.name == "Booster", "boosterMissileVelocityPenalty", src.getModifiedItemAttr("shipBonusRole2"))
-    fit.boosters.filteredItemBoost(lambda mod: mod.item.group.name == "Booster", "boosterTurretTrackingPenalty", src.getModifiedItemAttr("shipBonusRole2"))
-    fit.boosters.filteredItemBoost(lambda mod: mod.item.group.name == "Booster", "boosterShieldCapacityPenalty", src.getModifiedItemAttr("shipBonusRole2"))
-    fit.boosters.filteredItemBoost(lambda mod: mod.item.group.name == "Booster", "boosterTurretOptimalRangePenalty", src.getModifiedItemAttr("shipBonusRole2"))
-    fit.boosters.filteredItemBoost(lambda mod: mod.item.group.name == "Booster", "boosterShieldBoostAmountPenalty", src.getModifiedItemAttr("shipBonusRole2"))
-    fit.boosters.filteredItemBoost(lambda mod: mod.item.group.name == "Booster", "boosterTurretFalloffPenalty", src.getModifiedItemAttr("shipBonusRole2"))
-    fit.boosters.filteredItemBoost(lambda mod: mod.item.group.name == "Booster", "boosterArmorHPPenalty", src.getModifiedItemAttr("shipBonusRole2"))
-    fit.boosters.filteredItemBoost(lambda mod: mod.item.group.name == "Booster", "boosterMaxVelocityPenalty", src.getModifiedItemAttr("shipBonusRole2"))
diff --git a/eos/effects/effect6994.py b/eos/effects/effect6994.py
deleted file mode 100644
index 3bb0f6833..000000000
--- a/eos/effects/effect6994.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# eliteReconBonusMHTDamage1
-#
-# Used by:
-# Ship: Victor
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Hybrid Turret"), "damageMultiplier",
-                                  src.getModifiedItemAttr("eliteBonusReconShip1"), skill="Recon Ships")
diff --git a/eos/effects/effect6995.py b/eos/effects/effect6995.py
deleted file mode 100644
index 66dac5bc6..000000000
--- a/eos/effects/effect6995.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# targetABCAttack
-#
-# Used by:
-# Modules from group: Precursor Weapon (15 of 15)
-type = 'active'
-
-
-def handler(fit, module, context):
-    # Set reload time to 1 second
-    module.reloadTime = 1000
diff --git a/eos/effects/effect6996.py b/eos/effects/effect6996.py
deleted file mode 100644
index 658f94883..000000000
--- a/eos/effects/effect6996.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# eliteReconBonusArmorRepAmount3
-#
-# Used by:
-# Ship: Victor
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Repair Systems"), "armorDamageAmount",
-                                  src.getModifiedItemAttr("eliteBonusReconShip3"), skill="Recon Ships")
diff --git a/eos/effects/effect6997.py b/eos/effects/effect6997.py
deleted file mode 100644
index 00a63046b..000000000
--- a/eos/effects/effect6997.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# eliteCovertOpsBonusArmorRepAmount4
-#
-# Used by:
-# Ship: Virtuoso
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Repair Systems"), "armorDamageAmount",
-                                  src.getModifiedItemAttr("eliteBonusCovertOps4"), skill="Covert Ops")
diff --git a/eos/effects/effect6999.py b/eos/effects/effect6999.py
deleted file mode 100644
index 926aa81c0..000000000
--- a/eos/effects/effect6999.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# covertOpsStealthBomberSiegeMissileLauncherCPUNeedBonus
-#
-# Used by:
-# Ship: Virtuoso
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemMultiply(lambda mod: mod.item.group.name == "Missile Launcher Torpedo",
-                                     "cpu", ship.getModifiedItemAttr("stealthBomberLauncherCPU"))
diff --git a/eos/effects/effect7000.py b/eos/effects/effect7000.py
deleted file mode 100644
index 1173ac822..000000000
--- a/eos/effects/effect7000.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusSHTFalloffGF1
-#
-# Used by:
-# Ship: Virtuoso
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Hybrid Turret"), "falloff",
-                                  src.getModifiedItemAttr("shipBonusGF"), skill="Gallente Frigate")
diff --git a/eos/effects/effect7001.py b/eos/effects/effect7001.py
deleted file mode 100644
index c87583d18..000000000
--- a/eos/effects/effect7001.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# roleBonusTorpRoF1
-#
-# Used by:
-# Ship: Virtuoso
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Missile Launcher Torpedo", "speed", src.getModifiedItemAttr("shipBonusRole1"))
diff --git a/eos/effects/effect7002.py b/eos/effects/effect7002.py
deleted file mode 100644
index e61365e2a..000000000
--- a/eos/effects/effect7002.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# roleBonusBombLauncherPWGCPU3
-#
-# Used by:
-# Ship: Virtuoso
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Bomb Deployment"), "power", src.getModifiedItemAttr("shipBonusRole3"))
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Bomb Deployment"), "cpu", src.getModifiedItemAttr("shipBonusRole3"))
diff --git a/eos/effects/effect7003.py b/eos/effects/effect7003.py
deleted file mode 100644
index 2a9628566..000000000
--- a/eos/effects/effect7003.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# eliteBonusCovertOpsSHTDamage3
-#
-# Used by:
-# Ship: Virtuoso
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Hybrid Turret"), "damageMultiplier",
-                                  src.getModifiedItemAttr("eliteBonusCovertOps3"), skill="Covert Ops")
diff --git a/eos/effects/effect7008.py b/eos/effects/effect7008.py
deleted file mode 100644
index 5ae185d64..000000000
--- a/eos/effects/effect7008.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# structureFullPowerStateHitpointModifier
-#
-# Used by:
-# Items from category: Structure (17 of 17)
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.ship.multiplyItemAttr("shieldCapacity", src.getModifiedItemAttr("structureFullPowerStateHitpointMultiplier") or 0)
-    fit.ship.multiplyItemAttr("armorHP", src.getModifiedItemAttr("structureFullPowerStateHitpointMultiplier") or 0)
diff --git a/eos/effects/effect7009.py b/eos/effects/effect7009.py
deleted file mode 100644
index a4f574110..000000000
--- a/eos/effects/effect7009.py
+++ /dev/null
@@ -1,14 +0,0 @@
-# serviceModuleFullPowerHitpointPostAssign
-#
-# Used by:
-# Structure Modules from group: Structure Citadel Service Module (2 of 2)
-# Structure Modules from group: Structure Engineering Service Module (6 of 6)
-# Structure Modules from group: Structure Navigation Service Module (3 of 3)
-# Structure Modules from group: Structure Resource Processing Service Module (4 of 4)
-# Structure Module: Standup Moon Drill I
-type = "passive"
-runTime = "early"
-
-
-def handler(fit, src, context):
-    fit.ship.forceItemAttr("structureFullPowerStateHitpointMultiplier", src.getModifiedItemAttr("serviceModuleFullPowerStateHitpointMultiplier"))
diff --git a/eos/effects/effect7012.py b/eos/effects/effect7012.py
deleted file mode 100644
index a7a6d9551..000000000
--- a/eos/effects/effect7012.py
+++ /dev/null
@@ -1,16 +0,0 @@
-# moduleBonusAssaultDamageControl
-#
-# Used by:
-# Variations of module: Assault Damage Control I (5 of 5)
-type = "active"
-runTime = "early"
-
-
-def handler(fit, src, context):
-    for layer, attrPrefix in (('shield', 'shield'), ('armor', 'armor'), ('hull', '')):
-        for damageType in ('Kinetic', 'Thermal', 'Explosive', 'Em'):
-            bonus = "%s%sDamageResonance" % (attrPrefix, damageType)
-            bonus = "%s%s" % (bonus[0].lower(), bonus[1:])
-            booster = "%s%sDamageResonance" % (layer, damageType)
-
-            src.forceItemAttr(booster, src.getModifiedItemAttr("resistanceMultiplier"))
diff --git a/eos/effects/effect7013.py b/eos/effects/effect7013.py
deleted file mode 100644
index 18afde89e..000000000
--- a/eos/effects/effect7013.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# eliteBonusGunshipKineticMissileDamage1
-#
-# Used by:
-# Ship: Jaguar
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"), "kineticDamage",
-                                    src.getModifiedItemAttr("eliteBonusGunship1"), skill="Assault Frigates")
diff --git a/eos/effects/effect7014.py b/eos/effects/effect7014.py
deleted file mode 100644
index 04ee9c25d..000000000
--- a/eos/effects/effect7014.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# eliteBonusGunshipThermalMissileDamage1
-#
-# Used by:
-# Ship: Jaguar
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"), "thermalDamage",
-                                    src.getModifiedItemAttr("eliteBonusGunship1"), skill="Assault Frigates")
diff --git a/eos/effects/effect7015.py b/eos/effects/effect7015.py
deleted file mode 100644
index ae5a4aed2..000000000
--- a/eos/effects/effect7015.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# eliteBonusGunshipEMMissileDamage1
-#
-# Used by:
-# Ship: Jaguar
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"), "emDamage",
-                                    src.getModifiedItemAttr("eliteBonusGunship1"), skill="Assault Frigates")
diff --git a/eos/effects/effect7016.py b/eos/effects/effect7016.py
deleted file mode 100644
index 626f6ce51..000000000
--- a/eos/effects/effect7016.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# eliteBonusGunshipExplosiveMissileDamage1
-#
-# Used by:
-# Ship: Jaguar
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"), "explosiveDamage",
-                                    src.getModifiedItemAttr("eliteBonusGunship1"), skill="Assault Frigates")
diff --git a/eos/effects/effect7017.py b/eos/effects/effect7017.py
deleted file mode 100644
index e17de01c1..000000000
--- a/eos/effects/effect7017.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# eliteBonusGunshipExplosionVelocity2
-#
-# Used by:
-# Ship: Jaguar
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"), "aoeVelocity",
-                                    src.getModifiedItemAttr("eliteBonusGunship2"), stackingPenalties=True, skill="Assault Frigates")
diff --git a/eos/effects/effect7018.py b/eos/effects/effect7018.py
deleted file mode 100644
index df4394b19..000000000
--- a/eos/effects/effect7018.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipSETROFAF
-#
-# Used by:
-# Ship: Retribution
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Energy Turret"), "speed",
-                                  src.getModifiedItemAttr("shipBonusAF"), stackingPenalties=False, skill="Amarr Frigate")
diff --git a/eos/effects/effect7020.py b/eos/effects/effect7020.py
deleted file mode 100644
index 531f18ded..000000000
--- a/eos/effects/effect7020.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# remoteWebifierMaxRangeBonus
-#
-# Used by:
-# Implants named like: Inquest 'Eros' Stasis Webifier MR (3 of 3)
-# Implants named like: Inquest 'Hedone' Entanglement Optimizer WS (3 of 3)
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Stasis Web", "maxRange",
-                                  src.getModifiedItemAttr("stasisWebRangeBonus"), stackingPenalties=False)
diff --git a/eos/effects/effect7021.py b/eos/effects/effect7021.py
deleted file mode 100644
index 52ac17bc8..000000000
--- a/eos/effects/effect7021.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# structureRigMaxTargetRange
-#
-# Used by:
-# Structure Modules from group: Structure Combat Rig L - Max Targets and Sensor Boosting (2 of 2)
-# Structure Modules from group: Structure Combat Rig M - Boosted Sensors (2 of 2)
-# Structure Modules from group: Structure Combat Rig XL - Doomsday and Targeting (2 of 2)
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.ship.boostItemAttr("maxTargetRange", module.getModifiedItemAttr("structureRigMaxTargetRangeBonus"))
diff --git a/eos/effects/effect7024.py b/eos/effects/effect7024.py
deleted file mode 100644
index 20c82238a..000000000
--- a/eos/effects/effect7024.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusDroneTrackingEliteGunship2
-#
-# Used by:
-# Ship: Ishkur
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill("Drones"), "trackingSpeed",
-                                 src.getModifiedItemAttr("eliteBonusGunship2"), skill="Assault Frigates")
diff --git a/eos/effects/effect7026.py b/eos/effects/effect7026.py
deleted file mode 100644
index 6f03786d6..000000000
--- a/eos/effects/effect7026.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# scriptStandupWarpScram
-#
-# Used by:
-# Charge: Standup Focused Warp Scrambling Script
-
-type = "passive"
-runTime = "early"
-
-
-def handler(fit, src, context, *args, **kwargs):
-    src.boostItemAttr("maxRange", src.getModifiedChargeAttr("warpScrambleRangeBonus"))
diff --git a/eos/effects/effect7027.py b/eos/effects/effect7027.py
deleted file mode 100644
index b0477fe60..000000000
--- a/eos/effects/effect7027.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# structureCapacitorCapacityBonus
-#
-# Used by:
-# Structure Modules from group: Structure Capacitor Battery (2 of 2)
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.ship.increaseItemAttr("capacitorCapacity", ship.getModifiedItemAttr("capacitorBonus"))
diff --git a/eos/effects/effect7028.py b/eos/effects/effect7028.py
deleted file mode 100644
index f5977b6fe..000000000
--- a/eos/effects/effect7028.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# structureModifyPowerRechargeRate
-#
-# Used by:
-# Structure Modules from group: Structure Capacitor Power Relay (2 of 2)
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.ship.multiplyItemAttr("rechargeRate", module.getModifiedItemAttr("capacitorRechargeRateMultiplier"))
diff --git a/eos/effects/effect7029.py b/eos/effects/effect7029.py
deleted file mode 100644
index 9c2c727ae..000000000
--- a/eos/effects/effect7029.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# structureArmorHPBonus
-#
-# Used by:
-# Structure Modules from group: Structure Armor Reinforcer (2 of 2)
-type = "passive"
-runTime = "early"
-
-
-def handler(fit, src, context):
-    fit.ship.boostItemAttr("hiddenArmorHPMultiplier", src.getModifiedItemAttr("armorHpBonus"), stackingPenalties=True)
diff --git a/eos/effects/effect7030.py b/eos/effects/effect7030.py
deleted file mode 100644
index 48dc00c7d..000000000
--- a/eos/effects/effect7030.py
+++ /dev/null
@@ -1,15 +0,0 @@
-# structureAoERoFRoleBonus
-#
-# Used by:
-# Items from category: Structure (11 of 17)
-# Structures from group: Citadel (8 of 9)
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Structure Guided Bomb Launcher",
-                                  "speed", ship.getModifiedItemAttr("structureAoERoFRoleBonus"))
-    for attr in ["duration", "durationTargetIlluminationBurstProjector", "durationWeaponDisruptionBurstProjector",
-                 "durationECMJammerBurstProjector", "durationSensorDampeningBurstProjector", "capacitorNeed"]:
-        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Structure Burst Projector",
-                                      attr, ship.getModifiedItemAttr("structureAoERoFRoleBonus"))
diff --git a/eos/effects/effect7031.py b/eos/effects/effect7031.py
deleted file mode 100644
index f9ef052fa..000000000
--- a/eos/effects/effect7031.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusHeavyMissileKineticDamageCBC2
-#
-# Used by:
-# Ship: Drake Navy Issue
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Missiles"), "kineticDamage",
-                                    src.getModifiedItemAttr("shipBonusCBC2"), skill="Caldari Battlecruiser")
diff --git a/eos/effects/effect7032.py b/eos/effects/effect7032.py
deleted file mode 100644
index cf22a33c3..000000000
--- a/eos/effects/effect7032.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusHeavyMissileThermalDamageCBC2
-#
-# Used by:
-# Ship: Drake Navy Issue
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Missiles"), "thermalDamage",
-                                    src.getModifiedItemAttr("shipBonusCBC2"), skill="Caldari Battlecruiser")
diff --git a/eos/effects/effect7033.py b/eos/effects/effect7033.py
deleted file mode 100644
index a2e53af5a..000000000
--- a/eos/effects/effect7033.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusHeavyMissileEMDamageCBC2
-#
-# Used by:
-# Ship: Drake Navy Issue
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Missiles"),
-                                    "emDamage", src.getModifiedItemAttr("shipBonusCBC2"), skill="Caldari Battlecruiser")
diff --git a/eos/effects/effect7034.py b/eos/effects/effect7034.py
deleted file mode 100644
index c4a2df83e..000000000
--- a/eos/effects/effect7034.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusHeavyMissileExplosiveDamageCBC2
-#
-# Used by:
-# Ship: Drake Navy Issue
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Missiles"), "explosiveDamage",
-                                    src.getModifiedItemAttr("shipBonusCBC2"), skill="Caldari Battlecruiser")
diff --git a/eos/effects/effect7035.py b/eos/effects/effect7035.py
deleted file mode 100644
index 3ea3ea593..000000000
--- a/eos/effects/effect7035.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusHeavyAssaultMissileExplosiveDamageCBC2
-#
-# Used by:
-# Ship: Drake Navy Issue
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Assault Missiles"), "explosiveDamage",
-                                    src.getModifiedItemAttr("shipBonusCBC2"), skill="Caldari Battlecruiser")
diff --git a/eos/effects/effect7036.py b/eos/effects/effect7036.py
deleted file mode 100644
index dc9dfef75..000000000
--- a/eos/effects/effect7036.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusHeavyAssaultMissileEMDamageCBC2
-#
-# Used by:
-# Ship: Drake Navy Issue
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Assault Missiles"), "emDamage",
-                                    src.getModifiedItemAttr("shipBonusCBC2"), skill="Caldari Battlecruiser")
diff --git a/eos/effects/effect7037.py b/eos/effects/effect7037.py
deleted file mode 100644
index dd3e5b94a..000000000
--- a/eos/effects/effect7037.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusHeavyAssaultMissileThermalDamageCBC2
-#
-# Used by:
-# Ship: Drake Navy Issue
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Assault Missiles"),
-                                    "thermalDamage", src.getModifiedItemAttr("shipBonusCBC2"), skill="Caldari Battlecruiser")
diff --git a/eos/effects/effect7038.py b/eos/effects/effect7038.py
deleted file mode 100644
index fdb946508..000000000
--- a/eos/effects/effect7038.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusHeavyAssaultMissileKineticDamageCBC2
-#
-# Used by:
-# Ship: Drake Navy Issue
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Assault Missiles"),
-                                    "kineticDamage", src.getModifiedItemAttr("shipBonusCBC2"), skill="Caldari Battlecruiser")
diff --git a/eos/effects/effect7039.py b/eos/effects/effect7039.py
deleted file mode 100644
index 61abbf2f4..000000000
--- a/eos/effects/effect7039.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# structureHiddenMissileDamageMultiplier
-#
-# Used by:
-# Items from category: Structure (14 of 17)
-type = "passive"
-
-
-def handler(fit, src, context):
-    groups = ("Structure Anti-Subcapital Missile", "Structure Anti-Capital Missile")
-    for dmgType in ("em", "kinetic", "explosive", "thermal"):
-        fit.modules.filteredChargeMultiply(lambda mod: mod.item.group.name in groups,
-                                           "%sDamage" % dmgType,
-                                           src.getModifiedItemAttr("hiddenMissileDamageMultiplier"))
diff --git a/eos/effects/effect7040.py b/eos/effects/effect7040.py
deleted file mode 100644
index af1b39be3..000000000
--- a/eos/effects/effect7040.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# structureHiddenArmorHPMultiplier
-#
-# Used by:
-# Items from category: Structure (17 of 17)
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.ship.multiplyItemAttr("armorHP", src.getModifiedItemAttr("hiddenArmorHPMultiplier") or 0)
diff --git a/eos/effects/effect7042.py b/eos/effects/effect7042.py
deleted file mode 100644
index 853eed5d1..000000000
--- a/eos/effects/effect7042.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# shipArmorHitPointsAC1
-#
-# Used by:
-# Ship: Monitor
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.ship.boostItemAttr("armorHP", src.getModifiedItemAttr("shipBonusAC"), skill="Amarr Cruiser")
diff --git a/eos/effects/effect7043.py b/eos/effects/effect7043.py
deleted file mode 100644
index 06fdfea96..000000000
--- a/eos/effects/effect7043.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# shipShieldHitpointsCC1
-#
-# Used by:
-# Ship: Monitor
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.ship.boostItemAttr("shieldCapacity", src.getModifiedItemAttr("shipBonusCC"), skill="Caldari Cruiser")
diff --git a/eos/effects/effect7044.py b/eos/effects/effect7044.py
deleted file mode 100644
index 6c08d527f..000000000
--- a/eos/effects/effect7044.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# shipAgilityBonusGC1
-#
-# Used by:
-# Ship: Monitor
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.ship.boostItemAttr("agility", src.getModifiedItemAttr("shipBonusGC"), skill="Gallente Cruiser")
diff --git a/eos/effects/effect7045.py b/eos/effects/effect7045.py
deleted file mode 100644
index e366d23af..000000000
--- a/eos/effects/effect7045.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# shipSignatureRadiusMC1
-#
-# Used by:
-# Ship: Monitor
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.ship.boostItemAttr("signatureRadius", src.getModifiedItemAttr("shipBonusMC"), skill="Minmatar Cruiser")
diff --git a/eos/effects/effect7046.py b/eos/effects/effect7046.py
deleted file mode 100644
index 5ca4a504d..000000000
--- a/eos/effects/effect7046.py
+++ /dev/null
@@ -1,20 +0,0 @@
-# eliteBonusFlagCruiserAllResistances1
-#
-# Used by:
-# Ship: Monitor
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.ship.boostItemAttr("explosiveDamageResonance", src.getModifiedItemAttr("eliteBonusFlagCruisers1"), skill="Flag Cruisers")
-    fit.ship.boostItemAttr("shieldKineticDamageResonance", src.getModifiedItemAttr("eliteBonusFlagCruisers1"), skill="Flag Cruisers")
-    fit.ship.boostItemAttr("shieldExplosiveDamageResonance", src.getModifiedItemAttr("eliteBonusFlagCruisers1"), skill="Flag Cruisers")
-    fit.ship.boostItemAttr("armorThermalDamageResonance", src.getModifiedItemAttr("eliteBonusFlagCruisers1"), skill="Flag Cruisers")
-    fit.ship.boostItemAttr("thermalDamageResonance", src.getModifiedItemAttr("eliteBonusFlagCruisers1"), skill="Flag Cruisers")
-    fit.ship.boostItemAttr("shieldEmDamageResonance", src.getModifiedItemAttr("eliteBonusFlagCruisers1"), skill="Flag Cruisers")
-    fit.ship.boostItemAttr("armorExplosiveDamageResonance", src.getModifiedItemAttr("eliteBonusFlagCruisers1"), skill="Flag Cruisers")
-    fit.ship.boostItemAttr("armorEmDamageResonance", src.getModifiedItemAttr("eliteBonusFlagCruisers1"), skill="Flag Cruisers")
-    fit.ship.boostItemAttr("shieldThermalDamageResonance", src.getModifiedItemAttr("eliteBonusFlagCruisers1"), skill="Flag Cruisers")
-    fit.ship.boostItemAttr("kineticDamageResonance", src.getModifiedItemAttr("eliteBonusFlagCruisers1"), skill="Flag Cruisers")
-    fit.ship.boostItemAttr("armorKineticDamageResonance", src.getModifiedItemAttr("eliteBonusFlagCruisers1"), skill="Flag Cruisers")
-    fit.ship.boostItemAttr("emDamageResonance", src.getModifiedItemAttr("eliteBonusFlagCruisers1"), skill="Flag Cruisers")
diff --git a/eos/effects/effect7047.py b/eos/effects/effect7047.py
deleted file mode 100644
index 2020db2d9..000000000
--- a/eos/effects/effect7047.py
+++ /dev/null
@@ -1,17 +0,0 @@
-# roleBonusFlagCruiserModuleFittingReduction
-#
-# Used by:
-# Ship: Monitor
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name in ("Propulsion Module", "Micro Jump Drive"),
-                                  "power", src.getModifiedItemAttr("flagCruiserFittingBonusPropMods"))
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name in ("Propulsion Module", "Micro Jump Drive"),
-                                  "cpu", src.getModifiedItemAttr("flagCruiserFittingBonusPropMods"))
-
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name in ("Target Painter", "Scan Probe Launcher"),
-                                  "cpu", src.getModifiedItemAttr("flagCruiserFittingBonusPainterProbes"))
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name in ("Target Painter", "Scan Probe Launcher"),
-                                  "power", src.getModifiedItemAttr("flagCruiserFittingBonusPainterProbes"))
diff --git a/eos/effects/effect7050.py b/eos/effects/effect7050.py
deleted file mode 100644
index fa01e217d..000000000
--- a/eos/effects/effect7050.py
+++ /dev/null
@@ -1,16 +0,0 @@
-# aoe_beacon_bioluminescence_cloud
-#
-# Used by:
-# Celestials named like: Bioluminescence Cloud (3 of 3)
-runTime = "early"
-type = ("projected", "passive", "gang")
-
-
-def handler(fit, beacon, context, **kwargs):
-    for x in range(1, 3):
-        if beacon.getModifiedItemAttr("warfareBuff{}ID".format(x)):
-            value = beacon.getModifiedItemAttr("warfareBuff{}Value".format(x))
-            id = beacon.getModifiedItemAttr("warfareBuff{}ID".format(x))
-
-            if id:
-                fit.addCommandBonus(id, value, beacon, kwargs['effect'], 'early')
diff --git a/eos/effects/effect7051.py b/eos/effects/effect7051.py
deleted file mode 100644
index f11c9805b..000000000
--- a/eos/effects/effect7051.py
+++ /dev/null
@@ -1,16 +0,0 @@
-# aoe_beacon_caustic_cloud
-#
-# Used by:
-# Celestials named like: Caustic Cloud (3 of 3)
-runTime = "early"
-type = ("projected", "passive", "gang")
-
-
-def handler(fit, beacon, context, **kwargs):
-    for x in range(1, 3):
-        if beacon.getModifiedItemAttr("warfareBuff{}ID".format(x)):
-            value = beacon.getModifiedItemAttr("warfareBuff{}Value".format(x))
-            id = beacon.getModifiedItemAttr("warfareBuff{}ID".format(x))
-
-            if id:
-                fit.addCommandBonus(id, value, beacon, kwargs['effect'], 'early')
diff --git a/eos/effects/effect7052.py b/eos/effects/effect7052.py
deleted file mode 100644
index 7400a0707..000000000
--- a/eos/effects/effect7052.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# roleBonusFlagCruiserTargetPainterModifications
-#
-# Used by:
-# Ship: Monitor
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Target Painter", "signatureRadiusBonus",
-                                  src.getModifiedItemAttr("targetPainterStrengthModifierFlagCruisers"))
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Target Painter", "maxRange",
-                                  src.getModifiedItemAttr("targetPainterRangeModifierFlagCruisers"))
diff --git a/eos/effects/effect7055.py b/eos/effects/effect7055.py
deleted file mode 100644
index a734806d8..000000000
--- a/eos/effects/effect7055.py
+++ /dev/null
@@ -1,38 +0,0 @@
-# shipLargeWeaponsDamageBonus
-#
-# Used by:
-# Ship: Praxis
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Large Hybrid Turret"), "damageMultiplier",
-                                  src.getModifiedItemAttr("shipBonusRole7"))
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Large Projectile Turret"), "damageMultiplier",
-                                  src.getModifiedItemAttr("shipBonusRole7"))
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Large Energy Turret"), "damageMultiplier",
-                                  src.getModifiedItemAttr("shipBonusRole7"))
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Missiles"), "thermalDamage",
-                                    src.getModifiedItemAttr("shipBonusRole7"))
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Missiles"), "emDamage",
-                                    src.getModifiedItemAttr("shipBonusRole7"))
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Missiles"), "kineticDamage",
-                                    src.getModifiedItemAttr("shipBonusRole7"))
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Missiles"), "explosiveDamage",
-                                    src.getModifiedItemAttr("shipBonusRole7"))
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Torpedoes"), "emDamage",
-                                    src.getModifiedItemAttr("shipBonusRole7"))
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Torpedoes"), "kineticDamage",
-                                    src.getModifiedItemAttr("shipBonusRole7"))
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Torpedoes"), "explosiveDamage",
-                                    src.getModifiedItemAttr("shipBonusRole7"))
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Torpedoes"), "thermalDamage",
-                                    src.getModifiedItemAttr("shipBonusRole7"))
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Cruise Missiles"), "thermalDamage",
-                                    src.getModifiedItemAttr("shipBonusRole7"))
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Cruise Missiles"), "explosiveDamage",
-                                    src.getModifiedItemAttr("shipBonusRole7"))
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Cruise Missiles"), "kineticDamage",
-                                    src.getModifiedItemAttr("shipBonusRole7"))
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Cruise Missiles"), "emDamage",
-                                    src.getModifiedItemAttr("shipBonusRole7"))
diff --git a/eos/effects/effect7058.py b/eos/effects/effect7058.py
deleted file mode 100644
index 085114e7c..000000000
--- a/eos/effects/effect7058.py
+++ /dev/null
@@ -1,16 +0,0 @@
-# aoe_beacon_filament_cloud
-#
-# Used by:
-# Celestials named like: Filament Cloud (3 of 3)
-runTime = "early"
-type = ("projected", "passive", "gang")
-
-
-def handler(fit, beacon, context, **kwargs):
-    for x in range(1, 3):
-        if beacon.getModifiedItemAttr("warfareBuff{}ID".format(x)):
-            value = beacon.getModifiedItemAttr("warfareBuff{}Value".format(x))
-            id = beacon.getModifiedItemAttr("warfareBuff{}ID".format(x))
-
-            if id:
-                fit.addCommandBonus(id, value, beacon, kwargs['effect'], 'early')
diff --git a/eos/effects/effect7059.py b/eos/effects/effect7059.py
deleted file mode 100644
index c13489860..000000000
--- a/eos/effects/effect7059.py
+++ /dev/null
@@ -1,18 +0,0 @@
-# weather_caustic_toxin
-#
-# Used by:
-# Celestial: caustic_toxin_weather_1
-# Celestial: caustic_toxin_weather_2
-# Celestial: caustic_toxin_weather_3
-runTime = "early"
-type = ("projected", "passive", "gang")
-
-
-def handler(fit, beacon, context, **kwargs):
-    for x in range(1, 3):
-        if beacon.getModifiedItemAttr("warfareBuff{}ID".format(x)):
-            value = beacon.getModifiedItemAttr("warfareBuff{}Value".format(x))
-            id = beacon.getModifiedItemAttr("warfareBuff{}ID".format(x))
-
-            if id:
-                fit.addCommandBonus(id, value, beacon, kwargs['effect'], 'early')
diff --git a/eos/effects/effect706.py b/eos/effects/effect706.py
deleted file mode 100644
index 1ab7538c1..000000000
--- a/eos/effects/effect706.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# covertOpsWarpResistance
-#
-# Used by:
-# Ships from group: Covert Ops (5 of 8)
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.ship.increaseItemAttr("warpFactor", src.getModifiedItemAttr("eliteBonusCovertOps1"), skill="Covert Ops")
diff --git a/eos/effects/effect7060.py b/eos/effects/effect7060.py
deleted file mode 100644
index c67b7924d..000000000
--- a/eos/effects/effect7060.py
+++ /dev/null
@@ -1,18 +0,0 @@
-# weather_darkness
-#
-# Used by:
-# Celestial: darkness_weather_1
-# Celestial: darkness_weather_2
-# Celestial: darkness_weather_3
-# Celestial: pvp_weather_1
-runTime = "early"
-type = ("projected", "passive", "gang")
-
-
-def handler(fit, beacon, context, **kwargs):
-    for x in range(1, 5):
-        if beacon.getModifiedItemAttr("warfareBuff{}ID".format(x)):
-            value = beacon.getModifiedItemAttr("warfareBuff{}Value".format(x))
-            id = beacon.getModifiedItemAttr("warfareBuff{}ID".format(x))
-            if id:
-                fit.addCommandBonus(id, value, beacon, kwargs['effect'], 'early')
diff --git a/eos/effects/effect7061.py b/eos/effects/effect7061.py
deleted file mode 100644
index b6e78935f..000000000
--- a/eos/effects/effect7061.py
+++ /dev/null
@@ -1,18 +0,0 @@
-# weather_electric_storm
-#
-# Used by:
-# Celestial: electric_storm_weather_1
-# Celestial: electric_storm_weather_2
-# Celestial: electric_storm_weather_3
-runTime = "early"
-type = ("projected", "passive", "gang")
-
-
-def handler(fit, beacon, context, **kwargs):
-    for x in range(1, 3):
-        if beacon.getModifiedItemAttr("warfareBuff{}ID".format(x)):
-            value = beacon.getModifiedItemAttr("warfareBuff{}Value".format(x))
-            id = beacon.getModifiedItemAttr("warfareBuff{}ID".format(x))
-
-            if id:
-                fit.addCommandBonus(id, value, beacon, kwargs['effect'], 'early')
diff --git a/eos/effects/effect7062.py b/eos/effects/effect7062.py
deleted file mode 100644
index 9ddfe1a30..000000000
--- a/eos/effects/effect7062.py
+++ /dev/null
@@ -1,18 +0,0 @@
-# weather_infernal
-#
-# Used by:
-# Celestial: infernal_weather_1
-# Celestial: infernal_weather_2
-# Celestial: infernal_weather_3
-runTime = "early"
-type = ("projected", "passive", "gang")
-
-
-def handler(fit, beacon, context, **kwargs):
-    for x in range(1, 3):
-        if beacon.getModifiedItemAttr("warfareBuff{}ID".format(x)):
-            value = beacon.getModifiedItemAttr("warfareBuff{}Value".format(x))
-            id = beacon.getModifiedItemAttr("warfareBuff{}ID".format(x))
-
-            if id:
-                fit.addCommandBonus(id, value, beacon, kwargs['effect'], 'early')
diff --git a/eos/effects/effect7063.py b/eos/effects/effect7063.py
deleted file mode 100644
index 913a7de2b..000000000
--- a/eos/effects/effect7063.py
+++ /dev/null
@@ -1,18 +0,0 @@
-# weather_xenon_gas
-#
-# Used by:
-# Celestial: xenon_gas_weather_1
-# Celestial: xenon_gas_weather_2
-# Celestial: xenon_gas_weather_3
-runTime = "early"
-type = ("projected", "passive", "gang")
-
-
-def handler(fit, beacon, context, **kwargs):
-    for x in range(1, 3):
-        if beacon.getModifiedItemAttr("warfareBuff{}ID".format(x)):
-            value = beacon.getModifiedItemAttr("warfareBuff{}Value".format(x))
-            id = beacon.getModifiedItemAttr("warfareBuff{}ID".format(x))
-
-            if id:
-                fit.addCommandBonus(id, value, beacon, kwargs['effect'], 'early')
diff --git a/eos/effects/effect7064.py b/eos/effects/effect7064.py
deleted file mode 100644
index 61b26655c..000000000
--- a/eos/effects/effect7064.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# weather_basic
-#
-# Used by:
-# Celestial: basic_weather
-runTime = "early"
-type = ("projected", "passive")
-
-
-def handler(fit, beacon, context):
-    pass
diff --git a/eos/effects/effect7071.py b/eos/effects/effect7071.py
deleted file mode 100644
index 1d3fbe176..000000000
--- a/eos/effects/effect7071.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# smallPrecursorTurretDmgBonusRequiredSkill
-#
-# Used by:
-# Skill: Small Precursor Weapon
-type = "passive"
-
-
-def handler(fit, container, context):
-    level = container.level if "skill" in context else 1
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Precursor Weapon"),
-                                  "damageMultiplier", container.getModifiedItemAttr("damageMultiplierBonus") * level)
diff --git a/eos/effects/effect7072.py b/eos/effects/effect7072.py
deleted file mode 100644
index c35fcda31..000000000
--- a/eos/effects/effect7072.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# mediumPrecursorTurretDmgBonusRequiredSkill
-#
-# Used by:
-# Skill: Medium Precursor Weapon
-type = "passive"
-
-
-def handler(fit, container, context):
-    level = container.level if "skill" in context else 1
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Precursor Weapon"),
-                                  "damageMultiplier", container.getModifiedItemAttr("damageMultiplierBonus") * level)
diff --git a/eos/effects/effect7073.py b/eos/effects/effect7073.py
deleted file mode 100644
index 32ba9bb8b..000000000
--- a/eos/effects/effect7073.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# largePrecursorTurretDmgBonusRequiredSkill
-#
-# Used by:
-# Skill: Large Precursor Weapon
-type = "passive"
-
-
-def handler(fit, container, context):
-    level = container.level if "skill" in context else 1
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Large Precursor Weapon"),
-                                  "damageMultiplier", container.getModifiedItemAttr("damageMultiplierBonus") * level)
diff --git a/eos/effects/effect7074.py b/eos/effects/effect7074.py
deleted file mode 100644
index 8a3b7babe..000000000
--- a/eos/effects/effect7074.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# smallDisintegratorSkillDmgBonus
-#
-# Used by:
-# Skill: Small Disintegrator Specialization
-type = "passive"
-
-
-def handler(fit, container, context):
-    level = container.level if "skill" in context else 1
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Disintegrator Specialization"),
-                                  "damageMultiplier", container.getModifiedItemAttr("damageMultiplierBonus") * level)
diff --git a/eos/effects/effect7075.py b/eos/effects/effect7075.py
deleted file mode 100644
index f7a2cc10e..000000000
--- a/eos/effects/effect7075.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# mediumDisintegratorSkillDmgBonus
-#
-# Used by:
-# Skill: Medium Disintegrator Specialization
-type = "passive"
-
-
-def handler(fit, container, context):
-    level = container.level if "skill" in context else 1
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Disintegrator Specialization"),
-                                  "damageMultiplier", container.getModifiedItemAttr("damageMultiplierBonus") * level)
diff --git a/eos/effects/effect7076.py b/eos/effects/effect7076.py
deleted file mode 100644
index c3b03337d..000000000
--- a/eos/effects/effect7076.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# largeDisintegratorSkillDmgBonus
-#
-# Used by:
-# Skill: Large Disintegrator Specialization
-type = "passive"
-
-
-def handler(fit, container, context):
-    level = container.level if "skill" in context else 1
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Large Disintegrator Specialization"),
-                                  "damageMultiplier", container.getModifiedItemAttr("damageMultiplierBonus") * level)
diff --git a/eos/effects/effect7077.py b/eos/effects/effect7077.py
deleted file mode 100644
index b070c9ee2..000000000
--- a/eos/effects/effect7077.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# disintegratorWeaponDamageMultiply
-#
-# Used by:
-# Modules from group: Entropic Radiation Sink (4 of 4)
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.modules.filteredItemMultiply(lambda mod: mod.item.group.name == "Precursor Weapon",
-                                     "damageMultiplier", module.getModifiedItemAttr("damageMultiplier"),
-                                     stackingPenalties=True)
diff --git a/eos/effects/effect7078.py b/eos/effects/effect7078.py
deleted file mode 100644
index eccf38371..000000000
--- a/eos/effects/effect7078.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# disintegratorWeaponSpeedMultiply
-#
-# Used by:
-# Modules from group: Entropic Radiation Sink (4 of 4)
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.modules.filteredItemMultiply(lambda mod: mod.item.group.name == "Precursor Weapon",
-                                     "speed", module.getModifiedItemAttr("speedMultiplier"),
-                                     stackingPenalties=True)
diff --git a/eos/effects/effect7079.py b/eos/effects/effect7079.py
deleted file mode 100644
index 9a35e373c..000000000
--- a/eos/effects/effect7079.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipPCBSSPeedBonusPCBS1
-#
-# Used by:
-# Ship: Leshak
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Large Precursor Weapon"),
-                                  "speed", ship.getModifiedItemAttr("shipBonusPBS1"), skill="Precursor Battleship")
diff --git a/eos/effects/effect7080.py b/eos/effects/effect7080.py
deleted file mode 100644
index 3f35b237c..000000000
--- a/eos/effects/effect7080.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipPCBSDmgBonusPCBS2
-#
-# Used by:
-# Ship: Leshak
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Large Precursor Weapon"),
-                                  "damageMultiplier", ship.getModifiedItemAttr("shipBonusPBS2"), skill="Precursor Battleship")
diff --git a/eos/effects/effect7085.py b/eos/effects/effect7085.py
deleted file mode 100644
index 06e686ab2..000000000
--- a/eos/effects/effect7085.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipbonusPCTDamagePC1
-#
-# Used by:
-# Ship: Tiamat
-# Ship: Vedmak
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Precursor Weapon"),
-                                  "damageMultiplier", ship.getModifiedItemAttr("shipBonusPC1"), skill="Precursor Cruiser")
diff --git a/eos/effects/effect7086.py b/eos/effects/effect7086.py
deleted file mode 100644
index 4914d290e..000000000
--- a/eos/effects/effect7086.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipbonusPCTTrackingPC2
-#
-# Used by:
-# Ship: Tiamat
-# Ship: Vedmak
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Precursor Weapon"),
-                                  "trackingSpeed", ship.getModifiedItemAttr("shipBonusPC2"), skill="Precursor Cruiser")
diff --git a/eos/effects/effect7087.py b/eos/effects/effect7087.py
deleted file mode 100644
index 7403b2146..000000000
--- a/eos/effects/effect7087.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipbonusPCTOptimalPF2
-#
-# Used by:
-# Ship: Damavik
-# Ship: Hydra
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Precursor Weapon"),
-                                  "maxRange", ship.getModifiedItemAttr("shipBonusPF2"), skill="Precursor Frigate")
diff --git a/eos/effects/effect7088.py b/eos/effects/effect7088.py
deleted file mode 100644
index 59a1071e2..000000000
--- a/eos/effects/effect7088.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipbonusPCTDamagePF1
-#
-# Used by:
-# Ship: Damavik
-# Ship: Hydra
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Precursor Weapon"),
-                                  "damageMultiplier", ship.getModifiedItemAttr("shipBonusPF1"), skill="Precursor Frigate")
diff --git a/eos/effects/effect7091.py b/eos/effects/effect7091.py
deleted file mode 100644
index ec427ec11..000000000
--- a/eos/effects/effect7091.py
+++ /dev/null
@@ -1,7 +0,0 @@
-# shipBonusNosNeutCapNeedRoleBonus2
-#
-# Used by:
-# Variations of ship: Rodiva (2 of 2)
-type = "passive"
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capacitor Emission Systems"), "capacitorNeed", src.getModifiedItemAttr("shipBonusRole2"))
diff --git a/eos/effects/effect7092.py b/eos/effects/effect7092.py
deleted file mode 100644
index ac4ef0aa0..000000000
--- a/eos/effects/effect7092.py
+++ /dev/null
@@ -1,16 +0,0 @@
-# shipBonusRemoteRepCapNeedRoleBonus2
-#
-# Used by:
-# Ship: Damavik
-# Ship: Drekavac
-# Ship: Hydra
-# Ship: Kikimora
-# Ship: Leshak
-# Ship: Tiamat
-# Ship: Vedmak
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Remote Armor Repair Systems"),
-                                  "capacitorNeed", ship.getModifiedItemAttr("shipBonusRole2"))
diff --git a/eos/effects/effect7093.py b/eos/effects/effect7093.py
deleted file mode 100644
index 69e4017a8..000000000
--- a/eos/effects/effect7093.py
+++ /dev/null
@@ -1,17 +0,0 @@
-# shipBonusSmartbombCapNeedRoleBonus2
-#
-# Used by:
-# Variations of ship: Rodiva (2 of 2)
-# Ship: Damavik
-# Ship: Drekavac
-# Ship: Hydra
-# Ship: Kikimora
-# Ship: Leshak
-# Ship: Tiamat
-# Ship: Vedmak
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Energy Pulse Weapons"),
-                                  "capacitorNeed", ship.getModifiedItemAttr("shipBonusRole2"))
diff --git a/eos/effects/effect7094.py b/eos/effects/effect7094.py
deleted file mode 100644
index 31963a4da..000000000
--- a/eos/effects/effect7094.py
+++ /dev/null
@@ -1,16 +0,0 @@
-# shipBonusRemoteRepMaxRangeRoleBonus1
-#
-# Used by:
-# Ship: Damavik
-# Ship: Drekavac
-# Ship: Hydra
-# Ship: Kikimora
-# Ship: Leshak
-# Ship: Tiamat
-# Ship: Vedmak
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Remote Armor Repair Systems"),
-                                  "maxRange", ship.getModifiedItemAttr("shipBonusRole1"))
diff --git a/eos/effects/effect7097.py b/eos/effects/effect7097.py
deleted file mode 100644
index f1aaa88e2..000000000
--- a/eos/effects/effect7097.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# surgicalStrikeDamageMultiplierBonusPostPercentDamageMultiplierLocationShipGroupPrecursorTurret
-#
-# Used by:
-# Skill: Surgical Strike
-type = "passive"
-
-
-def handler(fit, skill, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Precursor Weapon",
-                                  "damageMultiplier", skill.getModifiedItemAttr("damageMultiplierBonus") * skill.level)
diff --git a/eos/effects/effect7111.py b/eos/effects/effect7111.py
deleted file mode 100644
index 595b9a679..000000000
--- a/eos/effects/effect7111.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# systemSmallPrecursorTurretDamage
-#
-# Used by:
-# Celestials named like: Wolf Rayet Effect Beacon Class (5 of 6)
-runTime = "early"
-type = ("projected", "passive")
-
-
-def handler(fit, module, context):
-    fit.modules.filteredItemMultiply(lambda mod: mod.item.requiresSkill("Small Precursor Weapon"),
-                                     "damageMultiplier", module.getModifiedItemAttr("smallWeaponDamageMultiplier"),
-                                     stackingPenalties=True)
diff --git a/eos/effects/effect7112.py b/eos/effects/effect7112.py
deleted file mode 100644
index 52dfa7796..000000000
--- a/eos/effects/effect7112.py
+++ /dev/null
@@ -1,16 +0,0 @@
-# shipBonusNeutCapNeedRoleBonus2
-#
-# Used by:
-# Ship: Damavik
-# Ship: Drekavac
-# Ship: Hydra
-# Ship: Kikimora
-# Ship: Leshak
-# Ship: Tiamat
-# Ship: Vedmak
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Neutralizer", "capacitorNeed",
-                                  src.getModifiedItemAttr("shipBonusRole2"))
diff --git a/eos/effects/effect7116.py b/eos/effects/effect7116.py
deleted file mode 100644
index 55db46631..000000000
--- a/eos/effects/effect7116.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# eliteBonusReconScanProbeStrength2
-#
-# Used by:
-# Ship: Tiamat
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Astrometrics"), "baseSensorStrength",
-                                    src.getModifiedItemAttr("eliteBonusReconShip2"), skill="Recon Ships")
diff --git a/eos/effects/effect7117.py b/eos/effects/effect7117.py
deleted file mode 100644
index 2532ab94a..000000000
--- a/eos/effects/effect7117.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# roleBonusWarpSpeed
-#
-# Used by:
-# Ship: Cynabal
-# Ship: Dramiel
-# Ship: Leopard
-# Ship: Machariel
-# Ship: Victorieux Luxury Yacht
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.ship.boostItemAttr("warpSpeedMultiplier", src.getModifiedItemAttr("shipRoleBonusWarpSpeed"))
diff --git a/eos/effects/effect7118.py b/eos/effects/effect7118.py
deleted file mode 100644
index 550cdc94b..000000000
--- a/eos/effects/effect7118.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# eliteBonusCovertOps3PCTdamagePerCycle
-#
-# Used by:
-# Ship: Hydra
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemIncrease(lambda mod: mod.item.requiresSkill("Small Precursor Weapon"), "damageMultiplierBonusPerCycle",
-                                     src.getModifiedItemAttr("eliteBonusCovertOps3"), skill="Covert Ops")
diff --git a/eos/effects/effect7119.py b/eos/effects/effect7119.py
deleted file mode 100644
index 5aabfdcb7..000000000
--- a/eos/effects/effect7119.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# eliteBonusReconShip3PCTdamagePerCycle
-#
-# Used by:
-# Ship: Tiamat
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemIncrease(lambda mod: mod.item.requiresSkill("Medium Precursor Weapon"), "damageMultiplierBonusPerCycle",
-                                     src.getModifiedItemAttr("eliteBonusReconShip3"), skill="Recon Ships")
diff --git a/eos/effects/effect7142.py b/eos/effects/effect7142.py
deleted file mode 100644
index ebeb25f5a..000000000
--- a/eos/effects/effect7142.py
+++ /dev/null
@@ -1,17 +0,0 @@
-# massEntanglerEffect5
-#
-# Used by:
-# Module: Zero-Point Mass Entangler
-type = "active"
-
-
-def handler(fit, src, context):
-    fit.ship.increaseItemAttr("warpScrambleStatus", src.getModifiedItemAttr("warpScrambleStrength"))
-    fit.ship.boostItemAttr("mass", src.getModifiedItemAttr("massBonusPercentage"), stackingPenalties=True)
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Afterburner"), "speedFactor",
-                                  src.getModifiedItemAttr("speedFactorBonus"), stackingPenalties=True)
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Afterburner"), "speedBoostFactor",
-                                  src.getModifiedItemAttr("speedBoostFactorBonus"))
-    fit.modules.filteredItemIncrease(lambda mod: mod.item.requiresSkill("High Speed Maneuvering"), "activationBlocked",
-                                     src.getModifiedItemAttr("activationBlockedStrenght"))
-    fit.ship.boostItemAttr("maxVelocity", src.getModifiedItemAttr("maxVelocityBonus"), stackingPenalties=True)
diff --git a/eos/effects/effect7154.py b/eos/effects/effect7154.py
deleted file mode 100644
index 23adcba2d..000000000
--- a/eos/effects/effect7154.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipBonusPD1DisintegratorDamage
-#
-# Used by:
-# Ship: Kikimora
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Precursor Weapon"),
-                                  "damageMultiplier", ship.getModifiedItemAttr("shipBonusPD1"),
-                                  skill="Precursor Destroyer")
diff --git a/eos/effects/effect7155.py b/eos/effects/effect7155.py
deleted file mode 100644
index da8e257ea..000000000
--- a/eos/effects/effect7155.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipBonusPBC1DisintegratorDamage
-#
-# Used by:
-# Ship: Drekavac
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Precursor Weapon"),
-                                  "damageMultiplier", ship.getModifiedItemAttr("shipBonusPBC1"),
-                                  skill="Precursor Battlecruiser")
diff --git a/eos/effects/effect7156.py b/eos/effects/effect7156.py
deleted file mode 100644
index 74e4dca9d..000000000
--- a/eos/effects/effect7156.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# smallDisintegratorMaxRangeBonus
-#
-# Used by:
-# Ship: Kikimora
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Precursor Weapon"),
-                                  "maxRange", ship.getModifiedItemAttr("maxRangeBonus"))
diff --git a/eos/effects/effect7157.py b/eos/effects/effect7157.py
deleted file mode 100644
index c56940a22..000000000
--- a/eos/effects/effect7157.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipBonusPD2DisintegratorMaxRange
-#
-# Used by:
-# Ship: Kikimora
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Precursor Weapon"),
-                                  "maxRange", ship.getModifiedItemAttr("shipBonusPD2"),
-                                  skill="Precursor Destroyer")
diff --git a/eos/effects/effect7158.py b/eos/effects/effect7158.py
deleted file mode 100644
index 0248e9374..000000000
--- a/eos/effects/effect7158.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipArmorKineticResistancePBC2
-#
-# Used by:
-# Ship: Drekavac
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.ship.boostItemAttr("armorKineticDamageResonance", ship.getModifiedItemAttr("shipBonusPBC2"),
-                           skill="Precursor Battlecruiser")
diff --git a/eos/effects/effect7159.py b/eos/effects/effect7159.py
deleted file mode 100644
index 99149f084..000000000
--- a/eos/effects/effect7159.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipArmorThermalResistancePBC2
-#
-# Used by:
-# Ship: Drekavac
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.ship.boostItemAttr("armorThermalDamageResonance", ship.getModifiedItemAttr("shipBonusPBC2"),
-                           skill="Precursor Battlecruiser")
diff --git a/eos/effects/effect7160.py b/eos/effects/effect7160.py
deleted file mode 100644
index 8fcf35f0e..000000000
--- a/eos/effects/effect7160.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipArmorEMResistancePBC2
-#
-# Used by:
-# Ship: Drekavac
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.ship.boostItemAttr("armorEmDamageResonance", ship.getModifiedItemAttr("shipBonusPBC2"),
-                           skill="Precursor Battlecruiser")
diff --git a/eos/effects/effect7161.py b/eos/effects/effect7161.py
deleted file mode 100644
index 588feda67..000000000
--- a/eos/effects/effect7161.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipArmorExplosiveResistancePBC2
-#
-# Used by:
-# Ship: Drekavac
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.ship.boostItemAttr("armorExplosiveDamageResonance", ship.getModifiedItemAttr("shipBonusPBC2"),
-                           skill="Precursor Battlecruiser")
diff --git a/eos/effects/effect7162.py b/eos/effects/effect7162.py
deleted file mode 100644
index 193bcd298..000000000
--- a/eos/effects/effect7162.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipRoleDisintegratorMaxRangeCBC
-#
-# Used by:
-# Ship: Drekavac
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Precursor Weapon"),
-                                  "maxRange", ship.getModifiedItemAttr("roleBonusCBC"))
diff --git a/eos/effects/effect7166.py b/eos/effects/effect7166.py
deleted file mode 100644
index 94a53be2b..000000000
--- a/eos/effects/effect7166.py
+++ /dev/null
@@ -1,28 +0,0 @@
-# ShipModuleRemoteArmorMutadaptiveRepairer
-#
-# Used by:
-# Modules from group: Mutadaptive Remote Armor Repairer (5 of 5)
-
-
-import eos.config
-from eos.utils.spoolSupport import SpoolType, SpoolOptions, calculateSpoolup, resolveSpoolOptions
-
-
-type = "projected", "active"
-runTime = "late"
-
-
-def handler(fit, container, context, **kwargs):
-    if "projected" in context:
-        repAmountBase = container.getModifiedItemAttr("armorDamageAmount")
-        cycleTime = container.getModifiedItemAttr("duration") / 1000.0
-        repSpoolMax = container.getModifiedItemAttr("repairMultiplierBonusMax")
-        repSpoolPerCycle = container.getModifiedItemAttr("repairMultiplierBonusPerCycle")
-        defaultSpoolValue = eos.config.settings['globalDefaultSpoolupPercentage']
-        spoolType, spoolAmount = resolveSpoolOptions(SpoolOptions(SpoolType.SCALE, defaultSpoolValue, False), container)
-        rps = repAmountBase * (1 + calculateSpoolup(repSpoolMax, repSpoolPerCycle, cycleTime, spoolType, spoolAmount)[0]) / cycleTime
-        rpsPreSpool = repAmountBase * (1 + calculateSpoolup(repSpoolMax, repSpoolPerCycle, cycleTime, SpoolType.SCALE, 0)[0]) / cycleTime
-        rpsFullSpool = repAmountBase * (1 + calculateSpoolup(repSpoolMax, repSpoolPerCycle, cycleTime, SpoolType.SCALE, 1)[0]) / cycleTime
-        fit.extraAttributes.increase("armorRepair", rps, **kwargs)
-        fit.extraAttributes.increase("armorRepairPreSpool", rpsPreSpool, **kwargs)
-        fit.extraAttributes.increase("armorRepairFullSpool", rpsFullSpool, **kwargs)
diff --git a/eos/effects/effect7167.py b/eos/effects/effect7167.py
deleted file mode 100644
index bfd670862..000000000
--- a/eos/effects/effect7167.py
+++ /dev/null
@@ -1,7 +0,0 @@
-# shipBonusRemoteCapacitorTransferRangeRole1
-#
-# Used by:
-# Variations of ship: Rodiva (2 of 2)
-type = "passive"
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Remote Capacitor Transmitter", "maxRange", src.getModifiedItemAttr("shipBonusRole1"))
diff --git a/eos/effects/effect7168.py b/eos/effects/effect7168.py
deleted file mode 100644
index 64fca9ffb..000000000
--- a/eos/effects/effect7168.py
+++ /dev/null
@@ -1,7 +0,0 @@
-# shipBonusMutadaptiveRemoteRepairRangeRole3
-#
-# Used by:
-# Ship: Rodiva
-type = "passive"
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Mutadaptive Remote Armor Repairer", "maxRange", src.getModifiedItemAttr("shipBonusRole3"))
diff --git a/eos/effects/effect7169.py b/eos/effects/effect7169.py
deleted file mode 100644
index 7e892f3e4..000000000
--- a/eos/effects/effect7169.py
+++ /dev/null
@@ -1,7 +0,0 @@
-# shipBonusMutadaptiveRepAmountPC1
-#
-# Used by:
-# Ship: Rodiva
-type = "passive"
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Mutadaptive Remote Armor Repairer", "armorDamageAmount", src.getModifiedItemAttr("shipBonusPC1"), skill="Precursor Cruiser")
diff --git a/eos/effects/effect7170.py b/eos/effects/effect7170.py
deleted file mode 100644
index 22348514a..000000000
--- a/eos/effects/effect7170.py
+++ /dev/null
@@ -1,7 +0,0 @@
-# shipBonusMutadaptiveRepCapNeedPC2
-#
-# Used by:
-# Ship: Rodiva
-type = "passive"
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Mutadaptive Remote Armor Repairer", "capacitorNeed", src.getModifiedItemAttr("shipBonusPC2"), skill="Precursor Cruiser")
diff --git a/eos/effects/effect7171.py b/eos/effects/effect7171.py
deleted file mode 100644
index 67b2da620..000000000
--- a/eos/effects/effect7171.py
+++ /dev/null
@@ -1,7 +0,0 @@
-# shipBonusMutadaptiveRemoteRepRangePC1
-#
-# Used by:
-# Ship: Zarmazd
-type = "passive"
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Mutadaptive Remote Armor Repairer", "maxRange", src.getModifiedItemAttr("shipBonusPC1"), skill="Precursor Cruiser")
diff --git a/eos/effects/effect7172.py b/eos/effects/effect7172.py
deleted file mode 100644
index b936f644c..000000000
--- a/eos/effects/effect7172.py
+++ /dev/null
@@ -1,7 +0,0 @@
-# shipBonusMutadaptiveRemoteRepCapNeedeliteBonusLogisitics1
-#
-# Used by:
-# Ship: Zarmazd
-type = "passive"
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Mutadaptive Remote Armor Repairer", "capacitorNeed", src.getModifiedItemAttr("eliteBonusLogistics1"), skill="Logistics Cruisers")
diff --git a/eos/effects/effect7173.py b/eos/effects/effect7173.py
deleted file mode 100644
index b8ae258c3..000000000
--- a/eos/effects/effect7173.py
+++ /dev/null
@@ -1,7 +0,0 @@
-# shipBonusMutadaptiveRemoteRepAmounteliteBonusLogisitics2
-#
-# Used by:
-# Ship: Zarmazd
-type = "passive"
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Mutadaptive Remote Armor Repairer", "armorDamageAmount", src.getModifiedItemAttr("eliteBonusLogistics2"), skill="Logistics Cruisers")
diff --git a/eos/effects/effect7176.py b/eos/effects/effect7176.py
deleted file mode 100644
index 01ab85de7..000000000
--- a/eos/effects/effect7176.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# skillBonusDroneInterfacingNotFighters
-#
-# Used by:
-# Implant: CreoDron 'Bumblebee' Drone Tuner T10-5D
-# Implant: CreoDron 'Yellowjacket' Drone Tuner D5-10T
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill("Drones"), "damageMultiplier",
-                                 src.getModifiedItemAttr("damageMultiplierBonus"))
diff --git a/eos/effects/effect7177.py b/eos/effects/effect7177.py
deleted file mode 100644
index d2b8a0967..000000000
--- a/eos/effects/effect7177.py
+++ /dev/null
@@ -1,14 +0,0 @@
-# skillBonusDroneDurabilityNotFighters
-#
-# Used by:
-# Implants from group: Cyber Drones (4 of 4)
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill("Drones"), "hp",
-                                 src.getModifiedItemAttr("hullHpBonus"))
-    fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill("Drones"), "armorHP",
-                                 src.getModifiedItemAttr("armorHpBonus"))
-    fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill("Drones"), "shieldCapacity",
-                                 src.getModifiedItemAttr("shieldCapacityBonus"))
diff --git a/eos/effects/effect7179.py b/eos/effects/effect7179.py
deleted file mode 100644
index c9d0179a6..000000000
--- a/eos/effects/effect7179.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# stripMinerDurationMultiplier
-#
-# Used by:
-# Module: Frostline 'Omnivore' Harvester Upgrade
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Strip Miner",
-                                  "duration", module.getModifiedItemAttr("miningDurationMultiplier"))
diff --git a/eos/effects/effect7180.py b/eos/effects/effect7180.py
deleted file mode 100644
index 3d4cad5a5..000000000
--- a/eos/effects/effect7180.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# miningDurationMultiplierOnline
-#
-# Used by:
-# Module: Frostline 'Omnivore' Harvester Upgrade
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Mining Laser",
-                                  "duration", module.getModifiedItemAttr("miningDurationMultiplier"))
diff --git a/eos/effects/effect7183.py b/eos/effects/effect7183.py
deleted file mode 100644
index 8eea16959..000000000
--- a/eos/effects/effect7183.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# implantWarpScrambleRangeBonus
-#
-# Used by:
-# Implants named like: Inquest 'Hedone' Entanglement Optimizer WS (3 of 3)
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Warp Scrambler", "maxRange",
-                                  src.getModifiedItemAttr("warpScrambleRangeBonus"), stackingPenalties=False)
diff --git a/eos/effects/effect726.py b/eos/effects/effect726.py
deleted file mode 100644
index 85388f312..000000000
--- a/eos/effects/effect726.py
+++ /dev/null
@@ -1,17 +0,0 @@
-# shipBonusCargo2GI
-#
-# Used by:
-# Variations of ship: Miasmos (3 of 4)
-# Variations of ship: Nereus (2 of 2)
-# Ship: Iteron Mark V
-type = "passive"
-
-
-def handler(fit, ship, context):
-    # TODO: investigate if we can live without such ifs or hardcoding
-    # Viator doesn't have GI bonus
-    if "shipBonusGI" in fit.ship.item.attributes:
-        bonusAttr = "shipBonusGI"
-    else:
-        bonusAttr = "shipBonusGI2"
-    fit.ship.boostItemAttr("capacity", ship.getModifiedItemAttr(bonusAttr), skill="Gallente Industrial")
diff --git a/eos/effects/effect727.py b/eos/effects/effect727.py
deleted file mode 100644
index 3e80fb36a..000000000
--- a/eos/effects/effect727.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusCargoCI
-#
-# Used by:
-# Variations of ship: Badger (2 of 2)
-# Ship: Tayra
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.ship.boostItemAttr("capacity", ship.getModifiedItemAttr("shipBonusCI"), skill="Caldari Industrial")
diff --git a/eos/effects/effect728.py b/eos/effects/effect728.py
deleted file mode 100644
index bc98e3615..000000000
--- a/eos/effects/effect728.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusCargoMI
-#
-# Used by:
-# Variations of ship: Wreathe (2 of 2)
-# Ship: Mammoth
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.ship.boostItemAttr("capacity", ship.getModifiedItemAttr("shipBonusMI"), skill="Minmatar Industrial")
diff --git a/eos/effects/effect729.py b/eos/effects/effect729.py
deleted file mode 100644
index b032ee1d1..000000000
--- a/eos/effects/effect729.py
+++ /dev/null
@@ -1,19 +0,0 @@
-# shipBonusVelocityGI
-#
-# Used by:
-# 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):
-    # TODO: investigate if we can live without such ifs or hardcoding
-    # Viator doesn't have GI bonus
-    if "shipBonusGI" in fit.ship.item.attributes:
-        bonusAttr = "shipBonusGI"
-    else:
-        bonusAttr = "shipBonusGI2"
-    fit.ship.boostItemAttr("maxVelocity", ship.getModifiedItemAttr(bonusAttr), skill="Gallente Industrial")
diff --git a/eos/effects/effect730.py b/eos/effects/effect730.py
deleted file mode 100644
index 9f34a3e72..000000000
--- a/eos/effects/effect730.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusVelocityCI
-#
-# Used by:
-# Variations of ship: Tayra (2 of 2)
-# Ship: Crane
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.ship.boostItemAttr("maxVelocity", ship.getModifiedItemAttr("shipBonusCI"), skill="Caldari Industrial")
diff --git a/eos/effects/effect732.py b/eos/effects/effect732.py
deleted file mode 100644
index 3ba16182d..000000000
--- a/eos/effects/effect732.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipVelocityBonusAI
-#
-# Used by:
-# Variations of ship: Bestower (2 of 2)
-# Ship: Prorator
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.ship.boostItemAttr("maxVelocity", ship.getModifiedItemAttr("shipBonusAI"), skill="Amarr Industrial")
diff --git a/eos/effects/effect736.py b/eos/effects/effect736.py
deleted file mode 100644
index 73ccc8035..000000000
--- a/eos/effects/effect736.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusCapCapAB
-#
-# Used by:
-# Ship: Apocalypse Imperial Issue
-# Ship: Paladin
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.ship.boostItemAttr("capacitorCapacity", ship.getModifiedItemAttr("shipBonusAB2"), skill="Amarr Battleship")
diff --git a/eos/effects/effect744.py b/eos/effects/effect744.py
deleted file mode 100644
index 6dcf933fd..000000000
--- a/eos/effects/effect744.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# surveyScanspeedBonusPostPercentDurationLocationShipModulesRequiringElectronics
-#
-# Used by:
-# Modules named like: Signal Focusing Kit (8 of 8)
-# Skill: Survey
-type = "passive"
-
-
-def handler(fit, container, context):
-    level = container.level if "skill" in context else 1
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("CPU Management"),
-                                  "duration", container.getModifiedItemAttr("scanspeedBonus") * level)
diff --git a/eos/effects/effect754.py b/eos/effects/effect754.py
deleted file mode 100644
index a10dafe76..000000000
--- a/eos/effects/effect754.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipHybridDamageBonusCF
-#
-# Used by:
-# Ship: Raptor
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Hybrid Turret"),
-                                  "damageMultiplier", ship.getModifiedItemAttr("shipBonusCF"), skill="Caldari Frigate")
diff --git a/eos/effects/effect757.py b/eos/effects/effect757.py
deleted file mode 100644
index 939e163fa..000000000
--- a/eos/effects/effect757.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# shipETDamageAF
-#
-# Used by:
-# Ship: Crucifier Navy Issue
-# Ship: Crusader
-# Ship: Imperial Navy Slicer
-# Ship: Pacifier
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Energy Turret"), "damageMultiplier",
-                                  src.getModifiedItemAttr("shipBonusAF"), skill="Amarr Frigate")
diff --git a/eos/effects/effect760.py b/eos/effects/effect760.py
deleted file mode 100644
index 9849ecc4b..000000000
--- a/eos/effects/effect760.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# shipBonusSmallMissileRoFCF2
-#
-# Used by:
-# Ship: Buzzard
-# Ship: Hawk
-# Ship: Pacifier
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Missile Launcher Operation"),
-                                  "speed", ship.getModifiedItemAttr("shipBonusCF2"), skill="Caldari Frigate")
diff --git a/eos/effects/effect763.py b/eos/effects/effect763.py
deleted file mode 100644
index 4fca60500..000000000
--- a/eos/effects/effect763.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# missileDMGBonus
-#
-# Used by:
-# Modules from group: Ballistic Control system (22 of 22)
-type = "passive"
-
-
-def handler(fit, container, context):
-    for dmgType in ("em", "kinetic", "explosive", "thermal"):
-        fit.modules.filteredChargeMultiply(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"),
-                                           "%sDamage" % dmgType,
-                                           container.getModifiedItemAttr("missileDamageMultiplierBonus"),
-                                           stackingPenalties=True)
diff --git a/eos/effects/effect784.py b/eos/effects/effect784.py
deleted file mode 100644
index e7356d260..000000000
--- a/eos/effects/effect784.py
+++ /dev/null
@@ -1,16 +0,0 @@
-# missileBombardmentMaxFlightTimeBonusPostPercentExplosionDelayOwnerCharModulesRequiringMissileLauncherOperation
-#
-# Used by:
-# Implants named like: Zainou 'Deadeye' Missile Bombardment MB (6 of 6)
-# Modules named like: Rocket Fuel Cache Partition (8 of 8)
-# Implant: Antipharmakon Toxot
-# Skill: Missile Bombardment
-type = "passive"
-
-
-def handler(fit, container, context):
-    level = container.level if "skill" in context else 1
-    penalized = False if "skill" in context or "implant" in context or "booster" in context else True
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"),
-                                    "explosionDelay", container.getModifiedItemAttr("maxFlightTimeBonus") * level,
-                                    stackingPenalties=penalized)
diff --git a/eos/effects/effect804.py b/eos/effects/effect804.py
deleted file mode 100644
index 3bbb1103c..000000000
--- a/eos/effects/effect804.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# ammoInfluenceCapNeed
-#
-# Used by:
-# Items from category: Charge (493 of 949)
-type = "passive"
-
-
-def handler(fit, module, context):
-    # Dirty hack to work around cap charges setting cap booster
-    # injection amount to zero
-    rawAttr = module.item.getAttribute("capacitorNeed")
-    if rawAttr is not None and rawAttr >= 0:
-        module.boostItemAttr("capacitorNeed", module.getModifiedChargeAttr("capNeedBonus") or 0)
diff --git a/eos/effects/effect836.py b/eos/effects/effect836.py
deleted file mode 100644
index 93f4c33cf..000000000
--- a/eos/effects/effect836.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# skillFreightBonus
-#
-# Used by:
-# Modules named like: Cargohold Optimization (8 of 8)
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.ship.boostItemAttr("capacity", module.getModifiedItemAttr("cargoCapacityBonus"))
diff --git a/eos/effects/effect848.py b/eos/effects/effect848.py
deleted file mode 100644
index 292926bdd..000000000
--- a/eos/effects/effect848.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# cloakingTargetingDelayBonusPostPercentCloakingTargetingDelayBonusForShipModulesRequiringCloaking
-#
-# Used by:
-# Skill: Cloaking
-type = "passive"
-
-
-def handler(fit, skill, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Cloaking"),
-                                  "cloakingTargetingDelay",
-                                  skill.getModifiedItemAttr("cloakingTargetingDelayBonus") * skill.level)
diff --git a/eos/effects/effect854.py b/eos/effects/effect854.py
deleted file mode 100644
index 38f073c5b..000000000
--- a/eos/effects/effect854.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# cloakingScanResolutionMultiplier
-#
-# Used by:
-# Modules from group: Cloaking Device (12 of 14)
-type = "offline"
-
-
-def handler(fit, module, context):
-    fit.ship.multiplyItemAttr("scanResolution",
-                              module.getModifiedItemAttr("scanResolutionMultiplier"),
-                              stackingPenalties=True, penaltyGroup="cloakingScanResolutionMultiplier")
diff --git a/eos/effects/effect856.py b/eos/effects/effect856.py
deleted file mode 100644
index 57174c39d..000000000
--- a/eos/effects/effect856.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# warpSkillSpeed
-#
-# Used by:
-# Implants named like: Eifyr and Co. 'Rogue' Warp Drive Speed WS (6 of 6)
-# Implants named like: grade Ascendancy (10 of 12)
-# Modules named like: Hyperspatial Velocity Optimizer (8 of 8)
-type = "passive"
-
-
-def handler(fit, container, context):
-    penalized = False if "skill" in context or "implant" in context else True
-    fit.ship.boostItemAttr("baseWarpSpeed", container.getModifiedItemAttr("WarpSBonus"),
-                           stackingPenalties=penalized)
diff --git a/eos/effects/effect874.py b/eos/effects/effect874.py
deleted file mode 100644
index d4245be72..000000000
--- a/eos/effects/effect874.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipProjectileOptimalBonuseMF2
-#
-# Used by:
-# Ship: Cheetah
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Projectile Turret"),
-                                  "maxRange", ship.getModifiedItemAttr("shipBonusMF2"), skill="Minmatar Frigate")
diff --git a/eos/effects/effect882.py b/eos/effects/effect882.py
deleted file mode 100644
index 08e85c17c..000000000
--- a/eos/effects/effect882.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipHybridRangeBonusCF2
-#
-# Used by:
-# Ship: Harpy
-# Ship: Raptor
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Hybrid Turret"),
-                                  "maxRange", ship.getModifiedItemAttr("shipBonusCF2"), skill="Caldari Frigate")
diff --git a/eos/effects/effect887.py b/eos/effects/effect887.py
deleted file mode 100644
index 73ffd229d..000000000
--- a/eos/effects/effect887.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipETspeedBonusAB2
-#
-# Used by:
-# Variations of ship: Armageddon (3 of 5)
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Large Energy Turret"),
-                                  "speed", ship.getModifiedItemAttr("shipBonusAB2"), skill="Amarr Battleship")
diff --git a/eos/effects/effect889.py b/eos/effects/effect889.py
deleted file mode 100644
index 2655e614e..000000000
--- a/eos/effects/effect889.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# missileLauncherSpeedMultiplier
-#
-# Used by:
-# Modules from group: Ballistic Control system (22 of 22)
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.modules.filteredItemMultiply(lambda mod: mod.item.requiresSkill("Missile Launcher Operation"),
-                                     "speed", module.getModifiedItemAttr("speedMultiplier"),
-                                     stackingPenalties=True)
diff --git a/eos/effects/effect89.py b/eos/effects/effect89.py
deleted file mode 100644
index 73c1d538d..000000000
--- a/eos/effects/effect89.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# projectileWeaponSpeedMultiply
-#
-# Used by:
-# Modules from group: Gyrostabilizer (14 of 14)
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.modules.filteredItemMultiply(lambda mod: mod.item.group.name == "Projectile Weapon",
-                                     "speed", module.getModifiedItemAttr("speedMultiplier"),
-                                     stackingPenalties=True)
diff --git a/eos/effects/effect891.py b/eos/effects/effect891.py
deleted file mode 100644
index b690761be..000000000
--- a/eos/effects/effect891.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipCruiseMissileVelocityBonusCB3
-#
-# Used by:
-# Variations of ship: Raven (3 of 4)
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Cruise Missiles"),
-                                    "maxVelocity", ship.getModifiedItemAttr("shipBonusCB3"), skill="Caldari Battleship")
diff --git a/eos/effects/effect892.py b/eos/effects/effect892.py
deleted file mode 100644
index 6bedfb8c6..000000000
--- a/eos/effects/effect892.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipTorpedosVelocityBonusCB3
-#
-# Used by:
-# Variations of ship: Raven (3 of 4)
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Torpedoes"),
-                                    "maxVelocity", ship.getModifiedItemAttr("shipBonusCB3"), skill="Caldari Battleship")
diff --git a/eos/effects/effect896.py b/eos/effects/effect896.py
deleted file mode 100644
index 8c45bb186..000000000
--- a/eos/effects/effect896.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# covertOpsCpuBonus1
-#
-# Used by:
-# Ships from group: Stealth Bomber (4 of 5)
-# Subsystems named like: Defensive Covert Reconfiguration (4 of 4)
-type = "passive"
-
-
-def handler(fit, container, context):
-    fit.modules.filteredItemMultiply(lambda mod: mod.item.group.name == "Cloaking Device",
-                                     "cpu", container.getModifiedItemAttr("cloakingCpuNeedBonus"))
diff --git a/eos/effects/effect898.py b/eos/effects/effect898.py
deleted file mode 100644
index 3718e1666..000000000
--- a/eos/effects/effect898.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# shipMissileKineticDamageCF
-#
-# Used by:
-# Ship: Buzzard
-# Ship: Condor
-# Ship: Hawk
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"),
-                                    "kineticDamage", ship.getModifiedItemAttr("shipBonusCF"), skill="Caldari Frigate")
diff --git a/eos/effects/effect899.py b/eos/effects/effect899.py
deleted file mode 100644
index e656053e6..000000000
--- a/eos/effects/effect899.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# shipMissileKineticDamageCC
-#
-# Used by:
-# Ship: Cerberus
-# Ship: Onyx
-# Ship: Orthrus
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"),
-                                    "kineticDamage", ship.getModifiedItemAttr("shipBonusCC"), skill="Caldari Cruiser")
diff --git a/eos/effects/effect900.py b/eos/effects/effect900.py
deleted file mode 100644
index 54f7716e0..000000000
--- a/eos/effects/effect900.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipDroneScoutThermalDamageGF2
-#
-# Used by:
-# Ship: Helios
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill("Light Drone Operation"),
-                                 "thermalDamage", ship.getModifiedItemAttr("shipBonusGF2"), skill="Gallente Frigate")
diff --git a/eos/effects/effect907.py b/eos/effects/effect907.py
deleted file mode 100644
index dbb11d779..000000000
--- a/eos/effects/effect907.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipLaserRofAC2
-#
-# Used by:
-# Ship: Omen
-# Ship: Zealot
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Energy Turret"),
-                                  "speed", ship.getModifiedItemAttr("shipBonusAC2"), skill="Amarr Cruiser")
diff --git a/eos/effects/effect909.py b/eos/effects/effect909.py
deleted file mode 100644
index a801712c2..000000000
--- a/eos/effects/effect909.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# shipArmorHpAC2
-#
-# Used by:
-# Ship: Augoror Navy Issue
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.ship.boostItemAttr("armorHP", ship.getModifiedItemAttr("shipBonusAC2"), skill="Amarr Cruiser")
diff --git a/eos/effects/effect91.py b/eos/effects/effect91.py
deleted file mode 100644
index 42dddd186..000000000
--- a/eos/effects/effect91.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# energyWeaponDamageMultiply
-#
-# Used by:
-# Modules from group: Heat Sink (19 of 19)
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.modules.filteredItemMultiply(lambda mod: mod.item.group.name == "Energy Weapon",
-                                     "damageMultiplier", module.getModifiedItemAttr("damageMultiplier"),
-                                     stackingPenalties=True)
diff --git a/eos/effects/effect912.py b/eos/effects/effect912.py
deleted file mode 100644
index 1c1ce33d4..000000000
--- a/eos/effects/effect912.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipMissileLauncherRofCC2
-#
-# Used by:
-# Ship: Onyx
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Missile Launcher Operation"),
-                                  "speed", ship.getModifiedItemAttr("shipBonusCC2"), skill="Caldari Cruiser")
diff --git a/eos/effects/effect918.py b/eos/effects/effect918.py
deleted file mode 100644
index 16390827e..000000000
--- a/eos/effects/effect918.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# shipDronesMaxGC2
-#
-# Used by:
-# Ship: Guardian-Vexor
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.extraAttributes.increase("maxActiveDrones", ship.getModifiedItemAttr("shipBonusGC2"), skill="Gallente Cruiser")
diff --git a/eos/effects/effect919.py b/eos/effects/effect919.py
deleted file mode 100644
index 4169cca0d..000000000
--- a/eos/effects/effect919.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipHybridTrackingGC2
-#
-# Used by:
-# Ship: Enforcer
-# Ship: Thorax
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Hybrid Turret"),
-                                  "trackingSpeed", ship.getModifiedItemAttr("shipBonusGC2"), skill="Gallente Cruiser")
diff --git a/eos/effects/effect92.py b/eos/effects/effect92.py
deleted file mode 100644
index aeafffff7..000000000
--- a/eos/effects/effect92.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# projectileWeaponDamageMultiply
-#
-# Used by:
-# Modules from group: Gyrostabilizer (14 of 14)
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.modules.filteredItemMultiply(lambda mod: mod.item.group.name == "Projectile Weapon",
-                                     "damageMultiplier", module.getModifiedItemAttr("damageMultiplier"),
-                                     stackingPenalties=True)
diff --git a/eos/effects/effect93.py b/eos/effects/effect93.py
deleted file mode 100644
index 87166fc7c..000000000
--- a/eos/effects/effect93.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# hybridWeaponDamageMultiply
-#
-# Used by:
-# Modules from group: Magnetic Field Stabilizer (15 of 15)
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.modules.filteredItemMultiply(lambda mod: mod.item.group.name == "Hybrid Weapon",
-                                     "damageMultiplier", module.getModifiedItemAttr("damageMultiplier"),
-                                     stackingPenalties=True)
diff --git a/eos/effects/effect95.py b/eos/effects/effect95.py
deleted file mode 100644
index 19dacfb85..000000000
--- a/eos/effects/effect95.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# energyWeaponSpeedMultiply
-#
-# Used by:
-# Modules from group: Heat Sink (19 of 19)
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.modules.filteredItemMultiply(lambda mod: mod.item.group.name == "Energy Weapon",
-                                     "speed", module.getModifiedItemAttr("speedMultiplier"),
-                                     stackingPenalties=True)
diff --git a/eos/effects/effect958.py b/eos/effects/effect958.py
deleted file mode 100644
index 3b38e626e..000000000
--- a/eos/effects/effect958.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# shipArmorEmResistanceAC2
-#
-# Used by:
-# Ship: Maller
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.ship.boostItemAttr("armorEmDamageResonance", ship.getModifiedItemAttr("shipBonusAC2"), skill="Amarr Cruiser")
diff --git a/eos/effects/effect959.py b/eos/effects/effect959.py
deleted file mode 100644
index 76c98a057..000000000
--- a/eos/effects/effect959.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipArmorExplosiveResistanceAC2
-#
-# Used by:
-# Ship: Maller
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.ship.boostItemAttr("armorExplosiveDamageResonance", ship.getModifiedItemAttr("shipBonusAC2"),
-                           skill="Amarr Cruiser")
diff --git a/eos/effects/effect96.py b/eos/effects/effect96.py
deleted file mode 100644
index 876ef5b3c..000000000
--- a/eos/effects/effect96.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# hybridWeaponSpeedMultiply
-#
-# Used by:
-# Modules from group: Magnetic Field Stabilizer (15 of 15)
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.modules.filteredItemMultiply(lambda mod: mod.item.group.name == "Hybrid Weapon",
-                                     "speed", module.getModifiedItemAttr("speedMultiplier"),
-                                     stackingPenalties=True)
diff --git a/eos/effects/effect960.py b/eos/effects/effect960.py
deleted file mode 100644
index 5c96ab767..000000000
--- a/eos/effects/effect960.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipArmorKineticResistanceAC2
-#
-# Used by:
-# Ship: Maller
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.ship.boostItemAttr("armorKineticDamageResonance", ship.getModifiedItemAttr("shipBonusAC2"),
-                           skill="Amarr Cruiser")
diff --git a/eos/effects/effect961.py b/eos/effects/effect961.py
deleted file mode 100644
index 3e3dab2cf..000000000
--- a/eos/effects/effect961.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipArmorThermalResistanceAC2
-#
-# Used by:
-# Ship: Maller
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.ship.boostItemAttr("armorThermalDamageResonance", ship.getModifiedItemAttr("shipBonusAC2"),
-                           skill="Amarr Cruiser")
diff --git a/eos/effects/effect968.py b/eos/effects/effect968.py
deleted file mode 100644
index c313f8e7e..000000000
--- a/eos/effects/effect968.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# shipProjectileDmgMC2
-#
-# Used by:
-# Variations of ship: Rupture (3 of 3)
-# Ship: Cynabal
-# Ship: Moracha
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Projectile Turret"),
-                                  "damageMultiplier", ship.getModifiedItemAttr("shipBonusMC2"),
-                                  skill="Minmatar Cruiser")
diff --git a/eos/effects/effect980.py b/eos/effects/effect980.py
deleted file mode 100644
index 6906118dc..000000000
--- a/eos/effects/effect980.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# cloakingWarpSafe
-#
-# Used by:
-# Modules named like: Covert Ops Cloaking Device II (2 of 2)
-type = "active"
-runTime = "early"
-
-
-def handler(fit, ship, context):
-    fit.extraAttributes["cloaked"] = True
-    # TODO: Implement
diff --git a/eos/effects/effect989.py b/eos/effects/effect989.py
deleted file mode 100644
index df9a7dbb0..000000000
--- a/eos/effects/effect989.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# eliteBonusGunshipHybridOptimal1
-#
-# Used by:
-# Ship: Enyo
-# Ship: Harpy
-# Ship: Ishkur
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Hybrid Turret"),
-                                  "maxRange", ship.getModifiedItemAttr("eliteBonusGunship1"), skill="Assault Frigates")
diff --git a/eos/effects/effect991.py b/eos/effects/effect991.py
deleted file mode 100644
index ea410651b..000000000
--- a/eos/effects/effect991.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# eliteBonusGunshipLaserOptimal1
-#
-# Used by:
-# Ship: Retribution
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Energy Turret"),
-                                  "maxRange", ship.getModifiedItemAttr("eliteBonusGunship1"), skill="Assault Frigates")
diff --git a/eos/effects/effect996.py b/eos/effects/effect996.py
deleted file mode 100644
index 9fc26ca51..000000000
--- a/eos/effects/effect996.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# eliteBonusGunshipHybridTracking2
-#
-# Used by:
-# Ship: Enyo
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Hybrid Turret"),
-                                  "trackingSpeed", ship.getModifiedItemAttr("eliteBonusGunship2"),
-                                  skill="Assault Frigates")
diff --git a/eos/effects/effect998.py b/eos/effects/effect998.py
deleted file mode 100644
index df8ed9532..000000000
--- a/eos/effects/effect998.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# eliteBonusGunshipProjectileFalloff2
-#
-# Used by:
-# Ship: Wolf
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Projectile Turret"),
-                                  "falloff", ship.getModifiedItemAttr("eliteBonusGunship2"), skill="Assault Frigates")
diff --git a/eos/effects/effect999.py b/eos/effects/effect999.py
deleted file mode 100644
index 883b11110..000000000
--- a/eos/effects/effect999.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# eliteBonusGunshipShieldBoost2
-#
-# Used by:
-# Ship: Hawk
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Operation"),
-                                  "shieldBonus", ship.getModifiedItemAttr("eliteBonusGunship2"),
-                                  skill="Assault Frigates")
diff --git a/eos/gamedata.py b/eos/gamedata.py
index 40fbefe2f..07f25ae51 100644
--- a/eos/gamedata.py
+++ b/eos/gamedata.py
@@ -17,26 +17,20 @@
 # along with eos.  If not, see <http://www.gnu.org/licenses/>.
 # ===============================================================================
 
-import re
 
-from sqlalchemy.orm import reconstructor
-import eos.config as config
-import eos.db
-from .eqBase import EqBase
-from eos.saveddata.price import Price as types_Price
 from collections import OrderedDict
-import importlib
-
 
 from logbook import Logger
+from sqlalchemy.orm import reconstructor
+
+import eos.effects
+import eos.db
+from eos.saveddata.price import Price as types_Price
+from .eqBase import EqBase
+
 
 pyfalog = Logger(__name__)
 
-try:
-    import eos.effects.all as all_effects_module
-except ImportError:
-    all_effects_module = None
-
 
 class Effect(EqBase):
     """
@@ -56,8 +50,7 @@ class Effect(EqBase):
         Reconstructor, composes the object as we grab it from the database
         """
         self.__generated = False
-        self.__effectModule = None
-        self.handlerName = "effect{}".format(self.ID)
+        self.__effectDef = None
 
     @property
     def handler(self):
@@ -147,7 +140,7 @@ class Effect(EqBase):
         Whether this effect is implemented in code or not,
         unimplemented effects simply do nothing at all when run
         """
-        return self.handler != effectDummy
+        return self.handler is not eos.effects.EffectDef.handler
 
     def isType(self, type):
         """
@@ -161,43 +154,31 @@ class Effect(EqBase):
         if it doesn't, set dummy values and add a dummy handler
         """
         try:
-            if all_effects_module and config.use_all_effect_module:
-                pyfalog.debug("Loading {0} ({1}) from all module".format(self.handlerName, self.name))
-                func = getattr(all_effects_module, self.handlerName)
-                self.__effectModule = effectModule = func()
-                self.__handler = effectModule.get("handler", effectDummy)
-                self.__runTime = effectModule.get("runTime", "normal")
-                self.__activeByDefault = effectModule.get("activeByDefault", True)
-                t = effectModule.get("type", None)
-
-                t = t if isinstance(t, tuple) or t is None else (t,)
-                self.__type = t
-            else:
-                pyfalog.debug("Loading {0} ({1}) from effect file".format(self.handlerName, self.name))
-                self.__effectModule = effectModule = importlib.import_module('eos.effects.' + self.handlerName)
-                self.__handler = getattr(effectModule, "handler", effectDummy)
-                self.__runTime = getattr(effectModule, "runTime", "normal")
-                self.__activeByDefault = getattr(effectModule, "activeByDefault", True)
-                t = getattr(effectModule, "type", None)
-
-                t = t if isinstance(t, tuple) or t is None else (t,)
-                self.__type = t
+            effectDefName = "Effect{}".format(self.ID)
+            pyfalog.debug("Loading {0} ({1})".format(self.name, effectDefName))
+            self.__effectDef = effectDef = getattr(eos.effects, effectDefName)
+            self.__handler = getattr(effectDef, "handler", eos.effects.EffectDef.handler)
+            self.__runTime = getattr(effectDef, "runTime", "normal")
+            self.__activeByDefault = getattr(effectDef, "activeByDefault", True)
+            effectType = getattr(effectDef, "type", None)
+            effectType = effectType if isinstance(effectType, tuple) or effectType is None else (effectType,)
+            self.__type = effectType
         except ImportError as e:
             # Effect probably doesn't exist, so create a dummy effect and flag it with a warning.
-            self.__handler = effectDummy
+            self.__handler = eos.effects.EffectDef.handler
             self.__runTime = "normal"
             self.__activeByDefault = True
             self.__type = None
             pyfalog.debug("ImportError generating handler: {0}", e)
         except AttributeError as e:
             # Effect probably exists but there is an issue with it.  Turn it into a dummy effect so we can continue, but flag it with an error.
-            self.__handler = effectDummy
+            self.__handler = eos.effects.EffectDef.handler
             self.__runTime = "normal"
             self.__activeByDefault = True
             self.__type = None
             pyfalog.error("AttributeError generating handler: {0}", e)
         except Exception as e:
-            self.__handler = effectDummy
+            self.__handler = eos.effects.EffectDef.handler
             self.__runTime = "normal"
             self.__activeByDefault = True
             self.__type = None
@@ -211,13 +192,9 @@ class Effect(EqBase):
             self.__generateHandler()
 
         try:
-            return self.__effectModule.get(key, None)
+            return self.__effectDef.get(key, None)
         except:
-            return getattr(self.__effectModule, key, None)
-
-
-def effectDummy(*args, **kwargs):
-    pass
+            return getattr(self.__effectDef, key, None)
 
 
 class Item(EqBase):
diff --git a/scripts/effect_rollup.py b/scripts/effect_rollup.py
deleted file mode 100644
index bb8abfb67..000000000
--- a/scripts/effect_rollup.py
+++ /dev/null
@@ -1,24 +0,0 @@
-import os
-import os.path
-
-new_effect_file_contents = ""
-
-for filename in os.listdir(os.path.join('eos', 'effects')):
-    if filename.startswith("_") or not filename.endswith(".py") or filename == 'all.py':
-        continue
-
-    new_effect_file_contents += f"def {os.path.splitext(filename)[0]}():\n"
-
-    file = open(os.path.join('eos', 'effects', filename), "r")
-
-    for line in file:
-        if line.strip().startswith("#") or line.strip() == "":
-            continue
-        new_effect_file_contents += f"    {line}"
-
-    new_effect_file_contents += "\n    return locals()\n\n"
-
-with open(os.path.join('eos', 'effects', 'all.py'), "w") as f:
-    f.write(new_effect_file_contents)
-
-

From 0c7601b6d364528fba7b5d81229e9d782640922b Mon Sep 17 00:00:00 2001
From: DarkPhoenix <phoenix@mail.ru>
Date: Fri, 22 Mar 2019 18:01:14 +0300
Subject: [PATCH 15/32] Change effectUsedBy script and run it over effects file

---
 eos/effects.py          | 12770 +++++++++++++++++++++++++++++++++++++-
 scripts/effectUsedBy.py |   149 +-
 2 files changed, 12828 insertions(+), 91 deletions(-)

diff --git a/eos/effects.py b/eos/effects.py
index 20506604d..bce2b1971 100644
--- a/eos/effects.py
+++ b/eos/effects.py
@@ -31,6 +31,12 @@ class EffectDef:
 
 
 class Effect4(EffectDef):
+    """
+    shieldBoosting
+
+    Used by:
+    Modules from group: Shield Booster (97 of 97)
+    """
 
     runTime = 'late'
     type = 'active'
@@ -43,6 +49,13 @@ class Effect4(EffectDef):
 
 
 class Effect10(EffectDef):
+    """
+    targetAttack
+
+    Used by:
+    Drones from group: Combat Drone (75 of 75)
+    Modules from group: Energy Weapon (212 of 214)
+    """
 
     type = 'active'
 
@@ -53,6 +66,12 @@ class Effect10(EffectDef):
 
 
 class Effect17(EffectDef):
+    """
+    mining
+
+    Used by:
+    Drones from group: Mining Drone (10 of 10)
+    """
 
     grouped = True
     type = 'passive'
@@ -67,6 +86,13 @@ class Effect17(EffectDef):
 
 
 class Effect21(EffectDef):
+    """
+    shieldCapacityBonusOnline
+
+    Used by:
+    Modules from group: Shield Extender (36 of 36)
+    Modules from group: Shield Resistance Amplifier (88 of 88)
+    """
 
     type = 'passive'
 
@@ -76,6 +102,12 @@ class Effect21(EffectDef):
 
 
 class Effect25(EffectDef):
+    """
+    capacitorCapacityBonus
+
+    Used by:
+    Modules from group: Capacitor Battery (30 of 30)
+    """
 
     type = 'passive'
 
@@ -85,6 +117,12 @@ class Effect25(EffectDef):
 
 
 class Effect26(EffectDef):
+    """
+    structureRepair
+
+    Used by:
+    Modules from group: Hull Repair Unit (25 of 25)
+    """
 
     runTime = 'late'
     type = 'active'
@@ -97,6 +135,12 @@ class Effect26(EffectDef):
 
 
 class Effect27(EffectDef):
+    """
+    armorRepair
+
+    Used by:
+    Modules from group: Armor Repair Unit (108 of 108)
+    """
 
     runTime = 'late'
     type = 'active'
@@ -112,6 +156,13 @@ class Effect27(EffectDef):
 
 
 class Effect34(EffectDef):
+    """
+    projectileFired
+
+    Used by:
+    Modules from group: Hybrid Weapon (221 of 221)
+    Modules from group: Projectile Weapon (165 of 165)
+    """
 
     type = 'active'
 
@@ -126,11 +177,23 @@ class Effect34(EffectDef):
 
 
 class Effect38(EffectDef):
+    """
+    empWave
+
+    Used by:
+    Modules from group: Smart Bomb (118 of 118)
+    """
 
     type = 'active'
 
 
 class Effect39(EffectDef):
+    """
+    warpDisrupt
+
+    Used by:
+    Modules named like: Warp Disruptor (28 of 28)
+    """
 
     type = 'projected', 'active'
 
@@ -141,6 +204,12 @@ class Effect39(EffectDef):
 
 
 class Effect48(EffectDef):
+    """
+    powerBooster
+
+    Used by:
+    Modules from group: Capacitor Booster (59 of 59)
+    """
 
     type = 'active'
 
@@ -158,6 +227,16 @@ class Effect48(EffectDef):
 
 
 class Effect50(EffectDef):
+    """
+    modifyShieldRechargeRate
+
+    Used by:
+    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 Recharger (4 of 4)
+    Modules named like: Flux Coil (12 of 12)
+    """
 
     type = 'passive'
 
@@ -167,6 +246,17 @@ class Effect50(EffectDef):
 
 
 class Effect51(EffectDef):
+    """
+    modifyPowerRechargeRate
+
+    Used by:
+    Modules from group: Capacitor Flux Coil (6 of 6)
+    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 Power Relay (6 of 6)
+    """
 
     type = 'passive'
 
@@ -176,11 +266,27 @@ class Effect51(EffectDef):
 
 
 class Effect55(EffectDef):
+    """
+    targetHostiles
+
+    Used by:
+    Modules from group: Automated Targeting System (6 of 6)
+    """
 
     type = 'active'
 
 
 class Effect56(EffectDef):
+    """
+    powerOutputMultiply
+
+    Used by:
+    Modules from group: Capacitor Flux Coil (6 of 6)
+    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)
+    Variations of structure module: Standup Reactor Control Unit I (2 of 2)
+    """
 
     type = 'passive'
 
@@ -192,6 +298,15 @@ class Effect56(EffectDef):
 
 
 class Effect57(EffectDef):
+    """
+    shieldCapacityMultiply
+
+    Used by:
+    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 named like: Flux Coil (12 of 12)
+    """
 
     type = 'passive'
 
@@ -203,6 +318,16 @@ class Effect57(EffectDef):
 
 
 class Effect58(EffectDef):
+    """
+    capacitorCapacityMultiply
+
+    Used by:
+    Modules from group: Capacitor Flux Coil (6 of 6)
+    Modules from group: Capacitor Power Relay (20 of 20)
+    Modules from group: Power Diagnostic System (23 of 23)
+    Modules from group: Propulsion Module (68 of 133)
+    Modules from group: Reactor Control Unit (22 of 22)
+    """
 
     type = 'passive'
 
@@ -214,6 +339,14 @@ class Effect58(EffectDef):
 
 
 class Effect59(EffectDef):
+    """
+    cargoCapacityMultiply
+
+    Used by:
+    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'
 
@@ -223,6 +356,13 @@ class Effect59(EffectDef):
 
 
 class Effect60(EffectDef):
+    """
+    structureHPMultiply
+
+    Used by:
+    Modules from group: Nanofiber Internal Structure (7 of 7)
+    Modules from group: Reinforced Bulkhead (8 of 8)
+    """
 
     type = 'passive'
 
@@ -232,6 +372,12 @@ class Effect60(EffectDef):
 
 
 class Effect61(EffectDef):
+    """
+    agilityBonus
+
+    Used by:
+    Subsystems named like: Propulsion Interdiction Nullifier (4 of 4)
+    """
 
     type = 'passive'
 
@@ -241,6 +387,13 @@ class Effect61(EffectDef):
 
 
 class Effect63(EffectDef):
+    """
+    armorHPMultiply
+
+    Used by:
+    Modules from group: Armor Coating (202 of 202)
+    Modules from group: Armor Plating Energized (187 of 187)
+    """
 
     type = 'passive'
 
@@ -250,6 +403,15 @@ class Effect63(EffectDef):
 
 
 class Effect67(EffectDef):
+    """
+    miningLaser
+
+    Used by:
+    Modules from group: Frequency Mining Laser (3 of 3)
+    Modules from group: Mining Laser (15 of 15)
+    Modules from group: Strip Miner (5 of 5)
+    Module: Citizen Miner
+    """
 
     type = 'active'
 
@@ -260,6 +422,12 @@ class Effect67(EffectDef):
 
 
 class Effect89(EffectDef):
+    """
+    projectileWeaponSpeedMultiply
+
+    Used by:
+    Modules from group: Gyrostabilizer (14 of 14)
+    """
 
     type = 'passive'
 
@@ -271,6 +439,12 @@ class Effect89(EffectDef):
 
 
 class Effect91(EffectDef):
+    """
+    energyWeaponDamageMultiply
+
+    Used by:
+    Modules from group: Heat Sink (19 of 19)
+    """
 
     type = 'passive'
 
@@ -282,6 +456,12 @@ class Effect91(EffectDef):
 
 
 class Effect92(EffectDef):
+    """
+    projectileWeaponDamageMultiply
+
+    Used by:
+    Modules from group: Gyrostabilizer (14 of 14)
+    """
 
     type = 'passive'
 
@@ -293,6 +473,12 @@ class Effect92(EffectDef):
 
 
 class Effect93(EffectDef):
+    """
+    hybridWeaponDamageMultiply
+
+    Used by:
+    Modules from group: Magnetic Field Stabilizer (15 of 15)
+    """
 
     type = 'passive'
 
@@ -304,6 +490,12 @@ class Effect93(EffectDef):
 
 
 class Effect95(EffectDef):
+    """
+    energyWeaponSpeedMultiply
+
+    Used by:
+    Modules from group: Heat Sink (19 of 19)
+    """
 
     type = 'passive'
 
@@ -315,6 +507,12 @@ class Effect95(EffectDef):
 
 
 class Effect96(EffectDef):
+    """
+    hybridWeaponSpeedMultiply
+
+    Used by:
+    Modules from group: Magnetic Field Stabilizer (15 of 15)
+    """
 
     type = 'passive'
 
@@ -326,6 +524,15 @@ class Effect96(EffectDef):
 
 
 class Effect101(EffectDef):
+    """
+    useMissiles
+
+    Used by:
+    Modules from group: Missile Launcher Heavy (12 of 12)
+    Modules from group: Missile Launcher Rocket (15 of 15)
+    Modules named like: Launcher (154 of 154)
+    Structure Modules named like: Standup Launcher (7 of 7)
+    """
 
     type = 'active', 'projected'
 
@@ -355,6 +562,12 @@ class Effect101(EffectDef):
 
 
 class Effect118(EffectDef):
+    """
+    electronicAttributeModifyOnline
+
+    Used by:
+    Modules from group: Automated Targeting System (6 of 6)
+    """
 
     type = 'passive'
 
@@ -364,6 +577,13 @@ class Effect118(EffectDef):
 
 
 class Effect157(EffectDef):
+    """
+    largeHybridTurretDamageMultiplierBonusPostPercentDamageMultiplierLocationShipModulesRequiringLargeHybridTurret
+
+    Used by:
+    Implants named like: Zainou 'Deadeye' Large Hybrid Turret LH (6 of 6)
+    Skill: Large Hybrid Turret
+    """
 
     type = 'passive'
 
@@ -375,6 +595,13 @@ class Effect157(EffectDef):
 
 
 class Effect159(EffectDef):
+    """
+    mediumEnergyTurretDamageMultiplierBonusPostPercentDamageMultiplierLocationShipModulesRequiringMediumEnergyTurret
+
+    Used by:
+    Implants named like: Inherent Implants 'Lancer' Medium Energy Turret ME (6 of 6)
+    Skill: Medium Energy Turret
+    """
 
     type = 'passive'
 
@@ -386,6 +613,13 @@ class Effect159(EffectDef):
 
 
 class Effect160(EffectDef):
+    """
+    mediumHybridTurretDamageMultiplierBonusPostPercentDamageMultiplierLocationShipModulesRequiringMediumHybridTurret
+
+    Used by:
+    Implants named like: Zainou 'Deadeye' Medium Hybrid Turret MH (6 of 6)
+    Skill: Medium Hybrid Turret
+    """
 
     type = 'passive'
 
@@ -397,6 +631,13 @@ class Effect160(EffectDef):
 
 
 class Effect161(EffectDef):
+    """
+    mediumProjectileTurretDamageMultiplierBonusPostPercentDamageMultiplierLocationShipModulesRequiringMediumProjectileTurret
+
+    Used by:
+    Implants named like: Eifyr and Co. 'Gunslinger' Medium Projectile Turret MP (6 of 6)
+    Skill: Medium Projectile Turret
+    """
 
     type = 'passive'
 
@@ -408,6 +649,14 @@ class Effect161(EffectDef):
 
 
 class Effect162(EffectDef):
+    """
+    largeEnergyTurretDamageMultiplierBonusPostPercentDamageMultiplierLocationShipModulesRequiringLargeEnergyTurret
+
+    Used by:
+    Implants named like: Inherent Implants 'Lancer' Large Energy Turret LE (6 of 6)
+    Implant: Pashan's Turret Handling Mindlink
+    Skill: Large Energy Turret
+    """
 
     type = 'passive'
 
@@ -419,6 +668,13 @@ class Effect162(EffectDef):
 
 
 class Effect172(EffectDef):
+    """
+    smallEnergyTurretDamageMultiplierBonusPostPercentDamageMultiplierLocationShipModulesRequiringSmallEnergyTurret
+
+    Used by:
+    Implants named like: Inherent Implants 'Lancer' Small Energy Turret SE (6 of 6)
+    Skill: Small Energy Turret
+    """
 
     type = 'passive'
 
@@ -430,6 +686,13 @@ class Effect172(EffectDef):
 
 
 class Effect173(EffectDef):
+    """
+    smallHybridTurretDamageMultiplierBonusPostPercentDamageMultiplierLocationShipModulesRequiringSmallHybridTurret
+
+    Used by:
+    Implants named like: Zainou 'Deadeye' Small Hybrid Turret SH (6 of 6)
+    Skill: Small Hybrid Turret
+    """
 
     type = 'passive'
 
@@ -441,6 +704,13 @@ class Effect173(EffectDef):
 
 
 class Effect174(EffectDef):
+    """
+    smallProjectileTurretDamageMultiplierBonusPostPercentDamageMultiplierLocationShipModulesRequiringSmallProjectileTurret
+
+    Used by:
+    Implants named like: Eifyr and Co. 'Gunslinger' Small Projectile Turret SP (6 of 6)
+    Skill: Small Projectile Turret
+    """
 
     type = 'passive'
 
@@ -452,6 +722,14 @@ class Effect174(EffectDef):
 
 
 class Effect212(EffectDef):
+    """
+    sensorUpgradesCpuNeedBonusPostPercentCpuLocationShipModulesRequiringSensorUpgrades
+
+    Used by:
+    Implants named like: Zainou 'Gypsy' Electronics Upgrades EU (6 of 6)
+    Modules named like: Liquid Cooled Electronics (8 of 8)
+    Skill: Electronics Upgrades
+    """
 
     type = 'passive'
 
@@ -463,6 +741,12 @@ class Effect212(EffectDef):
 
 
 class Effect214(EffectDef):
+    """
+    targetingMaxTargetBonusModAddMaxLockedTargetsLocationChar
+
+    Used by:
+    Skills named like: Target Management (2 of 2)
+    """
 
     type = 'passive', 'structure'
 
@@ -473,6 +757,13 @@ class Effect214(EffectDef):
 
 
 class Effect223(EffectDef):
+    """
+    navigationVelocityBonusPostPercentMaxVelocityLocationShip
+
+    Used by:
+    Implant: Low-grade Snake Alpha
+    Implant: Mid-grade Snake Alpha
+    """
 
     type = 'passive'
 
@@ -482,6 +773,12 @@ class Effect223(EffectDef):
 
 
 class Effect227(EffectDef):
+    """
+    accerationControlCapNeedBonusPostPercentCapacitorNeedLocationShipGroupAfterburner
+
+    Used by:
+    Modules named like: Dynamic Fuel Valve (8 of 8)
+    """
 
     type = 'passive'
 
@@ -492,6 +789,14 @@ class Effect227(EffectDef):
 
 
 class Effect230(EffectDef):
+    """
+    afterburnerDurationBonusPostPercentDurationLocationShipModulesRequiringAfterburner
+
+    Used by:
+    Implants named like: Eifyr and Co. 'Rogue' Afterburner AB (6 of 6)
+    Implant: Zor's Custom Navigation Link
+    Skill: Afterburner
+    """
 
     type = 'passive'
 
@@ -503,6 +808,12 @@ class Effect230(EffectDef):
 
 
 class Effect235(EffectDef):
+    """
+    warpdriveoperationWarpCapacitorNeedBonusPostPercentWarpCapacitorNeedLocationShip
+
+    Used by:
+    Implants named like: Eifyr and Co. 'Rogue' Warp Drive Operation WD (6 of 6)
+    """
 
     type = 'passive'
 
@@ -512,6 +823,12 @@ class Effect235(EffectDef):
 
 
 class Effect242(EffectDef):
+    """
+    accerationControlSpeedFBonusPostPercentSpeedFactorLocationShipGroupAfterburner
+
+    Used by:
+    Implants named like: Eifyr and Co. 'Rogue' Acceleration Control AC (6 of 6)
+    """
 
     type = 'passive'
 
@@ -522,6 +839,13 @@ class Effect242(EffectDef):
 
 
 class Effect244(EffectDef):
+    """
+    highSpeedManuveringCapacitorNeedMultiplierPostPercentCapacitorNeedLocationShipModulesRequiringHighSpeedManuvering
+
+    Used by:
+    Implants named like: Eifyr and Co. 'Rogue' High Speed Maneuvering HS (6 of 6)
+    Skill: High Speed Maneuvering
+    """
 
     type = 'passive'
 
@@ -533,6 +857,16 @@ class Effect244(EffectDef):
 
 
 class Effect271(EffectDef):
+    """
+    hullUpgradesArmorHpBonusPostPercentHpLocationShip
+
+    Used by:
+    Implants named like: grade Slave (15 of 18)
+    Modules named like: Trimark Armor Pump (8 of 8)
+    Implant: Low-grade Snake Epsilon
+    Implant: Mid-grade Snake Epsilon
+    Skill: Hull Upgrades
+    """
 
     type = 'passive'
 
@@ -543,6 +877,15 @@ class Effect271(EffectDef):
 
 
 class Effect272(EffectDef):
+    """
+    repairSystemsDurationBonusPostPercentDurationLocationShipModulesRequiringRepairSystems
+
+    Used by:
+    Implants named like: Inherent Implants 'Noble' Repair Systems RS (6 of 6)
+    Modules named like: Nanobot Accelerator (8 of 8)
+    Implant: Numon Family Heirloom
+    Skill: Repair Systems
+    """
 
     type = 'passive'
 
@@ -554,6 +897,14 @@ class Effect272(EffectDef):
 
 
 class Effect273(EffectDef):
+    """
+    shieldUpgradesPowerNeedBonusPostPercentPowerLocationShipModulesRequiringShieldUpgrades
+
+    Used by:
+    Implants named like: Zainou 'Gnome' Shield Upgrades SU (6 of 6)
+    Modules named like: Core Defense Charge Economizer (8 of 8)
+    Skill: Shield Upgrades
+    """
 
     type = 'passive'
 
@@ -565,6 +916,12 @@ class Effect273(EffectDef):
 
 
 class Effect277(EffectDef):
+    """
+    tacticalshieldManipulationSkillBoostUniformityBonus
+
+    Used by:
+    Skill: Tactical Shield Manipulation
+    """
 
     type = 'passive'
 
@@ -574,6 +931,13 @@ class Effect277(EffectDef):
 
 
 class Effect279(EffectDef):
+    """
+    shieldEmmisionSystemsCapNeedBonusPostPercentCapacitorNeedLocationShipModulesRequiringShieldEmmisionSystems
+
+    Used by:
+    Implants named like: Zainou 'Gnome' Shield Emission Systems SE (6 of 6)
+    Skill: Shield Emission Systems
+    """
 
     type = 'passive'
 
@@ -585,6 +949,13 @@ class Effect279(EffectDef):
 
 
 class Effect287(EffectDef):
+    """
+    controlledBurstsCapNeedBonusPostPercentCapacitorNeedLocationShipModulesRequiringGunnery
+
+    Used by:
+    Implants named like: Inherent Implants 'Lancer' Controlled Bursts CB (6 of 6)
+    Skill: Controlled Bursts
+    """
 
     type = 'passive'
 
@@ -596,6 +967,14 @@ class Effect287(EffectDef):
 
 
 class Effect290(EffectDef):
+    """
+    sharpshooterRangeSkillBonusPostPercentMaxRangeLocationShipModulesRequiringGunnery
+
+    Used by:
+    Implants named like: Frentix Booster (4 of 4)
+    Implants named like: Zainou 'Deadeye' Sharpshooter ST (6 of 6)
+    Skill: Sharpshooter
+    """
 
     type = 'passive'
 
@@ -607,6 +986,14 @@ class Effect290(EffectDef):
 
 
 class Effect298(EffectDef):
+    """
+    surgicalStrikeFalloffBonusPostPercentFalloffLocationShipModulesRequiringGunnery
+
+    Used by:
+    Implants named like: Sooth Sayer Booster (4 of 4)
+    Implants named like: Zainou 'Deadeye' Trajectory Analysis TA (6 of 6)
+    Skill: Trajectory Analysis
+    """
 
     type = 'passive'
 
@@ -618,6 +1005,12 @@ class Effect298(EffectDef):
 
 
 class Effect315(EffectDef):
+    """
+    dronesSkillBoostMaxActiveDroneBonus
+
+    Used by:
+    Skill: Drones
+    """
 
     type = 'passive'
 
@@ -628,6 +1021,15 @@ class Effect315(EffectDef):
 
 
 class Effect391(EffectDef):
+    """
+    astrogeologyMiningAmountBonusPostPercentMiningAmountLocationShipModulesRequiringMining
+
+    Used by:
+    Implants named like: Inherent Implants 'Highwall' Mining MX (3 of 3)
+    Implant: Michi's Excavation Augmentor
+    Skill: Astrogeology
+    Skill: Mining
+    """
 
     type = 'passive'
 
@@ -639,6 +1041,14 @@ class Effect391(EffectDef):
 
 
 class Effect392(EffectDef):
+    """
+    mechanicHullHpBonusPostPercentHpShip
+
+    Used by:
+    Implants named like: Inherent Implants 'Noble' Mechanic MC (6 of 6)
+    Modules named like: Transverse Bulkhead (8 of 8)
+    Skill: Mechanics
+    """
 
     type = 'passive'
 
@@ -649,6 +1059,17 @@ class Effect392(EffectDef):
 
 
 class Effect394(EffectDef):
+    """
+    navigationVelocityBonusPostPercentMaxVelocityShip
+
+    Used by:
+    Modules from group: Rig Anchor (4 of 4)
+    Implants named like: Agency 'Overclocker' SB Dose (4 of 4)
+    Implants named like: grade Snake (16 of 18)
+    Modules named like: Auxiliary Thrusters (8 of 8)
+    Implant: Quafe Zero
+    Skill: Navigation
+    """
 
     type = 'passive'
 
@@ -661,6 +1082,18 @@ class Effect394(EffectDef):
 
 
 class Effect395(EffectDef):
+    """
+    evasiveManeuveringAgilityBonusPostPercentAgilityShip
+
+    Used by:
+    Modules from group: Rig Anchor (4 of 4)
+    Implants named like: Eifyr and Co. 'Rogue' Evasive Maneuvering EM (6 of 6)
+    Implants named like: grade Nomad (10 of 12)
+    Modules named like: Low Friction Nozzle Joints (8 of 8)
+    Implant: Genolution Core Augmentation CA-4
+    Skill: Evasive Maneuvering
+    Skill: Spaceship Command
+    """
 
     type = 'passive'
 
@@ -672,6 +1105,14 @@ class Effect395(EffectDef):
 
 
 class Effect396(EffectDef):
+    """
+    energyGridUpgradesCpuNeedBonusPostPercentCpuLocationShipModulesRequiringEnergyGridUpgrades
+
+    Used by:
+    Implants named like: Inherent Implants 'Squire' Energy Grid Upgrades EU (6 of 6)
+    Modules named like: Powergrid Subroutine Maximizer (8 of 8)
+    Skill: Energy Grid Upgrades
+    """
 
     type = 'passive'
 
@@ -683,6 +1124,16 @@ class Effect396(EffectDef):
 
 
 class Effect397(EffectDef):
+    """
+    electronicsCpuOutputBonusPostPercentCpuOutputLocationShipGroupComputer
+
+    Used by:
+    Implants named like: Zainou 'Gypsy' CPU Management EE (6 of 6)
+    Modules named like: Processor Overclocking Unit (8 of 8)
+    Subsystems named like: Core Electronic Efficiency Gate (2 of 2)
+    Implant: Genolution Core Augmentation CA-2
+    Skill: CPU Management
+    """
 
     type = 'passive'
 
@@ -693,6 +1144,13 @@ class Effect397(EffectDef):
 
 
 class Effect408(EffectDef):
+    """
+    largeProjectileTurretDamageMultiplierBonusPostPercentDamageMultiplierLocationShipModulesRequiringLargeProjectileTurret
+
+    Used by:
+    Implants named like: Eifyr and Co. 'Gunslinger' Large Projectile Turret LP (6 of 6)
+    Skill: Large Projectile Turret
+    """
 
     type = 'passive'
 
@@ -704,6 +1162,14 @@ class Effect408(EffectDef):
 
 
 class Effect414(EffectDef):
+    """
+    gunneryTurretSpeeBonusPostPercentSpeedLocationShipModulesRequiringGunnery
+
+    Used by:
+    Implants named like: Inherent Implants 'Lancer' Gunnery RF (6 of 6)
+    Implant: Pashan's Turret Customization Mindlink
+    Skill: Gunnery
+    """
 
     type = 'passive'
 
@@ -715,6 +1181,16 @@ class Effect414(EffectDef):
 
 
 class Effect446(EffectDef):
+    """
+    shieldManagementShieldCapacityBonusPostPercentCapacityLocationShipGroupShield
+
+    Used by:
+    Implants named like: Zainou 'Gnome' Shield Management SM (6 of 6)
+    Modules named like: Core Defense Field Extender (8 of 8)
+    Implant: Genolution Core Augmentation CA-3
+    Implant: Sansha Modified 'Gnome' Implant
+    Skill: Shield Management
+    """
 
     type = 'passive'
 
@@ -725,6 +1201,15 @@ class Effect446(EffectDef):
 
 
 class Effect485(EffectDef):
+    """
+    energysystemsoperationCapRechargeBonusPostPercentRechargeRateLocationShipGroupCapacitor
+
+    Used by:
+    Implants named like: Inherent Implants 'Squire' Capacitor Systems Operation EO (6 of 6)
+    Modules named like: Capacitor Control Circuit (8 of 8)
+    Implant: Genolution Core Augmentation CA-2
+    Skill: Capacitor Systems Operation
+    """
 
     type = 'passive'
 
@@ -735,6 +1220,15 @@ class Effect485(EffectDef):
 
 
 class Effect486(EffectDef):
+    """
+    shieldOperationRechargeratebonusPostPercentRechargeRateLocationShipGroupShield
+
+    Used by:
+    Implants named like: Zainou 'Gnome' Shield Operation SP (6 of 6)
+    Modules named like: Core Defense Field Purger (8 of 8)
+    Implant: Sansha Modified 'Gnome' Implant
+    Skill: Shield Operation
+    """
 
     type = 'passive'
 
@@ -745,6 +1239,16 @@ class Effect486(EffectDef):
 
 
 class Effect490(EffectDef):
+    """
+    engineeringPowerEngineeringOutputBonusPostPercentPowerOutputLocationShipGroupPowerCore
+
+    Used by:
+    Implants named like: Inherent Implants 'Squire' Power Grid Management EG (6 of 6)
+    Modules named like: Ancillary Current Router (8 of 8)
+    Subsystems named like: Core Augmented Reactor (4 of 4)
+    Implant: Genolution Core Augmentation CA-1
+    Skill: Power Grid Management
+    """
 
     type = 'passive'
 
@@ -755,6 +1259,13 @@ class Effect490(EffectDef):
 
 
 class Effect494(EffectDef):
+    """
+    warpDriveOperationWarpCapacitorNeedBonusPostPercentWarpCapacitorNeedLocationShipGroupPropulsion
+
+    Used by:
+    Modules named like: Warp Core Optimizer (8 of 8)
+    Skill: Warp Drive Operation
+    """
 
     type = 'passive'
 
@@ -766,6 +1277,13 @@ class Effect494(EffectDef):
 
 
 class Effect504(EffectDef):
+    """
+    scoutDroneOperationDroneRangeBonusModAddDroneControlDistanceChar
+
+    Used by:
+    Modules named like: Drone Control Range Augmentor (8 of 8)
+    Skills named like: Drone Avionics (2 of 2)
+    """
 
     type = 'passive'
 
@@ -777,6 +1295,13 @@ class Effect504(EffectDef):
 
 
 class Effect506(EffectDef):
+    """
+    fuelConservationCapNeedBonusPostPercentCapacitorNeedLocationShipModulesRequiringAfterburner
+
+    Used by:
+    Skill: Afterburner
+    Skill: Fuel Conservation
+    """
 
     type = 'passive'
 
@@ -787,6 +1312,13 @@ class Effect506(EffectDef):
 
 
 class Effect507(EffectDef):
+    """
+    longRangeTargetingMaxTargetRangeBonusPostPercentMaxTargetRangeLocationShipGroupElectronic
+
+    Used by:
+    Implants named like: Zainou 'Gypsy' Long Range Targeting LT (6 of 6)
+    Skill: Long Range Targeting
+    """
 
     type = 'passive'
 
@@ -797,6 +1329,18 @@ class Effect507(EffectDef):
 
 
 class Effect508(EffectDef):
+    """
+    shipPDmgBonusMF
+
+    Used by:
+    Ship: Cheetah
+    Ship: Freki
+    Ship: Republic Fleet Firetail
+    Ship: Rifter
+    Ship: Slasher
+    Ship: Stiletto
+    Ship: Wolf
+    """
 
     type = 'passive'
 
@@ -807,6 +1351,18 @@ class Effect508(EffectDef):
 
 
 class Effect511(EffectDef):
+    """
+    shipEnergyTCapNeedBonusAF
+
+    Used by:
+    Ship: Crusader
+    Ship: Executioner
+    Ship: Gold Magnate
+    Ship: Punisher
+    Ship: Retribution
+    Ship: Silver Magnate
+    Ship: Tormentor
+    """
 
     type = 'passive'
 
@@ -817,6 +1373,17 @@ class Effect511(EffectDef):
 
 
 class Effect512(EffectDef):
+    """
+    shipSHTDmgBonusGF
+
+    Used by:
+    Variations of ship: Incursus (3 of 3)
+    Ship: Atron
+    Ship: Federation Navy Comet
+    Ship: Helios
+    Ship: Pacifier
+    Ship: Taranis
+    """
 
     type = 'passive'
 
@@ -827,6 +1394,15 @@ class Effect512(EffectDef):
 
 
 class Effect514(EffectDef):
+    """
+    shipSETDmgBonusAF
+
+    Used by:
+    Ship: Executioner
+    Ship: Gold Magnate
+    Ship: Silver Magnate
+    Ship: Tormentor
+    """
 
     type = 'passive'
 
@@ -837,6 +1413,14 @@ class Effect514(EffectDef):
 
 
 class Effect516(EffectDef):
+    """
+    shipTCapNeedBonusAC
+
+    Used by:
+    Ship: Devoter
+    Ship: Omen
+    Ship: Zealot
+    """
 
     type = 'passive'
 
@@ -847,6 +1431,12 @@ class Effect516(EffectDef):
 
 
 class Effect521(EffectDef):
+    """
+    shipHRangeBonusCC
+
+    Used by:
+    Ship: Eagle
+    """
 
     type = 'passive'
 
@@ -857,6 +1447,14 @@ class Effect521(EffectDef):
 
 
 class Effect527(EffectDef):
+    """
+    shipVelocityBonusMI
+
+    Used by:
+    Variations of ship: Mammoth (2 of 2)
+    Ship: Hoarder
+    Ship: Prowler
+    """
 
     type = 'passive'
 
@@ -866,6 +1464,13 @@ class Effect527(EffectDef):
 
 
 class Effect529(EffectDef):
+    """
+    shipCargoBonusAI
+
+    Used by:
+    Variations of ship: Sigil (2 of 2)
+    Ship: Bestower
+    """
 
     type = 'passive'
 
@@ -875,6 +1480,13 @@ class Effect529(EffectDef):
 
 
 class Effect536(EffectDef):
+    """
+    cpuMultiplierPostMulCpuOutputShip
+
+    Used by:
+    Modules from group: CPU Enhancer (19 of 19)
+    Variations of structure module: Standup Co-Processor Array I (2 of 2)
+    """
 
     type = 'passive'
 
@@ -884,6 +1496,13 @@ class Effect536(EffectDef):
 
 
 class Effect542(EffectDef):
+    """
+    shipCapNeedBonusAB
+
+    Used by:
+    Variations of ship: Armageddon (3 of 5)
+    Ship: Apocalypse Imperial Issue
+    """
 
     type = 'passive'
 
@@ -894,6 +1513,14 @@ class Effect542(EffectDef):
 
 
 class Effect549(EffectDef):
+    """
+    shipPTDmgBonusMB
+
+    Used by:
+    Variations of ship: Tempest (3 of 4)
+    Ship: Machariel
+    Ship: Panther
+    """
 
     type = 'passive'
 
@@ -905,6 +1532,17 @@ class Effect549(EffectDef):
 
 
 class Effect550(EffectDef):
+    """
+    shipHTDmgBonusGB
+
+    Used by:
+    Ship: Dominix Navy Issue
+    Ship: Hyperion
+    Ship: Kronos
+    Ship: Marshal
+    Ship: Megathron Federate Issue
+    Ship: Sin
+    """
 
     type = 'passive'
 
@@ -916,6 +1554,12 @@ class Effect550(EffectDef):
 
 
 class Effect553(EffectDef):
+    """
+    shipHTTrackingBonusGB
+
+    Used by:
+    Ship: Vindicator
+    """
 
     type = 'passive'
 
@@ -926,6 +1570,19 @@ class Effect553(EffectDef):
 
 
 class Effect562(EffectDef):
+    """
+    shipHTDmgBonusfixedGC
+
+    Used by:
+    Ship: Adrestia
+    Ship: Arazu
+    Ship: Deimos
+    Ship: Enforcer
+    Ship: Exequror Navy Issue
+    Ship: Guardian-Vexor
+    Ship: Thorax
+    Ship: Vexor
+    """
 
     type = 'passive'
 
@@ -936,6 +1593,13 @@ class Effect562(EffectDef):
 
 
 class Effect581(EffectDef):
+    """
+    weaponUpgradesCpuNeedBonusPostPercentCpuLocationShipModulesRequiringGunnery
+
+    Used by:
+    Implants named like: Zainou 'Gnome' Weapon Upgrades WU (6 of 6)
+    Skill: Weapon Upgrades
+    """
 
     type = 'passive'
 
@@ -947,6 +1611,12 @@ class Effect581(EffectDef):
 
 
 class Effect582(EffectDef):
+    """
+    rapidFiringRofBonusPostPercentSpeedLocationShipModulesRequiringGunnery
+
+    Used by:
+    Skill: Rapid Firing
+    """
 
     type = 'passive'
 
@@ -957,6 +1627,14 @@ class Effect582(EffectDef):
 
 
 class Effect584(EffectDef):
+    """
+    surgicalStrikeDamageMultiplierBonusPostPercentDamageMultiplierLocationShipModulesRequiringGunnery
+
+    Used by:
+    Implants named like: Agency 'Pyrolancea' DB Dose (4 of 4)
+    Implants named like: Eifyr and Co. 'Gunslinger' Surgical Strike SS (6 of 6)
+    Implant: Standard Cerebral Accelerator
+    """
 
     type = 'passive'
 
@@ -967,6 +1645,12 @@ class Effect584(EffectDef):
 
 
 class Effect587(EffectDef):
+    """
+    surgicalStrikeDamageMultiplierBonusPostPercentDamageMultiplierLocationShipGroupEnergyWeapon
+
+    Used by:
+    Skill: Surgical Strike
+    """
 
     type = 'passive'
 
@@ -977,6 +1661,12 @@ class Effect587(EffectDef):
 
 
 class Effect588(EffectDef):
+    """
+    surgicalStrikeDamageMultiplierBonusPostPercentDamageMultiplierLocationShipGroupProjectileWeapon
+
+    Used by:
+    Skill: Surgical Strike
+    """
 
     type = 'passive'
 
@@ -987,6 +1677,12 @@ class Effect588(EffectDef):
 
 
 class Effect589(EffectDef):
+    """
+    surgicalStrikeDamageMultiplierBonusPostPercentDamageMultiplierLocationShipGroupHybridWeapon
+
+    Used by:
+    Skill: Surgical Strike
+    """
 
     type = 'passive'
 
@@ -997,6 +1693,13 @@ class Effect589(EffectDef):
 
 
 class Effect590(EffectDef):
+    """
+    energyPulseWeaponsDurationBonusPostPercentDurationLocationShipModulesRequiringEnergyPulseWeapons
+
+    Used by:
+    Implants named like: Inherent Implants 'Squire' Energy Pulse Weapons EP (6 of 6)
+    Skill: Energy Pulse Weapons
+    """
 
     type = 'passive'
 
@@ -1008,6 +1711,12 @@ class Effect590(EffectDef):
 
 
 class Effect596(EffectDef):
+    """
+    ammoInfluenceRange
+
+    Used by:
+    Items from category: Charge (587 of 949)
+    """
 
     type = 'passive'
 
@@ -1017,6 +1726,14 @@ class Effect596(EffectDef):
 
 
 class Effect598(EffectDef):
+    """
+    ammoSpeedMultiplier
+
+    Used by:
+    Charges from group: Festival Charges (26 of 26)
+    Charges from group: Interdiction Probe (2 of 2)
+    Items from market group: Special Edition Assets > Special Edition Festival Assets (30 of 33)
+    """
 
     type = 'passive'
 
@@ -1026,6 +1743,17 @@ class Effect598(EffectDef):
 
 
 class Effect599(EffectDef):
+    """
+    ammoFallofMultiplier
+
+    Used by:
+    Charges from group: Advanced Artillery Ammo (8 of 8)
+    Charges from group: Advanced Autocannon Ammo (8 of 8)
+    Charges from group: Advanced Beam Laser Crystal (8 of 8)
+    Charges from group: Advanced Blaster Charge (8 of 8)
+    Charges from group: Advanced Pulse Laser Crystal (8 of 8)
+    Charges from group: Advanced Railgun Charge (8 of 8)
+    """
 
     type = 'passive'
 
@@ -1035,6 +1763,13 @@ class Effect599(EffectDef):
 
 
 class Effect600(EffectDef):
+    """
+    ammoTrackingMultiplier
+
+    Used by:
+    Items from category: Charge (182 of 949)
+    Charges from group: Projectile Ammo (128 of 128)
+    """
 
     type = 'passive'
 
@@ -1044,6 +1779,16 @@ class Effect600(EffectDef):
 
 
 class Effect602(EffectDef):
+    """
+    shipPTurretSpeedBonusMC
+
+    Used by:
+    Variations of ship: Rupture (3 of 3)
+    Variations of ship: Stabber (3 of 3)
+    Ship: Enforcer
+    Ship: Huginn
+    Ship: Scythe Fleet Issue
+    """
 
     type = 'passive'
 
@@ -1054,6 +1799,16 @@ class Effect602(EffectDef):
 
 
 class Effect604(EffectDef):
+    """
+    shipPTspeedBonusMB2
+
+    Used by:
+    Variations of ship: Tempest (4 of 4)
+    Ship: Maelstrom
+    Ship: Marshal
+    Ship: Panther
+    Ship: Typhoon Fleet Issue
+    """
 
     type = 'passive'
 
@@ -1064,6 +1819,12 @@ class Effect604(EffectDef):
 
 
 class Effect607(EffectDef):
+    """
+    cloaking
+
+    Used by:
+    Modules from group: Cloaking Device (10 of 14)
+    """
 
     runTime = 'early'
     type = 'active'
@@ -1079,6 +1840,13 @@ class Effect607(EffectDef):
 
 
 class Effect623(EffectDef):
+    """
+    miningDroneOperationMiningAmountBonusPostPercentMiningDroneAmountPercentChar
+
+    Used by:
+    Modules named like: Drone Mining Augmentor (8 of 8)
+    Skill: Mining Drone Operation
+    """
 
     type = 'passive'
 
@@ -1091,6 +1859,12 @@ class Effect623(EffectDef):
 
 
 class Effect627(EffectDef):
+    """
+    powerIncrease
+
+    Used by:
+    Modules from group: Auxiliary Power Core (5 of 5)
+    """
 
     type = 'passive'
 
@@ -1100,6 +1874,14 @@ class Effect627(EffectDef):
 
 
 class Effect657(EffectDef):
+    """
+    agilityMultiplierEffect
+
+    Used by:
+    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'
 
@@ -1111,6 +1893,14 @@ class Effect657(EffectDef):
 
 
 class Effect660(EffectDef):
+    """
+    missileEMDmgBonus
+
+    Used by:
+    Skills named like: Missiles (5 of 7)
+    Skill: Rockets
+    Skill: Torpedoes
+    """
 
     type = 'passive'
 
@@ -1121,6 +1911,14 @@ class Effect660(EffectDef):
 
 
 class Effect661(EffectDef):
+    """
+    missileExplosiveDmgBonus
+
+    Used by:
+    Skills named like: Missiles (5 of 7)
+    Skill: Rockets
+    Skill: Torpedoes
+    """
 
     type = 'passive'
 
@@ -1131,6 +1929,14 @@ class Effect661(EffectDef):
 
 
 class Effect662(EffectDef):
+    """
+    missileThermalDmgBonus
+
+    Used by:
+    Skills named like: Missiles (5 of 7)
+    Skill: Rockets
+    Skill: Torpedoes
+    """
 
     type = 'passive'
 
@@ -1141,6 +1947,14 @@ class Effect662(EffectDef):
 
 
 class Effect668(EffectDef):
+    """
+    missileKineticDmgBonus2
+
+    Used by:
+    Skills named like: Missiles (5 of 7)
+    Skill: Rockets
+    Skill: Torpedoes
+    """
 
     type = 'passive'
 
@@ -1151,6 +1965,12 @@ class Effect668(EffectDef):
 
 
 class Effect670(EffectDef):
+    """
+    antiWarpScramblingPassive
+
+    Used by:
+    Modules from group: Warp Core Stabilizer (8 of 8)
+    """
 
     type = 'passive'
 
@@ -1160,6 +1980,12 @@ class Effect670(EffectDef):
 
 
 class Effect675(EffectDef):
+    """
+    weaponUpgradesCpuNeedBonusPostPercentCpuLocationShipModulesRequiringEnergyPulseWeapons
+
+    Used by:
+    Skill: Weapon Upgrades
+    """
 
     type = 'passive'
 
@@ -1170,6 +1996,13 @@ class Effect675(EffectDef):
 
 
 class Effect677(EffectDef):
+    """
+    weaponUpgradesCpuNeedBonusPostPercentCpuLocationShipModulesRequiringMissileLauncherOperation
+
+    Used by:
+    Implants named like: Zainou 'Gnome' Launcher CPU Efficiency LE (6 of 6)
+    Skill: Weapon Upgrades
+    """
 
     type = 'passive'
 
@@ -1181,6 +2014,15 @@ class Effect677(EffectDef):
 
 
 class Effect699(EffectDef):
+    """
+    signatureAnalysisScanResolutionBonusPostPercentScanResolutionShip
+
+    Used by:
+    Implants named like: Zainou 'Gypsy' Signature Analysis SA (6 of 6)
+    Modules named like: Targeting System Subcontroller (8 of 8)
+    Implant: Quafe Zero
+    Skill: Signature Analysis
+    """
 
     type = 'passive'
 
@@ -1193,6 +2035,12 @@ class Effect699(EffectDef):
 
 
 class Effect706(EffectDef):
+    """
+    covertOpsWarpResistance
+
+    Used by:
+    Ships from group: Covert Ops (5 of 8)
+    """
 
     type = 'passive'
 
@@ -1202,6 +2050,14 @@ class Effect706(EffectDef):
 
 
 class Effect726(EffectDef):
+    """
+    shipBonusCargo2GI
+
+    Used by:
+    Variations of ship: Miasmos (3 of 4)
+    Variations of ship: Nereus (2 of 2)
+    Ship: Iteron Mark V
+    """
 
     type = 'passive'
 
@@ -1217,6 +2073,13 @@ class Effect726(EffectDef):
 
 
 class Effect727(EffectDef):
+    """
+    shipBonusCargoCI
+
+    Used by:
+    Variations of ship: Badger (2 of 2)
+    Ship: Tayra
+    """
 
     type = 'passive'
 
@@ -1226,6 +2089,13 @@ class Effect727(EffectDef):
 
 
 class Effect728(EffectDef):
+    """
+    shipBonusCargoMI
+
+    Used by:
+    Variations of ship: Wreathe (2 of 2)
+    Ship: Mammoth
+    """
 
     type = 'passive'
 
@@ -1235,6 +2105,16 @@ class Effect728(EffectDef):
 
 
 class Effect729(EffectDef):
+    """
+    shipBonusVelocityGI
+
+    Used by:
+    Variations of ship: Epithal (2 of 2)
+    Variations of ship: Miasmos (4 of 4)
+    Ship: Iteron Mark V
+    Ship: Kryos
+    Ship: Viator
+    """
 
     type = 'passive'
 
@@ -1250,6 +2130,13 @@ class Effect729(EffectDef):
 
 
 class Effect730(EffectDef):
+    """
+    shipBonusVelocityCI
+
+    Used by:
+    Variations of ship: Tayra (2 of 2)
+    Ship: Crane
+    """
 
     type = 'passive'
 
@@ -1259,6 +2146,13 @@ class Effect730(EffectDef):
 
 
 class Effect732(EffectDef):
+    """
+    shipVelocityBonusAI
+
+    Used by:
+    Variations of ship: Bestower (2 of 2)
+    Ship: Prorator
+    """
 
     type = 'passive'
 
@@ -1268,6 +2162,13 @@ class Effect732(EffectDef):
 
 
 class Effect736(EffectDef):
+    """
+    shipBonusCapCapAB
+
+    Used by:
+    Ship: Apocalypse Imperial Issue
+    Ship: Paladin
+    """
 
     type = 'passive'
 
@@ -1277,6 +2178,13 @@ class Effect736(EffectDef):
 
 
 class Effect744(EffectDef):
+    """
+    surveyScanspeedBonusPostPercentDurationLocationShipModulesRequiringElectronics
+
+    Used by:
+    Modules named like: Signal Focusing Kit (8 of 8)
+    Skill: Survey
+    """
 
     type = 'passive'
 
@@ -1288,6 +2196,12 @@ class Effect744(EffectDef):
 
 
 class Effect754(EffectDef):
+    """
+    shipHybridDamageBonusCF
+
+    Used by:
+    Ship: Raptor
+    """
 
     type = 'passive'
 
@@ -1298,6 +2212,15 @@ class Effect754(EffectDef):
 
 
 class Effect757(EffectDef):
+    """
+    shipETDamageAF
+
+    Used by:
+    Ship: Crucifier Navy Issue
+    Ship: Crusader
+    Ship: Imperial Navy Slicer
+    Ship: Pacifier
+    """
 
     type = 'passive'
 
@@ -1308,6 +2231,14 @@ class Effect757(EffectDef):
 
 
 class Effect760(EffectDef):
+    """
+    shipBonusSmallMissileRoFCF2
+
+    Used by:
+    Ship: Buzzard
+    Ship: Hawk
+    Ship: Pacifier
+    """
 
     type = 'passive'
 
@@ -1318,6 +2249,12 @@ class Effect760(EffectDef):
 
 
 class Effect763(EffectDef):
+    """
+    missileDMGBonus
+
+    Used by:
+    Modules from group: Ballistic Control system (22 of 22)
+    """
 
     type = 'passive'
 
@@ -1331,6 +2268,15 @@ class Effect763(EffectDef):
 
 
 class Effect784(EffectDef):
+    """
+    missileBombardmentMaxFlightTimeBonusPostPercentExplosionDelayOwnerCharModulesRequiringMissileLauncherOperation
+
+    Used by:
+    Implants named like: Zainou 'Deadeye' Missile Bombardment MB (6 of 6)
+    Modules named like: Rocket Fuel Cache Partition (8 of 8)
+    Implant: Antipharmakon Toxot
+    Skill: Missile Bombardment
+    """
 
     type = 'passive'
 
@@ -1344,6 +2290,12 @@ class Effect784(EffectDef):
 
 
 class Effect804(EffectDef):
+    """
+    ammoInfluenceCapNeed
+
+    Used by:
+    Items from category: Charge (493 of 949)
+    """
 
     type = 'passive'
 
@@ -1357,6 +2309,12 @@ class Effect804(EffectDef):
 
 
 class Effect836(EffectDef):
+    """
+    skillFreightBonus
+
+    Used by:
+    Modules named like: Cargohold Optimization (8 of 8)
+    """
 
     type = 'passive'
 
@@ -1366,6 +2324,12 @@ class Effect836(EffectDef):
 
 
 class Effect848(EffectDef):
+    """
+    cloakingTargetingDelayBonusPostPercentCloakingTargetingDelayBonusForShipModulesRequiringCloaking
+
+    Used by:
+    Skill: Cloaking
+    """
 
     type = 'passive'
 
@@ -1377,6 +2341,12 @@ class Effect848(EffectDef):
 
 
 class Effect854(EffectDef):
+    """
+    cloakingScanResolutionMultiplier
+
+    Used by:
+    Modules from group: Cloaking Device (12 of 14)
+    """
 
     type = 'offline'
 
@@ -1388,6 +2358,14 @@ class Effect854(EffectDef):
 
 
 class Effect856(EffectDef):
+    """
+    warpSkillSpeed
+
+    Used by:
+    Implants named like: Eifyr and Co. 'Rogue' Warp Drive Speed WS (6 of 6)
+    Implants named like: grade Ascendancy (10 of 12)
+    Modules named like: Hyperspatial Velocity Optimizer (8 of 8)
+    """
 
     type = 'passive'
 
@@ -1399,6 +2377,12 @@ class Effect856(EffectDef):
 
 
 class Effect874(EffectDef):
+    """
+    shipProjectileOptimalBonuseMF2
+
+    Used by:
+    Ship: Cheetah
+    """
 
     type = 'passive'
 
@@ -1409,6 +2393,13 @@ class Effect874(EffectDef):
 
 
 class Effect882(EffectDef):
+    """
+    shipHybridRangeBonusCF2
+
+    Used by:
+    Ship: Harpy
+    Ship: Raptor
+    """
 
     type = 'passive'
 
@@ -1419,6 +2410,12 @@ class Effect882(EffectDef):
 
 
 class Effect887(EffectDef):
+    """
+    shipETspeedBonusAB2
+
+    Used by:
+    Variations of ship: Armageddon (3 of 5)
+    """
 
     type = 'passive'
 
@@ -1429,6 +2426,12 @@ class Effect887(EffectDef):
 
 
 class Effect889(EffectDef):
+    """
+    missileLauncherSpeedMultiplier
+
+    Used by:
+    Modules from group: Ballistic Control system (22 of 22)
+    """
 
     type = 'passive'
 
@@ -1440,6 +2443,12 @@ class Effect889(EffectDef):
 
 
 class Effect891(EffectDef):
+    """
+    shipCruiseMissileVelocityBonusCB3
+
+    Used by:
+    Variations of ship: Raven (3 of 4)
+    """
 
     type = 'passive'
 
@@ -1450,6 +2459,12 @@ class Effect891(EffectDef):
 
 
 class Effect892(EffectDef):
+    """
+    shipTorpedosVelocityBonusCB3
+
+    Used by:
+    Variations of ship: Raven (3 of 4)
+    """
 
     type = 'passive'
 
@@ -1460,6 +2475,13 @@ class Effect892(EffectDef):
 
 
 class Effect896(EffectDef):
+    """
+    covertOpsCpuBonus1
+
+    Used by:
+    Ships from group: Stealth Bomber (4 of 5)
+    Subsystems named like: Defensive Covert Reconfiguration (4 of 4)
+    """
 
     type = 'passive'
 
@@ -1470,6 +2492,14 @@ class Effect896(EffectDef):
 
 
 class Effect898(EffectDef):
+    """
+    shipMissileKineticDamageCF
+
+    Used by:
+    Ship: Buzzard
+    Ship: Condor
+    Ship: Hawk
+    """
 
     type = 'passive'
 
@@ -1480,6 +2510,14 @@ class Effect898(EffectDef):
 
 
 class Effect899(EffectDef):
+    """
+    shipMissileKineticDamageCC
+
+    Used by:
+    Ship: Cerberus
+    Ship: Onyx
+    Ship: Orthrus
+    """
 
     type = 'passive'
 
@@ -1490,6 +2528,12 @@ class Effect899(EffectDef):
 
 
 class Effect900(EffectDef):
+    """
+    shipDroneScoutThermalDamageGF2
+
+    Used by:
+    Ship: Helios
+    """
 
     type = 'passive'
 
@@ -1500,6 +2544,13 @@ class Effect900(EffectDef):
 
 
 class Effect907(EffectDef):
+    """
+    shipLaserRofAC2
+
+    Used by:
+    Ship: Omen
+    Ship: Zealot
+    """
 
     type = 'passive'
 
@@ -1510,6 +2561,12 @@ class Effect907(EffectDef):
 
 
 class Effect909(EffectDef):
+    """
+    shipArmorHpAC2
+
+    Used by:
+    Ship: Augoror Navy Issue
+    """
 
     type = 'passive'
 
@@ -1519,6 +2576,12 @@ class Effect909(EffectDef):
 
 
 class Effect912(EffectDef):
+    """
+    shipMissileLauncherRofCC2
+
+    Used by:
+    Ship: Onyx
+    """
 
     type = 'passive'
 
@@ -1529,6 +2592,12 @@ class Effect912(EffectDef):
 
 
 class Effect918(EffectDef):
+    """
+    shipDronesMaxGC2
+
+    Used by:
+    Ship: Guardian-Vexor
+    """
 
     type = 'passive'
 
@@ -1538,6 +2607,13 @@ class Effect918(EffectDef):
 
 
 class Effect919(EffectDef):
+    """
+    shipHybridTrackingGC2
+
+    Used by:
+    Ship: Enforcer
+    Ship: Thorax
+    """
 
     type = 'passive'
 
@@ -1548,6 +2624,12 @@ class Effect919(EffectDef):
 
 
 class Effect958(EffectDef):
+    """
+    shipArmorEmResistanceAC2
+
+    Used by:
+    Ship: Maller
+    """
 
     type = 'passive'
 
@@ -1557,6 +2639,12 @@ class Effect958(EffectDef):
 
 
 class Effect959(EffectDef):
+    """
+    shipArmorExplosiveResistanceAC2
+
+    Used by:
+    Ship: Maller
+    """
 
     type = 'passive'
 
@@ -1567,6 +2655,12 @@ class Effect959(EffectDef):
 
 
 class Effect960(EffectDef):
+    """
+    shipArmorKineticResistanceAC2
+
+    Used by:
+    Ship: Maller
+    """
 
     type = 'passive'
 
@@ -1577,6 +2671,12 @@ class Effect960(EffectDef):
 
 
 class Effect961(EffectDef):
+    """
+    shipArmorThermalResistanceAC2
+
+    Used by:
+    Ship: Maller
+    """
 
     type = 'passive'
 
@@ -1587,6 +2687,14 @@ class Effect961(EffectDef):
 
 
 class Effect968(EffectDef):
+    """
+    shipProjectileDmgMC2
+
+    Used by:
+    Variations of ship: Rupture (3 of 3)
+    Ship: Cynabal
+    Ship: Moracha
+    """
 
     type = 'passive'
 
@@ -1598,6 +2706,12 @@ class Effect968(EffectDef):
 
 
 class Effect980(EffectDef):
+    """
+    cloakingWarpSafe
+
+    Used by:
+    Modules named like: Covert Ops Cloaking Device II (2 of 2)
+    """
 
     runTime = 'early'
     type = 'active'
@@ -1609,6 +2723,14 @@ class Effect980(EffectDef):
 
 
 class Effect989(EffectDef):
+    """
+    eliteBonusGunshipHybridOptimal1
+
+    Used by:
+    Ship: Enyo
+    Ship: Harpy
+    Ship: Ishkur
+    """
 
     type = 'passive'
 
@@ -1619,6 +2741,12 @@ class Effect989(EffectDef):
 
 
 class Effect991(EffectDef):
+    """
+    eliteBonusGunshipLaserOptimal1
+
+    Used by:
+    Ship: Retribution
+    """
 
     type = 'passive'
 
@@ -1629,6 +2757,12 @@ class Effect991(EffectDef):
 
 
 class Effect996(EffectDef):
+    """
+    eliteBonusGunshipHybridTracking2
+
+    Used by:
+    Ship: Enyo
+    """
 
     type = 'passive'
 
@@ -1640,6 +2774,12 @@ class Effect996(EffectDef):
 
 
 class Effect998(EffectDef):
+    """
+    eliteBonusGunshipProjectileFalloff2
+
+    Used by:
+    Ship: Wolf
+    """
 
     type = 'passive'
 
@@ -1650,6 +2790,12 @@ class Effect998(EffectDef):
 
 
 class Effect999(EffectDef):
+    """
+    eliteBonusGunshipShieldBoost2
+
+    Used by:
+    Ship: Hawk
+    """
 
     type = 'passive'
 
@@ -1661,6 +2807,12 @@ class Effect999(EffectDef):
 
 
 class Effect1001(EffectDef):
+    """
+    eliteBonusGunshipCapRecharge2
+
+    Used by:
+    Ship: Vengeance
+    """
 
     type = 'passive'
 
@@ -1670,6 +2822,12 @@ class Effect1001(EffectDef):
 
 
 class Effect1003(EffectDef):
+    """
+    selfT2SmallLaserPulseDamageBonus
+
+    Used by:
+    Skill: Small Pulse Laser Specialization
+    """
 
     type = 'passive'
 
@@ -1680,6 +2838,12 @@ class Effect1003(EffectDef):
 
 
 class Effect1004(EffectDef):
+    """
+    selfT2SmallLaserBeamDamageBonus
+
+    Used by:
+    Skill: Small Beam Laser Specialization
+    """
 
     type = 'passive'
 
@@ -1690,6 +2854,12 @@ class Effect1004(EffectDef):
 
 
 class Effect1005(EffectDef):
+    """
+    selfT2SmallHybridBlasterDamageBonus
+
+    Used by:
+    Skill: Small Blaster Specialization
+    """
 
     type = 'passive'
 
@@ -1700,6 +2870,12 @@ class Effect1005(EffectDef):
 
 
 class Effect1006(EffectDef):
+    """
+    selfT2SmallHybridRailDamageBonus
+
+    Used by:
+    Skill: Small Railgun Specialization
+    """
 
     type = 'passive'
 
@@ -1710,6 +2886,12 @@ class Effect1006(EffectDef):
 
 
 class Effect1007(EffectDef):
+    """
+    selfT2SmallProjectileACDamageBonus
+
+    Used by:
+    Skill: Small Autocannon Specialization
+    """
 
     type = 'passive'
 
@@ -1720,6 +2902,12 @@ class Effect1007(EffectDef):
 
 
 class Effect1008(EffectDef):
+    """
+    selfT2SmallProjectileArtyDamageBonus
+
+    Used by:
+    Skill: Small Artillery Specialization
+    """
 
     type = 'passive'
 
@@ -1730,6 +2918,12 @@ class Effect1008(EffectDef):
 
 
 class Effect1009(EffectDef):
+    """
+    selfT2MediumLaserPulseDamageBonus
+
+    Used by:
+    Skill: Medium Pulse Laser Specialization
+    """
 
     type = 'passive'
 
@@ -1740,6 +2934,12 @@ class Effect1009(EffectDef):
 
 
 class Effect1010(EffectDef):
+    """
+    selfT2MediumLaserBeamDamageBonus
+
+    Used by:
+    Skill: Medium Beam Laser Specialization
+    """
 
     type = 'passive'
 
@@ -1750,6 +2950,12 @@ class Effect1010(EffectDef):
 
 
 class Effect1011(EffectDef):
+    """
+    selfT2MediumHybridBlasterDamageBonus
+
+    Used by:
+    Skill: Medium Blaster Specialization
+    """
 
     type = 'passive'
 
@@ -1760,6 +2966,12 @@ class Effect1011(EffectDef):
 
 
 class Effect1012(EffectDef):
+    """
+    selfT2MediumHybridRailDamageBonus
+
+    Used by:
+    Skill: Medium Railgun Specialization
+    """
 
     type = 'passive'
 
@@ -1770,6 +2982,12 @@ class Effect1012(EffectDef):
 
 
 class Effect1013(EffectDef):
+    """
+    selfT2MediumProjectileACDamageBonus
+
+    Used by:
+    Skill: Medium Autocannon Specialization
+    """
 
     type = 'passive'
 
@@ -1780,6 +2998,12 @@ class Effect1013(EffectDef):
 
 
 class Effect1014(EffectDef):
+    """
+    selfT2MediumProjectileArtyDamageBonus
+
+    Used by:
+    Skill: Medium Artillery Specialization
+    """
 
     type = 'passive'
 
@@ -1790,6 +3014,12 @@ class Effect1014(EffectDef):
 
 
 class Effect1015(EffectDef):
+    """
+    selfT2LargeLaserPulseDamageBonus
+
+    Used by:
+    Skill: Large Pulse Laser Specialization
+    """
 
     type = 'passive'
 
@@ -1800,6 +3030,12 @@ class Effect1015(EffectDef):
 
 
 class Effect1016(EffectDef):
+    """
+    selfT2LargeLaserBeamDamageBonus
+
+    Used by:
+    Skill: Large Beam Laser Specialization
+    """
 
     type = 'passive'
 
@@ -1810,6 +3046,12 @@ class Effect1016(EffectDef):
 
 
 class Effect1017(EffectDef):
+    """
+    selfT2LargeHybridBlasterDamageBonus
+
+    Used by:
+    Skill: Large Blaster Specialization
+    """
 
     type = 'passive'
 
@@ -1820,6 +3062,12 @@ class Effect1017(EffectDef):
 
 
 class Effect1018(EffectDef):
+    """
+    selfT2LargeHybridRailDamageBonus
+
+    Used by:
+    Skill: Large Railgun Specialization
+    """
 
     type = 'passive'
 
@@ -1830,6 +3078,12 @@ class Effect1018(EffectDef):
 
 
 class Effect1019(EffectDef):
+    """
+    selfT2LargeProjectileACDamageBonus
+
+    Used by:
+    Skill: Large Autocannon Specialization
+    """
 
     type = 'passive'
 
@@ -1840,6 +3094,12 @@ class Effect1019(EffectDef):
 
 
 class Effect1020(EffectDef):
+    """
+    selfT2LargeProjectileArtyDamageBonus
+
+    Used by:
+    Skill: Large Artillery Specialization
+    """
 
     type = 'passive'
 
@@ -1850,6 +3110,12 @@ class Effect1020(EffectDef):
 
 
 class Effect1021(EffectDef):
+    """
+    eliteBonusGunshipHybridDmg2
+
+    Used by:
+    Ship: Harpy
+    """
 
     type = 'passive'
 
@@ -1861,6 +3127,13 @@ class Effect1021(EffectDef):
 
 
 class Effect1024(EffectDef):
+    """
+    shipMissileHeavyVelocityBonusCC2
+
+    Used by:
+    Ship: Caracal
+    Ship: Osprey Navy Issue
+    """
 
     type = 'passive'
 
@@ -1871,6 +3144,13 @@ class Effect1024(EffectDef):
 
 
 class Effect1025(EffectDef):
+    """
+    shipMissileLightVelocityBonusCC2
+
+    Used by:
+    Ship: Caracal
+    Ship: Osprey Navy Issue
+    """
 
     type = 'passive'
 
@@ -1881,6 +3161,14 @@ class Effect1025(EffectDef):
 
 
 class Effect1030(EffectDef):
+    """
+    remoteArmorSystemsCapNeedBonusPostPercentCapacitorNeedLocationShipModulesRequiringRemoteArmorSystems
+
+    Used by:
+    Implants named like: Inherent Implants 'Noble' Remote Armor Repair Systems RA (6 of 6)
+    Modules named like: Remote Repair Augmentor (6 of 8)
+    Skill: Remote Armor Repair Systems
+    """
 
     type = 'passive'
 
@@ -1892,6 +3180,12 @@ class Effect1030(EffectDef):
 
 
 class Effect1033(EffectDef):
+    """
+    eliteBonusLogisticRemoteArmorRepairCapNeed1
+
+    Used by:
+    Ship: Oneiros
+    """
 
     type = 'passive'
 
@@ -1902,6 +3196,13 @@ class Effect1033(EffectDef):
 
 
 class Effect1034(EffectDef):
+    """
+    eliteBonusLogisticRemoteArmorRepairCapNeed2
+
+    Used by:
+    Ship: Guardian
+    Ship: Rabisu
+    """
 
     type = 'passive'
 
@@ -1912,6 +3213,12 @@ class Effect1034(EffectDef):
 
 
 class Effect1035(EffectDef):
+    """
+    eliteBonusLogisticShieldTransferCapNeed2
+
+    Used by:
+    Ship: Scimitar
+    """
 
     type = 'passive'
 
@@ -1922,6 +3229,13 @@ class Effect1035(EffectDef):
 
 
 class Effect1036(EffectDef):
+    """
+    eliteBonusLogisticShieldTransferCapNeed1
+
+    Used by:
+    Ship: Basilisk
+    Ship: Etana
+    """
 
     type = 'passive'
 
@@ -1932,6 +3246,12 @@ class Effect1036(EffectDef):
 
 
 class Effect1046(EffectDef):
+    """
+    shipRemoteArmorRangeGC1
+
+    Used by:
+    Ship: Oneiros
+    """
 
     type = 'passive'
 
@@ -1942,6 +3262,12 @@ class Effect1046(EffectDef):
 
 
 class Effect1047(EffectDef):
+    """
+    shipRemoteArmorRangeAC2
+
+    Used by:
+    Ship: Guardian
+    """
 
     type = 'passive'
 
@@ -1952,6 +3278,13 @@ class Effect1047(EffectDef):
 
 
 class Effect1048(EffectDef):
+    """
+    shipShieldTransferRangeCC1
+
+    Used by:
+    Ship: Basilisk
+    Ship: Etana
+    """
 
     type = 'passive'
 
@@ -1962,6 +3295,12 @@ class Effect1048(EffectDef):
 
 
 class Effect1049(EffectDef):
+    """
+    shipShieldTransferRangeMC2
+
+    Used by:
+    Ship: Scimitar
+    """
 
     type = 'passive'
 
@@ -1972,6 +3311,12 @@ class Effect1049(EffectDef):
 
 
 class Effect1056(EffectDef):
+    """
+    eliteBonusHeavyGunshipHybridOptimal1
+
+    Used by:
+    Ship: Eagle
+    """
 
     type = 'passive'
 
@@ -1983,6 +3328,12 @@ class Effect1056(EffectDef):
 
 
 class Effect1057(EffectDef):
+    """
+    eliteBonusHeavyGunshipProjectileOptimal1
+
+    Used by:
+    Ship: Muninn
+    """
 
     type = 'passive'
 
@@ -1994,6 +3345,12 @@ class Effect1057(EffectDef):
 
 
 class Effect1058(EffectDef):
+    """
+    eliteBonusHeavyGunshipLaserOptimal1
+
+    Used by:
+    Ship: Zealot
+    """
 
     type = 'passive'
 
@@ -2005,6 +3362,12 @@ class Effect1058(EffectDef):
 
 
 class Effect1060(EffectDef):
+    """
+    eliteBonusHeavyGunshipProjectileFallOff1
+
+    Used by:
+    Ship: Vagabond
+    """
 
     type = 'passive'
 
@@ -2016,6 +3379,13 @@ class Effect1060(EffectDef):
 
 
 class Effect1061(EffectDef):
+    """
+    eliteBonusHeavyGunshipHybridDmg2
+
+    Used by:
+    Ship: Deimos
+    Ship: Eagle
+    """
 
     type = 'passive'
 
@@ -2027,6 +3397,12 @@ class Effect1061(EffectDef):
 
 
 class Effect1062(EffectDef):
+    """
+    eliteBonusHeavyGunshipLaserDmg2
+
+    Used by:
+    Ship: Zealot
+    """
 
     type = 'passive'
 
@@ -2038,6 +3414,12 @@ class Effect1062(EffectDef):
 
 
 class Effect1063(EffectDef):
+    """
+    eliteBonusHeavyGunshipProjectileTracking2
+
+    Used by:
+    Ship: Muninn
+    """
 
     type = 'passive'
 
@@ -2049,6 +3431,12 @@ class Effect1063(EffectDef):
 
 
 class Effect1080(EffectDef):
+    """
+    eliteBonusHeavyGunshipHybridFallOff1
+
+    Used by:
+    Ship: Deimos
+    """
 
     type = 'passive'
 
@@ -2060,6 +3448,12 @@ class Effect1080(EffectDef):
 
 
 class Effect1081(EffectDef):
+    """
+    eliteBonusHeavyGunshipHeavyMissileFlightTime1
+
+    Used by:
+    Ship: Cerberus
+    """
 
     type = 'passive'
 
@@ -2071,6 +3465,12 @@ class Effect1081(EffectDef):
 
 
 class Effect1082(EffectDef):
+    """
+    eliteBonusHeavyGunshipLightMissileFlightTime1
+
+    Used by:
+    Ship: Cerberus
+    """
 
     type = 'passive'
 
@@ -2082,6 +3482,12 @@ class Effect1082(EffectDef):
 
 
 class Effect1084(EffectDef):
+    """
+    eliteBonusHeavyGunshipDroneControlRange1
+
+    Used by:
+    Ship: Ishtar
+    """
 
     type = 'passive'
 
@@ -2092,6 +3498,12 @@ class Effect1084(EffectDef):
 
 
 class Effect1087(EffectDef):
+    """
+    eliteBonusHeavyGunshipProjectileDmg2
+
+    Used by:
+    Ship: Vagabond
+    """
 
     type = 'passive'
 
@@ -2103,6 +3515,14 @@ class Effect1087(EffectDef):
 
 
 class Effect1099(EffectDef):
+    """
+    shipProjectileTrackingMF2
+
+    Used by:
+    Variations of ship: Slasher (3 of 3)
+    Ship: Republic Fleet Firetail
+    Ship: Wolf
+    """
 
     type = 'passive'
 
@@ -2113,6 +3533,13 @@ class Effect1099(EffectDef):
 
 
 class Effect1176(EffectDef):
+    """
+    accerationControlSkillAb&MwdSpeedBoost
+
+    Used by:
+    Implant: Zor's Custom Navigation Hyper-Link
+    Skill: Acceleration Control
+    """
 
     type = 'passive'
 
@@ -2124,6 +3551,12 @@ class Effect1176(EffectDef):
 
 
 class Effect1179(EffectDef):
+    """
+    eliteBonusGunshipLaserDamage2
+
+    Used by:
+    Ship: Retribution
+    """
 
     type = 'passive'
 
@@ -2135,6 +3568,12 @@ class Effect1179(EffectDef):
 
 
 class Effect1181(EffectDef):
+    """
+    eliteBonusLogisticEnergyTransferCapNeed1
+
+    Used by:
+    Ship: Guardian
+    """
 
     type = 'passive'
 
@@ -2146,6 +3585,12 @@ class Effect1181(EffectDef):
 
 
 class Effect1182(EffectDef):
+    """
+    shipEnergyTransferRange1
+
+    Used by:
+    Ship: Guardian
+    """
 
     type = 'passive'
 
@@ -2156,6 +3601,13 @@ class Effect1182(EffectDef):
 
 
 class Effect1183(EffectDef):
+    """
+    eliteBonusLogisticEnergyTransferCapNeed2
+
+    Used by:
+    Ship: Basilisk
+    Ship: Etana
+    """
 
     type = 'passive'
 
@@ -2167,6 +3619,13 @@ class Effect1183(EffectDef):
 
 
 class Effect1184(EffectDef):
+    """
+    shipEnergyTransferRange2
+
+    Used by:
+    Ship: Basilisk
+    Ship: Etana
+    """
 
     type = 'passive'
 
@@ -2177,6 +3636,13 @@ class Effect1184(EffectDef):
 
 
 class Effect1185(EffectDef):
+    """
+    structureStealthEmitterArraySigDecrease
+
+    Used by:
+    Implants named like: X Instinct Booster (4 of 4)
+    Implants named like: grade Halo (15 of 18)
+    """
 
     type = 'passive'
 
@@ -2186,6 +3652,14 @@ class Effect1185(EffectDef):
 
 
 class Effect1190(EffectDef):
+    """
+    iceHarvestCycleTimeModulesRequiringIceHarvesting
+
+    Used by:
+    Implants named like: Inherent Implants 'Yeti' Ice Harvesting IH (3 of 3)
+    Module: Medium Ice Harvester Accelerator I
+    Skill: Ice Harvesting
+    """
 
     type = 'passive'
 
@@ -2197,6 +3671,13 @@ class Effect1190(EffectDef):
 
 
 class Effect1200(EffectDef):
+    """
+    miningInfoMultiplier
+
+    Used by:
+    Charges from group: Mining Crystal (40 of 40)
+    Charges named like: Mining Crystal (42 of 42)
+    """
 
     type = 'passive'
 
@@ -2208,6 +3689,12 @@ class Effect1200(EffectDef):
 
 
 class Effect1212(EffectDef):
+    """
+    crystalMiningamountInfo2
+
+    Used by:
+    Modules from group: Frequency Mining Laser (3 of 3)
+    """
 
     runTime = 'late'
     type = 'passive'
@@ -2218,6 +3705,14 @@ class Effect1212(EffectDef):
 
 
 class Effect1215(EffectDef):
+    """
+    shipEnergyDrainAmountAF1
+
+    Used by:
+    Ship: Caedes
+    Ship: Cruor
+    Ship: Sentinel
+    """
 
     type = 'passive'
 
@@ -2228,6 +3723,14 @@ class Effect1215(EffectDef):
 
 
 class Effect1218(EffectDef):
+    """
+    shipBonusPirateSmallHybridDmg
+
+    Used by:
+    Ship: Daredevil
+    Ship: Hecate
+    Ship: Sunesis
+    """
 
     type = 'passive'
 
@@ -2238,6 +3741,12 @@ class Effect1218(EffectDef):
 
 
 class Effect1219(EffectDef):
+    """
+    shipEnergyVampireTransferAmountBonusAB
+
+    Used by:
+    Ship: Bhaalgorn
+    """
 
     type = 'passive'
 
@@ -2249,6 +3758,14 @@ class Effect1219(EffectDef):
 
 
 class Effect1220(EffectDef):
+    """
+    shipEnergyVampireTransferAmountBonusAc
+
+    Used by:
+    Ship: Ashimmu
+    Ship: Rabisu
+    Ship: Vangel
+    """
 
     type = 'passive'
 
@@ -2259,6 +3776,12 @@ class Effect1220(EffectDef):
 
 
 class Effect1221(EffectDef):
+    """
+    shipStasisWebRangeBonusMB
+
+    Used by:
+    Ship: Bhaalgorn
+    """
 
     type = 'passive'
 
@@ -2269,6 +3792,12 @@ class Effect1221(EffectDef):
 
 
 class Effect1222(EffectDef):
+    """
+    shipStasisWebRangeBonusMC2
+
+    Used by:
+    Ship: Ashimmu
+    """
 
     type = 'passive'
 
@@ -2279,6 +3808,13 @@ class Effect1222(EffectDef):
 
 
 class Effect1228(EffectDef):
+    """
+    shipProjectileTrackingGF
+
+    Used by:
+    Ship: Chremoas
+    Ship: Dramiel
+    """
 
     type = 'passive'
 
@@ -2289,6 +3825,14 @@ class Effect1228(EffectDef):
 
 
 class Effect1230(EffectDef):
+    """
+    shipMissileVelocityPirateFactionFrigate
+
+    Used by:
+    Ship: Barghest
+    Ship: Garmur
+    Ship: Orthrus
+    """
 
     type = 'passive'
 
@@ -2299,6 +3843,13 @@ class Effect1230(EffectDef):
 
 
 class Effect1232(EffectDef):
+    """
+    shipProjectileRofPirateCruiser
+
+    Used by:
+    Ship: Cynabal
+    Ship: Moracha
+    """
 
     type = 'passive'
 
@@ -2309,6 +3860,13 @@ class Effect1232(EffectDef):
 
 
 class Effect1233(EffectDef):
+    """
+    shipHybridDmgPirateCruiser
+
+    Used by:
+    Ship: Gnosis
+    Ship: Vigilant
+    """
 
     type = 'passive'
 
@@ -2319,6 +3877,13 @@ class Effect1233(EffectDef):
 
 
 class Effect1234(EffectDef):
+    """
+    shipMissileVelocityPirateFactionLight
+
+    Used by:
+    Ship: Corax
+    Ship: Talwar
+    """
 
     type = 'passive'
 
@@ -2329,6 +3894,12 @@ class Effect1234(EffectDef):
 
 
 class Effect1239(EffectDef):
+    """
+    shipProjectileRofPirateBattleship
+
+    Used by:
+    Ship: Machariel
+    """
 
     type = 'passive'
 
@@ -2339,6 +3910,12 @@ class Effect1239(EffectDef):
 
 
 class Effect1240(EffectDef):
+    """
+    shipHybridDmgPirateBattleship
+
+    Used by:
+    Ship: Vindicator
+    """
 
     type = 'passive'
 
@@ -2349,6 +3926,12 @@ class Effect1240(EffectDef):
 
 
 class Effect1255(EffectDef):
+    """
+    setBonusBloodraider
+
+    Used by:
+    Implants named like: grade Talisman (18 of 18)
+    """
 
     runTime = 'early'
     type = 'passive'
@@ -2360,6 +3943,12 @@ class Effect1255(EffectDef):
 
 
 class Effect1256(EffectDef):
+    """
+    setBonusBloodraiderNosferatu
+
+    Used by:
+    Implants named like: grade Talisman (15 of 18)
+    """
 
     type = 'passive'
 
@@ -2370,6 +3959,12 @@ class Effect1256(EffectDef):
 
 
 class Effect1261(EffectDef):
+    """
+    setBonusSerpentis
+
+    Used by:
+    Implants named like: grade Snake (18 of 18)
+    """
 
     runTime = 'early'
     type = 'passive'
@@ -2381,6 +3976,12 @@ class Effect1261(EffectDef):
 
 
 class Effect1264(EffectDef):
+    """
+    interceptor2HybridTracking
+
+    Used by:
+    Ship: Taranis
+    """
 
     type = 'passive'
 
@@ -2392,6 +3993,12 @@ class Effect1264(EffectDef):
 
 
 class Effect1268(EffectDef):
+    """
+    interceptor2LaserTracking
+
+    Used by:
+    Ship: Crusader
+    """
 
     type = 'passive'
 
@@ -2403,6 +4010,14 @@ class Effect1268(EffectDef):
 
 
 class Effect1281(EffectDef):
+    """
+    structuralAnalysisEffect
+
+    Used by:
+    Implants named like: Inherent Implants 'Noble' Repair Proficiency RP (6 of 6)
+    Modules named like: Auxiliary Nano Pump (8 of 8)
+    Implant: Imperial Navy Modified 'Noble' Implant
+    """
 
     type = 'passive'
 
@@ -2415,6 +4030,13 @@ class Effect1281(EffectDef):
 
 
 class Effect1318(EffectDef):
+    """
+    ewSkillScanStrengthBonus
+
+    Used by:
+    Modules named like: Particle Dispersion Augmentor (8 of 8)
+    Skill: Signal Dispersion
+    """
 
     type = 'passive'
 
@@ -2430,6 +4052,13 @@ class Effect1318(EffectDef):
 
 
 class Effect1360(EffectDef):
+    """
+    ewSkillRsdCapNeedBonusSkillLevel
+
+    Used by:
+    Implants named like: Zainou 'Gypsy' Sensor Linking SL (6 of 6)
+    Skill: Sensor Linking
+    """
 
     type = 'passive'
 
@@ -2441,6 +4070,13 @@ class Effect1360(EffectDef):
 
 
 class Effect1361(EffectDef):
+    """
+    ewSkillTdCapNeedBonusSkillLevel
+
+    Used by:
+    Implants named like: Zainou 'Gypsy' Weapon Disruption WD (6 of 6)
+    Skill: Weapon Disruption
+    """
 
     type = 'passive'
 
@@ -2452,6 +4088,13 @@ class Effect1361(EffectDef):
 
 
 class Effect1370(EffectDef):
+    """
+    ewSkillTpCapNeedBonusSkillLevel
+
+    Used by:
+    Implants named like: Zainou 'Gypsy' Target Painting TG (6 of 6)
+    Skill: Target Painting
+    """
 
     type = 'passive'
 
@@ -2463,6 +4106,14 @@ class Effect1370(EffectDef):
 
 
 class Effect1372(EffectDef):
+    """
+    ewSkillEwCapNeedSkillLevel
+
+    Used by:
+    Implants named like: Zainou 'Gypsy' Electronic Warfare EW (6 of 6)
+    Modules named like: Signal Disruption Amplifier (8 of 8)
+    Skill: Electronic Warfare
+    """
 
     type = 'passive'
 
@@ -2474,6 +4125,12 @@ class Effect1372(EffectDef):
 
 
 class Effect1395(EffectDef):
+    """
+    shieldBoostAmplifierPassive
+
+    Used by:
+    Implants named like: grade Crystal (15 of 18)
+    """
 
     type = 'passive'
 
@@ -2484,6 +4141,12 @@ class Effect1395(EffectDef):
 
 
 class Effect1397(EffectDef):
+    """
+    setBonusGuristas
+
+    Used by:
+    Implants named like: grade Crystal (18 of 18)
+    """
 
     runTime = 'early'
     type = 'passive'
@@ -2495,6 +4158,14 @@ class Effect1397(EffectDef):
 
 
 class Effect1409(EffectDef):
+    """
+    systemScanDurationSkillAstrometrics
+
+    Used by:
+    Implants named like: Poteque 'Prospector' Astrometric Acquisition AQ (3 of 3)
+    Skill: Astrometric Acquisition
+    Skill: Astrometrics
+    """
 
     type = 'passive'
 
@@ -2506,6 +4177,13 @@ class Effect1409(EffectDef):
 
 
 class Effect1410(EffectDef):
+    """
+    propulsionSkillCapNeedBonusSkillLevel
+
+    Used by:
+    Implants named like: Zainou 'Gypsy' Propulsion Jamming PJ (6 of 6)
+    Skill: Propulsion Jamming
+    """
 
     type = 'passive'
 
@@ -2519,6 +4197,12 @@ class Effect1410(EffectDef):
 
 
 class Effect1412(EffectDef):
+    """
+    shipBonusHybridOptimalCB
+
+    Used by:
+    Ship: Rokh
+    """
 
     type = 'passive'
 
@@ -2529,6 +4213,12 @@ class Effect1412(EffectDef):
 
 
 class Effect1434(EffectDef):
+    """
+    caldariShipEwStrengthCB
+
+    Used by:
+    Ship: Scorpion
+    """
 
     type = 'passive'
 
@@ -2542,6 +4232,12 @@ class Effect1434(EffectDef):
 
 
 class Effect1441(EffectDef):
+    """
+    caldariShipEwOptimalRangeCB3
+
+    Used by:
+    Ship: Scorpion
+    """
 
     type = 'passive'
 
@@ -2552,6 +4248,12 @@ class Effect1441(EffectDef):
 
 
 class Effect1442(EffectDef):
+    """
+    caldariShipEwOptimalRangeCC2
+
+    Used by:
+    Ship: Blackbird
+    """
 
     type = 'passive'
 
@@ -2562,6 +4264,14 @@ class Effect1442(EffectDef):
 
 
 class Effect1443(EffectDef):
+    """
+    caldariShipEwCapacitorNeedCC
+
+    Used by:
+    Ship: Chameleon
+    Ship: Falcon
+    Ship: Rook
+    """
 
     type = 'passive'
 
@@ -2572,6 +4282,13 @@ class Effect1443(EffectDef):
 
 
 class Effect1445(EffectDef):
+    """
+    ewSkillRsdMaxRangeBonus
+
+    Used by:
+    Modules named like: Particle Dispersion Projector (8 of 8)
+    Skill: Long Distance Jamming
+    """
 
     type = 'passive'
 
@@ -2584,6 +4301,13 @@ class Effect1445(EffectDef):
 
 
 class Effect1446(EffectDef):
+    """
+    ewSkillTpMaxRangeBonus
+
+    Used by:
+    Modules named like: Particle Dispersion Projector (8 of 8)
+    Skill: Long Distance Jamming
+    """
 
     type = 'passive'
 
@@ -2596,6 +4320,13 @@ class Effect1446(EffectDef):
 
 
 class Effect1448(EffectDef):
+    """
+    ewSkillTdMaxRangeBonus
+
+    Used by:
+    Modules named like: Particle Dispersion Projector (8 of 8)
+    Skill: Long Distance Jamming
+    """
 
     type = 'passive'
 
@@ -2608,6 +4339,12 @@ class Effect1448(EffectDef):
 
 
 class Effect1449(EffectDef):
+    """
+    ewSkillRsdFallOffBonus
+
+    Used by:
+    Skill: Frequency Modulation
+    """
 
     type = 'passive'
 
@@ -2618,6 +4355,12 @@ class Effect1449(EffectDef):
 
 
 class Effect1450(EffectDef):
+    """
+    ewSkillTpFallOffBonus
+
+    Used by:
+    Skill: Frequency Modulation
+    """
 
     type = 'passive'
 
@@ -2628,6 +4371,12 @@ class Effect1450(EffectDef):
 
 
 class Effect1451(EffectDef):
+    """
+    ewSkillTdFallOffBonus
+
+    Used by:
+    Skill: Frequency Modulation
+    """
 
     type = 'passive'
 
@@ -2638,6 +4387,14 @@ class Effect1451(EffectDef):
 
 
 class Effect1452(EffectDef):
+    """
+    ewSkillEwMaxRangeBonus
+
+    Used by:
+    Implants named like: grade Centurion (10 of 12)
+    Modules named like: Particle Dispersion Projector (8 of 8)
+    Skill: Long Distance Jamming
+    """
 
     type = 'passive'
 
@@ -2650,6 +4407,12 @@ class Effect1452(EffectDef):
 
 
 class Effect1453(EffectDef):
+    """
+    ewSkillEwFallOffBonus
+
+    Used by:
+    Skill: Frequency Modulation
+    """
 
     type = 'passive'
 
@@ -2660,6 +4423,14 @@ class Effect1453(EffectDef):
 
 
 class Effect1472(EffectDef):
+    """
+    missileSkillAoeCloudSizeBonus
+
+    Used by:
+    Implants named like: Zainou 'Deadeye' Guided Missile Precision GP (6 of 6)
+    Modules named like: Warhead Rigor Catalyst (8 of 8)
+    Skill: Guided Missile Precision
+    """
 
     type = 'passive'
 
@@ -2673,6 +4444,13 @@ class Effect1472(EffectDef):
 
 
 class Effect1500(EffectDef):
+    """
+    shieldOperationSkillBoostCapacitorNeedBonus
+
+    Used by:
+    Modules named like: Core Defense Capacitor Safeguard (8 of 8)
+    Skill: Shield Compensation
+    """
 
     type = 'passive'
 
@@ -2684,6 +4462,12 @@ class Effect1500(EffectDef):
 
 
 class Effect1550(EffectDef):
+    """
+    ewSkillTargetPaintingStrengthBonus
+
+    Used by:
+    Skill: Signature Focusing
+    """
 
     type = 'passive'
 
@@ -2695,6 +4479,13 @@ class Effect1550(EffectDef):
 
 
 class Effect1551(EffectDef):
+    """
+    minmatarShipEwTargetPainterMF2
+
+    Used by:
+    Ship: Hyena
+    Ship: Vigil
+    """
 
     type = 'passive'
 
@@ -2706,6 +4497,12 @@ class Effect1551(EffectDef):
 
 
 class Effect1577(EffectDef):
+    """
+    angelsetbonus
+
+    Used by:
+    Implants named like: grade Halo (18 of 18)
+    """
 
     runTime = 'early'
     type = 'passive'
@@ -2720,6 +4517,13 @@ class Effect1577(EffectDef):
 
 
 class Effect1579(EffectDef):
+    """
+    setBonusSansha
+
+    Used by:
+    Implants named like: grade Slave (18 of 18)
+    Implant: High-grade Halo Omega
+    """
 
     runTime = 'early'
     type = 'passive'
@@ -2731,6 +4535,12 @@ class Effect1579(EffectDef):
 
 
 class Effect1581(EffectDef):
+    """
+    jumpDriveSkillsRangeBonus
+
+    Used by:
+    Skill: Jump Drive Calibration
+    """
 
     type = 'passive'
 
@@ -2740,6 +4550,12 @@ class Effect1581(EffectDef):
 
 
 class Effect1585(EffectDef):
+    """
+    capitalTurretSkillLaserDamage
+
+    Used by:
+    Skill: Capital Energy Turret
+    """
 
     type = 'passive'
 
@@ -2750,6 +4566,12 @@ class Effect1585(EffectDef):
 
 
 class Effect1586(EffectDef):
+    """
+    capitalTurretSkillProjectileDamage
+
+    Used by:
+    Skill: Capital Projectile Turret
+    """
 
     type = 'passive'
 
@@ -2760,6 +4582,12 @@ class Effect1586(EffectDef):
 
 
 class Effect1587(EffectDef):
+    """
+    capitalTurretSkillHybridDamage
+
+    Used by:
+    Skill: Capital Hybrid Turret
+    """
 
     type = 'passive'
 
@@ -2770,6 +4598,13 @@ class Effect1587(EffectDef):
 
 
 class Effect1588(EffectDef):
+    """
+    capitalLauncherSkillCitadelKineticDamage
+
+    Used by:
+    Implants named like: Hardwiring Zainou 'Sharpshooter' ZMX (6 of 6)
+    Skill: XL Torpedoes
+    """
 
     type = 'passive'
 
@@ -2781,6 +4616,14 @@ class Effect1588(EffectDef):
 
 
 class Effect1590(EffectDef):
+    """
+    missileSkillAoeVelocityBonus
+
+    Used by:
+    Implants named like: Zainou 'Deadeye' Target Navigation Prediction TN (6 of 6)
+    Modules named like: Warhead Flare Catalyst (8 of 8)
+    Skill: Target Navigation Prediction
+    """
 
     type = 'passive'
 
@@ -2794,6 +4637,13 @@ class Effect1590(EffectDef):
 
 
 class Effect1592(EffectDef):
+    """
+    capitalLauncherSkillCitadelEmDamage
+
+    Used by:
+    Implants named like: Hardwiring Zainou 'Sharpshooter' ZMX (6 of 6)
+    Skill: XL Torpedoes
+    """
 
     type = 'passive'
 
@@ -2805,6 +4655,13 @@ class Effect1592(EffectDef):
 
 
 class Effect1593(EffectDef):
+    """
+    capitalLauncherSkillCitadelExplosiveDamage
+
+    Used by:
+    Implants named like: Hardwiring Zainou 'Sharpshooter' ZMX (6 of 6)
+    Skill: XL Torpedoes
+    """
 
     type = 'passive'
 
@@ -2816,6 +4673,13 @@ class Effect1593(EffectDef):
 
 
 class Effect1594(EffectDef):
+    """
+    capitalLauncherSkillCitadelThermalDamage
+
+    Used by:
+    Implants named like: Hardwiring Zainou 'Sharpshooter' ZMX (6 of 6)
+    Skill: XL Torpedoes
+    """
 
     type = 'passive'
 
@@ -2827,6 +4691,13 @@ class Effect1594(EffectDef):
 
 
 class Effect1595(EffectDef):
+    """
+    missileSkillWarheadUpgradesEmDamageBonus
+
+    Used by:
+    Implants named like: Agency 'Pyrolancea' DB Dose (4 of 4)
+    Skill: Warhead Upgrades
+    """
 
     type = 'passive'
 
@@ -2838,6 +4709,13 @@ class Effect1595(EffectDef):
 
 
 class Effect1596(EffectDef):
+    """
+    missileSkillWarheadUpgradesExplosiveDamageBonus
+
+    Used by:
+    Implants named like: Agency 'Pyrolancea' DB Dose (4 of 4)
+    Skill: Warhead Upgrades
+    """
 
     type = 'passive'
 
@@ -2849,6 +4727,13 @@ class Effect1596(EffectDef):
 
 
 class Effect1597(EffectDef):
+    """
+    missileSkillWarheadUpgradesKineticDamageBonus
+
+    Used by:
+    Implants named like: Agency 'Pyrolancea' DB Dose (4 of 4)
+    Skill: Warhead Upgrades
+    """
 
     type = 'passive'
 
@@ -2860,6 +4745,12 @@ class Effect1597(EffectDef):
 
 
 class Effect1615(EffectDef):
+    """
+    shipAdvancedSpaceshipCommandAgilityBonus
+
+    Used by:
+    Items from market group: Ships > Capital Ships (40 of 40)
+    """
 
     type = 'passive'
 
@@ -2871,6 +4762,12 @@ class Effect1615(EffectDef):
 
 
 class Effect1616(EffectDef):
+    """
+    skillCapitalShipsAdvancedAgility
+
+    Used by:
+    Skill: Capital Ships
+    """
 
     type = 'passive'
 
@@ -2881,6 +4778,12 @@ class Effect1616(EffectDef):
 
 
 class Effect1617(EffectDef):
+    """
+    shipCapitalAgilityBonus
+
+    Used by:
+    Items from market group: Ships > Capital Ships (31 of 40)
+    """
 
     type = 'passive'
 
@@ -2890,6 +4793,13 @@ class Effect1617(EffectDef):
 
 
 class Effect1634(EffectDef):
+    """
+    capitalShieldOperationSkillCapacitorNeedBonus
+
+    Used by:
+    Modules named like: Core Defense Capacitor Safeguard (8 of 8)
+    Skill: Capital Shield Operation
+    """
 
     type = 'passive'
 
@@ -2901,6 +4811,13 @@ class Effect1634(EffectDef):
 
 
 class Effect1635(EffectDef):
+    """
+    capitalRepairSystemsSkillDurationBonus
+
+    Used by:
+    Modules named like: Nanobot Accelerator (8 of 8)
+    Skill: Capital Repair Systems
+    """
 
     type = 'passive'
 
@@ -2913,6 +4830,12 @@ class Effect1635(EffectDef):
 
 
 class Effect1638(EffectDef):
+    """
+    skillAdvancedWeaponUpgradesPowerNeedBonus
+
+    Used by:
+    Skill: Advanced Weapon Upgrades
+    """
 
     type = 'passive'
 
@@ -2924,6 +4847,14 @@ class Effect1638(EffectDef):
 
 
 class Effect1643(EffectDef):
+    """
+    armoredCommandMindlink
+
+    Used by:
+    Implant: Armored Command Mindlink
+    Implant: Federation Navy Command Mindlink
+    Implant: Imperial Navy Command Mindlink
+    """
 
     type = 'passive'
 
@@ -2942,6 +4873,14 @@ class Effect1643(EffectDef):
 
 
 class Effect1644(EffectDef):
+    """
+    skirmishCommandMindlink
+
+    Used by:
+    Implant: Federation Navy Command Mindlink
+    Implant: Republic Fleet Command Mindlink
+    Implant: Skirmish Command Mindlink
+    """
 
     type = 'passive'
 
@@ -2960,6 +4899,12 @@ class Effect1644(EffectDef):
 
 
 class Effect1645(EffectDef):
+    """
+    shieldCommandMindlink
+
+    Used by:
+    Implants from group: Cyber Leadership (4 of 10)
+    """
 
     type = 'passive'
 
@@ -2978,6 +4923,14 @@ class Effect1645(EffectDef):
 
 
 class Effect1646(EffectDef):
+    """
+    informationCommandMindlink
+
+    Used by:
+    Implant: Caldari Navy Command Mindlink
+    Implant: Imperial Navy Command Mindlink
+    Implant: Information Command Mindlink
+    """
 
     type = 'passive'
 
@@ -2996,6 +4949,12 @@ class Effect1646(EffectDef):
 
 
 class Effect1650(EffectDef):
+    """
+    skillSiegeModuleConsumptionQuantityBonus
+
+    Used by:
+    Skill: Tactical Weapon Reconfiguration
+    """
 
     type = 'passive'
 
@@ -3007,6 +4966,13 @@ class Effect1650(EffectDef):
 
 
 class Effect1657(EffectDef):
+    """
+    missileSkillWarheadUpgradesThermalDamageBonus
+
+    Used by:
+    Implants named like: Agency 'Pyrolancea' DB Dose (4 of 4)
+    Skill: Warhead Upgrades
+    """
 
     type = 'passive'
 
@@ -3018,6 +4984,12 @@ class Effect1657(EffectDef):
 
 
 class Effect1668(EffectDef):
+    """
+    freighterCargoBonusA2
+
+    Used by:
+    Variations of ship: Providence (2 of 2)
+    """
 
     type = 'passive'
 
@@ -3027,6 +4999,12 @@ class Effect1668(EffectDef):
 
 
 class Effect1669(EffectDef):
+    """
+    freighterCargoBonusC2
+
+    Used by:
+    Variations of ship: Charon (2 of 2)
+    """
 
     type = 'passive'
 
@@ -3036,6 +5014,12 @@ class Effect1669(EffectDef):
 
 
 class Effect1670(EffectDef):
+    """
+    freighterCargoBonusG2
+
+    Used by:
+    Variations of ship: Obelisk (2 of 2)
+    """
 
     type = 'passive'
 
@@ -3045,6 +5029,12 @@ class Effect1670(EffectDef):
 
 
 class Effect1671(EffectDef):
+    """
+    freighterCargoBonusM2
+
+    Used by:
+    Variations of ship: Fenrir (2 of 2)
+    """
 
     type = 'passive'
 
@@ -3054,6 +5044,12 @@ class Effect1671(EffectDef):
 
 
 class Effect1672(EffectDef):
+    """
+    freighterMaxVelocityBonusA1
+
+    Used by:
+    Ship: Providence
+    """
 
     type = 'passive'
 
@@ -3063,6 +5059,12 @@ class Effect1672(EffectDef):
 
 
 class Effect1673(EffectDef):
+    """
+    freighterMaxVelocityBonusC1
+
+    Used by:
+    Ship: Charon
+    """
 
     type = 'passive'
 
@@ -3072,6 +5074,12 @@ class Effect1673(EffectDef):
 
 
 class Effect1674(EffectDef):
+    """
+    freighterMaxVelocityBonusG1
+
+    Used by:
+    Ship: Obelisk
+    """
 
     type = 'passive'
 
@@ -3081,6 +5089,12 @@ class Effect1674(EffectDef):
 
 
 class Effect1675(EffectDef):
+    """
+    freighterMaxVelocityBonusM1
+
+    Used by:
+    Ship: Fenrir
+    """
 
     type = 'passive'
 
@@ -3090,6 +5104,13 @@ class Effect1675(EffectDef):
 
 
 class Effect1720(EffectDef):
+    """
+    shieldBoostAmplifier
+
+    Used by:
+    Modules from group: Capacitor Power Relay (20 of 20)
+    Modules from group: Shield Boost Amplifier (25 of 25)
+    """
 
     type = 'passive'
 
@@ -3102,6 +5123,12 @@ class Effect1720(EffectDef):
 
 
 class Effect1722(EffectDef):
+    """
+    jumpDriveSkillsCapacitorNeedBonus
+
+    Used by:
+    Skill: Jump Drive Operation
+    """
 
     type = 'passive'
 
@@ -3112,6 +5139,12 @@ class Effect1722(EffectDef):
 
 
 class Effect1730(EffectDef):
+    """
+    droneDmgBonus
+
+    Used by:
+    Skills from group: Drones (8 of 26)
+    """
 
     type = 'passive'
 
@@ -3122,11 +5155,27 @@ class Effect1730(EffectDef):
 
 
 class Effect1738(EffectDef):
+    """
+    doHacking
+
+    Used by:
+    Modules from group: Data Miners (10 of 10)
+    """
 
     type = 'active'
 
 
 class Effect1763(EffectDef):
+    """
+    missileSkillRapidLauncherRoF
+
+    Used by:
+    Implants named like: Zainou 'Deadeye' Rapid Launch RL (6 of 6)
+    Implant: Standard Cerebral Accelerator
+    Implant: Whelan Machorin's Ballistic Smartlink
+    Skill: Missile Launcher Operation
+    Skill: Rapid Launch
+    """
 
     type = 'passive'
 
@@ -3138,6 +5187,14 @@ class Effect1763(EffectDef):
 
 
 class Effect1764(EffectDef):
+    """
+    missileSkillMissileProjectileVelocityBonus
+
+    Used by:
+    Implants named like: Zainou 'Deadeye' Missile Projection MP (6 of 6)
+    Modules named like: Hydraulic Bay Thrusters (8 of 8)
+    Skill: Missile Projection
+    """
 
     type = 'passive'
 
@@ -3151,6 +5208,13 @@ class Effect1764(EffectDef):
 
 
 class Effect1773(EffectDef):
+    """
+    shipBonusSHTFalloffGF2
+
+    Used by:
+    Ship: Atron
+    Ship: Daredevil
+    """
 
     type = 'passive'
 
@@ -3161,6 +5225,14 @@ class Effect1773(EffectDef):
 
 
 class Effect1804(EffectDef):
+    """
+    shipArmorEMResistanceAF1
+
+    Used by:
+    Ship: Astero
+    Ship: Malice
+    Ship: Punisher
+    """
 
     type = 'passive'
 
@@ -3170,6 +5242,14 @@ class Effect1804(EffectDef):
 
 
 class Effect1805(EffectDef):
+    """
+    shipArmorTHResistanceAF1
+
+    Used by:
+    Ship: Astero
+    Ship: Malice
+    Ship: Punisher
+    """
 
     type = 'passive'
 
@@ -3180,6 +5260,14 @@ class Effect1805(EffectDef):
 
 
 class Effect1806(EffectDef):
+    """
+    shipArmorKNResistanceAF1
+
+    Used by:
+    Ship: Astero
+    Ship: Malice
+    Ship: Punisher
+    """
 
     type = 'passive'
 
@@ -3190,6 +5278,14 @@ class Effect1806(EffectDef):
 
 
 class Effect1807(EffectDef):
+    """
+    shipArmorEXResistanceAF1
+
+    Used by:
+    Ship: Astero
+    Ship: Malice
+    Ship: Punisher
+    """
 
     type = 'passive'
 
@@ -3200,6 +5296,12 @@ class Effect1807(EffectDef):
 
 
 class Effect1812(EffectDef):
+    """
+    shipShieldEMResistanceCC2
+
+    Used by:
+    Variations of ship: Moa (3 of 4)
+    """
 
     type = 'passive'
 
@@ -3209,6 +5311,12 @@ class Effect1812(EffectDef):
 
 
 class Effect1813(EffectDef):
+    """
+    shipShieldThermalResistanceCC2
+
+    Used by:
+    Variations of ship: Moa (3 of 4)
+    """
 
     type = 'passive'
 
@@ -3219,6 +5327,12 @@ class Effect1813(EffectDef):
 
 
 class Effect1814(EffectDef):
+    """
+    shipShieldKineticResistanceCC2
+
+    Used by:
+    Variations of ship: Moa (3 of 4)
+    """
 
     type = 'passive'
 
@@ -3229,6 +5343,12 @@ class Effect1814(EffectDef):
 
 
 class Effect1815(EffectDef):
+    """
+    shipShieldExplosiveResistanceCC2
+
+    Used by:
+    Variations of ship: Moa (3 of 4)
+    """
 
     type = 'passive'
 
@@ -3239,6 +5359,14 @@ class Effect1815(EffectDef):
 
 
 class Effect1816(EffectDef):
+    """
+    shipShieldEMResistanceCF2
+
+    Used by:
+    Variations of ship: Merlin (3 of 4)
+    Ship: Cambion
+    Ship: Whiptail
+    """
 
     type = 'passive'
 
@@ -3248,6 +5376,14 @@ class Effect1816(EffectDef):
 
 
 class Effect1817(EffectDef):
+    """
+    shipShieldThermalResistanceCF2
+
+    Used by:
+    Variations of ship: Merlin (3 of 4)
+    Ship: Cambion
+    Ship: Whiptail
+    """
 
     type = 'passive'
 
@@ -3258,6 +5394,14 @@ class Effect1817(EffectDef):
 
 
 class Effect1819(EffectDef):
+    """
+    shipShieldKineticResistanceCF2
+
+    Used by:
+    Variations of ship: Merlin (3 of 4)
+    Ship: Cambion
+    Ship: Whiptail
+    """
 
     type = 'passive'
 
@@ -3268,6 +5412,14 @@ class Effect1819(EffectDef):
 
 
 class Effect1820(EffectDef):
+    """
+    shipShieldExplosiveResistanceCF2
+
+    Used by:
+    Variations of ship: Merlin (3 of 4)
+    Ship: Cambion
+    Ship: Whiptail
+    """
 
     type = 'passive'
 
@@ -3278,6 +5430,13 @@ class Effect1820(EffectDef):
 
 
 class Effect1848(EffectDef):
+    """
+    miningForemanMindlink
+
+    Used by:
+    Implant: Mining Foreman Mindlink
+    Implant: ORE Mining Director Mindlink
+    """
 
     type = 'passive'
 
@@ -3296,6 +5455,14 @@ class Effect1848(EffectDef):
 
 
 class Effect1851(EffectDef):
+    """
+    selfRof
+
+    Used by:
+    Skills named like: Missile Specialization (4 of 5)
+    Skill: Rocket Specialization
+    Skill: Torpedo Specialization
+    """
 
     type = 'passive'
 
@@ -3306,6 +5473,12 @@ class Effect1851(EffectDef):
 
 
 class Effect1862(EffectDef):
+    """
+    shipMissileEMDamageCF2
+
+    Used by:
+    Ship: Garmur
+    """
 
     type = 'passive'
 
@@ -3316,6 +5489,12 @@ class Effect1862(EffectDef):
 
 
 class Effect1863(EffectDef):
+    """
+    shipMissileThermalDamageCF2
+
+    Used by:
+    Ship: Garmur
+    """
 
     type = 'passive'
 
@@ -3326,6 +5505,12 @@ class Effect1863(EffectDef):
 
 
 class Effect1864(EffectDef):
+    """
+    shipMissileExplosiveDamageCF2
+
+    Used by:
+    Ship: Garmur
+    """
 
     type = 'passive'
 
@@ -3337,6 +5522,13 @@ class Effect1864(EffectDef):
 
 
 class Effect1882(EffectDef):
+    """
+    miningYieldMultiplyPercent
+
+    Used by:
+    Variations of module: Mining Laser Upgrade I (5 of 5)
+    Module: Frostline 'Omnivore' Harvester Upgrade
+    """
 
     type = 'passive'
 
@@ -3347,6 +5539,13 @@ class Effect1882(EffectDef):
 
 
 class Effect1885(EffectDef):
+    """
+    shipCruiseLauncherROFBonus2CB
+
+    Used by:
+    Ship: Raven
+    Ship: Raven State Issue
+    """
 
     type = 'passive'
 
@@ -3357,6 +5556,13 @@ class Effect1885(EffectDef):
 
 
 class Effect1886(EffectDef):
+    """
+    shipSiegeLauncherROFBonus2CB
+
+    Used by:
+    Ship: Raven
+    Ship: Raven State Issue
+    """
 
     type = 'passive'
 
@@ -3367,6 +5573,12 @@ class Effect1886(EffectDef):
 
 
 class Effect1896(EffectDef):
+    """
+    eliteBargeBonusIceHarvestingCycleTimeBarge3
+
+    Used by:
+    Ships from group: Exhumer (3 of 3)
+    """
 
     type = 'passive'
 
@@ -3377,6 +5589,13 @@ class Effect1896(EffectDef):
 
 
 class Effect1910(EffectDef):
+    """
+    eliteBonusVampireDrainAmount2
+
+    Used by:
+    Ship: Curse
+    Ship: Pilgrim
+    """
 
     type = 'passive'
 
@@ -3388,6 +5607,14 @@ class Effect1910(EffectDef):
 
 
 class Effect1911(EffectDef):
+    """
+    eliteReconBonusGravimetricStrength2
+
+    Used by:
+    Ship: Chameleon
+    Ship: Falcon
+    Ship: Rook
+    """
 
     type = 'passive'
 
@@ -3399,6 +5626,14 @@ class Effect1911(EffectDef):
 
 
 class Effect1912(EffectDef):
+    """
+    eliteReconBonusMagnetometricStrength2
+
+    Used by:
+    Ship: Chameleon
+    Ship: Falcon
+    Ship: Rook
+    """
 
     type = 'passive'
 
@@ -3410,6 +5645,14 @@ class Effect1912(EffectDef):
 
 
 class Effect1913(EffectDef):
+    """
+    eliteReconBonusRadarStrength2
+
+    Used by:
+    Ship: Chameleon
+    Ship: Falcon
+    Ship: Rook
+    """
 
     type = 'passive'
 
@@ -3421,6 +5664,14 @@ class Effect1913(EffectDef):
 
 
 class Effect1914(EffectDef):
+    """
+    eliteReconBonusLadarStrength2
+
+    Used by:
+    Ship: Chameleon
+    Ship: Falcon
+    Ship: Rook
+    """
 
     type = 'passive'
 
@@ -3432,6 +5683,15 @@ class Effect1914(EffectDef):
 
 
 class Effect1921(EffectDef):
+    """
+    eliteReconStasisWebBonus2
+
+    Used by:
+    Ship: Huginn
+    Ship: Moracha
+    Ship: Rapier
+    Ship: Victor
+    """
 
     type = 'passive'
 
@@ -3442,6 +5702,14 @@ class Effect1921(EffectDef):
 
 
 class Effect1922(EffectDef):
+    """
+    eliteReconScramblerRangeBonus2
+
+    Used by:
+    Ship: Arazu
+    Ship: Enforcer
+    Ship: Lachesis
+    """
 
     type = 'passive'
 
@@ -3452,6 +5720,12 @@ class Effect1922(EffectDef):
 
 
 class Effect1959(EffectDef):
+    """
+    armorReinforcerMassAdd
+
+    Used by:
+    Modules from group: Armor Reinforcer (51 of 51)
+    """
 
     type = 'passive'
 
@@ -3461,6 +5735,12 @@ class Effect1959(EffectDef):
 
 
 class Effect1964(EffectDef):
+    """
+    shipBonusShieldTransferCapneed1
+
+    Used by:
+    Ship: Osprey
+    """
 
     type = 'passive'
 
@@ -3471,6 +5751,12 @@ class Effect1964(EffectDef):
 
 
 class Effect1969(EffectDef):
+    """
+    shipBonusRemoteArmorRepairCapNeedGC1
+
+    Used by:
+    Ship: Exequror
+    """
 
     type = 'passive'
 
@@ -3481,6 +5767,13 @@ class Effect1969(EffectDef):
 
 
 class Effect1996(EffectDef):
+    """
+    caldariShipEwCapacitorNeedCF2
+
+    Used by:
+    Ship: Griffin
+    Ship: Kitsune
+    """
 
     type = 'passive'
 
@@ -3491,6 +5784,12 @@ class Effect1996(EffectDef):
 
 
 class Effect2000(EffectDef):
+    """
+    droneRangeBonusAdd
+
+    Used by:
+    Modules from group: Drone Control Range Module (7 of 7)
+    """
 
     type = 'passive'
 
@@ -3501,6 +5800,12 @@ class Effect2000(EffectDef):
 
 
 class Effect2008(EffectDef):
+    """
+    cynosuralDurationBonus
+
+    Used by:
+    Ships from group: Force Recon Ship (8 of 9)
+    """
 
     type = 'passive'
 
@@ -3511,6 +5816,14 @@ class Effect2008(EffectDef):
 
 
 class Effect2013(EffectDef):
+    """
+    droneMaxVelocityBonus
+
+    Used by:
+    Modules named like: Drone Speed Augmentor (6 of 8)
+    Implant: Overmind 'Goliath' Drone Tuner T25-10S
+    Implant: Overmind 'Hawkmoth' Drone Tuner S10-25T
+    """
 
     type = 'passive'
 
@@ -3522,6 +5835,12 @@ class Effect2013(EffectDef):
 
 
 class Effect2014(EffectDef):
+    """
+    droneMaxRangeBonus
+
+    Used by:
+    Modules named like: Drone Scope Chip (6 of 8)
+    """
 
     type = 'passive'
 
@@ -3536,6 +5855,12 @@ class Effect2014(EffectDef):
 
 
 class Effect2015(EffectDef):
+    """
+    droneDurabilityShieldCapBonus
+
+    Used by:
+    Modules named like: Drone Durability Enhancer (6 of 8)
+    """
 
     type = 'passive'
 
@@ -3546,6 +5871,12 @@ class Effect2015(EffectDef):
 
 
 class Effect2016(EffectDef):
+    """
+    droneDurabilityArmorHPBonus
+
+    Used by:
+    Modules named like: Drone Durability Enhancer (6 of 8)
+    """
 
     type = 'passive'
 
@@ -3556,6 +5887,12 @@ class Effect2016(EffectDef):
 
 
 class Effect2017(EffectDef):
+    """
+    droneDurabilityHPBonus
+
+    Used by:
+    Modules named like: Drone Durability Enhancer (6 of 8)
+    """
 
     type = 'passive'
 
@@ -3567,6 +5904,13 @@ class Effect2017(EffectDef):
 
 
 class Effect2019(EffectDef):
+    """
+    repairDroneShieldBonusBonus
+
+    Used by:
+    Modules named like: Drone Repair Augmentor (8 of 8)
+    Skill: Repair Drone Operation
+    """
 
     type = 'passive'
 
@@ -3578,6 +5922,13 @@ class Effect2019(EffectDef):
 
 
 class Effect2020(EffectDef):
+    """
+    repairDroneArmorDamageAmountBonus
+
+    Used by:
+    Modules named like: Drone Repair Augmentor (8 of 8)
+    Skill: Repair Drone Operation
+    """
 
     type = 'passive'
 
@@ -3590,6 +5941,13 @@ class Effect2020(EffectDef):
 
 
 class Effect2029(EffectDef):
+    """
+    addToSignatureRadius2
+
+    Used by:
+    Modules from group: Missile Launcher Bomb (2 of 2)
+    Modules from group: Shield Extender (36 of 36)
+    """
 
     type = 'passive'
 
@@ -3599,6 +5957,13 @@ class Effect2029(EffectDef):
 
 
 class Effect2041(EffectDef):
+    """
+    modifyArmorResonancePostPercent
+
+    Used by:
+    Modules from group: Armor Coating (202 of 202)
+    Modules from group: Armor Plating Energized (187 of 187)
+    """
 
     type = 'passive'
 
@@ -3611,6 +5976,12 @@ class Effect2041(EffectDef):
 
 
 class Effect2052(EffectDef):
+    """
+    modifyShieldResonancePostPercent
+
+    Used by:
+    Modules from group: Shield Resistance Amplifier (88 of 88)
+    """
 
     type = 'passive'
 
@@ -3623,6 +5994,12 @@ class Effect2052(EffectDef):
 
 
 class Effect2053(EffectDef):
+    """
+    emShieldCompensationHardeningBonusGroupShieldAmp
+
+    Used by:
+    Skill: EM Shield Compensation
+    """
 
     type = 'passive'
 
@@ -3633,6 +6010,12 @@ class Effect2053(EffectDef):
 
 
 class Effect2054(EffectDef):
+    """
+    explosiveShieldCompensationHardeningBonusGroupShieldAmp
+
+    Used by:
+    Skill: Explosive Shield Compensation
+    """
 
     type = 'passive'
 
@@ -3644,6 +6027,12 @@ class Effect2054(EffectDef):
 
 
 class Effect2055(EffectDef):
+    """
+    kineticShieldCompensationHardeningBonusGroupShieldAmp
+
+    Used by:
+    Skill: Kinetic Shield Compensation
+    """
 
     type = 'passive'
 
@@ -3655,6 +6044,12 @@ class Effect2055(EffectDef):
 
 
 class Effect2056(EffectDef):
+    """
+    thermalShieldCompensationHardeningBonusGroupShieldAmp
+
+    Used by:
+    Skill: Thermal Shield Compensation
+    """
 
     type = 'passive'
 
@@ -3666,6 +6061,12 @@ class Effect2056(EffectDef):
 
 
 class Effect2105(EffectDef):
+    """
+    emArmorCompensationHardeningBonusGroupArmorCoating
+
+    Used by:
+    Skill: EM Armor Compensation
+    """
 
     type = 'passive'
 
@@ -3676,6 +6077,12 @@ class Effect2105(EffectDef):
 
 
 class Effect2106(EffectDef):
+    """
+    explosiveArmorCompensationHardeningBonusGroupArmorCoating
+
+    Used by:
+    Skill: Explosive Armor Compensation
+    """
 
     type = 'passive'
 
@@ -3687,6 +6094,12 @@ class Effect2106(EffectDef):
 
 
 class Effect2107(EffectDef):
+    """
+    kineticArmorCompensationHardeningBonusGroupArmorCoating
+
+    Used by:
+    Skill: Kinetic Armor Compensation
+    """
 
     type = 'passive'
 
@@ -3698,6 +6111,12 @@ class Effect2107(EffectDef):
 
 
 class Effect2108(EffectDef):
+    """
+    thermicArmorCompensationHardeningBonusGroupArmorCoating
+
+    Used by:
+    Skill: Thermal Armor Compensation
+    """
 
     type = 'passive'
 
@@ -3709,6 +6128,12 @@ class Effect2108(EffectDef):
 
 
 class Effect2109(EffectDef):
+    """
+    emArmorCompensationHardeningBonusGroupEnergized
+
+    Used by:
+    Skill: EM Armor Compensation
+    """
 
     type = 'passive'
 
@@ -3719,6 +6144,12 @@ class Effect2109(EffectDef):
 
 
 class Effect2110(EffectDef):
+    """
+    explosiveArmorCompensationHardeningBonusGroupEnergized
+
+    Used by:
+    Skill: Explosive Armor Compensation
+    """
 
     type = 'passive'
 
@@ -3730,6 +6161,12 @@ class Effect2110(EffectDef):
 
 
 class Effect2111(EffectDef):
+    """
+    kineticArmorCompensationHardeningBonusGroupEnergized
+
+    Used by:
+    Skill: Kinetic Armor Compensation
+    """
 
     type = 'passive'
 
@@ -3741,6 +6178,12 @@ class Effect2111(EffectDef):
 
 
 class Effect2112(EffectDef):
+    """
+    thermicArmorCompensationHardeningBonusGroupEnergized
+
+    Used by:
+    Skill: Thermal Armor Compensation
+    """
 
     type = 'passive'
 
@@ -3752,6 +6195,13 @@ class Effect2112(EffectDef):
 
 
 class Effect2130(EffectDef):
+    """
+    smallHybridMaxRangeBonus
+
+    Used by:
+    Ship: Catalyst
+    Ship: Cormorant
+    """
 
     type = 'passive'
 
@@ -3762,6 +6212,14 @@ class Effect2130(EffectDef):
 
 
 class Effect2131(EffectDef):
+    """
+    smallEnergyMaxRangeBonus
+
+    Used by:
+    Ship: Coercer
+    Ship: Gold Magnate
+    Ship: Silver Magnate
+    """
 
     type = 'passive'
 
@@ -3772,6 +6230,12 @@ class Effect2131(EffectDef):
 
 
 class Effect2132(EffectDef):
+    """
+    smallProjectileMaxRangeBonus
+
+    Used by:
+    Ship: Thrasher
+    """
 
     type = 'passive'
 
@@ -3782,6 +6246,13 @@ class Effect2132(EffectDef):
 
 
 class Effect2133(EffectDef):
+    """
+    energyTransferArrayMaxRangeBonus
+
+    Used by:
+    Ship: Augoror
+    Ship: Osprey
+    """
 
     type = 'passive'
 
@@ -3792,6 +6263,15 @@ class Effect2133(EffectDef):
 
 
 class Effect2134(EffectDef):
+    """
+    shieldTransporterMaxRangeBonus
+
+    Used by:
+    Ships from group: Industrial Command Ship (2 of 2)
+    Ship: Osprey
+    Ship: Rorqual
+    Ship: Scythe
+    """
 
     type = 'passive'
 
@@ -3804,6 +6284,16 @@ class Effect2134(EffectDef):
 
 
 class Effect2135(EffectDef):
+    """
+    armorRepairProjectorMaxRangeBonus
+
+    Used by:
+    Variations of ship: Navitas (2 of 2)
+    Ship: Augoror
+    Ship: Deacon
+    Ship: Exequror
+    Ship: Inquisitor
+    """
 
     type = 'passive'
 
@@ -3816,6 +6306,12 @@ class Effect2135(EffectDef):
 
 
 class Effect2143(EffectDef):
+    """
+    minmatarShipEwTargetPainterMC2
+
+    Used by:
+    Ship: Huginn
+    """
 
     type = 'passive'
 
@@ -3827,6 +6323,12 @@ class Effect2143(EffectDef):
 
 
 class Effect2155(EffectDef):
+    """
+    eliteBonusCommandShipProjectileDamageCS1
+
+    Used by:
+    Ship: Sleipnir
+    """
 
     type = 'passive'
 
@@ -3838,6 +6340,12 @@ class Effect2155(EffectDef):
 
 
 class Effect2156(EffectDef):
+    """
+    eliteBonusCommandShipProjectileFalloffCS2
+
+    Used by:
+    Ship: Sleipnir
+    """
 
     type = 'passive'
 
@@ -3848,6 +6356,12 @@ class Effect2156(EffectDef):
 
 
 class Effect2157(EffectDef):
+    """
+    eliteBonusCommandShipLaserDamageCS1
+
+    Used by:
+    Ship: Absolution
+    """
 
     type = 'passive'
 
@@ -3859,6 +6373,12 @@ class Effect2157(EffectDef):
 
 
 class Effect2158(EffectDef):
+    """
+    eliteBonusCommandShipLaserROFCS2
+
+    Used by:
+    Ship: Absolution
+    """
 
     type = 'passive'
 
@@ -3869,6 +6389,12 @@ class Effect2158(EffectDef):
 
 
 class Effect2160(EffectDef):
+    """
+    eliteBonusCommandShipHybridFalloffCS2
+
+    Used by:
+    Ship: Astarte
+    """
 
     type = 'passive'
 
@@ -3879,6 +6405,12 @@ class Effect2160(EffectDef):
 
 
 class Effect2161(EffectDef):
+    """
+    eliteBonusCommandShipHybridOptimalCS1
+
+    Used by:
+    Ship: Vulture
+    """
 
     type = 'passive'
 
@@ -3890,6 +6422,14 @@ class Effect2161(EffectDef):
 
 
 class Effect2179(EffectDef):
+    """
+    shipBonusDroneHitpointsGC2
+
+    Used by:
+    Ships named like: Stratios (2 of 2)
+    Ship: Vexor
+    Ship: Vexor Navy Issue
+    """
 
     type = 'passive'
 
@@ -3901,6 +6441,12 @@ class Effect2179(EffectDef):
 
 
 class Effect2181(EffectDef):
+    """
+    shipBonusDroneHitpointsFixedAC2
+
+    Used by:
+    Variations of ship: Arbitrator (3 of 3)
+    """
 
     type = 'passive'
 
@@ -3912,6 +6458,13 @@ class Effect2181(EffectDef):
 
 
 class Effect2186(EffectDef):
+    """
+    shipBonusDroneHitpointsGB2
+
+    Used by:
+    Variations of ship: Dominix (3 of 3)
+    Ship: Nestor
+    """
 
     type = 'passive'
 
@@ -3923,6 +6476,13 @@ class Effect2186(EffectDef):
 
 
 class Effect2187(EffectDef):
+    """
+    shipBonusDroneDamageMultiplierGB2
+
+    Used by:
+    Variations of ship: Dominix (3 of 3)
+    Ship: Nestor
+    """
 
     type = 'passive'
 
@@ -3934,6 +6494,14 @@ class Effect2187(EffectDef):
 
 
 class Effect2188(EffectDef):
+    """
+    shipBonusDroneDamageMultiplierGC2
+
+    Used by:
+    Ships named like: Stratios (2 of 2)
+    Ship: Vexor
+    Ship: Vexor Navy Issue
+    """
 
     type = 'passive'
 
@@ -3944,6 +6512,12 @@ class Effect2188(EffectDef):
 
 
 class Effect2189(EffectDef):
+    """
+    shipBonusDroneDamageMultiplierAC2
+
+    Used by:
+    Variations of ship: Arbitrator (3 of 3)
+    """
 
     type = 'passive'
 
@@ -3954,6 +6528,12 @@ class Effect2189(EffectDef):
 
 
 class Effect2200(EffectDef):
+    """
+    eliteBonusInterdictorsMissileKineticDamage1
+
+    Used by:
+    Ship: Flycatcher
+    """
 
     type = 'passive'
 
@@ -3965,6 +6545,12 @@ class Effect2200(EffectDef):
 
 
 class Effect2201(EffectDef):
+    """
+    eliteBonusInterdictorsProjectileFalloff1
+
+    Used by:
+    Ship: Sabre
+    """
 
     type = 'passive'
 
@@ -3975,6 +6561,15 @@ class Effect2201(EffectDef):
 
 
 class Effect2215(EffectDef):
+    """
+    shipBonusPirateFrigateProjDamage
+
+    Used by:
+    Ship: Chremoas
+    Ship: Dramiel
+    Ship: Sunesis
+    Ship: Svipul
+    """
 
     type = 'passive'
 
@@ -3985,6 +6580,12 @@ class Effect2215(EffectDef):
 
 
 class Effect2232(EffectDef):
+    """
+    scanStrengthBonusPercentOnline
+
+    Used by:
+    Modules from group: Signal Amplifier (7 of 7)
+    """
 
     type = 'passive'
 
@@ -3997,6 +6598,12 @@ class Effect2232(EffectDef):
 
 
 class Effect2249(EffectDef):
+    """
+    shipBonusDroneMiningAmountAC2
+
+    Used by:
+    Ship: Arbitrator
+    """
 
     type = 'passive'
 
@@ -4007,6 +6614,13 @@ class Effect2249(EffectDef):
 
 
 class Effect2250(EffectDef):
+    """
+    shipBonusDroneMiningAmountGC2
+
+    Used by:
+    Ship: Vexor
+    Ship: Vexor Navy Issue
+    """
 
     type = 'passive'
 
@@ -4017,6 +6631,14 @@ class Effect2250(EffectDef):
 
 
 class Effect2251(EffectDef):
+    """
+    commandshipMultiRelayEffect
+
+    Used by:
+    Ships from group: Command Ship (8 of 8)
+    Ships from group: Industrial Command Ship (2 of 2)
+    Ship: Rorqual
+    """
 
     type = 'passive'
 
@@ -4029,6 +6651,21 @@ class Effect2251(EffectDef):
 
 
 class Effect2252(EffectDef):
+    """
+    covertOpsAndReconOpsCloakModuleDelayBonus
+
+    Used by:
+    Ships from group: Black Ops (5 of 5)
+    Ships from group: Blockade Runner (4 of 4)
+    Ships from group: Covert Ops (8 of 8)
+    Ships from group: Expedition Frigate (2 of 2)
+    Ships from group: Force Recon Ship (9 of 9)
+    Ships from group: Stealth Bomber (5 of 5)
+    Ships named like: Stratios (2 of 2)
+    Subsystems named like: Defensive Covert Reconfiguration (4 of 4)
+    Ship: Astero
+    Ship: Rabisu
+    """
 
     type = 'passive'
 
@@ -4040,6 +6677,18 @@ class Effect2252(EffectDef):
 
 
 class Effect2253(EffectDef):
+    """
+    covertOpsStealthBomberTargettingDelayBonus
+
+    Used by:
+    Ships from group: Black Ops (5 of 5)
+    Ships from group: Stealth Bomber (5 of 5)
+    Ship: Caedes
+    Ship: Chremoas
+    Ship: Endurance
+    Ship: Etana
+    Ship: Rabisu
+    """
 
     type = 'passive'
 
@@ -4051,11 +6700,24 @@ class Effect2253(EffectDef):
 
 
 class Effect2255(EffectDef):
+    """
+    tractorBeamCan
+
+    Used by:
+    Deployables from group: Mobile Tractor Unit (3 of 3)
+    Modules from group: Tractor Beam (4 of 4)
+    """
 
     type = 'active'
 
 
 class Effect2298(EffectDef):
+    """
+    scanStrengthBonusPercentPassive
+
+    Used by:
+    Implants named like: High grade (20 of 66)
+    """
 
     type = 'passive'
 
@@ -4069,6 +6731,12 @@ class Effect2298(EffectDef):
 
 
 class Effect2302(EffectDef):
+    """
+    damageControl
+
+    Used by:
+    Modules from group: Damage Control (22 of 27)
+    """
 
     type = 'passive'
 
@@ -4084,6 +6752,13 @@ class Effect2302(EffectDef):
 
 
 class Effect2305(EffectDef):
+    """
+    eliteReconBonusEnergyNeutAmount2
+
+    Used by:
+    Ship: Curse
+    Ship: Pilgrim
+    """
 
     type = 'passive'
 
@@ -4095,6 +6770,13 @@ class Effect2305(EffectDef):
 
 
 class Effect2354(EffectDef):
+    """
+    capitalRemoteArmorRepairerCapNeedBonusSkill
+
+    Used by:
+    Variations of module: Capital Remote Repair Augmentor I (2 of 2)
+    Skill: Capital Remote Armor Repair Systems
+    """
 
     type = 'passive'
 
@@ -4106,6 +6788,12 @@ class Effect2354(EffectDef):
 
 
 class Effect2355(EffectDef):
+    """
+    capitalRemoteShieldTransferCapNeedBonusSkill
+
+    Used by:
+    Skill: Capital Shield Emission Systems
+    """
 
     type = 'passive'
 
@@ -4117,6 +6805,12 @@ class Effect2355(EffectDef):
 
 
 class Effect2356(EffectDef):
+    """
+    capitalRemoteEnergyTransferCapNeedBonusSkill
+
+    Used by:
+    Skill: Capital Capacitor Emission Systems
+    """
 
     type = 'passive'
 
@@ -4127,6 +6821,12 @@ class Effect2356(EffectDef):
 
 
 class Effect2402(EffectDef):
+    """
+    skillSuperWeaponDmgBonus
+
+    Used by:
+    Skill: Doomsday Operation
+    """
 
     type = 'passive'
 
@@ -4141,6 +6841,14 @@ class Effect2402(EffectDef):
 
 
 class Effect2422(EffectDef):
+    """
+    implantVelocityBonus
+
+    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'
 
@@ -4150,6 +6858,17 @@ class Effect2422(EffectDef):
 
 
 class Effect2432(EffectDef):
+    """
+    energyManagementCapacitorBonusPostPercentCapacityLocationShipGroupCapacitorCapacityBonus
+
+    Used by:
+    Implants named like: Inherent Implants 'Squire' Capacitor Management EM (6 of 6)
+    Implants named like: Mindflood Booster (4 of 4)
+    Modules named like: Semiconductor Memory Cell (8 of 8)
+    Implant: Antipharmakon Aeolis
+    Implant: Genolution Core Augmentation CA-1
+    Skill: Capacitor Management
+    """
 
     type = 'passive'
 
@@ -4160,6 +6879,13 @@ class Effect2432(EffectDef):
 
 
 class Effect2444(EffectDef):
+    """
+    minerCpuUsageMultiplyPercent2
+
+    Used by:
+    Variations of module: Mining Laser Upgrade I (5 of 5)
+    Module: Frostline 'Omnivore' Harvester Upgrade
+    """
 
     type = 'passive'
 
@@ -4170,6 +6896,12 @@ class Effect2444(EffectDef):
 
 
 class Effect2445(EffectDef):
+    """
+    iceMinerCpuUsagePercent
+
+    Used by:
+    Variations of module: Ice Harvester Upgrade I (5 of 5)
+    """
 
     type = 'passive'
 
@@ -4180,6 +6912,13 @@ class Effect2445(EffectDef):
 
 
 class Effect2456(EffectDef):
+    """
+    miningUpgradeCPUPenaltyReductionModulesRequiringMiningUpgradePercent
+
+    Used by:
+    Implants named like: Inherent Implants 'Highwall' Mining Upgrades MU (3 of 3)
+    Skill: Mining Upgrades
+    """
 
     type = 'passive'
 
@@ -4192,6 +6931,13 @@ class Effect2456(EffectDef):
 
 
 class Effect2465(EffectDef):
+    """
+    shipBonusArmorResistAB
+
+    Used by:
+    Ship: Abaddon
+    Ship: Nestor
+    """
 
     type = 'passive'
 
@@ -4203,6 +6949,13 @@ class Effect2465(EffectDef):
 
 
 class Effect2479(EffectDef):
+    """
+    iceHarvestCycleTimeModulesRequiringIceHarvestingOnline
+
+    Used by:
+    Variations of module: Ice Harvester Upgrade I (5 of 5)
+    Module: Frostline 'Omnivore' Harvester Upgrade
+    """
 
     type = 'passive'
 
@@ -4213,6 +6966,15 @@ class Effect2479(EffectDef):
 
 
 class Effect2485(EffectDef):
+    """
+    implantArmorHpBonus2
+
+    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'
 
@@ -4222,6 +6984,12 @@ class Effect2485(EffectDef):
 
 
 class Effect2488(EffectDef):
+    """
+    implantVelocityBonus2
+
+    Used by:
+    Implant: Republic Special Ops Field Enhancer - Gamma
+    """
 
     type = 'passive'
 
@@ -4231,6 +6999,12 @@ class Effect2488(EffectDef):
 
 
 class Effect2489(EffectDef):
+    """
+    shipBonusRemoteTrackingComputerFalloffMC
+
+    Used by:
+    Ship: Scimitar
+    """
 
     type = 'passive'
 
@@ -4242,6 +7016,12 @@ class Effect2489(EffectDef):
 
 
 class Effect2490(EffectDef):
+    """
+    shipBonusRemoteTrackingComputerFalloffGC2
+
+    Used by:
+    Ship: Oneiros
+    """
 
     type = 'passive'
 
@@ -4253,6 +7033,13 @@ class Effect2490(EffectDef):
 
 
 class Effect2491(EffectDef):
+    """
+    ewSkillEcmBurstRangeBonus
+
+    Used by:
+    Modules named like: Particle Dispersion Projector (8 of 8)
+    Skill: Long Distance Jamming
+    """
 
     type = 'passive'
 
@@ -4265,6 +7052,14 @@ class Effect2491(EffectDef):
 
 
 class Effect2492(EffectDef):
+    """
+    ewSkillEcmBurstCapNeedBonus
+
+    Used by:
+    Implants named like: Zainou 'Gypsy' Electronic Warfare EW (6 of 6)
+    Modules named like: Signal Disruption Amplifier (8 of 8)
+    Skill: Electronic Warfare
+    """
 
     type = 'passive'
 
@@ -4276,6 +7071,13 @@ class Effect2492(EffectDef):
 
 
 class Effect2503(EffectDef):
+    """
+    shipHTTrackingBonusGB2
+
+    Used by:
+    Ships named like: Megathron (3 of 3)
+    Ship: Marshal
+    """
 
     type = 'passive'
 
@@ -4287,6 +7089,15 @@ class Effect2503(EffectDef):
 
 
 class Effect2504(EffectDef):
+    """
+    shipBonusHybridTrackingGF2
+
+    Used by:
+    Ship: Ares
+    Ship: Federation Navy Comet
+    Ship: Pacifier
+    Ship: Tristan
+    """
 
     type = 'passive'
 
@@ -4297,6 +7108,12 @@ class Effect2504(EffectDef):
 
 
 class Effect2561(EffectDef):
+    """
+    eliteBonusAssaultShipMissileVelocity1
+
+    Used by:
+    Ship: Hawk
+    """
 
     type = 'passive'
 
@@ -4308,6 +7125,13 @@ class Effect2561(EffectDef):
 
 
 class Effect2589(EffectDef):
+    """
+    modifyBoosterEffectChanceWithBoosterChanceBonusPostPercent
+
+    Used by:
+    Implants named like: Eifyr and Co. 'Alchemist' Neurotoxin Recovery NR (2 of 2)
+    Skill: Neurotoxin Recovery
+    """
 
     type = 'passive'
 
@@ -4321,6 +7145,14 @@ class Effect2589(EffectDef):
 
 
 class Effect2602(EffectDef):
+    """
+    shipBonusEmShieldResistanceCB2
+
+    Used by:
+    Ship: Rattlesnake
+    Ship: Rokh
+    Ship: Scorpion Navy Issue
+    """
 
     type = 'passive'
 
@@ -4331,6 +7163,14 @@ class Effect2602(EffectDef):
 
 
 class Effect2603(EffectDef):
+    """
+    shipBonusExplosiveShieldResistanceCB2
+
+    Used by:
+    Ship: Rattlesnake
+    Ship: Rokh
+    Ship: Scorpion Navy Issue
+    """
 
     type = 'passive'
 
@@ -4341,6 +7181,14 @@ class Effect2603(EffectDef):
 
 
 class Effect2604(EffectDef):
+    """
+    shipBonusKineticShieldResistanceCB2
+
+    Used by:
+    Ship: Rattlesnake
+    Ship: Rokh
+    Ship: Scorpion Navy Issue
+    """
 
     type = 'passive'
 
@@ -4351,6 +7199,14 @@ class Effect2604(EffectDef):
 
 
 class Effect2605(EffectDef):
+    """
+    shipBonusThermicShieldResistanceCB2
+
+    Used by:
+    Ship: Rattlesnake
+    Ship: Rokh
+    Ship: Scorpion Navy Issue
+    """
 
     type = 'passive'
 
@@ -4361,6 +7217,12 @@ class Effect2605(EffectDef):
 
 
 class Effect2611(EffectDef):
+    """
+    eliteBonusGunshipProjectileDamage1
+
+    Used by:
+    Ship: Wolf
+    """
 
     type = 'passive'
 
@@ -4372,6 +7234,12 @@ class Effect2611(EffectDef):
 
 
 class Effect2644(EffectDef):
+    """
+    increaseSignatureRadiusOnline
+
+    Used by:
+    Modules from group: Inertial Stabilizer (7 of 7)
+    """
 
     type = 'passive'
 
@@ -4381,6 +7249,13 @@ class Effect2644(EffectDef):
 
 
 class Effect2645(EffectDef):
+    """
+    scanResolutionMultiplierOnline
+
+    Used by:
+    Modules from group: Warp Core Stabilizer (8 of 8)
+    Module: Target Spectrum Breaker
+    """
 
     type = 'passive'
 
@@ -4391,6 +7266,12 @@ class Effect2645(EffectDef):
 
 
 class Effect2646(EffectDef):
+    """
+    maxTargetRangeBonus
+
+    Used by:
+    Modules from group: Warp Core Stabilizer (8 of 8)
+    """
 
     type = 'passive'
 
@@ -4401,6 +7282,12 @@ class Effect2646(EffectDef):
 
 
 class Effect2647(EffectDef):
+    """
+    eliteBonusHeavyGunshipHeavyMissileLaunhcerRof2
+
+    Used by:
+    Ship: Cerberus
+    """
 
     type = 'passive'
 
@@ -4412,6 +7299,12 @@ class Effect2647(EffectDef):
 
 
 class Effect2648(EffectDef):
+    """
+    eliteBonusHeavyGunshipHeavyAssaultMissileLaunhcerRof2
+
+    Used by:
+    Ship: Cerberus
+    """
 
     type = 'passive'
 
@@ -4423,6 +7316,12 @@ class Effect2648(EffectDef):
 
 
 class Effect2649(EffectDef):
+    """
+    eliteBonusHeavyGunshipAssaultMissileLaunhcerRof2
+
+    Used by:
+    Ship: Cerberus
+    """
 
     type = 'passive'
 
@@ -4434,6 +7333,12 @@ class Effect2649(EffectDef):
 
 
 class Effect2670(EffectDef):
+    """
+    sensorBoosterActivePercentage
+
+    Used by:
+    Modules from group: Sensor Booster (16 of 16)
+    """
 
     type = 'active'
 
@@ -4453,6 +7358,12 @@ class Effect2670(EffectDef):
 
 
 class Effect2688(EffectDef):
+    """
+    capNeedBonusEffectLasers
+
+    Used by:
+    Modules named like: Energy Discharge Elutriation (8 of 8)
+    """
 
     type = 'passive'
 
@@ -4463,6 +7374,12 @@ class Effect2688(EffectDef):
 
 
 class Effect2689(EffectDef):
+    """
+    capNeedBonusEffectHybrids
+
+    Used by:
+    Modules named like: Hybrid Discharge Elutriation (8 of 8)
+    """
 
     type = 'passive'
 
@@ -4473,6 +7390,12 @@ class Effect2689(EffectDef):
 
 
 class Effect2690(EffectDef):
+    """
+    cpuNeedBonusEffectLasers
+
+    Used by:
+    Modules named like: Algid Energy Administrations Unit (8 of 8)
+    """
 
     type = 'passive'
 
@@ -4483,6 +7406,12 @@ class Effect2690(EffectDef):
 
 
 class Effect2691(EffectDef):
+    """
+    cpuNeedBonusEffectHybrid
+
+    Used by:
+    Modules named like: Algid Hybrid Administrations Unit (8 of 8)
+    """
 
     type = 'passive'
 
@@ -4493,6 +7422,12 @@ class Effect2691(EffectDef):
 
 
 class Effect2693(EffectDef):
+    """
+    falloffBonusEffectLasers
+
+    Used by:
+    Modules named like: Energy Ambit Extension (8 of 8)
+    """
 
     type = 'passive'
 
@@ -4504,6 +7439,12 @@ class Effect2693(EffectDef):
 
 
 class Effect2694(EffectDef):
+    """
+    falloffBonusEffectHybrids
+
+    Used by:
+    Modules named like: Hybrid Ambit Extension (8 of 8)
+    """
 
     type = 'passive'
 
@@ -4515,6 +7456,12 @@ class Effect2694(EffectDef):
 
 
 class Effect2695(EffectDef):
+    """
+    falloffBonusEffectProjectiles
+
+    Used by:
+    Modules named like: Projectile Ambit Extension (8 of 8)
+    """
 
     type = 'passive'
 
@@ -4526,6 +7473,12 @@ class Effect2695(EffectDef):
 
 
 class Effect2696(EffectDef):
+    """
+    maxRangeBonusEffectLasers
+
+    Used by:
+    Modules named like: Energy Locus Coordinator (8 of 8)
+    """
 
     type = 'passive'
 
@@ -4537,6 +7490,12 @@ class Effect2696(EffectDef):
 
 
 class Effect2697(EffectDef):
+    """
+    maxRangeBonusEffectHybrids
+
+    Used by:
+    Modules named like: Hybrid Locus Coordinator (8 of 8)
+    """
 
     type = 'passive'
 
@@ -4548,6 +7507,12 @@ class Effect2697(EffectDef):
 
 
 class Effect2698(EffectDef):
+    """
+    maxRangeBonusEffectProjectiles
+
+    Used by:
+    Modules named like: Projectile Locus Coordinator (8 of 8)
+    """
 
     type = 'passive'
 
@@ -4559,6 +7524,12 @@ class Effect2698(EffectDef):
 
 
 class Effect2706(EffectDef):
+    """
+    drawbackPowerNeedLasers
+
+    Used by:
+    Modules from group: Rig Energy Weapon (56 of 56)
+    """
 
     type = 'passive'
 
@@ -4569,6 +7540,12 @@ class Effect2706(EffectDef):
 
 
 class Effect2707(EffectDef):
+    """
+    drawbackPowerNeedHybrids
+
+    Used by:
+    Modules from group: Rig Hybrid Weapon (56 of 56)
+    """
 
     type = 'passive'
 
@@ -4579,6 +7556,12 @@ class Effect2707(EffectDef):
 
 
 class Effect2708(EffectDef):
+    """
+    drawbackPowerNeedProjectiles
+
+    Used by:
+    Modules from group: Rig Projectile Weapon (40 of 40)
+    """
 
     type = 'passive'
 
@@ -4589,6 +7572,12 @@ class Effect2708(EffectDef):
 
 
 class Effect2712(EffectDef):
+    """
+    drawbackArmorHP
+
+    Used by:
+    Modules from group: Rig Navigation (48 of 64)
+    """
 
     type = 'passive'
 
@@ -4598,6 +7587,12 @@ class Effect2712(EffectDef):
 
 
 class Effect2713(EffectDef):
+    """
+    drawbackCPUOutput
+
+    Used by:
+    Modules from group: Rig Drones (58 of 64)
+    """
 
     type = 'passive'
 
@@ -4607,6 +7602,12 @@ class Effect2713(EffectDef):
 
 
 class Effect2714(EffectDef):
+    """
+    drawbackCPUNeedLaunchers
+
+    Used by:
+    Modules from group: Rig Launcher (48 of 48)
+    """
 
     type = 'passive'
 
@@ -4617,6 +7618,13 @@ class Effect2714(EffectDef):
 
 
 class Effect2716(EffectDef):
+    """
+    drawbackSigRad
+
+    Used by:
+    Modules from group: Rig Shield (72 of 72)
+    Modules named like: Optimizer (16 of 16)
+    """
 
     type = 'passive'
 
@@ -4626,6 +7634,13 @@ class Effect2716(EffectDef):
 
 
 class Effect2717(EffectDef):
+    """
+    drawbackMaxVelocity
+
+    Used by:
+    Modules from group: Rig Armor (48 of 72)
+    Modules from group: Rig Resource Processing (8 of 10)
+    """
 
     type = 'passive'
 
@@ -4636,6 +7651,14 @@ class Effect2717(EffectDef):
 
 
 class Effect2718(EffectDef):
+    """
+    drawbackShieldCapacity
+
+    Used by:
+    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'
 
@@ -4645,11 +7668,23 @@ class Effect2718(EffectDef):
 
 
 class Effect2726(EffectDef):
+    """
+    miningClouds
+
+    Used by:
+    Modules from group: Gas Cloud Harvester (5 of 5)
+    """
 
     type = 'active'
 
 
 class Effect2727(EffectDef):
+    """
+    gasCloudHarvestingMaxGroupSkillLevel
+
+    Used by:
+    Skill: Gas Cloud Harvesting
+    """
 
     type = 'passive'
 
@@ -4660,6 +7695,12 @@ class Effect2727(EffectDef):
 
 
 class Effect2734(EffectDef):
+    """
+    shipECMScanStrengthBonusCF
+
+    Used by:
+    Variations of ship: Griffin (3 of 3)
+    """
 
     type = 'passive'
 
@@ -4672,6 +7713,12 @@ class Effect2734(EffectDef):
 
 
 class Effect2735(EffectDef):
+    """
+    boosterArmorHpPenalty
+
+    Used by:
+    Implants named like: Booster (12 of 35)
+    """
 
     attr = 'boosterArmorHPPenalty'
     displayName = 'Armor Capacity'
@@ -4683,6 +7730,14 @@ class Effect2735(EffectDef):
 
 
 class Effect2736(EffectDef):
+    """
+    boosterArmorRepairAmountPenalty
+
+    Used by:
+    Implants named like: Drop Booster (3 of 4)
+    Implants named like: Mindflood Booster (3 of 4)
+    Implants named like: Sooth Sayer Booster (3 of 4)
+    """
 
     attr = 'boosterArmorRepairAmountPenalty'
     displayName = 'Armor Repair Amount'
@@ -4695,6 +7750,12 @@ class Effect2736(EffectDef):
 
 
 class Effect2737(EffectDef):
+    """
+    boosterShieldCapacityPenalty
+
+    Used by:
+    Implants from group: Booster (12 of 70)
+    """
 
     attr = 'boosterShieldCapacityPenalty'
     displayName = 'Shield Capacity'
@@ -4706,6 +7767,14 @@ class Effect2737(EffectDef):
 
 
 class Effect2739(EffectDef):
+    """
+    boosterTurretOptimalRangePenalty
+
+    Used by:
+    Implants named like: Blue Pill Booster (3 of 5)
+    Implants named like: Mindflood Booster (3 of 4)
+    Implants named like: Sooth Sayer Booster (3 of 4)
+    """
 
     attr = 'boosterTurretOptimalRangePenalty'
     displayName = 'Turret Optimal Range'
@@ -4718,6 +7787,13 @@ class Effect2739(EffectDef):
 
 
 class Effect2741(EffectDef):
+    """
+    boosterTurretFalloffPenalty
+
+    Used by:
+    Implants named like: Drop Booster (3 of 4)
+    Implants named like: X Instinct Booster (3 of 4)
+    """
 
     attr = 'boosterTurretFalloffPenalty'
     displayName = 'Turret Falloff'
@@ -4730,6 +7806,13 @@ class Effect2741(EffectDef):
 
 
 class Effect2745(EffectDef):
+    """
+    boosterCapacitorCapacityPenalty
+
+    Used by:
+    Implants named like: Blue Pill Booster (3 of 5)
+    Implants named like: Exile Booster (3 of 4)
+    """
 
     attr = 'boosterCapacitorCapacityPenalty'
     displayName = 'Cap Capacity'
@@ -4741,6 +7824,13 @@ class Effect2745(EffectDef):
 
 
 class Effect2746(EffectDef):
+    """
+    boosterMaxVelocityPenalty
+
+    Used by:
+    Implants named like: Crash Booster (3 of 4)
+    Items from market group: Implants & Boosters > Booster > Booster Slot 02 (9 of 13)
+    """
 
     attr = 'boosterMaxVelocityPenalty'
     displayName = 'Velocity'
@@ -4752,6 +7842,13 @@ class Effect2746(EffectDef):
 
 
 class Effect2747(EffectDef):
+    """
+    boosterTurretTrackingPenalty
+
+    Used by:
+    Implants named like: Exile Booster (3 of 4)
+    Implants named like: Frentix Booster (3 of 4)
+    """
 
     attr = 'boosterTurretTrackingPenalty'
     displayName = 'Turret Tracking'
@@ -4764,6 +7861,13 @@ class Effect2747(EffectDef):
 
 
 class Effect2748(EffectDef):
+    """
+    boosterMissileVelocityPenalty
+
+    Used by:
+    Implants named like: Crash Booster (3 of 4)
+    Implants named like: X Instinct Booster (3 of 4)
+    """
 
     attr = 'boosterMissileVelocityPenalty'
     displayName = 'Missile Velocity'
@@ -4776,6 +7880,12 @@ class Effect2748(EffectDef):
 
 
 class Effect2749(EffectDef):
+    """
+    boosterMissileExplosionVelocityPenalty
+
+    Used by:
+    Implants named like: Blue Pill Booster (3 of 5)
+    """
 
     attr = 'boosterAOEVelocityPenalty'
     displayName = 'Missile Explosion Velocity'
@@ -4788,6 +7898,12 @@ class Effect2749(EffectDef):
 
 
 class Effect2756(EffectDef):
+    """
+    shipBonusECMStrengthBonusCC
+
+    Used by:
+    Ship: Blackbird
+    """
 
     type = 'passive'
 
@@ -4800,11 +7916,25 @@ class Effect2756(EffectDef):
 
 
 class Effect2757(EffectDef):
+    """
+    salvaging
+
+    Used by:
+    Modules from group: Salvager (3 of 3)
+    """
 
     type = 'active'
 
 
 class Effect2760(EffectDef):
+    """
+    boosterModifyBoosterArmorPenalties
+
+    Used by:
+    Implants named like: Eifyr and Co. 'Alchemist' Neurotoxin Control NC (2 of 2)
+    Implants named like: grade Edge (10 of 12)
+    Skill: Neurotoxin Control
+    """
 
     runTime = 'early'
     type = 'passive'
@@ -4819,6 +7949,14 @@ class Effect2760(EffectDef):
 
 
 class Effect2763(EffectDef):
+    """
+    boosterModifyBoosterShieldPenalty
+
+    Used by:
+    Implants named like: Eifyr and Co. 'Alchemist' Neurotoxin Control NC (2 of 2)
+    Implants named like: grade Edge (10 of 12)
+    Skill: Neurotoxin Control
+    """
 
     type = 'passive'
 
@@ -4834,6 +7972,14 @@ class Effect2763(EffectDef):
 
 
 class Effect2766(EffectDef):
+    """
+    boosterModifyBoosterMaxVelocityAndCapacitorPenalty
+
+    Used by:
+    Implants named like: Eifyr and Co. 'Alchemist' Neurotoxin Control NC (2 of 2)
+    Implants named like: grade Edge (10 of 12)
+    Skill: Neurotoxin Control
+    """
 
     type = 'passive'
 
@@ -4847,6 +7993,14 @@ class Effect2766(EffectDef):
 
 
 class Effect2776(EffectDef):
+    """
+    boosterModifyBoosterMissilePenalty
+
+    Used by:
+    Implants named like: Eifyr and Co. 'Alchemist' Neurotoxin Control NC (2 of 2)
+    Implants named like: grade Edge (10 of 12)
+    Skill: Neurotoxin Control
+    """
 
     type = 'passive'
 
@@ -4860,6 +8014,14 @@ class Effect2776(EffectDef):
 
 
 class Effect2778(EffectDef):
+    """
+    boosterModifyBoosterTurretPenalty
+
+    Used by:
+    Implants named like: Eifyr and Co. 'Alchemist' Neurotoxin Control NC (2 of 2)
+    Implants named like: grade Edge (10 of 12)
+    Skill: Neurotoxin Control
+    """
 
     type = 'passive'
 
@@ -4873,6 +8035,13 @@ class Effect2778(EffectDef):
 
 
 class Effect2791(EffectDef):
+    """
+    boosterMissileExplosionCloudPenaltyFixed
+
+    Used by:
+    Implants named like: Exile Booster (3 of 4)
+    Implants named like: Mindflood Booster (3 of 4)
+    """
 
     attr = 'boosterMissileAOECloudPenalty'
     displayName = 'Missile Explosion Radius'
@@ -4885,6 +8054,12 @@ class Effect2791(EffectDef):
 
 
 class Effect2792(EffectDef):
+    """
+    modifyArmorResonancePostPercentPassive
+
+    Used by:
+    Modules named like: Anti Pump (32 of 32)
+    """
 
     type = 'passive'
 
@@ -4897,6 +8072,13 @@ class Effect2792(EffectDef):
 
 
 class Effect2794(EffectDef):
+    """
+    salvagingAccessDifficultyBonusEffectPassive
+
+    Used by:
+    Modules from group: Rig Resource Processing (8 of 10)
+    Implant: Poteque 'Prospector' Salvaging SV-905
+    """
 
     type = 'passive'
 
@@ -4908,6 +8090,12 @@ class Effect2794(EffectDef):
 
 
 class Effect2795(EffectDef):
+    """
+    modifyShieldResonancePostPercentPassive
+
+    Used by:
+    Modules named like: Anti Screen Reinforcer (32 of 32)
+    """
 
     type = 'passive'
 
@@ -4920,6 +8108,12 @@ class Effect2795(EffectDef):
 
 
 class Effect2796(EffectDef):
+    """
+    massReductionBonusPassive
+
+    Used by:
+    Modules from group: Rig Anchor (4 of 4)
+    """
 
     type = 'passive'
 
@@ -4929,6 +8123,12 @@ class Effect2796(EffectDef):
 
 
 class Effect2797(EffectDef):
+    """
+    projectileWeaponSpeedMultiplyPassive
+
+    Used by:
+    Modules named like: Projectile Burst Aerator (8 of 8)
+    """
 
     type = 'passive'
 
@@ -4940,6 +8140,12 @@ class Effect2797(EffectDef):
 
 
 class Effect2798(EffectDef):
+    """
+    projectileWeaponDamageMultiplyPassive
+
+    Used by:
+    Modules named like: Projectile Collision Accelerator (8 of 8)
+    """
 
     type = 'passive'
 
@@ -4951,6 +8157,12 @@ class Effect2798(EffectDef):
 
 
 class Effect2799(EffectDef):
+    """
+    missileLauncherSpeedMultiplierPassive
+
+    Used by:
+    Modules named like: Bay Loading Accelerator (8 of 8)
+    """
 
     type = 'passive'
 
@@ -4962,6 +8174,12 @@ class Effect2799(EffectDef):
 
 
 class Effect2801(EffectDef):
+    """
+    energyWeaponSpeedMultiplyPassive
+
+    Used by:
+    Modules named like: Energy Burst Aerator (8 of 8)
+    """
 
     type = 'passive'
 
@@ -4973,6 +8191,12 @@ class Effect2801(EffectDef):
 
 
 class Effect2802(EffectDef):
+    """
+    hybridWeaponDamageMultiplyPassive
+
+    Used by:
+    Modules named like: Hybrid Collision Accelerator (8 of 8)
+    """
 
     type = 'passive'
 
@@ -4984,6 +8208,12 @@ class Effect2802(EffectDef):
 
 
 class Effect2803(EffectDef):
+    """
+    energyWeaponDamageMultiplyPassive
+
+    Used by:
+    Modules named like: Energy Collision Accelerator (8 of 8)
+    """
 
     type = 'passive'
 
@@ -4995,6 +8225,12 @@ class Effect2803(EffectDef):
 
 
 class Effect2804(EffectDef):
+    """
+    hybridWeaponSpeedMultiplyPassive
+
+    Used by:
+    Modules named like: Hybrid Burst Aerator (8 of 8)
+    """
 
     type = 'passive'
 
@@ -5006,6 +8242,13 @@ class Effect2804(EffectDef):
 
 
 class Effect2805(EffectDef):
+    """
+    shipBonusLargeEnergyWeaponDamageAB2
+
+    Used by:
+    Ship: Abaddon
+    Ship: Marshal
+    """
 
     type = 'passive'
 
@@ -5017,6 +8260,13 @@ class Effect2805(EffectDef):
 
 
 class Effect2809(EffectDef):
+    """
+    shipMissileAssaultMissileVelocityBonusCC2
+
+    Used by:
+    Ship: Caracal
+    Ship: Osprey Navy Issue
+    """
 
     type = 'passive'
 
@@ -5027,6 +8277,12 @@ class Effect2809(EffectDef):
 
 
 class Effect2810(EffectDef):
+    """
+    eliteBonusHeavyGunshipAssaultMissileFlightTime1
+
+    Used by:
+    Ship: Cerberus
+    """
 
     type = 'passive'
 
@@ -5038,6 +8294,12 @@ class Effect2810(EffectDef):
 
 
 class Effect2812(EffectDef):
+    """
+    caldariShipECMBurstOptimalRangeCB3
+
+    Used by:
+    Ship: Scorpion
+    """
 
     type = 'passive'
 
@@ -5048,6 +8310,12 @@ class Effect2812(EffectDef):
 
 
 class Effect2837(EffectDef):
+    """
+    armorHPBonusAdd
+
+    Used by:
+    Modules from group: Armor Reinforcer (51 of 51)
+    """
 
     type = 'passive'
 
@@ -5057,6 +8325,16 @@ class Effect2837(EffectDef):
 
 
 class Effect2847(EffectDef):
+    """
+    trackingSpeedBonusPassiveRequiringGunneryTrackingSpeedBonus
+
+    Used by:
+    Implants named like: Drop Booster (4 of 4)
+    Implants named like: Eifyr and Co. 'Gunslinger' Motion Prediction MR (6 of 6)
+    Implant: Antipharmakon Iokira
+    Implant: Ogdin's Eye Coordination Enhancer
+    Skill: Motion Prediction
+    """
 
     type = 'passive'
 
@@ -5068,6 +8346,14 @@ class Effect2847(EffectDef):
 
 
 class Effect2848(EffectDef):
+    """
+    accessDifficultyBonusModifierRequiringArchaelogy
+
+    Used by:
+    Modules named like: Emission Scope Sharpener (8 of 8)
+    Implant: Poteque 'Prospector' Archaeology AC-905
+    Implant: Poteque 'Prospector' Environmental Analysis EY-1005
+    """
 
     type = 'passive'
 
@@ -5079,6 +8365,15 @@ class Effect2848(EffectDef):
 
 
 class Effect2849(EffectDef):
+    """
+    accessDifficultyBonusModifierRequiringHacking
+
+    Used by:
+    Modules named like: Memetic Algorithm Bank (8 of 8)
+    Implant: Neural Lace 'Blackglass' Net Intrusion 920-40
+    Implant: Poteque 'Prospector' Environmental Analysis EY-1005
+    Implant: Poteque 'Prospector' Hacking HC-905
+    """
 
     type = 'passive'
 
@@ -5090,6 +8385,12 @@ class Effect2849(EffectDef):
 
 
 class Effect2850(EffectDef):
+    """
+    durationBonusForGroupAfterburner
+
+    Used by:
+    Modules named like: Engine Thermal Shielding (8 of 8)
+    """
 
     type = 'passive'
 
@@ -5100,6 +8401,12 @@ class Effect2850(EffectDef):
 
 
 class Effect2851(EffectDef):
+    """
+    missileDMGBonusPassive
+
+    Used by:
+    Modules named like: Warhead Calefaction Catalyst (8 of 8)
+    """
 
     type = 'passive'
 
@@ -5113,6 +8420,12 @@ class Effect2851(EffectDef):
 
 
 class Effect2853(EffectDef):
+    """
+    cloakingTargetingDelayBonusLRSMCloakingPassive
+
+    Used by:
+    Modules named like: Targeting Systems Stabilizer (8 of 8)
+    """
 
     type = 'passive'
 
@@ -5123,6 +8436,12 @@ class Effect2853(EffectDef):
 
 
 class Effect2857(EffectDef):
+    """
+    cynosuralGeneration
+
+    Used by:
+    Modules from group: Cynosural Field Generator (2 of 2)
+    """
 
     type = 'active'
 
@@ -5132,6 +8451,14 @@ class Effect2857(EffectDef):
 
 
 class Effect2865(EffectDef):
+    """
+    velocityBonusOnline
+
+    Used by:
+    Modules from group: Entosis Link (6 of 6)
+    Modules from group: Nanofiber Internal Structure (7 of 7)
+    Modules from group: Overdrive Injector System (7 of 7)
+    """
 
     type = 'passive'
 
@@ -5142,6 +8469,13 @@ class Effect2865(EffectDef):
 
 
 class Effect2866(EffectDef):
+    """
+    biologyTimeBonusFixed
+
+    Used by:
+    Implants named like: Eifyr and Co. 'Alchemist' Biology BY (2 of 2)
+    Skill: Biology
+    """
 
     type = 'passive'
 
@@ -5153,6 +8487,12 @@ class Effect2866(EffectDef):
 
 
 class Effect2867(EffectDef):
+    """
+    sentryDroneDamageBonus
+
+    Used by:
+    Modules named like: Sentry Damage Augmentor (8 of 8)
+    """
 
     type = 'passive'
 
@@ -5164,6 +8504,12 @@ class Effect2867(EffectDef):
 
 
 class Effect2868(EffectDef):
+    """
+    armorDamageAmountBonusCapitalArmorRepairers
+
+    Used by:
+    Modules named like: Auxiliary Nano Pump (8 of 8)
+    """
 
     type = 'passive'
 
@@ -5175,6 +8521,12 @@ class Effect2868(EffectDef):
 
 
 class Effect2872(EffectDef):
+    """
+    missileVelocityBonusDefender
+
+    Used by:
+    Implants named like: Zainou 'Snapshot' Defender Missiles DM (6 of 6)
+    """
 
     type = 'passive'
 
@@ -5185,6 +8537,12 @@ class Effect2872(EffectDef):
 
 
 class Effect2881(EffectDef):
+    """
+    missileEMDmgBonusCruise3
+
+    Used by:
+    Implants named like: Zainou 'Snapshot' Cruise Missiles CM (6 of 6)
+    """
 
     type = 'passive'
 
@@ -5195,6 +8553,12 @@ class Effect2881(EffectDef):
 
 
 class Effect2882(EffectDef):
+    """
+    missileExplosiveDmgBonusCruise3
+
+    Used by:
+    Implants named like: Zainou 'Snapshot' Cruise Missiles CM (6 of 6)
+    """
 
     type = 'passive'
 
@@ -5205,6 +8569,12 @@ class Effect2882(EffectDef):
 
 
 class Effect2883(EffectDef):
+    """
+    missileKineticDmgBonusCruise3
+
+    Used by:
+    Implants named like: Zainou 'Snapshot' Cruise Missiles CM (6 of 6)
+    """
 
     type = 'passive'
 
@@ -5215,6 +8585,12 @@ class Effect2883(EffectDef):
 
 
 class Effect2884(EffectDef):
+    """
+    missileThermalDmgBonusCruise3
+
+    Used by:
+    Implants named like: Zainou 'Snapshot' Cruise Missiles CM (6 of 6)
+    """
 
     type = 'passive'
 
@@ -5225,6 +8601,12 @@ class Effect2884(EffectDef):
 
 
 class Effect2885(EffectDef):
+    """
+    gasHarvestingCycleTimeModulesRequiringGasCloudHarvesting
+
+    Used by:
+    Implants named like: Eifyr and Co. 'Alchemist' Gas Harvesting GH (3 of 3)
+    """
 
     type = 'passive'
 
@@ -5235,6 +8617,12 @@ class Effect2885(EffectDef):
 
 
 class Effect2887(EffectDef):
+    """
+    missileEMDmgBonusRocket
+
+    Used by:
+    Implants named like: Zainou 'Snapshot' Rockets RD (6 of 6)
+    """
 
     type = 'passive'
 
@@ -5245,6 +8633,12 @@ class Effect2887(EffectDef):
 
 
 class Effect2888(EffectDef):
+    """
+    missileExplosiveDmgBonusRocket
+
+    Used by:
+    Implants named like: Zainou 'Snapshot' Rockets RD (6 of 6)
+    """
 
     type = 'passive'
 
@@ -5255,6 +8649,12 @@ class Effect2888(EffectDef):
 
 
 class Effect2889(EffectDef):
+    """
+    missileKineticDmgBonusRocket
+
+    Used by:
+    Implants named like: Zainou 'Snapshot' Rockets RD (6 of 6)
+    """
 
     type = 'passive'
 
@@ -5265,6 +8665,12 @@ class Effect2889(EffectDef):
 
 
 class Effect2890(EffectDef):
+    """
+    missileThermalDmgBonusRocket
+
+    Used by:
+    Implants named like: Zainou 'Snapshot' Rockets RD (6 of 6)
+    """
 
     type = 'passive'
 
@@ -5275,6 +8681,12 @@ class Effect2890(EffectDef):
 
 
 class Effect2891(EffectDef):
+    """
+    missileEMDmgBonusStandard
+
+    Used by:
+    Implants named like: Zainou 'Snapshot' Light Missiles LM (6 of 6)
+    """
 
     type = 'passive'
 
@@ -5285,6 +8697,12 @@ class Effect2891(EffectDef):
 
 
 class Effect2892(EffectDef):
+    """
+    missileExplosiveDmgBonusStandard
+
+    Used by:
+    Implants named like: Zainou 'Snapshot' Light Missiles LM (6 of 6)
+    """
 
     type = 'passive'
 
@@ -5295,6 +8713,12 @@ class Effect2892(EffectDef):
 
 
 class Effect2893(EffectDef):
+    """
+    missileKineticDmgBonusStandard
+
+    Used by:
+    Implants named like: Zainou 'Snapshot' Light Missiles LM (6 of 6)
+    """
 
     type = 'passive'
 
@@ -5305,6 +8729,12 @@ class Effect2893(EffectDef):
 
 
 class Effect2894(EffectDef):
+    """
+    missileThermalDmgBonusStandard
+
+    Used by:
+    Implants named like: Zainou 'Snapshot' Light Missiles LM (6 of 6)
+    """
 
     type = 'passive'
 
@@ -5315,6 +8745,12 @@ class Effect2894(EffectDef):
 
 
 class Effect2899(EffectDef):
+    """
+    missileEMDmgBonusHeavy
+
+    Used by:
+    Implants named like: Zainou 'Snapshot' Heavy Missiles HM (6 of 6)
+    """
 
     type = 'passive'
 
@@ -5325,6 +8761,12 @@ class Effect2899(EffectDef):
 
 
 class Effect2900(EffectDef):
+    """
+    missileExplosiveDmgBonusHeavy
+
+    Used by:
+    Implants named like: Zainou 'Snapshot' Heavy Missiles HM (6 of 6)
+    """
 
     type = 'passive'
 
@@ -5335,6 +8777,12 @@ class Effect2900(EffectDef):
 
 
 class Effect2901(EffectDef):
+    """
+    missileKineticDmgBonusHeavy
+
+    Used by:
+    Implants named like: Zainou 'Snapshot' Heavy Missiles HM (6 of 6)
+    """
 
     type = 'passive'
 
@@ -5345,6 +8793,12 @@ class Effect2901(EffectDef):
 
 
 class Effect2902(EffectDef):
+    """
+    missileThermalDmgBonusHeavy
+
+    Used by:
+    Implants named like: Zainou 'Snapshot' Heavy Missiles HM (6 of 6)
+    """
 
     type = 'passive'
 
@@ -5355,6 +8809,12 @@ class Effect2902(EffectDef):
 
 
 class Effect2903(EffectDef):
+    """
+    missileEMDmgBonusHAM
+
+    Used by:
+    Implants named like: Zainou 'Snapshot' Heavy Assault Missiles AM (6 of 6)
+    """
 
     type = 'passive'
 
@@ -5365,6 +8825,12 @@ class Effect2903(EffectDef):
 
 
 class Effect2904(EffectDef):
+    """
+    missileExplosiveDmgBonusHAM
+
+    Used by:
+    Implants named like: Zainou 'Snapshot' Heavy Assault Missiles AM (6 of 6)
+    """
 
     type = 'passive'
 
@@ -5375,6 +8841,12 @@ class Effect2904(EffectDef):
 
 
 class Effect2905(EffectDef):
+    """
+    missileKineticDmgBonusHAM
+
+    Used by:
+    Implants named like: Zainou 'Snapshot' Heavy Assault Missiles AM (6 of 6)
+    """
 
     type = 'passive'
 
@@ -5385,6 +8857,12 @@ class Effect2905(EffectDef):
 
 
 class Effect2906(EffectDef):
+    """
+    missileThermalDmgBonusHAM
+
+    Used by:
+    Implants named like: Zainou 'Snapshot' Heavy Assault Missiles AM (6 of 6)
+    """
 
     type = 'passive'
 
@@ -5395,6 +8873,12 @@ class Effect2906(EffectDef):
 
 
 class Effect2907(EffectDef):
+    """
+    missileEMDmgBonusTorpedo
+
+    Used by:
+    Implants named like: Zainou 'Snapshot' Torpedoes TD (6 of 6)
+    """
 
     type = 'passive'
 
@@ -5405,6 +8889,12 @@ class Effect2907(EffectDef):
 
 
 class Effect2908(EffectDef):
+    """
+    missileExplosiveDmgBonusTorpedo
+
+    Used by:
+    Implants named like: Zainou 'Snapshot' Torpedoes TD (6 of 6)
+    """
 
     type = 'passive'
 
@@ -5415,6 +8905,12 @@ class Effect2908(EffectDef):
 
 
 class Effect2909(EffectDef):
+    """
+    missileKineticDmgBonusTorpedo
+
+    Used by:
+    Implants named like: Zainou 'Snapshot' Torpedoes TD (6 of 6)
+    """
 
     type = 'passive'
 
@@ -5425,6 +8921,12 @@ class Effect2909(EffectDef):
 
 
 class Effect2910(EffectDef):
+    """
+    missileThermalDmgBonusTorpedo
+
+    Used by:
+    Implants named like: Zainou 'Snapshot' Torpedoes TD (6 of 6)
+    """
 
     type = 'passive'
 
@@ -5435,6 +8937,12 @@ class Effect2910(EffectDef):
 
 
 class Effect2911(EffectDef):
+    """
+    dataminerModuleDurationReduction
+
+    Used by:
+    Implant: Poteque 'Prospector' Environmental Analysis EY-1005
+    """
 
     type = 'passive'
 
@@ -5445,6 +8953,12 @@ class Effect2911(EffectDef):
 
 
 class Effect2967(EffectDef):
+    """
+    skillTriageModuleConsumptionQuantityBonus
+
+    Used by:
+    Skill: Tactical Logistics Reconfiguration
+    """
 
     type = 'passive'
 
@@ -5456,6 +8970,9 @@ class Effect2967(EffectDef):
 
 
 class Effect2977(EffectDef):
+    """
+    Not used by any item
+    """
 
     type = 'passive'
 
@@ -5466,6 +8983,12 @@ class Effect2977(EffectDef):
 
 
 class Effect2980(EffectDef):
+    """
+    skillCapitalRemoteHullRepairSystemsCapNeedBonus
+
+    Used by:
+    Skill: Capital Remote Hull Repair Systems
+    """
 
     type = 'passive'
 
@@ -5476,6 +8999,12 @@ class Effect2980(EffectDef):
 
 
 class Effect2982(EffectDef):
+    """
+    skillRemoteECMDurationBonus
+
+    Used by:
+    Skill: Burst Projector Operation
+    """
 
     type = 'passive'
 
@@ -5509,6 +9038,14 @@ class Effect2982(EffectDef):
 
 
 class Effect3001(EffectDef):
+    """
+    overloadRofBonus
+
+    Used by:
+    Modules from group: Missile Launcher Torpedo (22 of 22)
+    Items from market group: Ship Equipment > Turrets & Bays (429 of 883)
+    Module: Interdiction Sphere Launcher I
+    """
 
     type = 'overheat'
 
@@ -5518,6 +9055,24 @@ class Effect3001(EffectDef):
 
 
 class Effect3002(EffectDef):
+    """
+    overloadSelfDurationBonus
+
+    Used by:
+    Modules from group: Ancillary Remote Shield Booster (4 of 4)
+    Modules from group: Capacitor Booster (59 of 59)
+    Modules from group: Energy Neutralizer (54 of 54)
+    Modules from group: Energy Nosferatu (54 of 54)
+    Modules from group: Hull Repair Unit (25 of 25)
+    Modules from group: Remote Armor Repairer (39 of 39)
+    Modules from group: Remote Capacitor Transmitter (41 of 41)
+    Modules from group: Remote Shield Booster (38 of 38)
+    Modules from group: Smart Bomb (118 of 118)
+    Modules from group: Warp Disrupt Field Generator (7 of 7)
+    Modules named like: Remote Repairer (56 of 56)
+    Module: Reactive Armor Hardener
+    Module: Target Spectrum Breaker
+    """
 
     type = 'overheat'
 
@@ -5527,6 +9082,13 @@ class Effect3002(EffectDef):
 
 
 class Effect3024(EffectDef):
+    """
+    eliteBonusCoverOpsBombExplosiveDmg1
+
+    Used by:
+    Ship: Hound
+    Ship: Virtuoso
+    """
 
     type = 'passive'
 
@@ -5538,6 +9100,15 @@ class Effect3024(EffectDef):
 
 
 class Effect3025(EffectDef):
+    """
+    overloadSelfDamageBonus
+
+    Used by:
+    Modules from group: Energy Weapon (101 of 214)
+    Modules from group: Hybrid Weapon (105 of 221)
+    Modules from group: Precursor Weapon (15 of 15)
+    Modules from group: Projectile Weapon (99 of 165)
+    """
 
     type = 'overheat'
 
@@ -5547,6 +9118,12 @@ class Effect3025(EffectDef):
 
 
 class Effect3026(EffectDef):
+    """
+    eliteBonusCoverOpsBombKineticDmg1
+
+    Used by:
+    Ship: Manticore
+    """
 
     type = 'passive'
 
@@ -5558,6 +9135,13 @@ class Effect3026(EffectDef):
 
 
 class Effect3027(EffectDef):
+    """
+    eliteBonusCoverOpsBombThermalDmg1
+
+    Used by:
+    Ship: Nemesis
+    Ship: Virtuoso
+    """
 
     type = 'passive'
 
@@ -5569,6 +9153,12 @@ class Effect3027(EffectDef):
 
 
 class Effect3028(EffectDef):
+    """
+    eliteBonusCoverOpsBombEmDmg1
+
+    Used by:
+    Ship: Purifier
+    """
 
     type = 'passive'
 
@@ -5579,6 +9169,14 @@ class Effect3028(EffectDef):
 
 
 class Effect3029(EffectDef):
+    """
+    overloadSelfEmHardeningBonus
+
+    Used by:
+    Variations of module: Armor EM Hardener I (39 of 39)
+    Variations of module: EM Ward Field I (19 of 19)
+    Module: Civilian EM Ward Field
+    """
 
     type = 'overheat'
 
@@ -5588,6 +9186,14 @@ class Effect3029(EffectDef):
 
 
 class Effect3030(EffectDef):
+    """
+    overloadSelfThermalHardeningBonus
+
+    Used by:
+    Variations of module: Armor Thermal Hardener I (39 of 39)
+    Variations of module: Thermal Dissipation Field I (19 of 19)
+    Module: Civilian Thermal Dissipation Field
+    """
 
     type = 'overheat'
 
@@ -5597,6 +9203,14 @@ class Effect3030(EffectDef):
 
 
 class Effect3031(EffectDef):
+    """
+    overloadSelfExplosiveHardeningBonus
+
+    Used by:
+    Variations of module: Armor Explosive Hardener I (39 of 39)
+    Variations of module: Explosive Deflection Field I (19 of 19)
+    Module: Civilian Explosive Deflection Field
+    """
 
     type = 'overheat'
 
@@ -5606,6 +9220,14 @@ class Effect3031(EffectDef):
 
 
 class Effect3032(EffectDef):
+    """
+    overloadSelfKineticHardeningBonus
+
+    Used by:
+    Variations of module: Armor Kinetic Hardener I (39 of 39)
+    Variations of module: Kinetic Deflection Field I (19 of 19)
+    Module: Civilian Kinetic Deflection Field
+    """
 
     type = 'overheat'
 
@@ -5615,6 +9237,13 @@ class Effect3032(EffectDef):
 
 
 class Effect3035(EffectDef):
+    """
+    overloadSelfHardeningInvulnerabilityBonus
+
+    Used by:
+    Modules named like: Capital Flex Hardener (9 of 9)
+    Variations of module: Adaptive Invulnerability Field I (17 of 17)
+    """
 
     type = 'overheat'
 
@@ -5626,6 +9255,12 @@ class Effect3035(EffectDef):
 
 
 class Effect3036(EffectDef):
+    """
+    skillBombDeploymentModuleReactivationDelayBonus
+
+    Used by:
+    Skill: Bomb Deployment
+    """
 
     type = 'passive'
 
@@ -5636,6 +9271,12 @@ class Effect3036(EffectDef):
 
 
 class Effect3046(EffectDef):
+    """
+    modifyMaxVelocityOfShipPassive
+
+    Used by:
+    Modules from group: Expanded Cargohold (7 of 7)
+    """
 
     type = 'passive'
 
@@ -5645,6 +9286,12 @@ class Effect3046(EffectDef):
 
 
 class Effect3047(EffectDef):
+    """
+    structureHPMultiplyPassive
+
+    Used by:
+    Modules from group: Expanded Cargohold (7 of 7)
+    """
 
     type = 'passive'
 
@@ -5654,6 +9301,12 @@ class Effect3047(EffectDef):
 
 
 class Effect3061(EffectDef):
+    """
+    heatDamageBonus
+
+    Used by:
+    Modules from group: Shield Boost Amplifier (25 of 25)
+    """
 
     type = 'passive'
 
@@ -5664,6 +9317,12 @@ class Effect3061(EffectDef):
 
 
 class Effect3169(EffectDef):
+    """
+    shieldTransportCpuNeedBonusEffect
+
+    Used by:
+    Ships from group: Logistics (3 of 7)
+    """
 
     type = 'passive'
 
@@ -5674,6 +9333,14 @@ class Effect3169(EffectDef):
 
 
 class Effect3172(EffectDef):
+    """
+    droneArmorDamageBonusEffect
+
+    Used by:
+    Ships from group: Logistics (6 of 7)
+    Ship: Exequror
+    Ship: Scythe
+    """
 
     type = 'passive'
 
@@ -5686,6 +9353,14 @@ class Effect3172(EffectDef):
 
 
 class Effect3173(EffectDef):
+    """
+    droneShieldBonusBonusEffect
+
+    Used by:
+    Ships from group: Logistics (6 of 7)
+    Ship: Exequror
+    Ship: Scythe
+    """
 
     type = 'passive'
 
@@ -5698,6 +9373,14 @@ class Effect3173(EffectDef):
 
 
 class Effect3174(EffectDef):
+    """
+    overloadSelfRangeBonus
+
+    Used by:
+    Modules from group: Stasis Grappler (7 of 7)
+    Modules from group: Stasis Web (19 of 19)
+    Modules from group: Warp Scrambler (54 of 55)
+    """
 
     type = 'overheat'
 
@@ -5708,6 +9391,12 @@ class Effect3174(EffectDef):
 
 
 class Effect3175(EffectDef):
+    """
+    overloadSelfSpeedBonus
+
+    Used by:
+    Modules from group: Propulsion Module (133 of 133)
+    """
 
     type = 'overheat'
 
@@ -5718,6 +9407,13 @@ class Effect3175(EffectDef):
 
 
 class Effect3182(EffectDef):
+    """
+    overloadSelfECMStrenghtBonus
+
+    Used by:
+    Modules from group: Burst Jammer (11 of 11)
+    Modules from group: ECM (39 of 39)
+    """
 
     type = 'overheat'
 
@@ -5731,6 +9427,12 @@ class Effect3182(EffectDef):
 
 
 class Effect3196(EffectDef):
+    """
+    thermodynamicsSkillDamageBonus
+
+    Used by:
+    Skill: Thermodynamics
+    """
 
     type = 'passive'
 
@@ -5741,6 +9443,13 @@ class Effect3196(EffectDef):
 
 
 class Effect3200(EffectDef):
+    """
+    overloadSelfArmorDamageAmountDurationBonus
+
+    Used by:
+    Modules from group: Ancillary Armor Repairer (7 of 7)
+    Modules from group: Armor Repair Unit (108 of 108)
+    """
 
     type = 'overheat'
 
@@ -5752,6 +9461,13 @@ class Effect3200(EffectDef):
 
 
 class Effect3201(EffectDef):
+    """
+    overloadSelfShieldBonusDurationBonus
+
+    Used by:
+    Modules from group: Ancillary Shield Booster (8 of 8)
+    Modules from group: Shield Booster (97 of 97)
+    """
 
     type = 'overheat'
 
@@ -5762,6 +9478,12 @@ class Effect3201(EffectDef):
 
 
 class Effect3212(EffectDef):
+    """
+    missileSkillFoFAoeCloudSizeBonus
+
+    Used by:
+    Implants named like: Zainou 'Snapshot' Auto Targeting Explosion Radius FR (6 of 6)
+    """
 
     type = 'passive'
 
@@ -5773,6 +9495,13 @@ class Effect3212(EffectDef):
 
 
 class Effect3234(EffectDef):
+    """
+    shipRocketExplosiveDmgAF
+
+    Used by:
+    Ship: Anathema
+    Ship: Vengeance
+    """
 
     type = 'passive'
 
@@ -5783,6 +9512,13 @@ class Effect3234(EffectDef):
 
 
 class Effect3235(EffectDef):
+    """
+    shipRocketKineticDmgAF
+
+    Used by:
+    Ship: Anathema
+    Ship: Vengeance
+    """
 
     type = 'passive'
 
@@ -5793,6 +9529,13 @@ class Effect3235(EffectDef):
 
 
 class Effect3236(EffectDef):
+    """
+    shipRocketThermalDmgAF
+
+    Used by:
+    Ship: Anathema
+    Ship: Vengeance
+    """
 
     type = 'passive'
 
@@ -5803,6 +9546,13 @@ class Effect3236(EffectDef):
 
 
 class Effect3237(EffectDef):
+    """
+    shipRocketEmDmgAF
+
+    Used by:
+    Ship: Anathema
+    Ship: Vengeance
+    """
 
     type = 'passive'
 
@@ -5813,6 +9563,12 @@ class Effect3237(EffectDef):
 
 
 class Effect3241(EffectDef):
+    """
+    eliteBonusGunshipArmorEmResistance1
+
+    Used by:
+    Ship: Vengeance
+    """
 
     type = 'passive'
 
@@ -5823,6 +9579,12 @@ class Effect3241(EffectDef):
 
 
 class Effect3242(EffectDef):
+    """
+    eliteBonusGunshipArmorThermalResistance1
+
+    Used by:
+    Ship: Vengeance
+    """
 
     type = 'passive'
 
@@ -5833,6 +9595,12 @@ class Effect3242(EffectDef):
 
 
 class Effect3243(EffectDef):
+    """
+    eliteBonusGunshipArmorKineticResistance1
+
+    Used by:
+    Ship: Vengeance
+    """
 
     type = 'passive'
 
@@ -5843,6 +9611,12 @@ class Effect3243(EffectDef):
 
 
 class Effect3244(EffectDef):
+    """
+    eliteBonusGunshipArmorExplosiveResistance1
+
+    Used by:
+    Ship: Vengeance
+    """
 
     type = 'passive'
 
@@ -5853,6 +9627,12 @@ class Effect3244(EffectDef):
 
 
 class Effect3249(EffectDef):
+    """
+    shipCapRecharge2AF
+
+    Used by:
+    Ship: Anathema
+    """
 
     type = 'passive'
 
@@ -5862,6 +9642,12 @@ class Effect3249(EffectDef):
 
 
 class Effect3264(EffectDef):
+    """
+    skillIndustrialReconfigurationConsumptionQuantityBonus
+
+    Used by:
+    Skill: Industrial Reconfiguration
+    """
 
     type = 'passive'
 
@@ -5873,6 +9659,12 @@ class Effect3264(EffectDef):
 
 
 class Effect3267(EffectDef):
+    """
+    shipConsumptionQuantityBonusIndustrialReconfigurationORECapital1
+
+    Used by:
+    Ship: Rorqual
+    """
 
     type = 'passive'
 
@@ -5884,6 +9676,12 @@ class Effect3267(EffectDef):
 
 
 class Effect3297(EffectDef):
+    """
+    shipEnergyNeutralizerTransferAmountBonusAB
+
+    Used by:
+    Ship: Bhaalgorn
+    """
 
     type = 'passive'
 
@@ -5895,6 +9693,13 @@ class Effect3297(EffectDef):
 
 
 class Effect3298(EffectDef):
+    """
+    shipEnergyNeutralizerTransferAmountBonusAC
+
+    Used by:
+    Ship: Ashimmu
+    Ship: Vangel
+    """
 
     type = 'passive'
 
@@ -5906,6 +9711,14 @@ class Effect3298(EffectDef):
 
 
 class Effect3299(EffectDef):
+    """
+    shipEnergyNeutralizerTransferAmountBonusAF
+
+    Used by:
+    Ship: Caedes
+    Ship: Cruor
+    Ship: Sentinel
+    """
 
     type = 'passive'
 
@@ -5917,6 +9730,12 @@ class Effect3299(EffectDef):
 
 
 class Effect3313(EffectDef):
+    """
+    cloneVatMaxJumpCloneBonusSkillNew
+
+    Used by:
+    Skill: Cloning Facility Operation
+    """
 
     type = 'passive'
 
@@ -5926,6 +9745,12 @@ class Effect3313(EffectDef):
 
 
 class Effect3331(EffectDef):
+    """
+    eliteBonusCommandShipArmorHP1
+
+    Used by:
+    Ship: Damnation
+    """
 
     type = 'passive'
 
@@ -5935,6 +9760,12 @@ class Effect3331(EffectDef):
 
 
 class Effect3335(EffectDef):
+    """
+    shipArmorEmResistanceMC2
+
+    Used by:
+    Ship: Mimir
+    """
 
     type = 'passive'
 
@@ -5944,6 +9775,12 @@ class Effect3335(EffectDef):
 
 
 class Effect3336(EffectDef):
+    """
+    shipArmorExplosiveResistanceMC2
+
+    Used by:
+    Ship: Mimir
+    """
 
     type = 'passive'
 
@@ -5954,6 +9791,12 @@ class Effect3336(EffectDef):
 
 
 class Effect3339(EffectDef):
+    """
+    shipArmorKineticResistanceMC2
+
+    Used by:
+    Ship: Mimir
+    """
 
     type = 'passive'
 
@@ -5964,6 +9807,12 @@ class Effect3339(EffectDef):
 
 
 class Effect3340(EffectDef):
+    """
+    shipArmorThermalResistanceMC2
+
+    Used by:
+    Ship: Mimir
+    """
 
     type = 'passive'
 
@@ -5974,6 +9823,12 @@ class Effect3340(EffectDef):
 
 
 class Effect3343(EffectDef):
+    """
+    eliteBonusHeavyInterdictorsProjectileFalloff1
+
+    Used by:
+    Ship: Broadsword
+    """
 
     type = 'passive'
 
@@ -5985,6 +9840,12 @@ class Effect3343(EffectDef):
 
 
 class Effect3355(EffectDef):
+    """
+    eliteBonusHeavyInterdictorHeavyMissileVelocityBonus1
+
+    Used by:
+    Ship: Onyx
+    """
 
     type = 'passive'
 
@@ -5996,6 +9857,12 @@ class Effect3355(EffectDef):
 
 
 class Effect3356(EffectDef):
+    """
+    eliteBonusHeavyInterdictorHeavyAssaultMissileVelocityBonus
+
+    Used by:
+    Ship: Onyx
+    """
 
     type = 'passive'
 
@@ -6007,6 +9874,12 @@ class Effect3356(EffectDef):
 
 
 class Effect3357(EffectDef):
+    """
+    eliteBonusHeavyInterdictorLightMissileVelocityBonus
+
+    Used by:
+    Ship: Onyx
+    """
 
     type = 'passive'
 
@@ -6018,6 +9891,13 @@ class Effect3357(EffectDef):
 
 
 class Effect3366(EffectDef):
+    """
+    shipRemoteSensorDampenerCapNeedGF
+
+    Used by:
+    Ship: Keres
+    Ship: Maulus
+    """
 
     type = 'passive'
 
@@ -6028,6 +9908,12 @@ class Effect3366(EffectDef):
 
 
 class Effect3367(EffectDef):
+    """
+    eliteBonusElectronicAttackShipWarpScramblerMaxRange1
+
+    Used by:
+    Ship: Keres
+    """
 
     type = 'passive'
 
@@ -6039,6 +9925,12 @@ class Effect3367(EffectDef):
 
 
 class Effect3369(EffectDef):
+    """
+    eliteBonusElectronicAttackShipECMOptimalRange1
+
+    Used by:
+    Ship: Kitsune
+    """
 
     type = 'passive'
 
@@ -6050,6 +9942,12 @@ class Effect3369(EffectDef):
 
 
 class Effect3370(EffectDef):
+    """
+    eliteBonusElectronicAttackShipStasisWebMaxRange1
+
+    Used by:
+    Ship: Hyena
+    """
 
     type = 'passive'
 
@@ -6061,6 +9959,12 @@ class Effect3370(EffectDef):
 
 
 class Effect3371(EffectDef):
+    """
+    eliteBonusElectronicAttackShipWarpScramblerCapNeed2
+
+    Used by:
+    Ship: Keres
+    """
 
     type = 'passive'
 
@@ -6072,6 +9976,12 @@ class Effect3371(EffectDef):
 
 
 class Effect3374(EffectDef):
+    """
+    eliteBonusElectronicAttackShipSignatureRadius2
+
+    Used by:
+    Ship: Hyena
+    """
 
     type = 'passive'
 
@@ -6082,6 +9992,12 @@ class Effect3374(EffectDef):
 
 
 class Effect3379(EffectDef):
+    """
+    implantHardwiringABcapacitorNeed
+
+    Used by:
+    Implants named like: Eifyr and Co. 'Rogue' Fuel Conservation FC (6 of 6)
+    """
 
     type = 'passive'
 
@@ -6092,6 +10008,12 @@ class Effect3379(EffectDef):
 
 
 class Effect3380(EffectDef):
+    """
+    warpDisruptSphere
+
+    Used by:
+    Modules from group: Warp Disrupt Field Generator (7 of 7)
+    """
 
     runTime = 'early'
     type = 'projected', 'active'
@@ -6120,6 +10042,12 @@ class Effect3380(EffectDef):
 
 
 class Effect3392(EffectDef):
+    """
+    eliteBonusBlackOpsLargeEnergyTurretTracking1
+
+    Used by:
+    Ship: Redeemer
+    """
 
     type = 'passive'
 
@@ -6130,6 +10058,12 @@ class Effect3392(EffectDef):
 
 
 class Effect3403(EffectDef):
+    """
+    eliteBonusBlackOpsCloakVelocity2
+
+    Used by:
+    Ships from group: Black Ops (5 of 5)
+    """
 
     type = 'passive'
 
@@ -6140,6 +10074,12 @@ class Effect3403(EffectDef):
 
 
 class Effect3406(EffectDef):
+    """
+    eliteBonusBlackOpsMaxVelocity1
+
+    Used by:
+    Ship: Panther
+    """
 
     type = 'passive'
 
@@ -6149,6 +10089,12 @@ class Effect3406(EffectDef):
 
 
 class Effect3415(EffectDef):
+    """
+    eliteBonusViolatorsLargeEnergyTurretDamageRole1
+
+    Used by:
+    Ship: Paladin
+    """
 
     type = 'passive'
 
@@ -6159,6 +10105,12 @@ class Effect3415(EffectDef):
 
 
 class Effect3416(EffectDef):
+    """
+    eliteBonusViolatorsLargeHybridTurretDamageRole1
+
+    Used by:
+    Ship: Kronos
+    """
 
     type = 'passive'
 
@@ -6169,6 +10121,12 @@ class Effect3416(EffectDef):
 
 
 class Effect3417(EffectDef):
+    """
+    eliteBonusViolatorsLargeProjectileTurretDamageRole1
+
+    Used by:
+    Ship: Vargur
+    """
 
     type = 'passive'
 
@@ -6179,6 +10137,12 @@ class Effect3417(EffectDef):
 
 
 class Effect3424(EffectDef):
+    """
+    eliteBonusViolatorsLargeHybridTurretTracking1
+
+    Used by:
+    Ship: Kronos
+    """
 
     type = 'passive'
 
@@ -6189,6 +10153,12 @@ class Effect3424(EffectDef):
 
 
 class Effect3425(EffectDef):
+    """
+    eliteBonusViolatorsLargeProjectileTurretTracking1
+
+    Used by:
+    Ship: Vargur
+    """
 
     type = 'passive'
 
@@ -6199,6 +10169,12 @@ class Effect3425(EffectDef):
 
 
 class Effect3427(EffectDef):
+    """
+    eliteBonusViolatorsTractorBeamMaxRangeRole2
+
+    Used by:
+    Ships from group: Marauder (4 of 4)
+    """
 
     type = 'passive'
 
@@ -6209,6 +10185,12 @@ class Effect3427(EffectDef):
 
 
 class Effect3439(EffectDef):
+    """
+    eliteBonusViolatorsEwTargetPainting1
+
+    Used by:
+    Ship: Golem
+    """
 
     type = 'passive'
 
@@ -6220,6 +10202,13 @@ class Effect3439(EffectDef):
 
 
 class Effect3447(EffectDef):
+    """
+    shipBonusPTFalloffMB1
+
+    Used by:
+    Ship: Marshal
+    Ship: Vargur
+    """
 
     type = 'passive'
 
@@ -6230,6 +10219,12 @@ class Effect3447(EffectDef):
 
 
 class Effect3466(EffectDef):
+    """
+    eliteBonusElectronicAttackShipRechargeRate2
+
+    Used by:
+    Ship: Sentinel
+    """
 
     type = 'passive'
 
@@ -6240,6 +10235,12 @@ class Effect3466(EffectDef):
 
 
 class Effect3467(EffectDef):
+    """
+    eliteBonusElectronicAttackShipCapacitorCapacity2
+
+    Used by:
+    Ship: Kitsune
+    """
 
     type = 'passive'
 
@@ -6250,6 +10251,12 @@ class Effect3467(EffectDef):
 
 
 class Effect3468(EffectDef):
+    """
+    eliteBonusHeavyInterdictorsWarpDisruptFieldGeneratorWarpScrambleRange2
+
+    Used by:
+    Ships from group: Heavy Interdiction Cruiser (5 of 5)
+    """
 
     type = 'passive'
 
@@ -6261,6 +10268,12 @@ class Effect3468(EffectDef):
 
 
 class Effect3473(EffectDef):
+    """
+    eliteBonusViolatorsTractorBeamMaxTractorVelocityRole3
+
+    Used by:
+    Ships from group: Marauder (4 of 4)
+    """
 
     type = 'passive'
 
@@ -6271,6 +10284,13 @@ class Effect3473(EffectDef):
 
 
 class Effect3478(EffectDef):
+    """
+    shipLaserDamagePirateBattleship
+
+    Used by:
+    Ship: Bhaalgorn
+    Ship: Nightmare
+    """
 
     type = 'passive'
 
@@ -6281,6 +10301,12 @@ class Effect3478(EffectDef):
 
 
 class Effect3480(EffectDef):
+    """
+    shipTrackingBonusAB
+
+    Used by:
+    Ship: Nightmare
+    """
 
     type = 'passive'
 
@@ -6291,6 +10317,15 @@ class Effect3480(EffectDef):
 
 
 class Effect3483(EffectDef):
+    """
+    shipBonusMediumEnergyTurretDamagePirateFaction
+
+    Used by:
+    Ship: Ashimmu
+    Ship: Fiend
+    Ship: Gnosis
+    Ship: Phantasm
+    """
 
     type = 'passive'
 
@@ -6301,6 +10336,13 @@ class Effect3483(EffectDef):
 
 
 class Effect3484(EffectDef):
+    """
+    shipBonusMediumEnergyTurretTrackingAC2
+
+    Used by:
+    Ship: Fiend
+    Ship: Phantasm
+    """
 
     type = 'passive'
 
@@ -6311,6 +10353,17 @@ class Effect3484(EffectDef):
 
 
 class Effect3487(EffectDef):
+    """
+    shipBonusSmallEnergyTurretDamagePirateFaction
+
+    Used by:
+    Ship: Caedes
+    Ship: Confessor
+    Ship: Cruor
+    Ship: Imp
+    Ship: Succubus
+    Ship: Sunesis
+    """
 
     type = 'passive'
 
@@ -6321,6 +10374,13 @@ class Effect3487(EffectDef):
 
 
 class Effect3489(EffectDef):
+    """
+    shipBonusSmallEnergyTurretTracking2AF
+
+    Used by:
+    Ship: Imp
+    Ship: Succubus
+    """
 
     type = 'passive'
 
@@ -6331,6 +10391,12 @@ class Effect3489(EffectDef):
 
 
 class Effect3493(EffectDef):
+    """
+    rorqualCargoScanRangeBonus
+
+    Used by:
+    Ship: Rorqual
+    """
 
     type = 'passive'
 
@@ -6341,6 +10407,12 @@ class Effect3493(EffectDef):
 
 
 class Effect3494(EffectDef):
+    """
+    rorqualSurveyScannerRangeBonus
+
+    Used by:
+    Ship: Rorqual
+    """
 
     type = 'passive'
 
@@ -6351,6 +10423,16 @@ class Effect3494(EffectDef):
 
 
 class Effect3495(EffectDef):
+    """
+    shipCapPropulsionJamming
+
+    Used by:
+    Ships from group: Interceptor (10 of 10)
+    Ship: Atron
+    Ship: Condor
+    Ship: Executioner
+    Ship: Slasher
+    """
 
     type = 'passive'
 
@@ -6362,6 +10444,12 @@ class Effect3495(EffectDef):
 
 
 class Effect3496(EffectDef):
+    """
+    setBonusThukker
+
+    Used by:
+    Implants named like: grade Nomad (12 of 12)
+    """
 
     runTime = 'early'
     type = 'passive'
@@ -6373,6 +10461,12 @@ class Effect3496(EffectDef):
 
 
 class Effect3498(EffectDef):
+    """
+    setBonusSisters
+
+    Used by:
+    Implants named like: grade Virtue (12 of 12)
+    """
 
     runTime = 'early'
     type = 'passive'
@@ -6384,6 +10478,12 @@ class Effect3498(EffectDef):
 
 
 class Effect3499(EffectDef):
+    """
+    setBonusSyndicate
+
+    Used by:
+    Implants named like: grade Edge (12 of 12)
+    """
 
     runTime = 'early'
     type = 'passive'
@@ -6396,6 +10496,12 @@ class Effect3499(EffectDef):
 
 
 class Effect3513(EffectDef):
+    """
+    setBonusMordus
+
+    Used by:
+    Implants named like: grade Centurion (12 of 12)
+    """
 
     runTime = 'early'
     type = 'passive'
@@ -6407,6 +10513,12 @@ class Effect3513(EffectDef):
 
 
 class Effect3514(EffectDef):
+    """
+    Interceptor2WarpScrambleRange
+
+    Used by:
+    Ships from group: Interceptor (6 of 10)
+    """
 
     type = 'passive'
 
@@ -6417,6 +10529,12 @@ class Effect3514(EffectDef):
 
 
 class Effect3519(EffectDef):
+    """
+    weaponUpgradesCpuNeedBonusPostPercentCpuLocationShipModulesRequiringBombLauncher
+
+    Used by:
+    Skill: Weapon Upgrades
+    """
 
     type = 'passive'
 
@@ -6427,6 +10545,12 @@ class Effect3519(EffectDef):
 
 
 class Effect3520(EffectDef):
+    """
+    skillAdvancedWeaponUpgradesPowerNeedBonusBombLaunchers
+
+    Used by:
+    Skill: Advanced Weapon Upgrades
+    """
 
     type = 'passive'
 
@@ -6437,6 +10561,13 @@ class Effect3520(EffectDef):
 
 
 class Effect3526(EffectDef):
+    """
+    cynosuralTheoryConsumptionBonus
+
+    Used by:
+    Ships from group: Force Recon Ship (8 of 9)
+    Skill: Cynosural Field Theory
+    """
 
     type = 'passive'
 
@@ -6449,6 +10580,12 @@ class Effect3526(EffectDef):
 
 
 class Effect3530(EffectDef):
+    """
+    eliteBonusBlackOpsAgiliy1
+
+    Used by:
+    Ship: Sin
+    """
 
     type = 'passive'
 
@@ -6458,6 +10595,12 @@ class Effect3530(EffectDef):
 
 
 class Effect3532(EffectDef):
+    """
+    skillJumpDriveConsumptionAmountBonusPercentage
+
+    Used by:
+    Skill: Jump Fuel Conservation
+    """
 
     type = 'passive'
 
@@ -6468,6 +10611,13 @@ class Effect3532(EffectDef):
 
 
 class Effect3561(EffectDef):
+    """
+    ewSkillTrackingDisruptionTrackingSpeedBonus
+
+    Used by:
+    Modules named like: Tracking Diagnostic Subroutines (8 of 8)
+    Skill: Weapon Destabilization
+    """
 
     type = 'passive'
 
@@ -6480,6 +10630,12 @@ class Effect3561(EffectDef):
 
 
 class Effect3568(EffectDef):
+    """
+    eliteBonusLogisticsTrackingLinkMaxRangeBonus1
+
+    Used by:
+    Ship: Scimitar
+    """
 
     type = 'passive'
 
@@ -6491,6 +10647,12 @@ class Effect3568(EffectDef):
 
 
 class Effect3569(EffectDef):
+    """
+    eliteBonusLogisticsTrackingLinkMaxRangeBonus2
+
+    Used by:
+    Ship: Oneiros
+    """
 
     type = 'passive'
 
@@ -6502,6 +10664,12 @@ class Effect3569(EffectDef):
 
 
 class Effect3570(EffectDef):
+    """
+    eliteBonusLogisticsTrackingLinkTrackingSpeedBonus2
+
+    Used by:
+    Ship: Oneiros
+    """
 
     type = 'passive'
 
@@ -6513,6 +10681,12 @@ class Effect3570(EffectDef):
 
 
 class Effect3571(EffectDef):
+    """
+    eliteBonusLogisticsTrackingLinkTrackingSpeedBonus1
+
+    Used by:
+    Ship: Scimitar
+    """
 
     type = 'passive'
 
@@ -6524,6 +10698,13 @@ class Effect3571(EffectDef):
 
 
 class Effect3586(EffectDef):
+    """
+    ewSkillSignalSuppressionScanResolutionBonus
+
+    Used by:
+    Modules named like: Inverted Signal Field Projector (8 of 8)
+    Skill: Signal Suppression
+    """
 
     type = 'passive'
 
@@ -6538,6 +10719,12 @@ class Effect3586(EffectDef):
 
 
 class Effect3587(EffectDef):
+    """
+    shipBonusEwRemoteSensorDampenerMaxTargetRangeBonusGC2
+
+    Used by:
+    Variations of ship: Celestis (3 of 3)
+    """
 
     type = 'passive'
 
@@ -6549,6 +10736,13 @@ class Effect3587(EffectDef):
 
 
 class Effect3588(EffectDef):
+    """
+    shipBonusEwRemoteSensorDampenerMaxTargetRangeBonusGF2
+
+    Used by:
+    Ship: Keres
+    Ship: Maulus
+    """
 
     type = 'passive'
 
@@ -6560,6 +10754,13 @@ class Effect3588(EffectDef):
 
 
 class Effect3589(EffectDef):
+    """
+    shipBonusEwRemoteSensorDampenerScanResolutionBonusGF2
+
+    Used by:
+    Ship: Keres
+    Ship: Maulus
+    """
 
     type = 'passive'
 
@@ -6571,6 +10772,12 @@ class Effect3589(EffectDef):
 
 
 class Effect3590(EffectDef):
+    """
+    shipBonusEwRemoteSensorDampenerScanResolutionBonusGC2
+
+    Used by:
+    Variations of ship: Celestis (3 of 3)
+    """
 
     type = 'passive'
 
@@ -6582,6 +10789,13 @@ class Effect3590(EffectDef):
 
 
 class Effect3591(EffectDef):
+    """
+    ewSkillSignalSuppressionMaxTargetRangeBonus
+
+    Used by:
+    Modules named like: Inverted Signal Field Projector (8 of 8)
+    Skill: Signal Suppression
+    """
 
     type = 'passive'
 
@@ -6594,6 +10808,12 @@ class Effect3591(EffectDef):
 
 
 class Effect3592(EffectDef):
+    """
+    eliteBonusJumpFreighterHullHP1
+
+    Used by:
+    Ships from group: Jump Freighter (4 of 4)
+    """
 
     type = 'passive'
 
@@ -6603,6 +10823,12 @@ class Effect3592(EffectDef):
 
 
 class Effect3593(EffectDef):
+    """
+    eliteBonusJumpFreighterJumpDriveConsumptionAmount2
+
+    Used by:
+    Ships from group: Jump Freighter (4 of 4)
+    """
 
     type = 'passive'
 
@@ -6613,6 +10839,13 @@ class Effect3593(EffectDef):
 
 
 class Effect3597(EffectDef):
+    """
+    scriptSensorBoosterScanResolutionBonusBonus
+
+    Used by:
+    Charges from group: Sensor Booster Script (3 of 3)
+    Charges from group: Sensor Dampener Script (2 of 2)
+    """
 
     type = 'passive'
 
@@ -6622,6 +10855,13 @@ class Effect3597(EffectDef):
 
 
 class Effect3598(EffectDef):
+    """
+    scriptSensorBoosterMaxTargetRangeBonusBonus
+
+    Used by:
+    Charges from group: Sensor Booster Script (3 of 3)
+    Charges from group: Sensor Dampener Script (2 of 2)
+    """
 
     type = 'passive'
 
@@ -6631,6 +10871,13 @@ class Effect3598(EffectDef):
 
 
 class Effect3599(EffectDef):
+    """
+    scriptTrackingComputerTrackingSpeedBonusBonus
+
+    Used by:
+    Charges from group: Tracking Disruption Script (2 of 2)
+    Charges from group: Tracking Script (2 of 2)
+    """
 
     type = 'passive'
 
@@ -6640,6 +10887,13 @@ class Effect3599(EffectDef):
 
 
 class Effect3600(EffectDef):
+    """
+    scriptTrackingComputerMaxRangeBonusBonus
+
+    Used by:
+    Charges from group: Tracking Disruption Script (2 of 2)
+    Charges from group: Tracking Script (2 of 2)
+    """
 
     type = 'passive'
 
@@ -6649,6 +10903,12 @@ class Effect3600(EffectDef):
 
 
 class Effect3601(EffectDef):
+    """
+    scriptWarpDisruptionFieldGeneratorSetDisallowInEmpireSpace
+
+    Used by:
+    Charges from group: Warp Disruption Script (2 of 2)
+    """
 
     type = 'passive'
 
@@ -6658,6 +10918,12 @@ class Effect3601(EffectDef):
 
 
 class Effect3602(EffectDef):
+    """
+    scriptDurationBonus
+
+    Used by:
+    Charges from group: Warp Disruption Script (2 of 2)
+    """
 
     type = 'passive'
 
@@ -6667,6 +10933,12 @@ class Effect3602(EffectDef):
 
 
 class Effect3617(EffectDef):
+    """
+    scriptSignatureRadiusBonusBonus
+
+    Used by:
+    Charges from group: Warp Disruption Script (2 of 2)
+    """
 
     runTime = 'early'
     type = 'passive'
@@ -6677,6 +10949,12 @@ class Effect3617(EffectDef):
 
 
 class Effect3618(EffectDef):
+    """
+    scriptMassBonusPercentageBonus
+
+    Used by:
+    Charges from group: Warp Disruption Script (2 of 2)
+    """
 
     runTime = 'early'
     type = 'passive'
@@ -6687,6 +10965,12 @@ class Effect3618(EffectDef):
 
 
 class Effect3619(EffectDef):
+    """
+    scriptSpeedBoostFactorBonusBonus
+
+    Used by:
+    Charges from group: Warp Disruption Script (2 of 2)
+    """
 
     runTime = 'early'
     type = 'passive'
@@ -6697,6 +10981,12 @@ class Effect3619(EffectDef):
 
 
 class Effect3620(EffectDef):
+    """
+    scriptSpeedFactorBonusBonus
+
+    Used by:
+    Charges from group: Warp Disruption Script (2 of 2)
+    """
 
     runTime = 'early'
     type = 'passive'
@@ -6707,6 +10997,12 @@ class Effect3620(EffectDef):
 
 
 class Effect3648(EffectDef):
+    """
+    scriptWarpScrambleRangeBonus
+
+    Used by:
+    Charges from group: Warp Disruption Script (2 of 2)
+    """
 
     type = 'passive'
 
@@ -6716,6 +11012,12 @@ class Effect3648(EffectDef):
 
 
 class Effect3649(EffectDef):
+    """
+    eliteBonusViolatorsLargeEnergyTurretDamage1
+
+    Used by:
+    Ship: Paladin
+    """
 
     type = 'passive'
 
@@ -6727,6 +11029,12 @@ class Effect3649(EffectDef):
 
 
 class Effect3650(EffectDef):
+    """
+    ewGroupRsdMaxRangeBonus
+
+    Used by:
+    Implants named like: grade Centurion (10 of 12)
+    """
 
     type = 'passive'
 
@@ -6737,6 +11045,12 @@ class Effect3650(EffectDef):
 
 
 class Effect3651(EffectDef):
+    """
+    ewGroupTpMaxRangeBonus
+
+    Used by:
+    Implants named like: grade Centurion (10 of 12)
+    """
 
     type = 'passive'
 
@@ -6747,6 +11061,12 @@ class Effect3651(EffectDef):
 
 
 class Effect3652(EffectDef):
+    """
+    ewGroupTdMaxRangeBonus
+
+    Used by:
+    Implants named like: grade Centurion (10 of 12)
+    """
 
     type = 'passive'
 
@@ -6757,6 +11077,12 @@ class Effect3652(EffectDef):
 
 
 class Effect3653(EffectDef):
+    """
+    ewGroupEcmBurstMaxRangeBonus
+
+    Used by:
+    Implants named like: grade Centurion (10 of 12)
+    """
 
     type = 'passive'
 
@@ -6767,6 +11093,12 @@ class Effect3653(EffectDef):
 
 
 class Effect3655(EffectDef):
+    """
+    gunneryMaxRangeBonusOnline
+
+    Used by:
+    Modules from group: Tracking Enhancer (10 of 10)
+    """
 
     type = 'passive'
 
@@ -6778,6 +11110,12 @@ class Effect3655(EffectDef):
 
 
 class Effect3656(EffectDef):
+    """
+    gunneryTrackingSpeedBonusOnline
+
+    Used by:
+    Modules from group: Tracking Enhancer (10 of 10)
+    """
 
     type = 'passive'
 
@@ -6789,6 +11127,13 @@ class Effect3656(EffectDef):
 
 
 class Effect3657(EffectDef):
+    """
+    shipScanResolutionBonusOnline
+
+    Used by:
+    Modules from group: Signal Amplifier (7 of 7)
+    Structure Modules from group: Structure Signal Amplifier (2 of 2)
+    """
 
     type = 'passive'
 
@@ -6799,6 +11144,13 @@ class Effect3657(EffectDef):
 
 
 class Effect3659(EffectDef):
+    """
+    shipMaxTargetRangeBonusOnline
+
+    Used by:
+    Modules from group: Signal Amplifier (7 of 7)
+    Structure Modules from group: Structure Signal Amplifier (2 of 2)
+    """
 
     type = 'passive'
 
@@ -6809,6 +11161,13 @@ class Effect3659(EffectDef):
 
 
 class Effect3660(EffectDef):
+    """
+    shipMaxLockedTargetsBonusAddOnline
+
+    Used by:
+    Modules from group: Signal Amplifier (7 of 7)
+    Structure Modules from group: Structure Signal Amplifier (2 of 2)
+    """
 
     type = 'passive'
 
@@ -6818,6 +11177,12 @@ class Effect3660(EffectDef):
 
 
 class Effect3668(EffectDef):
+    """
+    miningLaserRangeBonus
+
+    Used by:
+    Implants named like: grade Harvest (10 of 12)
+    """
 
     type = 'passive'
 
@@ -6828,6 +11193,12 @@ class Effect3668(EffectDef):
 
 
 class Effect3669(EffectDef):
+    """
+    frequencyMiningLaserMaxRangeBonus
+
+    Used by:
+    Implants named like: grade Harvest (10 of 12)
+    """
 
     type = 'passive'
 
@@ -6838,6 +11209,12 @@ class Effect3669(EffectDef):
 
 
 class Effect3670(EffectDef):
+    """
+    stripMinerMaxRangeBonus
+
+    Used by:
+    Implants named like: grade Harvest (10 of 12)
+    """
 
     type = 'passive'
 
@@ -6848,6 +11225,12 @@ class Effect3670(EffectDef):
 
 
 class Effect3671(EffectDef):
+    """
+    gasHarvesterMaxRangeBonus
+
+    Used by:
+    Implants named like: grade Harvest (10 of 12)
+    """
 
     type = 'passive'
 
@@ -6858,6 +11241,12 @@ class Effect3671(EffectDef):
 
 
 class Effect3672(EffectDef):
+    """
+    setBonusOre
+
+    Used by:
+    Implants named like: grade Harvest (12 of 12)
+    """
 
     runTime = 'early'
     type = 'passive'
@@ -6869,6 +11258,13 @@ class Effect3672(EffectDef):
 
 
 class Effect3677(EffectDef):
+    """
+    shipBonusLargeEnergyTurretMaxRangeAB2
+
+    Used by:
+    Ship: Apocalypse
+    Ship: Apocalypse Navy Issue
+    """
 
     type = 'passive'
 
@@ -6879,6 +11275,13 @@ class Effect3677(EffectDef):
 
 
 class Effect3678(EffectDef):
+    """
+    eliteBonusJumpFreighterShieldHP1
+
+    Used by:
+    Ship: Nomad
+    Ship: Rhea
+    """
 
     type = 'passive'
 
@@ -6889,6 +11292,13 @@ class Effect3678(EffectDef):
 
 
 class Effect3679(EffectDef):
+    """
+    eliteBonusJumpFreighterArmorHP1
+
+    Used by:
+    Ship: Anshar
+    Ship: Ark
+    """
 
     type = 'passive'
 
@@ -6898,6 +11308,12 @@ class Effect3679(EffectDef):
 
 
 class Effect3680(EffectDef):
+    """
+    freighterAgilityBonusC1
+
+    Used by:
+    Ship: Rhea
+    """
 
     type = 'passive'
 
@@ -6907,6 +11323,12 @@ class Effect3680(EffectDef):
 
 
 class Effect3681(EffectDef):
+    """
+    freighterAgilityBonusM1
+
+    Used by:
+    Ship: Nomad
+    """
 
     type = 'passive'
 
@@ -6916,6 +11338,12 @@ class Effect3681(EffectDef):
 
 
 class Effect3682(EffectDef):
+    """
+    freighterAgilityBonusG1
+
+    Used by:
+    Ship: Anshar
+    """
 
     type = 'passive'
 
@@ -6925,6 +11353,12 @@ class Effect3682(EffectDef):
 
 
 class Effect3683(EffectDef):
+    """
+    freighterAgilityBonusA1
+
+    Used by:
+    Ship: Ark
+    """
 
     type = 'passive'
 
@@ -6934,6 +11368,13 @@ class Effect3683(EffectDef):
 
 
 class Effect3686(EffectDef):
+    """
+    scriptTrackingComputerFalloffBonusBonus
+
+    Used by:
+    Charges from group: Tracking Disruption Script (2 of 2)
+    Charges from group: Tracking Script (2 of 2)
+    """
 
     type = 'passive'
 
@@ -6943,6 +11384,12 @@ class Effect3686(EffectDef):
 
 
 class Effect3703(EffectDef):
+    """
+    shipMissileLauncherSpeedBonusMC2
+
+    Used by:
+    Ship: Bellicose
+    """
 
     type = 'passive'
 
@@ -6954,6 +11401,13 @@ class Effect3703(EffectDef):
 
 
 class Effect3705(EffectDef):
+    """
+    shipHybridTurretROFBonusGC2
+
+    Used by:
+    Ship: Exequror Navy Issue
+    Ship: Phobos
+    """
 
     type = 'passive'
 
@@ -6964,6 +11418,12 @@ class Effect3705(EffectDef):
 
 
 class Effect3706(EffectDef):
+    """
+    shipBonusProjectileTrackingMC2
+
+    Used by:
+    Ship: Stabber Fleet Issue
+    """
 
     type = 'passive'
 
@@ -6974,6 +11434,12 @@ class Effect3706(EffectDef):
 
 
 class Effect3726(EffectDef):
+    """
+    agilityMultiplierEffectPassive
+
+    Used by:
+    Modules named like: Polycarbon Engine Housing (8 of 8)
+    """
 
     type = 'passive'
 
@@ -6983,6 +11449,12 @@ class Effect3726(EffectDef):
 
 
 class Effect3727(EffectDef):
+    """
+    velocityBonusPassive
+
+    Used by:
+    Modules named like: Polycarbon Engine Housing (8 of 8)
+    """
 
     type = 'passive'
 
@@ -6993,6 +11465,12 @@ class Effect3727(EffectDef):
 
 
 class Effect3739(EffectDef):
+    """
+    zColinOrcaTractorRangeBonus
+
+    Used by:
+    Ships from group: Industrial Command Ship (2 of 2)
+    """
 
     type = 'passive'
 
@@ -7003,6 +11481,12 @@ class Effect3739(EffectDef):
 
 
 class Effect3740(EffectDef):
+    """
+    zColinOrcaTractorVelocityBonus
+
+    Used by:
+    Ships from group: Industrial Command Ship (2 of 2)
+    """
 
     type = 'passive'
 
@@ -7013,6 +11497,12 @@ class Effect3740(EffectDef):
 
 
 class Effect3742(EffectDef):
+    """
+    cargoAndOreHoldCapacityBonusICS1
+
+    Used by:
+    Ships from group: Industrial Command Ship (2 of 2)
+    """
 
     type = 'passive'
 
@@ -7028,6 +11518,12 @@ class Effect3742(EffectDef):
 
 
 class Effect3744(EffectDef):
+    """
+    miningForemanBurstBonusICS2
+
+    Used by:
+    Ships from group: Industrial Command Ship (2 of 2)
+    """
 
     type = 'passive'
 
@@ -7046,6 +11542,12 @@ class Effect3744(EffectDef):
 
 
 class Effect3745(EffectDef):
+    """
+    zColinOrcaSurveyScannerBonus
+
+    Used by:
+    Ships from group: Industrial Command Ship (2 of 2)
+    """
 
     type = 'passive'
 
@@ -7056,6 +11558,12 @@ class Effect3745(EffectDef):
 
 
 class Effect3765(EffectDef):
+    """
+    covertOpsStealthBomberSiegeMissileLauncherPowerNeedBonus
+
+    Used by:
+    Ships from group: Stealth Bomber (5 of 5)
+    """
 
     type = 'passive'
 
@@ -7066,6 +11574,12 @@ class Effect3765(EffectDef):
 
 
 class Effect3766(EffectDef):
+    """
+    interceptorMWDSignatureRadiusBonus
+
+    Used by:
+    Ships from group: Interceptor (10 of 10)
+    """
 
     type = 'passive'
 
@@ -7077,6 +11591,12 @@ class Effect3766(EffectDef):
 
 
 class Effect3767(EffectDef):
+    """
+    eliteBonusCommandShipsHeavyMissileExplosionVelocityCS2
+
+    Used by:
+    Ship: Claymore
+    """
 
     type = 'passive'
 
@@ -7088,6 +11608,12 @@ class Effect3767(EffectDef):
 
 
 class Effect3771(EffectDef):
+    """
+    armorHPBonusAddPassive
+
+    Used by:
+    Subsystems from group: Defensive Systems (9 of 12)
+    """
 
     type = 'passive'
 
@@ -7097,6 +11623,12 @@ class Effect3771(EffectDef):
 
 
 class Effect3773(EffectDef):
+    """
+    hardPointModifierEffect
+
+    Used by:
+    Subsystems from group: Offensive Systems (12 of 12)
+    """
 
     type = 'passive'
 
@@ -7107,6 +11639,12 @@ class Effect3773(EffectDef):
 
 
 class Effect3774(EffectDef):
+    """
+    slotModifier
+
+    Used by:
+    Items from category: Subsystem (48 of 48)
+    """
 
     type = 'passive'
 
@@ -7118,6 +11656,12 @@ class Effect3774(EffectDef):
 
 
 class Effect3782(EffectDef):
+    """
+    powerOutputAddPassive
+
+    Used by:
+    Subsystems from group: Offensive Systems (8 of 12)
+    """
 
     type = 'passive'
 
@@ -7127,6 +11671,12 @@ class Effect3782(EffectDef):
 
 
 class Effect3783(EffectDef):
+    """
+    cpuOutputAddCpuOutputPassive
+
+    Used by:
+    Subsystems from group: Offensive Systems (8 of 12)
+    """
 
     type = 'passive'
 
@@ -7136,6 +11686,12 @@ class Effect3783(EffectDef):
 
 
 class Effect3797(EffectDef):
+    """
+    droneBandwidthAddPassive
+
+    Used by:
+    Subsystems from group: Offensive Systems (12 of 12)
+    """
 
     type = 'passive'
 
@@ -7145,6 +11701,12 @@ class Effect3797(EffectDef):
 
 
 class Effect3799(EffectDef):
+    """
+    droneCapacityAdddroneCapacityPassive
+
+    Used by:
+    Subsystems from group: Offensive Systems (12 of 12)
+    """
 
     type = 'passive'
 
@@ -7154,6 +11716,12 @@ class Effect3799(EffectDef):
 
 
 class Effect3807(EffectDef):
+    """
+    maxTargetRangeAddPassive
+
+    Used by:
+    Subsystems named like: Propulsion Interdiction Nullifier (4 of 4)
+    """
 
     type = 'passive'
 
@@ -7163,6 +11731,13 @@ class Effect3807(EffectDef):
 
 
 class Effect3808(EffectDef):
+    """
+    signatureRadiusAddPassive
+
+    Used by:
+    Subsystems from group: Defensive Systems (8 of 12)
+    Subsystems named like: Propulsion Interdiction Nullifier (4 of 4)
+    """
 
     type = 'passive'
 
@@ -7172,6 +11747,13 @@ class Effect3808(EffectDef):
 
 
 class Effect3810(EffectDef):
+    """
+    capacityAddPassive
+
+    Used by:
+    Subsystems named like: Defensive Covert Reconfiguration (4 of 4)
+    Subsystem: Legion Defensive - Nanobot Injector
+    """
 
     type = 'passive'
 
@@ -7181,6 +11763,12 @@ class Effect3810(EffectDef):
 
 
 class Effect3811(EffectDef):
+    """
+    capacitorCapacityAddPassive
+
+    Used by:
+    Items from category: Subsystem (20 of 48)
+    """
 
     type = 'passive'
 
@@ -7190,6 +11778,12 @@ class Effect3811(EffectDef):
 
 
 class Effect3831(EffectDef):
+    """
+    shieldCapacityAddPassive
+
+    Used by:
+    Subsystems from group: Defensive Systems (8 of 12)
+    """
 
     type = 'passive'
 
@@ -7199,6 +11793,12 @@ class Effect3831(EffectDef):
 
 
 class Effect3857(EffectDef):
+    """
+    subsystemBonusAmarrPropulsionMaxVelocity
+
+    Used by:
+    Subsystem: Legion Propulsion - Intercalated Nanofibers
+    """
 
     type = 'passive'
 
@@ -7209,6 +11809,12 @@ class Effect3857(EffectDef):
 
 
 class Effect3859(EffectDef):
+    """
+    subsystemBonusCaldariPropulsionMaxVelocity
+
+    Used by:
+    Subsystem: Tengu Propulsion - Chassis Optimization
+    """
 
     type = 'passive'
 
@@ -7219,6 +11825,12 @@ class Effect3859(EffectDef):
 
 
 class Effect3860(EffectDef):
+    """
+    subsystemBonusMinmatarPropulsionMaxVelocity
+
+    Used by:
+    Subsystem: Loki Propulsion - Intercalated Nanofibers
+    """
 
     type = 'passive'
 
@@ -7229,6 +11841,12 @@ class Effect3860(EffectDef):
 
 
 class Effect3861(EffectDef):
+    """
+    subsystemBonusMinmatarPropulsionAfterburnerSpeedFactor
+
+    Used by:
+    Subsystem: Loki Propulsion - Wake Limiter
+    """
 
     type = 'passive'
 
@@ -7240,6 +11858,12 @@ class Effect3861(EffectDef):
 
 
 class Effect3863(EffectDef):
+    """
+    subsystemBonusCaldariPropulsionAfterburnerSpeedFactor
+
+    Used by:
+    Subsystem: Tengu Propulsion - Fuel Catalyst
+    """
 
     type = 'passive'
 
@@ -7251,6 +11875,12 @@ class Effect3863(EffectDef):
 
 
 class Effect3864(EffectDef):
+    """
+    subsystemBonusAmarrPropulsionAfterburnerSpeedFactor
+
+    Used by:
+    Subsystem: Legion Propulsion - Wake Limiter
+    """
 
     type = 'passive'
 
@@ -7262,6 +11892,12 @@ class Effect3864(EffectDef):
 
 
 class Effect3865(EffectDef):
+    """
+    subsystemBonusAmarrPropulsion2Agility
+
+    Used by:
+    Subsystem: Legion Propulsion - Intercalated Nanofibers
+    """
 
     type = 'passive'
 
@@ -7272,6 +11908,12 @@ class Effect3865(EffectDef):
 
 
 class Effect3866(EffectDef):
+    """
+    subsystemBonusCaldariPropulsion2Agility
+
+    Used by:
+    Subsystem: Tengu Propulsion - Chassis Optimization
+    """
 
     type = 'passive'
 
@@ -7282,6 +11924,12 @@ class Effect3866(EffectDef):
 
 
 class Effect3867(EffectDef):
+    """
+    subsystemBonusGallentePropulsion2Agility
+
+    Used by:
+    Subsystem: Proteus Propulsion - Hyperspatial Optimization
+    """
 
     type = 'passive'
 
@@ -7292,6 +11940,12 @@ class Effect3867(EffectDef):
 
 
 class Effect3868(EffectDef):
+    """
+    subsystemBonusMinmatarPropulsion2Agility
+
+    Used by:
+    Subsystem: Loki Propulsion - Intercalated Nanofibers
+    """
 
     type = 'passive'
 
@@ -7302,6 +11956,12 @@ class Effect3868(EffectDef):
 
 
 class Effect3869(EffectDef):
+    """
+    subsystemBonusMinmatarPropulsion2MWDPenalty
+
+    Used by:
+    Subsystem: Loki Propulsion - Wake Limiter
+    """
 
     type = 'passive'
 
@@ -7313,6 +11973,12 @@ class Effect3869(EffectDef):
 
 
 class Effect3872(EffectDef):
+    """
+    subsystemBonusAmarrPropulsion2MWDPenalty
+
+    Used by:
+    Subsystem: Legion Propulsion - Wake Limiter
+    """
 
     type = 'passive'
 
@@ -7324,6 +11990,12 @@ class Effect3872(EffectDef):
 
 
 class Effect3875(EffectDef):
+    """
+    subsystemBonusGallentePropulsionABMWDCapNeed
+
+    Used by:
+    Subsystem: Proteus Propulsion - Localized Injectors
+    """
 
     type = 'passive'
 
@@ -7335,6 +12007,12 @@ class Effect3875(EffectDef):
 
 
 class Effect3893(EffectDef):
+    """
+    subsystemBonusMinmatarCoreScanStrengthLADAR
+
+    Used by:
+    Subsystem: Loki Core - Dissolution Sequencer
+    """
 
     type = 'passive'
 
@@ -7345,6 +12023,12 @@ class Effect3893(EffectDef):
 
 
 class Effect3895(EffectDef):
+    """
+    subsystemBonusGallenteCoreScanStrengthMagnetometric
+
+    Used by:
+    Subsystem: Proteus Core - Electronic Efficiency Gate
+    """
 
     type = 'passive'
 
@@ -7355,6 +12039,12 @@ class Effect3895(EffectDef):
 
 
 class Effect3897(EffectDef):
+    """
+    subsystemBonusCaldariCoreScanStrengthGravimetric
+
+    Used by:
+    Subsystem: Tengu Core - Electronic Efficiency Gate
+    """
 
     type = 'passive'
 
@@ -7364,6 +12054,12 @@ class Effect3897(EffectDef):
 
 
 class Effect3900(EffectDef):
+    """
+    subsystemBonusAmarrCoreScanStrengthRADAR
+
+    Used by:
+    Subsystem: Legion Core - Dissolution Sequencer
+    """
 
     type = 'passive'
 
@@ -7374,6 +12070,13 @@ class Effect3900(EffectDef):
 
 
 class Effect3959(EffectDef):
+    """
+    subsystemBonusAmarrDefensiveArmorRepairAmount
+
+    Used by:
+    Subsystem: Legion Defensive - Covert Reconfiguration
+    Subsystem: Legion Defensive - Nanobot Injector
+    """
 
     type = 'passive'
 
@@ -7385,6 +12088,13 @@ class Effect3959(EffectDef):
 
 
 class Effect3961(EffectDef):
+    """
+    subsystemBonusGallenteDefensiveArmorRepairAmount
+
+    Used by:
+    Subsystem: Proteus Defensive - Covert Reconfiguration
+    Subsystem: Proteus Defensive - Nanobot Injector
+    """
 
     type = 'passive'
 
@@ -7396,6 +12106,13 @@ class Effect3961(EffectDef):
 
 
 class Effect3962(EffectDef):
+    """
+    subsystemBonusMinmatarDefensiveShieldArmorRepairAmount
+
+    Used by:
+    Subsystem: Loki Defensive - Adaptive Defense Node
+    Subsystem: Loki Defensive - Covert Reconfiguration
+    """
 
     type = 'passive'
 
@@ -7410,6 +12127,13 @@ class Effect3962(EffectDef):
 
 
 class Effect3964(EffectDef):
+    """
+    subsystemBonusCaldariDefensiveShieldBoostAmount
+
+    Used by:
+    Subsystem: Tengu Defensive - Amplification Node
+    Subsystem: Tengu Defensive - Covert Reconfiguration
+    """
 
     type = 'passive'
 
@@ -7421,6 +12145,12 @@ class Effect3964(EffectDef):
 
 
 class Effect3976(EffectDef):
+    """
+    subsystemBonusCaldariDefensiveShieldHP
+
+    Used by:
+    Subsystem: Tengu Defensive - Supplemental Screening
+    """
 
     type = 'passive'
 
@@ -7431,6 +12161,12 @@ class Effect3976(EffectDef):
 
 
 class Effect3979(EffectDef):
+    """
+    subsystemBonusMinmatarDefensiveShieldArmorHP
+
+    Used by:
+    Subsystem: Loki Defensive - Augmented Durability
+    """
 
     type = 'passive'
 
@@ -7443,6 +12179,12 @@ class Effect3979(EffectDef):
 
 
 class Effect3980(EffectDef):
+    """
+    subsystemBonusGallenteDefensiveArmorHP
+
+    Used by:
+    Subsystem: Proteus Defensive - Augmented Plating
+    """
 
     type = 'passive'
 
@@ -7453,6 +12195,12 @@ class Effect3980(EffectDef):
 
 
 class Effect3982(EffectDef):
+    """
+    subsystemBonusAmarrDefensiveArmorHP
+
+    Used by:
+    Subsystem: Legion Defensive - Augmented Plating
+    """
 
     type = 'passive'
 
@@ -7463,6 +12211,12 @@ class Effect3982(EffectDef):
 
 
 class Effect3992(EffectDef):
+    """
+    systemShieldHP
+
+    Used by:
+    Celestials named like: Pulsar Effect Beacon Class (6 of 6)
+    """
 
     runTime = 'early'
     type = ('projected', 'passive')
@@ -7473,6 +12227,13 @@ class Effect3992(EffectDef):
 
 
 class Effect3993(EffectDef):
+    """
+    systemTargetingRange
+
+    Used by:
+    Celestials named like: Black Hole Effect Beacon Class (6 of 6)
+    Celestials named like: Magnetar Effect Beacon Class (6 of 6)
+    """
 
     runTime = 'early'
     type = ('projected', 'passive')
@@ -7484,6 +12245,13 @@ class Effect3993(EffectDef):
 
 
 class Effect3995(EffectDef):
+    """
+    systemSignatureRadius
+
+    Used by:
+    Celestials named like: Pulsar Effect Beacon Class (6 of 6)
+    Celestials named like: Wolf Rayet Effect Beacon Class (6 of 6)
+    """
 
     runTime = 'early'
     type = ('projected', 'passive')
@@ -7495,6 +12263,13 @@ class Effect3995(EffectDef):
 
 
 class Effect3996(EffectDef):
+    """
+    systemArmorEmResistance
+
+    Used by:
+    Celestials named like: Incursion Effect (2 of 2)
+    Celestials named like: Pulsar Effect Beacon Class (6 of 6)
+    """
 
     runTime = 'early'
     type = ('projected', 'passive')
@@ -7506,6 +12281,13 @@ class Effect3996(EffectDef):
 
 
 class Effect3997(EffectDef):
+    """
+    systemArmorExplosiveResistance
+
+    Used by:
+    Celestials named like: Incursion Effect (2 of 2)
+    Celestials named like: Pulsar Effect Beacon Class (6 of 6)
+    """
 
     runTime = 'early'
     type = ('projected', 'passive')
@@ -7518,6 +12300,13 @@ class Effect3997(EffectDef):
 
 
 class Effect3998(EffectDef):
+    """
+    systemArmorKineticResistance
+
+    Used by:
+    Celestials named like: Incursion Effect (2 of 2)
+    Celestials named like: Pulsar Effect Beacon Class (6 of 6)
+    """
 
     runTime = 'early'
     type = ('projected', 'passive')
@@ -7530,6 +12319,13 @@ class Effect3998(EffectDef):
 
 
 class Effect3999(EffectDef):
+    """
+    systemArmorThermalResistance
+
+    Used by:
+    Celestials named like: Incursion Effect (2 of 2)
+    Celestials named like: Pulsar Effect Beacon Class (6 of 6)
+    """
 
     runTime = 'early'
     type = ('projected', 'passive')
@@ -7542,6 +12338,12 @@ class Effect3999(EffectDef):
 
 
 class Effect4002(EffectDef):
+    """
+    systemMissileVelocity
+
+    Used by:
+    Celestials named like: Black Hole Effect Beacon Class (6 of 6)
+    """
 
     runTime = 'early'
     type = ('projected', 'passive')
@@ -7554,6 +12356,12 @@ class Effect4002(EffectDef):
 
 
 class Effect4003(EffectDef):
+    """
+    systemMaxVelocity
+
+    Used by:
+    Celestials named like: Black Hole Effect Beacon Class (6 of 6)
+    """
 
     runTime = 'early'
     type = ('projected', 'passive')
@@ -7565,6 +12373,12 @@ class Effect4003(EffectDef):
 
 
 class Effect4016(EffectDef):
+    """
+    systemDamageMultiplierGunnery
+
+    Used by:
+    Celestials named like: Magnetar Effect Beacon Class (6 of 6)
+    """
 
     runTime = 'early'
     type = ('projected', 'passive')
@@ -7577,6 +12391,12 @@ class Effect4016(EffectDef):
 
 
 class Effect4017(EffectDef):
+    """
+    systemDamageThermalMissiles
+
+    Used by:
+    Celestials named like: Magnetar Effect Beacon Class (6 of 6)
+    """
 
     runTime = 'early'
     type = ('projected', 'passive')
@@ -7589,6 +12409,12 @@ class Effect4017(EffectDef):
 
 
 class Effect4018(EffectDef):
+    """
+    systemDamageEmMissiles
+
+    Used by:
+    Celestials named like: Magnetar Effect Beacon Class (6 of 6)
+    """
 
     runTime = 'early'
     type = ('projected', 'passive')
@@ -7601,6 +12427,12 @@ class Effect4018(EffectDef):
 
 
 class Effect4019(EffectDef):
+    """
+    systemDamageExplosiveMissiles
+
+    Used by:
+    Celestials named like: Magnetar Effect Beacon Class (6 of 6)
+    """
 
     runTime = 'early'
     type = ('projected', 'passive')
@@ -7613,6 +12445,12 @@ class Effect4019(EffectDef):
 
 
 class Effect4020(EffectDef):
+    """
+    systemDamageKineticMissiles
+
+    Used by:
+    Celestials named like: Magnetar Effect Beacon Class (6 of 6)
+    """
 
     runTime = 'early'
     type = ('projected', 'passive')
@@ -7625,6 +12463,12 @@ class Effect4020(EffectDef):
 
 
 class Effect4021(EffectDef):
+    """
+    systemDamageDrones
+
+    Used by:
+    Celestials named like: Magnetar Effect Beacon Class (6 of 6)
+    """
 
     runTime = 'early'
     type = ('projected', 'passive')
@@ -7637,6 +12481,12 @@ class Effect4021(EffectDef):
 
 
 class Effect4022(EffectDef):
+    """
+    systemTracking
+
+    Used by:
+    Celestials named like: Magnetar Effect Beacon Class (6 of 6)
+    """
 
     runTime = 'early'
     type = ('projected', 'passive')
@@ -7649,6 +12499,12 @@ class Effect4022(EffectDef):
 
 
 class Effect4023(EffectDef):
+    """
+    systemAoeVelocity
+
+    Used by:
+    Celestials named like: Black Hole Effect Beacon Class (6 of 6)
+    """
 
     runTime = 'early'
     type = ('projected', 'passive')
@@ -7660,6 +12516,12 @@ class Effect4023(EffectDef):
 
 
 class Effect4033(EffectDef):
+    """
+    systemHeatDamage
+
+    Used by:
+    Celestials named like: Red Giant Beacon Class (6 of 6)
+    """
 
     runTime = 'early'
     type = ('projected', 'passive')
@@ -7671,6 +12533,12 @@ class Effect4033(EffectDef):
 
 
 class Effect4034(EffectDef):
+    """
+    systemOverloadArmor
+
+    Used by:
+    Celestials named like: Red Giant Beacon Class (6 of 6)
+    """
 
     runTime = 'early'
     type = ('projected', 'passive')
@@ -7682,6 +12550,12 @@ class Effect4034(EffectDef):
 
 
 class Effect4035(EffectDef):
+    """
+    systemOverloadDamageModifier
+
+    Used by:
+    Celestials named like: Red Giant Beacon Class (6 of 6)
+    """
 
     runTime = 'early'
     type = ('projected', 'passive')
@@ -7693,6 +12567,12 @@ class Effect4035(EffectDef):
 
 
 class Effect4036(EffectDef):
+    """
+    systemOverloadDurationBonus
+
+    Used by:
+    Celestials named like: Red Giant Beacon Class (6 of 6)
+    """
 
     runTime = 'early'
     type = ('projected', 'passive')
@@ -7704,6 +12584,12 @@ class Effect4036(EffectDef):
 
 
 class Effect4037(EffectDef):
+    """
+    systemOverloadEccmStrength
+
+    Used by:
+    Celestials named like: Red Giant Beacon Class (6 of 6)
+    """
 
     runTime = 'early'
     type = ('projected', 'passive')
@@ -7715,6 +12601,12 @@ class Effect4037(EffectDef):
 
 
 class Effect4038(EffectDef):
+    """
+    systemOverloadEcmStrength
+
+    Used by:
+    Celestials named like: Red Giant Beacon Class (6 of 6)
+    """
 
     runTime = 'early'
     type = ('projected', 'passive')
@@ -7726,6 +12618,12 @@ class Effect4038(EffectDef):
 
 
 class Effect4039(EffectDef):
+    """
+    systemOverloadHardening
+
+    Used by:
+    Celestials named like: Red Giant Beacon Class (6 of 6)
+    """
 
     runTime = 'early'
     type = ('projected', 'passive')
@@ -7737,6 +12635,12 @@ class Effect4039(EffectDef):
 
 
 class Effect4040(EffectDef):
+    """
+    systemOverloadRange
+
+    Used by:
+    Celestials named like: Red Giant Beacon Class (6 of 6)
+    """
 
     runTime = 'early'
     type = ('projected', 'passive')
@@ -7748,6 +12652,12 @@ class Effect4040(EffectDef):
 
 
 class Effect4041(EffectDef):
+    """
+    systemOverloadRof
+
+    Used by:
+    Celestials named like: Red Giant Beacon Class (6 of 6)
+    """
 
     runTime = 'early'
     type = ('projected', 'passive')
@@ -7759,6 +12669,12 @@ class Effect4041(EffectDef):
 
 
 class Effect4042(EffectDef):
+    """
+    systemOverloadSelfDuration
+
+    Used by:
+    Celestials named like: Red Giant Beacon Class (6 of 6)
+    """
 
     runTime = 'early'
     type = ('projected', 'passive')
@@ -7770,6 +12686,12 @@ class Effect4042(EffectDef):
 
 
 class Effect4043(EffectDef):
+    """
+    systemOverloadShieldBonus
+
+    Used by:
+    Celestials named like: Red Giant Beacon Class (6 of 6)
+    """
 
     runTime = 'early'
     type = ('projected', 'passive')
@@ -7781,6 +12703,12 @@ class Effect4043(EffectDef):
 
 
 class Effect4044(EffectDef):
+    """
+    systemOverloadSpeedFactor
+
+    Used by:
+    Celestials named like: Red Giant Beacon Class (6 of 6)
+    """
 
     runTime = 'early'
     type = ('projected', 'passive')
@@ -7792,6 +12720,12 @@ class Effect4044(EffectDef):
 
 
 class Effect4045(EffectDef):
+    """
+    systemSmartBombRange
+
+    Used by:
+    Celestials named like: Red Giant Beacon Class (6 of 6)
+    """
 
     runTime = 'early'
     type = ('projected', 'passive')
@@ -7803,6 +12737,12 @@ class Effect4045(EffectDef):
 
 
 class Effect4046(EffectDef):
+    """
+    systemSmartBombEmDamage
+
+    Used by:
+    Celestials named like: Red Giant Beacon Class (6 of 6)
+    """
 
     runTime = 'early'
     type = ('projected', 'passive')
@@ -7814,6 +12754,12 @@ class Effect4046(EffectDef):
 
 
 class Effect4047(EffectDef):
+    """
+    systemSmartBombThermalDamage
+
+    Used by:
+    Celestials named like: Red Giant Beacon Class (6 of 6)
+    """
 
     runTime = 'early'
     type = ('projected', 'passive')
@@ -7825,6 +12771,12 @@ class Effect4047(EffectDef):
 
 
 class Effect4048(EffectDef):
+    """
+    systemSmartBombKineticDamage
+
+    Used by:
+    Celestials named like: Red Giant Beacon Class (6 of 6)
+    """
 
     runTime = 'early'
     type = ('projected', 'passive')
@@ -7836,6 +12788,12 @@ class Effect4048(EffectDef):
 
 
 class Effect4049(EffectDef):
+    """
+    systemSmartBombExplosiveDamage
+
+    Used by:
+    Celestials named like: Red Giant Beacon Class (6 of 6)
+    """
 
     runTime = 'early'
     type = ('projected', 'passive')
@@ -7847,6 +12805,12 @@ class Effect4049(EffectDef):
 
 
 class Effect4054(EffectDef):
+    """
+    systemSmallEnergyDamage
+
+    Used by:
+    Celestials named like: Wolf Rayet Effect Beacon Class (6 of 6)
+    """
 
     runTime = 'early'
     type = ('projected', 'passive')
@@ -7859,6 +12823,12 @@ class Effect4054(EffectDef):
 
 
 class Effect4055(EffectDef):
+    """
+    systemSmallProjectileDamage
+
+    Used by:
+    Celestials named like: Wolf Rayet Effect Beacon Class (6 of 6)
+    """
 
     runTime = 'early'
     type = ('projected', 'passive')
@@ -7871,6 +12841,12 @@ class Effect4055(EffectDef):
 
 
 class Effect4056(EffectDef):
+    """
+    systemSmallHybridDamage
+
+    Used by:
+    Celestials named like: Wolf Rayet Effect Beacon Class (6 of 6)
+    """
 
     runTime = 'early'
     type = ('projected', 'passive')
@@ -7883,6 +12859,12 @@ class Effect4056(EffectDef):
 
 
 class Effect4057(EffectDef):
+    """
+    systemRocketEmDamage
+
+    Used by:
+    Celestials named like: Wolf Rayet Effect Beacon Class (6 of 6)
+    """
 
     runTime = 'early'
     type = ('projected', 'passive')
@@ -7895,6 +12877,12 @@ class Effect4057(EffectDef):
 
 
 class Effect4058(EffectDef):
+    """
+    systemRocketExplosiveDamage
+
+    Used by:
+    Celestials named like: Wolf Rayet Effect Beacon Class (6 of 6)
+    """
 
     runTime = 'early'
     type = ('projected', 'passive')
@@ -7907,6 +12895,12 @@ class Effect4058(EffectDef):
 
 
 class Effect4059(EffectDef):
+    """
+    systemRocketKineticDamage
+
+    Used by:
+    Celestials named like: Wolf Rayet Effect Beacon Class (6 of 6)
+    """
 
     runTime = 'early'
     type = ('projected', 'passive')
@@ -7919,6 +12913,12 @@ class Effect4059(EffectDef):
 
 
 class Effect4060(EffectDef):
+    """
+    systemRocketThermalDamage
+
+    Used by:
+    Celestials named like: Wolf Rayet Effect Beacon Class (6 of 6)
+    """
 
     runTime = 'early'
     type = ('projected', 'passive')
@@ -7931,6 +12931,12 @@ class Effect4060(EffectDef):
 
 
 class Effect4061(EffectDef):
+    """
+    systemStandardMissileThermalDamage
+
+    Used by:
+    Celestials named like: Wolf Rayet Effect Beacon Class (6 of 6)
+    """
 
     runTime = 'early'
     type = ('projected', 'passive')
@@ -7943,6 +12949,12 @@ class Effect4061(EffectDef):
 
 
 class Effect4062(EffectDef):
+    """
+    systemStandardMissileEmDamage
+
+    Used by:
+    Celestials named like: Wolf Rayet Effect Beacon Class (6 of 6)
+    """
 
     runTime = 'early'
     type = ('projected', 'passive')
@@ -7955,6 +12967,12 @@ class Effect4062(EffectDef):
 
 
 class Effect4063(EffectDef):
+    """
+    systemStandardMissileExplosiveDamage
+
+    Used by:
+    Celestials named like: Wolf Rayet Effect Beacon Class (6 of 6)
+    """
 
     runTime = 'early'
     type = ('projected', 'passive')
@@ -7967,6 +12985,12 @@ class Effect4063(EffectDef):
 
 
 class Effect4086(EffectDef):
+    """
+    systemArmorRepairAmount
+
+    Used by:
+    Celestials named like: Cataclysmic Variable Effect Beacon Class (6 of 6)
+    """
 
     runTime = 'early'
     type = ('projected', 'passive')
@@ -7980,6 +13004,12 @@ class Effect4086(EffectDef):
 
 
 class Effect4088(EffectDef):
+    """
+    systemArmorRemoteRepairAmount
+
+    Used by:
+    Celestials named like: Cataclysmic Variable Effect Beacon Class (6 of 6)
+    """
 
     runTime = 'early'
     type = ('projected', 'passive')
@@ -7993,6 +13023,12 @@ class Effect4088(EffectDef):
 
 
 class Effect4089(EffectDef):
+    """
+    systemShieldRemoteRepairAmount
+
+    Used by:
+    Celestials named like: Cataclysmic Variable Effect Beacon Class (6 of 6)
+    """
 
     runTime = 'early'
     type = ('projected', 'passive')
@@ -8005,6 +13041,12 @@ class Effect4089(EffectDef):
 
 
 class Effect4090(EffectDef):
+    """
+    systemCapacitorCapacity
+
+    Used by:
+    Celestials named like: Cataclysmic Variable Effect Beacon Class (6 of 6)
+    """
 
     runTime = 'early'
     type = ('projected', 'passive')
@@ -8015,6 +13057,13 @@ class Effect4090(EffectDef):
 
 
 class Effect4091(EffectDef):
+    """
+    systemCapacitorRecharge
+
+    Used by:
+    Celestials named like: Cataclysmic Variable Effect Beacon Class (6 of 6)
+    Celestials named like: Pulsar Effect Beacon Class (6 of 6)
+    """
 
     runTime = 'early'
     type = ('projected', 'passive')
@@ -8025,6 +13074,12 @@ class Effect4091(EffectDef):
 
 
 class Effect4093(EffectDef):
+    """
+    subsystemBonusAmarrOffensiveEnergyWeaponDamageMultiplier
+
+    Used by:
+    Subsystem: Legion Offensive - Liquid Crystal Magnifiers
+    """
 
     type = 'passive'
 
@@ -8036,6 +13091,12 @@ class Effect4093(EffectDef):
 
 
 class Effect4104(EffectDef):
+    """
+    subsystemBonusCaldariOffensiveHybridWeaponMaxRange
+
+    Used by:
+    Subsystem: Tengu Offensive - Magnetic Infusion Basin
+    """
 
     type = 'passive'
 
@@ -8047,6 +13108,12 @@ class Effect4104(EffectDef):
 
 
 class Effect4106(EffectDef):
+    """
+    subsystemBonusGallenteOffensiveHybridWeaponFalloff
+
+    Used by:
+    Subsystem: Proteus Offensive - Hybrid Encoding Platform
+    """
 
     type = 'passive'
 
@@ -8058,6 +13125,12 @@ class Effect4106(EffectDef):
 
 
 class Effect4114(EffectDef):
+    """
+    subsystemBonusMinmatarOffensiveProjectileWeaponFalloff
+
+    Used by:
+    Subsystem: Loki Offensive - Projectile Scoping Array
+    """
 
     type = 'passive'
 
@@ -8069,6 +13142,12 @@ class Effect4114(EffectDef):
 
 
 class Effect4115(EffectDef):
+    """
+    subsystemBonusMinmatarOffensiveProjectileWeaponMaxRange
+
+    Used by:
+    Subsystem: Loki Offensive - Projectile Scoping Array
+    """
 
     type = 'passive'
 
@@ -8080,6 +13159,12 @@ class Effect4115(EffectDef):
 
 
 class Effect4122(EffectDef):
+    """
+    subsystemBonusCaldariOffensive1LauncherROF
+
+    Used by:
+    Subsystem: Tengu Offensive - Accelerated Ejection Bay
+    """
 
     type = 'passive'
 
@@ -8091,6 +13176,12 @@ class Effect4122(EffectDef):
 
 
 class Effect4135(EffectDef):
+    """
+    systemShieldEmResistance
+
+    Used by:
+    Celestials named like: Wolf Rayet Effect Beacon Class (6 of 6)
+    """
 
     runTime = 'early'
     type = ('projected', 'passive')
@@ -8102,6 +13193,12 @@ class Effect4135(EffectDef):
 
 
 class Effect4136(EffectDef):
+    """
+    systemShieldExplosiveResistance
+
+    Used by:
+    Celestials named like: Wolf Rayet Effect Beacon Class (6 of 6)
+    """
 
     runTime = 'early'
     type = ('projected', 'passive')
@@ -8114,6 +13211,12 @@ class Effect4136(EffectDef):
 
 
 class Effect4137(EffectDef):
+    """
+    systemShieldKineticResistance
+
+    Used by:
+    Celestials named like: Wolf Rayet Effect Beacon Class (6 of 6)
+    """
 
     runTime = 'early'
     type = ('projected', 'passive')
@@ -8126,6 +13229,12 @@ class Effect4137(EffectDef):
 
 
 class Effect4138(EffectDef):
+    """
+    systemShieldThermalResistance
+
+    Used by:
+    Celestials named like: Wolf Rayet Effect Beacon Class (6 of 6)
+    """
 
     runTime = 'early'
     type = ('projected', 'passive')
@@ -8138,6 +13247,12 @@ class Effect4138(EffectDef):
 
 
 class Effect4152(EffectDef):
+    """
+    subsystemBonusAmarrEngineeringHeatDamageReduction
+
+    Used by:
+    Subsystem: Legion Core - Energy Parasitic Complex
+    """
 
     type = 'passive'
 
@@ -8149,6 +13264,12 @@ class Effect4152(EffectDef):
 
 
 class Effect4153(EffectDef):
+    """
+    subsystemBonusCaldariEngineeringHeatDamageReduction
+
+    Used by:
+    Subsystem: Tengu Core - Obfuscation Manifold
+    """
 
     type = 'passive'
 
@@ -8160,6 +13281,12 @@ class Effect4153(EffectDef):
 
 
 class Effect4154(EffectDef):
+    """
+    subsystemBonusGallenteEngineeringHeatDamageReduction
+
+    Used by:
+    Subsystem: Proteus Core - Friction Extension Processor
+    """
 
     type = 'passive'
 
@@ -8171,6 +13298,12 @@ class Effect4154(EffectDef):
 
 
 class Effect4155(EffectDef):
+    """
+    subsystemBonusMinmatarEngineeringHeatDamageReduction
+
+    Used by:
+    Subsystem: Loki Core - Immobility Drivers
+    """
 
     type = 'passive'
 
@@ -8182,6 +13315,12 @@ class Effect4155(EffectDef):
 
 
 class Effect4158(EffectDef):
+    """
+    subsystemBonusCaldariCoreCapacitorCapacity
+
+    Used by:
+    Subsystem: Tengu Core - Augmented Graviton Reactor
+    """
 
     type = 'passive'
 
@@ -8192,6 +13331,12 @@ class Effect4158(EffectDef):
 
 
 class Effect4159(EffectDef):
+    """
+    subsystemBonusAmarrCoreCapacitorCapacity
+
+    Used by:
+    Subsystem: Legion Core - Augmented Antimatter Reactor
+    """
 
     type = 'passive'
 
@@ -8201,6 +13346,14 @@ class Effect4159(EffectDef):
 
 
 class Effect4161(EffectDef):
+    """
+    baseMaxScanDeviationModifierRequiringAstrometrics
+
+    Used by:
+    Implants named like: Poteque 'Prospector' Astrometric Pinpointing AP (3 of 3)
+    Skill: Astrometric Pinpointing
+    Skill: Astrometrics
+    """
 
     type = 'passive'
 
@@ -8213,6 +13366,17 @@ class Effect4161(EffectDef):
 
 
 class Effect4162(EffectDef):
+    """
+    baseSensorStrengthModifierRequiringAstrometrics
+
+    Used by:
+    Modules from group: Scan Probe Launcher (4 of 7)
+    Implants named like: Poteque 'Prospector' Astrometric Rangefinding AR (3 of 3)
+    Implants named like: grade Virtue (10 of 12)
+    Modules named like: Gravity Capacitor Upgrade (8 of 8)
+    Skill: Astrometric Rangefinding
+    Skill: Astrometrics
+    """
 
     type = 'passive'
 
@@ -8226,6 +13390,12 @@ class Effect4162(EffectDef):
 
 
 class Effect4165(EffectDef):
+    """
+    shipBonusScanProbeStrengthCF
+
+    Used by:
+    Ship: Heron
+    """
 
     type = 'passive'
 
@@ -8237,6 +13407,12 @@ class Effect4165(EffectDef):
 
 
 class Effect4166(EffectDef):
+    """
+    shipBonusScanProbeStrengthMF
+
+    Used by:
+    Ship: Probe
+    """
 
     type = 'passive'
 
@@ -8248,6 +13424,12 @@ class Effect4166(EffectDef):
 
 
 class Effect4167(EffectDef):
+    """
+    shipBonusScanProbeStrengthGF
+
+    Used by:
+    Ship: Imicus
+    """
 
     type = 'passive'
 
@@ -8259,6 +13441,12 @@ class Effect4167(EffectDef):
 
 
 class Effect4168(EffectDef):
+    """
+    eliteBonusCoverOpsScanProbeStrength2
+
+    Used by:
+    Ships from group: Covert Ops (8 of 8)
+    """
 
     type = 'passive'
 
@@ -8270,6 +13458,12 @@ class Effect4168(EffectDef):
 
 
 class Effect4187(EffectDef):
+    """
+    shipBonusStrategicCruiserAmarrHeatDamage
+
+    Used by:
+    Ship: Legion
+    """
 
     type = 'passive'
 
@@ -8281,6 +13475,12 @@ class Effect4187(EffectDef):
 
 
 class Effect4188(EffectDef):
+    """
+    shipBonusStrategicCruiserCaldariHeatDamage
+
+    Used by:
+    Ship: Tengu
+    """
 
     type = 'passive'
 
@@ -8292,6 +13492,12 @@ class Effect4188(EffectDef):
 
 
 class Effect4189(EffectDef):
+    """
+    shipBonusStrategicCruiserGallenteHeatDamage
+
+    Used by:
+    Ship: Proteus
+    """
 
     type = 'passive'
 
@@ -8303,6 +13509,12 @@ class Effect4189(EffectDef):
 
 
 class Effect4190(EffectDef):
+    """
+    shipBonusStrategicCruiserMinmatarHeatDamage
+
+    Used by:
+    Ship: Loki
+    """
 
     type = 'passive'
 
@@ -8314,6 +13526,12 @@ class Effect4190(EffectDef):
 
 
 class Effect4215(EffectDef):
+    """
+    subsystemBonusAmarrOffensive2EnergyWeaponCapacitorNeed
+
+    Used by:
+    Subsystem: Legion Offensive - Liquid Crystal Magnifiers
+    """
 
     type = 'passive'
 
@@ -8325,6 +13543,12 @@ class Effect4215(EffectDef):
 
 
 class Effect4216(EffectDef):
+    """
+    subsystemBonusAmarrCore2EnergyVampireAmount
+
+    Used by:
+    Subsystem: Legion Core - Energy Parasitic Complex
+    """
 
     type = 'passive'
 
@@ -8335,6 +13559,12 @@ class Effect4216(EffectDef):
 
 
 class Effect4217(EffectDef):
+    """
+    subsystemBonusAmarrCore2EnergyDestabilizerAmount
+
+    Used by:
+    Subsystem: Legion Core - Energy Parasitic Complex
+    """
 
     type = 'passive'
 
@@ -8345,6 +13575,12 @@ class Effect4217(EffectDef):
 
 
 class Effect4248(EffectDef):
+    """
+    subsystemBonusCaldariOffensive2MissileLauncherKineticDamage
+
+    Used by:
+    Subsystem: Tengu Offensive - Accelerated Ejection Bay
+    """
 
     type = 'passive'
 
@@ -8362,6 +13598,12 @@ class Effect4248(EffectDef):
 
 
 class Effect4250(EffectDef):
+    """
+    subsystemBonusGallenteOffensiveDroneDamageHP
+
+    Used by:
+    Subsystem: Proteus Offensive - Drone Synthesis Projector
+    """
 
     type = 'passive'
 
@@ -8382,6 +13624,12 @@ class Effect4250(EffectDef):
 
 
 class Effect4251(EffectDef):
+    """
+    subsystemBonusMinmatarOffensive2ProjectileWeaponDamageMultiplier
+
+    Used by:
+    Subsystem: Loki Offensive - Projectile Scoping Array
+    """
 
     type = 'passive'
 
@@ -8393,6 +13641,12 @@ class Effect4251(EffectDef):
 
 
 class Effect4256(EffectDef):
+    """
+    subsystemBonusMinmatarOffensive2MissileLauncherROF
+
+    Used by:
+    Subsystem: Loki Offensive - Launcher Efficiency Configuration
+    """
 
     type = 'passive'
 
@@ -8405,6 +13659,12 @@ class Effect4256(EffectDef):
 
 
 class Effect4264(EffectDef):
+    """
+    subsystemBonusMinmatarCoreCapacitorRecharge
+
+    Used by:
+    Subsystem: Loki Core - Augmented Nuclear Reactor
+    """
 
     type = 'passive'
 
@@ -8415,6 +13675,12 @@ class Effect4264(EffectDef):
 
 
 class Effect4265(EffectDef):
+    """
+    subsystemBonusGallenteCoreCapacitorRecharge
+
+    Used by:
+    Subsystem: Proteus Core - Augmented Fusion Reactor
+    """
 
     type = 'passive'
 
@@ -8425,6 +13691,12 @@ class Effect4265(EffectDef):
 
 
 class Effect4269(EffectDef):
+    """
+    subsystemBonusAmarrCore3ScanResolution
+
+    Used by:
+    Subsystem: Legion Core - Dissolution Sequencer
+    """
 
     type = 'passive'
 
@@ -8435,6 +13707,12 @@ class Effect4269(EffectDef):
 
 
 class Effect4270(EffectDef):
+    """
+    subsystemBonusMinmatarCore3ScanResolution
+
+    Used by:
+    Subsystem: Loki Core - Dissolution Sequencer
+    """
 
     type = 'passive'
 
@@ -8445,6 +13723,12 @@ class Effect4270(EffectDef):
 
 
 class Effect4271(EffectDef):
+    """
+    subsystemBonusCaldariCore2MaxTargetingRange
+
+    Used by:
+    Subsystem: Tengu Core - Electronic Efficiency Gate
+    """
 
     type = 'passive'
 
@@ -8454,6 +13738,12 @@ class Effect4271(EffectDef):
 
 
 class Effect4272(EffectDef):
+    """
+    subsystemBonusGallenteCore2MaxTargetingRange
+
+    Used by:
+    Subsystem: Proteus Core - Electronic Efficiency Gate
+    """
 
     type = 'passive'
 
@@ -8464,6 +13754,12 @@ class Effect4272(EffectDef):
 
 
 class Effect4273(EffectDef):
+    """
+    subsystemBonusGallenteCore2WarpScrambleRange
+
+    Used by:
+    Subsystem: Proteus Core - Friction Extension Processor
+    """
 
     type = 'passive'
 
@@ -8474,6 +13770,12 @@ class Effect4273(EffectDef):
 
 
 class Effect4274(EffectDef):
+    """
+    subsystemBonusMinmatarCore2StasisWebifierRange
+
+    Used by:
+    Subsystem: Loki Core - Immobility Drivers
+    """
 
     type = 'passive'
 
@@ -8484,6 +13786,12 @@ class Effect4274(EffectDef):
 
 
 class Effect4275(EffectDef):
+    """
+    subsystemBonusCaldariPropulsion2WarpSpeed
+
+    Used by:
+    Subsystem: Tengu Propulsion - Interdiction Nullifier
+    """
 
     type = 'passive'
 
@@ -8494,6 +13802,12 @@ class Effect4275(EffectDef):
 
 
 class Effect4277(EffectDef):
+    """
+    subsystemBonusGallentePropulsionWarpCapacitor
+
+    Used by:
+    Subsystem: Proteus Propulsion - Interdiction Nullifier
+    """
 
     type = 'passive'
 
@@ -8504,6 +13818,12 @@ class Effect4277(EffectDef):
 
 
 class Effect4278(EffectDef):
+    """
+    subsystemBonusGallentePropulsion2WarpSpeed
+
+    Used by:
+    Subsystem: Proteus Propulsion - Interdiction Nullifier
+    """
 
     type = 'passive'
 
@@ -8514,6 +13834,12 @@ class Effect4278(EffectDef):
 
 
 class Effect4280(EffectDef):
+    """
+    systemAgility
+
+    Used by:
+    Celestials named like: Black Hole Effect Beacon Class (6 of 6)
+    """
 
     runTime = 'early'
     type = ('projected', 'passive')
@@ -8524,6 +13850,12 @@ class Effect4280(EffectDef):
 
 
 class Effect4282(EffectDef):
+    """
+    subsystemBonusGallenteOffensive2HybridWeaponDamageMultiplier
+
+    Used by:
+    Subsystem: Proteus Offensive - Hybrid Encoding Platform
+    """
 
     type = 'passive'
 
@@ -8535,6 +13867,12 @@ class Effect4282(EffectDef):
 
 
 class Effect4283(EffectDef):
+    """
+    subsystemBonusCaldariOffensive2HybridWeaponDamageMultiplier
+
+    Used by:
+    Subsystem: Tengu Offensive - Magnetic Infusion Basin
+    """
 
     type = 'passive'
 
@@ -8546,6 +13884,12 @@ class Effect4283(EffectDef):
 
 
 class Effect4286(EffectDef):
+    """
+    subsystemBonusAmarrOffensive2RemoteArmorRepairCapUse
+
+    Used by:
+    Subsystem: Legion Offensive - Support Processor
+    """
 
     type = 'passive'
 
@@ -8556,6 +13900,12 @@ class Effect4286(EffectDef):
 
 
 class Effect4288(EffectDef):
+    """
+    subsystemBonusGallenteOffensive2RemoteArmorRepairCapUse
+
+    Used by:
+    Subsystem: Proteus Offensive - Support Processor
+    """
 
     type = 'passive'
 
@@ -8566,6 +13916,12 @@ class Effect4288(EffectDef):
 
 
 class Effect4290(EffectDef):
+    """
+    subsystemBonusMinmatarOffensive2RemoteRepCapUse
+
+    Used by:
+    Subsystem: Loki Offensive - Support Processor
+    """
 
     type = 'passive'
 
@@ -8577,6 +13933,12 @@ class Effect4290(EffectDef):
 
 
 class Effect4292(EffectDef):
+    """
+    subsystemBonusCaldariOffensive2RemoteShieldBoosterCapUse
+
+    Used by:
+    Subsystem: Tengu Offensive - Support Processor
+    """
 
     type = 'passive'
 
@@ -8588,6 +13950,12 @@ class Effect4292(EffectDef):
 
 
 class Effect4321(EffectDef):
+    """
+    subsystemBonusCaldariCore2ECMStrengthRange
+
+    Used by:
+    Subsystem: Tengu Core - Obfuscation Manifold
+    """
 
     type = 'passive'
 
@@ -8606,6 +13974,12 @@ class Effect4321(EffectDef):
 
 
 class Effect4327(EffectDef):
+    """
+    subsystemBonusAmarrOffensive3DroneDamageHP
+
+    Used by:
+    Subsystem: Legion Offensive - Assault Optimization
+    """
 
     type = 'passive'
 
@@ -8622,6 +13996,12 @@ class Effect4327(EffectDef):
 
 
 class Effect4330(EffectDef):
+    """
+    subsystemBonusAmarrOffensive3EnergyWeaponMaxRange
+
+    Used by:
+    Subsystem: Legion Offensive - Liquid Crystal Magnifiers
+    """
 
     type = 'passive'
 
@@ -8633,6 +14013,12 @@ class Effect4330(EffectDef):
 
 
 class Effect4331(EffectDef):
+    """
+    subsystemBonusCaldariOffensive3HMLHAMVelocity
+
+    Used by:
+    Subsystem: Tengu Offensive - Accelerated Ejection Bay
+    """
 
     type = 'passive'
 
@@ -8644,6 +14030,12 @@ class Effect4331(EffectDef):
 
 
 class Effect4342(EffectDef):
+    """
+    subsystemBonusMinmatarCore2MaxTargetingRange
+
+    Used by:
+    Subsystem: Loki Core - Dissolution Sequencer
+    """
 
     type = 'passive'
 
@@ -8654,6 +14046,12 @@ class Effect4342(EffectDef):
 
 
 class Effect4343(EffectDef):
+    """
+    subsystemBonusAmarrCore2MaxTargetingRange
+
+    Used by:
+    Subsystem: Legion Core - Dissolution Sequencer
+    """
 
     type = 'passive'
 
@@ -8664,6 +14062,13 @@ class Effect4343(EffectDef):
 
 
 class Effect4347(EffectDef):
+    """
+    subsystemBonusGallenteOffensive3TurretTracking
+
+    Used by:
+    Subsystem: Proteus Offensive - Drone Synthesis Projector
+    Subsystem: Proteus Offensive - Hybrid Encoding Platform
+    """
 
     type = 'passive'
 
@@ -8675,6 +14080,12 @@ class Effect4347(EffectDef):
 
 
 class Effect4351(EffectDef):
+    """
+    subsystemBonusMinmatarOffensive3TurretTracking
+
+    Used by:
+    Subsystem: Loki Offensive - Projectile Scoping Array
+    """
 
     type = 'passive'
 
@@ -8686,6 +14097,12 @@ class Effect4351(EffectDef):
 
 
 class Effect4358(EffectDef):
+    """
+    ecmRangeBonusModuleEffect
+
+    Used by:
+    Modules from group: ECM Stabilizer (6 of 6)
+    """
 
     type = 'passive'
 
@@ -8697,6 +14114,12 @@ class Effect4358(EffectDef):
 
 
 class Effect4360(EffectDef):
+    """
+    subsystemBonusAmarrOffensiveMissileLauncherROF
+
+    Used by:
+    Subsystem: Legion Offensive - Assault Optimization
+    """
 
     type = 'passive'
 
@@ -8708,6 +14131,12 @@ class Effect4360(EffectDef):
 
 
 class Effect4362(EffectDef):
+    """
+    subsystemBonusAmarrOffensive2MissileDamage
+
+    Used by:
+    Subsystem: Legion Offensive - Assault Optimization
+    """
 
     type = 'passive'
 
@@ -8724,6 +14153,12 @@ class Effect4362(EffectDef):
 
 
 class Effect4366(EffectDef):
+    """
+    shipBonusMediumHybridDmgCC2
+
+    Used by:
+    Ship: Falcon
+    """
 
     type = 'passive'
 
@@ -8734,6 +14169,12 @@ class Effect4366(EffectDef):
 
 
 class Effect4369(EffectDef):
+    """
+    subsystemBonusWarpBubbleImmune
+
+    Used by:
+    Subsystems named like: Propulsion Interdiction Nullifier (4 of 4)
+    """
 
     type = 'passive'
 
@@ -8743,6 +14184,12 @@ class Effect4369(EffectDef):
 
 
 class Effect4370(EffectDef):
+    """
+    caldariShipEwFalloffRangeCC2
+
+    Used by:
+    Ship: Blackbird
+    """
 
     type = 'passive'
 
@@ -8754,6 +14201,12 @@ class Effect4370(EffectDef):
 
 
 class Effect4372(EffectDef):
+    """
+    caldariShipEwFalloffRangeCB3
+
+    Used by:
+    Ship: Scorpion
+    """
 
     type = 'passive'
 
@@ -8765,6 +14218,12 @@ class Effect4372(EffectDef):
 
 
 class Effect4373(EffectDef):
+    """
+    subSystemBonusAmarrOffensiveCommandBursts
+
+    Used by:
+    Subsystem: Legion Offensive - Support Processor
+    """
 
     type = 'passive'
 
@@ -8805,6 +14264,13 @@ class Effect4373(EffectDef):
 
 
 class Effect4377(EffectDef):
+    """
+    shipBonusTorpedoVelocityGF2
+
+    Used by:
+    Ship: Nemesis
+    Ship: Virtuoso
+    """
 
     type = 'passive'
 
@@ -8815,6 +14281,12 @@ class Effect4377(EffectDef):
 
 
 class Effect4378(EffectDef):
+    """
+    shipBonusTorpedoVelocityMF2
+
+    Used by:
+    Ship: Hound
+    """
 
     type = 'passive'
 
@@ -8825,6 +14297,12 @@ class Effect4378(EffectDef):
 
 
 class Effect4379(EffectDef):
+    """
+    shipBonusTorpedoVelocity2AF
+
+    Used by:
+    Ship: Purifier
+    """
 
     type = 'passive'
 
@@ -8835,6 +14313,12 @@ class Effect4379(EffectDef):
 
 
 class Effect4380(EffectDef):
+    """
+    shipBonusTorpedoVelocityCF2
+
+    Used by:
+    Ship: Manticore
+    """
 
     type = 'passive'
 
@@ -8845,6 +14329,12 @@ class Effect4380(EffectDef):
 
 
 class Effect4384(EffectDef):
+    """
+    eliteReconBonusHeavyMissileVelocity
+
+    Used by:
+    Ship: Rook
+    """
 
     type = 'passive'
 
@@ -8856,6 +14346,12 @@ class Effect4384(EffectDef):
 
 
 class Effect4385(EffectDef):
+    """
+    eliteReconBonusHeavyAssaultMissileVelocity
+
+    Used by:
+    Ship: Rook
+    """
 
     type = 'passive'
 
@@ -8867,6 +14363,13 @@ class Effect4385(EffectDef):
 
 
 class Effect4393(EffectDef):
+    """
+    shipBonusEliteCover2TorpedoThermalDamage
+
+    Used by:
+    Ship: Nemesis
+    Ship: Virtuoso
+    """
 
     type = 'passive'
 
@@ -8878,6 +14381,12 @@ class Effect4393(EffectDef):
 
 
 class Effect4394(EffectDef):
+    """
+    shipBonusEliteCover2TorpedoEMDamage
+
+    Used by:
+    Ship: Purifier
+    """
 
     type = 'passive'
 
@@ -8888,6 +14397,13 @@ class Effect4394(EffectDef):
 
 
 class Effect4395(EffectDef):
+    """
+    shipBonusEliteCover2TorpedoExplosiveDamage
+
+    Used by:
+    Ship: Hound
+    Ship: Virtuoso
+    """
 
     type = 'passive'
 
@@ -8899,6 +14415,12 @@ class Effect4395(EffectDef):
 
 
 class Effect4396(EffectDef):
+    """
+    shipBonusEliteCover2TorpedoKineticDamage
+
+    Used by:
+    Ship: Manticore
+    """
 
     type = 'passive'
 
@@ -8910,6 +14432,12 @@ class Effect4396(EffectDef):
 
 
 class Effect4397(EffectDef):
+    """
+    shipBonusGFTorpedoExplosionVelocity
+
+    Used by:
+    Ship: Nemesis
+    """
 
     type = 'passive'
 
@@ -8920,6 +14448,13 @@ class Effect4397(EffectDef):
 
 
 class Effect4398(EffectDef):
+    """
+    shipBonusMF1TorpedoExplosionVelocity
+
+    Used by:
+    Ship: Hound
+    Ship: Virtuoso
+    """
 
     type = 'passive'
 
@@ -8930,6 +14465,12 @@ class Effect4398(EffectDef):
 
 
 class Effect4399(EffectDef):
+    """
+    shipBonusCF1TorpedoExplosionVelocity
+
+    Used by:
+    Ship: Manticore
+    """
 
     type = 'passive'
 
@@ -8940,6 +14481,12 @@ class Effect4399(EffectDef):
 
 
 class Effect4400(EffectDef):
+    """
+    shipBonusAF1TorpedoExplosionVelocity
+
+    Used by:
+    Ship: Purifier
+    """
 
     type = 'passive'
 
@@ -8950,6 +14497,12 @@ class Effect4400(EffectDef):
 
 
 class Effect4413(EffectDef):
+    """
+    shipBonusGF1TorpedoFlightTime
+
+    Used by:
+    Ship: Nemesis
+    """
 
     type = 'passive'
 
@@ -8960,6 +14513,13 @@ class Effect4413(EffectDef):
 
 
 class Effect4415(EffectDef):
+    """
+    shipBonusMF1TorpedoFlightTime
+
+    Used by:
+    Ship: Hound
+    Ship: Virtuoso
+    """
 
     type = 'passive'
 
@@ -8970,6 +14530,12 @@ class Effect4415(EffectDef):
 
 
 class Effect4416(EffectDef):
+    """
+    shipBonusCF1TorpedoFlightTime
+
+    Used by:
+    Ship: Manticore
+    """
 
     type = 'passive'
 
@@ -8980,6 +14546,12 @@ class Effect4416(EffectDef):
 
 
 class Effect4417(EffectDef):
+    """
+    shipBonusAF1TorpedoFlightTime
+
+    Used by:
+    Ship: Purifier
+    """
 
     type = 'passive'
 
@@ -8990,6 +14562,12 @@ class Effect4417(EffectDef):
 
 
 class Effect4451(EffectDef):
+    """
+    ScanRadarStrengthModifierEffect
+
+    Used by:
+    Implants named like: Low grade Grail (5 of 6)
+    """
 
     type = 'passive'
 
@@ -8999,6 +14577,12 @@ class Effect4451(EffectDef):
 
 
 class Effect4452(EffectDef):
+    """
+    ScanLadarStrengthModifierEffect
+
+    Used by:
+    Implants named like: Low grade Jackal (5 of 6)
+    """
 
     type = 'passive'
 
@@ -9008,6 +14592,12 @@ class Effect4452(EffectDef):
 
 
 class Effect4453(EffectDef):
+    """
+    ScanGravimetricStrengthModifierEffect
+
+    Used by:
+    Implants named like: Low grade Talon (5 of 6)
+    """
 
     type = 'passive'
 
@@ -9017,6 +14607,12 @@ class Effect4453(EffectDef):
 
 
 class Effect4454(EffectDef):
+    """
+    ScanMagnetometricStrengthModifierEffect
+
+    Used by:
+    Implants named like: Low grade Spur (5 of 6)
+    """
 
     type = 'passive'
 
@@ -9027,6 +14623,12 @@ class Effect4454(EffectDef):
 
 
 class Effect4456(EffectDef):
+    """
+    federationsetbonus3
+
+    Used by:
+    Implants named like: High grade Spur (6 of 6)
+    """
 
     runTime = 'early'
     type = 'passive'
@@ -9039,6 +14641,12 @@ class Effect4456(EffectDef):
 
 
 class Effect4457(EffectDef):
+    """
+    imperialsetbonus3
+
+    Used by:
+    Implants named like: High grade Grail (6 of 6)
+    """
 
     runTime = 'early'
     type = 'passive'
@@ -9051,6 +14659,12 @@ class Effect4457(EffectDef):
 
 
 class Effect4458(EffectDef):
+    """
+    republicsetbonus3
+
+    Used by:
+    Implants named like: High grade Jackal (6 of 6)
+    """
 
     runTime = 'early'
     type = 'passive'
@@ -9063,6 +14677,12 @@ class Effect4458(EffectDef):
 
 
 class Effect4459(EffectDef):
+    """
+    caldarisetbonus3
+
+    Used by:
+    Implants named like: High grade Talon (6 of 6)
+    """
 
     runTime = 'early'
     type = 'passive'
@@ -9075,6 +14695,12 @@ class Effect4459(EffectDef):
 
 
 class Effect4460(EffectDef):
+    """
+    imperialsetLGbonus
+
+    Used by:
+    Implants named like: Low grade Grail (6 of 6)
+    """
 
     runTime = 'early'
     type = 'passive'
@@ -9087,6 +14713,12 @@ class Effect4460(EffectDef):
 
 
 class Effect4461(EffectDef):
+    """
+    federationsetLGbonus
+
+    Used by:
+    Implants named like: Low grade Spur (6 of 6)
+    """
 
     runTime = 'early'
     type = 'passive'
@@ -9099,6 +14731,12 @@ class Effect4461(EffectDef):
 
 
 class Effect4462(EffectDef):
+    """
+    caldarisetLGbonus
+
+    Used by:
+    Implants named like: Low grade Talon (6 of 6)
+    """
 
     runTime = 'early'
     type = 'passive'
@@ -9111,6 +14749,12 @@ class Effect4462(EffectDef):
 
 
 class Effect4463(EffectDef):
+    """
+    republicsetLGbonus
+
+    Used by:
+    Implants named like: Low grade Jackal (6 of 6)
+    """
 
     runTime = 'early'
     type = 'passive'
@@ -9123,6 +14767,12 @@ class Effect4463(EffectDef):
 
 
 class Effect4464(EffectDef):
+    """
+    shipProjectileRofMF
+
+    Used by:
+    Ship: Claw
+    """
 
     type = 'passive'
 
@@ -9133,6 +14783,14 @@ class Effect4464(EffectDef):
 
 
 class Effect4471(EffectDef):
+    """
+    shipBonusStasisMF2
+
+    Used by:
+    Ship: Caedes
+    Ship: Cruor
+    Ship: Freki
+    """
 
     type = 'passive'
 
@@ -9143,6 +14801,12 @@ class Effect4471(EffectDef):
 
 
 class Effect4472(EffectDef):
+    """
+    shipProjectileDmgMC
+
+    Used by:
+    Ship: Mimir
+    """
 
     type = 'passive'
 
@@ -9153,6 +14817,13 @@ class Effect4472(EffectDef):
 
 
 class Effect4473(EffectDef):
+    """
+    shipVelocityBonusATC1
+
+    Used by:
+    Ship: Adrestia
+    Ship: Mimir
+    """
 
     type = 'passive'
 
@@ -9162,6 +14833,12 @@ class Effect4473(EffectDef):
 
 
 class Effect4474(EffectDef):
+    """
+    shipMTMaxRangeBonusATC
+
+    Used by:
+    Ship: Mimir
+    """
 
     type = 'passive'
 
@@ -9172,6 +14849,12 @@ class Effect4474(EffectDef):
 
 
 class Effect4475(EffectDef):
+    """
+    shipMTFalloffBonusATC
+
+    Used by:
+    Ship: Mimir
+    """
 
     type = 'passive'
 
@@ -9182,6 +14865,12 @@ class Effect4475(EffectDef):
 
 
 class Effect4476(EffectDef):
+    """
+    shipMTFalloffBonusATF
+
+    Used by:
+    Ship: Freki
+    """
 
     type = 'passive'
 
@@ -9192,6 +14881,12 @@ class Effect4476(EffectDef):
 
 
 class Effect4477(EffectDef):
+    """
+    shipMTMaxRangeBonusATF
+
+    Used by:
+    Ship: Freki
+    """
 
     type = 'passive'
 
@@ -9202,6 +14897,12 @@ class Effect4477(EffectDef):
 
 
 class Effect4478(EffectDef):
+    """
+    shipBonusAfterburnerCapNeedATF
+
+    Used by:
+    Ship: Freki
+    """
 
     type = 'passive'
 
@@ -9212,6 +14913,12 @@ class Effect4478(EffectDef):
 
 
 class Effect4479(EffectDef):
+    """
+    shipBonusSurveyProbeExplosionDelaySkillSurveyCovertOps3
+
+    Used by:
+    Ships from group: Covert Ops (5 of 8)
+    """
 
     type = 'passive'
 
@@ -9223,6 +14930,13 @@ class Effect4479(EffectDef):
 
 
 class Effect4482(EffectDef):
+    """
+    shipETOptimalRange2AF
+
+    Used by:
+    Ship: Imperial Navy Slicer
+    Ship: Pacifier
+    """
 
     type = 'passive'
 
@@ -9233,6 +14947,12 @@ class Effect4482(EffectDef):
 
 
 class Effect4484(EffectDef):
+    """
+    shipPTurretFalloffBonusGB
+
+    Used by:
+    Ship: Machariel
+    """
 
     type = 'passive'
 
@@ -9243,6 +14963,12 @@ class Effect4484(EffectDef):
 
 
 class Effect4485(EffectDef):
+    """
+    shipBonusStasisWebSpeedFactorMB
+
+    Used by:
+    Ship: Vindicator
+    """
 
     type = 'passive'
 
@@ -9253,26 +14979,57 @@ class Effect4485(EffectDef):
 
 
 class Effect4489(EffectDef):
+    """
+    superWeaponAmarr
+
+    Used by:
+    Module: 'Judgment' Electromagnetic Doomsday
+    """
 
     type = 'active'
 
 
 class Effect4490(EffectDef):
+    """
+    superWeaponCaldari
+
+    Used by:
+    Module: 'Oblivion' Kinetic Doomsday
+    """
 
     type = 'active'
 
 
 class Effect4491(EffectDef):
+    """
+    superWeaponGallente
+
+    Used by:
+    Module: 'Aurora Ominae' Thermal Doomsday
+    """
 
     type = 'active'
 
 
 class Effect4492(EffectDef):
+    """
+    superWeaponMinmatar
+
+    Used by:
+    Module: 'Gjallarhorn' Explosive Doomsday
+    """
 
     type = 'active'
 
 
 class Effect4510(EffectDef):
+    """
+    shipStasisWebStrengthBonusMC2
+
+    Used by:
+    Ship: Victor
+    Ship: Vigilant
+    """
 
     type = 'passive'
 
@@ -9283,6 +15040,13 @@ class Effect4510(EffectDef):
 
 
 class Effect4512(EffectDef):
+    """
+    shipPTurretFalloffBonusGC
+
+    Used by:
+    Ship: Cynabal
+    Ship: Moracha
+    """
 
     type = 'passive'
 
@@ -9293,6 +15057,13 @@ class Effect4512(EffectDef):
 
 
 class Effect4513(EffectDef):
+    """
+    shipStasisWebStrengthBonusMF2
+
+    Used by:
+    Ship: Daredevil
+    Ship: Virtuoso
+    """
 
     type = 'passive'
 
@@ -9303,6 +15074,13 @@ class Effect4513(EffectDef):
 
 
 class Effect4515(EffectDef):
+    """
+    shipFalloffBonusMF
+
+    Used by:
+    Ship: Chremoas
+    Ship: Dramiel
+    """
 
     type = 'passive'
 
@@ -9313,6 +15091,13 @@ class Effect4515(EffectDef):
 
 
 class Effect4516(EffectDef):
+    """
+    shipHTurretFalloffBonusGC
+
+    Used by:
+    Ship: Victor
+    Ship: Vigilant
+    """
 
     type = 'passive'
 
@@ -9323,6 +15108,12 @@ class Effect4516(EffectDef):
 
 
 class Effect4527(EffectDef):
+    """
+    gunneryFalloffBonusOnline
+
+    Used by:
+    Modules from group: Tracking Enhancer (10 of 10)
+    """
 
     type = 'passive'
 
@@ -9334,6 +15125,12 @@ class Effect4527(EffectDef):
 
 
 class Effect4555(EffectDef):
+    """
+    capitalLauncherSkillCruiseCitadelEmDamage1
+
+    Used by:
+    Skill: XL Cruise Missiles
+    """
 
     type = 'passive'
 
@@ -9344,6 +15141,12 @@ class Effect4555(EffectDef):
 
 
 class Effect4556(EffectDef):
+    """
+    capitalLauncherSkillCruiseCitadelExplosiveDamage1
+
+    Used by:
+    Skill: XL Cruise Missiles
+    """
 
     type = 'passive'
 
@@ -9354,6 +15157,12 @@ class Effect4556(EffectDef):
 
 
 class Effect4557(EffectDef):
+    """
+    capitalLauncherSkillCruiseCitadelKineticDamage1
+
+    Used by:
+    Skill: XL Cruise Missiles
+    """
 
     type = 'passive'
 
@@ -9364,6 +15173,12 @@ class Effect4557(EffectDef):
 
 
 class Effect4558(EffectDef):
+    """
+    capitalLauncherSkillCruiseCitadelThermalDamage1
+
+    Used by:
+    Skill: XL Cruise Missiles
+    """
 
     type = 'passive'
 
@@ -9374,6 +15189,12 @@ class Effect4558(EffectDef):
 
 
 class Effect4559(EffectDef):
+    """
+    gunneryMaxRangeFalloffTrackingSpeedBonus
+
+    Used by:
+    Modules from group: Tracking Computer (11 of 11)
+    """
 
     type = 'active'
 
@@ -9386,6 +15207,12 @@ class Effect4559(EffectDef):
 
 
 class Effect4575(EffectDef):
+    """
+    industrialCoreEffect2
+
+    Used by:
+    Variations of module: Industrial Core I (2 of 2)
+    """
 
     runTime = 'early'
     type = 'active'
@@ -9500,6 +15327,12 @@ class Effect4575(EffectDef):
 
 
 class Effect4576(EffectDef):
+    """
+    eliteBonusLogisticsTrackingLinkFalloffBonus1
+
+    Used by:
+    Ship: Scimitar
+    """
 
     type = 'passive'
 
@@ -9511,6 +15344,12 @@ class Effect4576(EffectDef):
 
 
 class Effect4577(EffectDef):
+    """
+    eliteBonusLogisticsTrackingLinkFalloffBonus2
+
+    Used by:
+    Ship: Oneiros
+    """
 
     type = 'passive'
 
@@ -9522,6 +15361,12 @@ class Effect4577(EffectDef):
 
 
 class Effect4579(EffectDef):
+    """
+    droneRigStasisWebSpeedFactorBonus
+
+    Used by:
+    Modules named like: Stasis Drone Augmentor (8 of 8)
+    """
 
     type = 'passive'
 
@@ -9532,6 +15377,12 @@ class Effect4579(EffectDef):
 
 
 class Effect4619(EffectDef):
+    """
+    shipBonusDroneDamageGF2
+
+    Used by:
+    Ship: Utu
+    """
 
     type = 'passive'
 
@@ -9542,6 +15393,13 @@ class Effect4619(EffectDef):
 
 
 class Effect4620(EffectDef):
+    """
+    shipBonusWarpScramblerMaxRangeGF2
+
+    Used by:
+    Ship: Garmur
+    Ship: Utu
+    """
 
     type = 'passive'
 
@@ -9552,6 +15410,14 @@ class Effect4620(EffectDef):
 
 
 class Effect4621(EffectDef):
+    """
+    shipBonusHeatDamageATF1
+
+    Used by:
+    Ship: Cambion
+    Ship: Etana
+    Ship: Utu
+    """
 
     type = 'passive'
 
@@ -9562,6 +15428,12 @@ class Effect4621(EffectDef):
 
 
 class Effect4622(EffectDef):
+    """
+    shipBonusSmallHybridMaxRangeATF2
+
+    Used by:
+    Ship: Utu
+    """
 
     type = 'passive'
 
@@ -9572,6 +15444,12 @@ class Effect4622(EffectDef):
 
 
 class Effect4623(EffectDef):
+    """
+    shipBonusSmallHybridTrackingSpeedATF2
+
+    Used by:
+    Ship: Utu
+    """
 
     type = 'passive'
 
@@ -9582,6 +15460,12 @@ class Effect4623(EffectDef):
 
 
 class Effect4624(EffectDef):
+    """
+    shipBonusHybridTrackingATC2
+
+    Used by:
+    Ship: Adrestia
+    """
 
     type = 'passive'
 
@@ -9592,6 +15476,12 @@ class Effect4624(EffectDef):
 
 
 class Effect4625(EffectDef):
+    """
+    shipBonusHybridFalloffATC2
+
+    Used by:
+    Ship: Adrestia
+    """
 
     type = 'passive'
 
@@ -9602,6 +15492,13 @@ class Effect4625(EffectDef):
 
 
 class Effect4626(EffectDef):
+    """
+    shipBonusWarpScramblerMaxRangeGC2
+
+    Used by:
+    Ship: Adrestia
+    Ship: Orthrus
+    """
 
     type = 'passive'
 
@@ -9612,6 +15509,12 @@ class Effect4626(EffectDef):
 
 
 class Effect4635(EffectDef):
+    """
+    eliteBonusMaraudersCruiseAndTorpedoDamageRole1
+
+    Used by:
+    Ship: Golem
+    """
 
     type = 'passive'
 
@@ -9625,6 +15528,12 @@ class Effect4635(EffectDef):
 
 
 class Effect4636(EffectDef):
+    """
+    shipBonusAoeVelocityCruiseAndTorpedoCB2
+
+    Used by:
+    Ship: Golem
+    """
 
     type = 'passive'
 
@@ -9636,6 +15545,13 @@ class Effect4636(EffectDef):
 
 
 class Effect4637(EffectDef):
+    """
+    shipCruiseAndTorpedoVelocityBonusCB3
+
+    Used by:
+    Ship: Golem
+    Ship: Widow
+    """
 
     type = 'passive'
 
@@ -9647,6 +15563,14 @@ class Effect4637(EffectDef):
 
 
 class Effect4640(EffectDef):
+    """
+    shipArmorEMAndExpAndkinAndThmResistanceAC2
+
+    Used by:
+    Ships named like: Stratios (2 of 2)
+    Ship: Sacrilege
+    Ship: Vangel
+    """
 
     type = 'passive'
 
@@ -9659,6 +15583,12 @@ class Effect4640(EffectDef):
 
 
 class Effect4643(EffectDef):
+    """
+    shipHeavyAssaultMissileEMAndExpAndKinAndThmDmgAC1
+
+    Used by:
+    Ship: Sacrilege
+    """
 
     type = 'passive'
 
@@ -9672,6 +15602,12 @@ class Effect4643(EffectDef):
 
 
 class Effect4645(EffectDef):
+    """
+    eliteBonusHeavyGunshipHeavyAndHeavyAssaultAndAssaultMissileLauncherROF
+
+    Used by:
+    Ship: Sacrilege
+    """
 
     type = 'passive'
 
@@ -9684,6 +15620,12 @@ class Effect4645(EffectDef):
 
 
 class Effect4648(EffectDef):
+    """
+    eliteBonusBlackOpsECMGravAndLadarAndMagnetometricAndRadarStrength1
+
+    Used by:
+    Ship: Widow
+    """
 
     type = 'passive'
 
@@ -9696,6 +15638,12 @@ class Effect4648(EffectDef):
 
 
 class Effect4649(EffectDef):
+    """
+    shipCruiseAndSiegeLauncherROFBonus2CB
+
+    Used by:
+    Ship: Widow
+    """
 
     type = 'passive'
 
@@ -9707,6 +15655,12 @@ class Effect4649(EffectDef):
 
 
 class Effect4667(EffectDef):
+    """
+    shipBonusNoctisSalvageCycle
+
+    Used by:
+    Ship: Noctis
+    """
 
     type = 'passive'
 
@@ -9718,6 +15672,12 @@ class Effect4667(EffectDef):
 
 
 class Effect4668(EffectDef):
+    """
+    shipBonusNoctisTractorCycle
+
+    Used by:
+    Ship: Noctis
+    """
 
     type = 'passive'
 
@@ -9729,6 +15689,12 @@ class Effect4668(EffectDef):
 
 
 class Effect4669(EffectDef):
+    """
+    shipBonusNoctisTractorVelocity
+
+    Used by:
+    Ship: Noctis
+    """
 
     type = 'passive'
 
@@ -9740,6 +15706,12 @@ class Effect4669(EffectDef):
 
 
 class Effect4670(EffectDef):
+    """
+    shipBonusNoctisTractorRange
+
+    Used by:
+    Ship: Noctis
+    """
 
     type = 'passive'
 
@@ -9751,6 +15723,13 @@ class Effect4670(EffectDef):
 
 
 class Effect4728(EffectDef):
+    """
+    OffensiveDefensiveReduction
+
+    Used by:
+    Celestials named like: Drifter Incursion (6 of 6)
+    Celestials named like: Incursion ship attributes effects (3 of 3)
+    """
 
     runTime = 'early'
     type = ('projected', 'passive')
@@ -9782,6 +15761,12 @@ class Effect4728(EffectDef):
 
 
 class Effect4760(EffectDef):
+    """
+    subsystemBonusCaldariPropulsionWarpCapacitor
+
+    Used by:
+    Subsystem: Tengu Propulsion - Interdiction Nullifier
+    """
 
     type = 'passive'
 
@@ -9792,6 +15777,12 @@ class Effect4760(EffectDef):
 
 
 class Effect4775(EffectDef):
+    """
+    shipEnergyNeutralizerTransferAmountBonusAF2
+
+    Used by:
+    Ship: Malice
+    """
 
     type = 'passive'
 
@@ -9803,6 +15794,12 @@ class Effect4775(EffectDef):
 
 
 class Effect4782(EffectDef):
+    """
+    shipBonusSmallEnergyWeaponOptimalRangeATF2
+
+    Used by:
+    Ship: Malice
+    """
 
     type = 'passive'
 
@@ -9813,6 +15810,12 @@ class Effect4782(EffectDef):
 
 
 class Effect4789(EffectDef):
+    """
+    shipBonusSmallEnergyTurretDamageATF1
+
+    Used by:
+    Ship: Malice
+    """
 
     type = 'passive'
 
@@ -9823,6 +15826,12 @@ class Effect4789(EffectDef):
 
 
 class Effect4793(EffectDef):
+    """
+    shipBonusMissileLauncherHeavyROFATC1
+
+    Used by:
+    Ship: Vangel
+    """
 
     type = 'passive'
 
@@ -9833,6 +15842,12 @@ class Effect4793(EffectDef):
 
 
 class Effect4794(EffectDef):
+    """
+    shipBonusMissileLauncherAssaultROFATC1
+
+    Used by:
+    Ship: Vangel
+    """
 
     type = 'passive'
 
@@ -9843,6 +15858,12 @@ class Effect4794(EffectDef):
 
 
 class Effect4795(EffectDef):
+    """
+    shipBonusMissileLauncherHeavyAssaultROFATC1
+
+    Used by:
+    Ship: Vangel
+    """
 
     type = 'passive'
 
@@ -9853,6 +15874,12 @@ class Effect4795(EffectDef):
 
 
 class Effect4799(EffectDef):
+    """
+    eliteBonusBlackOpsECMBurstGravAndLadarAndMagnetoAndRadar
+
+    Used by:
+    Ship: Widow
+    """
 
     type = 'passive'
 
@@ -9866,6 +15893,14 @@ class Effect4799(EffectDef):
 
 
 class Effect4804(EffectDef):
+    """
+    dataMiningSkillBoostAccessDifficultyBonusAbsolutePercent
+
+    Used by:
+    Skill: Archaeology
+    Skill: Hacking
+    Skill: Salvaging
+    """
 
     type = 'passive'
 
@@ -9876,6 +15911,12 @@ class Effect4804(EffectDef):
 
 
 class Effect4809(EffectDef):
+    """
+    ecmGravimetricStrengthBonusPercent
+
+    Used by:
+    Modules from group: ECM Stabilizer (6 of 6)
+    """
 
     type = 'passive'
 
@@ -9887,6 +15928,12 @@ class Effect4809(EffectDef):
 
 
 class Effect4810(EffectDef):
+    """
+    ecmLadarStrengthBonusPercent
+
+    Used by:
+    Modules from group: ECM Stabilizer (6 of 6)
+    """
 
     type = 'passive'
 
@@ -9898,6 +15945,12 @@ class Effect4810(EffectDef):
 
 
 class Effect4811(EffectDef):
+    """
+    ecmMagnetometricStrengthBonusPercent
+
+    Used by:
+    Modules from group: ECM Stabilizer (6 of 6)
+    """
 
     type = 'passive'
 
@@ -9910,6 +15963,12 @@ class Effect4811(EffectDef):
 
 
 class Effect4812(EffectDef):
+    """
+    ecmRadarStrengthBonusPercent
+
+    Used by:
+    Modules from group: ECM Stabilizer (6 of 6)
+    """
 
     type = 'passive'
 
@@ -9921,6 +15980,12 @@ class Effect4812(EffectDef):
 
 
 class Effect4814(EffectDef):
+    """
+    jumpPortalConsumptionBonusPercentSkill
+
+    Used by:
+    Skill: Jump Portal Generation
+    """
 
     type = 'passive'
 
@@ -9931,6 +15996,12 @@ class Effect4814(EffectDef):
 
 
 class Effect4817(EffectDef):
+    """
+    salvagerModuleDurationReduction
+
+    Used by:
+    Implant: Poteque 'Prospector' Environmental Analysis EY-1005
+    """
 
     type = 'passive'
 
@@ -9941,6 +16012,12 @@ class Effect4817(EffectDef):
 
 
 class Effect4820(EffectDef):
+    """
+    bcLargeEnergyTurretPowerNeedBonus
+
+    Used by:
+    Ship: Oracle
+    """
 
     type = 'passive'
 
@@ -9951,6 +16028,13 @@ class Effect4820(EffectDef):
 
 
 class Effect4821(EffectDef):
+    """
+    bcLargeHybridTurretPowerNeedBonus
+
+    Used by:
+    Ship: Naga
+    Ship: Talos
+    """
 
     type = 'passive'
 
@@ -9961,6 +16045,12 @@ class Effect4821(EffectDef):
 
 
 class Effect4822(EffectDef):
+    """
+    bcLargeProjectileTurretPowerNeedBonus
+
+    Used by:
+    Ship: Tornado
+    """
 
     type = 'passive'
 
@@ -9971,6 +16061,12 @@ class Effect4822(EffectDef):
 
 
 class Effect4823(EffectDef):
+    """
+    bcLargeEnergyTurretCPUNeedBonus
+
+    Used by:
+    Ship: Oracle
+    """
 
     type = 'passive'
 
@@ -9981,6 +16077,13 @@ class Effect4823(EffectDef):
 
 
 class Effect4824(EffectDef):
+    """
+    bcLargeHybridTurretCPUNeedBonus
+
+    Used by:
+    Ship: Naga
+    Ship: Talos
+    """
 
     type = 'passive'
 
@@ -9991,6 +16094,12 @@ class Effect4824(EffectDef):
 
 
 class Effect4825(EffectDef):
+    """
+    bcLargeProjectileTurretCPUNeedBonus
+
+    Used by:
+    Ship: Tornado
+    """
 
     type = 'passive'
 
@@ -10001,6 +16110,12 @@ class Effect4825(EffectDef):
 
 
 class Effect4826(EffectDef):
+    """
+    bcLargeEnergyTurretCapacitorNeedBonus
+
+    Used by:
+    Ship: Oracle
+    """
 
     type = 'passive'
 
@@ -10011,6 +16126,13 @@ class Effect4826(EffectDef):
 
 
 class Effect4827(EffectDef):
+    """
+    bcLargeHybridTurretCapacitorNeedBonus
+
+    Used by:
+    Ship: Naga
+    Ship: Talos
+    """
 
     type = 'passive'
 
@@ -10021,6 +16143,12 @@ class Effect4827(EffectDef):
 
 
 class Effect4867(EffectDef):
+    """
+    setBonusChristmasPowergrid
+
+    Used by:
+    Implants named like: Genolution Core Augmentation CA (4 of 4)
+    """
 
     runTime = 'early'
     type = 'passive'
@@ -10033,6 +16161,12 @@ class Effect4867(EffectDef):
 
 
 class Effect4868(EffectDef):
+    """
+    setBonusChristmasCapacitorCapacity
+
+    Used by:
+    Implants named like: Genolution Core Augmentation CA (4 of 4)
+    """
 
     runTime = 'early'
     type = 'passive'
@@ -10045,6 +16179,12 @@ class Effect4868(EffectDef):
 
 
 class Effect4869(EffectDef):
+    """
+    setBonusChristmasCPUOutput
+
+    Used by:
+    Implants named like: Genolution Core Augmentation CA (4 of 4)
+    """
 
     runTime = 'early'
     type = 'passive'
@@ -10056,6 +16196,12 @@ class Effect4869(EffectDef):
 
 
 class Effect4871(EffectDef):
+    """
+    setBonusChristmasCapacitorRecharge2
+
+    Used by:
+    Implants named like: Genolution Core Augmentation CA (4 of 4)
+    """
 
     runTime = 'early'
     type = 'passive'
@@ -10067,6 +16213,12 @@ class Effect4871(EffectDef):
 
 
 class Effect4896(EffectDef):
+    """
+    shipBonusDroneHitpointsGF2
+
+    Used by:
+    Ship: Ishkur
+    """
 
     type = 'passive'
 
@@ -10077,6 +16229,12 @@ class Effect4896(EffectDef):
 
 
 class Effect4897(EffectDef):
+    """
+    shipBonusDroneArmorHitpointsGF2
+
+    Used by:
+    Ship: Ishkur
+    """
 
     type = 'passive'
 
@@ -10087,6 +16245,12 @@ class Effect4897(EffectDef):
 
 
 class Effect4898(EffectDef):
+    """
+    shipBonusDroneShieldHitpointsGF2
+
+    Used by:
+    Ship: Ishkur
+    """
 
     type = 'passive'
 
@@ -10097,6 +16261,12 @@ class Effect4898(EffectDef):
 
 
 class Effect4901(EffectDef):
+    """
+    shipMissileSpeedBonusAF
+
+    Used by:
+    Ship: Vengeance
+    """
 
     type = 'passive'
 
@@ -10107,6 +16277,14 @@ class Effect4901(EffectDef):
 
 
 class Effect4902(EffectDef):
+    """
+    MWDSignatureRadiusRoleBonus
+
+    Used by:
+    Ships from group: Assault Frigate (8 of 12)
+    Ships from group: Command Destroyer (4 of 4)
+    Ships from group: Heavy Assault Cruiser (8 of 11)
+    """
 
     type = 'passive'
 
@@ -10117,6 +16295,12 @@ class Effect4902(EffectDef):
 
 
 class Effect4906(EffectDef):
+    """
+    systemDamageFighters
+
+    Used by:
+    Celestials named like: Magnetar Effect Beacon Class (6 of 6)
+    """
 
     runTime = 'early'
     type = ('projected', 'passive')
@@ -10129,6 +16313,12 @@ class Effect4906(EffectDef):
 
 
 class Effect4911(EffectDef):
+    """
+    modifyShieldRechargeRatePassive
+
+    Used by:
+    Modules named like: Processor Overclocking Unit (8 of 8)
+    """
 
     type = 'passive'
 
@@ -10138,6 +16328,12 @@ class Effect4911(EffectDef):
 
 
 class Effect4921(EffectDef):
+    """
+    microJumpDrive
+
+    Used by:
+    Modules from group: Micro Jump Drive (2 of 2)
+    """
 
     type = 'active'
 
@@ -10147,6 +16343,12 @@ class Effect4921(EffectDef):
 
 
 class Effect4923(EffectDef):
+    """
+    skillMJDdurationBonus
+
+    Used by:
+    Skill: Micro Jump Drive Operation
+    """
 
     type = 'passive'
 
@@ -10157,6 +16359,12 @@ class Effect4923(EffectDef):
 
 
 class Effect4928(EffectDef):
+    """
+    adaptiveArmorHardener
+
+    Used by:
+    Module: Reactive Armor Hardener
+    """
 
     runTime = 'late'
     type = 'active'
@@ -10282,6 +16490,12 @@ class Effect4928(EffectDef):
 
 
 class Effect4934(EffectDef):
+    """
+    shipArmorRepairingGF2
+
+    Used by:
+    Ship: Incursus
+    """
 
     type = 'passive'
 
@@ -10293,6 +16507,12 @@ class Effect4934(EffectDef):
 
 
 class Effect4936(EffectDef):
+    """
+    fueledShieldBoosting
+
+    Used by:
+    Modules from group: Ancillary Shield Booster (8 of 8)
+    """
 
     runTime = 'late'
     type = 'active'
@@ -10305,6 +16525,13 @@ class Effect4936(EffectDef):
 
 
 class Effect4941(EffectDef):
+    """
+    shipHybridDamageBonusCF2
+
+    Used by:
+    Ship: Griffin Navy Issue
+    Ship: Merlin
+    """
 
     type = 'passive'
 
@@ -10315,11 +16542,23 @@ class Effect4941(EffectDef):
 
 
 class Effect4942(EffectDef):
+    """
+    targetBreaker
+
+    Used by:
+    Module: Target Spectrum Breaker
+    """
 
     type = 'active'
 
 
 class Effect4945(EffectDef):
+    """
+    skillTargetBreakerDurationBonus2
+
+    Used by:
+    Skill: Target Breaker Amplification
+    """
 
     type = 'passive'
 
@@ -10330,6 +16569,12 @@ class Effect4945(EffectDef):
 
 
 class Effect4946(EffectDef):
+    """
+    skillTargetBreakerCapNeedBonus2
+
+    Used by:
+    Skill: Target Breaker Amplification
+    """
 
     type = 'passive'
 
@@ -10340,6 +16585,12 @@ class Effect4946(EffectDef):
 
 
 class Effect4950(EffectDef):
+    """
+    shipBonusShieldBoosterMB1a
+
+    Used by:
+    Ship: Maelstrom
+    """
 
     type = 'passive'
 
@@ -10350,6 +16601,14 @@ class Effect4950(EffectDef):
 
 
 class Effect4951(EffectDef):
+    """
+    shieldBoostAmplifierPassiveBooster
+
+    Used by:
+    Implants named like: Agency 'Hardshell' TB Dose (4 of 4)
+    Implants named like: Blue Pill Booster (5 of 5)
+    Implant: Antipharmakon Thureo
+    """
 
     type = 'passive'
 
@@ -10361,6 +16620,12 @@ class Effect4951(EffectDef):
 
 
 class Effect4961(EffectDef):
+    """
+    systemShieldRepairAmountShieldSkills
+
+    Used by:
+    Celestials named like: Cataclysmic Variable Effect Beacon Class (6 of 6)
+    """
 
     runTime = 'early'
     type = ('projected', 'passive')
@@ -10374,6 +16639,12 @@ class Effect4961(EffectDef):
 
 
 class Effect4967(EffectDef):
+    """
+    shieldBoosterDurationBonusShieldSkills
+
+    Used by:
+    Modules named like: Core Defense Operational Solidifier (8 of 8)
+    """
 
     type = 'passive'
 
@@ -10385,6 +16656,14 @@ class Effect4967(EffectDef):
 
 
 class Effect4970(EffectDef):
+    """
+    boosterShieldBoostAmountPenaltyShieldSkills
+
+    Used by:
+    Implants named like: Crash Booster (3 of 4)
+    Implants named like: Frentix Booster (3 of 4)
+    Implants named like: Mindflood Booster (3 of 4)
+    """
 
     attr = 'boosterShieldBoostAmountPenalty'
     displayName = 'Shield Boost'
@@ -10399,6 +16678,12 @@ class Effect4970(EffectDef):
 
 
 class Effect4972(EffectDef):
+    """
+    eliteBonusAssaultShipLightMissileROF
+
+    Used by:
+    Ship: Cambion
+    """
 
     type = 'passive'
 
@@ -10409,6 +16694,12 @@ class Effect4972(EffectDef):
 
 
 class Effect4973(EffectDef):
+    """
+    eliteBonusAssaultShipRocketROF
+
+    Used by:
+    Ship: Cambion
+    """
 
     type = 'passive'
 
@@ -10419,6 +16710,13 @@ class Effect4973(EffectDef):
 
 
 class Effect4974(EffectDef):
+    """
+    eliteBonusMarauderShieldBonus2a
+
+    Used by:
+    Ship: Golem
+    Ship: Vargur
+    """
 
     type = 'passive'
 
@@ -10429,6 +16727,12 @@ class Effect4974(EffectDef):
 
 
 class Effect4975(EffectDef):
+    """
+    shipBonusMissileKineticlATF2
+
+    Used by:
+    Ship: Cambion
+    """
 
     type = 'passive'
 
@@ -10439,6 +16743,12 @@ class Effect4975(EffectDef):
 
 
 class Effect4976(EffectDef):
+    """
+    skillReactiveArmorHardenerDurationBonus
+
+    Used by:
+    Skill: Resistance Phasing
+    """
 
     type = 'passive'
 
@@ -10452,6 +16762,12 @@ class Effect4976(EffectDef):
 
 
 class Effect4989(EffectDef):
+    """
+    missileSkillAoeCloudSizeBonusAllIncludingCapitals
+
+    Used by:
+    Implants named like: Crash Booster (4 of 4)
+    """
 
     type = 'passive'
 
@@ -10462,6 +16778,13 @@ class Effect4989(EffectDef):
 
 
 class Effect4990(EffectDef):
+    """
+    shipEnergyTCapNeedBonusRookie
+
+    Used by:
+    Ship: Hematos
+    Ship: Impairor
+    """
 
     type = 'passive'
 
@@ -10472,6 +16795,14 @@ class Effect4990(EffectDef):
 
 
 class Effect4991(EffectDef):
+    """
+    shipSETDmgBonusRookie
+
+    Used by:
+    Ship: Hematos
+    Ship: Immolator
+    Ship: Impairor
+    """
 
     type = 'passive'
 
@@ -10482,6 +16813,16 @@ class Effect4991(EffectDef):
 
 
 class Effect4994(EffectDef):
+    """
+    shipArmorEMResistanceRookie
+
+    Used by:
+    Ship: Devoter
+    Ship: Gold Magnate
+    Ship: Impairor
+    Ship: Phobos
+    Ship: Silver Magnate
+    """
 
     type = 'passive'
 
@@ -10491,6 +16832,16 @@ class Effect4994(EffectDef):
 
 
 class Effect4995(EffectDef):
+    """
+    shipArmorEXResistanceRookie
+
+    Used by:
+    Ship: Devoter
+    Ship: Gold Magnate
+    Ship: Impairor
+    Ship: Phobos
+    Ship: Silver Magnate
+    """
 
     type = 'passive'
 
@@ -10500,6 +16851,16 @@ class Effect4995(EffectDef):
 
 
 class Effect4996(EffectDef):
+    """
+    shipArmorKNResistanceRookie
+
+    Used by:
+    Ship: Devoter
+    Ship: Gold Magnate
+    Ship: Impairor
+    Ship: Phobos
+    Ship: Silver Magnate
+    """
 
     type = 'passive'
 
@@ -10509,6 +16870,16 @@ class Effect4996(EffectDef):
 
 
 class Effect4997(EffectDef):
+    """
+    shipArmorTHResistanceRookie
+
+    Used by:
+    Ship: Devoter
+    Ship: Gold Magnate
+    Ship: Impairor
+    Ship: Phobos
+    Ship: Silver Magnate
+    """
 
     type = 'passive'
 
@@ -10518,6 +16889,12 @@ class Effect4997(EffectDef):
 
 
 class Effect4999(EffectDef):
+    """
+    shipHybridRangeBonusRookie
+
+    Used by:
+    Ship: Ibis
+    """
 
     type = 'passive'
 
@@ -10528,6 +16905,12 @@ class Effect4999(EffectDef):
 
 
 class Effect5000(EffectDef):
+    """
+    shipMissileKineticDamageRookie
+
+    Used by:
+    Ship: Ibis
+    """
 
     type = 'passive'
 
@@ -10538,6 +16921,14 @@ class Effect5000(EffectDef):
 
 
 class Effect5008(EffectDef):
+    """
+    shipShieldEMResistanceRookie
+
+    Used by:
+    Ships from group: Heavy Interdiction Cruiser (3 of 5)
+    Ship: Ibis
+    Ship: Taipan
+    """
 
     type = 'passive'
 
@@ -10547,6 +16938,14 @@ class Effect5008(EffectDef):
 
 
 class Effect5009(EffectDef):
+    """
+    shipShieldExplosiveResistanceRookie
+
+    Used by:
+    Ships from group: Heavy Interdiction Cruiser (3 of 5)
+    Ship: Ibis
+    Ship: Taipan
+    """
 
     type = 'passive'
 
@@ -10556,6 +16955,14 @@ class Effect5009(EffectDef):
 
 
 class Effect5011(EffectDef):
+    """
+    shipShieldKineticResistanceRookie
+
+    Used by:
+    Ships from group: Heavy Interdiction Cruiser (3 of 5)
+    Ship: Ibis
+    Ship: Taipan
+    """
 
     type = 'passive'
 
@@ -10565,6 +16972,14 @@ class Effect5011(EffectDef):
 
 
 class Effect5012(EffectDef):
+    """
+    shipShieldThermalResistanceRookie
+
+    Used by:
+    Ships from group: Heavy Interdiction Cruiser (3 of 5)
+    Ship: Ibis
+    Ship: Taipan
+    """
 
     type = 'passive'
 
@@ -10574,6 +16989,14 @@ class Effect5012(EffectDef):
 
 
 class Effect5013(EffectDef):
+    """
+    shipSHTDmgBonusRookie
+
+    Used by:
+    Ship: Velator
+    Ship: Violator
+    Ship: Virtuoso
+    """
 
     type = 'passive'
 
@@ -10584,6 +17007,16 @@ class Effect5013(EffectDef):
 
 
 class Effect5014(EffectDef):
+    """
+    shipBonusDroneDamageMultiplierRookie
+
+    Used by:
+    Ship: Gnosis
+    Ship: Praxis
+    Ship: Sunesis
+    Ship: Taipan
+    Ship: Velator
+    """
 
     type = 'passive'
 
@@ -10594,6 +17027,12 @@ class Effect5014(EffectDef):
 
 
 class Effect5015(EffectDef):
+    """
+    shipBonusEwRemoteSensorDampenerMaxTargetRangeBonusRookie
+
+    Used by:
+    Ship: Velator
+    """
 
     type = 'passive'
 
@@ -10604,6 +17043,12 @@ class Effect5015(EffectDef):
 
 
 class Effect5016(EffectDef):
+    """
+    shipBonusEwRemoteSensorDampenerScanResolutionBonusRookie
+
+    Used by:
+    Ship: Velator
+    """
 
     type = 'passive'
 
@@ -10614,6 +17059,12 @@ class Effect5016(EffectDef):
 
 
 class Effect5017(EffectDef):
+    """
+    shipArmorRepairingRookie
+
+    Used by:
+    Ship: Velator
+    """
 
     type = 'passive'
 
@@ -10624,6 +17075,12 @@ class Effect5017(EffectDef):
 
 
 class Effect5018(EffectDef):
+    """
+    shipVelocityBonusRookie
+
+    Used by:
+    Ship: Reaper
+    """
 
     type = 'passive'
 
@@ -10633,6 +17090,12 @@ class Effect5018(EffectDef):
 
 
 class Effect5019(EffectDef):
+    """
+    minmatarShipEwTargetPainterRookie
+
+    Used by:
+    Ship: Reaper
+    """
 
     type = 'passive'
 
@@ -10643,6 +17106,13 @@ class Effect5019(EffectDef):
 
 
 class Effect5020(EffectDef):
+    """
+    shipSPTDmgBonusRookie
+
+    Used by:
+    Ship: Echo
+    Ship: Reaper
+    """
 
     type = 'passive'
 
@@ -10653,6 +17123,13 @@ class Effect5020(EffectDef):
 
 
 class Effect5021(EffectDef):
+    """
+    shipShieldBoostRookie
+
+    Used by:
+    Ship: Immolator
+    Ship: Reaper
+    """
 
     type = 'passive'
 
@@ -10663,6 +17140,12 @@ class Effect5021(EffectDef):
 
 
 class Effect5028(EffectDef):
+    """
+    shipECMScanStrengthBonusRookie
+
+    Used by:
+    Ship: Ibis
+    """
 
     type = 'passive'
 
@@ -10675,6 +17158,12 @@ class Effect5028(EffectDef):
 
 
 class Effect5029(EffectDef):
+    """
+    shipBonusDroneMiningAmountRole
+
+    Used by:
+    Ships from group: Industrial Command Ship (2 of 2)
+    """
 
     type = 'passive'
 
@@ -10687,6 +17176,15 @@ class Effect5029(EffectDef):
 
 
 class Effect5030(EffectDef):
+    """
+    shipBonusMiningDroneAmountPercentRookie
+
+    Used by:
+    Ship: Gnosis
+    Ship: Praxis
+    Ship: Taipan
+    Ship: Velator
+    """
 
     type = 'passive'
 
@@ -10697,6 +17195,17 @@ class Effect5030(EffectDef):
 
 
 class Effect5035(EffectDef):
+    """
+    shipBonusDroneHitpointsRookie
+
+    Used by:
+    Variations of ship: Procurer (2 of 2)
+    Ship: Gnosis
+    Ship: Praxis
+    Ship: Sunesis
+    Ship: Taipan
+    Ship: Velator
+    """
 
     type = 'passive'
 
@@ -10708,6 +17217,12 @@ class Effect5035(EffectDef):
 
 
 class Effect5036(EffectDef):
+    """
+    shipBonusSalvageCycleAF
+
+    Used by:
+    Ship: Magnate
+    """
 
     type = 'passive'
 
@@ -10718,6 +17233,12 @@ class Effect5036(EffectDef):
 
 
 class Effect5045(EffectDef):
+    """
+    shipBonusSalvageCycleCF
+
+    Used by:
+    Ship: Heron
+    """
 
     type = 'passive'
 
@@ -10728,6 +17249,12 @@ class Effect5045(EffectDef):
 
 
 class Effect5048(EffectDef):
+    """
+    shipBonusSalvageCycleGF
+
+    Used by:
+    Ship: Imicus
+    """
 
     type = 'passive'
 
@@ -10738,6 +17265,12 @@ class Effect5048(EffectDef):
 
 
 class Effect5051(EffectDef):
+    """
+    shipBonusSalvageCycleMF
+
+    Used by:
+    Ship: Probe
+    """
 
     type = 'passive'
 
@@ -10748,6 +17281,12 @@ class Effect5051(EffectDef):
 
 
 class Effect5055(EffectDef):
+    """
+    iceHarvesterDurationMultiplier
+
+    Used by:
+    Ship: Endurance
+    """
 
     type = 'passive'
 
@@ -10758,6 +17297,12 @@ class Effect5055(EffectDef):
 
 
 class Effect5058(EffectDef):
+    """
+    miningYieldMultiplyPassive
+
+    Used by:
+    Variations of ship: Venture (3 of 3)
+    """
 
     type = 'passive'
 
@@ -10768,6 +17313,13 @@ class Effect5058(EffectDef):
 
 
 class Effect5059(EffectDef):
+    """
+    shipBonusIceHarvesterDurationORE3
+
+    Used by:
+    Ships from group: Exhumer (3 of 3)
+    Ships from group: Mining Barge (3 of 3)
+    """
 
     type = 'passive'
 
@@ -10778,6 +17330,13 @@ class Effect5059(EffectDef):
 
 
 class Effect5066(EffectDef):
+    """
+    shipBonusTargetPainterOptimalMF1
+
+    Used by:
+    Ship: Hyena
+    Ship: Vigil
+    """
 
     type = 'passive'
 
@@ -10788,6 +17347,12 @@ class Effect5066(EffectDef):
 
 
 class Effect5067(EffectDef):
+    """
+    shipBonusOreHoldORE2
+
+    Used by:
+    Variations of ship: Retriever (2 of 2)
+    """
 
     type = 'passive'
 
@@ -10797,6 +17362,12 @@ class Effect5067(EffectDef):
 
 
 class Effect5068(EffectDef):
+    """
+    shipBonusShieldCapacityORE2
+
+    Used by:
+    Variations of ship: Procurer (2 of 2)
+    """
 
     type = 'passive'
 
@@ -10806,6 +17377,12 @@ class Effect5068(EffectDef):
 
 
 class Effect5069(EffectDef):
+    """
+    mercoxitCrystalBonus
+
+    Used by:
+    Module: Medium Mercoxit Mining Crystal Optimization I
+    """
 
     runTime = 'early'
     type = 'passive'
@@ -10818,6 +17395,12 @@ class Effect5069(EffectDef):
 
 
 class Effect5079(EffectDef):
+    """
+    shipMissileKineticDamageCF2
+
+    Used by:
+    Ship: Garmur
+    """
 
     type = 'passive'
 
@@ -10828,6 +17411,14 @@ class Effect5079(EffectDef):
 
 
 class Effect5080(EffectDef):
+    """
+    shipMissileVelocityCF
+
+    Used by:
+    Ship: Caldari Navy Hookbill
+    Ship: Crow
+    Ship: Kestrel
+    """
 
     type = 'passive'
 
@@ -10838,6 +17429,12 @@ class Effect5080(EffectDef):
 
 
 class Effect5081(EffectDef):
+    """
+    maxTargetingRangeBonusPostPercentPassive
+
+    Used by:
+    Modules named like: Ionic Field Projector (8 of 8)
+    """
 
     type = 'passive'
 
@@ -10848,6 +17445,14 @@ class Effect5081(EffectDef):
 
 
 class Effect5087(EffectDef):
+    """
+    shipBonusDroneHitpointsGF
+
+    Used by:
+    Ship: Astero
+    Ship: Maulus Navy Issue
+    Ship: Tristan
+    """
 
     type = 'passive'
 
@@ -10859,6 +17464,13 @@ class Effect5087(EffectDef):
 
 
 class Effect5090(EffectDef):
+    """
+    shipShieldBoostMF
+
+    Used by:
+    Ship: Breacher
+    Ship: Jaguar
+    """
 
     type = 'passive'
 
@@ -10869,6 +17481,12 @@ class Effect5090(EffectDef):
 
 
 class Effect5103(EffectDef):
+    """
+    shipBonusShieldTransferCapNeedCF
+
+    Used by:
+    Variations of ship: Bantam (2 of 2)
+    """
 
     type = 'passive'
 
@@ -10879,6 +17497,12 @@ class Effect5103(EffectDef):
 
 
 class Effect5104(EffectDef):
+    """
+    shipBonusShieldTransferBoostAmountCF2
+
+    Used by:
+    Variations of ship: Bantam (2 of 2)
+    """
 
     type = 'passive'
 
@@ -10889,6 +17513,12 @@ class Effect5104(EffectDef):
 
 
 class Effect5105(EffectDef):
+    """
+    shipBonusShieldTransferCapNeedMF
+
+    Used by:
+    Variations of ship: Burst (2 of 2)
+    """
 
     type = 'passive'
 
@@ -10899,6 +17529,12 @@ class Effect5105(EffectDef):
 
 
 class Effect5106(EffectDef):
+    """
+    shipBonusShieldTransferBoostAmountMF2
+
+    Used by:
+    Variations of ship: Burst (2 of 2)
+    """
 
     type = 'passive'
 
@@ -10909,6 +17545,12 @@ class Effect5106(EffectDef):
 
 
 class Effect5107(EffectDef):
+    """
+    shipBonusRemoteArmorRepairCapNeedGF
+
+    Used by:
+    Variations of ship: Navitas (2 of 2)
+    """
 
     type = 'passive'
 
@@ -10919,6 +17561,12 @@ class Effect5107(EffectDef):
 
 
 class Effect5108(EffectDef):
+    """
+    shipBonusRemoteArmorRepairAmountGF2
+
+    Used by:
+    Variations of ship: Navitas (2 of 2)
+    """
 
     type = 'passive'
 
@@ -10930,6 +17578,13 @@ class Effect5108(EffectDef):
 
 
 class Effect5109(EffectDef):
+    """
+    shipBonusRemoteArmorRepairCapNeedAF
+
+    Used by:
+    Ship: Deacon
+    Ship: Inquisitor
+    """
 
     type = 'passive'
 
@@ -10940,6 +17595,13 @@ class Effect5109(EffectDef):
 
 
 class Effect5110(EffectDef):
+    """
+    shipBonusRemoteArmorRepairAmount2AF
+
+    Used by:
+    Ship: Deacon
+    Ship: Inquisitor
+    """
 
     type = 'passive'
 
@@ -10950,6 +17612,13 @@ class Effect5110(EffectDef):
 
 
 class Effect5111(EffectDef):
+    """
+    shipBonusDroneTrackingGF
+
+    Used by:
+    Ship: Maulus Navy Issue
+    Ship: Tristan
+    """
 
     type = 'passive'
 
@@ -10960,6 +17629,12 @@ class Effect5111(EffectDef):
 
 
 class Effect5119(EffectDef):
+    """
+    shipBonusScanProbeStrength2AF
+
+    Used by:
+    Ship: Magnate
+    """
 
     type = 'passive'
 
@@ -10971,6 +17646,13 @@ class Effect5119(EffectDef):
 
 
 class Effect5121(EffectDef):
+    """
+    energyTransferArrayTransferAmountBonus
+
+    Used by:
+    Ship: Augoror
+    Ship: Osprey
+    """
 
     type = 'passive'
 
@@ -10981,6 +17663,12 @@ class Effect5121(EffectDef):
 
 
 class Effect5122(EffectDef):
+    """
+    shipBonusShieldTransferCapneedMC1
+
+    Used by:
+    Ship: Scythe
+    """
 
     type = 'passive'
 
@@ -10991,6 +17679,12 @@ class Effect5122(EffectDef):
 
 
 class Effect5123(EffectDef):
+    """
+    shipBonusRemoteArmorRepairCapNeedAC1
+
+    Used by:
+    Ship: Augoror
+    """
 
     type = 'passive'
 
@@ -11001,6 +17695,12 @@ class Effect5123(EffectDef):
 
 
 class Effect5124(EffectDef):
+    """
+    shipBonusRemoteArmorRepairAmountAC2
+
+    Used by:
+    Ship: Augoror
+    """
 
     type = 'passive'
 
@@ -11011,6 +17711,12 @@ class Effect5124(EffectDef):
 
 
 class Effect5125(EffectDef):
+    """
+    shipBonusRemoteArmorRepairAmountGC2
+
+    Used by:
+    Ship: Exequror
+    """
 
     type = 'passive'
 
@@ -11022,6 +17728,12 @@ class Effect5125(EffectDef):
 
 
 class Effect5126(EffectDef):
+    """
+    shipBonusShieldTransferBoostAmountCC2
+
+    Used by:
+    Ship: Osprey
+    """
 
     type = 'passive'
 
@@ -11032,6 +17744,12 @@ class Effect5126(EffectDef):
 
 
 class Effect5127(EffectDef):
+    """
+    shipBonusShieldTransferBoostAmountMC2
+
+    Used by:
+    Ship: Scythe
+    """
 
     type = 'passive'
 
@@ -11042,6 +17760,12 @@ class Effect5127(EffectDef):
 
 
 class Effect5128(EffectDef):
+    """
+    shipBonusEwRemoteSensorDampenerOptimalBonusGC1
+
+    Used by:
+    Ship: Celestis
+    """
 
     type = 'passive'
 
@@ -11052,6 +17776,13 @@ class Effect5128(EffectDef):
 
 
 class Effect5129(EffectDef):
+    """
+    minmatarShipEwTargetPainterMC1
+
+    Used by:
+    Ship: Bellicose
+    Ship: Rapier
+    """
 
     type = 'passive'
 
@@ -11063,6 +17794,13 @@ class Effect5129(EffectDef):
 
 
 class Effect5131(EffectDef):
+    """
+    shipMissileRofCC
+
+    Used by:
+    Ships named like: Caracal (2 of 2)
+    Ship: Enforcer
+    """
 
     type = 'passive'
 
@@ -11074,6 +17812,13 @@ class Effect5131(EffectDef):
 
 
 class Effect5132(EffectDef):
+    """
+    shipPTurretFalloffBonusMC2
+
+    Used by:
+    Ship: Enforcer
+    Ship: Stabber
+    """
 
     type = 'passive'
 
@@ -11084,6 +17829,12 @@ class Effect5132(EffectDef):
 
 
 class Effect5133(EffectDef):
+    """
+    shipHTDamageBonusCC
+
+    Used by:
+    Ship: Moa
+    """
 
     type = 'passive'
 
@@ -11094,6 +17845,15 @@ class Effect5133(EffectDef):
 
 
 class Effect5136(EffectDef):
+    """
+    shipMETCDamageBonusAC
+
+    Used by:
+    Ship: Augoror Navy Issue
+    Ship: Enforcer
+    Ship: Maller
+    Ship: Omen Navy Issue
+    """
 
     type = 'passive'
 
@@ -11104,6 +17864,12 @@ class Effect5136(EffectDef):
 
 
 class Effect5139(EffectDef):
+    """
+    shipMiningBonusOREfrig1
+
+    Used by:
+    Variations of ship: Venture (3 of 3)
+    """
 
     type = 'passive'
 
@@ -11115,6 +17881,13 @@ class Effect5139(EffectDef):
 
 
 class Effect5142(EffectDef):
+    """
+    GCHYieldMultiplyPassive
+
+    Used by:
+    Ship: Prospect
+    Ship: Venture
+    """
 
     type = 'passive'
 
@@ -11125,6 +17898,13 @@ class Effect5142(EffectDef):
 
 
 class Effect5153(EffectDef):
+    """
+    shipMissileVelocityPirateFactionRocket
+
+    Used by:
+    Ship: Corax
+    Ship: Talwar
+    """
 
     type = 'passive'
 
@@ -11135,6 +17915,13 @@ class Effect5153(EffectDef):
 
 
 class Effect5156(EffectDef):
+    """
+    shipGCHYieldBonusOREfrig2
+
+    Used by:
+    Ship: Prospect
+    Ship: Venture
+    """
 
     type = 'passive'
 
@@ -11145,6 +17932,12 @@ class Effect5156(EffectDef):
 
 
 class Effect5162(EffectDef):
+    """
+    skillReactiveArmorHardenerCapNeedBonus
+
+    Used by:
+    Skill: Resistance Phasing
+    """
 
     type = 'passive'
 
@@ -11158,6 +17951,13 @@ class Effect5162(EffectDef):
 
 
 class Effect5165(EffectDef):
+    """
+    shipBonusDroneMWDboostrole
+
+    Used by:
+    Ship: Algos
+    Ship: Dragoon
+    """
 
     type = 'passive'
 
@@ -11168,6 +17968,12 @@ class Effect5165(EffectDef):
 
 
 class Effect5168(EffectDef):
+    """
+    droneSalvageBonus
+
+    Used by:
+    Skill: Salvage Drone Operation
+    """
 
     type = 'passive'
 
@@ -11179,6 +17985,12 @@ class Effect5168(EffectDef):
 
 
 class Effect5180(EffectDef):
+    """
+    sensorCompensationSensorStrengthBonusGravimetric
+
+    Used by:
+    Skill: Gravimetric Sensor Compensation
+    """
 
     type = 'passive'
 
@@ -11189,6 +18001,12 @@ class Effect5180(EffectDef):
 
 
 class Effect5181(EffectDef):
+    """
+    sensorCompensationSensorStrengthBonusLadar
+
+    Used by:
+    Skill: Ladar Sensor Compensation
+    """
 
     type = 'passive'
 
@@ -11198,6 +18016,12 @@ class Effect5181(EffectDef):
 
 
 class Effect5182(EffectDef):
+    """
+    sensorCompensationSensorStrengthBonusMagnetometric
+
+    Used by:
+    Skill: Magnetometric Sensor Compensation
+    """
 
     type = 'passive'
 
@@ -11208,6 +18032,12 @@ class Effect5182(EffectDef):
 
 
 class Effect5183(EffectDef):
+    """
+    sensorCompensationSensorStrengthBonusRadar
+
+    Used by:
+    Skill: Radar Sensor Compensation
+    """
 
     type = 'passive'
 
@@ -11217,6 +18047,12 @@ class Effect5183(EffectDef):
 
 
 class Effect5185(EffectDef):
+    """
+    shipEnergyVampireAmountBonusFixedAF2
+
+    Used by:
+    Ship: Malice
+    """
 
     type = 'passive'
 
@@ -11228,6 +18064,12 @@ class Effect5185(EffectDef):
 
 
 class Effect5187(EffectDef):
+    """
+    shipBonusEwRemoteSensorDampenerFalloffBonusGC1
+
+    Used by:
+    Ship: Celestis
+    """
 
     type = 'passive'
 
@@ -11239,6 +18081,12 @@ class Effect5187(EffectDef):
 
 
 class Effect5188(EffectDef):
+    """
+    trackingSpeedBonusEffectHybrids
+
+    Used by:
+    Modules named like: Hybrid Metastasis Adjuster (8 of 8)
+    """
 
     type = 'passive'
 
@@ -11250,6 +18098,12 @@ class Effect5188(EffectDef):
 
 
 class Effect5189(EffectDef):
+    """
+    trackingSpeedBonusEffectLasers
+
+    Used by:
+    Modules named like: Energy Metastasis Adjuster (8 of 8)
+    """
 
     type = 'passive'
 
@@ -11261,6 +18115,12 @@ class Effect5189(EffectDef):
 
 
 class Effect5190(EffectDef):
+    """
+    trackingSpeedBonusEffectProjectiles
+
+    Used by:
+    Modules named like: Projectile Metastasis Adjuster (8 of 8)
+    """
 
     type = 'passive'
 
@@ -11272,6 +18132,12 @@ class Effect5190(EffectDef):
 
 
 class Effect5201(EffectDef):
+    """
+    armorUpgradesMassPenaltyReductionBonus
+
+    Used by:
+    Skill: Armor Layering
+    """
 
     type = 'passive'
 
@@ -11283,6 +18149,12 @@ class Effect5201(EffectDef):
 
 
 class Effect5205(EffectDef):
+    """
+    shipSETTrackingBonusRookie
+
+    Used by:
+    Ship: Immolator
+    """
 
     type = 'passive'
 
@@ -11293,6 +18165,12 @@ class Effect5205(EffectDef):
 
 
 class Effect5206(EffectDef):
+    """
+    shipSETOptimalBonusRookie
+
+    Used by:
+    Ship: Immolator
+    """
 
     type = 'passive'
 
@@ -11303,6 +18181,12 @@ class Effect5206(EffectDef):
 
 
 class Effect5207(EffectDef):
+    """
+    shipNOSTransferAmountBonusRookie
+
+    Used by:
+    Ship: Hematos
+    """
 
     type = 'passive'
 
@@ -11313,6 +18197,12 @@ class Effect5207(EffectDef):
 
 
 class Effect5208(EffectDef):
+    """
+    shipNeutDestabilizationAmountBonusRookie
+
+    Used by:
+    Ship: Hematos
+    """
 
     type = 'passive'
 
@@ -11323,6 +18213,13 @@ class Effect5208(EffectDef):
 
 
 class Effect5209(EffectDef):
+    """
+    shipWebVelocityBonusRookie
+
+    Used by:
+    Ship: Hematos
+    Ship: Violator
+    """
 
     type = 'passive'
 
@@ -11333,6 +18230,12 @@ class Effect5209(EffectDef):
 
 
 class Effect5212(EffectDef):
+    """
+    shipDroneMWDSpeedBonusRookie
+
+    Used by:
+    Ship: Taipan
+    """
 
     type = 'passive'
 
@@ -11343,6 +18246,12 @@ class Effect5212(EffectDef):
 
 
 class Effect5213(EffectDef):
+    """
+    shipRocketMaxVelocityBonusRookie
+
+    Used by:
+    Ship: Taipan
+    """
 
     type = 'passive'
 
@@ -11353,6 +18262,12 @@ class Effect5213(EffectDef):
 
 
 class Effect5214(EffectDef):
+    """
+    shipLightMissileMaxVelocityBonusRookie
+
+    Used by:
+    Ship: Taipan
+    """
 
     type = 'passive'
 
@@ -11363,6 +18278,12 @@ class Effect5214(EffectDef):
 
 
 class Effect5215(EffectDef):
+    """
+    shipSHTTrackingSpeedBonusRookie
+
+    Used by:
+    Ship: Violator
+    """
 
     type = 'passive'
 
@@ -11373,6 +18294,12 @@ class Effect5215(EffectDef):
 
 
 class Effect5216(EffectDef):
+    """
+    shipSHTFalloffBonusRookie
+
+    Used by:
+    Ship: Violator
+    """
 
     type = 'passive'
 
@@ -11383,6 +18310,12 @@ class Effect5216(EffectDef):
 
 
 class Effect5217(EffectDef):
+    """
+    shipSPTTrackingSpeedBonusRookie
+
+    Used by:
+    Ship: Echo
+    """
 
     type = 'passive'
 
@@ -11393,6 +18326,12 @@ class Effect5217(EffectDef):
 
 
 class Effect5218(EffectDef):
+    """
+    shipSPTFalloffBonusRookie
+
+    Used by:
+    Ship: Echo
+    """
 
     type = 'passive'
 
@@ -11403,6 +18342,12 @@ class Effect5218(EffectDef):
 
 
 class Effect5219(EffectDef):
+    """
+    shipSPTOptimalRangeBonusRookie
+
+    Used by:
+    Ship: Echo
+    """
 
     type = 'passive'
 
@@ -11413,6 +18358,12 @@ class Effect5219(EffectDef):
 
 
 class Effect5220(EffectDef):
+    """
+    shipProjectileDmgPirateCruiser
+
+    Used by:
+    Ship: Gnosis
+    """
 
     type = 'passive'
 
@@ -11423,6 +18374,12 @@ class Effect5220(EffectDef):
 
 
 class Effect5221(EffectDef):
+    """
+    shipHeavyAssaultMissileEMDmgPirateCruiser
+
+    Used by:
+    Ship: Gnosis
+    """
 
     type = 'passive'
 
@@ -11433,6 +18390,12 @@ class Effect5221(EffectDef):
 
 
 class Effect5222(EffectDef):
+    """
+    shipHeavyAssaultMissileKinDmgPirateCruiser
+
+    Used by:
+    Ship: Gnosis
+    """
 
     type = 'passive'
 
@@ -11443,6 +18406,12 @@ class Effect5222(EffectDef):
 
 
 class Effect5223(EffectDef):
+    """
+    shipHeavyAssaultMissileThermDmgPirateCruiser
+
+    Used by:
+    Ship: Gnosis
+    """
 
     type = 'passive'
 
@@ -11453,6 +18422,12 @@ class Effect5223(EffectDef):
 
 
 class Effect5224(EffectDef):
+    """
+    shipHeavyAssaultMissileExpDmgPirateCruiser
+
+    Used by:
+    Ship: Gnosis
+    """
 
     type = 'passive'
 
@@ -11463,6 +18438,12 @@ class Effect5224(EffectDef):
 
 
 class Effect5225(EffectDef):
+    """
+    shipHeavyMissileEMDmgPirateCruiser
+
+    Used by:
+    Ship: Gnosis
+    """
 
     type = 'passive'
 
@@ -11473,6 +18454,12 @@ class Effect5225(EffectDef):
 
 
 class Effect5226(EffectDef):
+    """
+    shipHeavyMissileExpDmgPirateCruiser
+
+    Used by:
+    Ship: Gnosis
+    """
 
     type = 'passive'
 
@@ -11483,6 +18470,12 @@ class Effect5226(EffectDef):
 
 
 class Effect5227(EffectDef):
+    """
+    shipHeavyMissileKinDmgPirateCruiser
+
+    Used by:
+    Ship: Gnosis
+    """
 
     type = 'passive'
 
@@ -11493,6 +18486,12 @@ class Effect5227(EffectDef):
 
 
 class Effect5228(EffectDef):
+    """
+    shipHeavyMissileThermDmgPirateCruiser
+
+    Used by:
+    Ship: Gnosis
+    """
 
     type = 'passive'
 
@@ -11503,6 +18502,16 @@ class Effect5228(EffectDef):
 
 
 class Effect5229(EffectDef):
+    """
+    shipScanProbeStrengthBonusPirateCruiser
+
+    Used by:
+    Ships named like: Stratios (2 of 2)
+    Ship: Astero
+    Ship: Gnosis
+    Ship: Praxis
+    Ship: Sunesis
+    """
 
     type = 'passive'
 
@@ -11513,6 +18522,13 @@ class Effect5229(EffectDef):
 
 
 class Effect5230(EffectDef):
+    """
+    modifyActiveShieldResonancePostPercent
+
+    Used by:
+    Modules from group: Flex Shield Hardener (5 of 5)
+    Modules from group: Shield Hardener (97 of 97)
+    """
 
     type = 'active'
 
@@ -11525,6 +18541,13 @@ class Effect5230(EffectDef):
 
 
 class Effect5231(EffectDef):
+    """
+    modifyActiveArmorResonancePostPercent
+
+    Used by:
+    Modules from group: Armor Hardener (156 of 156)
+    Modules from group: Flex Armor Hardener (4 of 4)
+    """
 
     type = 'active'
 
@@ -11537,6 +18560,13 @@ class Effect5231(EffectDef):
 
 
 class Effect5234(EffectDef):
+    """
+    shipSmallMissileExpDmgCF2
+
+    Used by:
+    Ship: Caldari Navy Hookbill
+    Ship: Kestrel
+    """
 
     type = 'passive'
 
@@ -11548,6 +18578,12 @@ class Effect5234(EffectDef):
 
 
 class Effect5237(EffectDef):
+    """
+    shipSmallMissileKinDmgCF2
+
+    Used by:
+    Ship: Kestrel
+    """
 
     type = 'passive'
 
@@ -11559,6 +18595,13 @@ class Effect5237(EffectDef):
 
 
 class Effect5240(EffectDef):
+    """
+    shipSmallMissileThermDmgCF2
+
+    Used by:
+    Ship: Caldari Navy Hookbill
+    Ship: Kestrel
+    """
 
     type = 'passive'
 
@@ -11570,6 +18613,13 @@ class Effect5240(EffectDef):
 
 
 class Effect5243(EffectDef):
+    """
+    shipSmallMissileEMDmgCF2
+
+    Used by:
+    Ship: Caldari Navy Hookbill
+    Ship: Kestrel
+    """
 
     type = 'passive'
 
@@ -11581,6 +18631,12 @@ class Effect5243(EffectDef):
 
 
 class Effect5259(EffectDef):
+    """
+    reconShipCloakCpuBonus1
+
+    Used by:
+    Ships from group: Force Recon Ship (7 of 9)
+    """
 
     runTime = 'early'
     type = 'passive'
@@ -11592,6 +18648,12 @@ class Effect5259(EffectDef):
 
 
 class Effect5260(EffectDef):
+    """
+    covertOpsCloakCpuPercentBonus1
+
+    Used by:
+    Ships from group: Covert Ops (6 of 8)
+    """
 
     runTime = 'early'
     type = 'passive'
@@ -11603,6 +18665,13 @@ class Effect5260(EffectDef):
 
 
 class Effect5261(EffectDef):
+    """
+    CovertCloakCPUAddition
+
+    Used by:
+    Modules named like: Covert Ops Cloaking Device II (2 of 2)
+    Module: Covert Cynosural Field Generator I
+    """
 
     type = 'passive'
 
@@ -11612,6 +18681,12 @@ class Effect5261(EffectDef):
 
 
 class Effect5262(EffectDef):
+    """
+    covertOpsCloakCpuPenalty
+
+    Used by:
+    Subsystems from group: Defensive Systems (8 of 12)
+    """
 
     type = 'passive'
 
@@ -11622,6 +18697,12 @@ class Effect5262(EffectDef):
 
 
 class Effect5263(EffectDef):
+    """
+    covertCynoCpuPenalty
+
+    Used by:
+    Subsystems from group: Defensive Systems (8 of 12)
+    """
 
     type = 'passive'
 
@@ -11632,6 +18713,13 @@ class Effect5263(EffectDef):
 
 
 class Effect5264(EffectDef):
+    """
+    warfareLinkCPUAddition
+
+    Used by:
+    Modules from group: Command Burst (10 of 10)
+    Modules from group: Gang Coordinator (6 of 6)
+    """
 
     type = 'passive'
 
@@ -11641,6 +18729,12 @@ class Effect5264(EffectDef):
 
 
 class Effect5265(EffectDef):
+    """
+    warfareLinkCpuPenalty
+
+    Used by:
+    Subsystems from group: Offensive Systems (8 of 12)
+    """
 
     type = 'passive'
 
@@ -11651,6 +18745,12 @@ class Effect5265(EffectDef):
 
 
 class Effect5266(EffectDef):
+    """
+    blockadeRunnerCloakCpuPercentBonus
+
+    Used by:
+    Ships from group: Blockade Runner (4 of 4)
+    """
 
     runTime = 'early'
     type = 'passive'
@@ -11663,6 +18763,13 @@ class Effect5266(EffectDef):
 
 
 class Effect5267(EffectDef):
+    """
+    drawbackRepairSystemsPGNeed
+
+    Used by:
+    Modules named like: Auxiliary Nano Pump (6 of 8)
+    Modules named like: Nanobot Accelerator (6 of 8)
+    """
 
     type = 'passive'
 
@@ -11673,6 +18780,13 @@ class Effect5267(EffectDef):
 
 
 class Effect5268(EffectDef):
+    """
+    drawbackCapRepPGNeed
+
+    Used by:
+    Variations of module: Capital Auxiliary Nano Pump I (2 of 2)
+    Variations of module: Capital Nanobot Accelerator I (2 of 2)
+    """
 
     type = 'passive'
 
@@ -11683,6 +18797,12 @@ class Effect5268(EffectDef):
 
 
 class Effect5275(EffectDef):
+    """
+    fueledArmorRepair
+
+    Used by:
+    Modules from group: Ancillary Armor Repairer (7 of 7)
+    """
 
     runTime = 'late'
     type = 'active'
@@ -11703,6 +18823,12 @@ class Effect5275(EffectDef):
 
 
 class Effect5293(EffectDef):
+    """
+    shipLaserCapNeed2AD1
+
+    Used by:
+    Ship: Coercer
+    """
 
     type = 'passive'
 
@@ -11713,6 +18839,12 @@ class Effect5293(EffectDef):
 
 
 class Effect5294(EffectDef):
+    """
+    shipLaserTracking2AD2
+
+    Used by:
+    Ship: Coercer
+    """
 
     type = 'passive'
 
@@ -11723,6 +18855,12 @@ class Effect5294(EffectDef):
 
 
 class Effect5295(EffectDef):
+    """
+    shipBonusDroneDamageMultiplierAD1
+
+    Used by:
+    Variations of ship: Dragoon (2 of 2)
+    """
 
     type = 'passive'
 
@@ -11733,6 +18871,12 @@ class Effect5295(EffectDef):
 
 
 class Effect5300(EffectDef):
+    """
+    shipBonusDroneHitpointsAD1
+
+    Used by:
+    Variations of ship: Dragoon (2 of 2)
+    """
 
     type = 'passive'
 
@@ -11747,6 +18891,12 @@ class Effect5300(EffectDef):
 
 
 class Effect5303(EffectDef):
+    """
+    shipHybridRange1CD1
+
+    Used by:
+    Ship: Cormorant
+    """
 
     type = 'passive'
 
@@ -11757,6 +18907,12 @@ class Effect5303(EffectDef):
 
 
 class Effect5304(EffectDef):
+    """
+    shipHybridTrackingCD2
+
+    Used by:
+    Ship: Cormorant
+    """
 
     type = 'passive'
 
@@ -11767,6 +18923,12 @@ class Effect5304(EffectDef):
 
 
 class Effect5305(EffectDef):
+    """
+    shipBonusFrigateSizedMissileKineticDamageCD1
+
+    Used by:
+    Ship: Corax
+    """
 
     type = 'passive'
 
@@ -11778,6 +18940,12 @@ class Effect5305(EffectDef):
 
 
 class Effect5306(EffectDef):
+    """
+    shipRocketKineticDmgCD1
+
+    Used by:
+    Ship: Corax
+    """
 
     type = 'passive'
 
@@ -11789,6 +18957,12 @@ class Effect5306(EffectDef):
 
 
 class Effect5307(EffectDef):
+    """
+    shipBonusAoeVelocityRocketsCD2
+
+    Used by:
+    Ship: Corax
+    """
 
     type = 'passive'
 
@@ -11799,6 +18973,12 @@ class Effect5307(EffectDef):
 
 
 class Effect5308(EffectDef):
+    """
+    shipBonusAoeVelocityStandardMissilesCD2
+
+    Used by:
+    Ship: Corax
+    """
 
     type = 'passive'
 
@@ -11809,6 +18989,12 @@ class Effect5308(EffectDef):
 
 
 class Effect5309(EffectDef):
+    """
+    shipHybridFallOff1GD1
+
+    Used by:
+    Ship: Catalyst
+    """
 
     type = 'passive'
 
@@ -11819,6 +19005,13 @@ class Effect5309(EffectDef):
 
 
 class Effect5310(EffectDef):
+    """
+    shipHybridTracking1GD2
+
+    Used by:
+    Variations of ship: Catalyst (2 of 2)
+    Ship: Algos
+    """
 
     type = 'passive'
 
@@ -11829,6 +19022,12 @@ class Effect5310(EffectDef):
 
 
 class Effect5311(EffectDef):
+    """
+    shipBonusDroneDamageMultiplierGD1
+
+    Used by:
+    Variations of ship: Algos (2 of 2)
+    """
 
     type = 'passive'
 
@@ -11839,6 +19038,12 @@ class Effect5311(EffectDef):
 
 
 class Effect5316(EffectDef):
+    """
+    shipBonusDroneHitpointsGD1
+
+    Used by:
+    Variations of ship: Algos (2 of 2)
+    """
 
     type = 'passive'
 
@@ -11853,6 +19058,12 @@ class Effect5316(EffectDef):
 
 
 class Effect5317(EffectDef):
+    """
+    shipProjectileDamageMD1
+
+    Used by:
+    Variations of ship: Thrasher (2 of 2)
+    """
 
     type = 'passive'
 
@@ -11864,6 +19075,12 @@ class Effect5317(EffectDef):
 
 
 class Effect5318(EffectDef):
+    """
+    shipProjectileTracking1MD2
+
+    Used by:
+    Variations of ship: Thrasher (2 of 2)
+    """
 
     type = 'passive'
 
@@ -11874,6 +19091,12 @@ class Effect5318(EffectDef):
 
 
 class Effect5319(EffectDef):
+    """
+    shipBonusFrigateSizedLightMissileExplosiveDamageMD1
+
+    Used by:
+    Ship: Talwar
+    """
 
     type = 'passive'
 
@@ -11885,6 +19108,12 @@ class Effect5319(EffectDef):
 
 
 class Effect5320(EffectDef):
+    """
+    shipRocketExplosiveDmgMD1
+
+    Used by:
+    Ship: Talwar
+    """
 
     type = 'passive'
 
@@ -11896,6 +19125,12 @@ class Effect5320(EffectDef):
 
 
 class Effect5321(EffectDef):
+    """
+    shipBonusMWDSignatureRadiusMD2
+
+    Used by:
+    Ship: Talwar
+    """
 
     type = 'passive'
 
@@ -11907,6 +19142,13 @@ class Effect5321(EffectDef):
 
 
 class Effect5322(EffectDef):
+    """
+    shipArmorEMResistance1ABC1
+
+    Used by:
+    Variations of ship: Prophecy (2 of 2)
+    Ship: Absolution
+    """
 
     type = 'passive'
 
@@ -11917,6 +19159,13 @@ class Effect5322(EffectDef):
 
 
 class Effect5323(EffectDef):
+    """
+    shipArmorExplosiveResistance1ABC1
+
+    Used by:
+    Variations of ship: Prophecy (2 of 2)
+    Ship: Absolution
+    """
 
     type = 'passive'
 
@@ -11927,6 +19176,13 @@ class Effect5323(EffectDef):
 
 
 class Effect5324(EffectDef):
+    """
+    shipArmorKineticResistance1ABC1
+
+    Used by:
+    Variations of ship: Prophecy (2 of 2)
+    Ship: Absolution
+    """
 
     type = 'passive'
 
@@ -11937,6 +19193,13 @@ class Effect5324(EffectDef):
 
 
 class Effect5325(EffectDef):
+    """
+    shipArmorThermResistance1ABC1
+
+    Used by:
+    Variations of ship: Prophecy (2 of 2)
+    Ship: Absolution
+    """
 
     type = 'passive'
 
@@ -11947,6 +19210,12 @@ class Effect5325(EffectDef):
 
 
 class Effect5326(EffectDef):
+    """
+    shipBonusDroneDamageMultiplierABC2
+
+    Used by:
+    Ship: Prophecy
+    """
 
     type = 'passive'
 
@@ -11958,6 +19227,12 @@ class Effect5326(EffectDef):
 
 
 class Effect5331(EffectDef):
+    """
+    shipBonusDroneHitpointsABC2
+
+    Used by:
+    Ship: Prophecy
+    """
 
     type = 'passive'
 
@@ -11969,6 +19244,12 @@ class Effect5331(EffectDef):
 
 
 class Effect5332(EffectDef):
+    """
+    shipLaserCapABC1
+
+    Used by:
+    Ship: Harbinger
+    """
 
     type = 'passive'
 
@@ -11980,6 +19261,12 @@ class Effect5332(EffectDef):
 
 
 class Effect5333(EffectDef):
+    """
+    shipLaserDamageBonusABC2
+
+    Used by:
+    Ships named like: Harbinger (2 of 2)
+    """
 
     type = 'passive'
 
@@ -11991,6 +19278,12 @@ class Effect5333(EffectDef):
 
 
 class Effect5334(EffectDef):
+    """
+    shipHybridOptimal1CBC1
+
+    Used by:
+    Variations of ship: Ferox (2 of 2)
+    """
 
     type = 'passive'
 
@@ -12001,6 +19294,14 @@ class Effect5334(EffectDef):
 
 
 class Effect5335(EffectDef):
+    """
+    shipShieldEmResistance1CBC2
+
+    Used by:
+    Ship: Drake
+    Ship: Nighthawk
+    Ship: Vulture
+    """
 
     type = 'passive'
 
@@ -12011,6 +19312,14 @@ class Effect5335(EffectDef):
 
 
 class Effect5336(EffectDef):
+    """
+    shipShieldExplosiveResistance1CBC2
+
+    Used by:
+    Ship: Drake
+    Ship: Nighthawk
+    Ship: Vulture
+    """
 
     type = 'passive'
 
@@ -12021,6 +19330,14 @@ class Effect5336(EffectDef):
 
 
 class Effect5337(EffectDef):
+    """
+    shipShieldKineticResistance1CBC2
+
+    Used by:
+    Ship: Drake
+    Ship: Nighthawk
+    Ship: Vulture
+    """
 
     type = 'passive'
 
@@ -12031,6 +19348,14 @@ class Effect5337(EffectDef):
 
 
 class Effect5338(EffectDef):
+    """
+    shipShieldThermalResistance1CBC2
+
+    Used by:
+    Ship: Drake
+    Ship: Nighthawk
+    Ship: Vulture
+    """
 
     type = 'passive'
 
@@ -12041,6 +19366,13 @@ class Effect5338(EffectDef):
 
 
 class Effect5339(EffectDef):
+    """
+    shipBonusHeavyAssaultMissileKineticDamageCBC1
+
+    Used by:
+    Ship: Drake
+    Ship: Nighthawk
+    """
 
     type = 'passive'
 
@@ -12052,6 +19384,13 @@ class Effect5339(EffectDef):
 
 
 class Effect5340(EffectDef):
+    """
+    shipBonusHeavyMissileKineticDamageCBC1
+
+    Used by:
+    Ship: Drake
+    Ship: Nighthawk
+    """
 
     type = 'passive'
 
@@ -12063,6 +19402,12 @@ class Effect5340(EffectDef):
 
 
 class Effect5341(EffectDef):
+    """
+    shipHybridDmg1GBC1
+
+    Used by:
+    Variations of ship: Brutix (3 of 3)
+    """
 
     type = 'passive'
 
@@ -12074,6 +19419,14 @@ class Effect5341(EffectDef):
 
 
 class Effect5342(EffectDef):
+    """
+    shipArmorRepairing1GBC2
+
+    Used by:
+    Variations of ship: Myrmidon (2 of 2)
+    Ship: Astarte
+    Ship: Brutix
+    """
 
     type = 'passive'
 
@@ -12085,6 +19438,12 @@ class Effect5342(EffectDef):
 
 
 class Effect5343(EffectDef):
+    """
+    shipBonusDroneDamageMultiplierGBC1
+
+    Used by:
+    Variations of ship: Myrmidon (2 of 2)
+    """
 
     type = 'passive'
 
@@ -12096,6 +19455,12 @@ class Effect5343(EffectDef):
 
 
 class Effect5348(EffectDef):
+    """
+    shipBonusDroneHitpointsGBC1
+
+    Used by:
+    Variations of ship: Myrmidon (2 of 2)
+    """
 
     type = 'passive'
 
@@ -12107,6 +19472,12 @@ class Effect5348(EffectDef):
 
 
 class Effect5349(EffectDef):
+    """
+    shipBonusHeavyMissileLauncherRofMBC2
+
+    Used by:
+    Variations of ship: Cyclone (2 of 2)
+    """
 
     type = 'passive'
 
@@ -12117,6 +19488,12 @@ class Effect5349(EffectDef):
 
 
 class Effect5350(EffectDef):
+    """
+    shipBonusHeavyAssaultMissileLauncherRofMBC2
+
+    Used by:
+    Variations of ship: Cyclone (2 of 2)
+    """
 
     type = 'passive'
 
@@ -12127,6 +19504,13 @@ class Effect5350(EffectDef):
 
 
 class Effect5351(EffectDef):
+    """
+    shipShieldBoost1MBC1
+
+    Used by:
+    Variations of ship: Cyclone (2 of 2)
+    Ship: Sleipnir
+    """
 
     type = 'passive'
 
@@ -12138,6 +19522,12 @@ class Effect5351(EffectDef):
 
 
 class Effect5352(EffectDef):
+    """
+    shipBonusProjectileDamageMBC1
+
+    Used by:
+    Ships named like: Hurricane (2 of 2)
+    """
 
     type = 'passive'
 
@@ -12149,6 +19539,12 @@ class Effect5352(EffectDef):
 
 
 class Effect5353(EffectDef):
+    """
+    shipProjectileRof1MBC2
+
+    Used by:
+    Ship: Hurricane
+    """
 
     type = 'passive'
 
@@ -12159,6 +19555,12 @@ class Effect5353(EffectDef):
 
 
 class Effect5354(EffectDef):
+    """
+    shipLargeLaserCapABC1
+
+    Used by:
+    Ship: Oracle
+    """
 
     type = 'passive'
 
@@ -12170,6 +19572,12 @@ class Effect5354(EffectDef):
 
 
 class Effect5355(EffectDef):
+    """
+    shipLargeLaserDamageBonusABC2
+
+    Used by:
+    Ship: Oracle
+    """
 
     type = 'passive'
 
@@ -12181,6 +19589,12 @@ class Effect5355(EffectDef):
 
 
 class Effect5356(EffectDef):
+    """
+    shipHybridRangeBonusCBC1
+
+    Used by:
+    Ship: Naga
+    """
 
     type = 'passive'
 
@@ -12191,6 +19605,12 @@ class Effect5356(EffectDef):
 
 
 class Effect5357(EffectDef):
+    """
+    shipHybridDamageBonusCBC2
+
+    Used by:
+    Ship: Naga
+    """
 
     type = 'passive'
 
@@ -12202,6 +19622,12 @@ class Effect5357(EffectDef):
 
 
 class Effect5358(EffectDef):
+    """
+    shipLargeHybridTrackingBonusGBC1
+
+    Used by:
+    Ship: Talos
+    """
 
     type = 'passive'
 
@@ -12213,6 +19639,12 @@ class Effect5358(EffectDef):
 
 
 class Effect5359(EffectDef):
+    """
+    shipHybridDamageBonusGBC2
+
+    Used by:
+    Ship: Talos
+    """
 
     type = 'passive'
 
@@ -12224,6 +19656,12 @@ class Effect5359(EffectDef):
 
 
 class Effect5360(EffectDef):
+    """
+    shipProjectileRofBonusMBC1
+
+    Used by:
+    Ship: Tornado
+    """
 
     type = 'passive'
 
@@ -12234,6 +19672,12 @@ class Effect5360(EffectDef):
 
 
 class Effect5361(EffectDef):
+    """
+    shipProjectileFalloffBonusMBC2
+
+    Used by:
+    Ship: Tornado
+    """
 
     type = 'passive'
 
@@ -12244,6 +19688,14 @@ class Effect5361(EffectDef):
 
 
 class Effect5364(EffectDef):
+    """
+    armorAllRepairSystemsAmountBonusPassive
+
+    Used by:
+    Implants named like: Agency 'Hardshell' TB Dose (4 of 4)
+    Implants named like: Exile Booster (4 of 4)
+    Implant: Antipharmakon Kosybo
+    """
 
     type = 'passive'
 
@@ -12255,6 +19707,13 @@ class Effect5364(EffectDef):
 
 
 class Effect5365(EffectDef):
+    """
+    eliteBonusViolatorsRepairSystemsArmorDamageAmount2
+
+    Used by:
+    Ship: Kronos
+    Ship: Paladin
+    """
 
     type = 'passive'
 
@@ -12266,6 +19725,12 @@ class Effect5365(EffectDef):
 
 
 class Effect5366(EffectDef):
+    """
+    shipBonusRepairSystemsBonusATC2
+
+    Used by:
+    Ship: Vangel
+    """
 
     type = 'passive'
 
@@ -12276,6 +19741,12 @@ class Effect5366(EffectDef):
 
 
 class Effect5367(EffectDef):
+    """
+    shipBonusRepairSystemsArmorRepairAmountGB2
+
+    Used by:
+    Ship: Hyperion
+    """
 
     type = 'passive'
 
@@ -12287,6 +19758,12 @@ class Effect5367(EffectDef):
 
 
 class Effect5378(EffectDef):
+    """
+    shipHeavyMissileAOECloudSizeCBC1
+
+    Used by:
+    Ship: Drake Navy Issue
+    """
 
     type = 'passive'
 
@@ -12298,6 +19775,12 @@ class Effect5378(EffectDef):
 
 
 class Effect5379(EffectDef):
+    """
+    shipHeavyAssaultMissileAOECloudSizeCBC1
+
+    Used by:
+    Ship: Drake Navy Issue
+    """
 
     type = 'passive'
 
@@ -12309,6 +19792,12 @@ class Effect5379(EffectDef):
 
 
 class Effect5380(EffectDef):
+    """
+    shipHybridTrackingGBC2
+
+    Used by:
+    Ship: Brutix Navy Issue
+    """
 
     type = 'passive'
 
@@ -12320,6 +19809,12 @@ class Effect5380(EffectDef):
 
 
 class Effect5381(EffectDef):
+    """
+    shipEnergyTrackingABC1
+
+    Used by:
+    Ship: Harbinger Navy Issue
+    """
 
     type = 'passive'
 
@@ -12331,6 +19826,13 @@ class Effect5381(EffectDef):
 
 
 class Effect5382(EffectDef):
+    """
+    shipBonusMETOptimalAC2
+
+    Used by:
+    Ship: Enforcer
+    Ship: Omen Navy Issue
+    """
 
     type = 'passive'
 
@@ -12341,6 +19843,13 @@ class Effect5382(EffectDef):
 
 
 class Effect5383(EffectDef):
+    """
+    shipMissileEMDamageCC
+
+    Used by:
+    Ship: Orthrus
+    Ship: Osprey Navy Issue
+    """
 
     type = 'passive'
 
@@ -12351,6 +19860,13 @@ class Effect5383(EffectDef):
 
 
 class Effect5384(EffectDef):
+    """
+    shipMissileThermDamageCC
+
+    Used by:
+    Ship: Orthrus
+    Ship: Osprey Navy Issue
+    """
 
     type = 'passive'
 
@@ -12361,6 +19877,13 @@ class Effect5384(EffectDef):
 
 
 class Effect5385(EffectDef):
+    """
+    shipMissileExpDamageCC
+
+    Used by:
+    Ship: Orthrus
+    Ship: Osprey Navy Issue
+    """
 
     type = 'passive'
 
@@ -12371,6 +19894,12 @@ class Effect5385(EffectDef):
 
 
 class Effect5386(EffectDef):
+    """
+    shipMissileKinDamageCC2
+
+    Used by:
+    Ship: Rook
+    """
 
     type = 'passive'
 
@@ -12381,6 +19910,12 @@ class Effect5386(EffectDef):
 
 
 class Effect5387(EffectDef):
+    """
+    shipHeavyAssaultMissileAOECloudSizeCC2
+
+    Used by:
+    Ship: Caracal Navy Issue
+    """
 
     type = 'passive'
 
@@ -12391,6 +19926,12 @@ class Effect5387(EffectDef):
 
 
 class Effect5388(EffectDef):
+    """
+    shipHeavyMissileAOECloudSizeCC2
+
+    Used by:
+    Ship: Caracal Navy Issue
+    """
 
     type = 'passive'
 
@@ -12401,6 +19942,12 @@ class Effect5388(EffectDef):
 
 
 class Effect5389(EffectDef):
+    """
+    shipBonusDroneTrackingGC
+
+    Used by:
+    Ship: Vexor Navy Issue
+    """
 
     type = 'passive'
 
@@ -12411,6 +19958,12 @@ class Effect5389(EffectDef):
 
 
 class Effect5390(EffectDef):
+    """
+    shipBonusDroneMWDboostGC
+
+    Used by:
+    Ship: Vexor Navy Issue
+    """
 
     type = 'passive'
 
@@ -12421,6 +19974,12 @@ class Effect5390(EffectDef):
 
 
 class Effect5397(EffectDef):
+    """
+    baseMaxScanDeviationModifierModuleOnline2None
+
+    Used by:
+    Variations of module: Scan Pinpointing Array I (2 of 2)
+    """
 
     type = 'passive'
 
@@ -12433,6 +19992,12 @@ class Effect5397(EffectDef):
 
 
 class Effect5398(EffectDef):
+    """
+    systemScanDurationModuleModifier
+
+    Used by:
+    Modules from group: Scanning Upgrade Time (2 of 2)
+    """
 
     type = 'passive'
 
@@ -12443,6 +20008,12 @@ class Effect5398(EffectDef):
 
 
 class Effect5399(EffectDef):
+    """
+    baseSensorStrengthModifierModule
+
+    Used by:
+    Variations of module: Scan Rangefinding Array I (2 of 2)
+    """
 
     type = 'passive'
 
@@ -12454,6 +20025,12 @@ class Effect5399(EffectDef):
 
 
 class Effect5402(EffectDef):
+    """
+    shipMissileHeavyAssaultVelocityABC2
+
+    Used by:
+    Ship: Damnation
+    """
 
     type = 'passive'
 
@@ -12465,6 +20042,12 @@ class Effect5402(EffectDef):
 
 
 class Effect5403(EffectDef):
+    """
+    shipMissileHeavyVelocityABC2
+
+    Used by:
+    Ship: Damnation
+    """
 
     type = 'passive'
 
@@ -12476,6 +20059,12 @@ class Effect5403(EffectDef):
 
 
 class Effect5410(EffectDef):
+    """
+    shipLaserCap1ABC2
+
+    Used by:
+    Ship: Absolution
+    """
 
     type = 'passive'
 
@@ -12487,6 +20076,12 @@ class Effect5410(EffectDef):
 
 
 class Effect5411(EffectDef):
+    """
+    shipMissileVelocityCD1
+
+    Used by:
+    Ship: Flycatcher
+    """
 
     type = 'passive'
 
@@ -12497,6 +20092,12 @@ class Effect5411(EffectDef):
 
 
 class Effect5417(EffectDef):
+    """
+    shipBonusDroneDamageMultiplierAB
+
+    Used by:
+    Ship: Armageddon
+    """
 
     type = 'passive'
 
@@ -12507,6 +20108,12 @@ class Effect5417(EffectDef):
 
 
 class Effect5418(EffectDef):
+    """
+    shipBonusDroneArmorHitPointsAB
+
+    Used by:
+    Ship: Armageddon
+    """
 
     type = 'passive'
 
@@ -12517,6 +20124,12 @@ class Effect5418(EffectDef):
 
 
 class Effect5419(EffectDef):
+    """
+    shipBonusDroneShieldHitPointsAB
+
+    Used by:
+    Ship: Armageddon
+    """
 
     type = 'passive'
 
@@ -12527,6 +20140,12 @@ class Effect5419(EffectDef):
 
 
 class Effect5420(EffectDef):
+    """
+    shipBonusDroneStructureHitPointsAB
+
+    Used by:
+    Ship: Armageddon
+    """
 
     type = 'passive'
 
@@ -12537,6 +20156,13 @@ class Effect5420(EffectDef):
 
 
 class Effect5424(EffectDef):
+    """
+    shipLargeHybridTurretRofGB
+
+    Used by:
+    Ship: Megathron
+    Ship: Megathron Navy Issue
+    """
 
     type = 'passive'
 
@@ -12547,6 +20173,12 @@ class Effect5424(EffectDef):
 
 
 class Effect5427(EffectDef):
+    """
+    shipBonusDroneTrackingGB
+
+    Used by:
+    Ship: Dominix
+    """
 
     type = 'passive'
 
@@ -12557,6 +20189,12 @@ class Effect5427(EffectDef):
 
 
 class Effect5428(EffectDef):
+    """
+    shipBonusDroneOptimalRangeGB
+
+    Used by:
+    Ship: Dominix
+    """
 
     type = 'passive'
 
@@ -12567,6 +20205,12 @@ class Effect5428(EffectDef):
 
 
 class Effect5429(EffectDef):
+    """
+    shipBonusMissileAoeVelocityMB2
+
+    Used by:
+    Ship: Typhoon
+    """
 
     type = 'passive'
 
@@ -12578,6 +20222,12 @@ class Effect5429(EffectDef):
 
 
 class Effect5430(EffectDef):
+    """
+    shipBonusAoeVelocityCruiseMissilesMB2
+
+    Used by:
+    Ship: Typhoon
+    """
 
     type = 'passive'
 
@@ -12589,6 +20239,13 @@ class Effect5430(EffectDef):
 
 
 class Effect5431(EffectDef):
+    """
+    shipBonusLargeEnergyTurretTrackingAB
+
+    Used by:
+    Ship: Apocalypse
+    Ship: Apocalypse Navy Issue
+    """
 
     type = 'passive'
 
@@ -12599,6 +20256,16 @@ class Effect5431(EffectDef):
 
 
 class Effect5433(EffectDef):
+    """
+    hackingSkillVirusBonus
+
+    Used by:
+    Modules named like: Memetic Algorithm Bank (8 of 8)
+    Implant: Neural Lace 'Blackglass' Net Intrusion 920-40
+    Implant: Poteque 'Prospector' Environmental Analysis EY-1005
+    Implant: Poteque 'Prospector' Hacking HC-905
+    Skill: Hacking
+    """
 
     type = 'passive'
 
@@ -12610,6 +20277,15 @@ class Effect5433(EffectDef):
 
 
 class Effect5437(EffectDef):
+    """
+    archaeologySkillVirusBonus
+
+    Used by:
+    Modules named like: Emission Scope Sharpener (8 of 8)
+    Implant: Poteque 'Prospector' Archaeology AC-905
+    Implant: Poteque 'Prospector' Environmental Analysis EY-1005
+    Skill: Archaeology
+    """
 
     type = 'passive'
 
@@ -12621,6 +20297,12 @@ class Effect5437(EffectDef):
 
 
 class Effect5440(EffectDef):
+    """
+    systemStandardMissileKineticDamage
+
+    Used by:
+    Celestials named like: Wolf Rayet Effect Beacon Class (6 of 6)
+    """
 
     runTime = 'early'
     type = ('projected', 'passive')
@@ -12633,6 +20315,12 @@ class Effect5440(EffectDef):
 
 
 class Effect5444(EffectDef):
+    """
+    shipTorpedoAOECloudSize1CB
+
+    Used by:
+    Ship: Raven Navy Issue
+    """
 
     type = 'passive'
 
@@ -12643,6 +20331,12 @@ class Effect5444(EffectDef):
 
 
 class Effect5445(EffectDef):
+    """
+    shipCruiseMissileAOECloudSize1CB
+
+    Used by:
+    Ship: Raven Navy Issue
+    """
 
     type = 'passive'
 
@@ -12653,6 +20347,12 @@ class Effect5445(EffectDef):
 
 
 class Effect5456(EffectDef):
+    """
+    shipCruiseMissileROFCB
+
+    Used by:
+    Ship: Scorpion Navy Issue
+    """
 
     type = 'passive'
 
@@ -12663,6 +20363,12 @@ class Effect5456(EffectDef):
 
 
 class Effect5457(EffectDef):
+    """
+    shipTorpedoROFCB
+
+    Used by:
+    Ship: Scorpion Navy Issue
+    """
 
     type = 'passive'
 
@@ -12673,6 +20379,12 @@ class Effect5457(EffectDef):
 
 
 class Effect5459(EffectDef):
+    """
+    hackingVirusStrengthBonus
+
+    Used by:
+    Implant: Neural Lace 'Blackglass' Net Intrusion 920-40
+    """
 
     type = 'passive'
 
@@ -12682,6 +20394,20 @@ class Effect5459(EffectDef):
 
 
 class Effect5460(EffectDef):
+    """
+    minigameVirusStrengthBonus
+
+    Used by:
+    Ships from group: Covert Ops (7 of 8)
+    Ships named like: Stratios (2 of 2)
+    Subsystems named like: Defensive Covert Reconfiguration (4 of 4)
+    Ship: Astero
+    Ship: Heron
+    Ship: Imicus
+    Ship: Magnate
+    Ship: Nestor
+    Ship: Probe
+    """
 
     type = 'passive'
 
@@ -12694,6 +20420,12 @@ class Effect5460(EffectDef):
 
 
 class Effect5461(EffectDef):
+    """
+    shieldOperationRechargeratebonusPostPercentOnline
+
+    Used by:
+    Modules from group: Shield Power Relay (6 of 6)
+    """
 
     type = 'passive'
 
@@ -12703,6 +20435,12 @@ class Effect5461(EffectDef):
 
 
 class Effect5468(EffectDef):
+    """
+    shipBonusAgilityCI2
+
+    Used by:
+    Ship: Badger
+    """
 
     type = 'passive'
 
@@ -12712,6 +20450,12 @@ class Effect5468(EffectDef):
 
 
 class Effect5469(EffectDef):
+    """
+    shipBonusAgilityMI2
+
+    Used by:
+    Ship: Wreathe
+    """
 
     type = 'passive'
 
@@ -12721,6 +20465,12 @@ class Effect5469(EffectDef):
 
 
 class Effect5470(EffectDef):
+    """
+    shipBonusAgilityGI2
+
+    Used by:
+    Ship: Nereus
+    """
 
     type = 'passive'
 
@@ -12730,6 +20480,12 @@ class Effect5470(EffectDef):
 
 
 class Effect5471(EffectDef):
+    """
+    shipBonusAgilityAI2
+
+    Used by:
+    Ship: Sigil
+    """
 
     type = 'passive'
 
@@ -12739,6 +20495,12 @@ class Effect5471(EffectDef):
 
 
 class Effect5476(EffectDef):
+    """
+    shipBonusOreCapacityGI2
+
+    Used by:
+    Ship: Miasmos
+    """
 
     type = 'passive'
 
@@ -12749,6 +20511,12 @@ class Effect5476(EffectDef):
 
 
 class Effect5477(EffectDef):
+    """
+    shipBonusAmmoBayMI2
+
+    Used by:
+    Ship: Hoarder
+    """
 
     type = 'passive'
 
@@ -12759,6 +20527,12 @@ class Effect5477(EffectDef):
 
 
 class Effect5478(EffectDef):
+    """
+    shipBonusPICommoditiesHoldGI2
+
+    Used by:
+    Ship: Epithal
+    """
 
     type = 'passive'
 
@@ -12769,6 +20543,12 @@ class Effect5478(EffectDef):
 
 
 class Effect5479(EffectDef):
+    """
+    shipBonusMineralBayGI2
+
+    Used by:
+    Ship: Kryos
+    """
 
     type = 'passive'
 
@@ -12779,6 +20559,12 @@ class Effect5479(EffectDef):
 
 
 class Effect5480(EffectDef):
+    """
+    setBonusChristmasBonusVelocity
+
+    Used by:
+    Implants named like: Genolution Core Augmentation CA (4 of 4)
+    """
 
     runTime = 'early'
     type = 'passive'
@@ -12790,6 +20576,12 @@ class Effect5480(EffectDef):
 
 
 class Effect5482(EffectDef):
+    """
+    setBonusChristmasAgilityBonus
+
+    Used by:
+    Implants named like: Genolution Core Augmentation CA (4 of 4)
+    """
 
     runTime = 'early'
     type = 'passive'
@@ -12801,6 +20593,12 @@ class Effect5482(EffectDef):
 
 
 class Effect5483(EffectDef):
+    """
+    setBonusChristmasShieldCapacityBonus
+
+    Used by:
+    Implants named like: Genolution Core Augmentation CA (4 of 4)
+    """
 
     runTime = 'early'
     type = 'passive'
@@ -12812,6 +20610,12 @@ class Effect5483(EffectDef):
 
 
 class Effect5484(EffectDef):
+    """
+    setBonusChristmasArmorHPBonus2
+
+    Used by:
+    Implants named like: Genolution Core Augmentation CA (4 of 4)
+    """
 
     runTime = 'early'
     type = 'passive'
@@ -12823,6 +20627,12 @@ class Effect5484(EffectDef):
 
 
 class Effect5485(EffectDef):
+    """
+    shipSPTOptimalBonusMF
+
+    Used by:
+    Ship: Chremoas
+    """
 
     type = 'passive'
 
@@ -12833,6 +20643,12 @@ class Effect5485(EffectDef):
 
 
 class Effect5486(EffectDef):
+    """
+    shipBonusProjectileDamageMBC2
+
+    Used by:
+    Ship: Sleipnir
+    """
 
     type = 'passive'
 
@@ -12844,6 +20660,13 @@ class Effect5486(EffectDef):
 
 
 class Effect5496(EffectDef):
+    """
+    eliteBonusCommandShipHAMRoFCS1
+
+    Used by:
+    Ship: Claymore
+    Ship: Nighthawk
+    """
 
     type = 'passive'
 
@@ -12854,6 +20677,13 @@ class Effect5496(EffectDef):
 
 
 class Effect5497(EffectDef):
+    """
+    eliteBonusCommandShipHMRoFCS1
+
+    Used by:
+    Ship: Claymore
+    Ship: Nighthawk
+    """
 
     type = 'passive'
 
@@ -12864,6 +20694,12 @@ class Effect5497(EffectDef):
 
 
 class Effect5498(EffectDef):
+    """
+    eliteBonusCommandShipsHeavyAssaultMissileExplosionVelocityCS2
+
+    Used by:
+    Ship: Claymore
+    """
 
     type = 'passive'
 
@@ -12875,6 +20711,12 @@ class Effect5498(EffectDef):
 
 
 class Effect5499(EffectDef):
+    """
+    eliteBonusCommandShipsHeavyAssaultMissileExplosionRadiusCS2
+
+    Used by:
+    Ship: Nighthawk
+    """
 
     type = 'passive'
 
@@ -12886,6 +20728,12 @@ class Effect5499(EffectDef):
 
 
 class Effect5500(EffectDef):
+    """
+    eliteBonusCommandShipsHeavyMissileExplosionRadiusCS2
+
+    Used by:
+    Ship: Nighthawk
+    """
 
     type = 'passive'
 
@@ -12897,6 +20745,12 @@ class Effect5500(EffectDef):
 
 
 class Effect5501(EffectDef):
+    """
+    eliteBonusCommandShipMediumHybridDamageCS2
+
+    Used by:
+    Ship: Vulture
+    """
 
     type = 'passive'
 
@@ -12908,6 +20762,12 @@ class Effect5501(EffectDef):
 
 
 class Effect5502(EffectDef):
+    """
+    eliteBonusCommandShipMediumHybridTrackingCS1
+
+    Used by:
+    Ship: Eos
+    """
 
     type = 'passive'
 
@@ -12919,6 +20779,12 @@ class Effect5502(EffectDef):
 
 
 class Effect5503(EffectDef):
+    """
+    eliteBonusCommandShipHeavyDroneTrackingCS2
+
+    Used by:
+    Ship: Eos
+    """
 
     type = 'passive'
 
@@ -12930,6 +20796,12 @@ class Effect5503(EffectDef):
 
 
 class Effect5504(EffectDef):
+    """
+    eliteBonusCommandShipHeavyDroneVelocityCS2
+
+    Used by:
+    Ship: Eos
+    """
 
     type = 'passive'
 
@@ -12941,6 +20813,12 @@ class Effect5504(EffectDef):
 
 
 class Effect5505(EffectDef):
+    """
+    eliteBonusCommandShipMediumHybridRoFCS1
+
+    Used by:
+    Ship: Astarte
+    """
 
     type = 'passive'
 
@@ -12951,6 +20829,12 @@ class Effect5505(EffectDef):
 
 
 class Effect5514(EffectDef):
+    """
+    eliteBonusCommandShipHeavyAssaultMissileDamageCS2
+
+    Used by:
+    Ship: Damnation
+    """
 
     type = 'passive'
 
@@ -12964,6 +20848,12 @@ class Effect5514(EffectDef):
 
 
 class Effect5521(EffectDef):
+    """
+    eliteBonusCommandShipHeavyMissileDamageCS2
+
+    Used by:
+    Ship: Damnation
+    """
 
     type = 'passive'
 
@@ -12977,6 +20867,12 @@ class Effect5521(EffectDef):
 
 
 class Effect5539(EffectDef):
+    """
+    shipBonusHMLKineticDamageAC
+
+    Used by:
+    Ship: Sacrilege
+    """
 
     type = 'passive'
 
@@ -12987,6 +20883,12 @@ class Effect5539(EffectDef):
 
 
 class Effect5540(EffectDef):
+    """
+    shipBonusHMLEMDamageAC
+
+    Used by:
+    Ship: Sacrilege
+    """
 
     type = 'passive'
 
@@ -12997,6 +20899,12 @@ class Effect5540(EffectDef):
 
 
 class Effect5541(EffectDef):
+    """
+    shipBonusHMLThermDamageAC
+
+    Used by:
+    Ship: Sacrilege
+    """
 
     type = 'passive'
 
@@ -13007,6 +20915,12 @@ class Effect5541(EffectDef):
 
 
 class Effect5542(EffectDef):
+    """
+    shipBonusHMLExploDamageAC
+
+    Used by:
+    Ship: Sacrilege
+    """
 
     type = 'passive'
 
@@ -13017,6 +20931,12 @@ class Effect5542(EffectDef):
 
 
 class Effect5552(EffectDef):
+    """
+    shipBonusHMLVelocityEliteBonusHeavyGunship1
+
+    Used by:
+    Ship: Sacrilege
+    """
 
     type = 'passive'
 
@@ -13028,6 +20948,12 @@ class Effect5552(EffectDef):
 
 
 class Effect5553(EffectDef):
+    """
+    shipBonusHAMVelocityEliteBonusHeavyGunship1
+
+    Used by:
+    Ship: Sacrilege
+    """
 
     type = 'passive'
 
@@ -13039,6 +20965,12 @@ class Effect5553(EffectDef):
 
 
 class Effect5554(EffectDef):
+    """
+    shipBonusArmorRepAmountGC2
+
+    Used by:
+    Ship: Deimos
+    """
 
     type = 'passive'
 
@@ -13050,6 +20982,12 @@ class Effect5554(EffectDef):
 
 
 class Effect5555(EffectDef):
+    """
+    shipBonusHeavyDroneSpeedGC
+
+    Used by:
+    Ship: Ishtar
+    """
 
     type = 'passive'
 
@@ -13060,6 +20998,12 @@ class Effect5555(EffectDef):
 
 
 class Effect5556(EffectDef):
+    """
+    shipBonusHeavyDRoneTrackingGC
+
+    Used by:
+    Ship: Ishtar
+    """
 
     type = 'passive'
 
@@ -13070,6 +21014,12 @@ class Effect5556(EffectDef):
 
 
 class Effect5557(EffectDef):
+    """
+    shipBonusSentryDroneOptimalRangeEliteBonusHeavyGunship2
+
+    Used by:
+    Ship: Ishtar
+    """
 
     type = 'passive'
 
@@ -13081,6 +21031,12 @@ class Effect5557(EffectDef):
 
 
 class Effect5558(EffectDef):
+    """
+    shipBonusSentryDroneTrackingEliteBonusHeavyGunship2
+
+    Used by:
+    Ship: Ishtar
+    """
 
     type = 'passive'
 
@@ -13092,6 +21048,12 @@ class Effect5558(EffectDef):
 
 
 class Effect5559(EffectDef):
+    """
+    shipBonusShieldBoostAmountMC2
+
+    Used by:
+    Ship: Vagabond
+    """
 
     type = 'passive'
 
@@ -13102,6 +21064,12 @@ class Effect5559(EffectDef):
 
 
 class Effect5560(EffectDef):
+    """
+    roleBonusMarauderMJDRReactivationDelayBonus
+
+    Used by:
+    Ships from group: Marauder (4 of 4)
+    """
 
     type = 'passive'
 
@@ -13112,6 +21080,12 @@ class Effect5560(EffectDef):
 
 
 class Effect5564(EffectDef):
+    """
+    subSystemBonusCaldariOffensiveCommandBursts
+
+    Used by:
+    Subsystem: Tengu Offensive - Support Processor
+    """
 
     type = 'passive'
 
@@ -13152,6 +21126,12 @@ class Effect5564(EffectDef):
 
 
 class Effect5568(EffectDef):
+    """
+    subSystemBonusGallenteOffensiveCommandBursts
+
+    Used by:
+    Subsystem: Proteus Offensive - Support Processor
+    """
 
     type = 'passive'
 
@@ -13192,6 +21172,12 @@ class Effect5568(EffectDef):
 
 
 class Effect5570(EffectDef):
+    """
+    subSystemBonusMinmatarOffensiveCommandBursts
+
+    Used by:
+    Subsystem: Loki Offensive - Support Processor
+    """
 
     type = 'passive'
 
@@ -13233,6 +21219,12 @@ class Effect5570(EffectDef):
 
 
 class Effect5572(EffectDef):
+    """
+    eliteBonusCommandShipArmoredCS3
+
+    Used by:
+    Ships from group: Command Ship (4 of 8)
+    """
 
     type = 'passive'
 
@@ -13251,6 +21243,12 @@ class Effect5572(EffectDef):
 
 
 class Effect5573(EffectDef):
+    """
+    eliteBonusCommandShipSiegeCS3
+
+    Used by:
+    Ships from group: Command Ship (4 of 8)
+    """
 
     type = 'passive'
 
@@ -13269,6 +21267,12 @@ class Effect5573(EffectDef):
 
 
 class Effect5574(EffectDef):
+    """
+    eliteBonusCommandShipSkirmishCS3
+
+    Used by:
+    Ships from group: Command Ship (4 of 8)
+    """
 
     type = 'passive'
 
@@ -13287,6 +21291,12 @@ class Effect5574(EffectDef):
 
 
 class Effect5575(EffectDef):
+    """
+    eliteBonusCommandShipInformationCS3
+
+    Used by:
+    Ships from group: Command Ship (4 of 8)
+    """
 
     type = 'passive'
 
@@ -13305,6 +21315,14 @@ class Effect5575(EffectDef):
 
 
 class Effect5607(EffectDef):
+    """
+    capacitorEmissionSystemskill
+
+    Used by:
+    Implants named like: Inherent Implants 'Squire' Capacitor Emission Systems ES (6 of 6)
+    Modules named like: Egress Port Maximizer (8 of 8)
+    Skill: Capacitor Emission Systems
+    """
 
     type = 'passive'
 
@@ -13316,6 +21334,13 @@ class Effect5607(EffectDef):
 
 
 class Effect5610(EffectDef):
+    """
+    shipBonusLargeEnergyTurretMaxRangeAB
+
+    Used by:
+    Ship: Marshal
+    Ship: Paladin
+    """
 
     type = 'passive'
 
@@ -13326,6 +21351,12 @@ class Effect5610(EffectDef):
 
 
 class Effect5611(EffectDef):
+    """
+    shipBonusHTFalloffGB2
+
+    Used by:
+    Ship: Kronos
+    """
 
     type = 'passive'
 
@@ -13336,6 +21367,13 @@ class Effect5611(EffectDef):
 
 
 class Effect5618(EffectDef):
+    """
+    shipBonusRHMLROF2CB
+
+    Used by:
+    Ship: Raven
+    Ship: Widow
+    """
 
     type = 'passive'
 
@@ -13346,6 +21384,12 @@ class Effect5618(EffectDef):
 
 
 class Effect5619(EffectDef):
+    """
+    shipBonusRHMLROFCB
+
+    Used by:
+    Ship: Scorpion Navy Issue
+    """
 
     type = 'passive'
 
@@ -13356,6 +21400,12 @@ class Effect5619(EffectDef):
 
 
 class Effect5620(EffectDef):
+    """
+    shipBonusRHMLROFMB
+
+    Used by:
+    Ship: Typhoon
+    """
 
     type = 'passive'
 
@@ -13366,6 +21416,12 @@ class Effect5620(EffectDef):
 
 
 class Effect5621(EffectDef):
+    """
+    shipBonusCruiseROFMB
+
+    Used by:
+    Ship: Typhoon
+    """
 
     type = 'passive'
 
@@ -13376,6 +21432,12 @@ class Effect5621(EffectDef):
 
 
 class Effect5622(EffectDef):
+    """
+    shipBonusTorpedoROFMB
+
+    Used by:
+    Ship: Typhoon
+    """
 
     type = 'passive'
 
@@ -13386,6 +21448,12 @@ class Effect5622(EffectDef):
 
 
 class Effect5628(EffectDef):
+    """
+    shipBonusCruiseMissileEMDmgMB
+
+    Used by:
+    Ship: Typhoon Fleet Issue
+    """
 
     type = 'passive'
 
@@ -13396,6 +21464,12 @@ class Effect5628(EffectDef):
 
 
 class Effect5629(EffectDef):
+    """
+    shipBonusCruiseMissileThermDmgMB
+
+    Used by:
+    Ship: Typhoon Fleet Issue
+    """
 
     type = 'passive'
 
@@ -13407,6 +21481,12 @@ class Effect5629(EffectDef):
 
 
 class Effect5630(EffectDef):
+    """
+    shipBonusCruiseMissileKineticDmgMB
+
+    Used by:
+    Ship: Typhoon Fleet Issue
+    """
 
     type = 'passive'
 
@@ -13418,6 +21498,12 @@ class Effect5630(EffectDef):
 
 
 class Effect5631(EffectDef):
+    """
+    shipBonusCruiseMissileExploDmgMB
+
+    Used by:
+    Ship: Typhoon Fleet Issue
+    """
 
     type = 'passive'
 
@@ -13429,6 +21515,12 @@ class Effect5631(EffectDef):
 
 
 class Effect5632(EffectDef):
+    """
+    shipBonusTorpedoMissileExploDmgMB
+
+    Used by:
+    Ship: Typhoon Fleet Issue
+    """
 
     type = 'passive'
 
@@ -13440,6 +21532,12 @@ class Effect5632(EffectDef):
 
 
 class Effect5633(EffectDef):
+    """
+    shipBonusTorpedoMissileEMDmgMB
+
+    Used by:
+    Ship: Typhoon Fleet Issue
+    """
 
     type = 'passive'
 
@@ -13450,6 +21548,12 @@ class Effect5633(EffectDef):
 
 
 class Effect5634(EffectDef):
+    """
+    shipBonusTorpedoMissileThermDmgMB
+
+    Used by:
+    Ship: Typhoon Fleet Issue
+    """
 
     type = 'passive'
 
@@ -13461,6 +21565,12 @@ class Effect5634(EffectDef):
 
 
 class Effect5635(EffectDef):
+    """
+    shipBonusTorpedoMissileKineticDmgMB
+
+    Used by:
+    Ship: Typhoon Fleet Issue
+    """
 
     type = 'passive'
 
@@ -13472,6 +21582,12 @@ class Effect5635(EffectDef):
 
 
 class Effect5636(EffectDef):
+    """
+    shipBonusHeavyMissileEMDmgMB
+
+    Used by:
+    Ship: Typhoon Fleet Issue
+    """
 
     type = 'passive'
 
@@ -13482,6 +21598,12 @@ class Effect5636(EffectDef):
 
 
 class Effect5637(EffectDef):
+    """
+    shipBonusHeavyMissileThermDmgMB
+
+    Used by:
+    Ship: Typhoon Fleet Issue
+    """
 
     type = 'passive'
 
@@ -13493,6 +21615,12 @@ class Effect5637(EffectDef):
 
 
 class Effect5638(EffectDef):
+    """
+    shipBonusHeavyMissileKineticDmgMB
+
+    Used by:
+    Ship: Typhoon Fleet Issue
+    """
 
     type = 'passive'
 
@@ -13504,6 +21632,12 @@ class Effect5638(EffectDef):
 
 
 class Effect5639(EffectDef):
+    """
+    shipBonusHeavyMissileExploDmgMB
+
+    Used by:
+    Ship: Typhoon Fleet Issue
+    """
 
     type = 'passive'
 
@@ -13515,6 +21649,12 @@ class Effect5639(EffectDef):
 
 
 class Effect5644(EffectDef):
+    """
+    shipBonusMissileVelocityCC2
+
+    Used by:
+    Ship: Cerberus
+    """
 
     type = 'passive'
 
@@ -13525,6 +21665,18 @@ class Effect5644(EffectDef):
 
 
 class Effect5647(EffectDef):
+    """
+    covertOpsCloakCPUPercentRoleBonus
+
+    Used by:
+    Ships from group: Expedition Frigate (2 of 2)
+    Ship: Astero
+    Ship: Enforcer
+    Ship: Pacifier
+    Ship: Victor
+    Ship: Victorieux Luxury Yacht
+    Ship: Virtuoso
+    """
 
     runTime = 'early'
     type = 'passive'
@@ -13536,6 +21688,12 @@ class Effect5647(EffectDef):
 
 
 class Effect5650(EffectDef):
+    """
+    shipArmorResistanceAF1
+
+    Used by:
+    Ship: Malediction
+    """
 
     type = 'passive'
 
@@ -13548,6 +21706,12 @@ class Effect5650(EffectDef):
 
 
 class Effect5657(EffectDef):
+    """
+    Interceptor2ShieldResist
+
+    Used by:
+    Ship: Raptor
+    """
 
     type = 'passive'
 
@@ -13560,6 +21724,12 @@ class Effect5657(EffectDef):
 
 
 class Effect5673(EffectDef):
+    """
+    interceptor2ProjectileDamage
+
+    Used by:
+    Ship: Claw
+    """
 
     type = 'passive'
 
@@ -13571,6 +21741,12 @@ class Effect5673(EffectDef):
 
 
 class Effect5676(EffectDef):
+    """
+    shipBonusSmallMissileExplosionRadiusCD2
+
+    Used by:
+    Ship: Flycatcher
+    """
 
     type = 'passive'
 
@@ -13582,6 +21758,12 @@ class Effect5676(EffectDef):
 
 
 class Effect5688(EffectDef):
+    """
+    shipBonusMissileVelocityAD2
+
+    Used by:
+    Ship: Heretic
+    """
 
     type = 'passive'
 
@@ -13592,6 +21774,12 @@ class Effect5688(EffectDef):
 
 
 class Effect5695(EffectDef):
+    """
+    eliteBonusInterdictorsArmorResist1
+
+    Used by:
+    Ship: Heretic
+    """
 
     type = 'passive'
 
@@ -13603,6 +21791,12 @@ class Effect5695(EffectDef):
 
 
 class Effect5717(EffectDef):
+    """
+    implantSetWarpSpeed
+
+    Used by:
+    Implants named like: grade Ascendancy (12 of 12)
+    """
 
     runTime = 'early'
     type = 'passive'
@@ -13614,6 +21808,12 @@ class Effect5717(EffectDef):
 
 
 class Effect5721(EffectDef):
+    """
+    shipBonusMETOptimalRangePirateFaction
+
+    Used by:
+    Ships named like: Stratios (2 of 2)
+    """
 
     type = 'passive'
 
@@ -13624,6 +21824,12 @@ class Effect5721(EffectDef):
 
 
 class Effect5722(EffectDef):
+    """
+    shipHybridOptimalGD1
+
+    Used by:
+    Ship: Eris
+    """
 
     type = 'passive'
 
@@ -13634,6 +21840,12 @@ class Effect5722(EffectDef):
 
 
 class Effect5723(EffectDef):
+    """
+    eliteBonusInterdictorsMWDSigRadius2
+
+    Used by:
+    Ships from group: Interdictor (4 of 4)
+    """
 
     type = 'passive'
 
@@ -13645,6 +21857,12 @@ class Effect5723(EffectDef):
 
 
 class Effect5724(EffectDef):
+    """
+    shipSHTOptimalBonusGF
+
+    Used by:
+    Ship: Ares
+    """
 
     type = 'passive'
 
@@ -13655,6 +21873,12 @@ class Effect5724(EffectDef):
 
 
 class Effect5725(EffectDef):
+    """
+    shipBonusRemoteRepairAmountPirateFaction
+
+    Used by:
+    Ship: Nestor
+    """
 
     type = 'passive'
 
@@ -13665,6 +21889,12 @@ class Effect5725(EffectDef):
 
 
 class Effect5726(EffectDef):
+    """
+    shipBonusLETOptimalRangePirateFaction
+
+    Used by:
+    Ship: Nestor
+    """
 
     type = 'passive'
 
@@ -13675,6 +21905,12 @@ class Effect5726(EffectDef):
 
 
 class Effect5733(EffectDef):
+    """
+    eliteBonusMaraudersHeavyMissileDamageExpRole1
+
+    Used by:
+    Ship: Golem
+    """
 
     type = 'passive'
 
@@ -13685,6 +21921,12 @@ class Effect5733(EffectDef):
 
 
 class Effect5734(EffectDef):
+    """
+    eliteBonusMaraudersHeavyMissileDamageKinRole1
+
+    Used by:
+    Ship: Golem
+    """
 
     type = 'passive'
 
@@ -13695,6 +21937,12 @@ class Effect5734(EffectDef):
 
 
 class Effect5735(EffectDef):
+    """
+    eliteBonusMaraudersHeavyMissileDamageEMRole1
+
+    Used by:
+    Ship: Golem
+    """
 
     type = 'passive'
 
@@ -13705,6 +21953,12 @@ class Effect5735(EffectDef):
 
 
 class Effect5736(EffectDef):
+    """
+    eliteBonusMaraudersHeavyMissileDamageThermRole1
+
+    Used by:
+    Ship: Golem
+    """
 
     type = 'passive'
 
@@ -13715,6 +21969,12 @@ class Effect5736(EffectDef):
 
 
 class Effect5737(EffectDef):
+    """
+    shipScanProbeStrengthBonusPirateFaction
+
+    Used by:
+    Ship: Nestor
+    """
 
     type = 'passive'
 
@@ -13725,6 +21985,12 @@ class Effect5737(EffectDef):
 
 
 class Effect5738(EffectDef):
+    """
+    shipBonusRemoteRepairRangePirateFaction2
+
+    Used by:
+    Ship: Nestor
+    """
 
     type = 'passive'
 
@@ -13737,6 +22003,13 @@ class Effect5738(EffectDef):
 
 
 class Effect5754(EffectDef):
+    """
+    overloadSelfTrackingModuleBonus
+
+    Used by:
+    Modules named like: Tracking Computer (19 of 19)
+    Variations of module: Tracking Disruptor I (6 of 6)
+    """
 
     type = 'overheat'
 
@@ -13748,6 +22021,14 @@ class Effect5754(EffectDef):
 
 
 class Effect5757(EffectDef):
+    """
+    overloadSelfSensorModuleBonus
+
+    Used by:
+    Modules from group: Remote Sensor Booster (8 of 8)
+    Modules from group: Sensor Booster (16 of 16)
+    Modules from group: Sensor Dampener (6 of 6)
+    """
 
     type = 'overheat'
 
@@ -13766,6 +22047,12 @@ class Effect5757(EffectDef):
 
 
 class Effect5758(EffectDef):
+    """
+    overloadSelfPainterBonus
+
+    Used by:
+    Modules from group: Target Painter (8 of 8)
+    """
 
     type = 'overheat'
 
@@ -13775,6 +22062,13 @@ class Effect5758(EffectDef):
 
 
 class Effect5769(EffectDef):
+    """
+    repairDroneHullBonusBonus
+
+    Used by:
+    Modules named like: Drone Repair Augmentor (8 of 8)
+    Skill: Repair Drone Operation
+    """
 
     type = 'passive'
 
@@ -13786,6 +22080,13 @@ class Effect5769(EffectDef):
 
 
 class Effect5778(EffectDef):
+    """
+    shipMissileRoFMF2
+
+    Used by:
+    Ship: Breacher
+    Ship: Jaguar
+    """
 
     type = 'passive'
 
@@ -13796,6 +22097,13 @@ class Effect5778(EffectDef):
 
 
 class Effect5779(EffectDef):
+    """
+    shipBonusSPTFalloffMF2
+
+    Used by:
+    Ship: Pacifier
+    Ship: Rifter
+    """
 
     type = 'passive'
 
@@ -13806,6 +22114,13 @@ class Effect5779(EffectDef):
 
 
 class Effect5793(EffectDef):
+    """
+    ewSkillTrackingDisruptionRangeDisruptionBonus
+
+    Used by:
+    Modules named like: Tracking Diagnostic Subroutines (8 of 8)
+    Skill: Weapon Destabilization
+    """
 
     type = 'passive'
 
@@ -13818,6 +22133,12 @@ class Effect5793(EffectDef):
 
 
 class Effect5802(EffectDef):
+    """
+    shipBonusAfterburnerSpeedFactor2CB
+
+    Used by:
+    Ship: Nightmare
+    """
 
     type = 'passive'
 
@@ -13828,6 +22149,12 @@ class Effect5802(EffectDef):
 
 
 class Effect5803(EffectDef):
+    """
+    shipBonusSentryDroneDamageMultiplierPirateFaction
+
+    Used by:
+    Ship: Rattlesnake
+    """
 
     type = 'passive'
 
@@ -13838,6 +22165,12 @@ class Effect5803(EffectDef):
 
 
 class Effect5804(EffectDef):
+    """
+    shipBonusHeavyDroneDamageMultiplierPirateFaction
+
+    Used by:
+    Ship: Rattlesnake
+    """
 
     type = 'passive'
 
@@ -13848,6 +22181,12 @@ class Effect5804(EffectDef):
 
 
 class Effect5805(EffectDef):
+    """
+    shipBonusSentryDroneHPPirateFaction
+
+    Used by:
+    Ship: Rattlesnake
+    """
 
     type = 'passive'
 
@@ -13858,6 +22197,12 @@ class Effect5805(EffectDef):
 
 
 class Effect5806(EffectDef):
+    """
+    shipBonusSentryDroneArmorHpPirateFaction
+
+    Used by:
+    Ship: Rattlesnake
+    """
 
     type = 'passive'
 
@@ -13868,6 +22213,12 @@ class Effect5806(EffectDef):
 
 
 class Effect5807(EffectDef):
+    """
+    shipBonusSentryDroneShieldHpPirateFaction
+
+    Used by:
+    Ship: Rattlesnake
+    """
 
     type = 'passive'
 
@@ -13878,6 +22229,12 @@ class Effect5807(EffectDef):
 
 
 class Effect5808(EffectDef):
+    """
+    shipBonusHeavyDroneShieldHpPirateFaction
+
+    Used by:
+    Ship: Rattlesnake
+    """
 
     type = 'passive'
 
@@ -13888,6 +22245,12 @@ class Effect5808(EffectDef):
 
 
 class Effect5809(EffectDef):
+    """
+    shipBonusHeavyDroneArmorHpPirateFaction
+
+    Used by:
+    Ship: Rattlesnake
+    """
 
     type = 'passive'
 
@@ -13898,6 +22261,12 @@ class Effect5809(EffectDef):
 
 
 class Effect5810(EffectDef):
+    """
+    shipBonusHeavyDroneHPPirateFaction
+
+    Used by:
+    Ship: Rattlesnake
+    """
 
     type = 'passive'
 
@@ -13908,6 +22277,12 @@ class Effect5810(EffectDef):
 
 
 class Effect5811(EffectDef):
+    """
+    shipBonusKineticMissileDamageGB2
+
+    Used by:
+    Ship: Rattlesnake
+    """
 
     type = 'passive'
 
@@ -13919,6 +22294,12 @@ class Effect5811(EffectDef):
 
 
 class Effect5812(EffectDef):
+    """
+    shipBonusThermalMissileDamageGB2
+
+    Used by:
+    Ship: Rattlesnake
+    """
 
     type = 'passive'
 
@@ -13930,6 +22311,13 @@ class Effect5812(EffectDef):
 
 
 class Effect5813(EffectDef):
+    """
+    shipBonusAfterburnerSpeedFactorCF2
+
+    Used by:
+    Ship: Imp
+    Ship: Succubus
+    """
 
     type = 'passive'
 
@@ -13940,6 +22328,13 @@ class Effect5813(EffectDef):
 
 
 class Effect5814(EffectDef):
+    """
+    shipBonusKineticMissileDamageGF
+
+    Used by:
+    Ship: Whiptail
+    Ship: Worm
+    """
 
     type = 'passive'
 
@@ -13950,6 +22345,13 @@ class Effect5814(EffectDef):
 
 
 class Effect5815(EffectDef):
+    """
+    shipBonusThermalMissileDamageGF
+
+    Used by:
+    Ship: Whiptail
+    Ship: Worm
+    """
 
     type = 'passive'
 
@@ -13960,6 +22362,13 @@ class Effect5815(EffectDef):
 
 
 class Effect5816(EffectDef):
+    """
+    shipBonusLightDroneDamageMultiplierPirateFaction
+
+    Used by:
+    Ship: Whiptail
+    Ship: Worm
+    """
 
     type = 'passive'
 
@@ -13970,6 +22379,13 @@ class Effect5816(EffectDef):
 
 
 class Effect5817(EffectDef):
+    """
+    shipBonusLightDroneHPPirateFaction
+
+    Used by:
+    Ship: Whiptail
+    Ship: Worm
+    """
 
     type = 'passive'
 
@@ -13980,6 +22396,13 @@ class Effect5817(EffectDef):
 
 
 class Effect5818(EffectDef):
+    """
+    shipBonusLightDroneArmorHPPirateFaction
+
+    Used by:
+    Ship: Whiptail
+    Ship: Worm
+    """
 
     type = 'passive'
 
@@ -13990,6 +22413,13 @@ class Effect5818(EffectDef):
 
 
 class Effect5819(EffectDef):
+    """
+    shipBonusLightDroneShieldHPPirateFaction
+
+    Used by:
+    Ship: Whiptail
+    Ship: Worm
+    """
 
     type = 'passive'
 
@@ -14000,6 +22430,13 @@ class Effect5819(EffectDef):
 
 
 class Effect5820(EffectDef):
+    """
+    shipBonusAfterburnerSpeedFactorCC2
+
+    Used by:
+    Ship: Fiend
+    Ship: Phantasm
+    """
 
     type = 'passive'
 
@@ -14010,6 +22447,13 @@ class Effect5820(EffectDef):
 
 
 class Effect5821(EffectDef):
+    """
+    shipBonusMediumDroneDamageMultiplierPirateFaction
+
+    Used by:
+    Ship: Chameleon
+    Ship: Gila
+    """
 
     type = 'passive'
 
@@ -14020,6 +22464,13 @@ class Effect5821(EffectDef):
 
 
 class Effect5822(EffectDef):
+    """
+    shipBonusMediumDroneHPPirateFaction
+
+    Used by:
+    Ship: Chameleon
+    Ship: Gila
+    """
 
     type = 'passive'
 
@@ -14030,6 +22481,13 @@ class Effect5822(EffectDef):
 
 
 class Effect5823(EffectDef):
+    """
+    shipBonusMediumDroneArmorHPPirateFaction
+
+    Used by:
+    Ship: Chameleon
+    Ship: Gila
+    """
 
     type = 'passive'
 
@@ -14040,6 +22498,13 @@ class Effect5823(EffectDef):
 
 
 class Effect5824(EffectDef):
+    """
+    shipBonusMediumDroneShieldHPPirateFaction
+
+    Used by:
+    Ship: Chameleon
+    Ship: Gila
+    """
 
     type = 'passive'
 
@@ -14050,6 +22515,13 @@ class Effect5824(EffectDef):
 
 
 class Effect5825(EffectDef):
+    """
+    shipBonusKineticMissileDamageGC2
+
+    Used by:
+    Ship: Chameleon
+    Ship: Gila
+    """
 
     type = 'passive'
 
@@ -14060,6 +22532,13 @@ class Effect5825(EffectDef):
 
 
 class Effect5826(EffectDef):
+    """
+    shipBonusThermalMissileDamageGC2
+
+    Used by:
+    Ship: Chameleon
+    Ship: Gila
+    """
 
     type = 'passive'
 
@@ -14070,6 +22549,12 @@ class Effect5826(EffectDef):
 
 
 class Effect5827(EffectDef):
+    """
+    shipBonusTDOptimalBonusAF1
+
+    Used by:
+    Ship: Crucifier
+    """
 
     type = 'passive'
 
@@ -14080,6 +22565,13 @@ class Effect5827(EffectDef):
 
 
 class Effect5829(EffectDef):
+    """
+    shipBonusMiningDurationORE3
+
+    Used by:
+    Ships from group: Exhumer (3 of 3)
+    Ships from group: Mining Barge (3 of 3)
+    """
 
     type = 'passive'
 
@@ -14090,6 +22582,12 @@ class Effect5829(EffectDef):
 
 
 class Effect5832(EffectDef):
+    """
+    shipBonusMiningIceHarvestingRangeORE2
+
+    Used by:
+    Variations of ship: Covetor (2 of 2)
+    """
 
     type = 'passive'
 
@@ -14101,6 +22599,12 @@ class Effect5832(EffectDef):
 
 
 class Effect5839(EffectDef):
+    """
+    eliteBargeShieldResistance1
+
+    Used by:
+    Ships from group: Exhumer (3 of 3)
+    """
 
     type = 'passive'
 
@@ -14112,6 +22616,12 @@ class Effect5839(EffectDef):
 
 
 class Effect5840(EffectDef):
+    """
+    eliteBargeBonusMiningDurationBarge2
+
+    Used by:
+    Ships from group: Exhumer (3 of 3)
+    """
 
     type = 'passive'
 
@@ -14122,6 +22632,12 @@ class Effect5840(EffectDef):
 
 
 class Effect5852(EffectDef):
+    """
+    eliteBonusExpeditionMining1
+
+    Used by:
+    Ship: Prospect
+    """
 
     type = 'passive'
 
@@ -14133,6 +22649,12 @@ class Effect5852(EffectDef):
 
 
 class Effect5853(EffectDef):
+    """
+    eliteBonusExpeditionSigRadius2
+
+    Used by:
+    Ship: Prospect
+    """
 
     type = 'passive'
 
@@ -14143,6 +22665,12 @@ class Effect5853(EffectDef):
 
 
 class Effect5862(EffectDef):
+    """
+    shipMissileEMDamageCB
+
+    Used by:
+    Ship: Barghest
+    """
 
     type = 'passive'
 
@@ -14153,6 +22681,12 @@ class Effect5862(EffectDef):
 
 
 class Effect5863(EffectDef):
+    """
+    shipMissileKinDamageCB
+
+    Used by:
+    Ship: Barghest
+    """
 
     type = 'passive'
 
@@ -14164,6 +22698,12 @@ class Effect5863(EffectDef):
 
 
 class Effect5864(EffectDef):
+    """
+    shipMissileThermDamageCB
+
+    Used by:
+    Ship: Barghest
+    """
 
     type = 'passive'
 
@@ -14175,6 +22715,12 @@ class Effect5864(EffectDef):
 
 
 class Effect5865(EffectDef):
+    """
+    shipMissileExploDamageCB
+
+    Used by:
+    Ship: Barghest
+    """
 
     type = 'passive'
 
@@ -14186,6 +22732,12 @@ class Effect5865(EffectDef):
 
 
 class Effect5866(EffectDef):
+    """
+    shipBonusWarpScrambleMaxRangeGB
+
+    Used by:
+    Ship: Barghest
+    """
 
     type = 'passive'
 
@@ -14196,6 +22748,14 @@ class Effect5866(EffectDef):
 
 
 class Effect5867(EffectDef):
+    """
+    shipBonusMissileExplosionDelayPirateFaction2
+
+    Used by:
+    Ship: Barghest
+    Ship: Garmur
+    Ship: Orthrus
+    """
 
     type = 'passive'
 
@@ -14206,6 +22766,12 @@ class Effect5867(EffectDef):
 
 
 class Effect5868(EffectDef):
+    """
+    drawbackCargoCapacity
+
+    Used by:
+    Modules named like: Transverse Bulkhead (8 of 8)
+    """
 
     type = 'passive'
 
@@ -14215,6 +22781,12 @@ class Effect5868(EffectDef):
 
 
 class Effect5869(EffectDef):
+    """
+    eliteIndustrialWarpSpeedBonus1
+
+    Used by:
+    Ships from group: Blockade Runner (4 of 4)
+    """
 
     type = 'passive'
 
@@ -14225,6 +22797,12 @@ class Effect5869(EffectDef):
 
 
 class Effect5870(EffectDef):
+    """
+    shipBonusShieldBoostCI2
+
+    Used by:
+    Ship: Bustard
+    """
 
     type = 'passive'
 
@@ -14235,6 +22813,12 @@ class Effect5870(EffectDef):
 
 
 class Effect5871(EffectDef):
+    """
+    shipBonusShieldBoostMI2
+
+    Used by:
+    Ship: Mastodon
+    """
 
     type = 'passive'
 
@@ -14245,6 +22829,12 @@ class Effect5871(EffectDef):
 
 
 class Effect5872(EffectDef):
+    """
+    shipBonusArmorRepairAI2
+
+    Used by:
+    Ship: Impel
+    """
 
     type = 'passive'
 
@@ -14256,6 +22846,12 @@ class Effect5872(EffectDef):
 
 
 class Effect5873(EffectDef):
+    """
+    shipBonusArmorRepairGI2
+
+    Used by:
+    Ship: Occator
+    """
 
     type = 'passive'
 
@@ -14267,6 +22863,12 @@ class Effect5873(EffectDef):
 
 
 class Effect5874(EffectDef):
+    """
+    eliteIndustrialFleetCapacity1
+
+    Used by:
+    Ships from group: Deep Space Transport (4 of 4)
+    """
 
     type = 'passive'
 
@@ -14277,6 +22879,13 @@ class Effect5874(EffectDef):
 
 
 class Effect5881(EffectDef):
+    """
+    eliteIndustrialShieldResists2
+
+    Used by:
+    Ship: Bustard
+    Ship: Mastodon
+    """
 
     type = 'passive'
 
@@ -14288,6 +22897,13 @@ class Effect5881(EffectDef):
 
 
 class Effect5888(EffectDef):
+    """
+    eliteIndustrialArmorResists2
+
+    Used by:
+    Ship: Impel
+    Ship: Occator
+    """
 
     type = 'passive'
 
@@ -14299,6 +22915,12 @@ class Effect5888(EffectDef):
 
 
 class Effect5889(EffectDef):
+    """
+    eliteIndustrialABHeatBonus
+
+    Used by:
+    Ships from group: Deep Space Transport (4 of 4)
+    """
 
     type = 'passive'
 
@@ -14309,6 +22931,12 @@ class Effect5889(EffectDef):
 
 
 class Effect5890(EffectDef):
+    """
+    eliteIndustrialMWDHeatBonus
+
+    Used by:
+    Ships from group: Deep Space Transport (4 of 4)
+    """
 
     type = 'passive'
 
@@ -14319,6 +22947,12 @@ class Effect5890(EffectDef):
 
 
 class Effect5891(EffectDef):
+    """
+    eliteIndustrialArmorHardenerHeatBonus
+
+    Used by:
+    Ships from group: Deep Space Transport (4 of 4)
+    """
 
     type = 'passive'
 
@@ -14329,6 +22963,12 @@ class Effect5891(EffectDef):
 
 
 class Effect5892(EffectDef):
+    """
+    eliteIndustrialReactiveArmorHardenerHeatBonus
+
+    Used by:
+    Ships from group: Deep Space Transport (4 of 4)
+    """
 
     type = 'passive'
 
@@ -14339,6 +22979,12 @@ class Effect5892(EffectDef):
 
 
 class Effect5893(EffectDef):
+    """
+    eliteIndustrialShieldHardenerHeatBonus
+
+    Used by:
+    Ships from group: Deep Space Transport (4 of 4)
+    """
 
     type = 'passive'
 
@@ -14349,6 +22995,12 @@ class Effect5893(EffectDef):
 
 
 class Effect5896(EffectDef):
+    """
+    eliteIndustrialShieldBoosterHeatBonus
+
+    Used by:
+    Ships from group: Deep Space Transport (4 of 4)
+    """
 
     type = 'passive'
 
@@ -14361,6 +23013,12 @@ class Effect5896(EffectDef):
 
 
 class Effect5899(EffectDef):
+    """
+    eliteIndustrialArmorRepairHeatBonus
+
+    Used by:
+    Ships from group: Deep Space Transport (4 of 4)
+    """
 
     type = 'passive'
 
@@ -14373,6 +23031,12 @@ class Effect5899(EffectDef):
 
 
 class Effect5900(EffectDef):
+    """
+    warpSpeedAddition
+
+    Used by:
+    Modules from group: Warp Accelerator (3 of 3)
+    """
 
     type = 'passive'
 
@@ -14382,6 +23046,13 @@ class Effect5900(EffectDef):
 
 
 class Effect5901(EffectDef):
+    """
+    roleBonusBulkheadCPU
+
+    Used by:
+    Ships from group: Freighter (4 of 5)
+    Ships from group: Jump Freighter (4 of 4)
+    """
 
     type = 'passive'
 
@@ -14392,6 +23063,12 @@ class Effect5901(EffectDef):
 
 
 class Effect5911(EffectDef):
+    """
+    onlineJumpDriveConsumptionAmountBonusPercentage
+
+    Used by:
+    Modules from group: Jump Drive Economizer (3 of 3)
+    """
 
     runTime = 'early'
     type = ('projected', 'passive')
@@ -14403,6 +23080,12 @@ class Effect5911(EffectDef):
 
 
 class Effect5912(EffectDef):
+    """
+    systemRemoteCapTransmitterAmount
+
+    Used by:
+    Celestials named like: Cataclysmic Variable Effect Beacon Class (6 of 6)
+    """
 
     runTime = 'early'
     type = ('projected', 'passive')
@@ -14415,6 +23098,12 @@ class Effect5912(EffectDef):
 
 
 class Effect5913(EffectDef):
+    """
+    systemArmorHP
+
+    Used by:
+    Celestials named like: Wolf Rayet Effect Beacon Class (6 of 6)
+    """
 
     runTime = 'early'
     type = ('projected', 'passive')
@@ -14425,6 +23114,12 @@ class Effect5913(EffectDef):
 
 
 class Effect5914(EffectDef):
+    """
+    systemEnergyNeutMultiplier
+
+    Used by:
+    Celestials named like: Pulsar Effect Beacon Class (6 of 6)
+    """
 
     runTime = 'early'
     type = ('projected', 'passive')
@@ -14438,6 +23133,12 @@ class Effect5914(EffectDef):
 
 
 class Effect5915(EffectDef):
+    """
+    systemEnergyVampireMultiplier
+
+    Used by:
+    Celestials named like: Pulsar Effect Beacon Class (6 of 6)
+    """
 
     runTime = 'early'
     type = ('projected', 'passive')
@@ -14451,6 +23152,12 @@ class Effect5915(EffectDef):
 
 
 class Effect5916(EffectDef):
+    """
+    systemDamageExplosiveBombs
+
+    Used by:
+    Celestials named like: Red Giant Beacon Class (6 of 6)
+    """
 
     runTime = 'early'
     type = ('projected', 'passive')
@@ -14463,6 +23170,12 @@ class Effect5916(EffectDef):
 
 
 class Effect5917(EffectDef):
+    """
+    systemDamageKineticBombs
+
+    Used by:
+    Celestials named like: Red Giant Beacon Class (6 of 6)
+    """
 
     runTime = 'early'
     type = ('projected', 'passive')
@@ -14475,6 +23188,12 @@ class Effect5917(EffectDef):
 
 
 class Effect5918(EffectDef):
+    """
+    systemDamageThermalBombs
+
+    Used by:
+    Celestials named like: Red Giant Beacon Class (6 of 6)
+    """
 
     runTime = 'early'
     type = ('projected', 'passive')
@@ -14487,6 +23206,12 @@ class Effect5918(EffectDef):
 
 
 class Effect5919(EffectDef):
+    """
+    systemDamageEMBombs
+
+    Used by:
+    Celestials named like: Red Giant Beacon Class (6 of 6)
+    """
 
     runTime = 'early'
     type = ('projected', 'passive')
@@ -14499,6 +23224,12 @@ class Effect5919(EffectDef):
 
 
 class Effect5920(EffectDef):
+    """
+    systemAoeCloudSize
+
+    Used by:
+    Celestials named like: Magnetar Effect Beacon Class (6 of 6)
+    """
 
     runTime = 'early'
     type = ('projected', 'passive')
@@ -14510,6 +23241,12 @@ class Effect5920(EffectDef):
 
 
 class Effect5921(EffectDef):
+    """
+    systemTargetPainterMultiplier
+
+    Used by:
+    Celestials named like: Magnetar Effect Beacon Class (6 of 6)
+    """
 
     runTime = 'early'
     type = ('projected', 'passive')
@@ -14523,6 +23260,12 @@ class Effect5921(EffectDef):
 
 
 class Effect5922(EffectDef):
+    """
+    systemWebifierStrengthMultiplier
+
+    Used by:
+    Celestials named like: Black Hole Effect Beacon Class (6 of 6)
+    """
 
     runTime = 'early'
     type = ('projected', 'passive')
@@ -14535,6 +23278,12 @@ class Effect5922(EffectDef):
 
 
 class Effect5923(EffectDef):
+    """
+    systemNeutBombs
+
+    Used by:
+    Celestials named like: Red Giant Beacon Class (6 of 6)
+    """
 
     runTime = 'early'
     type = ('projected', 'passive')
@@ -14548,6 +23297,12 @@ class Effect5923(EffectDef):
 
 
 class Effect5924(EffectDef):
+    """
+    systemGravimetricECMBomb
+
+    Used by:
+    Celestials named like: Red Giant Beacon Class (6 of 6)
+    """
 
     runTime = 'early'
     type = ('projected', 'passive')
@@ -14561,6 +23316,12 @@ class Effect5924(EffectDef):
 
 
 class Effect5925(EffectDef):
+    """
+    systemLadarECMBomb
+
+    Used by:
+    Celestials named like: Red Giant Beacon Class (6 of 6)
+    """
 
     runTime = 'early'
     type = ('projected', 'passive')
@@ -14574,6 +23335,12 @@ class Effect5925(EffectDef):
 
 
 class Effect5926(EffectDef):
+    """
+    systemMagnetrometricECMBomb
+
+    Used by:
+    Celestials named like: Red Giant Beacon Class (6 of 6)
+    """
 
     runTime = 'early'
     type = ('projected', 'passive')
@@ -14587,6 +23354,12 @@ class Effect5926(EffectDef):
 
 
 class Effect5927(EffectDef):
+    """
+    systemRadarECMBomb
+
+    Used by:
+    Celestials named like: Red Giant Beacon Class (6 of 6)
+    """
 
     runTime = 'early'
     type = ('projected', 'passive')
@@ -14600,6 +23373,12 @@ class Effect5927(EffectDef):
 
 
 class Effect5929(EffectDef):
+    """
+    systemDroneTracking
+
+    Used by:
+    Celestials named like: Magnetar Effect Beacon Class (6 of 6)
+    """
 
     runTime = 'early'
     type = ('projected', 'passive')
@@ -14612,6 +23391,12 @@ class Effect5929(EffectDef):
 
 
 class Effect5934(EffectDef):
+    """
+    warpScrambleBlockMWDWithNPCEffect
+
+    Used by:
+    Modules named like: Warp Scrambler (27 of 27)
+    """
 
     runTime = 'early'
     type = 'projected', 'active'
@@ -14635,6 +23420,12 @@ class Effect5934(EffectDef):
 
 
 class Effect5938(EffectDef):
+    """
+    shipBonusSmallMissileExplosionRadiusCF2
+
+    Used by:
+    Ship: Crow
+    """
 
     type = 'passive'
 
@@ -14646,6 +23437,12 @@ class Effect5938(EffectDef):
 
 
 class Effect5939(EffectDef):
+    """
+    shipRocketRoFBonusAF2
+
+    Used by:
+    Ship: Malediction
+    """
 
     type = 'passive'
 
@@ -14656,6 +23453,12 @@ class Effect5939(EffectDef):
 
 
 class Effect5940(EffectDef):
+    """
+    eliteBonusInterdictorsSHTRoF1
+
+    Used by:
+    Ship: Eris
+    """
 
     type = 'passive'
 
@@ -14666,6 +23469,12 @@ class Effect5940(EffectDef):
 
 
 class Effect5944(EffectDef):
+    """
+    shipMissileLauncherRoFAD1Fixed
+
+    Used by:
+    Ship: Heretic
+    """
 
     type = 'passive'
 
@@ -14676,6 +23485,12 @@ class Effect5944(EffectDef):
 
 
 class Effect5945(EffectDef):
+    """
+    cloakingPrototype
+
+    Used by:
+    Modules named like: Prototype Cloaking Device I (2 of 2)
+    """
 
     runTime = 'early'
     type = 'active'
@@ -14691,6 +23506,12 @@ class Effect5945(EffectDef):
 
 
 class Effect5951(EffectDef):
+    """
+    drawbackWarpSpeed
+
+    Used by:
+    Modules from group: Rig Anchor (4 of 4)
+    """
 
     type = 'passive'
 
@@ -14700,6 +23521,12 @@ class Effect5951(EffectDef):
 
 
 class Effect5956(EffectDef):
+    """
+    shipMETDamageBonusAC2
+
+    Used by:
+    Ship: Devoter
+    """
 
     type = 'passive'
 
@@ -14710,6 +23537,12 @@ class Effect5956(EffectDef):
 
 
 class Effect5957(EffectDef):
+    """
+    eliteBonusHeavyInterdictorsMETOptimal
+
+    Used by:
+    Ship: Devoter
+    """
 
     type = 'passive'
 
@@ -14721,6 +23554,13 @@ class Effect5957(EffectDef):
 
 
 class Effect5958(EffectDef):
+    """
+    shipHybridTrackingGC
+
+    Used by:
+    Ship: Lachesis
+    Ship: Phobos
+    """
 
     type = 'passive'
 
@@ -14731,6 +23571,12 @@ class Effect5958(EffectDef):
 
 
 class Effect5959(EffectDef):
+    """
+    eliteBonusHeavyInterdictorsHybridOptimal1
+
+    Used by:
+    Ship: Phobos
+    """
 
     type = 'passive'
 
@@ -14742,6 +23588,12 @@ class Effect5959(EffectDef):
 
 
 class Effect5994(EffectDef):
+    """
+    resistanceKillerHullAll
+
+    Used by:
+    Modules named like: Polarized (12 of 18)
+    """
 
     type = 'passive'
 
@@ -14753,6 +23605,12 @@ class Effect5994(EffectDef):
 
 
 class Effect5995(EffectDef):
+    """
+    resistanceKillerShieldArmorAll
+
+    Used by:
+    Modules named like: Polarized (12 of 18)
+    """
 
     type = 'passive'
 
@@ -14765,6 +23623,12 @@ class Effect5995(EffectDef):
 
 
 class Effect5998(EffectDef):
+    """
+    freighterSMACapacityBonusO1
+
+    Used by:
+    Ship: Bowhead
+    """
 
     type = 'passive'
 
@@ -14776,6 +23640,12 @@ class Effect5998(EffectDef):
 
 
 class Effect6001(EffectDef):
+    """
+    freighterAgilityBonus2O2
+
+    Used by:
+    Ship: Bowhead
+    """
 
     type = 'passive'
 
@@ -14786,6 +23656,12 @@ class Effect6001(EffectDef):
 
 
 class Effect6006(EffectDef):
+    """
+    shipSETDamageAmarrTacticalDestroyer1
+
+    Used by:
+    Ship: Confessor
+    """
 
     type = 'passive'
 
@@ -14797,6 +23673,12 @@ class Effect6006(EffectDef):
 
 
 class Effect6007(EffectDef):
+    """
+    shipSETCapNeedAmarrTacticalDestroyer2
+
+    Used by:
+    Ship: Confessor
+    """
 
     type = 'passive'
 
@@ -14808,6 +23690,12 @@ class Effect6007(EffectDef):
 
 
 class Effect6008(EffectDef):
+    """
+    shipHeatDamageAmarrTacticalDestroyer3
+
+    Used by:
+    Ship: Confessor
+    """
 
     type = 'passive'
 
@@ -14819,6 +23707,13 @@ class Effect6008(EffectDef):
 
 
 class Effect6009(EffectDef):
+    """
+    probeLauncherCPUPercentRoleBonusT3
+
+    Used by:
+    Ships from group: Strategic Cruiser (4 of 4)
+    Ships from group: Tactical Destroyer (4 of 4)
+    """
 
     type = 'passive'
 
@@ -14828,6 +23723,12 @@ class Effect6009(EffectDef):
 
 
 class Effect6010(EffectDef):
+    """
+    shipModeMaxTargetRangePostDiv
+
+    Used by:
+    Modules named like: Sharpshooter Mode (4 of 4)
+    """
 
     type = 'passive'
 
@@ -14842,6 +23743,12 @@ class Effect6010(EffectDef):
 
 
 class Effect6011(EffectDef):
+    """
+    shipModeSETOptimalRangePostDiv
+
+    Used by:
+    Module: Confessor Sharpshooter Mode
+    """
 
     type = 'passive'
 
@@ -14857,6 +23764,12 @@ class Effect6011(EffectDef):
 
 
 class Effect6012(EffectDef):
+    """
+    shipModeScanStrengthPostDiv
+
+    Used by:
+    Modules named like: Sharpshooter Mode (4 of 4)
+    """
 
     type = 'passive'
 
@@ -14872,6 +23785,13 @@ class Effect6012(EffectDef):
 
 
 class Effect6014(EffectDef):
+    """
+    modeSigRadiusPostDiv
+
+    Used by:
+    Module: Confessor Defense Mode
+    Module: Jackdaw Defense Mode
+    """
 
     type = 'passive'
 
@@ -14882,6 +23802,12 @@ class Effect6014(EffectDef):
 
 
 class Effect6015(EffectDef):
+    """
+    modeArmorResonancePostDiv
+
+    Used by:
+    Modules named like: Defense Mode (3 of 4)
+    """
 
     type = 'passive'
 
@@ -14902,6 +23828,12 @@ class Effect6015(EffectDef):
 
 
 class Effect6016(EffectDef):
+    """
+    modeAgilityPostDiv
+
+    Used by:
+    Modules named like: Propulsion Mode (4 of 4)
+    """
 
     type = 'passive'
 
@@ -14916,6 +23848,12 @@ class Effect6016(EffectDef):
 
 
 class Effect6017(EffectDef):
+    """
+    modeVelocityPostDiv
+
+    Used by:
+    Module: Jackdaw Propulsion Mode
+    """
 
     type = 'passive'
 
@@ -14930,6 +23868,12 @@ class Effect6017(EffectDef):
 
 
 class Effect6020(EffectDef):
+    """
+    shipBonusEnergyNeutOptimalRS3
+
+    Used by:
+    Ship: Pilgrim
+    """
 
     type = 'passive'
 
@@ -14940,6 +23884,12 @@ class Effect6020(EffectDef):
 
 
 class Effect6021(EffectDef):
+    """
+    shipBonusEnergyNosOptimalRS3
+
+    Used by:
+    Ship: Pilgrim
+    """
 
     type = 'passive'
 
@@ -14950,6 +23900,12 @@ class Effect6021(EffectDef):
 
 
 class Effect6025(EffectDef):
+    """
+    eliteReconBonusMHTOptimalRange1
+
+    Used by:
+    Ship: Lachesis
+    """
 
     type = 'passive'
 
@@ -14960,6 +23916,12 @@ class Effect6025(EffectDef):
 
 
 class Effect6027(EffectDef):
+    """
+    eliteReconBonusMPTdamage1
+
+    Used by:
+    Ship: Huginn
+    """
 
     type = 'passive'
 
@@ -14971,6 +23933,12 @@ class Effect6027(EffectDef):
 
 
 class Effect6032(EffectDef):
+    """
+    remoteCapacitorTransmitterPowerNeedBonusEffect
+
+    Used by:
+    Ships from group: Logistics (3 of 7)
+    """
 
     type = 'passive'
 
@@ -14981,6 +23949,12 @@ class Effect6032(EffectDef):
 
 
 class Effect6036(EffectDef):
+    """
+    shipHeatDamageMinmatarTacticalDestroyer3
+
+    Used by:
+    Ship: Svipul
+    """
 
     type = 'passive'
 
@@ -14992,6 +23966,12 @@ class Effect6036(EffectDef):
 
 
 class Effect6037(EffectDef):
+    """
+    shipSPTDamageMinmatarTacticalDestroyer1
+
+    Used by:
+    Ship: Svipul
+    """
 
     type = 'passive'
 
@@ -15003,6 +23983,12 @@ class Effect6037(EffectDef):
 
 
 class Effect6038(EffectDef):
+    """
+    shipSPTOptimalMinmatarTacticalDestroyer2
+
+    Used by:
+    Ship: Svipul
+    """
 
     type = 'passive'
 
@@ -15014,6 +24000,12 @@ class Effect6038(EffectDef):
 
 
 class Effect6039(EffectDef):
+    """
+    shipModeSPTTrackingPostDiv
+
+    Used by:
+    Module: Svipul Sharpshooter Mode
+    """
 
     type = 'passive'
 
@@ -15029,6 +24021,12 @@ class Effect6039(EffectDef):
 
 
 class Effect6040(EffectDef):
+    """
+    modeMWDSigRadiusPostDiv
+
+    Used by:
+    Module: Svipul Defense Mode
+    """
 
     type = 'passive'
 
@@ -15044,6 +24042,13 @@ class Effect6040(EffectDef):
 
 
 class Effect6041(EffectDef):
+    """
+    modeShieldResonancePostDiv
+
+    Used by:
+    Module: Jackdaw Defense Mode
+    Module: Svipul Defense Mode
+    """
 
     type = 'passive'
 
@@ -15064,6 +24069,12 @@ class Effect6041(EffectDef):
 
 
 class Effect6045(EffectDef):
+    """
+    shipBonusSentryDamageMultiplierGC3
+
+    Used by:
+    Ship: Ishtar
+    """
 
     type = 'passive'
 
@@ -15074,6 +24085,12 @@ class Effect6045(EffectDef):
 
 
 class Effect6046(EffectDef):
+    """
+    shipBonusSentryHPGC3
+
+    Used by:
+    Ship: Ishtar
+    """
 
     type = 'passive'
 
@@ -15084,6 +24101,12 @@ class Effect6046(EffectDef):
 
 
 class Effect6047(EffectDef):
+    """
+    shipBonusSentryArmorHPGC3
+
+    Used by:
+    Ship: Ishtar
+    """
 
     type = 'passive'
 
@@ -15094,6 +24117,12 @@ class Effect6047(EffectDef):
 
 
 class Effect6048(EffectDef):
+    """
+    shipBonusSentryShieldHPGC3
+
+    Used by:
+    Ship: Ishtar
+    """
 
     type = 'passive'
 
@@ -15104,6 +24133,12 @@ class Effect6048(EffectDef):
 
 
 class Effect6051(EffectDef):
+    """
+    shipBonusLightDroneDamageMultiplierGC2
+
+    Used by:
+    Ship: Ishtar
+    """
 
     type = 'passive'
 
@@ -15114,6 +24149,12 @@ class Effect6051(EffectDef):
 
 
 class Effect6052(EffectDef):
+    """
+    shipBonusMediumDroneDamageMultiplierGC2
+
+    Used by:
+    Ship: Ishtar
+    """
 
     type = 'passive'
 
@@ -15124,6 +24165,12 @@ class Effect6052(EffectDef):
 
 
 class Effect6053(EffectDef):
+    """
+    shipBonusHeavyDroneDamageMultiplierGC2
+
+    Used by:
+    Ship: Ishtar
+    """
 
     type = 'passive'
 
@@ -15134,6 +24181,12 @@ class Effect6053(EffectDef):
 
 
 class Effect6054(EffectDef):
+    """
+    shipBonusHeavyDroneHPGC2
+
+    Used by:
+    Ship: Ishtar
+    """
 
     type = 'passive'
 
@@ -15144,6 +24197,12 @@ class Effect6054(EffectDef):
 
 
 class Effect6055(EffectDef):
+    """
+    shipBonusHeavyDroneArmorHPGC2
+
+    Used by:
+    Ship: Ishtar
+    """
 
     type = 'passive'
 
@@ -15154,6 +24213,12 @@ class Effect6055(EffectDef):
 
 
 class Effect6056(EffectDef):
+    """
+    shipBonusHeavyDroneShieldHPGC2
+
+    Used by:
+    Ship: Ishtar
+    """
 
     type = 'passive'
 
@@ -15164,6 +24229,12 @@ class Effect6056(EffectDef):
 
 
 class Effect6057(EffectDef):
+    """
+    shipBonusMediumDroneShieldHPGC2
+
+    Used by:
+    Ship: Ishtar
+    """
 
     type = 'passive'
 
@@ -15174,6 +24245,12 @@ class Effect6057(EffectDef):
 
 
 class Effect6058(EffectDef):
+    """
+    shipBonusMediumDroneArmorHPGC2
+
+    Used by:
+    Ship: Ishtar
+    """
 
     type = 'passive'
 
@@ -15184,6 +24261,12 @@ class Effect6058(EffectDef):
 
 
 class Effect6059(EffectDef):
+    """
+    shipBonusMediumDroneHPGC2
+
+    Used by:
+    Ship: Ishtar
+    """
 
     type = 'passive'
 
@@ -15194,6 +24277,12 @@ class Effect6059(EffectDef):
 
 
 class Effect6060(EffectDef):
+    """
+    shipBonusLightDroneHPGC2
+
+    Used by:
+    Ship: Ishtar
+    """
 
     type = 'passive'
 
@@ -15204,6 +24293,12 @@ class Effect6060(EffectDef):
 
 
 class Effect6061(EffectDef):
+    """
+    shipBonusLightDroneArmorHPGC2
+
+    Used by:
+    Ship: Ishtar
+    """
 
     type = 'passive'
 
@@ -15214,6 +24309,12 @@ class Effect6061(EffectDef):
 
 
 class Effect6062(EffectDef):
+    """
+    shipBonusLightDroneShieldHPGC2
+
+    Used by:
+    Ship: Ishtar
+    """
 
     type = 'passive'
 
@@ -15224,6 +24325,12 @@ class Effect6062(EffectDef):
 
 
 class Effect6063(EffectDef):
+    """
+    entosisLink
+
+    Used by:
+    Modules from group: Entosis Link (6 of 6)
+    """
 
     type = 'active'
 
@@ -15239,6 +24346,12 @@ class Effect6063(EffectDef):
 
 
 class Effect6076(EffectDef):
+    """
+    shipModeMissileVelocityPostDiv
+
+    Used by:
+    Module: Jackdaw Sharpshooter Mode
+    """
 
     type = 'passive'
 
@@ -15254,6 +24367,12 @@ class Effect6076(EffectDef):
 
 
 class Effect6077(EffectDef):
+    """
+    shipHeatDamageCaldariTacticalDestroyer3
+
+    Used by:
+    Ship: Jackdaw
+    """
 
     type = 'passive'
 
@@ -15265,6 +24384,13 @@ class Effect6077(EffectDef):
 
 
 class Effect6083(EffectDef):
+    """
+    shipSmallMissileDmgPirateFaction
+
+    Used by:
+    Ship: Jackdaw
+    Ship: Sunesis
+    """
 
     type = 'passive'
 
@@ -15277,6 +24403,12 @@ class Effect6083(EffectDef):
 
 
 class Effect6085(EffectDef):
+    """
+    shipMissileRoFCaldariTacticalDestroyer1
+
+    Used by:
+    Ship: Jackdaw
+    """
 
     type = 'passive'
 
@@ -15288,6 +24420,13 @@ class Effect6085(EffectDef):
 
 
 class Effect6088(EffectDef):
+    """
+    shipBonusHeavyAssaultMissileAllDamageMC2
+
+    Used by:
+    Ship: Rapier
+    Ship: Scythe Fleet Issue
+    """
 
     type = 'passive'
 
@@ -15300,6 +24439,13 @@ class Effect6088(EffectDef):
 
 
 class Effect6093(EffectDef):
+    """
+    shipBonusHeavyMissileAllDamageMC2
+
+    Used by:
+    Ship: Rapier
+    Ship: Scythe Fleet Issue
+    """
 
     type = 'passive'
 
@@ -15312,6 +24458,13 @@ class Effect6093(EffectDef):
 
 
 class Effect6096(EffectDef):
+    """
+    shipBonusLightMissileAllDamageMC2
+
+    Used by:
+    Ship: Rapier
+    Ship: Scythe Fleet Issue
+    """
 
     type = 'passive'
 
@@ -15324,6 +24477,12 @@ class Effect6096(EffectDef):
 
 
 class Effect6098(EffectDef):
+    """
+    shipMissileReloadTimeCaldariTacticalDestroyer2
+
+    Used by:
+    Ship: Jackdaw
+    """
 
     type = 'passive'
 
@@ -15335,6 +24494,12 @@ class Effect6098(EffectDef):
 
 
 class Effect6104(EffectDef):
+    """
+    entosisDurationMultiply
+
+    Used by:
+    Items from market group: Ships > Capital Ships (31 of 40)
+    """
 
     type = 'passive'
 
@@ -15345,6 +24510,12 @@ class Effect6104(EffectDef):
 
 
 class Effect6110(EffectDef):
+    """
+    missileVelocityBonusOnline
+
+    Used by:
+    Modules from group: Missile Guidance Enhancer (3 of 3)
+    """
 
     type = 'passive'
 
@@ -15356,6 +24527,12 @@ class Effect6110(EffectDef):
 
 
 class Effect6111(EffectDef):
+    """
+    missileExplosionDelayBonusOnline
+
+    Used by:
+    Modules from group: Missile Guidance Enhancer (3 of 3)
+    """
 
     type = 'passive'
 
@@ -15367,6 +24544,12 @@ class Effect6111(EffectDef):
 
 
 class Effect6112(EffectDef):
+    """
+    missileAOECloudSizeBonusOnline
+
+    Used by:
+    Modules from group: Missile Guidance Enhancer (3 of 3)
+    """
 
     type = 'passive'
 
@@ -15378,6 +24561,13 @@ class Effect6112(EffectDef):
 
 
 class Effect6113(EffectDef):
+    """
+    missileAOEVelocityBonusOnline
+
+    Used by:
+    Modules from group: Missile Guidance Enhancer (3 of 3)
+    Module: ML-EKP 'Polybolos' Ballistic Control System
+    """
 
     type = 'passive'
 
@@ -15389,6 +24579,13 @@ class Effect6113(EffectDef):
 
 
 class Effect6128(EffectDef):
+    """
+    scriptMissileGuidanceComputerAOECloudSizeBonusBonus
+
+    Used by:
+    Charges from group: Tracking Script (2 of 2)
+    Charges named like: Missile Script (4 of 4)
+    """
 
     type = 'passive'
 
@@ -15398,6 +24595,13 @@ class Effect6128(EffectDef):
 
 
 class Effect6129(EffectDef):
+    """
+    scriptMissileGuidanceComputerAOEVelocityBonusBonus
+
+    Used by:
+    Charges from group: Tracking Script (2 of 2)
+    Charges named like: Missile Script (4 of 4)
+    """
 
     type = 'passive'
 
@@ -15407,6 +24611,12 @@ class Effect6129(EffectDef):
 
 
 class Effect6130(EffectDef):
+    """
+    scriptMissileGuidanceComputerMissileVelocityBonusBonus
+
+    Used by:
+    Charges named like: Missile Script (4 of 4)
+    """
 
     type = 'passive'
 
@@ -15416,6 +24626,12 @@ class Effect6130(EffectDef):
 
 
 class Effect6131(EffectDef):
+    """
+    scriptMissileGuidanceComputerExplosionDelayBonusBonus
+
+    Used by:
+    Charges named like: Missile Script (4 of 4)
+    """
 
     type = 'passive'
 
@@ -15425,6 +24641,12 @@ class Effect6131(EffectDef):
 
 
 class Effect6135(EffectDef):
+    """
+    missileGuidanceComputerBonus4
+
+    Used by:
+    Modules from group: Missile Guidance Computer (3 of 3)
+    """
 
     type = 'active'
 
@@ -15442,6 +24664,12 @@ class Effect6135(EffectDef):
 
 
 class Effect6144(EffectDef):
+    """
+    overloadSelfMissileGuidanceBonus5
+
+    Used by:
+    Modules from group: Missile Guidance Computer (3 of 3)
+    """
 
     type = 'overheat'
 
@@ -15458,6 +24686,12 @@ class Effect6144(EffectDef):
 
 
 class Effect6148(EffectDef):
+    """
+    shipHeatDamageGallenteTacticalDestroyer3
+
+    Used by:
+    Ship: Hecate
+    """
 
     type = 'passive'
 
@@ -15469,6 +24703,12 @@ class Effect6148(EffectDef):
 
 
 class Effect6149(EffectDef):
+    """
+    shipSHTRoFGallenteTacticalDestroyer1
+
+    Used by:
+    Ship: Hecate
+    """
 
     type = 'passive'
 
@@ -15480,6 +24720,12 @@ class Effect6149(EffectDef):
 
 
 class Effect6150(EffectDef):
+    """
+    shipSHTTrackingGallenteTacticalDestroyer2
+
+    Used by:
+    Ship: Hecate
+    """
 
     type = 'passive'
 
@@ -15491,6 +24737,12 @@ class Effect6150(EffectDef):
 
 
 class Effect6151(EffectDef):
+    """
+    modeHullResonancePostDiv
+
+    Used by:
+    Module: Hecate Defense Mode
+    """
 
     type = 'passive'
 
@@ -15509,6 +24761,12 @@ class Effect6151(EffectDef):
 
 
 class Effect6152(EffectDef):
+    """
+    shipModeSHTOptimalRangePostDiv
+
+    Used by:
+    Module: Hecate Sharpshooter Mode
+    """
 
     type = 'passive'
 
@@ -15524,6 +24782,12 @@ class Effect6152(EffectDef):
 
 
 class Effect6153(EffectDef):
+    """
+    modeMWDCapPostDiv
+
+    Used by:
+    Module: Hecate Propulsion Mode
+    """
 
     type = 'passive'
 
@@ -15537,6 +24801,12 @@ class Effect6153(EffectDef):
 
 
 class Effect6154(EffectDef):
+    """
+    modeMWDBoostPostDiv
+
+    Used by:
+    Module: Hecate Propulsion Mode
+    """
 
     type = 'passive'
 
@@ -15552,6 +24822,12 @@ class Effect6154(EffectDef):
 
 
 class Effect6155(EffectDef):
+    """
+    modeArmorRepDurationPostDiv
+
+    Used by:
+    Module: Hecate Defense Mode
+    """
 
     type = 'passive'
 
@@ -15565,6 +24841,12 @@ class Effect6155(EffectDef):
 
 
 class Effect6163(EffectDef):
+    """
+    passiveSpeedLimit
+
+    Used by:
+    Modules from group: Entosis Link (6 of 6)
+    """
 
     runtime = 'late'
     type = 'passive'
@@ -15575,6 +24857,12 @@ class Effect6163(EffectDef):
 
 
 class Effect6164(EffectDef):
+    """
+    systemMaxVelocityPercentage
+
+    Used by:
+    Celestials named like: Drifter Incursion (6 of 6)
+    """
 
     runTime = 'early'
     type = ('projected', 'passive')
@@ -15585,6 +24873,12 @@ class Effect6164(EffectDef):
 
 
 class Effect6166(EffectDef):
+    """
+    shipBonusWDFGnullPenalties
+
+    Used by:
+    Ship: Fiend
+    """
 
     runTime = 'early'
     type = 'passive'
@@ -15600,6 +24894,12 @@ class Effect6166(EffectDef):
 
 
 class Effect6170(EffectDef):
+    """
+    entosisCPUPenalty
+
+    Used by:
+    Ships from group: Interceptor (10 of 10)
+    """
 
     type = 'passive'
 
@@ -15610,6 +24910,12 @@ class Effect6170(EffectDef):
 
 
 class Effect6171(EffectDef):
+    """
+    entosisCPUAddition
+
+    Used by:
+    Modules from group: Entosis Link (6 of 6)
+    """
 
     type = 'passive'
 
@@ -15619,6 +24925,12 @@ class Effect6171(EffectDef):
 
 
 class Effect6172(EffectDef):
+    """
+    battlecruiserMETRange
+
+    Used by:
+    Ships named like: Harbinger (2 of 2)
+    """
 
     type = 'passive'
 
@@ -15631,6 +24943,13 @@ class Effect6172(EffectDef):
 
 
 class Effect6173(EffectDef):
+    """
+    battlecruiserMHTRange
+
+    Used by:
+    Ships named like: Brutix (2 of 2)
+    Ship: Ferox
+    """
 
     type = 'passive'
 
@@ -15643,6 +24962,12 @@ class Effect6173(EffectDef):
 
 
 class Effect6174(EffectDef):
+    """
+    battlecruiserMPTRange
+
+    Used by:
+    Ships named like: Hurricane (2 of 2)
+    """
 
     type = 'passive'
 
@@ -15655,6 +24980,13 @@ class Effect6174(EffectDef):
 
 
 class Effect6175(EffectDef):
+    """
+    battlecruiserMissileRange
+
+    Used by:
+    Ships named like: Drake (2 of 2)
+    Ship: Cyclone
+    """
 
     type = 'passive'
 
@@ -15665,6 +24997,13 @@ class Effect6175(EffectDef):
 
 
 class Effect6176(EffectDef):
+    """
+    battlecruiserDroneSpeed
+
+    Used by:
+    Ship: Myrmidon
+    Ship: Prophecy
+    """
 
     type = 'passive'
 
@@ -15675,6 +25014,12 @@ class Effect6176(EffectDef):
 
 
 class Effect6177(EffectDef):
+    """
+    shipHybridDmg1CBC2
+
+    Used by:
+    Ship: Ferox
+    """
 
     type = 'passive'
 
@@ -15686,6 +25031,12 @@ class Effect6177(EffectDef):
 
 
 class Effect6178(EffectDef):
+    """
+    shipBonusProjectileTrackingMBC2
+
+    Used by:
+    Ship: Hurricane Fleet Issue
+    """
 
     type = 'passive'
 
@@ -15697,6 +25048,12 @@ class Effect6178(EffectDef):
 
 
 class Effect6184(EffectDef):
+    """
+    shipModuleRemoteCapacitorTransmitter
+
+    Used by:
+    Modules from group: Remote Capacitor Transmitter (41 of 41)
+    """
 
     runTime = 'late'
     type = 'projected', 'active'
@@ -15715,6 +25072,12 @@ class Effect6184(EffectDef):
 
 
 class Effect6185(EffectDef):
+    """
+    shipModuleRemoteHullRepairer
+
+    Used by:
+    Modules from group: Remote Hull Repairer (8 of 8)
+    """
 
     runTime = 'late'
     type = 'projected', 'active'
@@ -15729,6 +25092,12 @@ class Effect6185(EffectDef):
 
 
 class Effect6186(EffectDef):
+    """
+    shipModuleRemoteShieldBooster
+
+    Used by:
+    Modules from group: Remote Shield Booster (38 of 38)
+    """
 
     type = 'projected', 'active'
 
@@ -15741,6 +25110,12 @@ class Effect6186(EffectDef):
 
 
 class Effect6187(EffectDef):
+    """
+    energyNeutralizerFalloff
+
+    Used by:
+    Modules from group: Energy Neutralizer (54 of 54)
+    """
 
     type = 'active', 'projected'
 
@@ -15760,6 +25135,12 @@ class Effect6187(EffectDef):
 
 
 class Effect6188(EffectDef):
+    """
+    shipModuleRemoteArmorRepairer
+
+    Used by:
+    Modules from group: Remote Armor Repairer (39 of 39)
+    """
 
     runTime = 'late'
     type = 'projected', 'active'
@@ -15776,6 +25157,12 @@ class Effect6188(EffectDef):
 
 
 class Effect6195(EffectDef):
+    """
+    expeditionFrigateShieldResistance1
+
+    Used by:
+    Ship: Endurance
+    """
 
     type = 'passive'
 
@@ -15792,6 +25179,12 @@ class Effect6195(EffectDef):
 
 
 class Effect6196(EffectDef):
+    """
+    expeditionFrigateBonusIceHarvestingCycleTime2
+
+    Used by:
+    Ship: Endurance
+    """
 
     type = 'passive'
 
@@ -15802,6 +25195,12 @@ class Effect6196(EffectDef):
 
 
 class Effect6197(EffectDef):
+    """
+    energyNosferatuFalloff
+
+    Used by:
+    Modules from group: Energy Nosferatu (54 of 54)
+    """
 
     runTime = 'late'
     type = 'active', 'projected'
@@ -15822,11 +25221,23 @@ class Effect6197(EffectDef):
 
 
 class Effect6201(EffectDef):
+    """
+    doomsdaySlash
+
+    Used by:
+    Modules named like: Reaper (4 of 4)
+    """
 
     type = 'active'
 
 
 class Effect6208(EffectDef):
+    """
+    microJumpPortalDrive
+
+    Used by:
+    Module: Micro Jump Field Generator
+    """
 
     type = 'active'
 
@@ -15837,6 +25248,13 @@ class Effect6208(EffectDef):
 
 
 class Effect6214(EffectDef):
+    """
+    roleBonusCDLinksPGReduction
+
+    Used by:
+    Ships from group: Command Destroyer (4 of 4)
+    Ship: Porpoise
+    """
 
     type = 'passive'
 
@@ -15847,6 +25265,12 @@ class Effect6214(EffectDef):
 
 
 class Effect6216(EffectDef):
+    """
+    structureEnergyNeutralizerFalloff
+
+    Used by:
+    Structure Modules from group: Structure Energy Neutralizer (5 of 5)
+    """
 
     type = 'active', 'projected'
 
@@ -15867,6 +25291,12 @@ class Effect6216(EffectDef):
 
 
 class Effect6222(EffectDef):
+    """
+    structureWarpScrambleBlockMWDWithNPCEffect
+
+    Used by:
+    Structure Modules from group: Structure Warp Scrambler (2 of 2)
+    """
 
     runTime = 'early'
     type = 'projected', 'active'
@@ -15884,6 +25314,12 @@ class Effect6222(EffectDef):
 
 
 class Effect6230(EffectDef):
+    """
+    shipBonusEnergyNeutOptimalRS1
+
+    Used by:
+    Ship: Curse
+    """
 
     type = 'passive'
 
@@ -15894,6 +25330,12 @@ class Effect6230(EffectDef):
 
 
 class Effect6232(EffectDef):
+    """
+    shipBonusEnergyNeutFalloffRS2
+
+    Used by:
+    Ship: Pilgrim
+    """
 
     type = 'passive'
 
@@ -15904,6 +25346,12 @@ class Effect6232(EffectDef):
 
 
 class Effect6233(EffectDef):
+    """
+    shipBonusEnergyNeutFalloffRS3
+
+    Used by:
+    Ship: Curse
+    """
 
     type = 'passive'
 
@@ -15914,6 +25362,12 @@ class Effect6233(EffectDef):
 
 
 class Effect6234(EffectDef):
+    """
+    shipBonusEnergyNosOptimalRS1
+
+    Used by:
+    Ship: Curse
+    """
 
     type = 'passive'
 
@@ -15924,6 +25378,12 @@ class Effect6234(EffectDef):
 
 
 class Effect6237(EffectDef):
+    """
+    shipBonusEnergyNosFalloffRS2
+
+    Used by:
+    Ship: Pilgrim
+    """
 
     type = 'passive'
 
@@ -15934,6 +25394,12 @@ class Effect6237(EffectDef):
 
 
 class Effect6238(EffectDef):
+    """
+    shipBonusEnergyNosFalloffRS3
+
+    Used by:
+    Ship: Curse
+    """
 
     type = 'passive'
 
@@ -15944,6 +25410,12 @@ class Effect6238(EffectDef):
 
 
 class Effect6239(EffectDef):
+    """
+    miningFrigateBonusIceHarvestingCycleTime2
+
+    Used by:
+    Ship: Endurance
+    """
 
     type = 'passive'
 
@@ -15954,6 +25426,12 @@ class Effect6239(EffectDef):
 
 
 class Effect6241(EffectDef):
+    """
+    shipBonusEnergyNeutFalloffAD1
+
+    Used by:
+    Ship: Dragoon
+    """
 
     type = 'passive'
 
@@ -15964,6 +25442,12 @@ class Effect6241(EffectDef):
 
 
 class Effect6242(EffectDef):
+    """
+    shipBonusEnergyNeutOptimalAD2
+
+    Used by:
+    Ship: Dragoon
+    """
 
     type = 'passive'
 
@@ -15974,6 +25458,12 @@ class Effect6242(EffectDef):
 
 
 class Effect6245(EffectDef):
+    """
+    shipBonusEnergyNosOptimalAD2
+
+    Used by:
+    Ship: Dragoon
+    """
 
     type = 'passive'
 
@@ -15984,6 +25474,12 @@ class Effect6245(EffectDef):
 
 
 class Effect6246(EffectDef):
+    """
+    shipBonusEnergyNosFalloffAD1
+
+    Used by:
+    Ship: Dragoon
+    """
 
     type = 'passive'
 
@@ -15994,6 +25490,12 @@ class Effect6246(EffectDef):
 
 
 class Effect6253(EffectDef):
+    """
+    shipBonusEnergyNeutOptimalAB
+
+    Used by:
+    Ship: Armageddon
+    """
 
     type = 'passive'
 
@@ -16004,6 +25506,12 @@ class Effect6253(EffectDef):
 
 
 class Effect6256(EffectDef):
+    """
+    shipBonusEnergyNeutFalloffAB2
+
+    Used by:
+    Ship: Armageddon
+    """
 
     type = 'passive'
 
@@ -16014,6 +25522,12 @@ class Effect6256(EffectDef):
 
 
 class Effect6257(EffectDef):
+    """
+    shipBonusEnergyNosOptimalAB
+
+    Used by:
+    Ship: Armageddon
+    """
 
     type = 'passive'
 
@@ -16024,6 +25538,12 @@ class Effect6257(EffectDef):
 
 
 class Effect6260(EffectDef):
+    """
+    shipBonusEnergyNosFalloffAB2
+
+    Used by:
+    Ship: Armageddon
+    """
 
     type = 'passive'
 
@@ -16034,6 +25554,12 @@ class Effect6260(EffectDef):
 
 
 class Effect6267(EffectDef):
+    """
+    shipBonusEnergyNeutOptimalEAF1
+
+    Used by:
+    Ship: Sentinel
+    """
 
     type = 'passive'
 
@@ -16045,6 +25571,12 @@ class Effect6267(EffectDef):
 
 
 class Effect6272(EffectDef):
+    """
+    shipBonusEnergyNeutFalloffEAF3
+
+    Used by:
+    Ship: Sentinel
+    """
 
     type = 'passive'
 
@@ -16056,6 +25588,12 @@ class Effect6272(EffectDef):
 
 
 class Effect6273(EffectDef):
+    """
+    shipBonusEnergyNosOptimalEAF1
+
+    Used by:
+    Ship: Sentinel
+    """
 
     type = 'passive'
 
@@ -16067,6 +25605,12 @@ class Effect6273(EffectDef):
 
 
 class Effect6278(EffectDef):
+    """
+    shipBonusEnergyNosFalloffEAF3
+
+    Used by:
+    Ship: Sentinel
+    """
 
     type = 'passive'
 
@@ -16078,6 +25622,12 @@ class Effect6278(EffectDef):
 
 
 class Effect6281(EffectDef):
+    """
+    shipBonusEnergyNeutOptimalAF2
+
+    Used by:
+    Ship: Malice
+    """
 
     type = 'passive'
 
@@ -16088,6 +25638,12 @@ class Effect6281(EffectDef):
 
 
 class Effect6285(EffectDef):
+    """
+    shipBonusEnergyNeutFalloffAF3
+
+    Used by:
+    Ship: Malice
+    """
 
     type = 'passive'
 
@@ -16098,6 +25654,12 @@ class Effect6285(EffectDef):
 
 
 class Effect6287(EffectDef):
+    """
+    shipBonusEnergyNosOptimalAF2
+
+    Used by:
+    Ship: Malice
+    """
 
     type = 'passive'
 
@@ -16108,6 +25670,12 @@ class Effect6287(EffectDef):
 
 
 class Effect6291(EffectDef):
+    """
+    shipBonusEnergyNosFalloffAF3
+
+    Used by:
+    Ship: Malice
+    """
 
     type = 'passive'
 
@@ -16118,6 +25686,12 @@ class Effect6291(EffectDef):
 
 
 class Effect6294(EffectDef):
+    """
+    shipBonusEnergyNeutOptimalAC1
+
+    Used by:
+    Ship: Vangel
+    """
 
     type = 'passive'
 
@@ -16128,6 +25702,12 @@ class Effect6294(EffectDef):
 
 
 class Effect6299(EffectDef):
+    """
+    shipBonusEnergyNeutFalloffAC3
+
+    Used by:
+    Ship: Vangel
+    """
 
     type = 'passive'
 
@@ -16138,6 +25718,12 @@ class Effect6299(EffectDef):
 
 
 class Effect6300(EffectDef):
+    """
+    shipBonusEnergyNosOptimalAC1
+
+    Used by:
+    Ship: Vangel
+    """
 
     type = 'passive'
 
@@ -16148,6 +25734,12 @@ class Effect6300(EffectDef):
 
 
 class Effect6301(EffectDef):
+    """
+    shipBonusNosOptimalFalloffAC2
+
+    Used by:
+    Ship: Rabisu
+    """
 
     type = 'passive'
 
@@ -16160,6 +25752,12 @@ class Effect6301(EffectDef):
 
 
 class Effect6305(EffectDef):
+    """
+    shipBonusEnergyNosFalloffAC3
+
+    Used by:
+    Ship: Vangel
+    """
 
     type = 'passive'
 
@@ -16170,6 +25768,12 @@ class Effect6305(EffectDef):
 
 
 class Effect6307(EffectDef):
+    """
+    shipBonusThermMissileDmgMD1
+
+    Used by:
+    Ship: Bifrost
+    """
 
     type = 'passive'
 
@@ -16180,6 +25784,12 @@ class Effect6307(EffectDef):
 
 
 class Effect6308(EffectDef):
+    """
+    shipBonusEMMissileDmgMD1
+
+    Used by:
+    Ship: Bifrost
+    """
 
     type = 'passive'
 
@@ -16190,6 +25800,12 @@ class Effect6308(EffectDef):
 
 
 class Effect6309(EffectDef):
+    """
+    shipBonusKineticMissileDmgMD1
+
+    Used by:
+    Ship: Bifrost
+    """
 
     type = 'passive'
 
@@ -16200,6 +25816,12 @@ class Effect6309(EffectDef):
 
 
 class Effect6310(EffectDef):
+    """
+    shipBonusExplosiveMissileDmgMD1
+
+    Used by:
+    Ship: Bifrost
+    """
 
     type = 'passive'
 
@@ -16211,6 +25833,13 @@ class Effect6310(EffectDef):
 
 
 class Effect6315(EffectDef):
+    """
+    eliteBonusCommandDestroyerSkirmish1
+
+    Used by:
+    Ship: Bifrost
+    Ship: Magus
+    """
 
     type = 'passive'
 
@@ -16229,6 +25858,13 @@ class Effect6315(EffectDef):
 
 
 class Effect6316(EffectDef):
+    """
+    eliteBonusCommandDestroyerShield1
+
+    Used by:
+    Ship: Bifrost
+    Ship: Stork
+    """
 
     type = 'passive'
 
@@ -16247,6 +25883,12 @@ class Effect6316(EffectDef):
 
 
 class Effect6317(EffectDef):
+    """
+    eliteBonusCommandDestroyerMJFGspool2
+
+    Used by:
+    Ships from group: Command Destroyer (4 of 4)
+    """
 
     type = 'passive'
 
@@ -16257,6 +25899,12 @@ class Effect6317(EffectDef):
 
 
 class Effect6318(EffectDef):
+    """
+    shipBonusEMShieldResistanceMD2
+
+    Used by:
+    Ship: Bifrost
+    """
 
     type = 'passive'
 
@@ -16267,6 +25915,12 @@ class Effect6318(EffectDef):
 
 
 class Effect6319(EffectDef):
+    """
+    shipBonusKineticShieldResistanceMD2
+
+    Used by:
+    Ship: Bifrost
+    """
 
     type = 'passive'
 
@@ -16277,6 +25931,12 @@ class Effect6319(EffectDef):
 
 
 class Effect6320(EffectDef):
+    """
+    shipBonusThermalShieldResistanceMD2
+
+    Used by:
+    Ship: Bifrost
+    """
 
     type = 'passive'
 
@@ -16287,6 +25947,12 @@ class Effect6320(EffectDef):
 
 
 class Effect6321(EffectDef):
+    """
+    shipBonusExplosiveShieldResistanceMD2
+
+    Used by:
+    Ship: Bifrost
+    """
 
     type = 'passive'
 
@@ -16297,6 +25963,12 @@ class Effect6321(EffectDef):
 
 
 class Effect6322(EffectDef):
+    """
+    scriptscanGravimetricStrengthBonusBonus
+
+    Used by:
+    Charges from group: Structure ECM script (4 of 4)
+    """
 
     runTime = 'early'
     type = 'passive'
@@ -16307,6 +25979,12 @@ class Effect6322(EffectDef):
 
 
 class Effect6323(EffectDef):
+    """
+    scriptscanLadarStrengthBonusBonus
+
+    Used by:
+    Charges from group: Structure ECM script (4 of 4)
+    """
 
     runTime = 'early'
     type = 'passive'
@@ -16317,6 +25995,12 @@ class Effect6323(EffectDef):
 
 
 class Effect6324(EffectDef):
+    """
+    scriptscanMagnetometricStrengthBonusBonus
+
+    Used by:
+    Charges from group: Structure ECM script (4 of 4)
+    """
 
     runTime = 'early'
     type = 'passive'
@@ -16327,6 +26011,12 @@ class Effect6324(EffectDef):
 
 
 class Effect6325(EffectDef):
+    """
+    scriptscanRadarStrengthBonusBonus
+
+    Used by:
+    Charges from group: Structure ECM script (4 of 4)
+    """
 
     runTime = 'early'
     type = 'passive'
@@ -16337,6 +26027,12 @@ class Effect6325(EffectDef):
 
 
 class Effect6326(EffectDef):
+    """
+    shipBonusThermalMissileDamageCD1
+
+    Used by:
+    Ship: Stork
+    """
 
     type = 'passive'
 
@@ -16347,6 +26043,12 @@ class Effect6326(EffectDef):
 
 
 class Effect6327(EffectDef):
+    """
+    shipBonusEMMissileDamageCD1
+
+    Used by:
+    Ship: Stork
+    """
 
     type = 'passive'
 
@@ -16357,6 +26059,12 @@ class Effect6327(EffectDef):
 
 
 class Effect6328(EffectDef):
+    """
+    shipBonusKineticMissileDamageCD1
+
+    Used by:
+    Ship: Stork
+    """
 
     type = 'passive'
 
@@ -16367,6 +26075,12 @@ class Effect6328(EffectDef):
 
 
 class Effect6329(EffectDef):
+    """
+    shipBonusExplosiveMissileDamageCD1
+
+    Used by:
+    Ship: Stork
+    """
 
     type = 'passive'
 
@@ -16378,6 +26092,12 @@ class Effect6329(EffectDef):
 
 
 class Effect6330(EffectDef):
+    """
+    shipBonusShieldEMResistanceCD2
+
+    Used by:
+    Ship: Stork
+    """
 
     type = 'passive'
 
@@ -16388,6 +26108,12 @@ class Effect6330(EffectDef):
 
 
 class Effect6331(EffectDef):
+    """
+    shipBonusShieldThermalResistanceCD2
+
+    Used by:
+    Ship: Stork
+    """
 
     type = 'passive'
 
@@ -16398,6 +26124,12 @@ class Effect6331(EffectDef):
 
 
 class Effect6332(EffectDef):
+    """
+    shipBonusShieldKineticResistanceCD2
+
+    Used by:
+    Ship: Stork
+    """
 
     type = 'passive'
 
@@ -16408,6 +26140,12 @@ class Effect6332(EffectDef):
 
 
 class Effect6333(EffectDef):
+    """
+    shipBonusShieldExplosiveResistanceCD2
+
+    Used by:
+    Ship: Stork
+    """
 
     type = 'passive'
 
@@ -16418,6 +26156,13 @@ class Effect6333(EffectDef):
 
 
 class Effect6334(EffectDef):
+    """
+    eliteBonusCommandDestroyerInfo1
+
+    Used by:
+    Ship: Pontifex
+    Ship: Stork
+    """
 
     type = 'passive'
 
@@ -16436,6 +26181,12 @@ class Effect6334(EffectDef):
 
 
 class Effect6335(EffectDef):
+    """
+    shipBonusKineticArmorResistanceAD2
+
+    Used by:
+    Ship: Pontifex
+    """
 
     type = 'passive'
 
@@ -16446,6 +26197,12 @@ class Effect6335(EffectDef):
 
 
 class Effect6336(EffectDef):
+    """
+    shipBonusThermalArmorResistanceAD2
+
+    Used by:
+    Ship: Pontifex
+    """
 
     type = 'passive'
 
@@ -16456,6 +26213,12 @@ class Effect6336(EffectDef):
 
 
 class Effect6337(EffectDef):
+    """
+    shipBonusEMArmorResistanceAD2
+
+    Used by:
+    Ship: Pontifex
+    """
 
     type = 'passive'
 
@@ -16465,6 +26228,12 @@ class Effect6337(EffectDef):
 
 
 class Effect6338(EffectDef):
+    """
+    shipBonusExplosiveArmorResistanceAD2
+
+    Used by:
+    Ship: Pontifex
+    """
 
     type = 'passive'
 
@@ -16475,6 +26244,13 @@ class Effect6338(EffectDef):
 
 
 class Effect6339(EffectDef):
+    """
+    eliteBonusCommandDestroyerArmored1
+
+    Used by:
+    Ship: Magus
+    Ship: Pontifex
+    """
 
     type = 'passive'
 
@@ -16493,6 +26269,12 @@ class Effect6339(EffectDef):
 
 
 class Effect6340(EffectDef):
+    """
+    shipBonusKineticArmorResistanceGD2
+
+    Used by:
+    Ship: Magus
+    """
 
     type = 'passive'
 
@@ -16503,6 +26285,12 @@ class Effect6340(EffectDef):
 
 
 class Effect6341(EffectDef):
+    """
+    shipBonusEMArmorResistanceGD2
+
+    Used by:
+    Ship: Magus
+    """
 
     type = 'passive'
 
@@ -16513,6 +26301,12 @@ class Effect6341(EffectDef):
 
 
 class Effect6342(EffectDef):
+    """
+    shipBonusThermalArmorResistanceGD2
+
+    Used by:
+    Ship: Magus
+    """
 
     type = 'passive'
 
@@ -16523,6 +26317,12 @@ class Effect6342(EffectDef):
 
 
 class Effect6343(EffectDef):
+    """
+    shipBonusExplosiveArmorResistanceGD2
+
+    Used by:
+    Ship: Magus
+    """
 
     type = 'passive'
 
@@ -16533,6 +26333,12 @@ class Effect6343(EffectDef):
 
 
 class Effect6350(EffectDef):
+    """
+    shipSmallMissileKinDmgCF3
+
+    Used by:
+    Ship: Caldari Navy Hookbill
+    """
 
     type = 'passive'
 
@@ -16544,6 +26350,12 @@ class Effect6350(EffectDef):
 
 
 class Effect6351(EffectDef):
+    """
+    shipMissileKinDamageCC3
+
+    Used by:
+    Ship: Osprey Navy Issue
+    """
 
     type = 'passive'
 
@@ -16554,6 +26366,12 @@ class Effect6351(EffectDef):
 
 
 class Effect6352(EffectDef):
+    """
+    roleBonusWDRange
+
+    Used by:
+    Ship: Crucifier Navy Issue
+    """
 
     type = 'passive'
 
@@ -16566,6 +26384,12 @@ class Effect6352(EffectDef):
 
 
 class Effect6353(EffectDef):
+    """
+    roleBonusWDCapCPU
+
+    Used by:
+    Ship: Crucifier Navy Issue
+    """
 
     type = 'passive'
 
@@ -16578,6 +26402,12 @@ class Effect6353(EffectDef):
 
 
 class Effect6354(EffectDef):
+    """
+    shipBonusEwWeaponDisruptionStrengthAF2
+
+    Used by:
+    Variations of ship: Crucifier (3 of 3)
+    """
 
     type = 'passive'
 
@@ -16600,6 +26430,12 @@ class Effect6354(EffectDef):
 
 
 class Effect6355(EffectDef):
+    """
+    roleBonusECMCapCPU
+
+    Used by:
+    Ship: Griffin Navy Issue
+    """
 
     type = 'passive'
 
@@ -16611,6 +26447,12 @@ class Effect6355(EffectDef):
 
 
 class Effect6356(EffectDef):
+    """
+    roleBonusECMRange
+
+    Used by:
+    Ship: Griffin Navy Issue
+    """
 
     type = 'passive'
 
@@ -16623,6 +26465,12 @@ class Effect6356(EffectDef):
 
 
 class Effect6357(EffectDef):
+    """
+    shipBonusJustScramblerRangeGF2
+
+    Used by:
+    Ship: Maulus Navy Issue
+    """
 
     type = 'passive'
 
@@ -16633,6 +26481,12 @@ class Effect6357(EffectDef):
 
 
 class Effect6358(EffectDef):
+    """
+    roleBonusJustScramblerStrength
+
+    Used by:
+    Ship: Maulus Navy Issue
+    """
 
     type = 'passive'
 
@@ -16643,6 +26497,12 @@ class Effect6358(EffectDef):
 
 
 class Effect6359(EffectDef):
+    """
+    shipBonusAoeVelocityRocketsMF
+
+    Used by:
+    Ship: Vigil Fleet Issue
+    """
 
     type = 'passive'
 
@@ -16653,6 +26513,12 @@ class Effect6359(EffectDef):
 
 
 class Effect6360(EffectDef):
+    """
+    shipRocketEMThermKinDmgMF2
+
+    Used by:
+    Ship: Vigil Fleet Issue
+    """
 
     type = 'passive'
 
@@ -16667,6 +26533,12 @@ class Effect6360(EffectDef):
 
 
 class Effect6361(EffectDef):
+    """
+    shipRocketExpDmgMF3
+
+    Used by:
+    Ship: Vigil Fleet Issue
+    """
 
     type = 'passive'
 
@@ -16677,6 +26549,12 @@ class Effect6361(EffectDef):
 
 
 class Effect6362(EffectDef):
+    """
+    roleBonusStasisRange
+
+    Used by:
+    Ship: Vigil Fleet Issue
+    """
 
     type = 'passive'
 
@@ -16687,6 +26565,15 @@ class Effect6362(EffectDef):
 
 
 class Effect6368(EffectDef):
+    """
+    shieldTransporterFalloffBonus
+
+    Used by:
+    Variations of ship: Bantam (2 of 2)
+    Variations of ship: Burst (2 of 2)
+    Ship: Osprey
+    Ship: Scythe
+    """
 
     type = 'passive'
 
@@ -16699,6 +26586,12 @@ class Effect6368(EffectDef):
 
 
 class Effect6369(EffectDef):
+    """
+    shipShieldTransferFalloffMC2
+
+    Used by:
+    Ship: Scimitar
+    """
 
     type = 'passive'
 
@@ -16709,6 +26602,13 @@ class Effect6369(EffectDef):
 
 
 class Effect6370(EffectDef):
+    """
+    shipShieldTransferFalloffCC1
+
+    Used by:
+    Ship: Basilisk
+    Ship: Etana
+    """
 
     type = 'passive'
 
@@ -16719,6 +26619,12 @@ class Effect6370(EffectDef):
 
 
 class Effect6371(EffectDef):
+    """
+    shipRemoteArmorFalloffGC1
+
+    Used by:
+    Ship: Oneiros
+    """
 
     type = 'passive'
 
@@ -16730,6 +26636,12 @@ class Effect6371(EffectDef):
 
 
 class Effect6372(EffectDef):
+    """
+    shipRemoteArmorFalloffAC2
+
+    Used by:
+    Ship: Guardian
+    """
 
     type = 'passive'
 
@@ -16741,6 +26653,16 @@ class Effect6372(EffectDef):
 
 
 class Effect6373(EffectDef):
+    """
+    armorRepairProjectorFalloffBonus
+
+    Used by:
+    Variations of ship: Navitas (2 of 2)
+    Ship: Augoror
+    Ship: Deacon
+    Ship: Exequror
+    Ship: Inquisitor
+    """
 
     type = 'passive'
 
@@ -16753,6 +26675,14 @@ class Effect6373(EffectDef):
 
 
 class Effect6374(EffectDef):
+    """
+    droneHullRepairBonusEffect
+
+    Used by:
+    Ships from group: Logistics (6 of 7)
+    Ship: Exequror
+    Ship: Scythe
+    """
 
     type = 'passive'
 
@@ -16763,6 +26693,13 @@ class Effect6374(EffectDef):
 
 
 class Effect6377(EffectDef):
+    """
+    eliteBonusLogiFrigArmorRepSpeedCap1
+
+    Used by:
+    Ship: Deacon
+    Ship: Thalia
+    """
 
     type = 'passive'
 
@@ -16775,6 +26712,13 @@ class Effect6377(EffectDef):
 
 
 class Effect6378(EffectDef):
+    """
+    eliteBonusLogiFrigShieldRepSpeedCap1
+
+    Used by:
+    Ship: Kirin
+    Ship: Scalpel
+    """
 
     type = 'passive'
 
@@ -16787,6 +26731,12 @@ class Effect6378(EffectDef):
 
 
 class Effect6379(EffectDef):
+    """
+    eliteBonusLogiFrigArmorHP2
+
+    Used by:
+    Ship: Deacon
+    """
 
     type = 'passive'
 
@@ -16796,6 +26746,12 @@ class Effect6379(EffectDef):
 
 
 class Effect6380(EffectDef):
+    """
+    eliteBonusLogiFrigShieldHP2
+
+    Used by:
+    Ship: Kirin
+    """
 
     type = 'passive'
 
@@ -16805,6 +26761,13 @@ class Effect6380(EffectDef):
 
 
 class Effect6381(EffectDef):
+    """
+    eliteBonusLogiFrigSignature2
+
+    Used by:
+    Ship: Scalpel
+    Ship: Thalia
+    """
 
     type = 'passive'
 
@@ -16815,6 +26778,12 @@ class Effect6381(EffectDef):
 
 
 class Effect6384(EffectDef):
+    """
+    overloadSelfMissileGuidanceModuleBonus
+
+    Used by:
+    Variations of module: Guidance Disruptor I (6 of 6)
+    """
 
     type = 'overheat'
 
@@ -16830,6 +26799,12 @@ class Effect6384(EffectDef):
 
 
 class Effect6385(EffectDef):
+    """
+    ignoreCloakVelocityPenalty
+
+    Used by:
+    Ship: Endurance
+    """
 
     runTime = 'early'
     type = 'passive'
@@ -16841,6 +26816,13 @@ class Effect6385(EffectDef):
 
 
 class Effect6386(EffectDef):
+    """
+    ewSkillGuidanceDisruptionBonus
+
+    Used by:
+    Modules named like: Tracking Diagnostic Subroutines (8 of 8)
+    Skill: Weapon Destabilization
+    """
 
     type = 'passive'
 
@@ -16858,6 +26840,12 @@ class Effect6386(EffectDef):
 
 
 class Effect6395(EffectDef):
+    """
+    shipBonusEwWeaponDisruptionStrengthAC1
+
+    Used by:
+    Variations of ship: Arbitrator (3 of 3)
+    """
 
     type = 'passive'
 
@@ -16880,6 +26868,12 @@ class Effect6395(EffectDef):
 
 
 class Effect6396(EffectDef):
+    """
+    skillStructureMissileDamageBonus
+
+    Used by:
+    Skill: Structure Missile Systems
+    """
 
     type = 'passive', 'structure'
 
@@ -16893,6 +26887,12 @@ class Effect6396(EffectDef):
 
 
 class Effect6400(EffectDef):
+    """
+    skillStructureElectronicSystemsCapNeedBonus
+
+    Used by:
+    Skill: Structure Electronic Systems
+    """
 
     type = 'passive', 'structure'
 
@@ -16905,6 +26905,12 @@ class Effect6400(EffectDef):
 
 
 class Effect6401(EffectDef):
+    """
+    skillStructureEngineeringSystemsCapNeedBonus
+
+    Used by:
+    Skill: Structure Engineering Systems
+    """
 
     type = 'passive', 'structure'
 
@@ -16917,6 +26923,12 @@ class Effect6401(EffectDef):
 
 
 class Effect6402(EffectDef):
+    """
+    structureRigAoeVelocityBonusSingleTargetMissiles
+
+    Used by:
+    Structure Modules named like: Standup Set Missile (6 of 8)
+    """
 
     type = 'passive'
 
@@ -16930,6 +26942,12 @@ class Effect6402(EffectDef):
 
 
 class Effect6403(EffectDef):
+    """
+    structureRigVelocityBonusSingleTargetMissiles
+
+    Used by:
+    Structure Modules named like: Standup Set Missile (6 of 8)
+    """
 
     type = 'passive'
 
@@ -16942,6 +26960,13 @@ class Effect6403(EffectDef):
 
 
 class Effect6404(EffectDef):
+    """
+    structureRigNeutralizerMaxRangeFalloffEffectiveness
+
+    Used by:
+    Structure Modules from group: Structure Combat Rig XL - Energy Neutralizer and EW (2 of 2)
+    Structure Modules named like: Standup Set Energy Neutralizer (4 of 6)
+    """
 
     type = 'passive'
 
@@ -16957,6 +26982,13 @@ class Effect6404(EffectDef):
 
 
 class Effect6405(EffectDef):
+    """
+    structureRigNeutralizerCapacitorNeed
+
+    Used by:
+    Structure Modules from group: Structure Combat Rig XL - Energy Neutralizer and EW (2 of 2)
+    Structure Modules named like: Standup Set Energy Neutralizer (4 of 6)
+    """
 
     type = 'passive'
 
@@ -16968,6 +27000,13 @@ class Effect6405(EffectDef):
 
 
 class Effect6406(EffectDef):
+    """
+    structureRigEWMaxRangeFalloff
+
+    Used by:
+    Structure Modules from group: Structure Combat Rig M - EW projection (2 of 2)
+    Structure Modules named like: Standup Set EW (4 of 4)
+    """
 
     type = 'passive'
 
@@ -16989,6 +27028,13 @@ class Effect6406(EffectDef):
 
 
 class Effect6407(EffectDef):
+    """
+    structureRigEWCapacitorNeed
+
+    Used by:
+    Structure Modules from group: Structure Combat Rig M - EW Cap Reduction (2 of 2)
+    Structure Modules named like: Standup Set EW (4 of 4)
+    """
 
     type = 'passive'
 
@@ -17001,6 +27047,13 @@ class Effect6407(EffectDef):
 
 
 class Effect6408(EffectDef):
+    """
+    structureRigMaxTargets
+
+    Used by:
+    Structure Modules from group: Structure Combat Rig XL - Doomsday and Targeting (2 of 2)
+    Structure Modules named like: Standup Set Target (4 of 4)
+    """
 
     type = 'passive'
 
@@ -17010,6 +27063,14 @@ class Effect6408(EffectDef):
 
 
 class Effect6409(EffectDef):
+    """
+    structureRigSensorResolution
+
+    Used by:
+    Structure Modules from group: Structure Combat Rig L - Max Targets and Sensor Boosting (2 of 2)
+    Structure Modules from group: Structure Combat Rig M - Boosted Sensors (2 of 2)
+    Structure Modules from group: Structure Combat Rig XL - Doomsday and Targeting (2 of 2)
+    """
 
     type = 'passive'
 
@@ -17020,6 +27081,13 @@ class Effect6409(EffectDef):
 
 
 class Effect6410(EffectDef):
+    """
+    structureRigExplosionRadiusBonusAoEMissiles
+
+    Used by:
+    Structure Modules from group: Structure Combat Rig L - AoE Launcher Application and Projection (2 of 2)
+    Structure Modules from group: Structure Combat Rig XL - Missile and AoE Missile (2 of 2)
+    """
 
     type = 'passive'
 
@@ -17031,6 +27099,13 @@ class Effect6410(EffectDef):
 
 
 class Effect6411(EffectDef):
+    """
+    structureRigVelocityBonusAoeMissiles
+
+    Used by:
+    Structure Modules from group: Structure Combat Rig L - AoE Launcher Application and Projection (2 of 2)
+    Structure Modules from group: Structure Combat Rig XL - Missile and AoE Missile (2 of 2)
+    """
 
     type = 'passive'
 
@@ -17042,6 +27117,13 @@ class Effect6411(EffectDef):
 
 
 class Effect6412(EffectDef):
+    """
+    structureRigPDBmaxRange
+
+    Used by:
+    Structure Modules from group: Structure Combat Rig L - Point Defense Battery Application and Projection (2 of 2)
+    Structure Modules from group: Structure Combat Rig XL - Doomsday and Targeting (2 of 2)
+    """
 
     type = 'passive'
 
@@ -17053,6 +27135,13 @@ class Effect6412(EffectDef):
 
 
 class Effect6413(EffectDef):
+    """
+    structureRigPDBCapacitorNeed
+
+    Used by:
+    Structure Modules from group: Structure Combat Rig L - Point Defense Battery Application and Projection (2 of 2)
+    Structure Modules from group: Structure Combat Rig XL - Doomsday and Targeting (2 of 2)
+    """
 
     type = 'passive'
 
@@ -17064,6 +27153,12 @@ class Effect6413(EffectDef):
 
 
 class Effect6417(EffectDef):
+    """
+    structureRigDoomsdayDamageLoss
+
+    Used by:
+    Structure Modules from group: Structure Combat Rig XL - Doomsday and Targeting (2 of 2)
+    """
 
     type = 'passive'
 
@@ -17075,6 +27170,13 @@ class Effect6417(EffectDef):
 
 
 class Effect6422(EffectDef):
+    """
+    remoteSensorDampFalloff
+
+    Used by:
+    Modules from group: Sensor Dampener (6 of 6)
+    Starbases from group: Sensor Dampening Battery (3 of 3)
+    """
 
     type = 'projected', 'active'
 
@@ -17091,6 +27193,12 @@ class Effect6422(EffectDef):
 
 
 class Effect6423(EffectDef):
+    """
+    shipModuleGuidanceDisruptor
+
+    Used by:
+    Variations of module: Guidance Disruptor I (6 of 6)
+    """
 
     type = 'active', 'projected'
 
@@ -17109,6 +27217,12 @@ class Effect6423(EffectDef):
 
 
 class Effect6424(EffectDef):
+    """
+    shipModuleTrackingDisruptor
+
+    Used by:
+    Variations of module: Tracking Disruptor I (6 of 6)
+    """
 
     type = 'projected', 'active'
 
@@ -17127,6 +27241,12 @@ class Effect6424(EffectDef):
 
 
 class Effect6425(EffectDef):
+    """
+    remoteTargetPaintFalloff
+
+    Used by:
+    Modules from group: Target Painter (8 of 8)
+    """
 
     type = 'projected', 'active'
 
@@ -17138,6 +27258,14 @@ class Effect6425(EffectDef):
 
 
 class Effect6426(EffectDef):
+    """
+    remoteWebifierFalloff
+
+    Used by:
+    Modules from group: Stasis Grappler (7 of 7)
+    Modules from group: Stasis Web (19 of 19)
+    Starbases from group: Stasis Webification Battery (3 of 3)
+    """
 
     type = 'active', 'projected'
 
@@ -17150,6 +27278,12 @@ class Effect6426(EffectDef):
 
 
 class Effect6427(EffectDef):
+    """
+    remoteSensorBoostFalloff
+
+    Used by:
+    Modules from group: Remote Sensor Booster (8 of 8)
+    """
 
     type = 'projected', 'active'
 
@@ -17172,6 +27306,12 @@ class Effect6427(EffectDef):
 
 
 class Effect6428(EffectDef):
+    """
+    shipModuleRemoteTrackingComputer
+
+    Used by:
+    Modules from group: Remote Tracking Computer (8 of 8)
+    """
 
     type = 'projected', 'active'
 
@@ -17190,6 +27330,13 @@ class Effect6428(EffectDef):
 
 
 class Effect6431(EffectDef):
+    """
+    fighterAbilityMissiles
+
+    Used by:
+    Items from category: Fighter (48 of 82)
+    Fighters from group: Light Fighter (32 of 32)
+    """
 
     displayName = 'Missile Attack'
     hasCharges = True
@@ -17198,6 +27345,12 @@ class Effect6431(EffectDef):
 
 
 class Effect6434(EffectDef):
+    """
+    fighterAbilityEnergyNeutralizer
+
+    Used by:
+    Fighters named like: Cenobite (4 of 4)
+    """
 
     displayName = 'Energy Neutralizer'
     grouped = True
@@ -17218,6 +27371,12 @@ class Effect6434(EffectDef):
 
 
 class Effect6435(EffectDef):
+    """
+    fighterAbilityStasisWebifier
+
+    Used by:
+    Fighters named like: Dromi (4 of 4)
+    """
 
     displayName = 'Stasis Webifier'
     grouped = True
@@ -17233,6 +27392,12 @@ class Effect6435(EffectDef):
 
 
 class Effect6436(EffectDef):
+    """
+    fighterAbilityWarpDisruption
+
+    Used by:
+    Fighters named like: Siren (4 of 4)
+    """
 
     displayName = 'Warp Disruption'
     grouped = True
@@ -17247,6 +27412,12 @@ class Effect6436(EffectDef):
 
 
 class Effect6437(EffectDef):
+    """
+    fighterAbilityECM
+
+    Used by:
+    Fighters named like: Scarab (4 of 4)
+    """
 
     displayName = 'ECM'
     grouped = True
@@ -17268,6 +27439,12 @@ class Effect6437(EffectDef):
 
 
 class Effect6439(EffectDef):
+    """
+    fighterAbilityEvasiveManeuvers
+
+    Used by:
+    Fighters from group: Light Fighter (16 of 32)
+    """
 
     displayName = 'Evasive Maneuvers'
     grouped = True
@@ -17299,6 +27476,12 @@ class Effect6439(EffectDef):
 
 
 class Effect6441(EffectDef):
+    """
+    fighterAbilityMicroWarpDrive
+
+    Used by:
+    Items from category: Fighter (48 of 82)
+    """
 
     displayName = 'Microwarpdrive'
     grouped = True
@@ -17315,16 +27498,34 @@ class Effect6441(EffectDef):
 
 
 class Effect6443(EffectDef):
+    """
+    pointDefense
+
+    Used by:
+    Structure Modules from group: Structure Area Denial Module (2 of 2)
+    """
 
     type = 'active'
 
 
 class Effect6447(EffectDef):
+    """
+    lightningWeapon
+
+    Used by:
+    Structure Module: Standup Arcing Vorton Projector I
+    """
 
     type = 'active'
 
 
 class Effect6448(EffectDef):
+    """
+    structureMissileGuidanceEnhancer
+
+    Used by:
+    Variations of structure module: Standup Missile Guidance Enhancer I (2 of 2)
+    """
 
     type = 'passive'
 
@@ -17343,6 +27544,12 @@ class Effect6448(EffectDef):
 
 
 class Effect6449(EffectDef):
+    """
+    structureBallisticControlSystem
+
+    Used by:
+    Variations of structure module: Standup Ballistic Control System I (2 of 2)
+    """
 
     type = 'passive'
 
@@ -17363,6 +27570,13 @@ class Effect6449(EffectDef):
 
 
 class Effect6465(EffectDef):
+    """
+    fighterAbilityAttackM
+
+    Used by:
+    Items from category: Fighter (50 of 82)
+    Fighters from group: Heavy Fighter (34 of 34)
+    """
 
     displayName = 'Turret Attack'
     prefix = 'fighterAbilityAttackMissile'
@@ -17370,6 +27584,13 @@ class Effect6465(EffectDef):
 
 
 class Effect6470(EffectDef):
+    """
+    remoteECMFalloff
+
+    Used by:
+    Modules from group: ECM (39 of 39)
+    Starbases from group: Electronic Warfare Battery (12 of 12)
+    """
 
     type = 'projected', 'active'
 
@@ -17387,21 +27608,45 @@ class Effect6470(EffectDef):
 
 
 class Effect6472(EffectDef):
+    """
+    doomsdayBeamDOT
+
+    Used by:
+    Modules named like: Lance (4 of 4)
+    """
 
     type = 'active'
 
 
 class Effect6473(EffectDef):
+    """
+    doomsdayConeDOT
+
+    Used by:
+    Module: Bosonic Field Generator
+    """
 
     type = 'active'
 
 
 class Effect6474(EffectDef):
+    """
+    doomsdayHOG
+
+    Used by:
+    Module: Gravitational Transportation Field Oscillator
+    """
 
     type = 'active'
 
 
 class Effect6475(EffectDef):
+    """
+    structureRigDoomsdayTargetAmountBonus
+
+    Used by:
+    Structure Modules from group: Structure Combat Rig XL - Doomsday and Targeting (2 of 2)
+    """
 
     type = 'passive'
 
@@ -17413,6 +27658,13 @@ class Effect6475(EffectDef):
 
 
 class Effect6476(EffectDef):
+    """
+    doomsdayAOEWeb
+
+    Used by:
+    Module: Stasis Webification Burst Projector
+    Structure Module: Standup Stasis Webification Burst Projector
+    """
 
     type = 'active', 'projected'
 
@@ -17425,6 +27677,13 @@ class Effect6476(EffectDef):
 
 
 class Effect6477(EffectDef):
+    """
+    doomsdayAOENeut
+
+    Used by:
+    Module: Energy Neutralization Burst Projector
+    Structure Module: Standup Energy Neutralization Burst Projector
+    """
 
     type = 'active', 'projected'
 
@@ -17444,6 +27703,13 @@ class Effect6477(EffectDef):
 
 
 class Effect6478(EffectDef):
+    """
+    doomsdayAOEPaint
+
+    Used by:
+    Module: Target Illumination Burst Projector
+    Structure Module: Standup Target Illumination Burst Projector
+    """
 
     type = 'projected', 'active'
 
@@ -17455,6 +27721,13 @@ class Effect6478(EffectDef):
 
 
 class Effect6479(EffectDef):
+    """
+    doomsdayAOETrack
+
+    Used by:
+    Module: Weapon Disruption Burst Projector
+    Structure Module: Standup Weapon Disruption Burst Projector
+    """
 
     type = 'active', 'projected'
 
@@ -17483,6 +27756,13 @@ class Effect6479(EffectDef):
 
 
 class Effect6481(EffectDef):
+    """
+    doomsdayAOEDamp
+
+    Used by:
+    Module: Sensor Dampening Burst Projector
+    Structure Module: Standup Sensor Dampening Burst Projector
+    """
 
     type = 'projected', 'active'
 
@@ -17499,6 +27779,13 @@ class Effect6481(EffectDef):
 
 
 class Effect6482(EffectDef):
+    """
+    doomsdayAOEBubble
+
+    Used by:
+    Module: Warp Disruption Burst Projector
+    Structure Module: Standup Warp Disruption Burst Projector
+    """
 
     type = 'projected', 'active'
 
@@ -17508,6 +27795,12 @@ class Effect6482(EffectDef):
 
 
 class Effect6484(EffectDef):
+    """
+    emergencyHullEnergizer
+
+    Used by:
+    Variations of module: Capital Emergency Hull Energizer I (5 of 5)
+    """
 
     runtime = 'late'
     type = 'active'
@@ -17521,6 +27814,12 @@ class Effect6484(EffectDef):
 
 
 class Effect6485(EffectDef):
+    """
+    fighterAbilityLaunchBomb
+
+    Used by:
+    Fighters from group: Heavy Fighter (16 of 34)
+    """
 
     displayName = 'Bomb'
     hasCharges = True
@@ -17529,6 +27828,12 @@ class Effect6485(EffectDef):
 
 
 class Effect6487(EffectDef):
+    """
+    modifyEnergyWarfareResistance
+
+    Used by:
+    Modules from group: Capacitor Battery (30 of 30)
+    """
 
     type = 'passive'
 
@@ -17540,6 +27845,12 @@ class Effect6487(EffectDef):
 
 
 class Effect6488(EffectDef):
+    """
+    scriptSensorBoosterSensorStrengthBonusBonus
+
+    Used by:
+    Charges from group: Sensor Booster Script (3 of 3)
+    """
 
     type = 'active'
 
@@ -17551,6 +27862,12 @@ class Effect6488(EffectDef):
 
 
 class Effect6501(EffectDef):
+    """
+    shipBonusDreadnoughtA1DamageBonus
+
+    Used by:
+    Ship: Revelation
+    """
 
     type = 'passive'
 
@@ -17561,6 +27878,12 @@ class Effect6501(EffectDef):
 
 
 class Effect6502(EffectDef):
+    """
+    shipBonusDreadnoughtA2ArmorResists
+
+    Used by:
+    Ship: Revelation
+    """
 
     type = 'passive'
 
@@ -17577,6 +27900,12 @@ class Effect6502(EffectDef):
 
 
 class Effect6503(EffectDef):
+    """
+    shipBonusDreadnoughtA3CapNeed
+
+    Used by:
+    Ship: Revelation
+    """
 
     type = 'passive'
 
@@ -17587,6 +27916,12 @@ class Effect6503(EffectDef):
 
 
 class Effect6504(EffectDef):
+    """
+    shipBonusDreadnoughtC1DamageBonus
+
+    Used by:
+    Ship: Phoenix
+    """
 
     type = 'passive'
 
@@ -17619,6 +27954,12 @@ class Effect6504(EffectDef):
 
 
 class Effect6505(EffectDef):
+    """
+    shipBonusDreadnoughtC2ShieldResists
+
+    Used by:
+    Variations of ship: Phoenix (2 of 2)
+    """
 
     type = 'passive'
 
@@ -17635,6 +27976,12 @@ class Effect6505(EffectDef):
 
 
 class Effect6506(EffectDef):
+    """
+    shipBonusDreadnoughtG1DamageBonus
+
+    Used by:
+    Ship: Moros
+    """
 
     type = 'passive'
 
@@ -17645,6 +27992,12 @@ class Effect6506(EffectDef):
 
 
 class Effect6507(EffectDef):
+    """
+    shipBonusDreadnoughtG2ROFBonus
+
+    Used by:
+    Variations of ship: Moros (2 of 2)
+    """
 
     type = 'passive'
 
@@ -17655,6 +28008,12 @@ class Effect6507(EffectDef):
 
 
 class Effect6508(EffectDef):
+    """
+    shipBonusDreadnoughtG3RepairTime
+
+    Used by:
+    Ship: Moros
+    """
 
     type = 'passive'
 
@@ -17665,6 +28024,12 @@ class Effect6508(EffectDef):
 
 
 class Effect6509(EffectDef):
+    """
+    shipBonusDreadnoughtM1DamageBonus
+
+    Used by:
+    Ship: Naglfar
+    """
 
     type = 'passive'
 
@@ -17675,6 +28040,12 @@ class Effect6509(EffectDef):
 
 
 class Effect6510(EffectDef):
+    """
+    shipBonusDreadnoughtM2ROFBonus
+
+    Used by:
+    Ship: Naglfar
+    """
 
     type = 'passive'
 
@@ -17685,6 +28056,12 @@ class Effect6510(EffectDef):
 
 
 class Effect6511(EffectDef):
+    """
+    shipBonusDreadnoughtM3RepairTime
+
+    Used by:
+    Ship: Naglfar
+    """
 
     type = 'passive'
 
@@ -17695,6 +28072,13 @@ class Effect6511(EffectDef):
 
 
 class Effect6513(EffectDef):
+    """
+    doomsdayAOEECM
+
+    Used by:
+    Module: ECM Jammer Burst Projector
+    Structure Module: Standup ECM Jammer Burst Projector
+    """
 
     type = 'projected', 'active'
 
@@ -17712,6 +28096,12 @@ class Effect6513(EffectDef):
 
 
 class Effect6526(EffectDef):
+    """
+    shipBonusForceAuxiliaryA1RemoteRepairAndCapAmount
+
+    Used by:
+    Ship: Apostle
+    """
 
     type = 'passive'
 
@@ -17728,6 +28118,12 @@ class Effect6526(EffectDef):
 
 
 class Effect6527(EffectDef):
+    """
+    shipBonusForceAuxiliaryA2ArmorResists
+
+    Used by:
+    Ship: Apostle
+    """
 
     type = 'passive'
 
@@ -17744,6 +28140,12 @@ class Effect6527(EffectDef):
 
 
 class Effect6533(EffectDef):
+    """
+    shipBonusForceAuxiliaryA4WarfareLinksBonus
+
+    Used by:
+    Ship: Apostle
+    """
 
     type = 'passive'
 
@@ -17767,6 +28169,12 @@ class Effect6533(EffectDef):
 
 
 class Effect6534(EffectDef):
+    """
+    shipBonusForceAuxiliaryM4WarfareLinksBonus
+
+    Used by:
+    Ship: Lif
+    """
 
     type = 'passive'
 
@@ -17790,6 +28198,12 @@ class Effect6534(EffectDef):
 
 
 class Effect6535(EffectDef):
+    """
+    shipBonusForceAuxiliaryG4WarfareLinksBonus
+
+    Used by:
+    Ship: Ninazu
+    """
 
     type = 'passive'
 
@@ -17813,6 +28227,12 @@ class Effect6535(EffectDef):
 
 
 class Effect6536(EffectDef):
+    """
+    shipBonusForceAuxiliaryC4WarfareLinksBonus
+
+    Used by:
+    Ship: Minokawa
+    """
 
     type = 'passive'
 
@@ -17836,6 +28256,12 @@ class Effect6536(EffectDef):
 
 
 class Effect6537(EffectDef):
+    """
+    shipBonusRole1CommandBurstCPUBonus
+
+    Used by:
+    Ships from group: Force Auxiliary (6 of 6)
+    """
 
     type = 'passive'
 
@@ -17846,6 +28272,12 @@ class Effect6537(EffectDef):
 
 
 class Effect6545(EffectDef):
+    """
+    shipBonusForceAuxiliaryC1RemoteBoostAndCapAmount
+
+    Used by:
+    Ship: Minokawa
+    """
 
     type = 'passive'
 
@@ -17865,6 +28297,12 @@ class Effect6545(EffectDef):
 
 
 class Effect6546(EffectDef):
+    """
+    shipBonusForceAuxiliaryC2ShieldResists
+
+    Used by:
+    Variations of ship: Minokawa (2 of 2)
+    """
 
     type = 'passive'
 
@@ -17881,6 +28319,12 @@ class Effect6546(EffectDef):
 
 
 class Effect6548(EffectDef):
+    """
+    shipBonusForceAuxiliaryG1RemoteCycleTime
+
+    Used by:
+    Ship: Ninazu
+    """
 
     type = 'passive'
 
@@ -17897,6 +28341,12 @@ class Effect6548(EffectDef):
 
 
 class Effect6549(EffectDef):
+    """
+    shipBonusForceAuxiliaryG2LocalRepairAmount
+
+    Used by:
+    Ship: Ninazu
+    """
 
     type = 'passive'
 
@@ -17909,6 +28359,12 @@ class Effect6549(EffectDef):
 
 
 class Effect6551(EffectDef):
+    """
+    shipBonusForceAuxiliaryM1RemoteDuration
+
+    Used by:
+    Ship: Lif
+    """
 
     type = 'passive'
 
@@ -17926,6 +28382,12 @@ class Effect6551(EffectDef):
 
 
 class Effect6552(EffectDef):
+    """
+    shipBonusForceAuxiliaryM2LocalBoostAmount
+
+    Used by:
+    Ship: Lif
+    """
 
     type = 'passive'
 
@@ -17938,6 +28400,12 @@ class Effect6552(EffectDef):
 
 
 class Effect6555(EffectDef):
+    """
+    moduleBonusDroneNavigationComputer
+
+    Used by:
+    Modules from group: Drone Navigation Computer (8 of 8)
+    """
 
     type = 'passive'
 
@@ -17950,6 +28418,14 @@ class Effect6555(EffectDef):
 
 
 class Effect6556(EffectDef):
+    """
+    moduleBonusDroneDamageAmplifier
+
+    Used by:
+    Modules from group: Drone Damage Modules (11 of 11)
+    Modules named like: C3 'Hivaa Saitsuo' Ballistic Control System (2 of 2)
+    Module: Abyssal Ballistic Control System
+    """
 
     type = 'passive'
 
@@ -17969,6 +28445,12 @@ class Effect6556(EffectDef):
 
 
 class Effect6557(EffectDef):
+    """
+    moduleBonusOmnidirectionalTrackingLink
+
+    Used by:
+    Modules from group: Drone Tracking Modules (10 of 10)
+    """
 
     type = 'active'
 
@@ -18012,6 +28494,12 @@ class Effect6557(EffectDef):
 
 
 class Effect6558(EffectDef):
+    """
+    moduleBonusOmnidirectionalTrackingLinkOverload
+
+    Used by:
+    Modules from group: Drone Tracking Modules (10 of 10)
+    """
 
     type = 'overheat'
 
@@ -18026,6 +28514,12 @@ class Effect6558(EffectDef):
 
 
 class Effect6559(EffectDef):
+    """
+    moduleBonusOmnidirectionalTrackingEnhancer
+
+    Used by:
+    Modules from group: Drone Tracking Enhancer (10 of 10)
+    """
 
     type = 'passive'
 
@@ -18069,6 +28563,12 @@ class Effect6559(EffectDef):
 
 
 class Effect6560(EffectDef):
+    """
+    skillBonusFighters
+
+    Used by:
+    Skill: Fighters
+    """
 
     type = 'passive'
 
@@ -18087,6 +28587,12 @@ class Effect6560(EffectDef):
 
 
 class Effect6561(EffectDef):
+    """
+    skillBonusLightFighters
+
+    Used by:
+    Skill: Light Fighters
+    """
 
     type = 'passive'
 
@@ -18098,6 +28604,12 @@ class Effect6561(EffectDef):
 
 
 class Effect6562(EffectDef):
+    """
+    skillBonusSupportFightersShield
+
+    Used by:
+    Skill: Support Fighters
+    """
 
     type = 'passive'
 
@@ -18109,6 +28621,12 @@ class Effect6562(EffectDef):
 
 
 class Effect6563(EffectDef):
+    """
+    skillBonusHeavyFighters
+
+    Used by:
+    Skill: Heavy Fighters
+    """
 
     type = 'passive'
 
@@ -18127,6 +28645,12 @@ class Effect6563(EffectDef):
 
 
 class Effect6565(EffectDef):
+    """
+    citadelRigBonus
+
+    Used by:
+    Structures from group: Citadel (9 of 9)
+    """
 
     runTime = 'early'
     type = 'passive'
@@ -18151,6 +28675,12 @@ class Effect6565(EffectDef):
 
 
 class Effect6566(EffectDef):
+    """
+    moduleBonusFighterSupportUnit
+
+    Used by:
+    Modules from group: Fighter Support Unit (8 of 8)
+    """
 
     type = 'passive'
 
@@ -18172,6 +28702,12 @@ class Effect6566(EffectDef):
 
 
 class Effect6567(EffectDef):
+    """
+    moduleBonusNetworkedSensorArray
+
+    Used by:
+    Module: Networked Sensor Array
+    """
 
     type = 'active'
 
@@ -18201,6 +28737,12 @@ class Effect6567(EffectDef):
 
 
 class Effect6570(EffectDef):
+    """
+    skillBonusFighterHangarManagement
+
+    Used by:
+    Skill: Fighter Hangar Management
+    """
 
     type = 'passive'
 
@@ -18211,6 +28753,12 @@ class Effect6570(EffectDef):
 
 
 class Effect6571(EffectDef):
+    """
+    skillBonusCapitalAutocannonSpecialization
+
+    Used by:
+    Skill: Capital Autocannon Specialization
+    """
 
     type = 'passive'
 
@@ -18222,6 +28770,12 @@ class Effect6571(EffectDef):
 
 
 class Effect6572(EffectDef):
+    """
+    skillBonusCapitalArtillerySpecialization
+
+    Used by:
+    Skill: Capital Artillery Specialization
+    """
 
     type = 'passive'
 
@@ -18233,6 +28787,12 @@ class Effect6572(EffectDef):
 
 
 class Effect6573(EffectDef):
+    """
+    skillBonusCapitalBlasterSpecialization
+
+    Used by:
+    Skill: Capital Blaster Specialization
+    """
 
     type = 'passive'
 
@@ -18244,6 +28804,12 @@ class Effect6573(EffectDef):
 
 
 class Effect6574(EffectDef):
+    """
+    skillBonusCapitalRailgunSpecialization
+
+    Used by:
+    Skill: Capital Railgun Specialization
+    """
 
     type = 'passive'
 
@@ -18255,6 +28821,12 @@ class Effect6574(EffectDef):
 
 
 class Effect6575(EffectDef):
+    """
+    skillBonusCapitalPulseLaserSpecialization
+
+    Used by:
+    Skill: Capital Pulse Laser Specialization
+    """
 
     type = 'passive'
 
@@ -18266,6 +28838,12 @@ class Effect6575(EffectDef):
 
 
 class Effect6576(EffectDef):
+    """
+    skillBonusCapitalBeamLaserSpecialization
+
+    Used by:
+    Skill: Capital Beam Laser Specialization
+    """
 
     type = 'passive'
 
@@ -18277,6 +28855,12 @@ class Effect6576(EffectDef):
 
 
 class Effect6577(EffectDef):
+    """
+    skillBonusXLCruiseMissileSpecialization
+
+    Used by:
+    Skill: XL Cruise Missile Specialization
+    """
 
     type = 'passive'
 
@@ -18288,6 +28872,12 @@ class Effect6577(EffectDef):
 
 
 class Effect6578(EffectDef):
+    """
+    skillBonusXLTorpedoSpecialization
+
+    Used by:
+    Skill: XL Torpedo Specialization
+    """
 
     type = 'passive'
 
@@ -18299,6 +28889,12 @@ class Effect6578(EffectDef):
 
 
 class Effect6580(EffectDef):
+    """
+    shipBonusRole2LogisticDroneRepAmountBonus
+
+    Used by:
+    Ships from group: Force Auxiliary (5 of 6)
+    """
 
     type = 'passive'
 
@@ -18313,6 +28909,12 @@ class Effect6580(EffectDef):
 
 
 class Effect6581(EffectDef):
+    """
+    moduleBonusTriageModule
+
+    Used by:
+    Variations of module: Triage Module I (2 of 2)
+    """
 
     runTime = 'early'
     type = 'active'
@@ -18389,6 +28991,12 @@ class Effect6581(EffectDef):
 
 
 class Effect6582(EffectDef):
+    """
+    moduleBonusSiegeModule
+
+    Used by:
+    Variations of module: Siege Module I (2 of 2)
+    """
 
     runTime = 'early'
     type = 'active'
@@ -18453,6 +29061,13 @@ class Effect6582(EffectDef):
 
 
 class Effect6591(EffectDef):
+    """
+    shipBonusSupercarrierA3WarpStrength
+
+    Used by:
+    Ship: Aeon
+    Ship: Revenant
+    """
 
     type = 'passive'
 
@@ -18463,6 +29078,13 @@ class Effect6591(EffectDef):
 
 
 class Effect6592(EffectDef):
+    """
+    shipBonusSupercarrierC3WarpStrength
+
+    Used by:
+    Ship: Revenant
+    Ship: Wyvern
+    """
 
     type = 'passive'
 
@@ -18473,6 +29095,12 @@ class Effect6592(EffectDef):
 
 
 class Effect6593(EffectDef):
+    """
+    shipBonusSupercarrierG3WarpStrength
+
+    Used by:
+    Variations of ship: Nyx (2 of 2)
+    """
 
     type = 'passive'
 
@@ -18483,6 +29111,13 @@ class Effect6593(EffectDef):
 
 
 class Effect6594(EffectDef):
+    """
+    shipBonusSupercarrierM3WarpStrength
+
+    Used by:
+    Ship: Hel
+    Ship: Vendetta
+    """
 
     type = 'passive'
 
@@ -18493,6 +29128,12 @@ class Effect6594(EffectDef):
 
 
 class Effect6595(EffectDef):
+    """
+    shipBonusCarrierA4WarfareLinksBonus
+
+    Used by:
+    Ship: Archon
+    """
 
     type = 'passive'
 
@@ -18516,6 +29157,12 @@ class Effect6595(EffectDef):
 
 
 class Effect6596(EffectDef):
+    """
+    shipBonusCarrierC4WarfareLinksBonus
+
+    Used by:
+    Ship: Chimera
+    """
 
     type = 'passive'
 
@@ -18539,6 +29186,12 @@ class Effect6596(EffectDef):
 
 
 class Effect6597(EffectDef):
+    """
+    shipBonusCarrierG4WarfareLinksBonus
+
+    Used by:
+    Ship: Thanatos
+    """
 
     type = 'passive'
 
@@ -18562,6 +29215,12 @@ class Effect6597(EffectDef):
 
 
 class Effect6598(EffectDef):
+    """
+    shipBonusCarrierM4WarfareLinksBonus
+
+    Used by:
+    Ship: Nidhoggur
+    """
 
     type = 'passive'
 
@@ -18585,6 +29244,12 @@ class Effect6598(EffectDef):
 
 
 class Effect6599(EffectDef):
+    """
+    shipBonusCarrierA1ArmorResists
+
+    Used by:
+    Ship: Archon
+    """
 
     type = 'passive'
 
@@ -18601,6 +29266,12 @@ class Effect6599(EffectDef):
 
 
 class Effect6600(EffectDef):
+    """
+    shipBonusCarrierC1ShieldResists
+
+    Used by:
+    Ship: Chimera
+    """
 
     type = 'passive'
 
@@ -18617,6 +29288,12 @@ class Effect6600(EffectDef):
 
 
 class Effect6601(EffectDef):
+    """
+    shipBonusCarrierG1FighterDamage
+
+    Used by:
+    Ship: Thanatos
+    """
 
     type = 'passive'
 
@@ -18634,6 +29311,12 @@ class Effect6601(EffectDef):
 
 
 class Effect6602(EffectDef):
+    """
+    shipBonusCarrierM1FighterDamage
+
+    Used by:
+    Ship: Nidhoggur
+    """
 
     type = 'passive'
 
@@ -18651,6 +29334,13 @@ class Effect6602(EffectDef):
 
 
 class Effect6603(EffectDef):
+    """
+    shipBonusSupercarrierA1FighterDamage
+
+    Used by:
+    Ship: Aeon
+    Ship: Revenant
+    """
 
     type = 'passive'
 
@@ -18668,6 +29358,13 @@ class Effect6603(EffectDef):
 
 
 class Effect6604(EffectDef):
+    """
+    shipBonusSupercarrierC1FighterDamage
+
+    Used by:
+    Ship: Revenant
+    Ship: Wyvern
+    """
 
     type = 'passive'
 
@@ -18685,6 +29382,12 @@ class Effect6604(EffectDef):
 
 
 class Effect6605(EffectDef):
+    """
+    shipBonusSupercarrierG1FighterDamage
+
+    Used by:
+    Variations of ship: Nyx (2 of 2)
+    """
 
     type = 'passive'
 
@@ -18702,6 +29405,12 @@ class Effect6605(EffectDef):
 
 
 class Effect6606(EffectDef):
+    """
+    shipBonusSupercarrierM1FighterDamage
+
+    Used by:
+    Ship: Hel
+    """
 
     type = 'passive'
 
@@ -18719,6 +29428,12 @@ class Effect6606(EffectDef):
 
 
 class Effect6607(EffectDef):
+    """
+    shipBonusSupercarrierA5WarfareLinksBonus
+
+    Used by:
+    Ship: Aeon
+    """
 
     type = 'passive'
 
@@ -18742,6 +29457,12 @@ class Effect6607(EffectDef):
 
 
 class Effect6608(EffectDef):
+    """
+    shipBonusSupercarrierC5WarfareLinksBonus
+
+    Used by:
+    Ship: Wyvern
+    """
 
     type = 'passive'
 
@@ -18765,6 +29486,12 @@ class Effect6608(EffectDef):
 
 
 class Effect6609(EffectDef):
+    """
+    shipBonusSupercarrierG5WarfareLinksBonus
+
+    Used by:
+    Ship: Nyx
+    """
 
     type = 'passive'
 
@@ -18788,6 +29515,12 @@ class Effect6609(EffectDef):
 
 
 class Effect6610(EffectDef):
+    """
+    shipBonusSupercarrierM5WarfareLinksBonus
+
+    Used by:
+    Ship: Hel
+    """
 
     type = 'passive'
 
@@ -18811,6 +29544,12 @@ class Effect6610(EffectDef):
 
 
 class Effect6611(EffectDef):
+    """
+    shipBonusSupercarrierC2AfterburnerBonus
+
+    Used by:
+    Ship: Revenant
+    """
 
     type = 'passive'
 
@@ -18821,6 +29560,12 @@ class Effect6611(EffectDef):
 
 
 class Effect6612(EffectDef):
+    """
+    shipBonusSupercarrierA2FighterApplicationBonus
+
+    Used by:
+    Ship: Revenant
+    """
 
     type = 'passive'
 
@@ -18835,6 +29580,12 @@ class Effect6612(EffectDef):
 
 
 class Effect6613(EffectDef):
+    """
+    shipBonusSupercarrierRole1NumWarfareLinks
+
+    Used by:
+    Ships from group: Supercarrier (6 of 6)
+    """
 
     type = 'passive'
 
@@ -18845,6 +29596,12 @@ class Effect6613(EffectDef):
 
 
 class Effect6614(EffectDef):
+    """
+    shipBonusSupercarrierRole2ArmorShieldModuleBonus
+
+    Used by:
+    Ships from group: Supercarrier (6 of 6)
+    """
 
     type = 'passive'
 
@@ -18857,6 +29614,12 @@ class Effect6614(EffectDef):
 
 
 class Effect6615(EffectDef):
+    """
+    shipBonusSupercarrierA4BurstProjectorBonus
+
+    Used by:
+    Ship: Aeon
+    """
 
     type = 'passive'
 
@@ -18868,6 +29631,12 @@ class Effect6615(EffectDef):
 
 
 class Effect6616(EffectDef):
+    """
+    shipBonusSupercarrierC4BurstProjectorBonus
+
+    Used by:
+    Ship: Wyvern
+    """
 
     type = 'passive'
 
@@ -18879,6 +29648,12 @@ class Effect6616(EffectDef):
 
 
 class Effect6617(EffectDef):
+    """
+    shipBonusSupercarrierG4BurstProjectorBonus
+
+    Used by:
+    Ship: Nyx
+    """
 
     type = 'passive'
 
@@ -18890,6 +29665,12 @@ class Effect6617(EffectDef):
 
 
 class Effect6618(EffectDef):
+    """
+    shipBonusSupercarrierM4BurstProjectorBonus
+
+    Used by:
+    Ship: Hel
+    """
 
     type = 'passive'
 
@@ -18901,6 +29682,12 @@ class Effect6618(EffectDef):
 
 
 class Effect6619(EffectDef):
+    """
+    shipBonusCarrierRole1NumWarfareLinks
+
+    Used by:
+    Ships from group: Carrier (4 of 4)
+    """
 
     type = 'passive'
 
@@ -18911,6 +29698,12 @@ class Effect6619(EffectDef):
 
 
 class Effect6620(EffectDef):
+    """
+    shipBonusDreadnoughtC3ReloadBonus
+
+    Used by:
+    Ship: Phoenix
+    """
 
     type = 'passive'
 
@@ -18921,6 +29714,12 @@ class Effect6620(EffectDef):
 
 
 class Effect6621(EffectDef):
+    """
+    shipBonusSupercarrierA2ArmorResists
+
+    Used by:
+    Ship: Aeon
+    """
 
     type = 'passive'
 
@@ -18937,6 +29736,12 @@ class Effect6621(EffectDef):
 
 
 class Effect6622(EffectDef):
+    """
+    shipBonusSupercarrierC2ShieldResists
+
+    Used by:
+    Ship: Wyvern
+    """
 
     type = 'passive'
 
@@ -18953,6 +29758,12 @@ class Effect6622(EffectDef):
 
 
 class Effect6623(EffectDef):
+    """
+    shipBonusSupercarrierG2FighterHitpoints
+
+    Used by:
+    Variations of ship: Nyx (2 of 2)
+    """
 
     type = 'passive'
 
@@ -18963,6 +29774,13 @@ class Effect6623(EffectDef):
 
 
 class Effect6624(EffectDef):
+    """
+    shipBonusSupercarrierM2FighterVelocity
+
+    Used by:
+    Ship: Hel
+    Ship: Vendetta
+    """
 
     type = 'passive'
 
@@ -18973,6 +29791,12 @@ class Effect6624(EffectDef):
 
 
 class Effect6625(EffectDef):
+    """
+    shipBonusCarrierA2SupportFighterBonus
+
+    Used by:
+    Ship: Archon
+    """
 
     type = 'passive'
 
@@ -18986,6 +29810,12 @@ class Effect6625(EffectDef):
 
 
 class Effect6626(EffectDef):
+    """
+    shipBonusCarrierC2SupportFighterBonus
+
+    Used by:
+    Ship: Chimera
+    """
 
     type = 'passive'
 
@@ -18999,6 +29829,12 @@ class Effect6626(EffectDef):
 
 
 class Effect6627(EffectDef):
+    """
+    shipBonusCarrierG2SupportFighterBonus
+
+    Used by:
+    Ship: Thanatos
+    """
 
     type = 'passive'
 
@@ -19012,6 +29848,12 @@ class Effect6627(EffectDef):
 
 
 class Effect6628(EffectDef):
+    """
+    shipBonusCarrierM2SupportFighterBonus
+
+    Used by:
+    Ship: Nidhoggur
+    """
 
     type = 'passive'
 
@@ -19025,6 +29867,12 @@ class Effect6628(EffectDef):
 
 
 class Effect6629(EffectDef):
+    """
+    scriptResistanceBonusBonus
+
+    Used by:
+    Charges named like: Resistance Script (8 of 8)
+    """
 
     type = 'passive'
 
@@ -19038,6 +29886,12 @@ class Effect6629(EffectDef):
 
 
 class Effect6634(EffectDef):
+    """
+    shipBonusTitanA1DamageBonus
+
+    Used by:
+    Ship: Avatar
+    """
 
     type = 'passive'
 
@@ -19048,6 +29902,12 @@ class Effect6634(EffectDef):
 
 
 class Effect6635(EffectDef):
+    """
+    shipBonusTitanC1KinDamageBonus
+
+    Used by:
+    Ship: Leviathan
+    """
 
     type = 'passive'
 
@@ -19062,6 +29922,12 @@ class Effect6635(EffectDef):
 
 
 class Effect6636(EffectDef):
+    """
+    shipBonusTitanG1DamageBonus
+
+    Used by:
+    Ship: Erebus
+    """
 
     type = 'passive'
 
@@ -19072,6 +29938,12 @@ class Effect6636(EffectDef):
 
 
 class Effect6637(EffectDef):
+    """
+    shipBonusTitanM1DamageBonus
+
+    Used by:
+    Ship: Ragnarok
+    """
 
     type = 'passive'
 
@@ -19082,6 +29954,12 @@ class Effect6637(EffectDef):
 
 
 class Effect6638(EffectDef):
+    """
+    shipBonusTitanC2ROFBonus
+
+    Used by:
+    Variations of ship: Leviathan (2 of 2)
+    """
 
     type = 'passive'
 
@@ -19096,6 +29974,12 @@ class Effect6638(EffectDef):
 
 
 class Effect6639(EffectDef):
+    """
+    shipBonusSupercarrierA4FighterApplicationBonus
+
+    Used by:
+    Ship: Revenant
+    """
 
     type = 'passive'
 
@@ -19110,6 +29994,12 @@ class Effect6639(EffectDef):
 
 
 class Effect6640(EffectDef):
+    """
+    shipBonusRole1NumWarfareLinks
+
+    Used by:
+    Ships from group: Titan (7 of 7)
+    """
 
     type = 'passive'
 
@@ -19120,6 +30010,12 @@ class Effect6640(EffectDef):
 
 
 class Effect6641(EffectDef):
+    """
+    shipBonusRole2ArmorPlates&ShieldExtendersBonus
+
+    Used by:
+    Ships from group: Titan (7 of 7)
+    """
 
     type = 'passive'
 
@@ -19132,6 +30028,12 @@ class Effect6641(EffectDef):
 
 
 class Effect6642(EffectDef):
+    """
+    skillBonusDoomsdayRapidFiring
+
+    Used by:
+    Skill: Doomsday Rapid Firing
+    """
 
     type = 'passive'
 
@@ -19143,6 +30045,12 @@ class Effect6642(EffectDef):
 
 
 class Effect6647(EffectDef):
+    """
+    shipBonusTitanA3WarpStrength
+
+    Used by:
+    Variations of ship: Avatar (2 of 2)
+    """
 
     type = 'passive'
 
@@ -19152,6 +30060,12 @@ class Effect6647(EffectDef):
 
 
 class Effect6648(EffectDef):
+    """
+    shipBonusTitanC3WarpStrength
+
+    Used by:
+    Variations of ship: Leviathan (2 of 2)
+    """
 
     type = 'passive'
 
@@ -19161,6 +30075,13 @@ class Effect6648(EffectDef):
 
 
 class Effect6649(EffectDef):
+    """
+    shipBonusTitanG3WarpStrength
+
+    Used by:
+    Variations of ship: Erebus (2 of 2)
+    Ship: Komodo
+    """
 
     type = 'passive'
 
@@ -19170,6 +30091,12 @@ class Effect6649(EffectDef):
 
 
 class Effect6650(EffectDef):
+    """
+    shipBonusTitanM3WarpStrength
+
+    Used by:
+    Ships from group: Titan (3 of 7)
+    """
 
     type = 'passive'
 
@@ -19179,6 +30106,12 @@ class Effect6650(EffectDef):
 
 
 class Effect6651(EffectDef):
+    """
+    shipModuleAncillaryRemoteArmorRepairer
+
+    Used by:
+    Modules from group: Ancillary Remote Armor Repairer (4 of 4)
+    """
 
     runTime = 'late'
     type = 'projected', 'active'
@@ -19202,6 +30135,12 @@ class Effect6651(EffectDef):
 
 
 class Effect6652(EffectDef):
+    """
+    shipModuleAncillaryRemoteShieldBooster
+
+    Used by:
+    Modules from group: Ancillary Remote Shield Booster (4 of 4)
+    """
 
     runTime = 'late'
     type = 'projected', 'active'
@@ -19216,6 +30155,12 @@ class Effect6652(EffectDef):
 
 
 class Effect6653(EffectDef):
+    """
+    shipBonusTitanA2CapNeed
+
+    Used by:
+    Ship: Avatar
+    """
 
     type = 'passive'
 
@@ -19226,6 +30171,12 @@ class Effect6653(EffectDef):
 
 
 class Effect6654(EffectDef):
+    """
+    shipBonusTitanG2ROFBonus
+
+    Used by:
+    Variations of ship: Erebus (2 of 2)
+    """
 
     type = 'passive'
 
@@ -19236,6 +30187,12 @@ class Effect6654(EffectDef):
 
 
 class Effect6655(EffectDef):
+    """
+    shipBonusTitanM2ROFBonus
+
+    Used by:
+    Ship: Ragnarok
+    """
 
     type = 'passive'
 
@@ -19246,6 +30203,12 @@ class Effect6655(EffectDef):
 
 
 class Effect6656(EffectDef):
+    """
+    shipBonusRole3XLTorpdeoVelocityBonus
+
+    Used by:
+    Variations of ship: Leviathan (2 of 2)
+    """
 
     type = 'passive'
 
@@ -19256,6 +30219,12 @@ class Effect6656(EffectDef):
 
 
 class Effect6657(EffectDef):
+    """
+    shipBonusTitanC5AllDamageBonus
+
+    Used by:
+    Ship: Leviathan
+    """
 
     type = 'passive'
 
@@ -19282,6 +30251,12 @@ class Effect6657(EffectDef):
 
 
 class Effect6658(EffectDef):
+    """
+    moduleBonusBastionModule
+
+    Used by:
+    Module: Bastion Module I
+    """
 
     runTime = 'early'
     type = 'active'
@@ -19354,6 +30329,12 @@ class Effect6658(EffectDef):
 
 
 class Effect6661(EffectDef):
+    """
+    shipBonusCarrierM3FighterVelocity
+
+    Used by:
+    Ship: Nidhoggur
+    """
 
     type = 'passive'
 
@@ -19364,6 +30345,12 @@ class Effect6661(EffectDef):
 
 
 class Effect6662(EffectDef):
+    """
+    shipBonusCarrierG3FighterHitpoints
+
+    Used by:
+    Ship: Thanatos
+    """
 
     type = 'passive'
 
@@ -19374,6 +30361,12 @@ class Effect6662(EffectDef):
 
 
 class Effect6663(EffectDef):
+    """
+    skillBonusDroneInterfacing
+
+    Used by:
+    Skill: Drone Interfacing
+    """
 
     type = 'passive'
 
@@ -19396,6 +30389,12 @@ class Effect6663(EffectDef):
 
 
 class Effect6664(EffectDef):
+    """
+    skillBonusDroneSharpshooting
+
+    Used by:
+    Skill: Drone Sharpshooting
+    """
 
     type = 'passive'
 
@@ -19415,6 +30414,12 @@ class Effect6664(EffectDef):
 
 
 class Effect6665(EffectDef):
+    """
+    skillBonusDroneDurability
+
+    Used by:
+    Skill: Drone Durability
+    """
 
     type = 'passive'
 
@@ -19432,6 +30437,12 @@ class Effect6665(EffectDef):
 
 
 class Effect6667(EffectDef):
+    """
+    skillBonusDroneNavigation
+
+    Used by:
+    Skill: Drone Navigation
+    """
 
     type = 'passive'
 
@@ -19445,6 +30456,12 @@ class Effect6667(EffectDef):
 
 
 class Effect6669(EffectDef):
+    """
+    moduleBonusCapitalDroneDurabilityEnhancer
+
+    Used by:
+    Variations of module: Capital Drone Durability Enhancer I (2 of 2)
+    """
 
     type = 'passive'
 
@@ -19462,6 +30479,12 @@ class Effect6669(EffectDef):
 
 
 class Effect6670(EffectDef):
+    """
+    moduleBonusCapitalDroneScopeChip
+
+    Used by:
+    Variations of module: Capital Drone Scope Chip I (2 of 2)
+    """
 
     type = 'passive'
 
@@ -19481,6 +30504,12 @@ class Effect6670(EffectDef):
 
 
 class Effect6671(EffectDef):
+    """
+    moduleBonusCapitalDroneSpeedAugmentor
+
+    Used by:
+    Variations of module: Capital Drone Speed Augmentor I (2 of 2)
+    """
 
     type = 'passive'
 
@@ -19494,6 +30523,12 @@ class Effect6671(EffectDef):
 
 
 class Effect6672(EffectDef):
+    """
+    structureCombatRigSecurityModification
+
+    Used by:
+    Items from market group: Structure Modifications > Structure Combat Rigs (32 of 34)
+    """
 
     runTime = 'early'
     type = 'passive'
@@ -19515,6 +30550,12 @@ class Effect6672(EffectDef):
 
 
 class Effect6679(EffectDef):
+    """
+    skillStructureDoomsdayDurationBonus
+
+    Used by:
+    Skill: Structure Doomsday Operation
+    """
 
     type = 'passive', 'structure'
 
@@ -19526,6 +30567,12 @@ class Effect6679(EffectDef):
 
 
 class Effect6681(EffectDef):
+    """
+    shipBonusRole3NumWarfareLinks
+
+    Used by:
+    Ships from group: Force Auxiliary (6 of 6)
+    """
 
     type = 'passive'
 
@@ -19536,6 +30583,12 @@ class Effect6681(EffectDef):
 
 
 class Effect6682(EffectDef):
+    """
+    structureModuleEffectStasisWebifier
+
+    Used by:
+    Structure Modules from group: Structure Stasis Webifier (2 of 2)
+    """
 
     type = 'active', 'projected'
 
@@ -19548,6 +30601,12 @@ class Effect6682(EffectDef):
 
 
 class Effect6683(EffectDef):
+    """
+    structureModuleEffectTargetPainter
+
+    Used by:
+    Variations of structure module: Standup Target Painter I (2 of 2)
+    """
 
     type = 'projected', 'active'
 
@@ -19559,6 +30618,12 @@ class Effect6683(EffectDef):
 
 
 class Effect6684(EffectDef):
+    """
+    structureModuleEffectRemoteSensorDampener
+
+    Used by:
+    Variations of structure module: Standup Remote Sensor Dampener I (2 of 2)
+    """
 
     type = 'projected', 'active'
 
@@ -19575,6 +30640,12 @@ class Effect6684(EffectDef):
 
 
 class Effect6685(EffectDef):
+    """
+    structureModuleEffectECM
+
+    Used by:
+    Structure Modules from group: Structure ECM Battery (3 of 3)
+    """
 
     type = 'projected', 'active'
 
@@ -19588,6 +30659,12 @@ class Effect6685(EffectDef):
 
 
 class Effect6686(EffectDef):
+    """
+    structureModuleEffectWeaponDisruption
+
+    Used by:
+    Variations of structure module: Standup Weapon Disruptor I (2 of 2)
+    """
 
     type = 'active', 'projected'
 
@@ -19616,6 +30693,12 @@ class Effect6686(EffectDef):
 
 
 class Effect6687(EffectDef):
+    """
+    npcEntityRemoteArmorRepairer
+
+    Used by:
+    Drones named like: Armor Maintenance Bot (6 of 6)
+    """
 
     type = 'projected', 'active'
 
@@ -19631,6 +30714,12 @@ class Effect6687(EffectDef):
 
 
 class Effect6688(EffectDef):
+    """
+    npcEntityRemoteShieldBooster
+
+    Used by:
+    Drones named like: Shield Maintenance Bot (6 of 6)
+    """
 
     type = 'projected', 'active'
 
@@ -19643,6 +30732,12 @@ class Effect6688(EffectDef):
 
 
 class Effect6689(EffectDef):
+    """
+    npcEntityRemoteHullRepairer
+
+    Used by:
+    Drones named like: Hull Maintenance Bot (6 of 6)
+    """
 
     runTime = 'late'
     type = 'projected', 'active'
@@ -19657,6 +30752,12 @@ class Effect6689(EffectDef):
 
 
 class Effect6690(EffectDef):
+    """
+    remoteWebifierEntity
+
+    Used by:
+    Drones from group: Stasis Webifying Drone (3 of 3)
+    """
 
     type = 'active', 'projected'
 
@@ -19669,6 +30770,12 @@ class Effect6690(EffectDef):
 
 
 class Effect6691(EffectDef):
+    """
+    entityEnergyNeutralizerFalloff
+
+    Used by:
+    Drones from group: Energy Neutralizer Drone (3 of 3)
+    """
 
     type = 'active', 'projected'
 
@@ -19687,6 +30794,12 @@ class Effect6691(EffectDef):
 
 
 class Effect6692(EffectDef):
+    """
+    remoteTargetPaintEntity
+
+    Used by:
+    Drones named like: TP (3 of 3)
+    """
 
     type = 'projected', 'active'
 
@@ -19698,6 +30811,12 @@ class Effect6692(EffectDef):
 
 
 class Effect6693(EffectDef):
+    """
+    remoteSensorDampEntity
+
+    Used by:
+    Drones named like: SD (3 of 3)
+    """
 
     type = 'projected', 'active'
 
@@ -19714,6 +30833,12 @@ class Effect6693(EffectDef):
 
 
 class Effect6694(EffectDef):
+    """
+    npcEntityWeaponDisruptor
+
+    Used by:
+    Drones named like: TD (3 of 3)
+    """
 
     type = 'projected', 'active'
 
@@ -19732,6 +30857,12 @@ class Effect6694(EffectDef):
 
 
 class Effect6695(EffectDef):
+    """
+    entityECMFalloff
+
+    Used by:
+    Drones named like: EC (3 of 3)
+    """
 
     type = 'projected', 'active'
 
@@ -19749,6 +30880,12 @@ class Effect6695(EffectDef):
 
 
 class Effect6697(EffectDef):
+    """
+    rigDrawbackReductionArmor
+
+    Used by:
+    Skill: Armor Rigging
+    """
 
     type = 'passive'
 
@@ -19762,6 +30899,12 @@ class Effect6697(EffectDef):
 
 
 class Effect6698(EffectDef):
+    """
+    rigDrawbackReductionAstronautics
+
+    Used by:
+    Skill: Astronautics Rigging
+    """
 
     type = 'passive'
 
@@ -19775,6 +30918,12 @@ class Effect6698(EffectDef):
 
 
 class Effect6699(EffectDef):
+    """
+    rigDrawbackReductionDrones
+
+    Used by:
+    Skill: Drones Rigging
+    """
 
     type = 'passive'
 
@@ -19786,6 +30935,12 @@ class Effect6699(EffectDef):
 
 
 class Effect6700(EffectDef):
+    """
+    rigDrawbackReductionElectronic
+
+    Used by:
+    Skill: Electronic Superiority Rigging
+    """
 
     type = 'passive'
 
@@ -19801,6 +30956,12 @@ class Effect6700(EffectDef):
 
 
 class Effect6701(EffectDef):
+    """
+    rigDrawbackReductionProjectile
+
+    Used by:
+    Skill: Projectile Weapon Rigging
+    """
 
     type = 'passive'
 
@@ -19812,6 +30973,12 @@ class Effect6701(EffectDef):
 
 
 class Effect6702(EffectDef):
+    """
+    rigDrawbackReductionEnergyWeapon
+
+    Used by:
+    Skill: Energy Weapon Rigging
+    """
 
     type = 'passive'
 
@@ -19823,6 +30990,12 @@ class Effect6702(EffectDef):
 
 
 class Effect6703(EffectDef):
+    """
+    rigDrawbackReductionHybrid
+
+    Used by:
+    Skill: Hybrid Weapon Rigging
+    """
 
     type = 'passive'
 
@@ -19834,6 +31007,12 @@ class Effect6703(EffectDef):
 
 
 class Effect6704(EffectDef):
+    """
+    rigDrawbackReductionLauncher
+
+    Used by:
+    Skill: Launcher Rigging
+    """
 
     type = 'passive'
 
@@ -19845,6 +31024,12 @@ class Effect6704(EffectDef):
 
 
 class Effect6705(EffectDef):
+    """
+    rigDrawbackReductionShield
+
+    Used by:
+    Skill: Shield Rigging
+    """
 
     type = 'passive'
 
@@ -19856,6 +31041,12 @@ class Effect6705(EffectDef):
 
 
 class Effect6706(EffectDef):
+    """
+    setBonusAsklepian
+
+    Used by:
+    Implants named like: grade Asklepian (18 of 18)
+    """
 
     runTime = 'early'
     type = 'passive'
@@ -19867,6 +31058,12 @@ class Effect6706(EffectDef):
 
 
 class Effect6708(EffectDef):
+    """
+    armorRepairAmountBonusSubcap
+
+    Used by:
+    Implants named like: grade Asklepian (15 of 18)
+    """
 
     type = 'passive'
 
@@ -19877,6 +31074,12 @@ class Effect6708(EffectDef):
 
 
 class Effect6709(EffectDef):
+    """
+    shipBonusRole1CapitalHybridDamageBonus
+
+    Used by:
+    Ship: Vehement
+    """
 
     type = 'passive'
 
@@ -19887,6 +31090,12 @@ class Effect6709(EffectDef):
 
 
 class Effect6710(EffectDef):
+    """
+    shipBonusDreadnoughtM1WebStrengthBonus
+
+    Used by:
+    Ship: Vehement
+    """
 
     type = 'passive'
 
@@ -19897,6 +31106,12 @@ class Effect6710(EffectDef):
 
 
 class Effect6711(EffectDef):
+    """
+    shipBonusRole3CapitalHybridDamageBonus
+
+    Used by:
+    Ship: Vanquisher
+    """
 
     type = 'passive'
 
@@ -19907,6 +31122,12 @@ class Effect6711(EffectDef):
 
 
 class Effect6712(EffectDef):
+    """
+    shipBonusTitanM1WebStrengthBonus
+
+    Used by:
+    Ship: Vanquisher
+    """
 
     type = 'passive'
 
@@ -19917,6 +31138,13 @@ class Effect6712(EffectDef):
 
 
 class Effect6713(EffectDef):
+    """
+    shipBonusSupercarrierM1BurstProjectorWebBonus
+
+    Used by:
+    Ship: Hel
+    Ship: Vendetta
+    """
 
     type = 'passive'
 
@@ -19927,6 +31155,12 @@ class Effect6713(EffectDef):
 
 
 class Effect6714(EffectDef):
+    """
+    ECMBurstJammer
+
+    Used by:
+    Modules from group: Burst Jammer (11 of 11)
+    """
 
     type = 'projected', 'active'
 
@@ -19944,6 +31178,12 @@ class Effect6714(EffectDef):
 
 
 class Effect6717(EffectDef):
+    """
+    roleBonusIceOreMiningDurationCap
+
+    Used by:
+    Variations of ship: Covetor (2 of 2)
+    """
 
     type = 'passive'
 
@@ -19960,6 +31200,12 @@ class Effect6717(EffectDef):
 
 
 class Effect6720(EffectDef):
+    """
+    shipBonusDroneRepairMC1
+
+    Used by:
+    Ship: Rabisu
+    """
 
     type = 'passive'
 
@@ -19974,6 +31220,12 @@ class Effect6720(EffectDef):
 
 
 class Effect6721(EffectDef):
+    """
+    eliteBonusLogisticRemoteArmorRepairOptimalFalloff1
+
+    Used by:
+    Ship: Rabisu
+    """
 
     type = 'passive'
 
@@ -19990,6 +31242,12 @@ class Effect6721(EffectDef):
 
 
 class Effect6722(EffectDef):
+    """
+    roleBonusRemoteArmorRepairOptimalFalloff
+
+    Used by:
+    Ship: Rabisu
+    """
 
     type = 'passive'
 
@@ -20004,6 +31262,12 @@ class Effect6722(EffectDef):
 
 
 class Effect6723(EffectDef):
+    """
+    shipBonusCloakCpuMC2
+
+    Used by:
+    Ship: Rabisu
+    """
 
     type = 'passive'
 
@@ -20014,6 +31278,12 @@ class Effect6723(EffectDef):
 
 
 class Effect6724(EffectDef):
+    """
+    eliteBonusLogisticRemoteArmorRepairDuration3
+
+    Used by:
+    Ship: Rabisu
+    """
 
     type = 'passive'
 
@@ -20024,6 +31294,12 @@ class Effect6724(EffectDef):
 
 
 class Effect6725(EffectDef):
+    """
+    shipBonusSETFalloffAF2
+
+    Used by:
+    Ship: Caedes
+    """
 
     type = 'passive'
 
@@ -20034,6 +31310,12 @@ class Effect6725(EffectDef):
 
 
 class Effect6726(EffectDef):
+    """
+    shipBonusCloakCpuMF1
+
+    Used by:
+    Ship: Caedes
+    """
 
     type = 'passive'
 
@@ -20044,6 +31326,12 @@ class Effect6726(EffectDef):
 
 
 class Effect6727(EffectDef):
+    """
+    eliteBonusCoverOpsNOSNeutFalloff1
+
+    Used by:
+    Ship: Caedes
+    """
 
     type = 'passive'
 
@@ -20055,6 +31343,12 @@ class Effect6727(EffectDef):
 
 
 class Effect6730(EffectDef):
+    """
+    moduleBonusMicrowarpdrive
+
+    Used by:
+    Modules from group: Propulsion Module (68 of 133)
+    """
 
     runTime = 'late'
     type = 'active'
@@ -20071,6 +31365,12 @@ class Effect6730(EffectDef):
 
 
 class Effect6731(EffectDef):
+    """
+    moduleBonusAfterburner
+
+    Used by:
+    Modules from group: Propulsion Module (65 of 133)
+    """
 
     runTime = 'late'
     type = 'active'
@@ -20085,6 +31385,12 @@ class Effect6731(EffectDef):
 
 
 class Effect6732(EffectDef):
+    """
+    moduleBonusWarfareLinkArmor
+
+    Used by:
+    Variations of module: Armor Command Burst I (2 of 2)
+    """
 
     type = 'active', 'gang'
 
@@ -20100,6 +31406,12 @@ class Effect6732(EffectDef):
 
 
 class Effect6733(EffectDef):
+    """
+    moduleBonusWarfareLinkShield
+
+    Used by:
+    Variations of module: Shield Command Burst I (2 of 2)
+    """
 
     type = 'active', 'gang'
 
@@ -20115,6 +31427,12 @@ class Effect6733(EffectDef):
 
 
 class Effect6734(EffectDef):
+    """
+    moduleBonusWarfareLinkSkirmish
+
+    Used by:
+    Variations of module: Skirmish Command Burst I (2 of 2)
+    """
 
     type = 'active', 'gang'
 
@@ -20130,6 +31448,12 @@ class Effect6734(EffectDef):
 
 
 class Effect6735(EffectDef):
+    """
+    moduleBonusWarfareLinkInfo
+
+    Used by:
+    Variations of module: Information Command Burst I (2 of 2)
+    """
 
     type = 'active', 'gang'
 
@@ -20145,6 +31469,12 @@ class Effect6735(EffectDef):
 
 
 class Effect6736(EffectDef):
+    """
+    moduleBonusWarfareLinkMining
+
+    Used by:
+    Variations of module: Mining Foreman Burst I (2 of 2)
+    """
 
     type = 'active', 'gang'
 
@@ -20160,6 +31490,12 @@ class Effect6736(EffectDef):
 
 
 class Effect6737(EffectDef):
+    """
+    chargeBonusWarfareCharge
+
+    Used by:
+    Items from market group: Ammunition & Charges > Command Burst Charges (15 of 15)
+    """
 
     type = 'active'
 
@@ -20171,6 +31507,12 @@ class Effect6737(EffectDef):
 
 
 class Effect6753(EffectDef):
+    """
+    moduleTitanEffectGenerator
+
+    Used by:
+    Modules from group: Titan Phenomena Generator (4 of 4)
+    """
 
     type = 'active', 'gang'
 
@@ -20186,6 +31528,12 @@ class Effect6753(EffectDef):
 
 
 class Effect6762(EffectDef):
+    """
+    miningDroneSpecBonus
+
+    Used by:
+    Skill: Mining Drone Specialization
+    """
 
     type = 'passive'
 
@@ -20199,6 +31547,13 @@ class Effect6762(EffectDef):
 
 
 class Effect6763(EffectDef):
+    """
+    iceHarvestingDroneOperationDurationBonus
+
+    Used by:
+    Modules named like: Drone Mining Augmentor (8 of 8)
+    Skill: Ice Harvesting Drone Operation
+    """
 
     type = 'passive'
 
@@ -20209,6 +31564,12 @@ class Effect6763(EffectDef):
 
 
 class Effect6764(EffectDef):
+    """
+    iceHarvestingDroneSpecBonus
+
+    Used by:
+    Skill: Ice Harvesting Drone Specialization
+    """
 
     type = 'passive'
 
@@ -20222,6 +31583,12 @@ class Effect6764(EffectDef):
 
 
 class Effect6765(EffectDef):
+    """
+    spatialPhenomenaGenerationDurationBonus
+
+    Used by:
+    Skill: Spatial Phenomena Generation
+    """
 
     type = 'passive'
 
@@ -20233,6 +31600,12 @@ class Effect6765(EffectDef):
 
 
 class Effect6766(EffectDef):
+    """
+    commandProcessorEffect
+
+    Used by:
+    Modules named like: Command Processor I (4 of 4)
+    """
 
     type = 'passive'
 
@@ -20245,6 +31618,14 @@ class Effect6766(EffectDef):
 
 
 class Effect6769(EffectDef):
+    """
+    commandBurstAoEBonus
+
+    Used by:
+    Skill: Fleet Command
+    Skill: Leadership
+    Skill: Wing Command
+    """
 
     type = 'passive'
 
@@ -20255,6 +31636,12 @@ class Effect6769(EffectDef):
 
 
 class Effect6770(EffectDef):
+    """
+    armoredCommandDurationBonus
+
+    Used by:
+    Skill: Armored Command
+    """
 
     type = 'passive'
 
@@ -20266,6 +31653,12 @@ class Effect6770(EffectDef):
 
 
 class Effect6771(EffectDef):
+    """
+    shieldCommandDurationBonus
+
+    Used by:
+    Skill: Shield Command
+    """
 
     type = 'passive'
 
@@ -20277,6 +31670,12 @@ class Effect6771(EffectDef):
 
 
 class Effect6772(EffectDef):
+    """
+    informationCommandDurationBonus
+
+    Used by:
+    Skill: Information Command
+    """
 
     type = 'passive'
 
@@ -20288,6 +31687,12 @@ class Effect6772(EffectDef):
 
 
 class Effect6773(EffectDef):
+    """
+    skirmishCommandDurationBonus
+
+    Used by:
+    Skill: Skirmish Command
+    """
 
     type = 'passive'
 
@@ -20299,6 +31704,12 @@ class Effect6773(EffectDef):
 
 
 class Effect6774(EffectDef):
+    """
+    miningForemanDurationBonus
+
+    Used by:
+    Skill: Mining Foreman
+    """
 
     type = 'passive'
 
@@ -20310,6 +31721,12 @@ class Effect6774(EffectDef):
 
 
 class Effect6776(EffectDef):
+    """
+    armoredCommandStrengthBonus
+
+    Used by:
+    Skill: Armored Command Specialist
+    """
 
     type = 'passive'
 
@@ -20327,6 +31744,12 @@ class Effect6776(EffectDef):
 
 
 class Effect6777(EffectDef):
+    """
+    shieldCommandStrengthBonus
+
+    Used by:
+    Skill: Shield Command Specialist
+    """
 
     type = 'passive'
 
@@ -20344,6 +31767,12 @@ class Effect6777(EffectDef):
 
 
 class Effect6778(EffectDef):
+    """
+    informationCommandStrengthBonus
+
+    Used by:
+    Skill: Information Command Specialist
+    """
 
     type = 'passive'
 
@@ -20361,6 +31790,12 @@ class Effect6778(EffectDef):
 
 
 class Effect6779(EffectDef):
+    """
+    skirmishCommandStrengthBonus
+
+    Used by:
+    Skill: Skirmish Command Specialist
+    """
 
     type = 'passive'
 
@@ -20378,6 +31813,12 @@ class Effect6779(EffectDef):
 
 
 class Effect6780(EffectDef):
+    """
+    miningForemanStrengthBonus
+
+    Used by:
+    Skill: Mining Director
+    """
 
     type = 'passive'
 
@@ -20391,6 +31832,12 @@ class Effect6780(EffectDef):
 
 
 class Effect6782(EffectDef):
+    """
+    commandBurstReloadTimeBonus
+
+    Used by:
+    Skill: Command Burst Specialist
+    """
 
     type = 'passive'
 
@@ -20403,6 +31850,20 @@ class Effect6782(EffectDef):
 
 
 class Effect6783(EffectDef):
+    """
+    commandBurstAoERoleBonus
+
+    Used by:
+    Ships from group: Carrier (4 of 4)
+    Ships from group: Combat Battlecruiser (14 of 14)
+    Ships from group: Command Ship (8 of 8)
+    Ships from group: Force Auxiliary (6 of 6)
+    Ships from group: Supercarrier (6 of 6)
+    Ships from group: Titan (7 of 7)
+    Subsystems named like: Offensive Support Processor (4 of 4)
+    Ship: Orca
+    Ship: Rorqual
+    """
 
     type = 'passive'
 
@@ -20413,6 +31874,12 @@ class Effect6783(EffectDef):
 
 
 class Effect6786(EffectDef):
+    """
+    shieldCommandBurstBonusICS3
+
+    Used by:
+    Ship: Orca
+    """
 
     type = 'passive'
 
@@ -20431,6 +31898,12 @@ class Effect6786(EffectDef):
 
 
 class Effect6787(EffectDef):
+    """
+    shipBonusDroneHPDamageMiningICS4
+
+    Used by:
+    Ships from group: Industrial Command Ship (2 of 2)
+    """
 
     type = 'passive'
 
@@ -20468,6 +31941,12 @@ class Effect6787(EffectDef):
 
 
 class Effect6788(EffectDef):
+    """
+    shipBonusDroneIceHarvestingICS5
+
+    Used by:
+    Ships from group: Industrial Command Ship (2 of 2)
+    """
 
     type = 'passive'
 
@@ -20481,6 +31960,19 @@ class Effect6788(EffectDef):
 
 
 class Effect6789(EffectDef):
+    """
+    industrialBonusDroneDamage
+
+    Used by:
+    Ships from group: Blockade Runner (4 of 4)
+    Ships from group: Deep Space Transport (4 of 4)
+    Ships from group: Exhumer (3 of 3)
+    Ships from group: Industrial (17 of 17)
+    Ships from group: Industrial Command Ship (2 of 2)
+    Ships from group: Mining Barge (3 of 3)
+    Variations of ship: Venture (3 of 3)
+    Ship: Rorqual
+    """
 
     type = 'passive'
 
@@ -20492,6 +31984,12 @@ class Effect6789(EffectDef):
 
 
 class Effect6790(EffectDef):
+    """
+    shipBonusDroneIceHarvestingRole
+
+    Used by:
+    Ship: Orca
+    """
 
     type = 'passive'
 
@@ -20502,6 +32000,12 @@ class Effect6790(EffectDef):
 
 
 class Effect6792(EffectDef):
+    """
+    shipBonusDroneHPDamageMiningORECapital4
+
+    Used by:
+    Ship: Rorqual
+    """
 
     type = 'passive'
 
@@ -20539,6 +32043,12 @@ class Effect6792(EffectDef):
 
 
 class Effect6793(EffectDef):
+    """
+    miningForemanBurstBonusORECapital2
+
+    Used by:
+    Ship: Rorqual
+    """
 
     type = 'passive'
 
@@ -20557,6 +32067,12 @@ class Effect6793(EffectDef):
 
 
 class Effect6794(EffectDef):
+    """
+    shieldCommandBurstBonusORECapital3
+
+    Used by:
+    Ship: Rorqual
+    """
 
     type = 'passive'
 
@@ -20575,6 +32091,12 @@ class Effect6794(EffectDef):
 
 
 class Effect6795(EffectDef):
+    """
+    shipBonusDroneIceHarvestingORECapital5
+
+    Used by:
+    Ship: Rorqual
+    """
 
     type = 'passive'
 
@@ -20588,6 +32110,12 @@ class Effect6795(EffectDef):
 
 
 class Effect6796(EffectDef):
+    """
+    shipModeSHTDamagePostDiv
+
+    Used by:
+    Module: Hecate Sharpshooter Mode
+    """
 
     type = 'passive'
 
@@ -20603,6 +32131,12 @@ class Effect6796(EffectDef):
 
 
 class Effect6797(EffectDef):
+    """
+    shipModeSPTDamagePostDiv
+
+    Used by:
+    Module: Svipul Sharpshooter Mode
+    """
 
     type = 'passive'
 
@@ -20618,6 +32152,12 @@ class Effect6797(EffectDef):
 
 
 class Effect6798(EffectDef):
+    """
+    shipModeSETDamagePostDiv
+
+    Used by:
+    Module: Confessor Sharpshooter Mode
+    """
 
     type = 'passive'
 
@@ -20633,6 +32173,12 @@ class Effect6798(EffectDef):
 
 
 class Effect6799(EffectDef):
+    """
+    shipModeSmallMissileDamagePostDiv
+
+    Used by:
+    Module: Jackdaw Sharpshooter Mode
+    """
 
     type = 'passive'
 
@@ -20648,6 +32194,12 @@ class Effect6799(EffectDef):
 
 
 class Effect6800(EffectDef):
+    """
+    modeDampTDResistsPostDiv
+
+    Used by:
+    Modules named like: Sharpshooter Mode (4 of 4)
+    """
 
     type = 'passive'
 
@@ -20658,6 +32210,13 @@ class Effect6800(EffectDef):
 
 
 class Effect6801(EffectDef):
+    """
+    modeMWDandABBoostPostDiv
+
+    Used by:
+    Module: Confessor Propulsion Mode
+    Module: Svipul Propulsion Mode
+    """
 
     type = 'passive'
 
@@ -20673,6 +32232,12 @@ class Effect6801(EffectDef):
 
 
 class Effect6807(EffectDef):
+    """
+    invulnerabilityCoreDurationBonus
+
+    Used by:
+    Skill: Invulnerability Core Operation
+    """
 
     type = 'passive'
 
@@ -20686,6 +32251,12 @@ class Effect6807(EffectDef):
 
 
 class Effect6844(EffectDef):
+    """
+    skillMultiplierDefenderMissileVelocity
+
+    Used by:
+    Skill: Defender Missiles
+    """
 
     type = 'passive'
 
@@ -20696,6 +32267,12 @@ class Effect6844(EffectDef):
 
 
 class Effect6845(EffectDef):
+    """
+    shipBonusCommandDestroyerRole1DefenderBonus
+
+    Used by:
+    Ships from group: Command Destroyer (4 of 4)
+    """
 
     type = 'passive'
 
@@ -20706,6 +32283,13 @@ class Effect6845(EffectDef):
 
 
 class Effect6851(EffectDef):
+    """
+    shipBonusRole3CapitalEnergyDamageBonus
+
+    Used by:
+    Ship: Chemosh
+    Ship: Molok
+    """
 
     type = 'passive'
 
@@ -20715,6 +32299,12 @@ class Effect6851(EffectDef):
 
 
 class Effect6852(EffectDef):
+    """
+    shipBonusTitanM1WebRangeBonus
+
+    Used by:
+    Ship: Molok
+    """
 
     type = 'passive'
 
@@ -20725,6 +32315,12 @@ class Effect6852(EffectDef):
 
 
 class Effect6853(EffectDef):
+    """
+    shipBonusTitanA1EnergyWarfareAmountBonus
+
+    Used by:
+    Ship: Molok
+    """
 
     type = 'passive'
 
@@ -20737,6 +32333,12 @@ class Effect6853(EffectDef):
 
 
 class Effect6855(EffectDef):
+    """
+    shipBonusDreadnoughtA1EnergyWarfareAmountBonus
+
+    Used by:
+    Ship: Chemosh
+    """
 
     type = 'passive'
 
@@ -20749,6 +32351,12 @@ class Effect6855(EffectDef):
 
 
 class Effect6856(EffectDef):
+    """
+    shipBonusDreadnoughtM1WebRangeBonus
+
+    Used by:
+    Ship: Chemosh
+    """
 
     type = 'passive'
 
@@ -20759,6 +32367,12 @@ class Effect6856(EffectDef):
 
 
 class Effect6857(EffectDef):
+    """
+    shipBonusForceAuxiliaryA1NosferatuRangeBonus
+
+    Used by:
+    Ship: Dagon
+    """
 
     type = 'passive'
 
@@ -20771,6 +32385,12 @@ class Effect6857(EffectDef):
 
 
 class Effect6858(EffectDef):
+    """
+    shipBonusForceAuxiliaryA1NosferatuDrainAmount
+
+    Used by:
+    Ship: Dagon
+    """
 
     type = 'passive'
 
@@ -20781,6 +32401,13 @@ class Effect6858(EffectDef):
 
 
 class Effect6859(EffectDef):
+    """
+    shipBonusRole4NosferatuCPUBonus
+
+    Used by:
+    Ship: Dagon
+    Ship: Rabisu
+    """
 
     type = 'passive'
 
@@ -20790,6 +32417,12 @@ class Effect6859(EffectDef):
 
 
 class Effect6860(EffectDef):
+    """
+    shipBonusRole5RemoteArmorRepairPowergridBonus
+
+    Used by:
+    Ships from group: Logistics (3 of 7)
+    """
 
     type = 'passive'
 
@@ -20800,6 +32433,12 @@ class Effect6860(EffectDef):
 
 
 class Effect6861(EffectDef):
+    """
+    shipBonusRole5CapitalRemoteArmorRepairPowergridBonus
+
+    Used by:
+    Ship: Dagon
+    """
 
     type = 'passive'
 
@@ -20809,6 +32448,12 @@ class Effect6861(EffectDef):
 
 
 class Effect6862(EffectDef):
+    """
+    shipBonusForceAuxiliaryM1RemoteArmorRepairDuration
+
+    Used by:
+    Ship: Dagon
+    """
 
     type = 'passive'
 
@@ -20819,6 +32464,12 @@ class Effect6862(EffectDef):
 
 
 class Effect6865(EffectDef):
+    """
+    eliteBonusCoverOpsWarpVelocity1
+
+    Used by:
+    Ship: Pacifier
+    """
 
     type = 'passive'
 
@@ -20828,6 +32479,12 @@ class Effect6865(EffectDef):
 
 
 class Effect6866(EffectDef):
+    """
+    shipBonusSmallMissileFlightTimeCF1
+
+    Used by:
+    Ship: Pacifier
+    """
 
     type = 'passive'
 
@@ -20840,6 +32497,12 @@ class Effect6866(EffectDef):
 
 
 class Effect6867(EffectDef):
+    """
+    shipBonusSPTRoFMF
+
+    Used by:
+    Ship: Pacifier
+    """
 
     type = 'passive'
 
@@ -20850,6 +32513,14 @@ class Effect6867(EffectDef):
 
 
 class Effect6871(EffectDef):
+    """
+    concordSecStatusTankBonus
+
+    Used by:
+    Ship: Enforcer
+    Ship: Marshal
+    Ship: Pacifier
+    """
 
     type = 'passive'
 
@@ -20871,6 +32542,12 @@ class Effect6871(EffectDef):
 
 
 class Effect6872(EffectDef):
+    """
+    eliteReconStasisWebBonus1
+
+    Used by:
+    Ship: Enforcer
+    """
 
     type = 'passive'
 
@@ -20880,6 +32557,12 @@ class Effect6872(EffectDef):
 
 
 class Effect6873(EffectDef):
+    """
+    eliteBonusReconWarpVelocity3
+
+    Used by:
+    Ship: Enforcer
+    """
 
     type = 'passive'
 
@@ -20889,6 +32572,12 @@ class Effect6873(EffectDef):
 
 
 class Effect6874(EffectDef):
+    """
+    shipBonusMedMissileFlightTimeCC2
+
+    Used by:
+    Ship: Enforcer
+    """
 
     type = 'passive'
 
@@ -20901,6 +32590,12 @@ class Effect6874(EffectDef):
 
 
 class Effect6877(EffectDef):
+    """
+    eliteBonusBlackOpsWarpVelocity1
+
+    Used by:
+    Ship: Marshal
+    """
 
     type = 'passive'
 
@@ -20910,6 +32605,12 @@ class Effect6877(EffectDef):
 
 
 class Effect6878(EffectDef):
+    """
+    eliteBonusBlackOpsScramblerRange4
+
+    Used by:
+    Ship: Marshal
+    """
 
     type = 'passive'
 
@@ -20920,6 +32621,12 @@ class Effect6878(EffectDef):
 
 
 class Effect6879(EffectDef):
+    """
+    eliteBonusBlackOpsWebRange3
+
+    Used by:
+    Ship: Marshal
+    """
 
     type = 'passive'
 
@@ -20930,6 +32637,12 @@ class Effect6879(EffectDef):
 
 
 class Effect6880(EffectDef):
+    """
+    shipBonusLauncherRoF2CB
+
+    Used by:
+    Ship: Marshal
+    """
 
     type = 'passive'
 
@@ -20944,6 +32657,12 @@ class Effect6880(EffectDef):
 
 
 class Effect6881(EffectDef):
+    """
+    shipBonusLargeMissileFlightTimeCB1
+
+    Used by:
+    Ship: Marshal
+    """
 
     type = 'passive'
 
@@ -20956,6 +32675,12 @@ class Effect6881(EffectDef):
 
 
 class Effect6883(EffectDef):
+    """
+    shipBonusForceAuxiliaryM2LocalRepairAmount
+
+    Used by:
+    Ship: Dagon
+    """
 
     type = 'passive'
 
@@ -20968,6 +32693,12 @@ class Effect6883(EffectDef):
 
 
 class Effect6894(EffectDef):
+    """
+    subsystemEnergyNeutFittingReduction
+
+    Used by:
+    Subsystem: Legion Core - Energy Parasitic Complex
+    """
 
     type = 'passive'
 
@@ -20980,6 +32711,12 @@ class Effect6894(EffectDef):
 
 
 class Effect6895(EffectDef):
+    """
+    subsystemMETFittingReduction
+
+    Used by:
+    Subsystem: Legion Offensive - Liquid Crystal Magnifiers
+    """
 
     type = 'passive'
 
@@ -20992,6 +32729,14 @@ class Effect6895(EffectDef):
 
 
 class Effect6896(EffectDef):
+    """
+    subsystemMHTFittingReduction
+
+    Used by:
+    Subsystem: Proteus Offensive - Drone Synthesis Projector
+    Subsystem: Proteus Offensive - Hybrid Encoding Platform
+    Subsystem: Tengu Offensive - Magnetic Infusion Basin
+    """
 
     type = 'passive'
 
@@ -21004,6 +32749,12 @@ class Effect6896(EffectDef):
 
 
 class Effect6897(EffectDef):
+    """
+    subsystemMPTFittingReduction
+
+    Used by:
+    Subsystem: Loki Offensive - Projectile Scoping Array
+    """
 
     type = 'passive'
 
@@ -21016,6 +32767,12 @@ class Effect6897(EffectDef):
 
 
 class Effect6898(EffectDef):
+    """
+    subsystemMRARFittingReduction
+
+    Used by:
+    Subsystems named like: Offensive Support Processor (3 of 4)
+    """
 
     type = 'passive'
 
@@ -21030,6 +32787,13 @@ class Effect6898(EffectDef):
 
 
 class Effect6899(EffectDef):
+    """
+    subsystemMRSBFittingReduction
+
+    Used by:
+    Subsystem: Loki Offensive - Support Processor
+    Subsystem: Tengu Offensive - Support Processor
+    """
 
     type = 'passive'
 
@@ -21044,6 +32808,14 @@ class Effect6899(EffectDef):
 
 
 class Effect6900(EffectDef):
+    """
+    subsystemMMissileFittingReduction
+
+    Used by:
+    Subsystem: Legion Offensive - Assault Optimization
+    Subsystem: Loki Offensive - Launcher Efficiency Configuration
+    Subsystem: Tengu Offensive - Accelerated Ejection Bay
+    """
 
     type = 'passive'
 
@@ -21057,6 +32829,12 @@ class Effect6900(EffectDef):
 
 
 class Effect6908(EffectDef):
+    """
+    shipBonusStrategicCruiserCaldariNaniteRepairTime2
+
+    Used by:
+    Ship: Tengu
+    """
 
     type = 'passive'
 
@@ -21068,6 +32846,12 @@ class Effect6908(EffectDef):
 
 
 class Effect6909(EffectDef):
+    """
+    shipBonusStrategicCruiserAmarrNaniteRepairTime2
+
+    Used by:
+    Ship: Legion
+    """
 
     type = 'passive'
 
@@ -21079,6 +32863,12 @@ class Effect6909(EffectDef):
 
 
 class Effect6910(EffectDef):
+    """
+    shipBonusStrategicCruiserGallenteNaniteRepairTime2
+
+    Used by:
+    Ship: Proteus
+    """
 
     type = 'passive'
 
@@ -21090,6 +32880,12 @@ class Effect6910(EffectDef):
 
 
 class Effect6911(EffectDef):
+    """
+    shipBonusStrategicCruiserMinmatarNaniteRepairTime2
+
+    Used by:
+    Ship: Loki
+    """
 
     type = 'passive'
 
@@ -21101,6 +32897,13 @@ class Effect6911(EffectDef):
 
 
 class Effect6920(EffectDef):
+    """
+    structureHPBonusAddPassive
+
+    Used by:
+    Subsystems named like: Defensive Covert Reconfiguration (4 of 4)
+    Subsystem: Loki Defensive - Adaptive Defense Node
+    """
 
     type = 'passive'
 
@@ -21110,6 +32913,12 @@ class Effect6920(EffectDef):
 
 
 class Effect6921(EffectDef):
+    """
+    subSystemBonusAmarrDefensive2ScanProbeStrength
+
+    Used by:
+    Subsystem: Legion Defensive - Covert Reconfiguration
+    """
 
     type = 'passive'
 
@@ -21121,6 +32930,12 @@ class Effect6921(EffectDef):
 
 
 class Effect6923(EffectDef):
+    """
+    subsystemBonusMinmatarOffensive1HMLHAMVelo
+
+    Used by:
+    Subsystem: Loki Offensive - Launcher Efficiency Configuration
+    """
 
     type = 'passive'
 
@@ -21132,6 +32947,12 @@ class Effect6923(EffectDef):
 
 
 class Effect6924(EffectDef):
+    """
+    subsystemBonusMinmatarOffensive3MissileExpVelo
+
+    Used by:
+    Subsystem: Loki Offensive - Launcher Efficiency Configuration
+    """
 
     type = 'passive'
 
@@ -21143,6 +32964,12 @@ class Effect6924(EffectDef):
 
 
 class Effect6925(EffectDef):
+    """
+    subsystemBonusGallenteOffensive2DroneVeloTracking
+
+    Used by:
+    Subsystem: Proteus Offensive - Drone Synthesis Projector
+    """
 
     type = 'passive'
 
@@ -21157,6 +32984,12 @@ class Effect6925(EffectDef):
 
 
 class Effect6926(EffectDef):
+    """
+    subsystemBonusAmarrPropulsionWarpCapacitor
+
+    Used by:
+    Subsystem: Legion Propulsion - Interdiction Nullifier
+    """
 
     type = 'passive'
 
@@ -21166,6 +32999,12 @@ class Effect6926(EffectDef):
 
 
 class Effect6927(EffectDef):
+    """
+    subsystemBonusMinmatarPropulsionWarpCapacitor
+
+    Used by:
+    Subsystem: Loki Propulsion - Interdiction Nullifier
+    """
 
     type = 'passive'
 
@@ -21176,6 +33015,12 @@ class Effect6927(EffectDef):
 
 
 class Effect6928(EffectDef):
+    """
+    subsystemBonusCaldariPropulsion2PropModHeatBenefit
+
+    Used by:
+    Subsystem: Tengu Propulsion - Fuel Catalyst
+    """
 
     type = 'passive'
 
@@ -21187,6 +33032,12 @@ class Effect6928(EffectDef):
 
 
 class Effect6929(EffectDef):
+    """
+    subsystemBonusGallentePropulsion2PropModHeatBenefit
+
+    Used by:
+    Subsystem: Proteus Propulsion - Localized Injectors
+    """
 
     type = 'passive'
 
@@ -21198,6 +33049,12 @@ class Effect6929(EffectDef):
 
 
 class Effect6930(EffectDef):
+    """
+    subsystemBonusAmarrCore2EnergyResistance
+
+    Used by:
+    Subsystem: Legion Core - Augmented Antimatter Reactor
+    """
 
     type = 'passive'
 
@@ -21207,6 +33064,12 @@ class Effect6930(EffectDef):
 
 
 class Effect6931(EffectDef):
+    """
+    subsystemBonusMinmatarCore2EnergyResistance
+
+    Used by:
+    Subsystem: Loki Core - Augmented Nuclear Reactor
+    """
 
     type = 'passive'
 
@@ -21217,6 +33080,12 @@ class Effect6931(EffectDef):
 
 
 class Effect6932(EffectDef):
+    """
+    subsystemBonusGallenteCore2EnergyResistance
+
+    Used by:
+    Subsystem: Proteus Core - Augmented Fusion Reactor
+    """
 
     type = 'passive'
 
@@ -21227,6 +33096,12 @@ class Effect6932(EffectDef):
 
 
 class Effect6933(EffectDef):
+    """
+    subsystemBonusCaldariCore2EnergyResistance
+
+    Used by:
+    Subsystem: Tengu Core - Augmented Graviton Reactor
+    """
 
     type = 'passive'
 
@@ -21237,6 +33112,14 @@ class Effect6933(EffectDef):
 
 
 class Effect6934(EffectDef):
+    """
+    shipMaxLockedTargetsBonusAddPassive
+
+    Used by:
+    Subsystems named like: Core Dissolution Sequencer (2 of 2)
+    Subsystems named like: Core Electronic Efficiency Gate (2 of 2)
+    Subsystems named like: Offensive Support Processor (4 of 4)
+    """
 
     type = 'passive'
 
@@ -21246,6 +33129,12 @@ class Effect6934(EffectDef):
 
 
 class Effect6935(EffectDef):
+    """
+    subsystemBonusAmarrCore3EnergyWarHeatBonus
+
+    Used by:
+    Subsystem: Legion Core - Energy Parasitic Complex
+    """
 
     type = 'passive'
 
@@ -21256,6 +33145,12 @@ class Effect6935(EffectDef):
 
 
 class Effect6936(EffectDef):
+    """
+    subsystemBonusMinmatarCore3StasisWebHeatBonus
+
+    Used by:
+    Subsystem: Loki Core - Immobility Drivers
+    """
 
     type = 'passive'
 
@@ -21267,6 +33162,12 @@ class Effect6936(EffectDef):
 
 
 class Effect6937(EffectDef):
+    """
+    subsystemBonusGallenteCore3WarpScramHeatBonus
+
+    Used by:
+    Subsystem: Proteus Core - Friction Extension Processor
+    """
 
     type = 'passive'
 
@@ -21277,6 +33178,12 @@ class Effect6937(EffectDef):
 
 
 class Effect6938(EffectDef):
+    """
+    subsystemBonusCaldariCore3ECMHeatBonus
+
+    Used by:
+    Subsystem: Tengu Core - Obfuscation Manifold
+    """
 
     type = 'passive'
 
@@ -21287,6 +33194,12 @@ class Effect6938(EffectDef):
 
 
 class Effect6939(EffectDef):
+    """
+    subsystemBonusAmarrDefensive2HardenerHeat
+
+    Used by:
+    Subsystem: Legion Defensive - Augmented Plating
+    """
 
     type = 'passive'
 
@@ -21299,6 +33212,12 @@ class Effect6939(EffectDef):
 
 
 class Effect6940(EffectDef):
+    """
+    subsystemBonusGallenteDefensive2HardenerHeat
+
+    Used by:
+    Subsystem: Proteus Defensive - Augmented Plating
+    """
 
     type = 'passive'
 
@@ -21311,6 +33230,12 @@ class Effect6940(EffectDef):
 
 
 class Effect6941(EffectDef):
+    """
+    subsystemBonusCaldariDefensive2HardenerHeat
+
+    Used by:
+    Subsystem: Tengu Defensive - Supplemental Screening
+    """
 
     type = 'passive'
 
@@ -21322,6 +33247,12 @@ class Effect6941(EffectDef):
 
 
 class Effect6942(EffectDef):
+    """
+    subsystemBonusMinmatarDefensive2HardenerHeat
+
+    Used by:
+    Subsystem: Loki Defensive - Augmented Durability
+    """
 
     type = 'passive'
 
@@ -21336,6 +33267,13 @@ class Effect6942(EffectDef):
 
 
 class Effect6943(EffectDef):
+    """
+    subsystemBonusAmarrDefensive3ArmorRepHeat
+
+    Used by:
+    Subsystem: Legion Defensive - Covert Reconfiguration
+    Subsystem: Legion Defensive - Nanobot Injector
+    """
 
     type = 'passive'
 
@@ -21350,6 +33288,13 @@ class Effect6943(EffectDef):
 
 
 class Effect6944(EffectDef):
+    """
+    subsystemBonusGallenteDefensive3ArmorRepHeat
+
+    Used by:
+    Subsystem: Proteus Defensive - Covert Reconfiguration
+    Subsystem: Proteus Defensive - Nanobot Injector
+    """
 
     type = 'passive'
 
@@ -21364,6 +33309,13 @@ class Effect6944(EffectDef):
 
 
 class Effect6945(EffectDef):
+    """
+    subsystemBonusCaldariDefensive3ShieldBoostHeat
+
+    Used by:
+    Subsystem: Tengu Defensive - Amplification Node
+    Subsystem: Tengu Defensive - Covert Reconfiguration
+    """
 
     type = 'passive'
 
@@ -21378,6 +33330,13 @@ class Effect6945(EffectDef):
 
 
 class Effect6946(EffectDef):
+    """
+    subsystemBonusMinmatarDefensive3LocalRepHeat
+
+    Used by:
+    Subsystem: Loki Defensive - Adaptive Defense Node
+    Subsystem: Loki Defensive - Covert Reconfiguration
+    """
 
     type = 'passive'
 
@@ -21392,6 +33351,12 @@ class Effect6946(EffectDef):
 
 
 class Effect6947(EffectDef):
+    """
+    subSystemBonusCaldariDefensive2ScanProbeStrength
+
+    Used by:
+    Subsystem: Tengu Defensive - Covert Reconfiguration
+    """
 
     type = 'passive'
 
@@ -21403,6 +33368,12 @@ class Effect6947(EffectDef):
 
 
 class Effect6949(EffectDef):
+    """
+    subSystemBonusGallenteDefensive2ScanProbeStrength
+
+    Used by:
+    Subsystem: Proteus Defensive - Covert Reconfiguration
+    """
 
     type = 'passive'
 
@@ -21413,6 +33384,12 @@ class Effect6949(EffectDef):
 
 
 class Effect6951(EffectDef):
+    """
+    subSystemBonusMinmatarDefensive2ScanProbeStrength
+
+    Used by:
+    Subsystem: Loki Defensive - Covert Reconfiguration
+    """
 
     type = 'passive'
 
@@ -21423,6 +33400,15 @@ class Effect6951(EffectDef):
 
 
 class Effect6953(EffectDef):
+    """
+    mediumRemoteRepFittingAdjustment
+
+    Used by:
+    Variations of module: Medium Remote Armor Repairer I (12 of 12)
+    Variations of module: Medium Remote Shield Booster I (11 of 11)
+    Module: Medium Ancillary Remote Armor Repairer
+    Module: Medium Ancillary Remote Shield Booster
+    """
 
     type = 'passive'
 
@@ -21433,6 +33419,12 @@ class Effect6953(EffectDef):
 
 
 class Effect6954(EffectDef):
+    """
+    subsystemBonusCommandBurstFittingReduction
+
+    Used by:
+    Subsystems named like: Offensive Support Processor (4 of 4)
+    """
 
     type = 'passive'
 
@@ -21445,6 +33437,13 @@ class Effect6954(EffectDef):
 
 
 class Effect6955(EffectDef):
+    """
+    subsystemRemoteShieldBoostFalloffBonus
+
+    Used by:
+    Subsystem: Loki Offensive - Support Processor
+    Subsystem: Tengu Offensive - Support Processor
+    """
 
     type = 'passive'
 
@@ -21455,6 +33454,12 @@ class Effect6955(EffectDef):
 
 
 class Effect6956(EffectDef):
+    """
+    subsystemRemoteArmorRepairerOptimalBonus
+
+    Used by:
+    Subsystems named like: Offensive Support Processor (3 of 4)
+    """
 
     type = 'passive'
 
@@ -21465,6 +33470,12 @@ class Effect6956(EffectDef):
 
 
 class Effect6957(EffectDef):
+    """
+    subsystemRemoteArmorRepairerFalloffBonus
+
+    Used by:
+    Subsystems named like: Offensive Support Processor (3 of 4)
+    """
 
     type = 'passive'
 
@@ -21475,6 +33486,12 @@ class Effect6957(EffectDef):
 
 
 class Effect6958(EffectDef):
+    """
+    subsystemBonusAmarrOffensive3RemoteArmorRepairHeat
+
+    Used by:
+    Subsystem: Legion Offensive - Support Processor
+    """
 
     type = 'passive'
 
@@ -21485,6 +33502,12 @@ class Effect6958(EffectDef):
 
 
 class Effect6959(EffectDef):
+    """
+    subsystemBonusGallenteOffensive3RemoteArmorRepairHeat
+
+    Used by:
+    Subsystem: Proteus Offensive - Support Processor
+    """
 
     type = 'passive'
 
@@ -21495,6 +33518,12 @@ class Effect6959(EffectDef):
 
 
 class Effect6960(EffectDef):
+    """
+    subsystemBonusCaldariOffensive3RemoteShieldBoosterHeat
+
+    Used by:
+    Subsystem: Tengu Offensive - Support Processor
+    """
 
     type = 'passive'
 
@@ -21506,6 +33535,12 @@ class Effect6960(EffectDef):
 
 
 class Effect6961(EffectDef):
+    """
+    subsystemBonusMinmatarOffensive3RemoteRepHeat
+
+    Used by:
+    Subsystem: Loki Offensive - Support Processor
+    """
 
     type = 'passive'
 
@@ -21517,6 +33552,12 @@ class Effect6961(EffectDef):
 
 
 class Effect6962(EffectDef):
+    """
+    subsystemBonusAmarrPropulsion2WarpSpeed
+
+    Used by:
+    Subsystem: Legion Propulsion - Interdiction Nullifier
+    """
 
     type = 'passive'
 
@@ -21527,6 +33568,12 @@ class Effect6962(EffectDef):
 
 
 class Effect6963(EffectDef):
+    """
+    subsystemBonusMinmatarPropulsion2WarpSpeed
+
+    Used by:
+    Subsystem: Loki Propulsion - Interdiction Nullifier
+    """
 
     type = 'passive'
 
@@ -21537,6 +33584,12 @@ class Effect6963(EffectDef):
 
 
 class Effect6964(EffectDef):
+    """
+    subsystemBonusGallentePropulsionWarpSpeed
+
+    Used by:
+    Subsystem: Proteus Propulsion - Hyperspatial Optimization
+    """
 
     type = 'passive'
 
@@ -21547,6 +33600,12 @@ class Effect6964(EffectDef):
 
 
 class Effect6981(EffectDef):
+    """
+    shipBonusTitanG1KinThermDamageBonus
+
+    Used by:
+    Ship: Komodo
+    """
 
     type = 'passive'
 
@@ -21567,6 +33626,12 @@ class Effect6981(EffectDef):
 
 
 class Effect6982(EffectDef):
+    """
+    shipBonusTitanG2EMExplosiveDamageBonus
+
+    Used by:
+    Ship: Komodo
+    """
 
     type = 'passive'
 
@@ -21587,6 +33652,12 @@ class Effect6982(EffectDef):
 
 
 class Effect6983(EffectDef):
+    """
+    shipBonusTitanC1ShieldResists
+
+    Used by:
+    Ship: Komodo
+    """
 
     type = 'passive'
 
@@ -21599,6 +33670,13 @@ class Effect6983(EffectDef):
 
 
 class Effect6984(EffectDef):
+    """
+    shipBonusRole4FighterDamageAndHitpoints
+
+    Used by:
+    Ship: Caiman
+    Ship: Komodo
+    """
 
     type = 'passive'
 
@@ -21615,6 +33693,12 @@ class Effect6984(EffectDef):
 
 
 class Effect6985(EffectDef):
+    """
+    shipBonusDreadnoughtG1KinThermDamageBonus
+
+    Used by:
+    Ship: Caiman
+    """
 
     type = 'passive'
 
@@ -21635,6 +33719,12 @@ class Effect6985(EffectDef):
 
 
 class Effect6986(EffectDef):
+    """
+    shipBonusForceAuxiliaryG1RemoteShieldBoostAmount
+
+    Used by:
+    Ship: Loggerhead
+    """
 
     type = 'passive'
 
@@ -21645,6 +33735,12 @@ class Effect6986(EffectDef):
 
 
 class Effect6987(EffectDef):
+    """
+    shipBonusRole2LogisticDroneRepAmountAndHitpointBonus
+
+    Used by:
+    Ship: Loggerhead
+    """
 
     type = 'passive'
 
@@ -21665,6 +33761,12 @@ class Effect6987(EffectDef):
 
 
 class Effect6992(EffectDef):
+    """
+    roleBonusMHTDamage1
+
+    Used by:
+    Ship: Victor
+    """
 
     type = 'passive'
 
@@ -21674,6 +33776,13 @@ class Effect6992(EffectDef):
 
 
 class Effect6993(EffectDef):
+    """
+    roleBonus2BoosterPenaltyReduction
+
+    Used by:
+    Ship: Victor
+    Ship: Virtuoso
+    """
 
     type = 'passive'
 
@@ -21694,6 +33803,12 @@ class Effect6993(EffectDef):
 
 
 class Effect6994(EffectDef):
+    """
+    eliteReconBonusMHTDamage1
+
+    Used by:
+    Ship: Victor
+    """
 
     type = 'passive'
 
@@ -21704,6 +33819,12 @@ class Effect6994(EffectDef):
 
 
 class Effect6995(EffectDef):
+    """
+    targetABCAttack
+
+    Used by:
+    Modules from group: Precursor Weapon (15 of 15)
+    """
 
     type = 'active'
 
@@ -21714,6 +33835,12 @@ class Effect6995(EffectDef):
 
 
 class Effect6996(EffectDef):
+    """
+    eliteReconBonusArmorRepAmount3
+
+    Used by:
+    Ship: Victor
+    """
 
     type = 'passive'
 
@@ -21724,6 +33851,12 @@ class Effect6996(EffectDef):
 
 
 class Effect6997(EffectDef):
+    """
+    eliteCovertOpsBonusArmorRepAmount4
+
+    Used by:
+    Ship: Virtuoso
+    """
 
     type = 'passive'
 
@@ -21734,6 +33867,12 @@ class Effect6997(EffectDef):
 
 
 class Effect6999(EffectDef):
+    """
+    covertOpsStealthBomberSiegeMissileLauncherCPUNeedBonus
+
+    Used by:
+    Ship: Virtuoso
+    """
 
     type = 'passive'
 
@@ -21744,6 +33883,12 @@ class Effect6999(EffectDef):
 
 
 class Effect7000(EffectDef):
+    """
+    shipBonusSHTFalloffGF1
+
+    Used by:
+    Ship: Virtuoso
+    """
 
     type = 'passive'
 
@@ -21754,6 +33899,12 @@ class Effect7000(EffectDef):
 
 
 class Effect7001(EffectDef):
+    """
+    roleBonusTorpRoF1
+
+    Used by:
+    Ship: Virtuoso
+    """
 
     type = 'passive'
 
@@ -21763,6 +33914,12 @@ class Effect7001(EffectDef):
 
 
 class Effect7002(EffectDef):
+    """
+    roleBonusBombLauncherPWGCPU3
+
+    Used by:
+    Ship: Virtuoso
+    """
 
     type = 'passive'
 
@@ -21773,6 +33930,12 @@ class Effect7002(EffectDef):
 
 
 class Effect7003(EffectDef):
+    """
+    eliteBonusCovertOpsSHTDamage3
+
+    Used by:
+    Ship: Virtuoso
+    """
 
     type = 'passive'
 
@@ -21783,6 +33946,12 @@ class Effect7003(EffectDef):
 
 
 class Effect7008(EffectDef):
+    """
+    structureFullPowerStateHitpointModifier
+
+    Used by:
+    Items from category: Structure (17 of 17)
+    """
 
     type = 'passive'
 
@@ -21793,6 +33962,16 @@ class Effect7008(EffectDef):
 
 
 class Effect7009(EffectDef):
+    """
+    serviceModuleFullPowerHitpointPostAssign
+
+    Used by:
+    Structure Modules from group: Structure Citadel Service Module (2 of 2)
+    Structure Modules from group: Structure Engineering Service Module (6 of 6)
+    Structure Modules from group: Structure Navigation Service Module (3 of 3)
+    Structure Modules from group: Structure Resource Processing Service Module (4 of 4)
+    Structure Module: Standup Moon Drill I
+    """
 
     runTime = 'early'
     type = 'passive'
@@ -21803,6 +33982,12 @@ class Effect7009(EffectDef):
 
 
 class Effect7012(EffectDef):
+    """
+    moduleBonusAssaultDamageControl
+
+    Used by:
+    Variations of module: Assault Damage Control I (5 of 5)
+    """
 
     runTime = 'early'
     type = 'active'
@@ -21819,6 +34004,12 @@ class Effect7012(EffectDef):
 
 
 class Effect7013(EffectDef):
+    """
+    eliteBonusGunshipKineticMissileDamage1
+
+    Used by:
+    Ship: Jaguar
+    """
 
     type = 'passive'
 
@@ -21829,6 +34020,12 @@ class Effect7013(EffectDef):
 
 
 class Effect7014(EffectDef):
+    """
+    eliteBonusGunshipThermalMissileDamage1
+
+    Used by:
+    Ship: Jaguar
+    """
 
     type = 'passive'
 
@@ -21839,6 +34036,12 @@ class Effect7014(EffectDef):
 
 
 class Effect7015(EffectDef):
+    """
+    eliteBonusGunshipEMMissileDamage1
+
+    Used by:
+    Ship: Jaguar
+    """
 
     type = 'passive'
 
@@ -21849,6 +34052,12 @@ class Effect7015(EffectDef):
 
 
 class Effect7016(EffectDef):
+    """
+    eliteBonusGunshipExplosiveMissileDamage1
+
+    Used by:
+    Ship: Jaguar
+    """
 
     type = 'passive'
 
@@ -21859,6 +34068,12 @@ class Effect7016(EffectDef):
 
 
 class Effect7017(EffectDef):
+    """
+    eliteBonusGunshipExplosionVelocity2
+
+    Used by:
+    Ship: Jaguar
+    """
 
     type = 'passive'
 
@@ -21869,6 +34084,12 @@ class Effect7017(EffectDef):
 
 
 class Effect7018(EffectDef):
+    """
+    shipSETROFAF
+
+    Used by:
+    Ship: Retribution
+    """
 
     type = 'passive'
 
@@ -21879,6 +34100,13 @@ class Effect7018(EffectDef):
 
 
 class Effect7020(EffectDef):
+    """
+    remoteWebifierMaxRangeBonus
+
+    Used by:
+    Implants named like: Inquest 'Eros' Stasis Webifier MR (3 of 3)
+    Implants named like: Inquest 'Hedone' Entanglement Optimizer WS (3 of 3)
+    """
 
     type = 'passive'
 
@@ -21889,6 +34117,14 @@ class Effect7020(EffectDef):
 
 
 class Effect7021(EffectDef):
+    """
+    structureRigMaxTargetRange
+
+    Used by:
+    Structure Modules from group: Structure Combat Rig L - Max Targets and Sensor Boosting (2 of 2)
+    Structure Modules from group: Structure Combat Rig M - Boosted Sensors (2 of 2)
+    Structure Modules from group: Structure Combat Rig XL - Doomsday and Targeting (2 of 2)
+    """
 
     type = 'passive'
 
@@ -21898,6 +34134,12 @@ class Effect7021(EffectDef):
 
 
 class Effect7024(EffectDef):
+    """
+    shipBonusDroneTrackingEliteGunship2
+
+    Used by:
+    Ship: Ishkur
+    """
 
     type = 'passive'
 
@@ -21908,6 +34150,12 @@ class Effect7024(EffectDef):
 
 
 class Effect7026(EffectDef):
+    """
+    scriptStandupWarpScram
+
+    Used by:
+    Charge: Standup Focused Warp Scrambling Script
+    """
 
     runTime = 'early'
     type = 'passive'
@@ -21918,6 +34166,12 @@ class Effect7026(EffectDef):
 
 
 class Effect7027(EffectDef):
+    """
+    structureCapacitorCapacityBonus
+
+    Used by:
+    Structure Modules from group: Structure Capacitor Battery (2 of 2)
+    """
 
     type = 'passive'
 
@@ -21927,6 +34181,12 @@ class Effect7027(EffectDef):
 
 
 class Effect7028(EffectDef):
+    """
+    structureModifyPowerRechargeRate
+
+    Used by:
+    Structure Modules from group: Structure Capacitor Power Relay (2 of 2)
+    """
 
     type = 'passive'
 
@@ -21936,6 +34196,12 @@ class Effect7028(EffectDef):
 
 
 class Effect7029(EffectDef):
+    """
+    structureArmorHPBonus
+
+    Used by:
+    Structure Modules from group: Structure Armor Reinforcer (2 of 2)
+    """
 
     runTime = 'early'
     type = 'passive'
@@ -21946,6 +34212,13 @@ class Effect7029(EffectDef):
 
 
 class Effect7030(EffectDef):
+    """
+    structureAoERoFRoleBonus
+
+    Used by:
+    Items from category: Structure (11 of 17)
+    Structures from group: Citadel (8 of 9)
+    """
 
     type = 'passive'
 
@@ -21960,6 +34233,12 @@ class Effect7030(EffectDef):
 
 
 class Effect7031(EffectDef):
+    """
+    shipBonusHeavyMissileKineticDamageCBC2
+
+    Used by:
+    Ship: Drake Navy Issue
+    """
 
     type = 'passive'
 
@@ -21970,6 +34249,12 @@ class Effect7031(EffectDef):
 
 
 class Effect7032(EffectDef):
+    """
+    shipBonusHeavyMissileThermalDamageCBC2
+
+    Used by:
+    Ship: Drake Navy Issue
+    """
 
     type = 'passive'
 
@@ -21980,6 +34265,12 @@ class Effect7032(EffectDef):
 
 
 class Effect7033(EffectDef):
+    """
+    shipBonusHeavyMissileEMDamageCBC2
+
+    Used by:
+    Ship: Drake Navy Issue
+    """
 
     type = 'passive'
 
@@ -21990,6 +34281,12 @@ class Effect7033(EffectDef):
 
 
 class Effect7034(EffectDef):
+    """
+    shipBonusHeavyMissileExplosiveDamageCBC2
+
+    Used by:
+    Ship: Drake Navy Issue
+    """
 
     type = 'passive'
 
@@ -22000,6 +34297,12 @@ class Effect7034(EffectDef):
 
 
 class Effect7035(EffectDef):
+    """
+    shipBonusHeavyAssaultMissileExplosiveDamageCBC2
+
+    Used by:
+    Ship: Drake Navy Issue
+    """
 
     type = 'passive'
 
@@ -22010,6 +34313,12 @@ class Effect7035(EffectDef):
 
 
 class Effect7036(EffectDef):
+    """
+    shipBonusHeavyAssaultMissileEMDamageCBC2
+
+    Used by:
+    Ship: Drake Navy Issue
+    """
 
     type = 'passive'
 
@@ -22020,6 +34329,12 @@ class Effect7036(EffectDef):
 
 
 class Effect7037(EffectDef):
+    """
+    shipBonusHeavyAssaultMissileThermalDamageCBC2
+
+    Used by:
+    Ship: Drake Navy Issue
+    """
 
     type = 'passive'
 
@@ -22030,6 +34345,12 @@ class Effect7037(EffectDef):
 
 
 class Effect7038(EffectDef):
+    """
+    shipBonusHeavyAssaultMissileKineticDamageCBC2
+
+    Used by:
+    Ship: Drake Navy Issue
+    """
 
     type = 'passive'
 
@@ -22040,6 +34361,12 @@ class Effect7038(EffectDef):
 
 
 class Effect7039(EffectDef):
+    """
+    structureHiddenMissileDamageMultiplier
+
+    Used by:
+    Items from category: Structure (14 of 17)
+    """
 
     type = 'passive'
 
@@ -22053,6 +34380,12 @@ class Effect7039(EffectDef):
 
 
 class Effect7040(EffectDef):
+    """
+    structureHiddenArmorHPMultiplier
+
+    Used by:
+    Items from category: Structure (17 of 17)
+    """
 
     type = 'passive'
 
@@ -22062,6 +34395,12 @@ class Effect7040(EffectDef):
 
 
 class Effect7042(EffectDef):
+    """
+    shipArmorHitPointsAC1
+
+    Used by:
+    Ship: Monitor
+    """
 
     type = 'passive'
 
@@ -22071,6 +34410,12 @@ class Effect7042(EffectDef):
 
 
 class Effect7043(EffectDef):
+    """
+    shipShieldHitpointsCC1
+
+    Used by:
+    Ship: Monitor
+    """
 
     type = 'passive'
 
@@ -22080,6 +34425,12 @@ class Effect7043(EffectDef):
 
 
 class Effect7044(EffectDef):
+    """
+    shipAgilityBonusGC1
+
+    Used by:
+    Ship: Monitor
+    """
 
     type = 'passive'
 
@@ -22089,6 +34440,12 @@ class Effect7044(EffectDef):
 
 
 class Effect7045(EffectDef):
+    """
+    shipSignatureRadiusMC1
+
+    Used by:
+    Ship: Monitor
+    """
 
     type = 'passive'
 
@@ -22098,6 +34455,12 @@ class Effect7045(EffectDef):
 
 
 class Effect7046(EffectDef):
+    """
+    eliteBonusFlagCruiserAllResistances1
+
+    Used by:
+    Ship: Monitor
+    """
 
     type = 'passive'
 
@@ -22118,6 +34481,12 @@ class Effect7046(EffectDef):
 
 
 class Effect7047(EffectDef):
+    """
+    roleBonusFlagCruiserModuleFittingReduction
+
+    Used by:
+    Ship: Monitor
+    """
 
     type = 'passive'
 
@@ -22135,6 +34504,12 @@ class Effect7047(EffectDef):
 
 
 class Effect7050(EffectDef):
+    """
+    aoe_beacon_bioluminescence_cloud
+
+    Used by:
+    Celestials named like: Bioluminescence Cloud (3 of 3)
+    """
 
     runTime = 'early'
     type = ('projected', 'passive', 'gang')
@@ -22151,6 +34526,12 @@ class Effect7050(EffectDef):
 
 
 class Effect7051(EffectDef):
+    """
+    aoe_beacon_caustic_cloud
+
+    Used by:
+    Celestials named like: Caustic Cloud (3 of 3)
+    """
 
     runTime = 'early'
     type = ('projected', 'passive', 'gang')
@@ -22167,6 +34548,12 @@ class Effect7051(EffectDef):
 
 
 class Effect7052(EffectDef):
+    """
+    roleBonusFlagCruiserTargetPainterModifications
+
+    Used by:
+    Ship: Monitor
+    """
 
     type = 'passive'
 
@@ -22179,6 +34566,12 @@ class Effect7052(EffectDef):
 
 
 class Effect7055(EffectDef):
+    """
+    shipLargeWeaponsDamageBonus
+
+    Used by:
+    Ship: Praxis
+    """
 
     type = 'passive'
 
@@ -22217,6 +34610,12 @@ class Effect7055(EffectDef):
 
 
 class Effect7058(EffectDef):
+    """
+    aoe_beacon_filament_cloud
+
+    Used by:
+    Celestials named like: Filament Cloud (3 of 3)
+    """
 
     runTime = 'early'
     type = ('projected', 'passive', 'gang')
@@ -22233,6 +34632,14 @@ class Effect7058(EffectDef):
 
 
 class Effect7059(EffectDef):
+    """
+    weather_caustic_toxin
+
+    Used by:
+    Celestial: caustic_toxin_weather_1
+    Celestial: caustic_toxin_weather_2
+    Celestial: caustic_toxin_weather_3
+    """
 
     runTime = 'early'
     type = ('projected', 'passive', 'gang')
@@ -22249,6 +34656,15 @@ class Effect7059(EffectDef):
 
 
 class Effect7060(EffectDef):
+    """
+    weather_darkness
+
+    Used by:
+    Celestial: darkness_weather_1
+    Celestial: darkness_weather_2
+    Celestial: darkness_weather_3
+    Celestial: pvp_weather_1
+    """
 
     runTime = 'early'
     type = ('projected', 'passive', 'gang')
@@ -22264,6 +34680,14 @@ class Effect7060(EffectDef):
 
 
 class Effect7061(EffectDef):
+    """
+    weather_electric_storm
+
+    Used by:
+    Celestial: electric_storm_weather_1
+    Celestial: electric_storm_weather_2
+    Celestial: electric_storm_weather_3
+    """
 
     runTime = 'early'
     type = ('projected', 'passive', 'gang')
@@ -22280,6 +34704,14 @@ class Effect7061(EffectDef):
 
 
 class Effect7062(EffectDef):
+    """
+    weather_infernal
+
+    Used by:
+    Celestial: infernal_weather_1
+    Celestial: infernal_weather_2
+    Celestial: infernal_weather_3
+    """
 
     runTime = 'early'
     type = ('projected', 'passive', 'gang')
@@ -22296,6 +34728,14 @@ class Effect7062(EffectDef):
 
 
 class Effect7063(EffectDef):
+    """
+    weather_xenon_gas
+
+    Used by:
+    Celestial: xenon_gas_weather_1
+    Celestial: xenon_gas_weather_2
+    Celestial: xenon_gas_weather_3
+    """
 
     runTime = 'early'
     type = ('projected', 'passive', 'gang')
@@ -22312,12 +34752,24 @@ class Effect7063(EffectDef):
 
 
 class Effect7064(EffectDef):
+    """
+    weather_basic
+
+    Used by:
+    Celestial: basic_weather
+    """
 
     runTime = 'early'
     type = ('projected', 'passive')
 
 
 class Effect7071(EffectDef):
+    """
+    smallPrecursorTurretDmgBonusRequiredSkill
+
+    Used by:
+    Skill: Small Precursor Weapon
+    """
 
     type = 'passive'
 
@@ -22329,6 +34781,12 @@ class Effect7071(EffectDef):
 
 
 class Effect7072(EffectDef):
+    """
+    mediumPrecursorTurretDmgBonusRequiredSkill
+
+    Used by:
+    Skill: Medium Precursor Weapon
+    """
 
     type = 'passive'
 
@@ -22340,6 +34798,12 @@ class Effect7072(EffectDef):
 
 
 class Effect7073(EffectDef):
+    """
+    largePrecursorTurretDmgBonusRequiredSkill
+
+    Used by:
+    Skill: Large Precursor Weapon
+    """
 
     type = 'passive'
 
@@ -22351,6 +34815,12 @@ class Effect7073(EffectDef):
 
 
 class Effect7074(EffectDef):
+    """
+    smallDisintegratorSkillDmgBonus
+
+    Used by:
+    Skill: Small Disintegrator Specialization
+    """
 
     type = 'passive'
 
@@ -22362,6 +34832,12 @@ class Effect7074(EffectDef):
 
 
 class Effect7075(EffectDef):
+    """
+    mediumDisintegratorSkillDmgBonus
+
+    Used by:
+    Skill: Medium Disintegrator Specialization
+    """
 
     type = 'passive'
 
@@ -22373,6 +34849,12 @@ class Effect7075(EffectDef):
 
 
 class Effect7076(EffectDef):
+    """
+    largeDisintegratorSkillDmgBonus
+
+    Used by:
+    Skill: Large Disintegrator Specialization
+    """
 
     type = 'passive'
 
@@ -22384,6 +34866,12 @@ class Effect7076(EffectDef):
 
 
 class Effect7077(EffectDef):
+    """
+    disintegratorWeaponDamageMultiply
+
+    Used by:
+    Modules from group: Entropic Radiation Sink (4 of 4)
+    """
 
     type = 'passive'
 
@@ -22395,6 +34883,12 @@ class Effect7077(EffectDef):
 
 
 class Effect7078(EffectDef):
+    """
+    disintegratorWeaponSpeedMultiply
+
+    Used by:
+    Modules from group: Entropic Radiation Sink (4 of 4)
+    """
 
     type = 'passive'
 
@@ -22406,6 +34900,12 @@ class Effect7078(EffectDef):
 
 
 class Effect7079(EffectDef):
+    """
+    shipPCBSSPeedBonusPCBS1
+
+    Used by:
+    Ship: Leshak
+    """
 
     type = 'passive'
 
@@ -22416,6 +34916,12 @@ class Effect7079(EffectDef):
 
 
 class Effect7080(EffectDef):
+    """
+    shipPCBSDmgBonusPCBS2
+
+    Used by:
+    Ship: Leshak
+    """
 
     type = 'passive'
 
@@ -22426,6 +34932,13 @@ class Effect7080(EffectDef):
 
 
 class Effect7085(EffectDef):
+    """
+    shipbonusPCTDamagePC1
+
+    Used by:
+    Ship: Tiamat
+    Ship: Vedmak
+    """
 
     type = 'passive'
 
@@ -22436,6 +34949,13 @@ class Effect7085(EffectDef):
 
 
 class Effect7086(EffectDef):
+    """
+    shipbonusPCTTrackingPC2
+
+    Used by:
+    Ship: Tiamat
+    Ship: Vedmak
+    """
 
     type = 'passive'
 
@@ -22446,6 +34966,13 @@ class Effect7086(EffectDef):
 
 
 class Effect7087(EffectDef):
+    """
+    shipbonusPCTOptimalPF2
+
+    Used by:
+    Ship: Damavik
+    Ship: Hydra
+    """
 
     type = 'passive'
 
@@ -22456,6 +34983,13 @@ class Effect7087(EffectDef):
 
 
 class Effect7088(EffectDef):
+    """
+    shipbonusPCTDamagePF1
+
+    Used by:
+    Ship: Damavik
+    Ship: Hydra
+    """
 
     type = 'passive'
 
@@ -22466,6 +35000,12 @@ class Effect7088(EffectDef):
 
 
 class Effect7091(EffectDef):
+    """
+    shipBonusNosNeutCapNeedRoleBonus2
+
+    Used by:
+    Variations of ship: Rodiva (2 of 2)
+    """
 
     type = 'passive'
 
@@ -22475,6 +35015,18 @@ class Effect7091(EffectDef):
 
 
 class Effect7092(EffectDef):
+    """
+    shipBonusRemoteRepCapNeedRoleBonus2
+
+    Used by:
+    Ship: Damavik
+    Ship: Drekavac
+    Ship: Hydra
+    Ship: Kikimora
+    Ship: Leshak
+    Ship: Tiamat
+    Ship: Vedmak
+    """
 
     type = 'passive'
 
@@ -22485,6 +35037,19 @@ class Effect7092(EffectDef):
 
 
 class Effect7093(EffectDef):
+    """
+    shipBonusSmartbombCapNeedRoleBonus2
+
+    Used by:
+    Variations of ship: Rodiva (2 of 2)
+    Ship: Damavik
+    Ship: Drekavac
+    Ship: Hydra
+    Ship: Kikimora
+    Ship: Leshak
+    Ship: Tiamat
+    Ship: Vedmak
+    """
 
     type = 'passive'
 
@@ -22495,6 +35060,18 @@ class Effect7093(EffectDef):
 
 
 class Effect7094(EffectDef):
+    """
+    shipBonusRemoteRepMaxRangeRoleBonus1
+
+    Used by:
+    Ship: Damavik
+    Ship: Drekavac
+    Ship: Hydra
+    Ship: Kikimora
+    Ship: Leshak
+    Ship: Tiamat
+    Ship: Vedmak
+    """
 
     type = 'passive'
 
@@ -22505,6 +35082,12 @@ class Effect7094(EffectDef):
 
 
 class Effect7097(EffectDef):
+    """
+    surgicalStrikeDamageMultiplierBonusPostPercentDamageMultiplierLocationShipGroupPrecursorTurret
+
+    Used by:
+    Skill: Surgical Strike
+    """
 
     type = 'passive'
 
@@ -22515,6 +35098,12 @@ class Effect7097(EffectDef):
 
 
 class Effect7111(EffectDef):
+    """
+    systemSmallPrecursorTurretDamage
+
+    Used by:
+    Celestials named like: Wolf Rayet Effect Beacon Class (5 of 6)
+    """
 
     runTime = 'early'
     type = ('projected', 'passive')
@@ -22527,6 +35116,18 @@ class Effect7111(EffectDef):
 
 
 class Effect7112(EffectDef):
+    """
+    shipBonusNeutCapNeedRoleBonus2
+
+    Used by:
+    Ship: Damavik
+    Ship: Drekavac
+    Ship: Hydra
+    Ship: Kikimora
+    Ship: Leshak
+    Ship: Tiamat
+    Ship: Vedmak
+    """
 
     type = 'passive'
 
@@ -22537,6 +35138,12 @@ class Effect7112(EffectDef):
 
 
 class Effect7116(EffectDef):
+    """
+    eliteBonusReconScanProbeStrength2
+
+    Used by:
+    Ship: Tiamat
+    """
 
     type = 'passive'
 
@@ -22547,6 +35154,16 @@ class Effect7116(EffectDef):
 
 
 class Effect7117(EffectDef):
+    """
+    roleBonusWarpSpeed
+
+    Used by:
+    Ship: Cynabal
+    Ship: Dramiel
+    Ship: Leopard
+    Ship: Machariel
+    Ship: Victorieux Luxury Yacht
+    """
 
     type = 'passive'
 
@@ -22556,6 +35173,12 @@ class Effect7117(EffectDef):
 
 
 class Effect7118(EffectDef):
+    """
+    eliteBonusCovertOps3PCTdamagePerCycle
+
+    Used by:
+    Ship: Hydra
+    """
 
     type = 'passive'
 
@@ -22566,6 +35189,12 @@ class Effect7118(EffectDef):
 
 
 class Effect7119(EffectDef):
+    """
+    eliteBonusReconShip3PCTdamagePerCycle
+
+    Used by:
+    Ship: Tiamat
+    """
 
     type = 'passive'
 
@@ -22576,6 +35205,12 @@ class Effect7119(EffectDef):
 
 
 class Effect7142(EffectDef):
+    """
+    massEntanglerEffect5
+
+    Used by:
+    Module: Zero-Point Mass Entangler
+    """
 
     type = 'active'
 
@@ -22593,6 +35228,12 @@ class Effect7142(EffectDef):
 
 
 class Effect7154(EffectDef):
+    """
+    shipBonusPD1DisintegratorDamage
+
+    Used by:
+    Ship: Kikimora
+    """
 
     type = 'passive'
 
@@ -22604,6 +35245,12 @@ class Effect7154(EffectDef):
 
 
 class Effect7155(EffectDef):
+    """
+    shipBonusPBC1DisintegratorDamage
+
+    Used by:
+    Ship: Drekavac
+    """
 
     type = 'passive'
 
@@ -22615,6 +35262,12 @@ class Effect7155(EffectDef):
 
 
 class Effect7156(EffectDef):
+    """
+    smallDisintegratorMaxRangeBonus
+
+    Used by:
+    Ship: Kikimora
+    """
 
     type = 'passive'
 
@@ -22625,6 +35278,12 @@ class Effect7156(EffectDef):
 
 
 class Effect7157(EffectDef):
+    """
+    shipBonusPD2DisintegratorMaxRange
+
+    Used by:
+    Ship: Kikimora
+    """
 
     type = 'passive'
 
@@ -22636,6 +35295,12 @@ class Effect7157(EffectDef):
 
 
 class Effect7158(EffectDef):
+    """
+    shipArmorKineticResistancePBC2
+
+    Used by:
+    Ship: Drekavac
+    """
 
     type = 'passive'
 
@@ -22646,6 +35311,12 @@ class Effect7158(EffectDef):
 
 
 class Effect7159(EffectDef):
+    """
+    shipArmorThermalResistancePBC2
+
+    Used by:
+    Ship: Drekavac
+    """
 
     type = 'passive'
 
@@ -22656,6 +35327,12 @@ class Effect7159(EffectDef):
 
 
 class Effect7160(EffectDef):
+    """
+    shipArmorEMResistancePBC2
+
+    Used by:
+    Ship: Drekavac
+    """
 
     type = 'passive'
 
@@ -22666,6 +35343,12 @@ class Effect7160(EffectDef):
 
 
 class Effect7161(EffectDef):
+    """
+    shipArmorExplosiveResistancePBC2
+
+    Used by:
+    Ship: Drekavac
+    """
 
     type = 'passive'
 
@@ -22676,6 +35359,12 @@ class Effect7161(EffectDef):
 
 
 class Effect7162(EffectDef):
+    """
+    shipRoleDisintegratorMaxRangeCBC
+
+    Used by:
+    Ship: Drekavac
+    """
 
     type = 'passive'
 
@@ -22686,6 +35375,12 @@ class Effect7162(EffectDef):
 
 
 class Effect7166(EffectDef):
+    """
+    ShipModuleRemoteArmorMutadaptiveRepairer
+
+    Used by:
+    Modules from group: Mutadaptive Remote Armor Repairer (5 of 5)
+    """
 
     runTime = 'late'
     type = 'projected', 'active'
@@ -22708,6 +35403,12 @@ class Effect7166(EffectDef):
 
 
 class Effect7167(EffectDef):
+    """
+    shipBonusRemoteCapacitorTransferRangeRole1
+
+    Used by:
+    Variations of ship: Rodiva (2 of 2)
+    """
 
     type = 'passive'
 
@@ -22717,6 +35418,12 @@ class Effect7167(EffectDef):
 
 
 class Effect7168(EffectDef):
+    """
+    shipBonusMutadaptiveRemoteRepairRangeRole3
+
+    Used by:
+    Ship: Rodiva
+    """
 
     type = 'passive'
 
@@ -22726,6 +35433,12 @@ class Effect7168(EffectDef):
 
 
 class Effect7169(EffectDef):
+    """
+    shipBonusMutadaptiveRepAmountPC1
+
+    Used by:
+    Ship: Rodiva
+    """
 
     type = 'passive'
 
@@ -22735,6 +35448,12 @@ class Effect7169(EffectDef):
 
 
 class Effect7170(EffectDef):
+    """
+    shipBonusMutadaptiveRepCapNeedPC2
+
+    Used by:
+    Ship: Rodiva
+    """
 
     type = 'passive'
 
@@ -22744,6 +35463,12 @@ class Effect7170(EffectDef):
 
 
 class Effect7171(EffectDef):
+    """
+    shipBonusMutadaptiveRemoteRepRangePC1
+
+    Used by:
+    Ship: Zarmazd
+    """
 
     type = 'passive'
 
@@ -22753,6 +35478,12 @@ class Effect7171(EffectDef):
 
 
 class Effect7172(EffectDef):
+    """
+    shipBonusMutadaptiveRemoteRepCapNeedeliteBonusLogisitics1
+
+    Used by:
+    Ship: Zarmazd
+    """
 
     type = 'passive'
 
@@ -22762,6 +35493,12 @@ class Effect7172(EffectDef):
 
 
 class Effect7173(EffectDef):
+    """
+    shipBonusMutadaptiveRemoteRepAmounteliteBonusLogisitics2
+
+    Used by:
+    Ship: Zarmazd
+    """
 
     type = 'passive'
 
@@ -22771,6 +35508,13 @@ class Effect7173(EffectDef):
 
 
 class Effect7176(EffectDef):
+    """
+    skillBonusDroneInterfacingNotFighters
+
+    Used by:
+    Implant: CreoDron 'Bumblebee' Drone Tuner T10-5D
+    Implant: CreoDron 'Yellowjacket' Drone Tuner D5-10T
+    """
 
     type = 'passive'
 
@@ -22781,6 +35525,12 @@ class Effect7176(EffectDef):
 
 
 class Effect7177(EffectDef):
+    """
+    skillBonusDroneDurabilityNotFighters
+
+    Used by:
+    Implants from group: Cyber Drones (4 of 4)
+    """
 
     type = 'passive'
 
@@ -22795,6 +35545,12 @@ class Effect7177(EffectDef):
 
 
 class Effect7179(EffectDef):
+    """
+    stripMinerDurationMultiplier
+
+    Used by:
+    Module: Frostline 'Omnivore' Harvester Upgrade
+    """
 
     type = 'passive'
 
@@ -22805,6 +35561,12 @@ class Effect7179(EffectDef):
 
 
 class Effect7180(EffectDef):
+    """
+    miningDurationMultiplierOnline
+
+    Used by:
+    Module: Frostline 'Omnivore' Harvester Upgrade
+    """
 
     type = 'passive'
 
@@ -22815,10 +35577,16 @@ class Effect7180(EffectDef):
 
 
 class Effect7183(EffectDef):
+    """
+    implantWarpScrambleRangeBonus
+
+    Used by:
+    Implants named like: Inquest 'Hedone' Entanglement Optimizer WS (3 of 3)
+    """
 
     type = 'passive'
 
     @staticmethod
     def handler(fit, src, context):
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Warp Scrambler', 'maxRange',
-                                      src.getModifiedItemAttr('warpScrambleRangeBonus'), stackingPenalties=False)
+                                      src.getModifiedItemAttr('warpScrambleRangeBonus'), stackingPenalties=False)
\ No newline at end of file
diff --git a/scripts/effectUsedBy.py b/scripts/effectUsedBy.py
index aa5f878b3..af318d264 100755
--- a/scripts/effectUsedBy.py
+++ b/scripts/effectUsedBy.py
@@ -60,19 +60,13 @@ from optparse import OptionParser
 script_dir = os.path.dirname(__file__)
 
 # Form list of effects for processing
-effects_path = os.path.join(script_dir, "..", "eos", "effects")
+effects_path = os.path.join(script_dir, "..", "eos", "effects.py")
 
 usage = "usage: %prog --database=DB [--debug=DEBUG]"
 parser = OptionParser(usage=usage)
 parser.add_option("-d", "--database", help="path to eve cache data dump in \
     sqlite format, default to eve database file included in pyfa (../eve.db)",
     type="string", default=os.path.join(script_dir, "..", "eve.db"))
-parser.add_option("-e", "--effects", help="explicit comma-separated list of \
-effects to process", type="string", default="")
-parser.add_option("-r", "--remove", help="remove effect files that are not \
-used by any items", action="store_true", dest="remove", default=False)
-parser.add_option("-x", "--remove2", help="remove effect files that do not exist \
-in database", action="store_true", dest="remove2", default=False)
 parser.add_option("-u", "--debug", help="debug level, 0 by default",
                   type="int", default=0)
 (options, args) = parser.parse_args()
@@ -178,20 +172,13 @@ invmarketgroups WHERE marketGroupID = ? LIMIT 1'
 # Compose list of effects w/o symbols which eos doesn't take into
 # consideration, we'll use it to find proper effect IDs from file
 # names
-globalmap_effectnameeos_effectid = {}
-globalmap_effectnameeos_effectnamedb = {}
-STRIPSPEC = "[^A-Za-z0-9]"
+globalmap_effectid_effectnamedb = {}
 cursor.execute(QUERY_ALLEFFECTS)
 for row in cursor:
     effectid = row[0]
     effectnamedb = row[1]
-    effectnameeos = re.sub(STRIPSPEC, "", effectnamedb).lower()
-    # There may be different effects with the same name, so form
-    # sets of IDs
-    if not effectnameeos in globalmap_effectnameeos_effectid:
-        globalmap_effectnameeos_effectid[effectnameeos] = set()
-    globalmap_effectnameeos_effectid[effectnameeos].add(effectid)
-    globalmap_effectnameeos_effectnamedb[effectnameeos] = effectnamedb
+    globalmap_effectid_effectnamedb[effectid] = effectnamedb
+
 # Stage 1
 
 # Published types set
@@ -402,42 +389,31 @@ for typeid in publishedtypes:
                 (set(), len(typenamesplitted))
             globalmap_typeid_typenamecombtuple[typeid][0].add(typenamecomb)
 
-if options.effects:
-    effect_list = options.effects.split(",")
-else:
-    effect_list = []
-    for effect_file in os.listdir(effects_path):
-        if not effect_file.startswith('__'):
-            file_name, file_extension = effect_file.rsplit('.', 1)
-            # Ignore non-py files and exclude implementation-specific 'effects'
-            if file_extension == "py" and not file_name in "__init__":
-                effect_list.append(file_name)
-
 # Stage 2
 
-# Go through effect files one-by-one
-for effect_name in effect_list:
-    effect_file = "{0}.py".format(effect_name)
+effectids_eos = set()
+
+with open(effects_path) as f:
+    for line in f:
+        m = re.match("class Effect(\d+)\(", line)
+        if m:
+            effectid = int(m.group(1))
+            effectids_eos.add(effectid)
+
+# Go through effect definitions
+for effectid in effectids_eos:
     # Stage 2.1
     # Set of items which are affected by current effect
     pereffectlist_usedbytypes = set()
-    if effect_name in globalmap_effectnameeos_effectid:
-        effectids = globalmap_effectnameeos_effectid[effect_name]
-    else:
-        if options.remove2:
-            print(("Warning: effect file " + effect_name +
-              " exists but is not in database, removing"))
-            os.remove(os.path.join(effects_path, effect_file))
-        else:
-            print(("Warning: effect file " + effect_name +
-              " exists but is not in database"))
+    if effectid not in globalmap_effectid_effectnamedb:
+        print(f"Warning: effect {effectid} is defined in eos but not in database")
         continue
-    for effectid in effectids:
-        cursor.execute(QUERY_EFFECTID_TYPEID, (effectid,))
-        for row in cursor:
-            typeid = row[0]
-            if typeid in publishedtypes:
-                pereffectlist_usedbytypes.add(typeid)
+    effectnamedb = globalmap_effectid_effectnamedb[effectid]
+    cursor.execute(QUERY_EFFECTID_TYPEID, (effectid,))
+    for row in cursor:
+        typeid = row[0]
+        if typeid in publishedtypes:
+            pereffectlist_usedbytypes.add(typeid)
     # Number of items affected by current effect
     pereffect_totalaffected = len(pereffectlist_usedbytypes)
 
@@ -500,7 +476,7 @@ for effect_name in effect_list:
 
     stopdebugprints = False
     if DEBUG_LEVEL >= 1:
-        print(("\nEffect:", effect_name))
+        print(("\nEffect:", effectnamedb))
         print(("Total items affected: {0}".format(pereffect_totalaffected)))
 
     # Stage 2.2
@@ -876,20 +852,6 @@ inner score: {5:.3})"
         print(("Type name combinations:", describedbytypenamecomb))
 
     # Stage 2.1
-    # Read effect file and split it into lines
-    effectfile = open(os.path.join(effects_path, effect_file), 'r')
-    effectcontentssource = effectfile.read()
-    effectfile.close()
-    effectLines = effectcontentssource.split("\n")
-    # Delete old comments from file contents
-    numofcommentlines = 0
-    for line in effectLines:
-        if line:
-            if line[0] == "#": numofcommentlines += 1
-            else: break
-        else: break
-    for i in range(numofcommentlines):
-        del effectLines[0]
 
     # These lists will contain IDs and some metadata in tuples
     printing_types = []
@@ -990,7 +952,7 @@ inner score: {5:.3})"
         # Append line for printing to list
         catname = type[2]
         typename = type[1]
-        printstr = "# {0}: {1}".format(catname, typename)
+        printstr = "{0}: {1}".format(catname, typename)
         if validate_string(printstr):
             printing_typelines.append(printstr)
     # Do the same for groups
@@ -1002,7 +964,7 @@ inner score: {5:.3})"
         groupname = group[1]
         described = len(effectmap_groupid_typeid[group[0]][0])
         total = len(globalmap_groupid_typeid[group[0]])
-        printstr = "# {0}s from group: {1} ({2} of {3})".format(catname, groupname, described, total)
+        printstr = "{0}s from group: {1} ({2} of {3})".format(catname, groupname, described, total)
         if validate_string(printstr):
             printing_grouplines.append(printstr)
     # Process categories
@@ -1013,7 +975,7 @@ inner score: {5:.3})"
         catname = category[1]
         described = len(effectmap_categoryid_typeid[category[0]][0])
         total = len(globalmap_categoryid_typeid[category[0]])
-        printstr = "# Items from category: {0} ({1} of {2})".format(catname, described, total)
+        printstr = "Items from category: {0} ({1} of {2})".format(catname, described, total)
         if validate_string(printstr):
             printing_categorylines.append(printstr)
     # Process variations
@@ -1027,7 +989,7 @@ inner score: {5:.3})"
         basename = basetype[1]
         described = len(effectmap_basetypeid_typeid[basetype[0]][0])
         total = len(globalmap_basetypeid_typeid[basetype[0]])
-        printstr = "# Variations of {0}: {1} ({2} of {3})".format(catname, basename, described, total)
+        printstr = "Variations of {0}: {1} ({2} of {3})".format(catname, basename, described, total)
         if validate_string(printstr):
             printing_basetypelines.append(printstr)
     # Process market groups with variations
@@ -1040,7 +1002,7 @@ inner score: {5:.3})"
                         [marketgroup[0]][0])
         total = len(globalmap_marketgroupid_typeidwithvariations
                     [marketgroup[0]])
-        printstr = "# Items from market group: {0} ({1} of {2})".format(marketgroupname, described, total)
+        printstr = "Items from market group: {0} ({1} of {2})".format(marketgroupname, described, total)
         if validate_string(printstr):
             printing_marketgroupwithvarslines.append(printstr)
     # Process type name combinations
@@ -1055,7 +1017,7 @@ inner score: {5:.3})"
         described = len(effectmap_typenamecombtuple_typeid
                         [typenamecomb[0]][0])
         total = len(globalmap_typenamecombtuple_typeid[typenamecomb[0]])
-        printstr = "# {0}s named like: {1} ({2} of {3})".format(catname, namedlike, described, total)
+        printstr = "{0}s named like: {1} ({2} of {3})".format(catname, namedlike, described, total)
         if validate_string(printstr):
             printing_typenamecombtuplelines.append(printstr)
 
@@ -1065,30 +1027,37 @@ inner score: {5:.3})"
     printing_basetypelines + printing_typelines
     # Prepend list with "used by"
     if commentlines:
-        commentlines = ["# %s\n#\n# Used by:" % \
-            globalmap_effectnameeos_effectnamedb[effect_name]]+commentlines
+        commentlines = [f"{effectnamedb}\n\nUsed by:"] + commentlines
     # If effect isn't used, write it to file and to terminal
     else:
-        commentlines = ["# Not used by any item"]
-        if options.remove:
-            print(("Warning: effect file " + effect_name +
-              " is not used by any item, removing"))
-            os.remove(os.path.join(effects_path, effect_file))
-            continue
-        else:
-            print(("Warning: effect file " + effect_name +
-              " is not used by any item"))
-    # Combine "used by" comment lines and actual effect lines
-    outputlines = commentlines + effectLines
-    # Combine all lines into single string
-    effectcontentsprocessed = "\n".join(outputlines)
-    # If we're not debugging and contents actually changed - write
-    # changes to the file
-    if DEBUG_LEVEL == 0 and (effectcontentsprocessed !=
-                             effectcontentssource):
-        effectfile = open(os.path.join(effects_path, effect_file), 'w')
-        effectfile.write(effectcontentsprocessed)
-        effectfile.close()
+        commentlines = ["Not used by any item"]
+        print(f"Warning: effect {effectid} {effectnamedb} is not used by any item")
+    # Prepare docstring
+    docstring = "\n".join(commentlines)
+    docstring = ['"""'] + docstring.splitlines() + ['"""']
+    docstring = [f'    {l}' if l else '' for l in docstring]
+    # If we're not debugging - write changes to the file
+    if DEBUG_LEVEL == 0:
+        with open(effects_path) as f:
+            data = f.read()
+        lines = data.splitlines()
+        effect_idx = None
+        for lineidx, line in enumerate(lines):
+            if line.startswith(f'class Effect{effectid}('):
+                effect_idx = lineidx
+                docstart_idx = effect_idx + 1
+                # Remove docstring if it's there
+                if lines[docstart_idx].strip() == '"""':
+                    docend_idx = None
+                    for docidx, docline in enumerate(lines[docstart_idx + 1:], start=docstart_idx + 1):
+                        if docline.strip() == '"""':
+                            docend_idx = docidx
+                            break
+                    if docend_idx is not None:
+                        lines = lines[:docstart_idx] + lines[docend_idx + 1:]
+        lines = lines[:effect_idx + 1] + docstring + lines[effect_idx + 1:]
+        with open(effects_path, 'w') as f:
+            f.write('\n'.join(lines))
     elif DEBUG_LEVEL >= 2:
         print("Comment to write to file:")
         print(("\n".join(commentlines)))

From e43cce20a6b2f0944fe74cc65fa05088d460ceb7 Mon Sep 17 00:00:00 2001
From: DarkPhoenix <phoenix@mail.ru>
Date: Fri, 22 Mar 2019 18:04:38 +0300
Subject: [PATCH 16/32] Fix remote hull rep effect

---
 eos/effects.py | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/eos/effects.py b/eos/effects.py
index bce2b1971..9771acc05 100644
--- a/eos/effects.py
+++ b/eos/effects.py
@@ -8969,9 +8969,12 @@ class Effect2967(EffectDef):
                                          'consumptionQuantity', amount * skill.level)
 
 
-class Effect2977(EffectDef):
+class Effect2979(EffectDef):
     """
-    Not used by any item
+    skillRemoteHullRepairSystemsCapNeedBonus
+
+    Used by:
+    Skill: Remote Hull Repair Systems
     """
 
     type = 'passive'

From efd58a80a438c979b71b47321b036112f1bb4bcb Mon Sep 17 00:00:00 2001
From: DarkPhoenix <phoenix@mail.ru>
Date: Fri, 22 Mar 2019 18:26:27 +0300
Subject: [PATCH 17/32] Change script to not write to effect file too much

---
 scripts/effectUsedBy.py | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/scripts/effectUsedBy.py b/scripts/effectUsedBy.py
index af318d264..5f1aa648a 100755
--- a/scripts/effectUsedBy.py
+++ b/scripts/effectUsedBy.py
@@ -1033,29 +1033,35 @@ inner score: {5:.3})"
         commentlines = ["Not used by any item"]
         print(f"Warning: effect {effectid} {effectnamedb} is not used by any item")
     # Prepare docstring
-    docstring = "\n".join(commentlines)
-    docstring = ['"""'] + docstring.splitlines() + ['"""']
-    docstring = [f'    {l}' if l else '' for l in docstring]
+    docstring_new = "\n".join(commentlines)
+    docstring_new = ['"""'] + docstring_new.splitlines() + ['"""']
+    docstring_new = [f'    {l}' if l else '' for l in docstring_new]
     # If we're not debugging - write changes to the file
     if DEBUG_LEVEL == 0:
         with open(effects_path) as f:
             data = f.read()
         lines = data.splitlines()
         effect_idx = None
+        docstart_idx = None
+        docend_idx = None
         for lineidx, line in enumerate(lines):
             if line.startswith(f'class Effect{effectid}('):
                 effect_idx = lineidx
                 docstart_idx = effect_idx + 1
                 # Remove docstring if it's there
                 if lines[docstart_idx].strip() == '"""':
-                    docend_idx = None
                     for docidx, docline in enumerate(lines[docstart_idx + 1:], start=docstart_idx + 1):
                         if docline.strip() == '"""':
                             docend_idx = docidx
                             break
-                    if docend_idx is not None:
-                        lines = lines[:docstart_idx] + lines[docend_idx + 1:]
-        lines = lines[:effect_idx + 1] + docstring + lines[effect_idx + 1:]
+                break
+        if docstart_idx is not None and docend_idx is not None:
+            docstring_old = lines[docstart_idx:docend_idx + 1]
+            if docstring_new == docstring_old:
+                continue
+            else:
+                lines = lines[:docstart_idx] + lines[docend_idx + 1:]
+        lines = lines[:effect_idx + 1] + docstring_new + lines[effect_idx + 1:] + []
         with open(effects_path, 'w') as f:
             f.write('\n'.join(lines))
     elif DEBUG_LEVEL >= 2:

From 37b44befac5ad6015fb48e9889675b701cbaf57f Mon Sep 17 00:00:00 2001
From: DarkPhoenix <phoenix@mail.ru>
Date: Fri, 22 Mar 2019 18:30:41 +0300
Subject: [PATCH 18/32] Add newline to the end of the file

---
 eos/effects.py          | 2 +-
 scripts/effectUsedBy.py | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/eos/effects.py b/eos/effects.py
index 9771acc05..b208a339d 100644
--- a/eos/effects.py
+++ b/eos/effects.py
@@ -35592,4 +35592,4 @@ class Effect7183(EffectDef):
     @staticmethod
     def handler(fit, src, context):
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Warp Scrambler', 'maxRange',
-                                      src.getModifiedItemAttr('warpScrambleRangeBonus'), stackingPenalties=False)
\ No newline at end of file
+                                      src.getModifiedItemAttr('warpScrambleRangeBonus'), stackingPenalties=False)
diff --git a/scripts/effectUsedBy.py b/scripts/effectUsedBy.py
index 5f1aa648a..4f239004b 100755
--- a/scripts/effectUsedBy.py
+++ b/scripts/effectUsedBy.py
@@ -1061,7 +1061,9 @@ inner score: {5:.3})"
                 continue
             else:
                 lines = lines[:docstart_idx] + lines[docend_idx + 1:]
-        lines = lines[:effect_idx + 1] + docstring_new + lines[effect_idx + 1:] + []
+        lines = lines[:effect_idx + 1] + docstring_new + lines[effect_idx + 1:]
+        if lines[-1].strip():
+            lines.append('')
         with open(effects_path, 'w') as f:
             f.write('\n'.join(lines))
     elif DEBUG_LEVEL >= 2:

From 1edaf021dac8631df1bb0e3c6e47d0d17767f336 Mon Sep 17 00:00:00 2001
From: DarkPhoenix <phoenix@mail.ru>
Date: Fri, 22 Mar 2019 19:11:28 +0300
Subject: [PATCH 19/32] Fix booster effects

---
 eos/effects.py | 66 +++++++++++++++++++++++++-------------------------
 1 file changed, 33 insertions(+), 33 deletions(-)

diff --git a/eos/effects.py b/eos/effects.py
index b208a339d..6b9543dcc 100644
--- a/eos/effects.py
+++ b/eos/effects.py
@@ -7724,9 +7724,9 @@ class Effect2735(EffectDef):
     displayName = 'Armor Capacity'
     type = 'boosterSideEffect'
 
-    @staticmethod
-    def handler(fit, booster, context):
-        fit.ship.boostItemAttr('armorHP', booster.getModifiedItemAttr(attr))
+    @classmethod
+    def handler(cls, fit, booster, context):
+        fit.ship.boostItemAttr('armorHP', booster.getModifiedItemAttr(cls.attr))
 
 
 class Effect2736(EffectDef):
@@ -7743,10 +7743,10 @@ class Effect2736(EffectDef):
     displayName = 'Armor Repair Amount'
     type = 'boosterSideEffect'
 
-    @staticmethod
-    def handler(fit, booster, context):
+    @classmethod
+    def handler(cls, fit, booster, context):
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Armor Repair Unit',
-                                      'armorDamageAmount', booster.getModifiedItemAttr(attr))
+                                      'armorDamageAmount', booster.getModifiedItemAttr(cls.attr))
 
 
 class Effect2737(EffectDef):
@@ -7761,9 +7761,9 @@ class Effect2737(EffectDef):
     displayName = 'Shield Capacity'
     type = 'boosterSideEffect'
 
-    @staticmethod
-    def handler(fit, booster, context):
-        fit.ship.boostItemAttr('shieldCapacity', booster.getModifiedItemAttr(attr))
+    @classmethod
+    def handler(cls, fit, booster, context):
+        fit.ship.boostItemAttr('shieldCapacity', booster.getModifiedItemAttr(cls.attr))
 
 
 class Effect2739(EffectDef):
@@ -7780,10 +7780,10 @@ class Effect2739(EffectDef):
     displayName = 'Turret Optimal Range'
     type = 'boosterSideEffect'
 
-    @staticmethod
-    def handler(fit, booster, context):
+    @classmethod
+    def handler(cls, fit, booster, context):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Gunnery'),
-                                      'maxRange', booster.getModifiedItemAttr(attr))
+                                      'maxRange', booster.getModifiedItemAttr(cls.attr))
 
 
 class Effect2741(EffectDef):
@@ -7799,10 +7799,10 @@ class Effect2741(EffectDef):
     displayName = 'Turret Falloff'
     type = 'boosterSideEffect'
 
-    @staticmethod
-    def handler(fit, booster, context):
+    @classmethod
+    def handler(cls, fit, booster, context):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Gunnery'),
-                                      'falloff', booster.getModifiedItemAttr(attr))
+                                      'falloff', booster.getModifiedItemAttr(cls.attr))
 
 
 class Effect2745(EffectDef):
@@ -7818,9 +7818,9 @@ class Effect2745(EffectDef):
     displayName = 'Cap Capacity'
     type = 'boosterSideEffect'
 
-    @staticmethod
-    def handler(fit, booster, context):
-        fit.ship.boostItemAttr('capacitorCapacity', booster.getModifiedItemAttr(attr))
+    @classmethod
+    def handler(cls, fit, booster, context):
+        fit.ship.boostItemAttr('capacitorCapacity', booster.getModifiedItemAttr(cls.attr))
 
 
 class Effect2746(EffectDef):
@@ -7836,9 +7836,9 @@ class Effect2746(EffectDef):
     displayName = 'Velocity'
     type = 'boosterSideEffect'
 
-    @staticmethod
-    def handler(fit, booster, context):
-        fit.ship.boostItemAttr('maxVelocity', booster.getModifiedItemAttr(attr))
+    @classmethod
+    def handler(cls, fit, booster, context):
+        fit.ship.boostItemAttr('maxVelocity', booster.getModifiedItemAttr(cls.attr))
 
 
 class Effect2747(EffectDef):
@@ -7854,10 +7854,10 @@ class Effect2747(EffectDef):
     displayName = 'Turret Tracking'
     type = 'boosterSideEffect'
 
-    @staticmethod
-    def handler(fit, booster, context):
+    @classmethod
+    def handler(cls, fit, booster, context):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Gunnery'),
-                                      'trackingSpeed', booster.getModifiedItemAttr(attr))
+                                      'trackingSpeed', booster.getModifiedItemAttr(cls.attr))
 
 
 class Effect2748(EffectDef):
@@ -7873,10 +7873,10 @@ class Effect2748(EffectDef):
     displayName = 'Missile Velocity'
     type = 'boosterSideEffect'
 
-    @staticmethod
-    def handler(fit, booster, context):
+    @classmethod
+    def handler(cls, fit, booster, context):
         fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Missile Launcher Operation'),
-                                        'maxVelocity', booster.getModifiedItemAttr(attr))
+                                        'maxVelocity', booster.getModifiedItemAttr(cls.attr))
 
 
 class Effect2749(EffectDef):
@@ -7891,10 +7891,10 @@ class Effect2749(EffectDef):
     displayName = 'Missile Explosion Velocity'
     type = 'boosterSideEffect'
 
-    @staticmethod
-    def handler(fit, booster, context):
+    @classmethod
+    def handler(cls, fit, booster, context):
         fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Missile Launcher Operation'),
-                                        'aoeVelocity', booster.getModifiedItemAttr(attr))
+                                        'aoeVelocity', booster.getModifiedItemAttr(cls.attr))
 
 
 class Effect2756(EffectDef):
@@ -8047,10 +8047,10 @@ class Effect2791(EffectDef):
     displayName = 'Missile Explosion Radius'
     type = 'boosterSideEffect'
 
-    @staticmethod
-    def handler(fit, booster, context):
+    @classmethod
+    def handler(cls, fit, booster, context):
         fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Missile Launcher Operation'),
-                                        'aoeCloudSize', booster.getModifiedItemAttr(attr))
+                                        'aoeCloudSize', booster.getModifiedItemAttr(cls.attr))
 
 
 class Effect2792(EffectDef):

From 4fa63aa2bd87c72138661bf4c80bf560f83d4e74 Mon Sep 17 00:00:00 2001
From: DarkPhoenix <phoenix@mail.ru>
Date: Sat, 23 Mar 2019 01:04:55 +0300
Subject: [PATCH 20/32] Add more jargon definition

---
 service/jargon/defaults.yaml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/service/jargon/defaults.yaml b/service/jargon/defaults.yaml
index 761fc8473..19003e753 100644
--- a/service/jargon/defaults.yaml
+++ b/service/jargon/defaults.yaml
@@ -192,6 +192,7 @@ thra: Thermal Dissipation Amplifier
 knra: Kinetic Deflection Amplifier
 emra: EM Ward Amplifier
 exra: Explosive Deflection Amplifier
+panic: Pulse Activated Nexus Invulnerability Core
 
 # Weapon Upgrades
 bcs: Ballistic Control System
@@ -263,6 +264,7 @@ cbst: Capacitor Booster
 sa: Signal Amplifier
 sigamp: Signal Amplifier
 mapc: Micro Auxiliary Power Core
+nsa: Networked Sensor Array
 
 # Ammo/Charges
 am: Antimatter

From 48ac6cb2aff6c023f765cfa0a827f914ae274b1c Mon Sep 17 00:00:00 2001
From: DarkPhoenix <phoenix@mail.ru>
Date: Sat, 23 Mar 2019 14:01:43 +0300
Subject: [PATCH 21/32] Remove debugging prints or move them to pyfalog

---
 config.py                            |  3 ---
 eos/events.py                        |  1 -
 gui/bitmap_loader.py                 |  9 +++++----
 gui/builtinMarketBrowser/itemView.py |  2 +-
 gui/builtinViews/fittingView.py      | 20 +++++---------------
 gui/graphFrame.py                    |  4 ++--
 gui/mainFrame.py                     |  9 +++++----
 gui/utils/exportHtml.py              |  2 +-
 service/esi.py                       |  1 -
 service/fit.py                       |  2 +-
 10 files changed, 20 insertions(+), 33 deletions(-)

diff --git a/config.py b/config.py
index 371adf8e2..6a4e2e95c 100644
--- a/config.py
+++ b/config.py
@@ -171,9 +171,6 @@ def defPaths(customSavePath=None):
     eos.config.saveddata_connectionstring = "sqlite:///" + saveDB + "?check_same_thread=False"
     eos.config.gamedata_connectionstring = "sqlite:///" + gameDB + "?check_same_thread=False"
 
-    print(eos.config.saveddata_connectionstring)
-    print(eos.config.gamedata_connectionstring)
-
     # initialize the settings
     from service.settings import EOSSettings
     eos.config.settings = EOSSettings.getInstance().EOSSettings  # this is kind of confusing, but whatever
diff --git a/eos/events.py b/eos/events.py
index dd4b07b79..7a8ffce18 100644
--- a/eos/events.py
+++ b/eos/events.py
@@ -58,7 +58,6 @@ def rel_listener(target, value, initiator):
     if not target or (isinstance(value, Module) and value.isEmpty):
         return
 
-    print("{} has had a relationship change :D".format(target))
     target.modified = datetime.datetime.now()
 
 
diff --git a/gui/bitmap_loader.py b/gui/bitmap_loader.py
index 042a6674b..09591b32a 100644
--- a/gui/bitmap_loader.py
+++ b/gui/bitmap_loader.py
@@ -27,7 +27,8 @@ from logbook import Logger
 
 import config
 
-logging = Logger(__name__)
+
+pyfalog = Logger(__name__)
 
 
 class BitmapLoader(object):
@@ -38,7 +39,7 @@ class BitmapLoader(object):
     #     logging.info("Using local image files.")
     #     archive = None
 
-    logging.info("Using local image files.")
+    pyfalog.info("Using local image files.")
     archive = None
 
     cached_bitmaps = OrderedDict()
@@ -93,7 +94,7 @@ class BitmapLoader(object):
             filename, img = cls.loadScaledBitmap(name, location, scale)
 
         if img is None:
-            print(("Missing icon file: {0}/{1}".format(location, filename)))
+            pyfalog.warning("Missing icon file: {0}/{1}".format(location, filename))
             return None
 
         bmp: wx.Bitmap = img.ConvertToBitmap()
@@ -130,7 +131,7 @@ class BitmapLoader(object):
                 sbuf = io.StringIO(img_data)
                 return wx.ImageFromStream(sbuf)
             except KeyError:
-                print(("Missing icon file from zip: {0}".format(path)))
+                pyfalog.warning("Missing icon file from zip: {0}".format(path))
         else:
             path = os.path.join(config.pyfaPath, 'imgs' + os.sep + location + os.sep + filename)
 
diff --git a/gui/builtinMarketBrowser/itemView.py b/gui/builtinMarketBrowser/itemView.py
index 258c8800f..97db645d7 100644
--- a/gui/builtinMarketBrowser/itemView.py
+++ b/gui/builtinMarketBrowser/itemView.py
@@ -202,7 +202,7 @@ class ItemView(Display):
             mktgrpid = sMkt.getMarketGroupByItem(item).ID
         except AttributeError:
             mktgrpid = -1
-            print(("unable to find market group for", item.name))
+            pyfalog.warning("unable to find market group for {}".format(item.name))
         parentname = sMkt.getParentItemByItem(item).name
         # Get position of market group
         metagrpid = sMkt.getMetaGroupIdByItem(item)
diff --git a/gui/builtinViews/fittingView.py b/gui/builtinViews/fittingView.py
index 97ba7d8f6..9801f4af0 100644
--- a/gui/builtinViews/fittingView.py
+++ b/gui/builtinViews/fittingView.py
@@ -82,7 +82,7 @@ class FitSpawner(gui.multiSwitch.TabSpawner):
 
             if not isinstance(view, FittingView):
                 view = FittingView(self.multiSwitch)
-                print("###################### Created new view:" + repr(view))
+                pyfalog.debug("###################### Created new view:" + repr(view))
                 self.multiSwitch.ReplaceActivePage(view)
 
             view.fitSelected(event)
@@ -174,8 +174,8 @@ class FittingView(d.Display):
         self.Bind(wx.EVT_MOTION, self.OnMouseMove)
         self.Bind(wx.EVT_LEAVE_WINDOW, self.OnLeaveWindow)
         self.parent.Bind(EVT_NOTEBOOK_PAGE_CHANGED, self.pageChanged)
-        print("------------------ new fitting view -------------------")
-        print(self)
+        pyfalog.debug("------------------ new fitting view -------------------")
+        pyfalog.debug(self)
 
     def OnLeaveWindow(self, event):
         self.SetToolTip(None)
@@ -224,16 +224,7 @@ class FittingView(d.Display):
             wx.PostEvent(self.mainFrame, FitSelected(fitID=fitID))
 
     def Destroy(self):
-        # @todo: when wxPython 4.0.2 is release, https://github.com/pyfa-org/Pyfa/issues/1586#issuecomment-390074915
-        # Make sure to remove the shitty checks that I have to put in place for these handlers to ignore when self is None
-        print("+++++ Destroy " + repr(self))
-
-        # print(self.parent.Unbind(EVT_NOTEBOOK_PAGE_CHANGED))
-        # print(self.mainFrame.Unbind(GE.FIT_CHANGED, handler=self.fitChanged))
-        # print(self.mainFrame.Unbind(EVT_FIT_RENAMED, handler=self.fitRenamed ))
-        # print(self.mainFrame.Unbind(EVT_FIT_REMOVED, handler=self.fitRemoved))
-        # print(self.mainFrame.Unbind(ITEM_SELECTED, handler=self.appendItem))
-
+        pyfalog.debug("+++++ Destroy " + repr(self))
         d.Display.Destroy(self)
 
     def pageChanged(self, event):
@@ -296,7 +287,6 @@ class FittingView(d.Display):
         delete fit caused change in stats (projected)
         todo: move this to the notebook, not the page. We don't want the page being responsible for deleting itself
         """
-        print('_+_+_+_+_+_ Fit Removed: {} {} activeFitID: {}, eventFitID: {}'.format(repr(self), str(bool(self)), self.activeFitID, event.fitID))
         pyfalog.debug("FittingView::fitRemoved")
         if not self:
             event.Skip()
@@ -331,7 +321,7 @@ class FittingView(d.Display):
         event.Skip()
 
     def fitSelected(self, event):
-        print('====== Fit Selected: ' + repr(self) + str(bool(self)))
+        pyfalog.debug('====== Fit Selected: ' + repr(self) + str(bool(self)))
 
         if self.parent.IsActive(self):
             fitID = event.fitID
diff --git a/gui/graphFrame.py b/gui/graphFrame.py
index a36c9c66a..1ea9b86c3 100644
--- a/gui/graphFrame.py
+++ b/gui/graphFrame.py
@@ -93,8 +93,8 @@ class GraphFrame(wx.Frame):
 
         graphFrame_enabled = True
         if int(mpl.__version__[0]) < 1:
-            print(("pyfa: Found matplotlib version ", mpl.__version__, " - activating OVER9000 workarounds"))
-            print("pyfa: Recommended minimum matplotlib version is 1.0.0")
+            pyfalog.warning("pyfa: Found matplotlib version {} - activating OVER9000 workarounds".format(mpl.__version__))
+            pyfalog.warning("pyfa: Recommended minimum matplotlib version is 1.0.0")
             self.legendFix = True
 
         mplImported = True
diff --git a/gui/mainFrame.py b/gui/mainFrame.py
index 3d17f9f65..78126fa80 100644
--- a/gui/mainFrame.py
+++ b/gui/mainFrame.py
@@ -73,17 +73,18 @@ from service.settings import HTMLExportSettings, SettingsProvider
 from service.update import Update
 import gui.fitCommands as cmd
 
+
+pyfalog = Logger(__name__)
+
 disableOverrideEditor = False
 
 try:
     from gui.propertyEditor import AttributeEditor
 except ImportError as e:
     AttributeEditor = None
-    print(("Error loading Attribute Editor: %s.\nAccess to Attribute Editor is disabled." % e.message))
+    pyfalog.warning("Error loading Attribute Editor: %s.\nAccess to Attribute Editor is disabled." % e.message)
     disableOverrideEditor = True
 
-pyfalog = Logger(__name__)
-
 pyfalog.debug("Done loading mainframe imports")
 
 
@@ -421,7 +422,7 @@ class MainFrame(wx.Frame):
                 if '.' not in os.path.basename(path):
                     path += ".xml"
             else:
-                print(("oops, invalid fit format %d" % format_))
+                pyfalog.warning("oops, invalid fit format %d" % format_)
                 try:
                     dlg.Destroy()
                 except RuntimeError:
diff --git a/gui/utils/exportHtml.py b/gui/utils/exportHtml.py
index 608b52396..ab8fa9107 100644
--- a/gui/utils/exportHtml.py
+++ b/gui/utils/exportHtml.py
@@ -68,7 +68,7 @@ class exportHtmlThread(threading.Thread):
             FILE.write(HTML)
             FILE.close()
         except IOError as ex:
-            print(("Failed to write to " + settings.getPath()))
+            pyfalog.warning("Failed to write to " + settings.getPath())
             pass
         except Exception as ex:
             pass
diff --git a/service/esi.py b/service/esi.py
index 88b704664..301af7d53 100644
--- a/service/esi.py
+++ b/service/esi.py
@@ -155,7 +155,6 @@ class Esi(EsiAccess):
                 res.json()
             )
         cdata = res.json()
-        print(cdata)
 
         currentCharacter = self.getSsoCharacter(cdata['CharacterName'])
 
diff --git a/service/fit.py b/service/fit.py
index c02dd7159..d116cd4f1 100644
--- a/service/fit.py
+++ b/service/fit.py
@@ -50,7 +50,7 @@ class DeferRecalc:
 
     def __enter__(self):
         self._recalc = self.sFit.recalc
-        self.sFit.recalc = lambda x: print('Deferred Recalc')
+        self.sFit.recalc = lambda x: pyfalog.debug('Deferred Recalc')
 
     def __exit__(self, *args):
         self.sFit.recalc = self._recalc

From 07d333d3d5b1f950a0f224ddbd43cb2819134d11 Mon Sep 17 00:00:00 2001
From: DarkPhoenix <phoenix@mail.ru>
Date: Sat, 23 Mar 2019 17:46:26 +0300
Subject: [PATCH 22/32] Fix bug with booster side-effects which appeared due to
 sorting them by attribute slot

---
 gui/builtinAdditionPanes/boosterView.py | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/gui/builtinAdditionPanes/boosterView.py b/gui/builtinAdditionPanes/boosterView.py
index eda07eb5e..d90ff1122 100644
--- a/gui/builtinAdditionPanes/boosterView.py
+++ b/gui/builtinAdditionPanes/boosterView.py
@@ -109,9 +109,9 @@ class BoosterView(d.Display):
             return
 
         self.origional = fit.boosters if fit is not None else None
-        self.boosters = stuff = fit.boosters[:] if fit is not None else None
-        if stuff is not None:
-            stuff.sort(key=lambda booster: booster.slot or 0)
+        self.boosters = fit.boosters[:] if fit is not None else None
+        if self.boosters is not None:
+            self.boosters.sort(key=lambda booster: booster.slot or 0)
 
 
         if event.fitID != self.lastFitId:
@@ -124,8 +124,8 @@ class BoosterView(d.Display):
 
             self.deselectItems()
 
-        self.populate(stuff)
-        self.refresh(stuff)
+        self.populate(self.boosters)
+        self.refresh(self.boosters)
         event.Skip()
 
     def addItem(self, event):
@@ -172,8 +172,7 @@ class BoosterView(d.Display):
         sel = self.GetFirstSelected()
         if sel != -1:
             sFit = Fit.getInstance()
-            fit = sFit.getFit(self.mainFrame.getActiveFit())
-            item = fit.boosters[sel]
+            item = self.boosters[sel]
 
             srcContext = "boosterItem"
             itemContext = "Booster"

From b7528d11b2732728b2a021d2715a2d76ae00b328 Mon Sep 17 00:00:00 2001
From: DarkPhoenix <phoenix@mail.ru>
Date: Sat, 23 Mar 2019 17:53:17 +0300
Subject: [PATCH 23/32] Remove fighters from drone sorting

---
 gui/builtinAdditionPanes/boosterView.py | 4 ++--
 gui/builtinAdditionPanes/droneView.py   | 3 +--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/gui/builtinAdditionPanes/boosterView.py b/gui/builtinAdditionPanes/boosterView.py
index d90ff1122..e050d853a 100644
--- a/gui/builtinAdditionPanes/boosterView.py
+++ b/gui/builtinAdditionPanes/boosterView.py
@@ -108,7 +108,7 @@ class BoosterView(d.Display):
             event.Skip()
             return
 
-        self.origional = fit.boosters if fit is not None else None
+        self.original = fit.boosters if fit is not None else None
         self.boosters = fit.boosters[:] if fit is not None else None
         if self.boosters is not None:
             self.boosters.sort(key=lambda booster: booster.slot or 0)
@@ -152,7 +152,7 @@ class BoosterView(d.Display):
 
     def removeBooster(self, booster):
         fitID = self.mainFrame.getActiveFit()
-        self.mainFrame.command.Submit(cmd.GuiRemoveBoosterCommand(fitID, self.origional.index(booster)))
+        self.mainFrame.command.Submit(cmd.GuiRemoveBoosterCommand(fitID, self.original.index(booster)))
 
     def click(self, event):
         event.Skip()
diff --git a/gui/builtinAdditionPanes/droneView.py b/gui/builtinAdditionPanes/droneView.py
index 2918c5aa4..9da438953 100644
--- a/gui/builtinAdditionPanes/droneView.py
+++ b/gui/builtinAdditionPanes/droneView.py
@@ -162,8 +162,7 @@ class DroneView(Display):
             wx.PostEvent(self.mainFrame, GE.FitChanged(fitID=fitID))
 
     DRONE_ORDER = ('Light Scout Drones', 'Medium Scout Drones',
-                   'Heavy Attack Drones', 'Sentry Drones', 'Fighters',
-                   'Fighter Bombers', 'Combat Utility Drones',
+                   'Heavy Attack Drones', 'Sentry Drones', 'Combat Utility Drones',
                    'Electronic Warfare Drones', 'Logistic Drones', 'Mining Drones', 'Salvage Drones')
 
     def droneKey(self, drone):

From caefd4fbbbab5118b6d5387dec9ac84b7b60c28f Mon Sep 17 00:00:00 2001
From: DarkPhoenix <phoenix@mail.ru>
Date: Sat, 23 Mar 2019 18:02:18 +0300
Subject: [PATCH 24/32] Sort fighters by group and name

---
 gui/builtinAdditionPanes/fighterView.py | 28 ++++++++-----------------
 1 file changed, 9 insertions(+), 19 deletions(-)

diff --git a/gui/builtinAdditionPanes/fighterView.py b/gui/builtinAdditionPanes/fighterView.py
index af98a46ed..f9025851b 100644
--- a/gui/builtinAdditionPanes/fighterView.py
+++ b/gui/builtinAdditionPanes/fighterView.py
@@ -220,20 +220,12 @@ class FighterDisplay(d.Display):
     def _merge(src, dst):
         return
 
-    '''
-    DRONE_ORDER = ('Light Scout Drones', 'Medium Scout Drones',
-                   'Heavy Attack Drones', 'Sentry Drones', 'Fighters',
-                   'Fighter Bombers', 'Combat Utility Drones',
-                   'Electronic Warfare Drones', 'Logistic Drones', 'Mining Drones', 'Salvage Drones',
-                   'Light Fighters', 'Heavy Fighters', 'Support Fighters')
-    def droneKey(self, drone):
-        sMkt = Market.getInstance()
+    FIGHTER_ORDER = ('Heavy Fighter', 'Light Fighter', 'Support Fighter')
 
-        groupName = sMkt.getMarketGroupByItem(drone.item).name
-        print groupName
-        return (self.DRONE_ORDER.index(groupName),
-                drone.item.name)
-    '''
+    def fighterKey(self, fighter):
+        sMkt = Market.getInstance()
+        groupName = sMkt.getGroupByItem(fighter.item).name
+        return (self.FIGHTER_ORDER.index(groupName), fighter.item.name)
 
     def fitChanged(self, event):
         sFit = Fit.getInstance()
@@ -249,12 +241,10 @@ class FighterDisplay(d.Display):
             return
 
         self.original = fit.fighters if fit is not None else None
-        self.fighters = stuff = fit.fighters[:] if fit is not None else None
+        self.fighters = fit.fighters[:] if fit is not None else None
 
-        '''
-        if stuff is not None:
-            stuff.sort(key=self.droneKey)
-        '''
+        if self.fighters is not None:
+            self.fighters.sort(key=self.fighterKey)
 
         if event.fitID != self.lastFitId:
             self.lastFitId = event.fitID
@@ -266,7 +256,7 @@ class FighterDisplay(d.Display):
 
             self.deselectItems()
 
-        self.update(stuff)
+        self.update(self.fighters)
         event.Skip()
 
     def addItem(self, event):

From dfa03734979b6d608df72a10859cb0cef76889d0 Mon Sep 17 00:00:00 2001
From: DarkPhoenix <phoenix@mail.ru>
Date: Sat, 23 Mar 2019 18:42:35 +0300
Subject: [PATCH 25/32] Fix fighter abilities and do not rely on effects'
 removed attributes anymore

---
 eos/effects.py                           | 3962 +++++++++++-----------
 eos/gamedata.py                          |   10 +-
 eos/saveddata/boosterSideEffect.py       |    2 +-
 eos/saveddata/fighter.py                 |    6 +-
 eos/saveddata/fighterAbility.py          |    2 +-
 gui/builtinItemStatsViews/itemEffects.py |   22 -
 6 files changed, 1993 insertions(+), 2011 deletions(-)

diff --git a/eos/effects.py b/eos/effects.py
index 6b9543dcc..eff818e59 100644
--- a/eos/effects.py
+++ b/eos/effects.py
@@ -23,14 +23,18 @@ from eos.const import FittingModuleState
 from eos.utils.spoolSupport import SpoolType, SpoolOptions, calculateSpoolup, resolveSpoolOptions
 
 
-class EffectDef:
+class BaseEffect:
 
     @staticmethod
     def handler(fit, module, context, *args, **kwargs):
         pass
 
 
-class Effect4(EffectDef):
+class DummyEffect(BaseEffect):
+    pass
+
+
+class Effect4(BaseEffect):
     """
     shieldBoosting
 
@@ -48,7 +52,7 @@ class Effect4(EffectDef):
         fit.extraAttributes.increase('shieldRepair', amount / speed)
 
 
-class Effect10(EffectDef):
+class Effect10(BaseEffect):
     """
     targetAttack
 
@@ -65,7 +69,7 @@ class Effect10(EffectDef):
         module.reloadTime = 1000
 
 
-class Effect17(EffectDef):
+class Effect17(BaseEffect):
     """
     mining
 
@@ -85,7 +89,7 @@ class Effect17(EffectDef):
             container.multiplyItemAttr('miningAmount', miningDroneAmountPercent / 100)
 
 
-class Effect21(EffectDef):
+class Effect21(BaseEffect):
     """
     shieldCapacityBonusOnline
 
@@ -101,7 +105,7 @@ class Effect21(EffectDef):
         fit.ship.increaseItemAttr('shieldCapacity', module.getModifiedItemAttr('capacityBonus'))
 
 
-class Effect25(EffectDef):
+class Effect25(BaseEffect):
     """
     capacitorCapacityBonus
 
@@ -116,7 +120,7 @@ class Effect25(EffectDef):
         fit.ship.increaseItemAttr('capacitorCapacity', ship.getModifiedItemAttr('capacitorBonus'))
 
 
-class Effect26(EffectDef):
+class Effect26(BaseEffect):
     """
     structureRepair
 
@@ -134,7 +138,7 @@ class Effect26(EffectDef):
         fit.extraAttributes.increase('hullRepair', amount / speed)
 
 
-class Effect27(EffectDef):
+class Effect27(BaseEffect):
     """
     armorRepair
 
@@ -155,7 +159,7 @@ class Effect27(EffectDef):
         fit.extraAttributes.increase('armorRepairFullSpool', rps)
 
 
-class Effect34(EffectDef):
+class Effect34(BaseEffect):
     """
     projectileFired
 
@@ -176,7 +180,7 @@ class Effect34(EffectDef):
             module.reloadTime = rt
 
 
-class Effect38(EffectDef):
+class Effect38(BaseEffect):
     """
     empWave
 
@@ -187,7 +191,7 @@ class Effect38(EffectDef):
     type = 'active'
 
 
-class Effect39(EffectDef):
+class Effect39(BaseEffect):
     """
     warpDisrupt
 
@@ -203,7 +207,7 @@ class Effect39(EffectDef):
             fit.ship.increaseItemAttr('warpScrambleStatus', module.getModifiedItemAttr('warpScrambleStrength'))
 
 
-class Effect48(EffectDef):
+class Effect48(BaseEffect):
     """
     powerBooster
 
@@ -226,7 +230,7 @@ class Effect48(EffectDef):
         module.itemModifiedAttributes['capacitorNeed'] = -capAmount
 
 
-class Effect50(EffectDef):
+class Effect50(BaseEffect):
     """
     modifyShieldRechargeRate
 
@@ -245,7 +249,7 @@ class Effect50(EffectDef):
         fit.ship.multiplyItemAttr('shieldRechargeRate', module.getModifiedItemAttr('shieldRechargeRateMultiplier') or 1)
 
 
-class Effect51(EffectDef):
+class Effect51(BaseEffect):
     """
     modifyPowerRechargeRate
 
@@ -265,7 +269,7 @@ class Effect51(EffectDef):
         fit.ship.multiplyItemAttr('rechargeRate', module.getModifiedItemAttr('capacitorRechargeRateMultiplier'))
 
 
-class Effect55(EffectDef):
+class Effect55(BaseEffect):
     """
     targetHostiles
 
@@ -276,7 +280,7 @@ class Effect55(EffectDef):
     type = 'active'
 
 
-class Effect56(EffectDef):
+class Effect56(BaseEffect):
     """
     powerOutputMultiply
 
@@ -297,7 +301,7 @@ class Effect56(EffectDef):
         fit.ship.multiplyItemAttr('powerOutput', module.getModifiedItemAttr('powerOutputMultiplier', None))
 
 
-class Effect57(EffectDef):
+class Effect57(BaseEffect):
     """
     shieldCapacityMultiply
 
@@ -317,7 +321,7 @@ class Effect57(EffectDef):
         fit.ship.multiplyItemAttr('shieldCapacity', module.getModifiedItemAttr('shieldCapacityMultiplier', None))
 
 
-class Effect58(EffectDef):
+class Effect58(BaseEffect):
     """
     capacitorCapacityMultiply
 
@@ -338,7 +342,7 @@ class Effect58(EffectDef):
         fit.ship.multiplyItemAttr('capacitorCapacity', module.getModifiedItemAttr('capacitorCapacityMultiplier', None))
 
 
-class Effect59(EffectDef):
+class Effect59(BaseEffect):
     """
     cargoCapacityMultiply
 
@@ -355,7 +359,7 @@ class Effect59(EffectDef):
         fit.ship.multiplyItemAttr('capacity', module.getModifiedItemAttr('cargoCapacityMultiplier'))
 
 
-class Effect60(EffectDef):
+class Effect60(BaseEffect):
     """
     structureHPMultiply
 
@@ -371,7 +375,7 @@ class Effect60(EffectDef):
         fit.ship.multiplyItemAttr('hp', module.getModifiedItemAttr('structureHPMultiplier'))
 
 
-class Effect61(EffectDef):
+class Effect61(BaseEffect):
     """
     agilityBonus
 
@@ -386,7 +390,7 @@ class Effect61(EffectDef):
         fit.ship.increaseItemAttr('agility', src.getModifiedItemAttr('agilityBonusAdd'))
 
 
-class Effect63(EffectDef):
+class Effect63(BaseEffect):
     """
     armorHPMultiply
 
@@ -402,7 +406,7 @@ class Effect63(EffectDef):
         fit.ship.multiplyItemAttr('armorHP', module.getModifiedItemAttr('armorHPMultiplier'))
 
 
-class Effect67(EffectDef):
+class Effect67(BaseEffect):
     """
     miningLaser
 
@@ -421,7 +425,7 @@ class Effect67(EffectDef):
         module.reloadTime = 1000
 
 
-class Effect89(EffectDef):
+class Effect89(BaseEffect):
     """
     projectileWeaponSpeedMultiply
 
@@ -438,7 +442,7 @@ class Effect89(EffectDef):
                                          stackingPenalties=True)
 
 
-class Effect91(EffectDef):
+class Effect91(BaseEffect):
     """
     energyWeaponDamageMultiply
 
@@ -455,7 +459,7 @@ class Effect91(EffectDef):
                                          stackingPenalties=True)
 
 
-class Effect92(EffectDef):
+class Effect92(BaseEffect):
     """
     projectileWeaponDamageMultiply
 
@@ -472,7 +476,7 @@ class Effect92(EffectDef):
                                          stackingPenalties=True)
 
 
-class Effect93(EffectDef):
+class Effect93(BaseEffect):
     """
     hybridWeaponDamageMultiply
 
@@ -489,7 +493,7 @@ class Effect93(EffectDef):
                                          stackingPenalties=True)
 
 
-class Effect95(EffectDef):
+class Effect95(BaseEffect):
     """
     energyWeaponSpeedMultiply
 
@@ -506,7 +510,7 @@ class Effect95(EffectDef):
                                          stackingPenalties=True)
 
 
-class Effect96(EffectDef):
+class Effect96(BaseEffect):
     """
     hybridWeaponSpeedMultiply
 
@@ -523,7 +527,7 @@ class Effect96(EffectDef):
                                          stackingPenalties=True)
 
 
-class Effect101(EffectDef):
+class Effect101(BaseEffect):
     """
     useMissiles
 
@@ -561,7 +565,7 @@ class Effect101(EffectDef):
                     fit.ecmProjectedStr *= strModifier
 
 
-class Effect118(EffectDef):
+class Effect118(BaseEffect):
     """
     electronicAttributeModifyOnline
 
@@ -576,7 +580,7 @@ class Effect118(EffectDef):
         fit.ship.increaseItemAttr('maxLockedTargets', module.getModifiedItemAttr('maxLockedTargetsBonus'))
 
 
-class Effect157(EffectDef):
+class Effect157(BaseEffect):
     """
     largeHybridTurretDamageMultiplierBonusPostPercentDamageMultiplierLocationShipModulesRequiringLargeHybridTurret
 
@@ -594,7 +598,7 @@ class Effect157(EffectDef):
                                       'damageMultiplier', container.getModifiedItemAttr('damageMultiplierBonus') * level)
 
 
-class Effect159(EffectDef):
+class Effect159(BaseEffect):
     """
     mediumEnergyTurretDamageMultiplierBonusPostPercentDamageMultiplierLocationShipModulesRequiringMediumEnergyTurret
 
@@ -612,7 +616,7 @@ class Effect159(EffectDef):
                                       'damageMultiplier', container.getModifiedItemAttr('damageMultiplierBonus') * level)
 
 
-class Effect160(EffectDef):
+class Effect160(BaseEffect):
     """
     mediumHybridTurretDamageMultiplierBonusPostPercentDamageMultiplierLocationShipModulesRequiringMediumHybridTurret
 
@@ -630,7 +634,7 @@ class Effect160(EffectDef):
                                       'damageMultiplier', container.getModifiedItemAttr('damageMultiplierBonus') * level)
 
 
-class Effect161(EffectDef):
+class Effect161(BaseEffect):
     """
     mediumProjectileTurretDamageMultiplierBonusPostPercentDamageMultiplierLocationShipModulesRequiringMediumProjectileTurret
 
@@ -648,7 +652,7 @@ class Effect161(EffectDef):
                                       'damageMultiplier', container.getModifiedItemAttr('damageMultiplierBonus') * level)
 
 
-class Effect162(EffectDef):
+class Effect162(BaseEffect):
     """
     largeEnergyTurretDamageMultiplierBonusPostPercentDamageMultiplierLocationShipModulesRequiringLargeEnergyTurret
 
@@ -667,7 +671,7 @@ class Effect162(EffectDef):
                                       'damageMultiplier', container.getModifiedItemAttr('damageMultiplierBonus') * level)
 
 
-class Effect172(EffectDef):
+class Effect172(BaseEffect):
     """
     smallEnergyTurretDamageMultiplierBonusPostPercentDamageMultiplierLocationShipModulesRequiringSmallEnergyTurret
 
@@ -685,7 +689,7 @@ class Effect172(EffectDef):
                                       'damageMultiplier', container.getModifiedItemAttr('damageMultiplierBonus') * level)
 
 
-class Effect173(EffectDef):
+class Effect173(BaseEffect):
     """
     smallHybridTurretDamageMultiplierBonusPostPercentDamageMultiplierLocationShipModulesRequiringSmallHybridTurret
 
@@ -703,7 +707,7 @@ class Effect173(EffectDef):
                                       'damageMultiplier', container.getModifiedItemAttr('damageMultiplierBonus') * level)
 
 
-class Effect174(EffectDef):
+class Effect174(BaseEffect):
     """
     smallProjectileTurretDamageMultiplierBonusPostPercentDamageMultiplierLocationShipModulesRequiringSmallProjectileTurret
 
@@ -721,7 +725,7 @@ class Effect174(EffectDef):
                                       'damageMultiplier', container.getModifiedItemAttr('damageMultiplierBonus') * level)
 
 
-class Effect212(EffectDef):
+class Effect212(BaseEffect):
     """
     sensorUpgradesCpuNeedBonusPostPercentCpuLocationShipModulesRequiringSensorUpgrades
 
@@ -740,7 +744,7 @@ class Effect212(EffectDef):
                                       'cpu', container.getModifiedItemAttr('cpuNeedBonus') * level)
 
 
-class Effect214(EffectDef):
+class Effect214(BaseEffect):
     """
     targetingMaxTargetBonusModAddMaxLockedTargetsLocationChar
 
@@ -756,7 +760,7 @@ class Effect214(EffectDef):
         fit.extraAttributes.increase('maxTargetsLockedFromSkills', amount)
 
 
-class Effect223(EffectDef):
+class Effect223(BaseEffect):
     """
     navigationVelocityBonusPostPercentMaxVelocityLocationShip
 
@@ -772,7 +776,7 @@ class Effect223(EffectDef):
         fit.ship.boostItemAttr('maxVelocity', implant.getModifiedItemAttr('velocityBonus'))
 
 
-class Effect227(EffectDef):
+class Effect227(BaseEffect):
     """
     accerationControlCapNeedBonusPostPercentCapacitorNeedLocationShipGroupAfterburner
 
@@ -788,7 +792,7 @@ class Effect227(EffectDef):
                                       'capacitorNeed', container.getModifiedItemAttr('capNeedBonus'))
 
 
-class Effect230(EffectDef):
+class Effect230(BaseEffect):
     """
     afterburnerDurationBonusPostPercentDurationLocationShipModulesRequiringAfterburner
 
@@ -807,7 +811,7 @@ class Effect230(EffectDef):
                                       'duration', container.getModifiedItemAttr('durationBonus') * level)
 
 
-class Effect235(EffectDef):
+class Effect235(BaseEffect):
     """
     warpdriveoperationWarpCapacitorNeedBonusPostPercentWarpCapacitorNeedLocationShip
 
@@ -822,7 +826,7 @@ class Effect235(EffectDef):
         fit.ship.boostItemAttr('warpCapacitorNeed', implant.getModifiedItemAttr('warpCapacitorNeedBonus'))
 
 
-class Effect242(EffectDef):
+class Effect242(BaseEffect):
     """
     accerationControlSpeedFBonusPostPercentSpeedFactorLocationShipGroupAfterburner
 
@@ -838,7 +842,7 @@ class Effect242(EffectDef):
                                       'speedFactor', implant.getModifiedItemAttr('speedFBonus'))
 
 
-class Effect244(EffectDef):
+class Effect244(BaseEffect):
     """
     highSpeedManuveringCapacitorNeedMultiplierPostPercentCapacitorNeedLocationShipModulesRequiringHighSpeedManuvering
 
@@ -856,7 +860,7 @@ class Effect244(EffectDef):
                                       'capacitorNeed', container.getModifiedItemAttr('capNeedBonus') * level)
 
 
-class Effect271(EffectDef):
+class Effect271(BaseEffect):
     """
     hullUpgradesArmorHpBonusPostPercentHpLocationShip
 
@@ -876,7 +880,7 @@ class Effect271(EffectDef):
         fit.ship.boostItemAttr('armorHP', (container.getModifiedItemAttr('armorHpBonus') or 0) * level)
 
 
-class Effect272(EffectDef):
+class Effect272(BaseEffect):
     """
     repairSystemsDurationBonusPostPercentDurationLocationShipModulesRequiringRepairSystems
 
@@ -896,7 +900,7 @@ class Effect272(EffectDef):
                                       'duration', container.getModifiedItemAttr('durationSkillBonus') * level)
 
 
-class Effect273(EffectDef):
+class Effect273(BaseEffect):
     """
     shieldUpgradesPowerNeedBonusPostPercentPowerLocationShipModulesRequiringShieldUpgrades
 
@@ -915,7 +919,7 @@ class Effect273(EffectDef):
                                       'power', container.getModifiedItemAttr('powerNeedBonus') * level)
 
 
-class Effect277(EffectDef):
+class Effect277(BaseEffect):
     """
     tacticalshieldManipulationSkillBoostUniformityBonus
 
@@ -930,7 +934,7 @@ class Effect277(EffectDef):
         fit.ship.increaseItemAttr('shieldUniformity', skill.getModifiedItemAttr('uniformityBonus') * skill.level)
 
 
-class Effect279(EffectDef):
+class Effect279(BaseEffect):
     """
     shieldEmmisionSystemsCapNeedBonusPostPercentCapacitorNeedLocationShipModulesRequiringShieldEmmisionSystems
 
@@ -948,7 +952,7 @@ class Effect279(EffectDef):
                                       'capacitorNeed', container.getModifiedItemAttr('capNeedBonus') * level)
 
 
-class Effect287(EffectDef):
+class Effect287(BaseEffect):
     """
     controlledBurstsCapNeedBonusPostPercentCapacitorNeedLocationShipModulesRequiringGunnery
 
@@ -966,7 +970,7 @@ class Effect287(EffectDef):
                                       'capacitorNeed', container.getModifiedItemAttr('capNeedBonus') * level)
 
 
-class Effect290(EffectDef):
+class Effect290(BaseEffect):
     """
     sharpshooterRangeSkillBonusPostPercentMaxRangeLocationShipModulesRequiringGunnery
 
@@ -985,7 +989,7 @@ class Effect290(EffectDef):
                                       'maxRange', container.getModifiedItemAttr('rangeSkillBonus') * level)
 
 
-class Effect298(EffectDef):
+class Effect298(BaseEffect):
     """
     surgicalStrikeFalloffBonusPostPercentFalloffLocationShipModulesRequiringGunnery
 
@@ -1004,7 +1008,7 @@ class Effect298(EffectDef):
                                       'falloff', container.getModifiedItemAttr('falloffBonus') * level)
 
 
-class Effect315(EffectDef):
+class Effect315(BaseEffect):
     """
     dronesSkillBoostMaxActiveDroneBonus
 
@@ -1020,7 +1024,7 @@ class Effect315(EffectDef):
         fit.extraAttributes.increase('maxActiveDrones', amount)
 
 
-class Effect391(EffectDef):
+class Effect391(BaseEffect):
     """
     astrogeologyMiningAmountBonusPostPercentMiningAmountLocationShipModulesRequiringMining
 
@@ -1040,7 +1044,7 @@ class Effect391(EffectDef):
                                       'miningAmount', container.getModifiedItemAttr('miningAmountBonus') * level)
 
 
-class Effect392(EffectDef):
+class Effect392(BaseEffect):
     """
     mechanicHullHpBonusPostPercentHpShip
 
@@ -1058,7 +1062,7 @@ class Effect392(EffectDef):
         fit.ship.boostItemAttr('hp', container.getModifiedItemAttr('hullHpBonus') * level)
 
 
-class Effect394(EffectDef):
+class Effect394(BaseEffect):
     """
     navigationVelocityBonusPostPercentMaxVelocityShip
 
@@ -1081,7 +1085,7 @@ class Effect394(EffectDef):
                                stackingPenalties='skill' not in context and 'implant' not in context and 'booster' not in context)
 
 
-class Effect395(EffectDef):
+class Effect395(BaseEffect):
     """
     evasiveManeuveringAgilityBonusPostPercentAgilityShip
 
@@ -1104,7 +1108,7 @@ class Effect395(EffectDef):
                                stackingPenalties='skill' not in context and 'implant' not in context)
 
 
-class Effect396(EffectDef):
+class Effect396(BaseEffect):
     """
     energyGridUpgradesCpuNeedBonusPostPercentCpuLocationShipModulesRequiringEnergyGridUpgrades
 
@@ -1123,7 +1127,7 @@ class Effect396(EffectDef):
                                       'cpu', container.getModifiedItemAttr('cpuNeedBonus') * level)
 
 
-class Effect397(EffectDef):
+class Effect397(BaseEffect):
     """
     electronicsCpuOutputBonusPostPercentCpuOutputLocationShipGroupComputer
 
@@ -1143,7 +1147,7 @@ class Effect397(EffectDef):
         fit.ship.boostItemAttr('cpuOutput', container.getModifiedItemAttr('cpuOutputBonus2') * level)
 
 
-class Effect408(EffectDef):
+class Effect408(BaseEffect):
     """
     largeProjectileTurretDamageMultiplierBonusPostPercentDamageMultiplierLocationShipModulesRequiringLargeProjectileTurret
 
@@ -1161,7 +1165,7 @@ class Effect408(EffectDef):
                                       'damageMultiplier', container.getModifiedItemAttr('damageMultiplierBonus') * level)
 
 
-class Effect414(EffectDef):
+class Effect414(BaseEffect):
     """
     gunneryTurretSpeeBonusPostPercentSpeedLocationShipModulesRequiringGunnery
 
@@ -1180,7 +1184,7 @@ class Effect414(EffectDef):
                                       'speed', container.getModifiedItemAttr('turretSpeeBonus') * level)
 
 
-class Effect446(EffectDef):
+class Effect446(BaseEffect):
     """
     shieldManagementShieldCapacityBonusPostPercentCapacityLocationShipGroupShield
 
@@ -1200,7 +1204,7 @@ class Effect446(EffectDef):
         fit.ship.boostItemAttr('shieldCapacity', container.getModifiedItemAttr('shieldCapacityBonus') * level)
 
 
-class Effect485(EffectDef):
+class Effect485(BaseEffect):
     """
     energysystemsoperationCapRechargeBonusPostPercentRechargeRateLocationShipGroupCapacitor
 
@@ -1219,7 +1223,7 @@ class Effect485(EffectDef):
         fit.ship.boostItemAttr('rechargeRate', container.getModifiedItemAttr('capRechargeBonus') * level)
 
 
-class Effect486(EffectDef):
+class Effect486(BaseEffect):
     """
     shieldOperationRechargeratebonusPostPercentRechargeRateLocationShipGroupShield
 
@@ -1238,7 +1242,7 @@ class Effect486(EffectDef):
         fit.ship.boostItemAttr('shieldRechargeRate', container.getModifiedItemAttr('rechargeratebonus') * level)
 
 
-class Effect490(EffectDef):
+class Effect490(BaseEffect):
     """
     engineeringPowerEngineeringOutputBonusPostPercentPowerOutputLocationShipGroupPowerCore
 
@@ -1258,7 +1262,7 @@ class Effect490(EffectDef):
         fit.ship.boostItemAttr('powerOutput', container.getModifiedItemAttr('powerEngineeringOutputBonus') * level)
 
 
-class Effect494(EffectDef):
+class Effect494(BaseEffect):
     """
     warpDriveOperationWarpCapacitorNeedBonusPostPercentWarpCapacitorNeedLocationShipGroupPropulsion
 
@@ -1276,7 +1280,7 @@ class Effect494(EffectDef):
                                stackingPenalties='skill' not in context)
 
 
-class Effect504(EffectDef):
+class Effect504(BaseEffect):
     """
     scoutDroneOperationDroneRangeBonusModAddDroneControlDistanceChar
 
@@ -1294,7 +1298,7 @@ class Effect504(EffectDef):
         fit.extraAttributes.increase('droneControlRange', amount)
 
 
-class Effect506(EffectDef):
+class Effect506(BaseEffect):
     """
     fuelConservationCapNeedBonusPostPercentCapacitorNeedLocationShipModulesRequiringAfterburner
 
@@ -1311,7 +1315,7 @@ class Effect506(EffectDef):
                                       'capacitorNeed', skill.getModifiedItemAttr('capNeedBonus') * skill.level)
 
 
-class Effect507(EffectDef):
+class Effect507(BaseEffect):
     """
     longRangeTargetingMaxTargetRangeBonusPostPercentMaxTargetRangeLocationShipGroupElectronic
 
@@ -1328,7 +1332,7 @@ class Effect507(EffectDef):
         fit.ship.boostItemAttr('maxTargetRange', container.getModifiedItemAttr('maxTargetRangeBonus') * level)
 
 
-class Effect508(EffectDef):
+class Effect508(BaseEffect):
     """
     shipPDmgBonusMF
 
@@ -1350,7 +1354,7 @@ class Effect508(EffectDef):
                                       'damageMultiplier', ship.getModifiedItemAttr('shipBonusMF'), skill='Minmatar Frigate')
 
 
-class Effect511(EffectDef):
+class Effect511(BaseEffect):
     """
     shipEnergyTCapNeedBonusAF
 
@@ -1372,7 +1376,7 @@ class Effect511(EffectDef):
                                       'capacitorNeed', ship.getModifiedItemAttr('shipBonus2AF'), skill='Amarr Frigate')
 
 
-class Effect512(EffectDef):
+class Effect512(BaseEffect):
     """
     shipSHTDmgBonusGF
 
@@ -1393,7 +1397,7 @@ class Effect512(EffectDef):
                                       'damageMultiplier', ship.getModifiedItemAttr('shipBonusGF'), skill='Gallente Frigate')
 
 
-class Effect514(EffectDef):
+class Effect514(BaseEffect):
     """
     shipSETDmgBonusAF
 
@@ -1412,7 +1416,7 @@ class Effect514(EffectDef):
                                       'damageMultiplier', ship.getModifiedItemAttr('shipBonusAF'), skill='Amarr Frigate')
 
 
-class Effect516(EffectDef):
+class Effect516(BaseEffect):
     """
     shipTCapNeedBonusAC
 
@@ -1430,7 +1434,7 @@ class Effect516(EffectDef):
                                       'capacitorNeed', ship.getModifiedItemAttr('shipBonusAC'), skill='Amarr Cruiser')
 
 
-class Effect521(EffectDef):
+class Effect521(BaseEffect):
     """
     shipHRangeBonusCC
 
@@ -1446,7 +1450,7 @@ class Effect521(EffectDef):
                                       'maxRange', ship.getModifiedItemAttr('shipBonusCC'), skill='Caldari Cruiser')
 
 
-class Effect527(EffectDef):
+class Effect527(BaseEffect):
     """
     shipVelocityBonusMI
 
@@ -1463,7 +1467,7 @@ class Effect527(EffectDef):
         fit.ship.boostItemAttr('maxVelocity', ship.getModifiedItemAttr('shipBonusMI'), skill='Minmatar Industrial')
 
 
-class Effect529(EffectDef):
+class Effect529(BaseEffect):
     """
     shipCargoBonusAI
 
@@ -1479,7 +1483,7 @@ class Effect529(EffectDef):
         fit.ship.boostItemAttr('capacity', ship.getModifiedItemAttr('shipBonusAI'), skill='Amarr Industrial')
 
 
-class Effect536(EffectDef):
+class Effect536(BaseEffect):
     """
     cpuMultiplierPostMulCpuOutputShip
 
@@ -1495,7 +1499,7 @@ class Effect536(EffectDef):
         fit.ship.multiplyItemAttr('cpuOutput', module.getModifiedItemAttr('cpuMultiplier'))
 
 
-class Effect542(EffectDef):
+class Effect542(BaseEffect):
     """
     shipCapNeedBonusAB
 
@@ -1512,7 +1516,7 @@ class Effect542(EffectDef):
                                       'capacitorNeed', ship.getModifiedItemAttr('shipBonusAB'), skill='Amarr Battleship')
 
 
-class Effect549(EffectDef):
+class Effect549(BaseEffect):
     """
     shipPTDmgBonusMB
 
@@ -1531,7 +1535,7 @@ class Effect549(EffectDef):
                                       skill='Minmatar Battleship')
 
 
-class Effect550(EffectDef):
+class Effect550(BaseEffect):
     """
     shipHTDmgBonusGB
 
@@ -1553,7 +1557,7 @@ class Effect550(EffectDef):
                                       skill='Gallente Battleship')
 
 
-class Effect553(EffectDef):
+class Effect553(BaseEffect):
     """
     shipHTTrackingBonusGB
 
@@ -1569,7 +1573,7 @@ class Effect553(EffectDef):
                                       'trackingSpeed', ship.getModifiedItemAttr('shipBonusGB'), skill='Gallente Battleship')
 
 
-class Effect562(EffectDef):
+class Effect562(BaseEffect):
     """
     shipHTDmgBonusfixedGC
 
@@ -1592,7 +1596,7 @@ class Effect562(EffectDef):
                                       'damageMultiplier', ship.getModifiedItemAttr('shipBonusGC'), skill='Gallente Cruiser')
 
 
-class Effect581(EffectDef):
+class Effect581(BaseEffect):
     """
     weaponUpgradesCpuNeedBonusPostPercentCpuLocationShipModulesRequiringGunnery
 
@@ -1610,7 +1614,7 @@ class Effect581(EffectDef):
                                       'cpu', container.getModifiedItemAttr('cpuNeedBonus') * level)
 
 
-class Effect582(EffectDef):
+class Effect582(BaseEffect):
     """
     rapidFiringRofBonusPostPercentSpeedLocationShipModulesRequiringGunnery
 
@@ -1626,7 +1630,7 @@ class Effect582(EffectDef):
                                       'speed', skill.getModifiedItemAttr('rofBonus') * skill.level)
 
 
-class Effect584(EffectDef):
+class Effect584(BaseEffect):
     """
     surgicalStrikeDamageMultiplierBonusPostPercentDamageMultiplierLocationShipModulesRequiringGunnery
 
@@ -1644,7 +1648,7 @@ class Effect584(EffectDef):
                                       'damageMultiplier', implant.getModifiedItemAttr('damageMultiplierBonus'))
 
 
-class Effect587(EffectDef):
+class Effect587(BaseEffect):
     """
     surgicalStrikeDamageMultiplierBonusPostPercentDamageMultiplierLocationShipGroupEnergyWeapon
 
@@ -1660,7 +1664,7 @@ class Effect587(EffectDef):
                                       'damageMultiplier', skill.getModifiedItemAttr('damageMultiplierBonus') * skill.level)
 
 
-class Effect588(EffectDef):
+class Effect588(BaseEffect):
     """
     surgicalStrikeDamageMultiplierBonusPostPercentDamageMultiplierLocationShipGroupProjectileWeapon
 
@@ -1676,7 +1680,7 @@ class Effect588(EffectDef):
                                       'damageMultiplier', skill.getModifiedItemAttr('damageMultiplierBonus') * skill.level)
 
 
-class Effect589(EffectDef):
+class Effect589(BaseEffect):
     """
     surgicalStrikeDamageMultiplierBonusPostPercentDamageMultiplierLocationShipGroupHybridWeapon
 
@@ -1692,7 +1696,7 @@ class Effect589(EffectDef):
                                       'damageMultiplier', skill.getModifiedItemAttr('damageMultiplierBonus') * skill.level)
 
 
-class Effect590(EffectDef):
+class Effect590(BaseEffect):
     """
     energyPulseWeaponsDurationBonusPostPercentDurationLocationShipModulesRequiringEnergyPulseWeapons
 
@@ -1710,7 +1714,7 @@ class Effect590(EffectDef):
                                       'duration', container.getModifiedItemAttr('durationBonus') * level)
 
 
-class Effect596(EffectDef):
+class Effect596(BaseEffect):
     """
     ammoInfluenceRange
 
@@ -1725,7 +1729,7 @@ class Effect596(EffectDef):
         module.multiplyItemAttr('maxRange', module.getModifiedChargeAttr('weaponRangeMultiplier'))
 
 
-class Effect598(EffectDef):
+class Effect598(BaseEffect):
     """
     ammoSpeedMultiplier
 
@@ -1742,7 +1746,7 @@ class Effect598(EffectDef):
         module.multiplyItemAttr('speed', module.getModifiedChargeAttr('speedMultiplier') or 1)
 
 
-class Effect599(EffectDef):
+class Effect599(BaseEffect):
     """
     ammoFallofMultiplier
 
@@ -1762,7 +1766,7 @@ class Effect599(EffectDef):
         module.multiplyItemAttr('falloff', module.getModifiedChargeAttr('fallofMultiplier') or 1)
 
 
-class Effect600(EffectDef):
+class Effect600(BaseEffect):
     """
     ammoTrackingMultiplier
 
@@ -1778,7 +1782,7 @@ class Effect600(EffectDef):
         module.multiplyItemAttr('trackingSpeed', module.getModifiedChargeAttr('trackingSpeedMultiplier'))
 
 
-class Effect602(EffectDef):
+class Effect602(BaseEffect):
     """
     shipPTurretSpeedBonusMC
 
@@ -1798,7 +1802,7 @@ class Effect602(EffectDef):
                                       'speed', ship.getModifiedItemAttr('shipBonusMC'), skill='Minmatar Cruiser')
 
 
-class Effect604(EffectDef):
+class Effect604(BaseEffect):
     """
     shipPTspeedBonusMB2
 
@@ -1818,7 +1822,7 @@ class Effect604(EffectDef):
                                       'speed', ship.getModifiedItemAttr('shipBonusMB2'), skill='Minmatar Battleship')
 
 
-class Effect607(EffectDef):
+class Effect607(BaseEffect):
     """
     cloaking
 
@@ -1839,7 +1843,7 @@ class Effect607(EffectDef):
         fit.ship.multiplyItemAttr('maxVelocity', module.getModifiedItemAttr('maxVelocityModifier'))
 
 
-class Effect623(EffectDef):
+class Effect623(BaseEffect):
     """
     miningDroneOperationMiningAmountBonusPostPercentMiningDroneAmountPercentChar
 
@@ -1858,7 +1862,7 @@ class Effect623(EffectDef):
                                      container.getModifiedItemAttr('miningAmountBonus') * level)
 
 
-class Effect627(EffectDef):
+class Effect627(BaseEffect):
     """
     powerIncrease
 
@@ -1873,7 +1877,7 @@ class Effect627(EffectDef):
         fit.ship.increaseItemAttr('powerOutput', module.getModifiedItemAttr('powerIncrease'))
 
 
-class Effect657(EffectDef):
+class Effect657(BaseEffect):
     """
     agilityMultiplierEffect
 
@@ -1892,7 +1896,7 @@ class Effect657(EffectDef):
                                stackingPenalties=True)
 
 
-class Effect660(EffectDef):
+class Effect660(BaseEffect):
     """
     missileEMDmgBonus
 
@@ -1910,7 +1914,7 @@ class Effect660(EffectDef):
                                         'emDamage', skill.getModifiedItemAttr('damageMultiplierBonus') * skill.level)
 
 
-class Effect661(EffectDef):
+class Effect661(BaseEffect):
     """
     missileExplosiveDmgBonus
 
@@ -1928,7 +1932,7 @@ class Effect661(EffectDef):
                                         'explosiveDamage', skill.getModifiedItemAttr('damageMultiplierBonus') * skill.level)
 
 
-class Effect662(EffectDef):
+class Effect662(BaseEffect):
     """
     missileThermalDmgBonus
 
@@ -1946,7 +1950,7 @@ class Effect662(EffectDef):
                                         'thermalDamage', skill.getModifiedItemAttr('damageMultiplierBonus') * skill.level)
 
 
-class Effect668(EffectDef):
+class Effect668(BaseEffect):
     """
     missileKineticDmgBonus2
 
@@ -1964,7 +1968,7 @@ class Effect668(EffectDef):
                                         'kineticDamage', skill.getModifiedItemAttr('damageMultiplierBonus') * skill.level)
 
 
-class Effect670(EffectDef):
+class Effect670(BaseEffect):
     """
     antiWarpScramblingPassive
 
@@ -1979,7 +1983,7 @@ class Effect670(EffectDef):
         fit.ship.increaseItemAttr('warpScrambleStatus', module.getModifiedItemAttr('warpScrambleStrength'))
 
 
-class Effect675(EffectDef):
+class Effect675(BaseEffect):
     """
     weaponUpgradesCpuNeedBonusPostPercentCpuLocationShipModulesRequiringEnergyPulseWeapons
 
@@ -1995,7 +1999,7 @@ class Effect675(EffectDef):
                                       'cpu', skill.getModifiedItemAttr('cpuNeedBonus') * skill.level)
 
 
-class Effect677(EffectDef):
+class Effect677(BaseEffect):
     """
     weaponUpgradesCpuNeedBonusPostPercentCpuLocationShipModulesRequiringMissileLauncherOperation
 
@@ -2013,7 +2017,7 @@ class Effect677(EffectDef):
                                       'cpu', container.getModifiedItemAttr('cpuNeedBonus') * level)
 
 
-class Effect699(EffectDef):
+class Effect699(BaseEffect):
     """
     signatureAnalysisScanResolutionBonusPostPercentScanResolutionShip
 
@@ -2034,7 +2038,7 @@ class Effect699(EffectDef):
                                stackingPenalties=penalized)
 
 
-class Effect706(EffectDef):
+class Effect706(BaseEffect):
     """
     covertOpsWarpResistance
 
@@ -2049,7 +2053,7 @@ class Effect706(EffectDef):
         fit.ship.increaseItemAttr('warpFactor', src.getModifiedItemAttr('eliteBonusCovertOps1'), skill='Covert Ops')
 
 
-class Effect726(EffectDef):
+class Effect726(BaseEffect):
     """
     shipBonusCargo2GI
 
@@ -2072,7 +2076,7 @@ class Effect726(EffectDef):
         fit.ship.boostItemAttr('capacity', ship.getModifiedItemAttr(bonusAttr), skill='Gallente Industrial')
 
 
-class Effect727(EffectDef):
+class Effect727(BaseEffect):
     """
     shipBonusCargoCI
 
@@ -2088,7 +2092,7 @@ class Effect727(EffectDef):
         fit.ship.boostItemAttr('capacity', ship.getModifiedItemAttr('shipBonusCI'), skill='Caldari Industrial')
 
 
-class Effect728(EffectDef):
+class Effect728(BaseEffect):
     """
     shipBonusCargoMI
 
@@ -2104,7 +2108,7 @@ class Effect728(EffectDef):
         fit.ship.boostItemAttr('capacity', ship.getModifiedItemAttr('shipBonusMI'), skill='Minmatar Industrial')
 
 
-class Effect729(EffectDef):
+class Effect729(BaseEffect):
     """
     shipBonusVelocityGI
 
@@ -2129,7 +2133,7 @@ class Effect729(EffectDef):
         fit.ship.boostItemAttr('maxVelocity', ship.getModifiedItemAttr(bonusAttr), skill='Gallente Industrial')
 
 
-class Effect730(EffectDef):
+class Effect730(BaseEffect):
     """
     shipBonusVelocityCI
 
@@ -2145,7 +2149,7 @@ class Effect730(EffectDef):
         fit.ship.boostItemAttr('maxVelocity', ship.getModifiedItemAttr('shipBonusCI'), skill='Caldari Industrial')
 
 
-class Effect732(EffectDef):
+class Effect732(BaseEffect):
     """
     shipVelocityBonusAI
 
@@ -2161,7 +2165,7 @@ class Effect732(EffectDef):
         fit.ship.boostItemAttr('maxVelocity', ship.getModifiedItemAttr('shipBonusAI'), skill='Amarr Industrial')
 
 
-class Effect736(EffectDef):
+class Effect736(BaseEffect):
     """
     shipBonusCapCapAB
 
@@ -2177,7 +2181,7 @@ class Effect736(EffectDef):
         fit.ship.boostItemAttr('capacitorCapacity', ship.getModifiedItemAttr('shipBonusAB2'), skill='Amarr Battleship')
 
 
-class Effect744(EffectDef):
+class Effect744(BaseEffect):
     """
     surveyScanspeedBonusPostPercentDurationLocationShipModulesRequiringElectronics
 
@@ -2195,7 +2199,7 @@ class Effect744(EffectDef):
                                       'duration', container.getModifiedItemAttr('scanspeedBonus') * level)
 
 
-class Effect754(EffectDef):
+class Effect754(BaseEffect):
     """
     shipHybridDamageBonusCF
 
@@ -2211,7 +2215,7 @@ class Effect754(EffectDef):
                                       'damageMultiplier', ship.getModifiedItemAttr('shipBonusCF'), skill='Caldari Frigate')
 
 
-class Effect757(EffectDef):
+class Effect757(BaseEffect):
     """
     shipETDamageAF
 
@@ -2230,7 +2234,7 @@ class Effect757(EffectDef):
                                       src.getModifiedItemAttr('shipBonusAF'), skill='Amarr Frigate')
 
 
-class Effect760(EffectDef):
+class Effect760(BaseEffect):
     """
     shipBonusSmallMissileRoFCF2
 
@@ -2248,7 +2252,7 @@ class Effect760(EffectDef):
                                       'speed', ship.getModifiedItemAttr('shipBonusCF2'), skill='Caldari Frigate')
 
 
-class Effect763(EffectDef):
+class Effect763(BaseEffect):
     """
     missileDMGBonus
 
@@ -2267,7 +2271,7 @@ class Effect763(EffectDef):
                                                stackingPenalties=True)
 
 
-class Effect784(EffectDef):
+class Effect784(BaseEffect):
     """
     missileBombardmentMaxFlightTimeBonusPostPercentExplosionDelayOwnerCharModulesRequiringMissileLauncherOperation
 
@@ -2289,7 +2293,7 @@ class Effect784(EffectDef):
                                         stackingPenalties=penalized)
 
 
-class Effect804(EffectDef):
+class Effect804(BaseEffect):
     """
     ammoInfluenceCapNeed
 
@@ -2308,7 +2312,7 @@ class Effect804(EffectDef):
             module.boostItemAttr('capacitorNeed', module.getModifiedChargeAttr('capNeedBonus') or 0)
 
 
-class Effect836(EffectDef):
+class Effect836(BaseEffect):
     """
     skillFreightBonus
 
@@ -2323,7 +2327,7 @@ class Effect836(EffectDef):
         fit.ship.boostItemAttr('capacity', module.getModifiedItemAttr('cargoCapacityBonus'))
 
 
-class Effect848(EffectDef):
+class Effect848(BaseEffect):
     """
     cloakingTargetingDelayBonusPostPercentCloakingTargetingDelayBonusForShipModulesRequiringCloaking
 
@@ -2340,7 +2344,7 @@ class Effect848(EffectDef):
                                       skill.getModifiedItemAttr('cloakingTargetingDelayBonus') * skill.level)
 
 
-class Effect854(EffectDef):
+class Effect854(BaseEffect):
     """
     cloakingScanResolutionMultiplier
 
@@ -2357,7 +2361,7 @@ class Effect854(EffectDef):
                                   stackingPenalties=True, penaltyGroup='cloakingScanResolutionMultiplier')
 
 
-class Effect856(EffectDef):
+class Effect856(BaseEffect):
     """
     warpSkillSpeed
 
@@ -2376,7 +2380,7 @@ class Effect856(EffectDef):
                                stackingPenalties=penalized)
 
 
-class Effect874(EffectDef):
+class Effect874(BaseEffect):
     """
     shipProjectileOptimalBonuseMF2
 
@@ -2392,7 +2396,7 @@ class Effect874(EffectDef):
                                       'maxRange', ship.getModifiedItemAttr('shipBonusMF2'), skill='Minmatar Frigate')
 
 
-class Effect882(EffectDef):
+class Effect882(BaseEffect):
     """
     shipHybridRangeBonusCF2
 
@@ -2409,7 +2413,7 @@ class Effect882(EffectDef):
                                       'maxRange', ship.getModifiedItemAttr('shipBonusCF2'), skill='Caldari Frigate')
 
 
-class Effect887(EffectDef):
+class Effect887(BaseEffect):
     """
     shipETspeedBonusAB2
 
@@ -2425,7 +2429,7 @@ class Effect887(EffectDef):
                                       'speed', ship.getModifiedItemAttr('shipBonusAB2'), skill='Amarr Battleship')
 
 
-class Effect889(EffectDef):
+class Effect889(BaseEffect):
     """
     missileLauncherSpeedMultiplier
 
@@ -2442,7 +2446,7 @@ class Effect889(EffectDef):
                                          stackingPenalties=True)
 
 
-class Effect891(EffectDef):
+class Effect891(BaseEffect):
     """
     shipCruiseMissileVelocityBonusCB3
 
@@ -2458,7 +2462,7 @@ class Effect891(EffectDef):
                                         'maxVelocity', ship.getModifiedItemAttr('shipBonusCB3'), skill='Caldari Battleship')
 
 
-class Effect892(EffectDef):
+class Effect892(BaseEffect):
     """
     shipTorpedosVelocityBonusCB3
 
@@ -2474,7 +2478,7 @@ class Effect892(EffectDef):
                                         'maxVelocity', ship.getModifiedItemAttr('shipBonusCB3'), skill='Caldari Battleship')
 
 
-class Effect896(EffectDef):
+class Effect896(BaseEffect):
     """
     covertOpsCpuBonus1
 
@@ -2491,7 +2495,7 @@ class Effect896(EffectDef):
                                          'cpu', container.getModifiedItemAttr('cloakingCpuNeedBonus'))
 
 
-class Effect898(EffectDef):
+class Effect898(BaseEffect):
     """
     shipMissileKineticDamageCF
 
@@ -2509,7 +2513,7 @@ class Effect898(EffectDef):
                                         'kineticDamage', ship.getModifiedItemAttr('shipBonusCF'), skill='Caldari Frigate')
 
 
-class Effect899(EffectDef):
+class Effect899(BaseEffect):
     """
     shipMissileKineticDamageCC
 
@@ -2527,7 +2531,7 @@ class Effect899(EffectDef):
                                         'kineticDamage', ship.getModifiedItemAttr('shipBonusCC'), skill='Caldari Cruiser')
 
 
-class Effect900(EffectDef):
+class Effect900(BaseEffect):
     """
     shipDroneScoutThermalDamageGF2
 
@@ -2543,7 +2547,7 @@ class Effect900(EffectDef):
                                      'thermalDamage', ship.getModifiedItemAttr('shipBonusGF2'), skill='Gallente Frigate')
 
 
-class Effect907(EffectDef):
+class Effect907(BaseEffect):
     """
     shipLaserRofAC2
 
@@ -2560,7 +2564,7 @@ class Effect907(EffectDef):
                                       'speed', ship.getModifiedItemAttr('shipBonusAC2'), skill='Amarr Cruiser')
 
 
-class Effect909(EffectDef):
+class Effect909(BaseEffect):
     """
     shipArmorHpAC2
 
@@ -2575,7 +2579,7 @@ class Effect909(EffectDef):
         fit.ship.boostItemAttr('armorHP', ship.getModifiedItemAttr('shipBonusAC2'), skill='Amarr Cruiser')
 
 
-class Effect912(EffectDef):
+class Effect912(BaseEffect):
     """
     shipMissileLauncherRofCC2
 
@@ -2591,7 +2595,7 @@ class Effect912(EffectDef):
                                       'speed', ship.getModifiedItemAttr('shipBonusCC2'), skill='Caldari Cruiser')
 
 
-class Effect918(EffectDef):
+class Effect918(BaseEffect):
     """
     shipDronesMaxGC2
 
@@ -2606,7 +2610,7 @@ class Effect918(EffectDef):
         fit.extraAttributes.increase('maxActiveDrones', ship.getModifiedItemAttr('shipBonusGC2'), skill='Gallente Cruiser')
 
 
-class Effect919(EffectDef):
+class Effect919(BaseEffect):
     """
     shipHybridTrackingGC2
 
@@ -2623,7 +2627,7 @@ class Effect919(EffectDef):
                                       'trackingSpeed', ship.getModifiedItemAttr('shipBonusGC2'), skill='Gallente Cruiser')
 
 
-class Effect958(EffectDef):
+class Effect958(BaseEffect):
     """
     shipArmorEmResistanceAC2
 
@@ -2638,7 +2642,7 @@ class Effect958(EffectDef):
         fit.ship.boostItemAttr('armorEmDamageResonance', ship.getModifiedItemAttr('shipBonusAC2'), skill='Amarr Cruiser')
 
 
-class Effect959(EffectDef):
+class Effect959(BaseEffect):
     """
     shipArmorExplosiveResistanceAC2
 
@@ -2654,7 +2658,7 @@ class Effect959(EffectDef):
                                skill='Amarr Cruiser')
 
 
-class Effect960(EffectDef):
+class Effect960(BaseEffect):
     """
     shipArmorKineticResistanceAC2
 
@@ -2670,7 +2674,7 @@ class Effect960(EffectDef):
                                skill='Amarr Cruiser')
 
 
-class Effect961(EffectDef):
+class Effect961(BaseEffect):
     """
     shipArmorThermalResistanceAC2
 
@@ -2686,7 +2690,7 @@ class Effect961(EffectDef):
                                skill='Amarr Cruiser')
 
 
-class Effect968(EffectDef):
+class Effect968(BaseEffect):
     """
     shipProjectileDmgMC2
 
@@ -2705,7 +2709,7 @@ class Effect968(EffectDef):
                                       skill='Minmatar Cruiser')
 
 
-class Effect980(EffectDef):
+class Effect980(BaseEffect):
     """
     cloakingWarpSafe
 
@@ -2722,7 +2726,7 @@ class Effect980(EffectDef):
         # TODO: Implement
 
 
-class Effect989(EffectDef):
+class Effect989(BaseEffect):
     """
     eliteBonusGunshipHybridOptimal1
 
@@ -2740,7 +2744,7 @@ class Effect989(EffectDef):
                                       'maxRange', ship.getModifiedItemAttr('eliteBonusGunship1'), skill='Assault Frigates')
 
 
-class Effect991(EffectDef):
+class Effect991(BaseEffect):
     """
     eliteBonusGunshipLaserOptimal1
 
@@ -2756,7 +2760,7 @@ class Effect991(EffectDef):
                                       'maxRange', ship.getModifiedItemAttr('eliteBonusGunship1'), skill='Assault Frigates')
 
 
-class Effect996(EffectDef):
+class Effect996(BaseEffect):
     """
     eliteBonusGunshipHybridTracking2
 
@@ -2773,7 +2777,7 @@ class Effect996(EffectDef):
                                       skill='Assault Frigates')
 
 
-class Effect998(EffectDef):
+class Effect998(BaseEffect):
     """
     eliteBonusGunshipProjectileFalloff2
 
@@ -2789,7 +2793,7 @@ class Effect998(EffectDef):
                                       'falloff', ship.getModifiedItemAttr('eliteBonusGunship2'), skill='Assault Frigates')
 
 
-class Effect999(EffectDef):
+class Effect999(BaseEffect):
     """
     eliteBonusGunshipShieldBoost2
 
@@ -2806,7 +2810,7 @@ class Effect999(EffectDef):
                                       skill='Assault Frigates')
 
 
-class Effect1001(EffectDef):
+class Effect1001(BaseEffect):
     """
     eliteBonusGunshipCapRecharge2
 
@@ -2821,7 +2825,7 @@ class Effect1001(EffectDef):
         fit.ship.boostItemAttr('rechargeRate', ship.getModifiedItemAttr('eliteBonusGunship2'), skill='Assault Frigates')
 
 
-class Effect1003(EffectDef):
+class Effect1003(BaseEffect):
     """
     selfT2SmallLaserPulseDamageBonus
 
@@ -2837,7 +2841,7 @@ class Effect1003(EffectDef):
                                       'damageMultiplier', skill.getModifiedItemAttr('damageMultiplierBonus') * skill.level)
 
 
-class Effect1004(EffectDef):
+class Effect1004(BaseEffect):
     """
     selfT2SmallLaserBeamDamageBonus
 
@@ -2853,7 +2857,7 @@ class Effect1004(EffectDef):
                                       'damageMultiplier', skill.getModifiedItemAttr('damageMultiplierBonus') * skill.level)
 
 
-class Effect1005(EffectDef):
+class Effect1005(BaseEffect):
     """
     selfT2SmallHybridBlasterDamageBonus
 
@@ -2869,7 +2873,7 @@ class Effect1005(EffectDef):
                                       'damageMultiplier', skill.getModifiedItemAttr('damageMultiplierBonus') * skill.level)
 
 
-class Effect1006(EffectDef):
+class Effect1006(BaseEffect):
     """
     selfT2SmallHybridRailDamageBonus
 
@@ -2885,7 +2889,7 @@ class Effect1006(EffectDef):
                                       'damageMultiplier', skill.getModifiedItemAttr('damageMultiplierBonus') * skill.level)
 
 
-class Effect1007(EffectDef):
+class Effect1007(BaseEffect):
     """
     selfT2SmallProjectileACDamageBonus
 
@@ -2901,7 +2905,7 @@ class Effect1007(EffectDef):
                                       'damageMultiplier', skill.getModifiedItemAttr('damageMultiplierBonus') * skill.level)
 
 
-class Effect1008(EffectDef):
+class Effect1008(BaseEffect):
     """
     selfT2SmallProjectileArtyDamageBonus
 
@@ -2917,7 +2921,7 @@ class Effect1008(EffectDef):
                                       'damageMultiplier', skill.getModifiedItemAttr('damageMultiplierBonus') * skill.level)
 
 
-class Effect1009(EffectDef):
+class Effect1009(BaseEffect):
     """
     selfT2MediumLaserPulseDamageBonus
 
@@ -2933,7 +2937,7 @@ class Effect1009(EffectDef):
                                       'damageMultiplier', skill.getModifiedItemAttr('damageMultiplierBonus') * skill.level)
 
 
-class Effect1010(EffectDef):
+class Effect1010(BaseEffect):
     """
     selfT2MediumLaserBeamDamageBonus
 
@@ -2949,7 +2953,7 @@ class Effect1010(EffectDef):
                                       'damageMultiplier', skill.getModifiedItemAttr('damageMultiplierBonus') * skill.level)
 
 
-class Effect1011(EffectDef):
+class Effect1011(BaseEffect):
     """
     selfT2MediumHybridBlasterDamageBonus
 
@@ -2965,7 +2969,7 @@ class Effect1011(EffectDef):
                                       'damageMultiplier', skill.getModifiedItemAttr('damageMultiplierBonus') * skill.level)
 
 
-class Effect1012(EffectDef):
+class Effect1012(BaseEffect):
     """
     selfT2MediumHybridRailDamageBonus
 
@@ -2981,7 +2985,7 @@ class Effect1012(EffectDef):
                                       'damageMultiplier', skill.getModifiedItemAttr('damageMultiplierBonus') * skill.level)
 
 
-class Effect1013(EffectDef):
+class Effect1013(BaseEffect):
     """
     selfT2MediumProjectileACDamageBonus
 
@@ -2997,7 +3001,7 @@ class Effect1013(EffectDef):
                                       'damageMultiplier', skill.getModifiedItemAttr('damageMultiplierBonus') * skill.level)
 
 
-class Effect1014(EffectDef):
+class Effect1014(BaseEffect):
     """
     selfT2MediumProjectileArtyDamageBonus
 
@@ -3013,7 +3017,7 @@ class Effect1014(EffectDef):
                                       'damageMultiplier', skill.getModifiedItemAttr('damageMultiplierBonus') * skill.level)
 
 
-class Effect1015(EffectDef):
+class Effect1015(BaseEffect):
     """
     selfT2LargeLaserPulseDamageBonus
 
@@ -3029,7 +3033,7 @@ class Effect1015(EffectDef):
                                       'damageMultiplier', skill.getModifiedItemAttr('damageMultiplierBonus') * skill.level)
 
 
-class Effect1016(EffectDef):
+class Effect1016(BaseEffect):
     """
     selfT2LargeLaserBeamDamageBonus
 
@@ -3045,7 +3049,7 @@ class Effect1016(EffectDef):
                                       'damageMultiplier', skill.getModifiedItemAttr('damageMultiplierBonus') * skill.level)
 
 
-class Effect1017(EffectDef):
+class Effect1017(BaseEffect):
     """
     selfT2LargeHybridBlasterDamageBonus
 
@@ -3061,7 +3065,7 @@ class Effect1017(EffectDef):
                                       'damageMultiplier', skill.getModifiedItemAttr('damageMultiplierBonus') * skill.level)
 
 
-class Effect1018(EffectDef):
+class Effect1018(BaseEffect):
     """
     selfT2LargeHybridRailDamageBonus
 
@@ -3077,7 +3081,7 @@ class Effect1018(EffectDef):
                                       'damageMultiplier', skill.getModifiedItemAttr('damageMultiplierBonus') * skill.level)
 
 
-class Effect1019(EffectDef):
+class Effect1019(BaseEffect):
     """
     selfT2LargeProjectileACDamageBonus
 
@@ -3093,7 +3097,7 @@ class Effect1019(EffectDef):
                                       'damageMultiplier', skill.getModifiedItemAttr('damageMultiplierBonus') * skill.level)
 
 
-class Effect1020(EffectDef):
+class Effect1020(BaseEffect):
     """
     selfT2LargeProjectileArtyDamageBonus
 
@@ -3109,7 +3113,7 @@ class Effect1020(EffectDef):
                                       'damageMultiplier', skill.getModifiedItemAttr('damageMultiplierBonus') * skill.level)
 
 
-class Effect1021(EffectDef):
+class Effect1021(BaseEffect):
     """
     eliteBonusGunshipHybridDmg2
 
@@ -3126,7 +3130,7 @@ class Effect1021(EffectDef):
                                       skill='Assault Frigates')
 
 
-class Effect1024(EffectDef):
+class Effect1024(BaseEffect):
     """
     shipMissileHeavyVelocityBonusCC2
 
@@ -3143,7 +3147,7 @@ class Effect1024(EffectDef):
                                         'maxVelocity', ship.getModifiedItemAttr('shipBonusCC2'), skill='Caldari Cruiser')
 
 
-class Effect1025(EffectDef):
+class Effect1025(BaseEffect):
     """
     shipMissileLightVelocityBonusCC2
 
@@ -3160,7 +3164,7 @@ class Effect1025(EffectDef):
                                         'maxVelocity', ship.getModifiedItemAttr('shipBonusCC2'), skill='Caldari Cruiser')
 
 
-class Effect1030(EffectDef):
+class Effect1030(BaseEffect):
     """
     remoteArmorSystemsCapNeedBonusPostPercentCapacitorNeedLocationShipModulesRequiringRemoteArmorSystems
 
@@ -3179,7 +3183,7 @@ class Effect1030(EffectDef):
                                       'capacitorNeed', container.getModifiedItemAttr('capNeedBonus') * level)
 
 
-class Effect1033(EffectDef):
+class Effect1033(BaseEffect):
     """
     eliteBonusLogisticRemoteArmorRepairCapNeed1
 
@@ -3195,7 +3199,7 @@ class Effect1033(EffectDef):
                                       src.getModifiedItemAttr('eliteBonusLogistics1'), skill='Logistics Cruisers')
 
 
-class Effect1034(EffectDef):
+class Effect1034(BaseEffect):
     """
     eliteBonusLogisticRemoteArmorRepairCapNeed2
 
@@ -3212,7 +3216,7 @@ class Effect1034(EffectDef):
                                       src.getModifiedItemAttr('eliteBonusLogistics2'), skill='Logistics Cruisers')
 
 
-class Effect1035(EffectDef):
+class Effect1035(BaseEffect):
     """
     eliteBonusLogisticShieldTransferCapNeed2
 
@@ -3228,7 +3232,7 @@ class Effect1035(EffectDef):
                                       src.getModifiedItemAttr('eliteBonusLogistics2'), skill='Logistics Cruisers')
 
 
-class Effect1036(EffectDef):
+class Effect1036(BaseEffect):
     """
     eliteBonusLogisticShieldTransferCapNeed1
 
@@ -3245,7 +3249,7 @@ class Effect1036(EffectDef):
                                       src.getModifiedItemAttr('eliteBonusLogistics1'), skill='Logistics Cruisers')
 
 
-class Effect1046(EffectDef):
+class Effect1046(BaseEffect):
     """
     shipRemoteArmorRangeGC1
 
@@ -3261,7 +3265,7 @@ class Effect1046(EffectDef):
                                       src.getModifiedItemAttr('shipBonusGC'), skill='Gallente Cruiser')
 
 
-class Effect1047(EffectDef):
+class Effect1047(BaseEffect):
     """
     shipRemoteArmorRangeAC2
 
@@ -3277,7 +3281,7 @@ class Effect1047(EffectDef):
                                       src.getModifiedItemAttr('shipBonusAC2'), skill='Amarr Cruiser')
 
 
-class Effect1048(EffectDef):
+class Effect1048(BaseEffect):
     """
     shipShieldTransferRangeCC1
 
@@ -3294,7 +3298,7 @@ class Effect1048(EffectDef):
                                       src.getModifiedItemAttr('shipBonusCC'), skill='Caldari Cruiser')
 
 
-class Effect1049(EffectDef):
+class Effect1049(BaseEffect):
     """
     shipShieldTransferRangeMC2
 
@@ -3310,7 +3314,7 @@ class Effect1049(EffectDef):
                                       src.getModifiedItemAttr('shipBonusMC2'), skill='Minmatar Cruiser')
 
 
-class Effect1056(EffectDef):
+class Effect1056(BaseEffect):
     """
     eliteBonusHeavyGunshipHybridOptimal1
 
@@ -3327,7 +3331,7 @@ class Effect1056(EffectDef):
                                       skill='Heavy Assault Cruisers')
 
 
-class Effect1057(EffectDef):
+class Effect1057(BaseEffect):
     """
     eliteBonusHeavyGunshipProjectileOptimal1
 
@@ -3344,7 +3348,7 @@ class Effect1057(EffectDef):
                                       skill='Heavy Assault Cruisers')
 
 
-class Effect1058(EffectDef):
+class Effect1058(BaseEffect):
     """
     eliteBonusHeavyGunshipLaserOptimal1
 
@@ -3361,7 +3365,7 @@ class Effect1058(EffectDef):
                                       skill='Heavy Assault Cruisers')
 
 
-class Effect1060(EffectDef):
+class Effect1060(BaseEffect):
     """
     eliteBonusHeavyGunshipProjectileFallOff1
 
@@ -3378,7 +3382,7 @@ class Effect1060(EffectDef):
                                       skill='Heavy Assault Cruisers')
 
 
-class Effect1061(EffectDef):
+class Effect1061(BaseEffect):
     """
     eliteBonusHeavyGunshipHybridDmg2
 
@@ -3396,7 +3400,7 @@ class Effect1061(EffectDef):
                                       skill='Heavy Assault Cruisers')
 
 
-class Effect1062(EffectDef):
+class Effect1062(BaseEffect):
     """
     eliteBonusHeavyGunshipLaserDmg2
 
@@ -3413,7 +3417,7 @@ class Effect1062(EffectDef):
                                       skill='Heavy Assault Cruisers')
 
 
-class Effect1063(EffectDef):
+class Effect1063(BaseEffect):
     """
     eliteBonusHeavyGunshipProjectileTracking2
 
@@ -3430,7 +3434,7 @@ class Effect1063(EffectDef):
                                       skill='Heavy Assault Cruisers')
 
 
-class Effect1080(EffectDef):
+class Effect1080(BaseEffect):
     """
     eliteBonusHeavyGunshipHybridFallOff1
 
@@ -3447,7 +3451,7 @@ class Effect1080(EffectDef):
                                       skill='Heavy Assault Cruisers')
 
 
-class Effect1081(EffectDef):
+class Effect1081(BaseEffect):
     """
     eliteBonusHeavyGunshipHeavyMissileFlightTime1
 
@@ -3464,7 +3468,7 @@ class Effect1081(EffectDef):
                                         skill='Heavy Assault Cruisers')
 
 
-class Effect1082(EffectDef):
+class Effect1082(BaseEffect):
     """
     eliteBonusHeavyGunshipLightMissileFlightTime1
 
@@ -3481,7 +3485,7 @@ class Effect1082(EffectDef):
                                         skill='Heavy Assault Cruisers')
 
 
-class Effect1084(EffectDef):
+class Effect1084(BaseEffect):
     """
     eliteBonusHeavyGunshipDroneControlRange1
 
@@ -3497,7 +3501,7 @@ class Effect1084(EffectDef):
                                      skill='Heavy Assault Cruisers')
 
 
-class Effect1087(EffectDef):
+class Effect1087(BaseEffect):
     """
     eliteBonusHeavyGunshipProjectileDmg2
 
@@ -3514,7 +3518,7 @@ class Effect1087(EffectDef):
                                       skill='Heavy Assault Cruisers')
 
 
-class Effect1099(EffectDef):
+class Effect1099(BaseEffect):
     """
     shipProjectileTrackingMF2
 
@@ -3532,7 +3536,7 @@ class Effect1099(EffectDef):
                                       'trackingSpeed', ship.getModifiedItemAttr('shipBonusMF2'), skill='Minmatar Frigate')
 
 
-class Effect1176(EffectDef):
+class Effect1176(BaseEffect):
     """
     accerationControlSkillAb&MwdSpeedBoost
 
@@ -3550,7 +3554,7 @@ class Effect1176(EffectDef):
                                       'speedFactor', container.getModifiedItemAttr('speedFBonus') * level)
 
 
-class Effect1179(EffectDef):
+class Effect1179(BaseEffect):
     """
     eliteBonusGunshipLaserDamage2
 
@@ -3567,7 +3571,7 @@ class Effect1179(EffectDef):
                                       skill='Assault Frigates')
 
 
-class Effect1181(EffectDef):
+class Effect1181(BaseEffect):
     """
     eliteBonusLogisticEnergyTransferCapNeed1
 
@@ -3584,7 +3588,7 @@ class Effect1181(EffectDef):
                                       skill='Logistics Cruisers')
 
 
-class Effect1182(EffectDef):
+class Effect1182(BaseEffect):
     """
     shipEnergyTransferRange1
 
@@ -3600,7 +3604,7 @@ class Effect1182(EffectDef):
                                       'maxRange', ship.getModifiedItemAttr('shipBonusAC'), skill='Amarr Cruiser')
 
 
-class Effect1183(EffectDef):
+class Effect1183(BaseEffect):
     """
     eliteBonusLogisticEnergyTransferCapNeed2
 
@@ -3618,7 +3622,7 @@ class Effect1183(EffectDef):
                                       skill='Logistics Cruisers')
 
 
-class Effect1184(EffectDef):
+class Effect1184(BaseEffect):
     """
     shipEnergyTransferRange2
 
@@ -3635,7 +3639,7 @@ class Effect1184(EffectDef):
                                       'maxRange', ship.getModifiedItemAttr('shipBonusCC2'), skill='Caldari Cruiser')
 
 
-class Effect1185(EffectDef):
+class Effect1185(BaseEffect):
     """
     structureStealthEmitterArraySigDecrease
 
@@ -3651,7 +3655,7 @@ class Effect1185(EffectDef):
         fit.ship.boostItemAttr('signatureRadius', implant.getModifiedItemAttr('signatureRadiusBonus'))
 
 
-class Effect1190(EffectDef):
+class Effect1190(BaseEffect):
     """
     iceHarvestCycleTimeModulesRequiringIceHarvesting
 
@@ -3670,7 +3674,7 @@ class Effect1190(EffectDef):
                                       'duration', container.getModifiedItemAttr('iceHarvestCycleBonus') * level)
 
 
-class Effect1200(EffectDef):
+class Effect1200(BaseEffect):
     """
     miningInfoMultiplier
 
@@ -3688,7 +3692,7 @@ class Effect1200(EffectDef):
         # module.multiplyItemAttr('miningAmount', module.getModifiedChargeAttr('specialisationAsteroidYieldMultiplier'))
 
 
-class Effect1212(EffectDef):
+class Effect1212(BaseEffect):
     """
     crystalMiningamountInfo2
 
@@ -3704,7 +3708,7 @@ class Effect1212(EffectDef):
         module.preAssignItemAttr('specialtyMiningAmount', module.getModifiedItemAttr('miningAmount'))
 
 
-class Effect1215(EffectDef):
+class Effect1215(BaseEffect):
     """
     shipEnergyDrainAmountAF1
 
@@ -3722,7 +3726,7 @@ class Effect1215(EffectDef):
                                       'powerTransferAmount', ship.getModifiedItemAttr('shipBonusAF'), skill='Amarr Frigate')
 
 
-class Effect1218(EffectDef):
+class Effect1218(BaseEffect):
     """
     shipBonusPirateSmallHybridDmg
 
@@ -3740,7 +3744,7 @@ class Effect1218(EffectDef):
                                       'damageMultiplier', ship.getModifiedItemAttr('shipBonusRole7'))
 
 
-class Effect1219(EffectDef):
+class Effect1219(BaseEffect):
     """
     shipEnergyVampireTransferAmountBonusAB
 
@@ -3757,7 +3761,7 @@ class Effect1219(EffectDef):
                                       skill='Amarr Battleship')
 
 
-class Effect1220(EffectDef):
+class Effect1220(BaseEffect):
     """
     shipEnergyVampireTransferAmountBonusAc
 
@@ -3775,7 +3779,7 @@ class Effect1220(EffectDef):
                                       'powerTransferAmount', ship.getModifiedItemAttr('shipBonusAC'), skill='Amarr Cruiser')
 
 
-class Effect1221(EffectDef):
+class Effect1221(BaseEffect):
     """
     shipStasisWebRangeBonusMB
 
@@ -3791,7 +3795,7 @@ class Effect1221(EffectDef):
                                       'maxRange', ship.getModifiedItemAttr('shipBonusMB'), skill='Minmatar Battleship')
 
 
-class Effect1222(EffectDef):
+class Effect1222(BaseEffect):
     """
     shipStasisWebRangeBonusMC2
 
@@ -3807,7 +3811,7 @@ class Effect1222(EffectDef):
                                       'maxRange', ship.getModifiedItemAttr('shipBonusMC2'), skill='Minmatar Cruiser')
 
 
-class Effect1228(EffectDef):
+class Effect1228(BaseEffect):
     """
     shipProjectileTrackingGF
 
@@ -3824,7 +3828,7 @@ class Effect1228(EffectDef):
                                       'trackingSpeed', ship.getModifiedItemAttr('shipBonusGF'), skill='Gallente Frigate')
 
 
-class Effect1230(EffectDef):
+class Effect1230(BaseEffect):
     """
     shipMissileVelocityPirateFactionFrigate
 
@@ -3842,7 +3846,7 @@ class Effect1230(EffectDef):
                                         'maxVelocity', ship.getModifiedItemAttr('shipBonusRole7'))
 
 
-class Effect1232(EffectDef):
+class Effect1232(BaseEffect):
     """
     shipProjectileRofPirateCruiser
 
@@ -3859,7 +3863,7 @@ class Effect1232(EffectDef):
                                       'speed', ship.getModifiedItemAttr('shipBonusRole7'))
 
 
-class Effect1233(EffectDef):
+class Effect1233(BaseEffect):
     """
     shipHybridDmgPirateCruiser
 
@@ -3876,7 +3880,7 @@ class Effect1233(EffectDef):
                                       'damageMultiplier', ship.getModifiedItemAttr('shipBonusRole7'))
 
 
-class Effect1234(EffectDef):
+class Effect1234(BaseEffect):
     """
     shipMissileVelocityPirateFactionLight
 
@@ -3893,7 +3897,7 @@ class Effect1234(EffectDef):
                                         'maxVelocity', ship.getModifiedItemAttr('shipBonusRole7'))
 
 
-class Effect1239(EffectDef):
+class Effect1239(BaseEffect):
     """
     shipProjectileRofPirateBattleship
 
@@ -3909,7 +3913,7 @@ class Effect1239(EffectDef):
                                       'speed', ship.getModifiedItemAttr('shipBonusRole7'))
 
 
-class Effect1240(EffectDef):
+class Effect1240(BaseEffect):
     """
     shipHybridDmgPirateBattleship
 
@@ -3925,7 +3929,7 @@ class Effect1240(EffectDef):
                                       'damageMultiplier', ship.getModifiedItemAttr('shipBonusRole7'))
 
 
-class Effect1255(EffectDef):
+class Effect1255(BaseEffect):
     """
     setBonusBloodraider
 
@@ -3942,7 +3946,7 @@ class Effect1255(EffectDef):
                                                  'durationBonus', implant.getModifiedItemAttr('implantSetBloodraider'))
 
 
-class Effect1256(EffectDef):
+class Effect1256(BaseEffect):
     """
     setBonusBloodraiderNosferatu
 
@@ -3958,7 +3962,7 @@ class Effect1256(EffectDef):
                                       'duration', implant.getModifiedItemAttr('durationBonus'))
 
 
-class Effect1261(EffectDef):
+class Effect1261(BaseEffect):
     """
     setBonusSerpentis
 
@@ -3975,7 +3979,7 @@ class Effect1261(EffectDef):
                                                  'velocityBonus', implant.getModifiedItemAttr('implantSetSerpentis'))
 
 
-class Effect1264(EffectDef):
+class Effect1264(BaseEffect):
     """
     interceptor2HybridTracking
 
@@ -3992,7 +3996,7 @@ class Effect1264(EffectDef):
                                       skill='Interceptors')
 
 
-class Effect1268(EffectDef):
+class Effect1268(BaseEffect):
     """
     interceptor2LaserTracking
 
@@ -4009,7 +4013,7 @@ class Effect1268(EffectDef):
                                       skill='Interceptors')
 
 
-class Effect1281(EffectDef):
+class Effect1281(BaseEffect):
     """
     structuralAnalysisEffect
 
@@ -4029,7 +4033,7 @@ class Effect1281(EffectDef):
                                       stackingPenalties=penalized)
 
 
-class Effect1318(EffectDef):
+class Effect1318(BaseEffect):
     """
     ewSkillScanStrengthBonus
 
@@ -4051,7 +4055,7 @@ class Effect1318(EffectDef):
                                           stackingPenalties=False if 'skill' in context else True)
 
 
-class Effect1360(EffectDef):
+class Effect1360(BaseEffect):
     """
     ewSkillRsdCapNeedBonusSkillLevel
 
@@ -4069,7 +4073,7 @@ class Effect1360(EffectDef):
                                       'capacitorNeed', container.getModifiedItemAttr('capNeedBonus') * level)
 
 
-class Effect1361(EffectDef):
+class Effect1361(BaseEffect):
     """
     ewSkillTdCapNeedBonusSkillLevel
 
@@ -4087,7 +4091,7 @@ class Effect1361(EffectDef):
                                       'capacitorNeed', container.getModifiedItemAttr('capNeedBonus') * level)
 
 
-class Effect1370(EffectDef):
+class Effect1370(BaseEffect):
     """
     ewSkillTpCapNeedBonusSkillLevel
 
@@ -4105,7 +4109,7 @@ class Effect1370(EffectDef):
                                       'capacitorNeed', container.getModifiedItemAttr('capNeedBonus') * level)
 
 
-class Effect1372(EffectDef):
+class Effect1372(BaseEffect):
     """
     ewSkillEwCapNeedSkillLevel
 
@@ -4124,7 +4128,7 @@ class Effect1372(EffectDef):
                                       'capacitorNeed', container.getModifiedItemAttr('capNeedBonus') * level)
 
 
-class Effect1395(EffectDef):
+class Effect1395(BaseEffect):
     """
     shieldBoostAmplifierPassive
 
@@ -4140,7 +4144,7 @@ class Effect1395(EffectDef):
                                       'shieldBonus', container.getModifiedItemAttr('shieldBoostMultiplier'))
 
 
-class Effect1397(EffectDef):
+class Effect1397(BaseEffect):
     """
     setBonusGuristas
 
@@ -4157,7 +4161,7 @@ class Effect1397(EffectDef):
                                                  'shieldBoostMultiplier', implant.getModifiedItemAttr('implantSetGuristas'))
 
 
-class Effect1409(EffectDef):
+class Effect1409(BaseEffect):
     """
     systemScanDurationSkillAstrometrics
 
@@ -4176,7 +4180,7 @@ class Effect1409(EffectDef):
                                       'duration', container.getModifiedItemAttr('durationBonus') * level)
 
 
-class Effect1410(EffectDef):
+class Effect1410(BaseEffect):
     """
     propulsionSkillCapNeedBonusSkillLevel
 
@@ -4196,7 +4200,7 @@ class Effect1410(EffectDef):
                                       'capacitorNeed', container.getModifiedItemAttr('capNeedBonus') * level)
 
 
-class Effect1412(EffectDef):
+class Effect1412(BaseEffect):
     """
     shipBonusHybridOptimalCB
 
@@ -4212,7 +4216,7 @@ class Effect1412(EffectDef):
                                       'maxRange', ship.getModifiedItemAttr('shipBonusCB'), skill='Caldari Battleship')
 
 
-class Effect1434(EffectDef):
+class Effect1434(BaseEffect):
     """
     caldariShipEwStrengthCB
 
@@ -4231,7 +4235,7 @@ class Effect1434(EffectDef):
                                           skill='Caldari Battleship')
 
 
-class Effect1441(EffectDef):
+class Effect1441(BaseEffect):
     """
     caldariShipEwOptimalRangeCB3
 
@@ -4247,7 +4251,7 @@ class Effect1441(EffectDef):
                                       'maxRange', ship.getModifiedItemAttr('shipBonusCB3'), skill='Caldari Battleship')
 
 
-class Effect1442(EffectDef):
+class Effect1442(BaseEffect):
     """
     caldariShipEwOptimalRangeCC2
 
@@ -4263,7 +4267,7 @@ class Effect1442(EffectDef):
                                       'maxRange', ship.getModifiedItemAttr('shipBonusCC2'), skill='Caldari Cruiser')
 
 
-class Effect1443(EffectDef):
+class Effect1443(BaseEffect):
     """
     caldariShipEwCapacitorNeedCC
 
@@ -4281,7 +4285,7 @@ class Effect1443(EffectDef):
                                       'capacitorNeed', ship.getModifiedItemAttr('shipBonusCC'), skill='Caldari Cruiser')
 
 
-class Effect1445(EffectDef):
+class Effect1445(BaseEffect):
     """
     ewSkillRsdMaxRangeBonus
 
@@ -4300,7 +4304,7 @@ class Effect1445(EffectDef):
                                       stackingPenalties='skill' not in context)
 
 
-class Effect1446(EffectDef):
+class Effect1446(BaseEffect):
     """
     ewSkillTpMaxRangeBonus
 
@@ -4319,7 +4323,7 @@ class Effect1446(EffectDef):
                                       stackingPenalties='skill' not in context)
 
 
-class Effect1448(EffectDef):
+class Effect1448(BaseEffect):
     """
     ewSkillTdMaxRangeBonus
 
@@ -4338,7 +4342,7 @@ class Effect1448(EffectDef):
                                       stackingPenalties='skill' not in context)
 
 
-class Effect1449(EffectDef):
+class Effect1449(BaseEffect):
     """
     ewSkillRsdFallOffBonus
 
@@ -4354,7 +4358,7 @@ class Effect1449(EffectDef):
                                       'falloffEffectiveness', skill.getModifiedItemAttr('falloffBonus') * skill.level)
 
 
-class Effect1450(EffectDef):
+class Effect1450(BaseEffect):
     """
     ewSkillTpFallOffBonus
 
@@ -4370,7 +4374,7 @@ class Effect1450(EffectDef):
                                       'falloffEffectiveness', skill.getModifiedItemAttr('falloffBonus') * skill.level)
 
 
-class Effect1451(EffectDef):
+class Effect1451(BaseEffect):
     """
     ewSkillTdFallOffBonus
 
@@ -4386,7 +4390,7 @@ class Effect1451(EffectDef):
                                       'falloffEffectiveness', skill.getModifiedItemAttr('falloffBonus') * skill.level)
 
 
-class Effect1452(EffectDef):
+class Effect1452(BaseEffect):
     """
     ewSkillEwMaxRangeBonus
 
@@ -4406,7 +4410,7 @@ class Effect1452(EffectDef):
                                       stackingPenalties='skill' not in context and 'implant' not in context)
 
 
-class Effect1453(EffectDef):
+class Effect1453(BaseEffect):
     """
     ewSkillEwFallOffBonus
 
@@ -4422,7 +4426,7 @@ class Effect1453(EffectDef):
                                       'falloffEffectiveness', skill.getModifiedItemAttr('falloffBonus') * skill.level)
 
 
-class Effect1472(EffectDef):
+class Effect1472(BaseEffect):
     """
     missileSkillAoeCloudSizeBonus
 
@@ -4443,7 +4447,7 @@ class Effect1472(EffectDef):
                                         stackingPenalties=penalize)
 
 
-class Effect1500(EffectDef):
+class Effect1500(BaseEffect):
     """
     shieldOperationSkillBoostCapacitorNeedBonus
 
@@ -4461,7 +4465,7 @@ class Effect1500(EffectDef):
                                       'capacitorNeed', container.getModifiedItemAttr('shieldBoostCapacitorBonus') * level)
 
 
-class Effect1550(EffectDef):
+class Effect1550(BaseEffect):
     """
     ewSkillTargetPaintingStrengthBonus
 
@@ -4478,7 +4482,7 @@ class Effect1550(EffectDef):
                                       skill.getModifiedItemAttr('scanSkillTargetPaintStrengthBonus') * skill.level)
 
 
-class Effect1551(EffectDef):
+class Effect1551(BaseEffect):
     """
     minmatarShipEwTargetPainterMF2
 
@@ -4496,7 +4500,7 @@ class Effect1551(EffectDef):
                                       skill='Minmatar Frigate')
 
 
-class Effect1577(EffectDef):
+class Effect1577(BaseEffect):
     """
     angelsetbonus
 
@@ -4516,7 +4520,7 @@ class Effect1577(EffectDef):
             implant.getModifiedItemAttr('implantSetAngel'))
 
 
-class Effect1579(EffectDef):
+class Effect1579(BaseEffect):
     """
     setBonusSansha
 
@@ -4534,7 +4538,7 @@ class Effect1579(EffectDef):
                                                  'armorHpBonus', implant.getModifiedItemAttr('implantSetSansha') or 1)
 
 
-class Effect1581(EffectDef):
+class Effect1581(BaseEffect):
     """
     jumpDriveSkillsRangeBonus
 
@@ -4549,7 +4553,7 @@ class Effect1581(EffectDef):
         fit.ship.boostItemAttr('jumpDriveRange', skill.getModifiedItemAttr('jumpDriveRangeBonus') * skill.level)
 
 
-class Effect1585(EffectDef):
+class Effect1585(BaseEffect):
     """
     capitalTurretSkillLaserDamage
 
@@ -4565,7 +4569,7 @@ class Effect1585(EffectDef):
                                       'damageMultiplier', skill.getModifiedItemAttr('damageMultiplierBonus') * skill.level)
 
 
-class Effect1586(EffectDef):
+class Effect1586(BaseEffect):
     """
     capitalTurretSkillProjectileDamage
 
@@ -4581,7 +4585,7 @@ class Effect1586(EffectDef):
                                       'damageMultiplier', skill.getModifiedItemAttr('damageMultiplierBonus') * skill.level)
 
 
-class Effect1587(EffectDef):
+class Effect1587(BaseEffect):
     """
     capitalTurretSkillHybridDamage
 
@@ -4597,7 +4601,7 @@ class Effect1587(EffectDef):
                                       'damageMultiplier', skill.getModifiedItemAttr('damageMultiplierBonus') * skill.level)
 
 
-class Effect1588(EffectDef):
+class Effect1588(BaseEffect):
     """
     capitalLauncherSkillCitadelKineticDamage
 
@@ -4615,7 +4619,7 @@ class Effect1588(EffectDef):
                                         'kineticDamage', container.getModifiedItemAttr('damageMultiplierBonus') * level)
 
 
-class Effect1590(EffectDef):
+class Effect1590(BaseEffect):
     """
     missileSkillAoeVelocityBonus
 
@@ -4636,7 +4640,7 @@ class Effect1590(EffectDef):
                                         stackingPenalties=penalize)
 
 
-class Effect1592(EffectDef):
+class Effect1592(BaseEffect):
     """
     capitalLauncherSkillCitadelEmDamage
 
@@ -4654,7 +4658,7 @@ class Effect1592(EffectDef):
                                         'emDamage', container.getModifiedItemAttr('damageMultiplierBonus') * level)
 
 
-class Effect1593(EffectDef):
+class Effect1593(BaseEffect):
     """
     capitalLauncherSkillCitadelExplosiveDamage
 
@@ -4672,7 +4676,7 @@ class Effect1593(EffectDef):
                                         'explosiveDamage', container.getModifiedItemAttr('damageMultiplierBonus') * level)
 
 
-class Effect1594(EffectDef):
+class Effect1594(BaseEffect):
     """
     capitalLauncherSkillCitadelThermalDamage
 
@@ -4690,7 +4694,7 @@ class Effect1594(EffectDef):
                                         'thermalDamage', container.getModifiedItemAttr('damageMultiplierBonus') * level)
 
 
-class Effect1595(EffectDef):
+class Effect1595(BaseEffect):
     """
     missileSkillWarheadUpgradesEmDamageBonus
 
@@ -4708,7 +4712,7 @@ class Effect1595(EffectDef):
                                         'emDamage', src.getModifiedItemAttr('damageMultiplierBonus') * mod)
 
 
-class Effect1596(EffectDef):
+class Effect1596(BaseEffect):
     """
     missileSkillWarheadUpgradesExplosiveDamageBonus
 
@@ -4726,7 +4730,7 @@ class Effect1596(EffectDef):
                                         'explosiveDamage', src.getModifiedItemAttr('damageMultiplierBonus') * mod)
 
 
-class Effect1597(EffectDef):
+class Effect1597(BaseEffect):
     """
     missileSkillWarheadUpgradesKineticDamageBonus
 
@@ -4744,7 +4748,7 @@ class Effect1597(EffectDef):
                                         'kineticDamage', src.getModifiedItemAttr('damageMultiplierBonus') * mod)
 
 
-class Effect1615(EffectDef):
+class Effect1615(BaseEffect):
     """
     shipAdvancedSpaceshipCommandAgilityBonus
 
@@ -4761,7 +4765,7 @@ class Effect1615(EffectDef):
         fit.ship.boostItemAttr('agility', skill.getModifiedItemAttr('agilityBonus'), skill=skillName)
 
 
-class Effect1616(EffectDef):
+class Effect1616(BaseEffect):
     """
     skillCapitalShipsAdvancedAgility
 
@@ -4777,7 +4781,7 @@ class Effect1616(EffectDef):
             fit.ship.boostItemAttr('agility', skill.getModifiedItemAttr('agilityBonus') * skill.level)
 
 
-class Effect1617(EffectDef):
+class Effect1617(BaseEffect):
     """
     shipCapitalAgilityBonus
 
@@ -4792,7 +4796,7 @@ class Effect1617(EffectDef):
         fit.ship.multiplyItemAttr('agility', src.getModifiedItemAttr('advancedCapitalAgility'), stackingPenalties=True)
 
 
-class Effect1634(EffectDef):
+class Effect1634(BaseEffect):
     """
     capitalShieldOperationSkillCapacitorNeedBonus
 
@@ -4810,7 +4814,7 @@ class Effect1634(EffectDef):
                                       'capacitorNeed', container.getModifiedItemAttr('shieldBoostCapacitorBonus') * level)
 
 
-class Effect1635(EffectDef):
+class Effect1635(BaseEffect):
     """
     capitalRepairSystemsSkillDurationBonus
 
@@ -4829,7 +4833,7 @@ class Effect1635(EffectDef):
                                       stackingPenalties='skill' not in context)
 
 
-class Effect1638(EffectDef):
+class Effect1638(BaseEffect):
     """
     skillAdvancedWeaponUpgradesPowerNeedBonus
 
@@ -4846,7 +4850,7 @@ class Effect1638(EffectDef):
             'power', skill.getModifiedItemAttr('powerNeedBonus') * skill.level)
 
 
-class Effect1643(EffectDef):
+class Effect1643(BaseEffect):
     """
     armoredCommandMindlink
 
@@ -4872,7 +4876,7 @@ class Effect1643(EffectDef):
                                       src.getModifiedItemAttr('mindlinkBonus'))
 
 
-class Effect1644(EffectDef):
+class Effect1644(BaseEffect):
     """
     skirmishCommandMindlink
 
@@ -4898,7 +4902,7 @@ class Effect1644(EffectDef):
                                       src.getModifiedItemAttr('mindlinkBonus'))
 
 
-class Effect1645(EffectDef):
+class Effect1645(BaseEffect):
     """
     shieldCommandMindlink
 
@@ -4922,7 +4926,7 @@ class Effect1645(EffectDef):
                                       src.getModifiedItemAttr('mindlinkBonus'))
 
 
-class Effect1646(EffectDef):
+class Effect1646(BaseEffect):
     """
     informationCommandMindlink
 
@@ -4948,7 +4952,7 @@ class Effect1646(EffectDef):
                                       src.getModifiedItemAttr('mindlinkBonus'))
 
 
-class Effect1650(EffectDef):
+class Effect1650(BaseEffect):
     """
     skillSiegeModuleConsumptionQuantityBonus
 
@@ -4965,7 +4969,7 @@ class Effect1650(EffectDef):
                                          'consumptionQuantity', amount * skill.level)
 
 
-class Effect1657(EffectDef):
+class Effect1657(BaseEffect):
     """
     missileSkillWarheadUpgradesThermalDamageBonus
 
@@ -4983,7 +4987,7 @@ class Effect1657(EffectDef):
                                         'thermalDamage', src.getModifiedItemAttr('damageMultiplierBonus') * mod)
 
 
-class Effect1668(EffectDef):
+class Effect1668(BaseEffect):
     """
     freighterCargoBonusA2
 
@@ -4998,7 +5002,7 @@ class Effect1668(EffectDef):
         fit.ship.boostItemAttr('capacity', ship.getModifiedItemAttr('freighterBonusA2'), skill='Amarr Freighter')
 
 
-class Effect1669(EffectDef):
+class Effect1669(BaseEffect):
     """
     freighterCargoBonusC2
 
@@ -5013,7 +5017,7 @@ class Effect1669(EffectDef):
         fit.ship.boostItemAttr('capacity', ship.getModifiedItemAttr('freighterBonusC2'), skill='Caldari Freighter')
 
 
-class Effect1670(EffectDef):
+class Effect1670(BaseEffect):
     """
     freighterCargoBonusG2
 
@@ -5028,7 +5032,7 @@ class Effect1670(EffectDef):
         fit.ship.boostItemAttr('capacity', ship.getModifiedItemAttr('freighterBonusG2'), skill='Gallente Freighter')
 
 
-class Effect1671(EffectDef):
+class Effect1671(BaseEffect):
     """
     freighterCargoBonusM2
 
@@ -5043,7 +5047,7 @@ class Effect1671(EffectDef):
         fit.ship.boostItemAttr('capacity', ship.getModifiedItemAttr('freighterBonusM2'), skill='Minmatar Freighter')
 
 
-class Effect1672(EffectDef):
+class Effect1672(BaseEffect):
     """
     freighterMaxVelocityBonusA1
 
@@ -5058,7 +5062,7 @@ class Effect1672(EffectDef):
         fit.ship.boostItemAttr('maxVelocity', ship.getModifiedItemAttr('freighterBonusA1'), skill='Amarr Freighter')
 
 
-class Effect1673(EffectDef):
+class Effect1673(BaseEffect):
     """
     freighterMaxVelocityBonusC1
 
@@ -5073,7 +5077,7 @@ class Effect1673(EffectDef):
         fit.ship.boostItemAttr('maxVelocity', ship.getModifiedItemAttr('freighterBonusC1'), skill='Caldari Freighter')
 
 
-class Effect1674(EffectDef):
+class Effect1674(BaseEffect):
     """
     freighterMaxVelocityBonusG1
 
@@ -5088,7 +5092,7 @@ class Effect1674(EffectDef):
         fit.ship.boostItemAttr('maxVelocity', ship.getModifiedItemAttr('freighterBonusG1'), skill='Gallente Freighter')
 
 
-class Effect1675(EffectDef):
+class Effect1675(BaseEffect):
     """
     freighterMaxVelocityBonusM1
 
@@ -5103,7 +5107,7 @@ class Effect1675(EffectDef):
         fit.ship.boostItemAttr('maxVelocity', ship.getModifiedItemAttr('freighterBonusM1'), skill='Minmatar Freighter')
 
 
-class Effect1720(EffectDef):
+class Effect1720(BaseEffect):
     """
     shieldBoostAmplifier
 
@@ -5122,7 +5126,7 @@ class Effect1720(EffectDef):
             stackingPenalties=True)
 
 
-class Effect1722(EffectDef):
+class Effect1722(BaseEffect):
     """
     jumpDriveSkillsCapacitorNeedBonus
 
@@ -5138,7 +5142,7 @@ class Effect1722(EffectDef):
                                skill.getModifiedItemAttr('jumpDriveCapacitorNeedBonus') * skill.level)
 
 
-class Effect1730(EffectDef):
+class Effect1730(BaseEffect):
     """
     droneDmgBonus
 
@@ -5154,7 +5158,7 @@ class Effect1730(EffectDef):
                                      'damageMultiplier', skill.getModifiedItemAttr('damageMultiplierBonus') * skill.level)
 
 
-class Effect1738(EffectDef):
+class Effect1738(BaseEffect):
     """
     doHacking
 
@@ -5165,7 +5169,7 @@ class Effect1738(EffectDef):
     type = 'active'
 
 
-class Effect1763(EffectDef):
+class Effect1763(BaseEffect):
     """
     missileSkillRapidLauncherRoF
 
@@ -5186,7 +5190,7 @@ class Effect1763(EffectDef):
                                       'speed', container.getModifiedItemAttr('rofBonus') * level)
 
 
-class Effect1764(EffectDef):
+class Effect1764(BaseEffect):
     """
     missileSkillMissileProjectileVelocityBonus
 
@@ -5207,7 +5211,7 @@ class Effect1764(EffectDef):
                                         stackingPenalties=penalized)
 
 
-class Effect1773(EffectDef):
+class Effect1773(BaseEffect):
     """
     shipBonusSHTFalloffGF2
 
@@ -5224,7 +5228,7 @@ class Effect1773(EffectDef):
                                       'falloff', ship.getModifiedItemAttr('shipBonusGF2'), skill='Gallente Frigate')
 
 
-class Effect1804(EffectDef):
+class Effect1804(BaseEffect):
     """
     shipArmorEMResistanceAF1
 
@@ -5241,7 +5245,7 @@ class Effect1804(EffectDef):
         fit.ship.boostItemAttr('armorEmDamageResonance', ship.getModifiedItemAttr('shipBonusAF'), skill='Amarr Frigate')
 
 
-class Effect1805(EffectDef):
+class Effect1805(BaseEffect):
     """
     shipArmorTHResistanceAF1
 
@@ -5259,7 +5263,7 @@ class Effect1805(EffectDef):
                                skill='Amarr Frigate')
 
 
-class Effect1806(EffectDef):
+class Effect1806(BaseEffect):
     """
     shipArmorKNResistanceAF1
 
@@ -5277,7 +5281,7 @@ class Effect1806(EffectDef):
                                skill='Amarr Frigate')
 
 
-class Effect1807(EffectDef):
+class Effect1807(BaseEffect):
     """
     shipArmorEXResistanceAF1
 
@@ -5295,7 +5299,7 @@ class Effect1807(EffectDef):
                                skill='Amarr Frigate')
 
 
-class Effect1812(EffectDef):
+class Effect1812(BaseEffect):
     """
     shipShieldEMResistanceCC2
 
@@ -5310,7 +5314,7 @@ class Effect1812(EffectDef):
         fit.ship.boostItemAttr('shieldEmDamageResonance', ship.getModifiedItemAttr('shipBonusCC2'), skill='Caldari Cruiser')
 
 
-class Effect1813(EffectDef):
+class Effect1813(BaseEffect):
     """
     shipShieldThermalResistanceCC2
 
@@ -5326,7 +5330,7 @@ class Effect1813(EffectDef):
                                skill='Caldari Cruiser')
 
 
-class Effect1814(EffectDef):
+class Effect1814(BaseEffect):
     """
     shipShieldKineticResistanceCC2
 
@@ -5342,7 +5346,7 @@ class Effect1814(EffectDef):
                                skill='Caldari Cruiser')
 
 
-class Effect1815(EffectDef):
+class Effect1815(BaseEffect):
     """
     shipShieldExplosiveResistanceCC2
 
@@ -5358,7 +5362,7 @@ class Effect1815(EffectDef):
                                skill='Caldari Cruiser')
 
 
-class Effect1816(EffectDef):
+class Effect1816(BaseEffect):
     """
     shipShieldEMResistanceCF2
 
@@ -5375,7 +5379,7 @@ class Effect1816(EffectDef):
         fit.ship.boostItemAttr('shieldEmDamageResonance', ship.getModifiedItemAttr('shipBonusCF'), skill='Caldari Frigate')
 
 
-class Effect1817(EffectDef):
+class Effect1817(BaseEffect):
     """
     shipShieldThermalResistanceCF2
 
@@ -5393,7 +5397,7 @@ class Effect1817(EffectDef):
                                skill='Caldari Frigate')
 
 
-class Effect1819(EffectDef):
+class Effect1819(BaseEffect):
     """
     shipShieldKineticResistanceCF2
 
@@ -5411,7 +5415,7 @@ class Effect1819(EffectDef):
                                skill='Caldari Frigate')
 
 
-class Effect1820(EffectDef):
+class Effect1820(BaseEffect):
     """
     shipShieldExplosiveResistanceCF2
 
@@ -5429,7 +5433,7 @@ class Effect1820(EffectDef):
                                skill='Caldari Frigate')
 
 
-class Effect1848(EffectDef):
+class Effect1848(BaseEffect):
     """
     miningForemanMindlink
 
@@ -5454,7 +5458,7 @@ class Effect1848(EffectDef):
                                       src.getModifiedItemAttr('mindlinkBonus'))
 
 
-class Effect1851(EffectDef):
+class Effect1851(BaseEffect):
     """
     selfRof
 
@@ -5472,7 +5476,7 @@ class Effect1851(EffectDef):
                                       'speed', skill.getModifiedItemAttr('rofBonus') * skill.level)
 
 
-class Effect1862(EffectDef):
+class Effect1862(BaseEffect):
     """
     shipMissileEMDamageCF2
 
@@ -5488,7 +5492,7 @@ class Effect1862(EffectDef):
                                         'emDamage', ship.getModifiedItemAttr('shipBonusCF2'), skill='Caldari Frigate')
 
 
-class Effect1863(EffectDef):
+class Effect1863(BaseEffect):
     """
     shipMissileThermalDamageCF2
 
@@ -5504,7 +5508,7 @@ class Effect1863(EffectDef):
                                         'thermalDamage', ship.getModifiedItemAttr('shipBonusCF2'), skill='Caldari Frigate')
 
 
-class Effect1864(EffectDef):
+class Effect1864(BaseEffect):
     """
     shipMissileExplosiveDamageCF2
 
@@ -5521,7 +5525,7 @@ class Effect1864(EffectDef):
                                         skill='Caldari Frigate')
 
 
-class Effect1882(EffectDef):
+class Effect1882(BaseEffect):
     """
     miningYieldMultiplyPercent
 
@@ -5538,7 +5542,7 @@ class Effect1882(EffectDef):
                                       'miningAmount', module.getModifiedItemAttr('miningAmountBonus'))
 
 
-class Effect1885(EffectDef):
+class Effect1885(BaseEffect):
     """
     shipCruiseLauncherROFBonus2CB
 
@@ -5555,7 +5559,7 @@ class Effect1885(EffectDef):
                                       'speed', ship.getModifiedItemAttr('shipBonus2CB'), skill='Caldari Battleship')
 
 
-class Effect1886(EffectDef):
+class Effect1886(BaseEffect):
     """
     shipSiegeLauncherROFBonus2CB
 
@@ -5572,7 +5576,7 @@ class Effect1886(EffectDef):
                                       'speed', ship.getModifiedItemAttr('shipBonus2CB'), skill='Caldari Battleship')
 
 
-class Effect1896(EffectDef):
+class Effect1896(BaseEffect):
     """
     eliteBargeBonusIceHarvestingCycleTimeBarge3
 
@@ -5588,7 +5592,7 @@ class Effect1896(EffectDef):
                                       'duration', ship.getModifiedItemAttr('eliteBonusBarge2'), skill='Exhumers')
 
 
-class Effect1910(EffectDef):
+class Effect1910(BaseEffect):
     """
     eliteBonusVampireDrainAmount2
 
@@ -5606,7 +5610,7 @@ class Effect1910(EffectDef):
                                       skill='Recon Ships')
 
 
-class Effect1911(EffectDef):
+class Effect1911(BaseEffect):
     """
     eliteReconBonusGravimetricStrength2
 
@@ -5625,7 +5629,7 @@ class Effect1911(EffectDef):
                                       skill='Recon Ships')
 
 
-class Effect1912(EffectDef):
+class Effect1912(BaseEffect):
     """
     eliteReconBonusMagnetometricStrength2
 
@@ -5644,7 +5648,7 @@ class Effect1912(EffectDef):
                                       skill='Recon Ships')
 
 
-class Effect1913(EffectDef):
+class Effect1913(BaseEffect):
     """
     eliteReconBonusRadarStrength2
 
@@ -5663,7 +5667,7 @@ class Effect1913(EffectDef):
                                       skill='Recon Ships')
 
 
-class Effect1914(EffectDef):
+class Effect1914(BaseEffect):
     """
     eliteReconBonusLadarStrength2
 
@@ -5682,7 +5686,7 @@ class Effect1914(EffectDef):
                                       skill='Recon Ships')
 
 
-class Effect1921(EffectDef):
+class Effect1921(BaseEffect):
     """
     eliteReconStasisWebBonus2
 
@@ -5701,7 +5705,7 @@ class Effect1921(EffectDef):
                                       'maxRange', ship.getModifiedItemAttr('eliteBonusReconShip2'), skill='Recon Ships')
 
 
-class Effect1922(EffectDef):
+class Effect1922(BaseEffect):
     """
     eliteReconScramblerRangeBonus2
 
@@ -5719,7 +5723,7 @@ class Effect1922(EffectDef):
                                       'maxRange', ship.getModifiedItemAttr('eliteBonusReconShip2'), skill='Recon Ships')
 
 
-class Effect1959(EffectDef):
+class Effect1959(BaseEffect):
     """
     armorReinforcerMassAdd
 
@@ -5734,7 +5738,7 @@ class Effect1959(EffectDef):
         fit.ship.increaseItemAttr('mass', module.getModifiedItemAttr('massAddition'))
 
 
-class Effect1964(EffectDef):
+class Effect1964(BaseEffect):
     """
     shipBonusShieldTransferCapneed1
 
@@ -5750,7 +5754,7 @@ class Effect1964(EffectDef):
                                       src.getModifiedItemAttr('shipBonusCC'), skill='Caldari Cruiser')
 
 
-class Effect1969(EffectDef):
+class Effect1969(BaseEffect):
     """
     shipBonusRemoteArmorRepairCapNeedGC1
 
@@ -5766,7 +5770,7 @@ class Effect1969(EffectDef):
                                       src.getModifiedItemAttr('shipBonusGC'), skill='Gallente Cruiser')
 
 
-class Effect1996(EffectDef):
+class Effect1996(BaseEffect):
     """
     caldariShipEwCapacitorNeedCF2
 
@@ -5783,7 +5787,7 @@ class Effect1996(EffectDef):
                                       'capacitorNeed', ship.getModifiedItemAttr('shipBonusCF2'), skill='Caldari Frigate')
 
 
-class Effect2000(EffectDef):
+class Effect2000(BaseEffect):
     """
     droneRangeBonusAdd
 
@@ -5799,7 +5803,7 @@ class Effect2000(EffectDef):
         fit.extraAttributes.increase('droneControlRange', amount)
 
 
-class Effect2008(EffectDef):
+class Effect2008(BaseEffect):
     """
     cynosuralDurationBonus
 
@@ -5815,7 +5819,7 @@ class Effect2008(EffectDef):
                                       'duration', ship.getModifiedItemAttr('durationBonus'))
 
 
-class Effect2013(EffectDef):
+class Effect2013(BaseEffect):
     """
     droneMaxVelocityBonus
 
@@ -5834,7 +5838,7 @@ class Effect2013(EffectDef):
                                      'maxVelocity', container.getModifiedItemAttr('droneMaxVelocityBonus') * level, stackingPenalties=True)
 
 
-class Effect2014(EffectDef):
+class Effect2014(BaseEffect):
     """
     droneMaxRangeBonus
 
@@ -5854,7 +5858,7 @@ class Effect2014(EffectDef):
                                      stackingPenalties=stacking)
 
 
-class Effect2015(EffectDef):
+class Effect2015(BaseEffect):
     """
     droneDurabilityShieldCapBonus
 
@@ -5870,7 +5874,7 @@ class Effect2015(EffectDef):
                                      'shieldCapacity', module.getModifiedItemAttr('hullHpBonus'))
 
 
-class Effect2016(EffectDef):
+class Effect2016(BaseEffect):
     """
     droneDurabilityArmorHPBonus
 
@@ -5886,7 +5890,7 @@ class Effect2016(EffectDef):
                                      'armorHP', module.getModifiedItemAttr('hullHpBonus'))
 
 
-class Effect2017(EffectDef):
+class Effect2017(BaseEffect):
     """
     droneDurabilityHPBonus
 
@@ -5903,7 +5907,7 @@ class Effect2017(EffectDef):
                                      'hp', container.getModifiedItemAttr('hullHpBonus') * level)
 
 
-class Effect2019(EffectDef):
+class Effect2019(BaseEffect):
     """
     repairDroneShieldBonusBonus
 
@@ -5921,7 +5925,7 @@ class Effect2019(EffectDef):
                                      'shieldBonus', container.getModifiedItemAttr('damageHP') * level)
 
 
-class Effect2020(EffectDef):
+class Effect2020(BaseEffect):
     """
     repairDroneArmorDamageAmountBonus
 
@@ -5940,7 +5944,7 @@ class Effect2020(EffectDef):
                                      stackingPenalties=True)
 
 
-class Effect2029(EffectDef):
+class Effect2029(BaseEffect):
     """
     addToSignatureRadius2
 
@@ -5956,7 +5960,7 @@ class Effect2029(EffectDef):
         fit.ship.increaseItemAttr('signatureRadius', module.getModifiedItemAttr('signatureRadiusAdd'))
 
 
-class Effect2041(EffectDef):
+class Effect2041(BaseEffect):
     """
     modifyArmorResonancePostPercent
 
@@ -5975,7 +5979,7 @@ class Effect2041(EffectDef):
                                    stackingPenalties=True)
 
 
-class Effect2052(EffectDef):
+class Effect2052(BaseEffect):
     """
     modifyShieldResonancePostPercent
 
@@ -5993,7 +5997,7 @@ class Effect2052(EffectDef):
                                    stackingPenalties=True)
 
 
-class Effect2053(EffectDef):
+class Effect2053(BaseEffect):
     """
     emShieldCompensationHardeningBonusGroupShieldAmp
 
@@ -6009,7 +6013,7 @@ class Effect2053(EffectDef):
                                       'emDamageResistanceBonus', skill.getModifiedItemAttr('hardeningBonus') * skill.level)
 
 
-class Effect2054(EffectDef):
+class Effect2054(BaseEffect):
     """
     explosiveShieldCompensationHardeningBonusGroupShieldAmp
 
@@ -6026,7 +6030,7 @@ class Effect2054(EffectDef):
                                       skill.getModifiedItemAttr('hardeningBonus') * skill.level)
 
 
-class Effect2055(EffectDef):
+class Effect2055(BaseEffect):
     """
     kineticShieldCompensationHardeningBonusGroupShieldAmp
 
@@ -6043,7 +6047,7 @@ class Effect2055(EffectDef):
                                       skill.getModifiedItemAttr('hardeningBonus') * skill.level)
 
 
-class Effect2056(EffectDef):
+class Effect2056(BaseEffect):
     """
     thermalShieldCompensationHardeningBonusGroupShieldAmp
 
@@ -6060,7 +6064,7 @@ class Effect2056(EffectDef):
                                       skill.getModifiedItemAttr('hardeningBonus') * skill.level)
 
 
-class Effect2105(EffectDef):
+class Effect2105(BaseEffect):
     """
     emArmorCompensationHardeningBonusGroupArmorCoating
 
@@ -6076,7 +6080,7 @@ class Effect2105(EffectDef):
                                       'emDamageResistanceBonus', skill.getModifiedItemAttr('hardeningBonus') * skill.level)
 
 
-class Effect2106(EffectDef):
+class Effect2106(BaseEffect):
     """
     explosiveArmorCompensationHardeningBonusGroupArmorCoating
 
@@ -6093,7 +6097,7 @@ class Effect2106(EffectDef):
                                       skill.getModifiedItemAttr('hardeningBonus') * skill.level)
 
 
-class Effect2107(EffectDef):
+class Effect2107(BaseEffect):
     """
     kineticArmorCompensationHardeningBonusGroupArmorCoating
 
@@ -6110,7 +6114,7 @@ class Effect2107(EffectDef):
                                       skill.getModifiedItemAttr('hardeningBonus') * skill.level)
 
 
-class Effect2108(EffectDef):
+class Effect2108(BaseEffect):
     """
     thermicArmorCompensationHardeningBonusGroupArmorCoating
 
@@ -6127,7 +6131,7 @@ class Effect2108(EffectDef):
                                       skill.getModifiedItemAttr('hardeningBonus') * skill.level)
 
 
-class Effect2109(EffectDef):
+class Effect2109(BaseEffect):
     """
     emArmorCompensationHardeningBonusGroupEnergized
 
@@ -6143,7 +6147,7 @@ class Effect2109(EffectDef):
                                       'emDamageResistanceBonus', skill.getModifiedItemAttr('hardeningBonus') * skill.level)
 
 
-class Effect2110(EffectDef):
+class Effect2110(BaseEffect):
     """
     explosiveArmorCompensationHardeningBonusGroupEnergized
 
@@ -6160,7 +6164,7 @@ class Effect2110(EffectDef):
                                       skill.getModifiedItemAttr('hardeningBonus') * skill.level)
 
 
-class Effect2111(EffectDef):
+class Effect2111(BaseEffect):
     """
     kineticArmorCompensationHardeningBonusGroupEnergized
 
@@ -6177,7 +6181,7 @@ class Effect2111(EffectDef):
                                       skill.getModifiedItemAttr('hardeningBonus') * skill.level)
 
 
-class Effect2112(EffectDef):
+class Effect2112(BaseEffect):
     """
     thermicArmorCompensationHardeningBonusGroupEnergized
 
@@ -6194,7 +6198,7 @@ class Effect2112(EffectDef):
                                       skill.getModifiedItemAttr('hardeningBonus') * skill.level)
 
 
-class Effect2130(EffectDef):
+class Effect2130(BaseEffect):
     """
     smallHybridMaxRangeBonus
 
@@ -6211,7 +6215,7 @@ class Effect2130(EffectDef):
                                       'maxRange', ship.getModifiedItemAttr('maxRangeBonus'))
 
 
-class Effect2131(EffectDef):
+class Effect2131(BaseEffect):
     """
     smallEnergyMaxRangeBonus
 
@@ -6229,7 +6233,7 @@ class Effect2131(EffectDef):
                                       'maxRange', ship.getModifiedItemAttr('maxRangeBonus'))
 
 
-class Effect2132(EffectDef):
+class Effect2132(BaseEffect):
     """
     smallProjectileMaxRangeBonus
 
@@ -6245,7 +6249,7 @@ class Effect2132(EffectDef):
                                       'maxRange', ship.getModifiedItemAttr('maxRangeBonus'))
 
 
-class Effect2133(EffectDef):
+class Effect2133(BaseEffect):
     """
     energyTransferArrayMaxRangeBonus
 
@@ -6262,7 +6266,7 @@ class Effect2133(EffectDef):
                                       'maxRange', ship.getModifiedItemAttr('maxRangeBonus2'))
 
 
-class Effect2134(EffectDef):
+class Effect2134(BaseEffect):
     """
     shieldTransporterMaxRangeBonus
 
@@ -6283,7 +6287,7 @@ class Effect2134(EffectDef):
                                       ship.getModifiedItemAttr('maxRangeBonus'))
 
 
-class Effect2135(EffectDef):
+class Effect2135(BaseEffect):
     """
     armorRepairProjectorMaxRangeBonus
 
@@ -6305,7 +6309,7 @@ class Effect2135(EffectDef):
                                       src.getModifiedItemAttr('maxRangeBonus'))
 
 
-class Effect2143(EffectDef):
+class Effect2143(BaseEffect):
     """
     minmatarShipEwTargetPainterMC2
 
@@ -6322,7 +6326,7 @@ class Effect2143(EffectDef):
                                       skill='Minmatar Cruiser')
 
 
-class Effect2155(EffectDef):
+class Effect2155(BaseEffect):
     """
     eliteBonusCommandShipProjectileDamageCS1
 
@@ -6339,7 +6343,7 @@ class Effect2155(EffectDef):
                                       skill='Command Ships')
 
 
-class Effect2156(EffectDef):
+class Effect2156(BaseEffect):
     """
     eliteBonusCommandShipProjectileFalloffCS2
 
@@ -6355,7 +6359,7 @@ class Effect2156(EffectDef):
                                       'falloff', ship.getModifiedItemAttr('eliteBonusCommandShips2'), skill='Command Ships')
 
 
-class Effect2157(EffectDef):
+class Effect2157(BaseEffect):
     """
     eliteBonusCommandShipLaserDamageCS1
 
@@ -6372,7 +6376,7 @@ class Effect2157(EffectDef):
                                       skill='Command Ships')
 
 
-class Effect2158(EffectDef):
+class Effect2158(BaseEffect):
     """
     eliteBonusCommandShipLaserROFCS2
 
@@ -6388,7 +6392,7 @@ class Effect2158(EffectDef):
                                       'speed', ship.getModifiedItemAttr('eliteBonusCommandShips2'), skill='Command Ships')
 
 
-class Effect2160(EffectDef):
+class Effect2160(BaseEffect):
     """
     eliteBonusCommandShipHybridFalloffCS2
 
@@ -6404,7 +6408,7 @@ class Effect2160(EffectDef):
                                       'falloff', ship.getModifiedItemAttr('eliteBonusCommandShips2'), skill='Command Ships')
 
 
-class Effect2161(EffectDef):
+class Effect2161(BaseEffect):
     """
     eliteBonusCommandShipHybridOptimalCS1
 
@@ -6421,7 +6425,7 @@ class Effect2161(EffectDef):
                                       skill='Command Ships')
 
 
-class Effect2179(EffectDef):
+class Effect2179(BaseEffect):
     """
     shipBonusDroneHitpointsGC2
 
@@ -6440,7 +6444,7 @@ class Effect2179(EffectDef):
                                          type, ship.getModifiedItemAttr('shipBonusGC2'), skill='Gallente Cruiser')
 
 
-class Effect2181(EffectDef):
+class Effect2181(BaseEffect):
     """
     shipBonusDroneHitpointsFixedAC2
 
@@ -6457,7 +6461,7 @@ class Effect2181(EffectDef):
                                          type, ship.getModifiedItemAttr('shipBonusAC2'), skill='Amarr Cruiser')
 
 
-class Effect2186(EffectDef):
+class Effect2186(BaseEffect):
     """
     shipBonusDroneHitpointsGB2
 
@@ -6475,7 +6479,7 @@ class Effect2186(EffectDef):
                                          type, ship.getModifiedItemAttr('shipBonusGB2'), skill='Gallente Battleship')
 
 
-class Effect2187(EffectDef):
+class Effect2187(BaseEffect):
     """
     shipBonusDroneDamageMultiplierGB2
 
@@ -6493,7 +6497,7 @@ class Effect2187(EffectDef):
                                      skill='Gallente Battleship')
 
 
-class Effect2188(EffectDef):
+class Effect2188(BaseEffect):
     """
     shipBonusDroneDamageMultiplierGC2
 
@@ -6511,7 +6515,7 @@ class Effect2188(EffectDef):
                                      'damageMultiplier', ship.getModifiedItemAttr('shipBonusGC2'), skill='Gallente Cruiser')
 
 
-class Effect2189(EffectDef):
+class Effect2189(BaseEffect):
     """
     shipBonusDroneDamageMultiplierAC2
 
@@ -6527,7 +6531,7 @@ class Effect2189(EffectDef):
                                      'damageMultiplier', ship.getModifiedItemAttr('shipBonusAC2'), skill='Amarr Cruiser')
 
 
-class Effect2200(EffectDef):
+class Effect2200(BaseEffect):
     """
     eliteBonusInterdictorsMissileKineticDamage1
 
@@ -6544,7 +6548,7 @@ class Effect2200(EffectDef):
             'kineticDamage', ship.getModifiedItemAttr('eliteBonusInterdictors1'), skill='Interdictors')
 
 
-class Effect2201(EffectDef):
+class Effect2201(BaseEffect):
     """
     eliteBonusInterdictorsProjectileFalloff1
 
@@ -6560,7 +6564,7 @@ class Effect2201(EffectDef):
                                       'falloff', ship.getModifiedItemAttr('eliteBonusInterdictors1'), skill='Interdictors')
 
 
-class Effect2215(EffectDef):
+class Effect2215(BaseEffect):
     """
     shipBonusPirateFrigateProjDamage
 
@@ -6579,7 +6583,7 @@ class Effect2215(EffectDef):
                                       'damageMultiplier', ship.getModifiedItemAttr('shipBonusRole7'))
 
 
-class Effect2232(EffectDef):
+class Effect2232(BaseEffect):
     """
     scanStrengthBonusPercentOnline
 
@@ -6597,7 +6601,7 @@ class Effect2232(EffectDef):
                                    stackingPenalties=True)
 
 
-class Effect2249(EffectDef):
+class Effect2249(BaseEffect):
     """
     shipBonusDroneMiningAmountAC2
 
@@ -6613,7 +6617,7 @@ class Effect2249(EffectDef):
                                      'miningAmount', ship.getModifiedItemAttr('shipBonusAC2'), skill='Amarr Cruiser')
 
 
-class Effect2250(EffectDef):
+class Effect2250(BaseEffect):
     """
     shipBonusDroneMiningAmountGC2
 
@@ -6630,7 +6634,7 @@ class Effect2250(EffectDef):
                                      'miningAmount', ship.getModifiedItemAttr('shipBonusGC2'), skill='Gallente Cruiser')
 
 
-class Effect2251(EffectDef):
+class Effect2251(BaseEffect):
     """
     commandshipMultiRelayEffect
 
@@ -6650,7 +6654,7 @@ class Effect2251(EffectDef):
                                          src.getModifiedItemAttr('maxGangModules'))
 
 
-class Effect2252(EffectDef):
+class Effect2252(BaseEffect):
     """
     covertOpsAndReconOpsCloakModuleDelayBonus
 
@@ -6676,7 +6680,7 @@ class Effect2252(EffectDef):
                                       container.getModifiedItemAttr('covertOpsAndReconOpsCloakModuleDelay'))
 
 
-class Effect2253(EffectDef):
+class Effect2253(BaseEffect):
     """
     covertOpsStealthBomberTargettingDelayBonus
 
@@ -6699,7 +6703,7 @@ class Effect2253(EffectDef):
                                       ship.getModifiedItemAttr('covertOpsStealthBomberTargettingDelay'))
 
 
-class Effect2255(EffectDef):
+class Effect2255(BaseEffect):
     """
     tractorBeamCan
 
@@ -6711,7 +6715,7 @@ class Effect2255(EffectDef):
     type = 'active'
 
 
-class Effect2298(EffectDef):
+class Effect2298(BaseEffect):
     """
     scanStrengthBonusPercentPassive
 
@@ -6730,7 +6734,7 @@ class Effect2298(EffectDef):
                 fit.ship.boostItemAttr(sensorType, implant.getModifiedItemAttr(sensorBoost))
 
 
-class Effect2302(EffectDef):
+class Effect2302(BaseEffect):
     """
     damageControl
 
@@ -6751,7 +6755,7 @@ class Effect2302(EffectDef):
                                           stackingPenalties=True, penaltyGroup='preMul')
 
 
-class Effect2305(EffectDef):
+class Effect2305(BaseEffect):
     """
     eliteReconBonusEnergyNeutAmount2
 
@@ -6769,7 +6773,7 @@ class Effect2305(EffectDef):
                                       skill='Recon Ships')
 
 
-class Effect2354(EffectDef):
+class Effect2354(BaseEffect):
     """
     capitalRemoteArmorRepairerCapNeedBonusSkill
 
@@ -6787,7 +6791,7 @@ class Effect2354(EffectDef):
                                       'capacitorNeed', container.getModifiedItemAttr('capNeedBonus') * level)
 
 
-class Effect2355(EffectDef):
+class Effect2355(BaseEffect):
     """
     capitalRemoteShieldTransferCapNeedBonusSkill
 
@@ -6804,7 +6808,7 @@ class Effect2355(EffectDef):
                                       'capacitorNeed', container.getModifiedItemAttr('capNeedBonus') * level)
 
 
-class Effect2356(EffectDef):
+class Effect2356(BaseEffect):
     """
     capitalRemoteEnergyTransferCapNeedBonusSkill
 
@@ -6820,7 +6824,7 @@ class Effect2356(EffectDef):
                                       'capacitorNeed', skill.getModifiedItemAttr('capNeedBonus') * skill.level)
 
 
-class Effect2402(EffectDef):
+class Effect2402(BaseEffect):
     """
     skillSuperWeaponDmgBonus
 
@@ -6840,7 +6844,7 @@ class Effect2402(EffectDef):
                 dmgAttr, skill.getModifiedItemAttr('damageMultiplierBonus') * skill.level)
 
 
-class Effect2422(EffectDef):
+class Effect2422(BaseEffect):
     """
     implantVelocityBonus
 
@@ -6857,7 +6861,7 @@ class Effect2422(EffectDef):
         fit.ship.boostItemAttr('maxVelocity', implant.getModifiedItemAttr('implantBonusVelocity'))
 
 
-class Effect2432(EffectDef):
+class Effect2432(BaseEffect):
     """
     energyManagementCapacitorBonusPostPercentCapacityLocationShipGroupCapacitorCapacityBonus
 
@@ -6878,7 +6882,7 @@ class Effect2432(EffectDef):
         fit.ship.boostItemAttr('capacitorCapacity', container.getModifiedItemAttr('capacitorCapacityBonus') * level)
 
 
-class Effect2444(EffectDef):
+class Effect2444(BaseEffect):
     """
     minerCpuUsageMultiplyPercent2
 
@@ -6895,7 +6899,7 @@ class Effect2444(EffectDef):
                                       'cpu', module.getModifiedItemAttr('cpuPenaltyPercent'))
 
 
-class Effect2445(EffectDef):
+class Effect2445(BaseEffect):
     """
     iceMinerCpuUsagePercent
 
@@ -6911,7 +6915,7 @@ class Effect2445(EffectDef):
                                       'cpu', module.getModifiedItemAttr('cpuPenaltyPercent'))
 
 
-class Effect2456(EffectDef):
+class Effect2456(BaseEffect):
     """
     miningUpgradeCPUPenaltyReductionModulesRequiringMiningUpgradePercent
 
@@ -6930,7 +6934,7 @@ class Effect2456(EffectDef):
                                       container.getModifiedItemAttr('miningUpgradeCPUReductionBonus') * level)
 
 
-class Effect2465(EffectDef):
+class Effect2465(BaseEffect):
     """
     shipBonusArmorResistAB
 
@@ -6948,7 +6952,7 @@ class Effect2465(EffectDef):
                                    skill='Amarr Battleship')
 
 
-class Effect2479(EffectDef):
+class Effect2479(BaseEffect):
     """
     iceHarvestCycleTimeModulesRequiringIceHarvestingOnline
 
@@ -6965,7 +6969,7 @@ class Effect2479(EffectDef):
                                       'duration', module.getModifiedItemAttr('iceHarvestCycleBonus'))
 
 
-class Effect2485(EffectDef):
+class Effect2485(BaseEffect):
     """
     implantArmorHpBonus2
 
@@ -6983,7 +6987,7 @@ class Effect2485(EffectDef):
         fit.ship.boostItemAttr('armorHP', implant.getModifiedItemAttr('armorHpBonus2'))
 
 
-class Effect2488(EffectDef):
+class Effect2488(BaseEffect):
     """
     implantVelocityBonus2
 
@@ -6998,7 +7002,7 @@ class Effect2488(EffectDef):
         fit.ship.boostItemAttr('maxVelocity', implant.getModifiedItemAttr('velocityBonus2'))
 
 
-class Effect2489(EffectDef):
+class Effect2489(BaseEffect):
     """
     shipBonusRemoteTrackingComputerFalloffMC
 
@@ -7015,7 +7019,7 @@ class Effect2489(EffectDef):
                                       skill='Minmatar Cruiser')
 
 
-class Effect2490(EffectDef):
+class Effect2490(BaseEffect):
     """
     shipBonusRemoteTrackingComputerFalloffGC2
 
@@ -7032,7 +7036,7 @@ class Effect2490(EffectDef):
                                       skill='Gallente Cruiser')
 
 
-class Effect2491(EffectDef):
+class Effect2491(BaseEffect):
     """
     ewSkillEcmBurstRangeBonus
 
@@ -7051,7 +7055,7 @@ class Effect2491(EffectDef):
                                       stackingPenalties=False if 'skill' in context else True)
 
 
-class Effect2492(EffectDef):
+class Effect2492(BaseEffect):
     """
     ewSkillEcmBurstCapNeedBonus
 
@@ -7070,7 +7074,7 @@ class Effect2492(EffectDef):
                                       'capacitorNeed', container.getModifiedItemAttr('capNeedBonus') * level)
 
 
-class Effect2503(EffectDef):
+class Effect2503(BaseEffect):
     """
     shipHTTrackingBonusGB2
 
@@ -7088,7 +7092,7 @@ class Effect2503(EffectDef):
                                       skill='Gallente Battleship')
 
 
-class Effect2504(EffectDef):
+class Effect2504(BaseEffect):
     """
     shipBonusHybridTrackingGF2
 
@@ -7107,7 +7111,7 @@ class Effect2504(EffectDef):
                                       'trackingSpeed', ship.getModifiedItemAttr('shipBonusGF2'), skill='Gallente Frigate')
 
 
-class Effect2561(EffectDef):
+class Effect2561(BaseEffect):
     """
     eliteBonusAssaultShipMissileVelocity1
 
@@ -7124,7 +7128,7 @@ class Effect2561(EffectDef):
                                         skill='Assault Frigates')
 
 
-class Effect2589(EffectDef):
+class Effect2589(BaseEffect):
     """
     modifyBoosterEffectChanceWithBoosterChanceBonusPostPercent
 
@@ -7144,7 +7148,7 @@ class Effect2589(EffectDef):
                                            attr, container.getModifiedItemAttr('boosterChanceBonus') * level)
 
 
-class Effect2602(EffectDef):
+class Effect2602(BaseEffect):
     """
     shipBonusEmShieldResistanceCB2
 
@@ -7162,7 +7166,7 @@ class Effect2602(EffectDef):
                                skill='Caldari Battleship')
 
 
-class Effect2603(EffectDef):
+class Effect2603(BaseEffect):
     """
     shipBonusExplosiveShieldResistanceCB2
 
@@ -7180,7 +7184,7 @@ class Effect2603(EffectDef):
                                skill='Caldari Battleship')
 
 
-class Effect2604(EffectDef):
+class Effect2604(BaseEffect):
     """
     shipBonusKineticShieldResistanceCB2
 
@@ -7198,7 +7202,7 @@ class Effect2604(EffectDef):
                                skill='Caldari Battleship')
 
 
-class Effect2605(EffectDef):
+class Effect2605(BaseEffect):
     """
     shipBonusThermicShieldResistanceCB2
 
@@ -7216,7 +7220,7 @@ class Effect2605(EffectDef):
                                skill='Caldari Battleship')
 
 
-class Effect2611(EffectDef):
+class Effect2611(BaseEffect):
     """
     eliteBonusGunshipProjectileDamage1
 
@@ -7233,7 +7237,7 @@ class Effect2611(EffectDef):
                                       skill='Assault Frigates')
 
 
-class Effect2644(EffectDef):
+class Effect2644(BaseEffect):
     """
     increaseSignatureRadiusOnline
 
@@ -7248,7 +7252,7 @@ class Effect2644(EffectDef):
         fit.ship.boostItemAttr('signatureRadius', module.getModifiedItemAttr('signatureRadiusBonus'), stackingPenalties=True)
 
 
-class Effect2645(EffectDef):
+class Effect2645(BaseEffect):
     """
     scanResolutionMultiplierOnline
 
@@ -7265,7 +7269,7 @@ class Effect2645(EffectDef):
                                   stackingPenalties=True)
 
 
-class Effect2646(EffectDef):
+class Effect2646(BaseEffect):
     """
     maxTargetRangeBonus
 
@@ -7281,7 +7285,7 @@ class Effect2646(EffectDef):
                                stackingPenalties=True)
 
 
-class Effect2647(EffectDef):
+class Effect2647(BaseEffect):
     """
     eliteBonusHeavyGunshipHeavyMissileLaunhcerRof2
 
@@ -7298,7 +7302,7 @@ class Effect2647(EffectDef):
                                       skill='Heavy Assault Cruisers')
 
 
-class Effect2648(EffectDef):
+class Effect2648(BaseEffect):
     """
     eliteBonusHeavyGunshipHeavyAssaultMissileLaunhcerRof2
 
@@ -7315,7 +7319,7 @@ class Effect2648(EffectDef):
                                       skill='Heavy Assault Cruisers')
 
 
-class Effect2649(EffectDef):
+class Effect2649(BaseEffect):
     """
     eliteBonusHeavyGunshipAssaultMissileLaunhcerRof2
 
@@ -7332,7 +7336,7 @@ class Effect2649(EffectDef):
                                       skill='Heavy Assault Cruisers')
 
 
-class Effect2670(EffectDef):
+class Effect2670(BaseEffect):
     """
     sensorBoosterActivePercentage
 
@@ -7357,7 +7361,7 @@ class Effect2670(EffectDef):
             )
 
 
-class Effect2688(EffectDef):
+class Effect2688(BaseEffect):
     """
     capNeedBonusEffectLasers
 
@@ -7373,7 +7377,7 @@ class Effect2688(EffectDef):
                                       'capacitorNeed', module.getModifiedItemAttr('capNeedBonus'))
 
 
-class Effect2689(EffectDef):
+class Effect2689(BaseEffect):
     """
     capNeedBonusEffectHybrids
 
@@ -7389,7 +7393,7 @@ class Effect2689(EffectDef):
                                       'capacitorNeed', module.getModifiedItemAttr('capNeedBonus'))
 
 
-class Effect2690(EffectDef):
+class Effect2690(BaseEffect):
     """
     cpuNeedBonusEffectLasers
 
@@ -7405,7 +7409,7 @@ class Effect2690(EffectDef):
                                       'cpu', module.getModifiedItemAttr('cpuNeedBonus'))
 
 
-class Effect2691(EffectDef):
+class Effect2691(BaseEffect):
     """
     cpuNeedBonusEffectHybrid
 
@@ -7421,7 +7425,7 @@ class Effect2691(EffectDef):
                                       'cpu', module.getModifiedItemAttr('cpuNeedBonus'))
 
 
-class Effect2693(EffectDef):
+class Effect2693(BaseEffect):
     """
     falloffBonusEffectLasers
 
@@ -7438,7 +7442,7 @@ class Effect2693(EffectDef):
                                       stackingPenalties=True)
 
 
-class Effect2694(EffectDef):
+class Effect2694(BaseEffect):
     """
     falloffBonusEffectHybrids
 
@@ -7455,7 +7459,7 @@ class Effect2694(EffectDef):
                                       stackingPenalties=True)
 
 
-class Effect2695(EffectDef):
+class Effect2695(BaseEffect):
     """
     falloffBonusEffectProjectiles
 
@@ -7472,7 +7476,7 @@ class Effect2695(EffectDef):
                                       stackingPenalties=True)
 
 
-class Effect2696(EffectDef):
+class Effect2696(BaseEffect):
     """
     maxRangeBonusEffectLasers
 
@@ -7489,7 +7493,7 @@ class Effect2696(EffectDef):
                                       stackingPenalties=True)
 
 
-class Effect2697(EffectDef):
+class Effect2697(BaseEffect):
     """
     maxRangeBonusEffectHybrids
 
@@ -7506,7 +7510,7 @@ class Effect2697(EffectDef):
                                       stackingPenalties=True)
 
 
-class Effect2698(EffectDef):
+class Effect2698(BaseEffect):
     """
     maxRangeBonusEffectProjectiles
 
@@ -7523,7 +7527,7 @@ class Effect2698(EffectDef):
                                       stackingPenalties=True)
 
 
-class Effect2706(EffectDef):
+class Effect2706(BaseEffect):
     """
     drawbackPowerNeedLasers
 
@@ -7539,7 +7543,7 @@ class Effect2706(EffectDef):
                                       'power', module.getModifiedItemAttr('drawback'))
 
 
-class Effect2707(EffectDef):
+class Effect2707(BaseEffect):
     """
     drawbackPowerNeedHybrids
 
@@ -7555,7 +7559,7 @@ class Effect2707(EffectDef):
                                       'power', module.getModifiedItemAttr('drawback'))
 
 
-class Effect2708(EffectDef):
+class Effect2708(BaseEffect):
     """
     drawbackPowerNeedProjectiles
 
@@ -7571,7 +7575,7 @@ class Effect2708(EffectDef):
                                       'power', module.getModifiedItemAttr('drawback'))
 
 
-class Effect2712(EffectDef):
+class Effect2712(BaseEffect):
     """
     drawbackArmorHP
 
@@ -7586,7 +7590,7 @@ class Effect2712(EffectDef):
         fit.ship.boostItemAttr('armorHP', module.getModifiedItemAttr('drawback'))
 
 
-class Effect2713(EffectDef):
+class Effect2713(BaseEffect):
     """
     drawbackCPUOutput
 
@@ -7601,7 +7605,7 @@ class Effect2713(EffectDef):
         fit.ship.boostItemAttr('cpuOutput', module.getModifiedItemAttr('drawback'))
 
 
-class Effect2714(EffectDef):
+class Effect2714(BaseEffect):
     """
     drawbackCPUNeedLaunchers
 
@@ -7617,7 +7621,7 @@ class Effect2714(EffectDef):
                                       'cpu', module.getModifiedItemAttr('drawback'))
 
 
-class Effect2716(EffectDef):
+class Effect2716(BaseEffect):
     """
     drawbackSigRad
 
@@ -7633,7 +7637,7 @@ class Effect2716(EffectDef):
         fit.ship.boostItemAttr('signatureRadius', module.getModifiedItemAttr('drawback'), stackingPenalties=True)
 
 
-class Effect2717(EffectDef):
+class Effect2717(BaseEffect):
     """
     drawbackMaxVelocity
 
@@ -7650,7 +7654,7 @@ class Effect2717(EffectDef):
                                stackingPenalties=True)
 
 
-class Effect2718(EffectDef):
+class Effect2718(BaseEffect):
     """
     drawbackShieldCapacity
 
@@ -7667,7 +7671,7 @@ class Effect2718(EffectDef):
         fit.ship.boostItemAttr('shieldCapacity', module.getModifiedItemAttr('drawback'))
 
 
-class Effect2726(EffectDef):
+class Effect2726(BaseEffect):
     """
     miningClouds
 
@@ -7678,7 +7682,7 @@ class Effect2726(EffectDef):
     type = 'active'
 
 
-class Effect2727(EffectDef):
+class Effect2727(BaseEffect):
     """
     gasCloudHarvestingMaxGroupSkillLevel
 
@@ -7694,7 +7698,7 @@ class Effect2727(EffectDef):
                                          'maxGroupActive', skill.level)
 
 
-class Effect2734(EffectDef):
+class Effect2734(BaseEffect):
     """
     shipECMScanStrengthBonusCF
 
@@ -7712,7 +7716,7 @@ class Effect2734(EffectDef):
                                           ship.getModifiedItemAttr('shipBonusCF'), skill='Caldari Frigate')
 
 
-class Effect2735(EffectDef):
+class Effect2735(BaseEffect):
     """
     boosterArmorHpPenalty
 
@@ -7729,7 +7733,7 @@ class Effect2735(EffectDef):
         fit.ship.boostItemAttr('armorHP', booster.getModifiedItemAttr(cls.attr))
 
 
-class Effect2736(EffectDef):
+class Effect2736(BaseEffect):
     """
     boosterArmorRepairAmountPenalty
 
@@ -7749,7 +7753,7 @@ class Effect2736(EffectDef):
                                       'armorDamageAmount', booster.getModifiedItemAttr(cls.attr))
 
 
-class Effect2737(EffectDef):
+class Effect2737(BaseEffect):
     """
     boosterShieldCapacityPenalty
 
@@ -7766,7 +7770,7 @@ class Effect2737(EffectDef):
         fit.ship.boostItemAttr('shieldCapacity', booster.getModifiedItemAttr(cls.attr))
 
 
-class Effect2739(EffectDef):
+class Effect2739(BaseEffect):
     """
     boosterTurretOptimalRangePenalty
 
@@ -7786,7 +7790,7 @@ class Effect2739(EffectDef):
                                       'maxRange', booster.getModifiedItemAttr(cls.attr))
 
 
-class Effect2741(EffectDef):
+class Effect2741(BaseEffect):
     """
     boosterTurretFalloffPenalty
 
@@ -7805,7 +7809,7 @@ class Effect2741(EffectDef):
                                       'falloff', booster.getModifiedItemAttr(cls.attr))
 
 
-class Effect2745(EffectDef):
+class Effect2745(BaseEffect):
     """
     boosterCapacitorCapacityPenalty
 
@@ -7823,7 +7827,7 @@ class Effect2745(EffectDef):
         fit.ship.boostItemAttr('capacitorCapacity', booster.getModifiedItemAttr(cls.attr))
 
 
-class Effect2746(EffectDef):
+class Effect2746(BaseEffect):
     """
     boosterMaxVelocityPenalty
 
@@ -7841,7 +7845,7 @@ class Effect2746(EffectDef):
         fit.ship.boostItemAttr('maxVelocity', booster.getModifiedItemAttr(cls.attr))
 
 
-class Effect2747(EffectDef):
+class Effect2747(BaseEffect):
     """
     boosterTurretTrackingPenalty
 
@@ -7860,7 +7864,7 @@ class Effect2747(EffectDef):
                                       'trackingSpeed', booster.getModifiedItemAttr(cls.attr))
 
 
-class Effect2748(EffectDef):
+class Effect2748(BaseEffect):
     """
     boosterMissileVelocityPenalty
 
@@ -7879,7 +7883,7 @@ class Effect2748(EffectDef):
                                         'maxVelocity', booster.getModifiedItemAttr(cls.attr))
 
 
-class Effect2749(EffectDef):
+class Effect2749(BaseEffect):
     """
     boosterMissileExplosionVelocityPenalty
 
@@ -7897,7 +7901,7 @@ class Effect2749(EffectDef):
                                         'aoeVelocity', booster.getModifiedItemAttr(cls.attr))
 
 
-class Effect2756(EffectDef):
+class Effect2756(BaseEffect):
     """
     shipBonusECMStrengthBonusCC
 
@@ -7915,7 +7919,7 @@ class Effect2756(EffectDef):
                                           skill='Caldari Cruiser')
 
 
-class Effect2757(EffectDef):
+class Effect2757(BaseEffect):
     """
     salvaging
 
@@ -7926,7 +7930,7 @@ class Effect2757(EffectDef):
     type = 'active'
 
 
-class Effect2760(EffectDef):
+class Effect2760(BaseEffect):
     """
     boosterModifyBoosterArmorPenalties
 
@@ -7948,7 +7952,7 @@ class Effect2760(EffectDef):
                                            container.getModifiedItemAttr('boosterAttributeModifier') * level)
 
 
-class Effect2763(EffectDef):
+class Effect2763(BaseEffect):
     """
     boosterModifyBoosterShieldPenalty
 
@@ -7971,7 +7975,7 @@ class Effect2763(EffectDef):
                                            attr, container.getModifiedItemAttr('boosterAttributeModifier') * level)
 
 
-class Effect2766(EffectDef):
+class Effect2766(BaseEffect):
     """
     boosterModifyBoosterMaxVelocityAndCapacitorPenalty
 
@@ -7992,7 +7996,7 @@ class Effect2766(EffectDef):
                                            container.getModifiedItemAttr('boosterAttributeModifier') * level)
 
 
-class Effect2776(EffectDef):
+class Effect2776(BaseEffect):
     """
     boosterModifyBoosterMissilePenalty
 
@@ -8013,7 +8017,7 @@ class Effect2776(EffectDef):
                                            container.getModifiedItemAttr('boosterAttributeModifier') * level)
 
 
-class Effect2778(EffectDef):
+class Effect2778(BaseEffect):
     """
     boosterModifyBoosterTurretPenalty
 
@@ -8034,7 +8038,7 @@ class Effect2778(EffectDef):
                                            container.getModifiedItemAttr('boosterAttributeModifier') * level)
 
 
-class Effect2791(EffectDef):
+class Effect2791(BaseEffect):
     """
     boosterMissileExplosionCloudPenaltyFixed
 
@@ -8053,7 +8057,7 @@ class Effect2791(EffectDef):
                                         'aoeCloudSize', booster.getModifiedItemAttr(cls.attr))
 
 
-class Effect2792(EffectDef):
+class Effect2792(BaseEffect):
     """
     modifyArmorResonancePostPercentPassive
 
@@ -8071,7 +8075,7 @@ class Effect2792(EffectDef):
                                    stackingPenalties=True)
 
 
-class Effect2794(EffectDef):
+class Effect2794(BaseEffect):
     """
     salvagingAccessDifficultyBonusEffectPassive
 
@@ -8089,7 +8093,7 @@ class Effect2794(EffectDef):
                                          position='post')
 
 
-class Effect2795(EffectDef):
+class Effect2795(BaseEffect):
     """
     modifyShieldResonancePostPercentPassive
 
@@ -8107,7 +8111,7 @@ class Effect2795(EffectDef):
                                    stackingPenalties=True)
 
 
-class Effect2796(EffectDef):
+class Effect2796(BaseEffect):
     """
     massReductionBonusPassive
 
@@ -8122,7 +8126,7 @@ class Effect2796(EffectDef):
         fit.ship.boostItemAttr('mass', module.getModifiedItemAttr('massBonusPercentage'), stackingPenalties=True)
 
 
-class Effect2797(EffectDef):
+class Effect2797(BaseEffect):
     """
     projectileWeaponSpeedMultiplyPassive
 
@@ -8139,7 +8143,7 @@ class Effect2797(EffectDef):
                                          stackingPenalties=True)
 
 
-class Effect2798(EffectDef):
+class Effect2798(BaseEffect):
     """
     projectileWeaponDamageMultiplyPassive
 
@@ -8156,7 +8160,7 @@ class Effect2798(EffectDef):
                                          stackingPenalties=True)
 
 
-class Effect2799(EffectDef):
+class Effect2799(BaseEffect):
     """
     missileLauncherSpeedMultiplierPassive
 
@@ -8173,7 +8177,7 @@ class Effect2799(EffectDef):
                                          stackingPenalties=True)
 
 
-class Effect2801(EffectDef):
+class Effect2801(BaseEffect):
     """
     energyWeaponSpeedMultiplyPassive
 
@@ -8190,7 +8194,7 @@ class Effect2801(EffectDef):
                                          stackingPenalties=True)
 
 
-class Effect2802(EffectDef):
+class Effect2802(BaseEffect):
     """
     hybridWeaponDamageMultiplyPassive
 
@@ -8207,7 +8211,7 @@ class Effect2802(EffectDef):
                                          stackingPenalties=True)
 
 
-class Effect2803(EffectDef):
+class Effect2803(BaseEffect):
     """
     energyWeaponDamageMultiplyPassive
 
@@ -8224,7 +8228,7 @@ class Effect2803(EffectDef):
                                          stackingPenalties=True)
 
 
-class Effect2804(EffectDef):
+class Effect2804(BaseEffect):
     """
     hybridWeaponSpeedMultiplyPassive
 
@@ -8241,7 +8245,7 @@ class Effect2804(EffectDef):
                                          stackingPenalties=True)
 
 
-class Effect2805(EffectDef):
+class Effect2805(BaseEffect):
     """
     shipBonusLargeEnergyWeaponDamageAB2
 
@@ -8259,7 +8263,7 @@ class Effect2805(EffectDef):
                                       skill='Amarr Battleship')
 
 
-class Effect2809(EffectDef):
+class Effect2809(BaseEffect):
     """
     shipMissileAssaultMissileVelocityBonusCC2
 
@@ -8276,7 +8280,7 @@ class Effect2809(EffectDef):
                                         'maxVelocity', ship.getModifiedItemAttr('shipBonusCC2'), skill='Caldari Cruiser')
 
 
-class Effect2810(EffectDef):
+class Effect2810(BaseEffect):
     """
     eliteBonusHeavyGunshipAssaultMissileFlightTime1
 
@@ -8293,7 +8297,7 @@ class Effect2810(EffectDef):
                                         skill='Heavy Assault Cruisers')
 
 
-class Effect2812(EffectDef):
+class Effect2812(BaseEffect):
     """
     caldariShipECMBurstOptimalRangeCB3
 
@@ -8309,7 +8313,7 @@ class Effect2812(EffectDef):
                                       'ecmBurstRange', ship.getModifiedItemAttr('shipBonusCB3'), skill='Caldari Battleship')
 
 
-class Effect2837(EffectDef):
+class Effect2837(BaseEffect):
     """
     armorHPBonusAdd
 
@@ -8324,7 +8328,7 @@ class Effect2837(EffectDef):
         fit.ship.increaseItemAttr('armorHP', module.getModifiedItemAttr('armorHPBonusAdd'))
 
 
-class Effect2847(EffectDef):
+class Effect2847(BaseEffect):
     """
     trackingSpeedBonusPassiveRequiringGunneryTrackingSpeedBonus
 
@@ -8345,7 +8349,7 @@ class Effect2847(EffectDef):
                                       'trackingSpeed', container.getModifiedItemAttr('trackingSpeedBonus') * level)
 
 
-class Effect2848(EffectDef):
+class Effect2848(BaseEffect):
     """
     accessDifficultyBonusModifierRequiringArchaelogy
 
@@ -8364,7 +8368,7 @@ class Effect2848(EffectDef):
                                          container.getModifiedItemAttr('accessDifficultyBonusModifier'), position='post')
 
 
-class Effect2849(EffectDef):
+class Effect2849(BaseEffect):
     """
     accessDifficultyBonusModifierRequiringHacking
 
@@ -8384,7 +8388,7 @@ class Effect2849(EffectDef):
                                          container.getModifiedItemAttr('accessDifficultyBonusModifier'), position='post')
 
 
-class Effect2850(EffectDef):
+class Effect2850(BaseEffect):
     """
     durationBonusForGroupAfterburner
 
@@ -8400,7 +8404,7 @@ class Effect2850(EffectDef):
                                       'duration', module.getModifiedItemAttr('durationBonus'))
 
 
-class Effect2851(EffectDef):
+class Effect2851(BaseEffect):
     """
     missileDMGBonusPassive
 
@@ -8419,7 +8423,7 @@ class Effect2851(EffectDef):
                                                stackingPenalties=True)
 
 
-class Effect2853(EffectDef):
+class Effect2853(BaseEffect):
     """
     cloakingTargetingDelayBonusLRSMCloakingPassive
 
@@ -8435,7 +8439,7 @@ class Effect2853(EffectDef):
                                       'cloakingTargetingDelay', module.getModifiedItemAttr('cloakingTargetingDelayBonus'))
 
 
-class Effect2857(EffectDef):
+class Effect2857(BaseEffect):
     """
     cynosuralGeneration
 
@@ -8450,7 +8454,7 @@ class Effect2857(EffectDef):
         fit.ship.boostItemAttr('maxVelocity', module.getModifiedItemAttr('speedFactor'))
 
 
-class Effect2865(EffectDef):
+class Effect2865(BaseEffect):
     """
     velocityBonusOnline
 
@@ -8468,7 +8472,7 @@ class Effect2865(EffectDef):
                                stackingPenalties=True)
 
 
-class Effect2866(EffectDef):
+class Effect2866(BaseEffect):
     """
     biologyTimeBonusFixed
 
@@ -8486,7 +8490,7 @@ class Effect2866(EffectDef):
                                        container.getModifiedItemAttr('durationBonus') * level)
 
 
-class Effect2867(EffectDef):
+class Effect2867(BaseEffect):
     """
     sentryDroneDamageBonus
 
@@ -8503,7 +8507,7 @@ class Effect2867(EffectDef):
                                      stackingPenalties=True)
 
 
-class Effect2868(EffectDef):
+class Effect2868(BaseEffect):
     """
     armorDamageAmountBonusCapitalArmorRepairers
 
@@ -8520,7 +8524,7 @@ class Effect2868(EffectDef):
                                       stackingPenalties=True)
 
 
-class Effect2872(EffectDef):
+class Effect2872(BaseEffect):
     """
     missileVelocityBonusDefender
 
@@ -8536,7 +8540,7 @@ class Effect2872(EffectDef):
                                            'maxVelocity', container.getModifiedItemAttr('missileVelocityBonus'))
 
 
-class Effect2881(EffectDef):
+class Effect2881(BaseEffect):
     """
     missileEMDmgBonusCruise3
 
@@ -8552,7 +8556,7 @@ class Effect2881(EffectDef):
                                         'emDamage', implant.getModifiedItemAttr('damageMultiplierBonus'))
 
 
-class Effect2882(EffectDef):
+class Effect2882(BaseEffect):
     """
     missileExplosiveDmgBonusCruise3
 
@@ -8568,7 +8572,7 @@ class Effect2882(EffectDef):
                                         'explosiveDamage', container.getModifiedItemAttr('damageMultiplierBonus'))
 
 
-class Effect2883(EffectDef):
+class Effect2883(BaseEffect):
     """
     missileKineticDmgBonusCruise3
 
@@ -8584,7 +8588,7 @@ class Effect2883(EffectDef):
                                         'kineticDamage', container.getModifiedItemAttr('damageMultiplierBonus'))
 
 
-class Effect2884(EffectDef):
+class Effect2884(BaseEffect):
     """
     missileThermalDmgBonusCruise3
 
@@ -8600,7 +8604,7 @@ class Effect2884(EffectDef):
                                         'thermalDamage', container.getModifiedItemAttr('damageMultiplierBonus'))
 
 
-class Effect2885(EffectDef):
+class Effect2885(BaseEffect):
     """
     gasHarvestingCycleTimeModulesRequiringGasCloudHarvesting
 
@@ -8616,7 +8620,7 @@ class Effect2885(EffectDef):
                                       'duration', implant.getModifiedItemAttr('durationBonus'))
 
 
-class Effect2887(EffectDef):
+class Effect2887(BaseEffect):
     """
     missileEMDmgBonusRocket
 
@@ -8632,7 +8636,7 @@ class Effect2887(EffectDef):
                                         'emDamage', implant.getModifiedItemAttr('damageMultiplierBonus'))
 
 
-class Effect2888(EffectDef):
+class Effect2888(BaseEffect):
     """
     missileExplosiveDmgBonusRocket
 
@@ -8648,7 +8652,7 @@ class Effect2888(EffectDef):
                                         'explosiveDamage', container.getModifiedItemAttr('damageMultiplierBonus'))
 
 
-class Effect2889(EffectDef):
+class Effect2889(BaseEffect):
     """
     missileKineticDmgBonusRocket
 
@@ -8664,7 +8668,7 @@ class Effect2889(EffectDef):
                                         'kineticDamage', container.getModifiedItemAttr('damageMultiplierBonus'))
 
 
-class Effect2890(EffectDef):
+class Effect2890(BaseEffect):
     """
     missileThermalDmgBonusRocket
 
@@ -8680,7 +8684,7 @@ class Effect2890(EffectDef):
                                         'thermalDamage', container.getModifiedItemAttr('damageMultiplierBonus'))
 
 
-class Effect2891(EffectDef):
+class Effect2891(BaseEffect):
     """
     missileEMDmgBonusStandard
 
@@ -8696,7 +8700,7 @@ class Effect2891(EffectDef):
                                         'emDamage', implant.getModifiedItemAttr('damageMultiplierBonus'))
 
 
-class Effect2892(EffectDef):
+class Effect2892(BaseEffect):
     """
     missileExplosiveDmgBonusStandard
 
@@ -8712,7 +8716,7 @@ class Effect2892(EffectDef):
                                         'explosiveDamage', container.getModifiedItemAttr('damageMultiplierBonus'))
 
 
-class Effect2893(EffectDef):
+class Effect2893(BaseEffect):
     """
     missileKineticDmgBonusStandard
 
@@ -8728,7 +8732,7 @@ class Effect2893(EffectDef):
                                         'kineticDamage', container.getModifiedItemAttr('damageMultiplierBonus'))
 
 
-class Effect2894(EffectDef):
+class Effect2894(BaseEffect):
     """
     missileThermalDmgBonusStandard
 
@@ -8744,7 +8748,7 @@ class Effect2894(EffectDef):
                                         'thermalDamage', container.getModifiedItemAttr('damageMultiplierBonus'))
 
 
-class Effect2899(EffectDef):
+class Effect2899(BaseEffect):
     """
     missileEMDmgBonusHeavy
 
@@ -8760,7 +8764,7 @@ class Effect2899(EffectDef):
                                         'emDamage', implant.getModifiedItemAttr('damageMultiplierBonus'))
 
 
-class Effect2900(EffectDef):
+class Effect2900(BaseEffect):
     """
     missileExplosiveDmgBonusHeavy
 
@@ -8776,7 +8780,7 @@ class Effect2900(EffectDef):
                                         'explosiveDamage', container.getModifiedItemAttr('damageMultiplierBonus'))
 
 
-class Effect2901(EffectDef):
+class Effect2901(BaseEffect):
     """
     missileKineticDmgBonusHeavy
 
@@ -8792,7 +8796,7 @@ class Effect2901(EffectDef):
                                         'kineticDamage', container.getModifiedItemAttr('damageMultiplierBonus'))
 
 
-class Effect2902(EffectDef):
+class Effect2902(BaseEffect):
     """
     missileThermalDmgBonusHeavy
 
@@ -8808,7 +8812,7 @@ class Effect2902(EffectDef):
                                         'thermalDamage', container.getModifiedItemAttr('damageMultiplierBonus'))
 
 
-class Effect2903(EffectDef):
+class Effect2903(BaseEffect):
     """
     missileEMDmgBonusHAM
 
@@ -8824,7 +8828,7 @@ class Effect2903(EffectDef):
                                         'emDamage', implant.getModifiedItemAttr('damageMultiplierBonus'))
 
 
-class Effect2904(EffectDef):
+class Effect2904(BaseEffect):
     """
     missileExplosiveDmgBonusHAM
 
@@ -8840,7 +8844,7 @@ class Effect2904(EffectDef):
                                         'explosiveDamage', container.getModifiedItemAttr('damageMultiplierBonus'))
 
 
-class Effect2905(EffectDef):
+class Effect2905(BaseEffect):
     """
     missileKineticDmgBonusHAM
 
@@ -8856,7 +8860,7 @@ class Effect2905(EffectDef):
                                         'kineticDamage', container.getModifiedItemAttr('damageMultiplierBonus'))
 
 
-class Effect2906(EffectDef):
+class Effect2906(BaseEffect):
     """
     missileThermalDmgBonusHAM
 
@@ -8872,7 +8876,7 @@ class Effect2906(EffectDef):
                                         'thermalDamage', container.getModifiedItemAttr('damageMultiplierBonus'))
 
 
-class Effect2907(EffectDef):
+class Effect2907(BaseEffect):
     """
     missileEMDmgBonusTorpedo
 
@@ -8888,7 +8892,7 @@ class Effect2907(EffectDef):
                                         'emDamage', implant.getModifiedItemAttr('damageMultiplierBonus'))
 
 
-class Effect2908(EffectDef):
+class Effect2908(BaseEffect):
     """
     missileExplosiveDmgBonusTorpedo
 
@@ -8904,7 +8908,7 @@ class Effect2908(EffectDef):
                                         'explosiveDamage', container.getModifiedItemAttr('damageMultiplierBonus'))
 
 
-class Effect2909(EffectDef):
+class Effect2909(BaseEffect):
     """
     missileKineticDmgBonusTorpedo
 
@@ -8920,7 +8924,7 @@ class Effect2909(EffectDef):
                                         'kineticDamage', container.getModifiedItemAttr('damageMultiplierBonus'))
 
 
-class Effect2910(EffectDef):
+class Effect2910(BaseEffect):
     """
     missileThermalDmgBonusTorpedo
 
@@ -8936,7 +8940,7 @@ class Effect2910(EffectDef):
                                         'thermalDamage', container.getModifiedItemAttr('damageMultiplierBonus'))
 
 
-class Effect2911(EffectDef):
+class Effect2911(BaseEffect):
     """
     dataminerModuleDurationReduction
 
@@ -8952,7 +8956,7 @@ class Effect2911(EffectDef):
                                       'duration', implant.getModifiedItemAttr('durationBonus'))
 
 
-class Effect2967(EffectDef):
+class Effect2967(BaseEffect):
     """
     skillTriageModuleConsumptionQuantityBonus
 
@@ -8969,7 +8973,7 @@ class Effect2967(EffectDef):
                                          'consumptionQuantity', amount * skill.level)
 
 
-class Effect2979(EffectDef):
+class Effect2979(BaseEffect):
     """
     skillRemoteHullRepairSystemsCapNeedBonus
 
@@ -8985,7 +8989,7 @@ class Effect2979(EffectDef):
                                       'capacitorNeed', skill.getModifiedItemAttr('capNeedBonus') * skill.level)
 
 
-class Effect2980(EffectDef):
+class Effect2980(BaseEffect):
     """
     skillCapitalRemoteHullRepairSystemsCapNeedBonus
 
@@ -9001,7 +9005,7 @@ class Effect2980(EffectDef):
                                       'capacitorNeed', skill.getModifiedItemAttr('capNeedBonus') * skill.level)
 
 
-class Effect2982(EffectDef):
+class Effect2982(BaseEffect):
     """
     skillRemoteECMDurationBonus
 
@@ -9040,7 +9044,7 @@ class Effect2982(EffectDef):
                                       skill.getModifiedItemAttr('projECMDurationBonus') * skill.level)
 
 
-class Effect3001(EffectDef):
+class Effect3001(BaseEffect):
     """
     overloadRofBonus
 
@@ -9057,7 +9061,7 @@ class Effect3001(EffectDef):
         module.boostItemAttr('speed', module.getModifiedItemAttr('overloadRofBonus'))
 
 
-class Effect3002(EffectDef):
+class Effect3002(BaseEffect):
     """
     overloadSelfDurationBonus
 
@@ -9084,7 +9088,7 @@ class Effect3002(EffectDef):
         module.boostItemAttr('duration', module.getModifiedItemAttr('overloadSelfDurationBonus') or 0)
 
 
-class Effect3024(EffectDef):
+class Effect3024(BaseEffect):
     """
     eliteBonusCoverOpsBombExplosiveDmg1
 
@@ -9102,7 +9106,7 @@ class Effect3024(EffectDef):
                                         skill='Covert Ops')
 
 
-class Effect3025(EffectDef):
+class Effect3025(BaseEffect):
     """
     overloadSelfDamageBonus
 
@@ -9120,7 +9124,7 @@ class Effect3025(EffectDef):
         module.boostItemAttr('damageMultiplier', module.getModifiedItemAttr('overloadDamageModifier'))
 
 
-class Effect3026(EffectDef):
+class Effect3026(BaseEffect):
     """
     eliteBonusCoverOpsBombKineticDmg1
 
@@ -9137,7 +9141,7 @@ class Effect3026(EffectDef):
                                         skill='Covert Ops')
 
 
-class Effect3027(EffectDef):
+class Effect3027(BaseEffect):
     """
     eliteBonusCoverOpsBombThermalDmg1
 
@@ -9155,7 +9159,7 @@ class Effect3027(EffectDef):
                                         skill='Covert Ops')
 
 
-class Effect3028(EffectDef):
+class Effect3028(BaseEffect):
     """
     eliteBonusCoverOpsBombEmDmg1
 
@@ -9171,7 +9175,7 @@ class Effect3028(EffectDef):
                                         'emDamage', ship.getModifiedItemAttr('eliteBonusCovertOps1'), skill='Covert Ops')
 
 
-class Effect3029(EffectDef):
+class Effect3029(BaseEffect):
     """
     overloadSelfEmHardeningBonus
 
@@ -9188,7 +9192,7 @@ class Effect3029(EffectDef):
         module.boostItemAttr('emDamageResistanceBonus', module.getModifiedItemAttr('overloadHardeningBonus'))
 
 
-class Effect3030(EffectDef):
+class Effect3030(BaseEffect):
     """
     overloadSelfThermalHardeningBonus
 
@@ -9205,7 +9209,7 @@ class Effect3030(EffectDef):
         module.boostItemAttr('thermalDamageResistanceBonus', module.getModifiedItemAttr('overloadHardeningBonus'))
 
 
-class Effect3031(EffectDef):
+class Effect3031(BaseEffect):
     """
     overloadSelfExplosiveHardeningBonus
 
@@ -9222,7 +9226,7 @@ class Effect3031(EffectDef):
         module.boostItemAttr('explosiveDamageResistanceBonus', module.getModifiedItemAttr('overloadHardeningBonus'))
 
 
-class Effect3032(EffectDef):
+class Effect3032(BaseEffect):
     """
     overloadSelfKineticHardeningBonus
 
@@ -9239,7 +9243,7 @@ class Effect3032(EffectDef):
         module.boostItemAttr('kineticDamageResistanceBonus', module.getModifiedItemAttr('overloadHardeningBonus'))
 
 
-class Effect3035(EffectDef):
+class Effect3035(BaseEffect):
     """
     overloadSelfHardeningInvulnerabilityBonus
 
@@ -9257,7 +9261,7 @@ class Effect3035(EffectDef):
                                  module.getModifiedItemAttr('overloadHardeningBonus'))
 
 
-class Effect3036(EffectDef):
+class Effect3036(BaseEffect):
     """
     skillBombDeploymentModuleReactivationDelayBonus
 
@@ -9273,7 +9277,7 @@ class Effect3036(EffectDef):
                                       'moduleReactivationDelay', skill.getModifiedItemAttr('reactivationDelayBonus') * skill.level)
 
 
-class Effect3046(EffectDef):
+class Effect3046(BaseEffect):
     """
     modifyMaxVelocityOfShipPassive
 
@@ -9288,7 +9292,7 @@ class Effect3046(EffectDef):
         fit.ship.multiplyItemAttr('maxVelocity', module.getModifiedItemAttr('maxVelocityModifier'), stackingPenalties=True)
 
 
-class Effect3047(EffectDef):
+class Effect3047(BaseEffect):
     """
     structureHPMultiplyPassive
 
@@ -9303,7 +9307,7 @@ class Effect3047(EffectDef):
         fit.ship.multiplyItemAttr('hp', module.getModifiedItemAttr('structureHPMultiplier'))
 
 
-class Effect3061(EffectDef):
+class Effect3061(BaseEffect):
     """
     heatDamageBonus
 
@@ -9319,7 +9323,7 @@ class Effect3061(EffectDef):
                                       'heatDamage', module.getModifiedItemAttr('heatDamageBonus'))
 
 
-class Effect3169(EffectDef):
+class Effect3169(BaseEffect):
     """
     shieldTransportCpuNeedBonusEffect
 
@@ -9335,7 +9339,7 @@ class Effect3169(EffectDef):
                                       src.getModifiedItemAttr('shieldTransportCpuNeedBonus'))
 
 
-class Effect3172(EffectDef):
+class Effect3172(BaseEffect):
     """
     droneArmorDamageBonusEffect
 
@@ -9355,7 +9359,7 @@ class Effect3172(EffectDef):
                                      'armorDamageAmount', ship.getModifiedItemAttr('droneArmorDamageAmountBonus'))
 
 
-class Effect3173(EffectDef):
+class Effect3173(BaseEffect):
     """
     droneShieldBonusBonusEffect
 
@@ -9375,7 +9379,7 @@ class Effect3173(EffectDef):
                                      'shieldBonus', ship.getModifiedItemAttr('droneShieldBonusBonus'))
 
 
-class Effect3174(EffectDef):
+class Effect3174(BaseEffect):
     """
     overloadSelfRangeBonus
 
@@ -9393,7 +9397,7 @@ class Effect3174(EffectDef):
                              stackingPenalties=True)
 
 
-class Effect3175(EffectDef):
+class Effect3175(BaseEffect):
     """
     overloadSelfSpeedBonus
 
@@ -9409,7 +9413,7 @@ class Effect3175(EffectDef):
                              stackingPenalties=True)
 
 
-class Effect3182(EffectDef):
+class Effect3182(BaseEffect):
     """
     overloadSelfECMStrenghtBonus
 
@@ -9429,7 +9433,7 @@ class Effect3182(EffectDef):
                                      stackingPenalties=True)
 
 
-class Effect3196(EffectDef):
+class Effect3196(BaseEffect):
     """
     thermodynamicsSkillDamageBonus
 
@@ -9445,7 +9449,7 @@ class Effect3196(EffectDef):
                                       skill.getModifiedItemAttr('thermodynamicsHeatDamage') * skill.level)
 
 
-class Effect3200(EffectDef):
+class Effect3200(BaseEffect):
     """
     overloadSelfArmorDamageAmountDurationBonus
 
@@ -9463,7 +9467,7 @@ class Effect3200(EffectDef):
                              stackingPenalties=True)
 
 
-class Effect3201(EffectDef):
+class Effect3201(BaseEffect):
     """
     overloadSelfShieldBonusDurationBonus
 
@@ -9480,7 +9484,7 @@ class Effect3201(EffectDef):
         module.boostItemAttr('shieldBonus', module.getModifiedItemAttr('overloadShieldBonus'), stackingPenalties=True)
 
 
-class Effect3212(EffectDef):
+class Effect3212(BaseEffect):
     """
     missileSkillFoFAoeCloudSizeBonus
 
@@ -9497,7 +9501,7 @@ class Effect3212(EffectDef):
                                         'aoeCloudSize', container.getModifiedItemAttr('aoeCloudSizeBonus') * level)
 
 
-class Effect3234(EffectDef):
+class Effect3234(BaseEffect):
     """
     shipRocketExplosiveDmgAF
 
@@ -9514,7 +9518,7 @@ class Effect3234(EffectDef):
                                         'explosiveDamage', ship.getModifiedItemAttr('shipBonusAF'), skill='Amarr Frigate')
 
 
-class Effect3235(EffectDef):
+class Effect3235(BaseEffect):
     """
     shipRocketKineticDmgAF
 
@@ -9531,7 +9535,7 @@ class Effect3235(EffectDef):
                                         'kineticDamage', ship.getModifiedItemAttr('shipBonusAF'), skill='Amarr Frigate')
 
 
-class Effect3236(EffectDef):
+class Effect3236(BaseEffect):
     """
     shipRocketThermalDmgAF
 
@@ -9548,7 +9552,7 @@ class Effect3236(EffectDef):
                                         'thermalDamage', ship.getModifiedItemAttr('shipBonusAF'), skill='Amarr Frigate')
 
 
-class Effect3237(EffectDef):
+class Effect3237(BaseEffect):
     """
     shipRocketEmDmgAF
 
@@ -9565,7 +9569,7 @@ class Effect3237(EffectDef):
                                         'emDamage', ship.getModifiedItemAttr('shipBonusAF'), skill='Amarr Frigate')
 
 
-class Effect3241(EffectDef):
+class Effect3241(BaseEffect):
     """
     eliteBonusGunshipArmorEmResistance1
 
@@ -9581,7 +9585,7 @@ class Effect3241(EffectDef):
                                skill='Assault Frigates')
 
 
-class Effect3242(EffectDef):
+class Effect3242(BaseEffect):
     """
     eliteBonusGunshipArmorThermalResistance1
 
@@ -9597,7 +9601,7 @@ class Effect3242(EffectDef):
                                skill='Assault Frigates')
 
 
-class Effect3243(EffectDef):
+class Effect3243(BaseEffect):
     """
     eliteBonusGunshipArmorKineticResistance1
 
@@ -9613,7 +9617,7 @@ class Effect3243(EffectDef):
                                skill='Assault Frigates')
 
 
-class Effect3244(EffectDef):
+class Effect3244(BaseEffect):
     """
     eliteBonusGunshipArmorExplosiveResistance1
 
@@ -9629,7 +9633,7 @@ class Effect3244(EffectDef):
                                skill='Assault Frigates')
 
 
-class Effect3249(EffectDef):
+class Effect3249(BaseEffect):
     """
     shipCapRecharge2AF
 
@@ -9644,7 +9648,7 @@ class Effect3249(EffectDef):
         fit.ship.boostItemAttr('rechargeRate', ship.getModifiedItemAttr('shipBonus2AF'), skill='Amarr Frigate')
 
 
-class Effect3264(EffectDef):
+class Effect3264(BaseEffect):
     """
     skillIndustrialReconfigurationConsumptionQuantityBonus
 
@@ -9661,7 +9665,7 @@ class Effect3264(EffectDef):
                                          'consumptionQuantity', amount * skill.level)
 
 
-class Effect3267(EffectDef):
+class Effect3267(BaseEffect):
     """
     shipConsumptionQuantityBonusIndustrialReconfigurationORECapital1
 
@@ -9678,7 +9682,7 @@ class Effect3267(EffectDef):
                                       skill='Capital Industrial Ships')
 
 
-class Effect3297(EffectDef):
+class Effect3297(BaseEffect):
     """
     shipEnergyNeutralizerTransferAmountBonusAB
 
@@ -9695,7 +9699,7 @@ class Effect3297(EffectDef):
                                       skill='Amarr Battleship')
 
 
-class Effect3298(EffectDef):
+class Effect3298(BaseEffect):
     """
     shipEnergyNeutralizerTransferAmountBonusAC
 
@@ -9713,7 +9717,7 @@ class Effect3298(EffectDef):
                                       skill='Amarr Cruiser')
 
 
-class Effect3299(EffectDef):
+class Effect3299(BaseEffect):
     """
     shipEnergyNeutralizerTransferAmountBonusAF
 
@@ -9732,7 +9736,7 @@ class Effect3299(EffectDef):
                                       skill='Amarr Frigate')
 
 
-class Effect3313(EffectDef):
+class Effect3313(BaseEffect):
     """
     cloneVatMaxJumpCloneBonusSkillNew
 
@@ -9747,7 +9751,7 @@ class Effect3313(EffectDef):
         fit.ship.boostItemAttr('maxJumpClones', skill.getModifiedItemAttr('maxJumpClonesBonus') * skill.level)
 
 
-class Effect3331(EffectDef):
+class Effect3331(BaseEffect):
     """
     eliteBonusCommandShipArmorHP1
 
@@ -9762,7 +9766,7 @@ class Effect3331(EffectDef):
         fit.ship.boostItemAttr('armorHP', ship.getModifiedItemAttr('eliteBonusCommandShips1'), skill='Command Ships')
 
 
-class Effect3335(EffectDef):
+class Effect3335(BaseEffect):
     """
     shipArmorEmResistanceMC2
 
@@ -9777,7 +9781,7 @@ class Effect3335(EffectDef):
         fit.ship.boostItemAttr('armorEmDamageResonance', ship.getModifiedItemAttr('shipBonusMC2'), skill='Minmatar Cruiser')
 
 
-class Effect3336(EffectDef):
+class Effect3336(BaseEffect):
     """
     shipArmorExplosiveResistanceMC2
 
@@ -9793,7 +9797,7 @@ class Effect3336(EffectDef):
                                skill='Minmatar Cruiser')
 
 
-class Effect3339(EffectDef):
+class Effect3339(BaseEffect):
     """
     shipArmorKineticResistanceMC2
 
@@ -9809,7 +9813,7 @@ class Effect3339(EffectDef):
                                skill='Minmatar Cruiser')
 
 
-class Effect3340(EffectDef):
+class Effect3340(BaseEffect):
     """
     shipArmorThermalResistanceMC2
 
@@ -9825,7 +9829,7 @@ class Effect3340(EffectDef):
                                skill='Minmatar Cruiser')
 
 
-class Effect3343(EffectDef):
+class Effect3343(BaseEffect):
     """
     eliteBonusHeavyInterdictorsProjectileFalloff1
 
@@ -9842,7 +9846,7 @@ class Effect3343(EffectDef):
                                       skill='Heavy Interdiction Cruisers')
 
 
-class Effect3355(EffectDef):
+class Effect3355(BaseEffect):
     """
     eliteBonusHeavyInterdictorHeavyMissileVelocityBonus1
 
@@ -9859,7 +9863,7 @@ class Effect3355(EffectDef):
                                         skill='Heavy Interdiction Cruisers')
 
 
-class Effect3356(EffectDef):
+class Effect3356(BaseEffect):
     """
     eliteBonusHeavyInterdictorHeavyAssaultMissileVelocityBonus
 
@@ -9876,7 +9880,7 @@ class Effect3356(EffectDef):
                                         skill='Heavy Interdiction Cruisers')
 
 
-class Effect3357(EffectDef):
+class Effect3357(BaseEffect):
     """
     eliteBonusHeavyInterdictorLightMissileVelocityBonus
 
@@ -9893,7 +9897,7 @@ class Effect3357(EffectDef):
                                         skill='Heavy Interdiction Cruisers')
 
 
-class Effect3366(EffectDef):
+class Effect3366(BaseEffect):
     """
     shipRemoteSensorDampenerCapNeedGF
 
@@ -9910,7 +9914,7 @@ class Effect3366(EffectDef):
                                       'capacitorNeed', ship.getModifiedItemAttr('shipBonusGF'), skill='Gallente Frigate')
 
 
-class Effect3367(EffectDef):
+class Effect3367(BaseEffect):
     """
     eliteBonusElectronicAttackShipWarpScramblerMaxRange1
 
@@ -9927,7 +9931,7 @@ class Effect3367(EffectDef):
                                       skill='Electronic Attack Ships')
 
 
-class Effect3369(EffectDef):
+class Effect3369(BaseEffect):
     """
     eliteBonusElectronicAttackShipECMOptimalRange1
 
@@ -9944,7 +9948,7 @@ class Effect3369(EffectDef):
                                       skill='Electronic Attack Ships')
 
 
-class Effect3370(EffectDef):
+class Effect3370(BaseEffect):
     """
     eliteBonusElectronicAttackShipStasisWebMaxRange1
 
@@ -9961,7 +9965,7 @@ class Effect3370(EffectDef):
                                       skill='Electronic Attack Ships')
 
 
-class Effect3371(EffectDef):
+class Effect3371(BaseEffect):
     """
     eliteBonusElectronicAttackShipWarpScramblerCapNeed2
 
@@ -9978,7 +9982,7 @@ class Effect3371(EffectDef):
                                       skill='Electronic Attack Ships')
 
 
-class Effect3374(EffectDef):
+class Effect3374(BaseEffect):
     """
     eliteBonusElectronicAttackShipSignatureRadius2
 
@@ -9994,7 +9998,7 @@ class Effect3374(EffectDef):
                                skill='Electronic Attack Ships')
 
 
-class Effect3379(EffectDef):
+class Effect3379(BaseEffect):
     """
     implantHardwiringABcapacitorNeed
 
@@ -10010,7 +10014,7 @@ class Effect3379(EffectDef):
                                       'capacitorNeed', implant.getModifiedItemAttr('capNeedBonus'))
 
 
-class Effect3380(EffectDef):
+class Effect3380(BaseEffect):
     """
     warpDisruptSphere
 
@@ -10044,7 +10048,7 @@ class Effect3380(EffectDef):
             fit.ship.forceItemAttr('disallowAssistance', 1)
 
 
-class Effect3392(EffectDef):
+class Effect3392(BaseEffect):
     """
     eliteBonusBlackOpsLargeEnergyTurretTracking1
 
@@ -10060,7 +10064,7 @@ class Effect3392(EffectDef):
                                       'trackingSpeed', ship.getModifiedItemAttr('eliteBonusBlackOps1'), skill='Black Ops')
 
 
-class Effect3403(EffectDef):
+class Effect3403(BaseEffect):
     """
     eliteBonusBlackOpsCloakVelocity2
 
@@ -10076,7 +10080,7 @@ class Effect3403(EffectDef):
             fit.ship.multiplyItemAttr('maxVelocity', ship.getModifiedItemAttr('eliteBonusBlackOps2'), skill='Black Ops')
 
 
-class Effect3406(EffectDef):
+class Effect3406(BaseEffect):
     """
     eliteBonusBlackOpsMaxVelocity1
 
@@ -10091,7 +10095,7 @@ class Effect3406(EffectDef):
         fit.ship.boostItemAttr('maxVelocity', ship.getModifiedItemAttr('eliteBonusBlackOps1'), skill='Black Ops')
 
 
-class Effect3415(EffectDef):
+class Effect3415(BaseEffect):
     """
     eliteBonusViolatorsLargeEnergyTurretDamageRole1
 
@@ -10107,7 +10111,7 @@ class Effect3415(EffectDef):
                                       'damageMultiplier', ship.getModifiedItemAttr('eliteBonusViolatorsRole1'))
 
 
-class Effect3416(EffectDef):
+class Effect3416(BaseEffect):
     """
     eliteBonusViolatorsLargeHybridTurretDamageRole1
 
@@ -10123,7 +10127,7 @@ class Effect3416(EffectDef):
                                       'damageMultiplier', ship.getModifiedItemAttr('eliteBonusViolatorsRole1'))
 
 
-class Effect3417(EffectDef):
+class Effect3417(BaseEffect):
     """
     eliteBonusViolatorsLargeProjectileTurretDamageRole1
 
@@ -10139,7 +10143,7 @@ class Effect3417(EffectDef):
                                       'damageMultiplier', ship.getModifiedItemAttr('eliteBonusViolatorsRole1'))
 
 
-class Effect3424(EffectDef):
+class Effect3424(BaseEffect):
     """
     eliteBonusViolatorsLargeHybridTurretTracking1
 
@@ -10155,7 +10159,7 @@ class Effect3424(EffectDef):
                                       'trackingSpeed', ship.getModifiedItemAttr('eliteBonusViolators1'), skill='Marauders')
 
 
-class Effect3425(EffectDef):
+class Effect3425(BaseEffect):
     """
     eliteBonusViolatorsLargeProjectileTurretTracking1
 
@@ -10171,7 +10175,7 @@ class Effect3425(EffectDef):
                                       'trackingSpeed', ship.getModifiedItemAttr('eliteBonusViolators1'), skill='Marauders')
 
 
-class Effect3427(EffectDef):
+class Effect3427(BaseEffect):
     """
     eliteBonusViolatorsTractorBeamMaxRangeRole2
 
@@ -10187,7 +10191,7 @@ class Effect3427(EffectDef):
                                       'maxRange', ship.getModifiedItemAttr('eliteBonusViolatorsRole2'))
 
 
-class Effect3439(EffectDef):
+class Effect3439(BaseEffect):
     """
     eliteBonusViolatorsEwTargetPainting1
 
@@ -10204,7 +10208,7 @@ class Effect3439(EffectDef):
                                       skill='Marauders')
 
 
-class Effect3447(EffectDef):
+class Effect3447(BaseEffect):
     """
     shipBonusPTFalloffMB1
 
@@ -10221,7 +10225,7 @@ class Effect3447(EffectDef):
                                       'falloff', ship.getModifiedItemAttr('shipBonusMB'), skill='Minmatar Battleship')
 
 
-class Effect3466(EffectDef):
+class Effect3466(BaseEffect):
     """
     eliteBonusElectronicAttackShipRechargeRate2
 
@@ -10237,7 +10241,7 @@ class Effect3466(EffectDef):
                                skill='Electronic Attack Ships')
 
 
-class Effect3467(EffectDef):
+class Effect3467(BaseEffect):
     """
     eliteBonusElectronicAttackShipCapacitorCapacity2
 
@@ -10253,7 +10257,7 @@ class Effect3467(EffectDef):
                                skill='Electronic Attack Ships')
 
 
-class Effect3468(EffectDef):
+class Effect3468(BaseEffect):
     """
     eliteBonusHeavyInterdictorsWarpDisruptFieldGeneratorWarpScrambleRange2
 
@@ -10270,7 +10274,7 @@ class Effect3468(EffectDef):
                                       skill='Heavy Interdiction Cruisers')
 
 
-class Effect3473(EffectDef):
+class Effect3473(BaseEffect):
     """
     eliteBonusViolatorsTractorBeamMaxTractorVelocityRole3
 
@@ -10286,7 +10290,7 @@ class Effect3473(EffectDef):
                                       'maxTractorVelocity', ship.getModifiedItemAttr('eliteBonusViolatorsRole3'))
 
 
-class Effect3478(EffectDef):
+class Effect3478(BaseEffect):
     """
     shipLaserDamagePirateBattleship
 
@@ -10303,7 +10307,7 @@ class Effect3478(EffectDef):
                                       'damageMultiplier', ship.getModifiedItemAttr('shipBonusRole7'))
 
 
-class Effect3480(EffectDef):
+class Effect3480(BaseEffect):
     """
     shipTrackingBonusAB
 
@@ -10319,7 +10323,7 @@ class Effect3480(EffectDef):
                                       'trackingSpeed', ship.getModifiedItemAttr('shipBonusAB2'), skill='Amarr Battleship')
 
 
-class Effect3483(EffectDef):
+class Effect3483(BaseEffect):
     """
     shipBonusMediumEnergyTurretDamagePirateFaction
 
@@ -10338,7 +10342,7 @@ class Effect3483(EffectDef):
                                       'damageMultiplier', ship.getModifiedItemAttr('shipBonusRole7'))
 
 
-class Effect3484(EffectDef):
+class Effect3484(BaseEffect):
     """
     shipBonusMediumEnergyTurretTrackingAC2
 
@@ -10355,7 +10359,7 @@ class Effect3484(EffectDef):
                                       'trackingSpeed', ship.getModifiedItemAttr('shipBonusAC2'), skill='Amarr Cruiser')
 
 
-class Effect3487(EffectDef):
+class Effect3487(BaseEffect):
     """
     shipBonusSmallEnergyTurretDamagePirateFaction
 
@@ -10376,7 +10380,7 @@ class Effect3487(EffectDef):
                                       'damageMultiplier', ship.getModifiedItemAttr('shipBonusRole7'))
 
 
-class Effect3489(EffectDef):
+class Effect3489(BaseEffect):
     """
     shipBonusSmallEnergyTurretTracking2AF
 
@@ -10393,7 +10397,7 @@ class Effect3489(EffectDef):
                                       'trackingSpeed', ship.getModifiedItemAttr('shipBonus2AF'), skill='Amarr Frigate')
 
 
-class Effect3493(EffectDef):
+class Effect3493(BaseEffect):
     """
     rorqualCargoScanRangeBonus
 
@@ -10409,7 +10413,7 @@ class Effect3493(EffectDef):
                                       'cargoScanRange', ship.getModifiedItemAttr('cargoScannerRangeBonus'))
 
 
-class Effect3494(EffectDef):
+class Effect3494(BaseEffect):
     """
     rorqualSurveyScannerRangeBonus
 
@@ -10425,7 +10429,7 @@ class Effect3494(EffectDef):
                                       'surveyScanRange', ship.getModifiedItemAttr('surveyScannerRangeBonus'))
 
 
-class Effect3495(EffectDef):
+class Effect3495(BaseEffect):
     """
     shipCapPropulsionJamming
 
@@ -10446,7 +10450,7 @@ class Effect3495(EffectDef):
                                       'capacitorNeed', ship.getModifiedItemAttr('eliteBonusInterceptorRole'))
 
 
-class Effect3496(EffectDef):
+class Effect3496(BaseEffect):
     """
     setBonusThukker
 
@@ -10463,7 +10467,7 @@ class Effect3496(EffectDef):
                                                  'agilityBonus', implant.getModifiedItemAttr('implantSetThukker'))
 
 
-class Effect3498(EffectDef):
+class Effect3498(BaseEffect):
     """
     setBonusSisters
 
@@ -10480,7 +10484,7 @@ class Effect3498(EffectDef):
                                                  'scanStrengthBonus', implant.getModifiedItemAttr('implantSetSisters'))
 
 
-class Effect3499(EffectDef):
+class Effect3499(BaseEffect):
     """
     setBonusSyndicate
 
@@ -10498,7 +10502,7 @@ class Effect3499(EffectDef):
                                                  implant.getModifiedItemAttr('implantSetSyndicate'))
 
 
-class Effect3513(EffectDef):
+class Effect3513(BaseEffect):
     """
     setBonusMordus
 
@@ -10515,7 +10519,7 @@ class Effect3513(EffectDef):
                                                  'rangeSkillBonus', implant.getModifiedItemAttr('implantSetMordus'))
 
 
-class Effect3514(EffectDef):
+class Effect3514(BaseEffect):
     """
     Interceptor2WarpScrambleRange
 
@@ -10531,7 +10535,7 @@ class Effect3514(EffectDef):
                                       'maxRange', ship.getModifiedItemAttr('eliteBonusInterceptor2'), skill='Interceptors')
 
 
-class Effect3519(EffectDef):
+class Effect3519(BaseEffect):
     """
     weaponUpgradesCpuNeedBonusPostPercentCpuLocationShipModulesRequiringBombLauncher
 
@@ -10547,7 +10551,7 @@ class Effect3519(EffectDef):
                                       'cpu', skill.getModifiedItemAttr('cpuNeedBonus') * skill.level)
 
 
-class Effect3520(EffectDef):
+class Effect3520(BaseEffect):
     """
     skillAdvancedWeaponUpgradesPowerNeedBonusBombLaunchers
 
@@ -10563,7 +10567,7 @@ class Effect3520(EffectDef):
                                       'power', skill.getModifiedItemAttr('powerNeedBonus') * skill.level)
 
 
-class Effect3526(EffectDef):
+class Effect3526(BaseEffect):
     """
     cynosuralTheoryConsumptionBonus
 
@@ -10582,7 +10586,7 @@ class Effect3526(EffectDef):
                                       container.getModifiedItemAttr('consumptionQuantityBonusPercentage') * level)
 
 
-class Effect3530(EffectDef):
+class Effect3530(BaseEffect):
     """
     eliteBonusBlackOpsAgiliy1
 
@@ -10597,7 +10601,7 @@ class Effect3530(EffectDef):
         fit.ship.boostItemAttr('agility', ship.getModifiedItemAttr('eliteBonusBlackOps1'), skill='Black Ops')
 
 
-class Effect3532(EffectDef):
+class Effect3532(BaseEffect):
     """
     skillJumpDriveConsumptionAmountBonusPercentage
 
@@ -10613,7 +10617,7 @@ class Effect3532(EffectDef):
                                skill.getModifiedItemAttr('consumptionQuantityBonusPercentage') * skill.level)
 
 
-class Effect3561(EffectDef):
+class Effect3561(BaseEffect):
     """
     ewSkillTrackingDisruptionTrackingSpeedBonus
 
@@ -10632,7 +10636,7 @@ class Effect3561(EffectDef):
                                       container.getModifiedItemAttr('scanSkillEwStrengthBonus') * level)
 
 
-class Effect3568(EffectDef):
+class Effect3568(BaseEffect):
     """
     eliteBonusLogisticsTrackingLinkMaxRangeBonus1
 
@@ -10649,7 +10653,7 @@ class Effect3568(EffectDef):
                                       skill='Logistics Cruisers')
 
 
-class Effect3569(EffectDef):
+class Effect3569(BaseEffect):
     """
     eliteBonusLogisticsTrackingLinkMaxRangeBonus2
 
@@ -10666,7 +10670,7 @@ class Effect3569(EffectDef):
                                       skill='Logistics Cruisers')
 
 
-class Effect3570(EffectDef):
+class Effect3570(BaseEffect):
     """
     eliteBonusLogisticsTrackingLinkTrackingSpeedBonus2
 
@@ -10683,7 +10687,7 @@ class Effect3570(EffectDef):
                                       skill='Logistics Cruisers')
 
 
-class Effect3571(EffectDef):
+class Effect3571(BaseEffect):
     """
     eliteBonusLogisticsTrackingLinkTrackingSpeedBonus1
 
@@ -10700,7 +10704,7 @@ class Effect3571(EffectDef):
                                       skill='Logistics Cruisers')
 
 
-class Effect3586(EffectDef):
+class Effect3586(BaseEffect):
     """
     ewSkillSignalSuppressionScanResolutionBonus
 
@@ -10721,7 +10725,7 @@ class Effect3586(EffectDef):
                                       stackingPenalties=penalized)
 
 
-class Effect3587(EffectDef):
+class Effect3587(BaseEffect):
     """
     shipBonusEwRemoteSensorDampenerMaxTargetRangeBonusGC2
 
@@ -10738,7 +10742,7 @@ class Effect3587(EffectDef):
                                       skill='Gallente Cruiser')
 
 
-class Effect3588(EffectDef):
+class Effect3588(BaseEffect):
     """
     shipBonusEwRemoteSensorDampenerMaxTargetRangeBonusGF2
 
@@ -10756,7 +10760,7 @@ class Effect3588(EffectDef):
                                       skill='Gallente Frigate')
 
 
-class Effect3589(EffectDef):
+class Effect3589(BaseEffect):
     """
     shipBonusEwRemoteSensorDampenerScanResolutionBonusGF2
 
@@ -10774,7 +10778,7 @@ class Effect3589(EffectDef):
                                       skill='Gallente Frigate')
 
 
-class Effect3590(EffectDef):
+class Effect3590(BaseEffect):
     """
     shipBonusEwRemoteSensorDampenerScanResolutionBonusGC2
 
@@ -10791,7 +10795,7 @@ class Effect3590(EffectDef):
                                       skill='Gallente Cruiser')
 
 
-class Effect3591(EffectDef):
+class Effect3591(BaseEffect):
     """
     ewSkillSignalSuppressionMaxTargetRangeBonus
 
@@ -10810,7 +10814,7 @@ class Effect3591(EffectDef):
                                       container.getModifiedItemAttr('scanSkillEwStrengthBonus') * level)
 
 
-class Effect3592(EffectDef):
+class Effect3592(BaseEffect):
     """
     eliteBonusJumpFreighterHullHP1
 
@@ -10825,7 +10829,7 @@ class Effect3592(EffectDef):
         fit.ship.boostItemAttr('hp', ship.getModifiedItemAttr('eliteBonusJumpFreighter1'), skill='Jump Freighters')
 
 
-class Effect3593(EffectDef):
+class Effect3593(BaseEffect):
     """
     eliteBonusJumpFreighterJumpDriveConsumptionAmount2
 
@@ -10841,7 +10845,7 @@ class Effect3593(EffectDef):
                                skill='Jump Freighters')
 
 
-class Effect3597(EffectDef):
+class Effect3597(BaseEffect):
     """
     scriptSensorBoosterScanResolutionBonusBonus
 
@@ -10857,7 +10861,7 @@ class Effect3597(EffectDef):
         module.boostItemAttr('scanResolutionBonus', module.getModifiedChargeAttr('scanResolutionBonusBonus'))
 
 
-class Effect3598(EffectDef):
+class Effect3598(BaseEffect):
     """
     scriptSensorBoosterMaxTargetRangeBonusBonus
 
@@ -10873,7 +10877,7 @@ class Effect3598(EffectDef):
         module.boostItemAttr('maxTargetRangeBonus', module.getModifiedChargeAttr('maxTargetRangeBonusBonus'))
 
 
-class Effect3599(EffectDef):
+class Effect3599(BaseEffect):
     """
     scriptTrackingComputerTrackingSpeedBonusBonus
 
@@ -10889,7 +10893,7 @@ class Effect3599(EffectDef):
         module.boostItemAttr('trackingSpeedBonus', module.getModifiedChargeAttr('trackingSpeedBonusBonus'))
 
 
-class Effect3600(EffectDef):
+class Effect3600(BaseEffect):
     """
     scriptTrackingComputerMaxRangeBonusBonus
 
@@ -10905,7 +10909,7 @@ class Effect3600(EffectDef):
         module.boostItemAttr('maxRangeBonus', module.getModifiedChargeAttr('maxRangeBonusBonus'))
 
 
-class Effect3601(EffectDef):
+class Effect3601(BaseEffect):
     """
     scriptWarpDisruptionFieldGeneratorSetDisallowInEmpireSpace
 
@@ -10920,7 +10924,7 @@ class Effect3601(EffectDef):
         module.forceItemAttr('disallowInEmpireSpace', module.getModifiedChargeAttr('disallowInEmpireSpace'))
 
 
-class Effect3602(EffectDef):
+class Effect3602(BaseEffect):
     """
     scriptDurationBonus
 
@@ -10935,7 +10939,7 @@ class Effect3602(EffectDef):
         module.boostItemAttr('duration', module.getModifiedChargeAttr('durationBonus'))
 
 
-class Effect3617(EffectDef):
+class Effect3617(BaseEffect):
     """
     scriptSignatureRadiusBonusBonus
 
@@ -10951,7 +10955,7 @@ class Effect3617(EffectDef):
         module.boostItemAttr('signatureRadiusBonus', module.getModifiedChargeAttr('signatureRadiusBonusBonus'))
 
 
-class Effect3618(EffectDef):
+class Effect3618(BaseEffect):
     """
     scriptMassBonusPercentageBonus
 
@@ -10967,7 +10971,7 @@ class Effect3618(EffectDef):
         module.boostItemAttr('massBonusPercentage', module.getModifiedChargeAttr('massBonusPercentageBonus'))
 
 
-class Effect3619(EffectDef):
+class Effect3619(BaseEffect):
     """
     scriptSpeedBoostFactorBonusBonus
 
@@ -10983,7 +10987,7 @@ class Effect3619(EffectDef):
         module.boostItemAttr('speedBoostFactorBonus', module.getModifiedChargeAttr('speedBoostFactorBonusBonus'))
 
 
-class Effect3620(EffectDef):
+class Effect3620(BaseEffect):
     """
     scriptSpeedFactorBonusBonus
 
@@ -10999,7 +11003,7 @@ class Effect3620(EffectDef):
         module.boostItemAttr('speedFactorBonus', module.getModifiedChargeAttr('speedFactorBonusBonus'))
 
 
-class Effect3648(EffectDef):
+class Effect3648(BaseEffect):
     """
     scriptWarpScrambleRangeBonus
 
@@ -11014,7 +11018,7 @@ class Effect3648(EffectDef):
         module.boostItemAttr('warpScrambleRange', module.getModifiedChargeAttr('warpScrambleRangeBonus'))
 
 
-class Effect3649(EffectDef):
+class Effect3649(BaseEffect):
     """
     eliteBonusViolatorsLargeEnergyTurretDamage1
 
@@ -11031,7 +11035,7 @@ class Effect3649(EffectDef):
                                       skill='Marauders')
 
 
-class Effect3650(EffectDef):
+class Effect3650(BaseEffect):
     """
     ewGroupRsdMaxRangeBonus
 
@@ -11047,7 +11051,7 @@ class Effect3650(EffectDef):
                                       'maxRange', implant.getModifiedItemAttr('rangeSkillBonus'))
 
 
-class Effect3651(EffectDef):
+class Effect3651(BaseEffect):
     """
     ewGroupTpMaxRangeBonus
 
@@ -11063,7 +11067,7 @@ class Effect3651(EffectDef):
                                       'maxRange', implant.getModifiedItemAttr('rangeSkillBonus'))
 
 
-class Effect3652(EffectDef):
+class Effect3652(BaseEffect):
     """
     ewGroupTdMaxRangeBonus
 
@@ -11079,7 +11083,7 @@ class Effect3652(EffectDef):
                                       'maxRange', implant.getModifiedItemAttr('rangeSkillBonus'))
 
 
-class Effect3653(EffectDef):
+class Effect3653(BaseEffect):
     """
     ewGroupEcmBurstMaxRangeBonus
 
@@ -11095,7 +11099,7 @@ class Effect3653(EffectDef):
                                       'maxRange', implant.getModifiedItemAttr('rangeSkillBonus'))
 
 
-class Effect3655(EffectDef):
+class Effect3655(BaseEffect):
     """
     gunneryMaxRangeBonusOnline
 
@@ -11112,7 +11116,7 @@ class Effect3655(EffectDef):
                                       stackingPenalties=True)
 
 
-class Effect3656(EffectDef):
+class Effect3656(BaseEffect):
     """
     gunneryTrackingSpeedBonusOnline
 
@@ -11129,7 +11133,7 @@ class Effect3656(EffectDef):
                                       stackingPenalties=True)
 
 
-class Effect3657(EffectDef):
+class Effect3657(BaseEffect):
     """
     shipScanResolutionBonusOnline
 
@@ -11146,7 +11150,7 @@ class Effect3657(EffectDef):
                                stackingPenalties=True)
 
 
-class Effect3659(EffectDef):
+class Effect3659(BaseEffect):
     """
     shipMaxTargetRangeBonusOnline
 
@@ -11163,7 +11167,7 @@ class Effect3659(EffectDef):
                                stackingPenalties=True)
 
 
-class Effect3660(EffectDef):
+class Effect3660(BaseEffect):
     """
     shipMaxLockedTargetsBonusAddOnline
 
@@ -11179,7 +11183,7 @@ class Effect3660(EffectDef):
         fit.ship.increaseItemAttr('maxLockedTargets', module.getModifiedItemAttr('maxLockedTargetsBonus'))
 
 
-class Effect3668(EffectDef):
+class Effect3668(BaseEffect):
     """
     miningLaserRangeBonus
 
@@ -11195,7 +11199,7 @@ class Effect3668(EffectDef):
                                       'maxRange', implant.getModifiedItemAttr('maxRangeBonus'))
 
 
-class Effect3669(EffectDef):
+class Effect3669(BaseEffect):
     """
     frequencyMiningLaserMaxRangeBonus
 
@@ -11211,7 +11215,7 @@ class Effect3669(EffectDef):
                                       'maxRange', implant.getModifiedItemAttr('maxRangeBonus'))
 
 
-class Effect3670(EffectDef):
+class Effect3670(BaseEffect):
     """
     stripMinerMaxRangeBonus
 
@@ -11227,7 +11231,7 @@ class Effect3670(EffectDef):
                                       'maxRange', implant.getModifiedItemAttr('maxRangeBonus'))
 
 
-class Effect3671(EffectDef):
+class Effect3671(BaseEffect):
     """
     gasHarvesterMaxRangeBonus
 
@@ -11243,7 +11247,7 @@ class Effect3671(EffectDef):
                                       'maxRange', implant.getModifiedItemAttr('maxRangeBonus'))
 
 
-class Effect3672(EffectDef):
+class Effect3672(BaseEffect):
     """
     setBonusOre
 
@@ -11260,7 +11264,7 @@ class Effect3672(EffectDef):
                                                  'maxRangeBonus', implant.getModifiedItemAttr('implantSetORE'))
 
 
-class Effect3677(EffectDef):
+class Effect3677(BaseEffect):
     """
     shipBonusLargeEnergyTurretMaxRangeAB2
 
@@ -11277,7 +11281,7 @@ class Effect3677(EffectDef):
                                       'maxRange', ship.getModifiedItemAttr('shipBonusAB2'), skill='Amarr Battleship')
 
 
-class Effect3678(EffectDef):
+class Effect3678(BaseEffect):
     """
     eliteBonusJumpFreighterShieldHP1
 
@@ -11294,7 +11298,7 @@ class Effect3678(EffectDef):
                                skill='Jump Freighters')
 
 
-class Effect3679(EffectDef):
+class Effect3679(BaseEffect):
     """
     eliteBonusJumpFreighterArmorHP1
 
@@ -11310,7 +11314,7 @@ class Effect3679(EffectDef):
         fit.ship.boostItemAttr('armorHP', ship.getModifiedItemAttr('eliteBonusJumpFreighter1'), skill='Jump Freighters')
 
 
-class Effect3680(EffectDef):
+class Effect3680(BaseEffect):
     """
     freighterAgilityBonusC1
 
@@ -11325,7 +11329,7 @@ class Effect3680(EffectDef):
         fit.ship.boostItemAttr('agility', ship.getModifiedItemAttr('freighterBonusC1'), skill='Caldari Freighter')
 
 
-class Effect3681(EffectDef):
+class Effect3681(BaseEffect):
     """
     freighterAgilityBonusM1
 
@@ -11340,7 +11344,7 @@ class Effect3681(EffectDef):
         fit.ship.boostItemAttr('agility', ship.getModifiedItemAttr('freighterBonusM1'), skill='Minmatar Freighter')
 
 
-class Effect3682(EffectDef):
+class Effect3682(BaseEffect):
     """
     freighterAgilityBonusG1
 
@@ -11355,7 +11359,7 @@ class Effect3682(EffectDef):
         fit.ship.boostItemAttr('agility', ship.getModifiedItemAttr('freighterBonusG1'), skill='Gallente Freighter')
 
 
-class Effect3683(EffectDef):
+class Effect3683(BaseEffect):
     """
     freighterAgilityBonusA1
 
@@ -11370,7 +11374,7 @@ class Effect3683(EffectDef):
         fit.ship.boostItemAttr('agility', ship.getModifiedItemAttr('freighterBonusA1'), skill='Amarr Freighter')
 
 
-class Effect3686(EffectDef):
+class Effect3686(BaseEffect):
     """
     scriptTrackingComputerFalloffBonusBonus
 
@@ -11386,7 +11390,7 @@ class Effect3686(EffectDef):
         module.boostItemAttr('falloffBonus', module.getModifiedChargeAttr('falloffBonusBonus'))
 
 
-class Effect3703(EffectDef):
+class Effect3703(BaseEffect):
     """
     shipMissileLauncherSpeedBonusMC2
 
@@ -11403,7 +11407,7 @@ class Effect3703(EffectDef):
                                       'speed', ship.getModifiedItemAttr('shipBonusMC2'), skill='Minmatar Cruiser')
 
 
-class Effect3705(EffectDef):
+class Effect3705(BaseEffect):
     """
     shipHybridTurretROFBonusGC2
 
@@ -11420,7 +11424,7 @@ class Effect3705(EffectDef):
                                       'speed', ship.getModifiedItemAttr('shipBonusGC2'), skill='Gallente Cruiser')
 
 
-class Effect3706(EffectDef):
+class Effect3706(BaseEffect):
     """
     shipBonusProjectileTrackingMC2
 
@@ -11436,7 +11440,7 @@ class Effect3706(EffectDef):
                                       'trackingSpeed', ship.getModifiedItemAttr('shipBonusMC2'), skill='Minmatar Cruiser')
 
 
-class Effect3726(EffectDef):
+class Effect3726(BaseEffect):
     """
     agilityMultiplierEffectPassive
 
@@ -11451,7 +11455,7 @@ class Effect3726(EffectDef):
         fit.ship.boostItemAttr('agility', module.getModifiedItemAttr('agilityBonus'), stackingPenalties=True)
 
 
-class Effect3727(EffectDef):
+class Effect3727(BaseEffect):
     """
     velocityBonusPassive
 
@@ -11467,7 +11471,7 @@ class Effect3727(EffectDef):
                                stackingPenalties=True)
 
 
-class Effect3739(EffectDef):
+class Effect3739(BaseEffect):
     """
     zColinOrcaTractorRangeBonus
 
@@ -11483,7 +11487,7 @@ class Effect3739(EffectDef):
                                       src.getModifiedItemAttr('roleBonusTractorBeamRange'))
 
 
-class Effect3740(EffectDef):
+class Effect3740(BaseEffect):
     """
     zColinOrcaTractorVelocityBonus
 
@@ -11499,7 +11503,7 @@ class Effect3740(EffectDef):
                                       ship.getModifiedItemAttr('roleBonusTractorBeamVelocity'))
 
 
-class Effect3742(EffectDef):
+class Effect3742(BaseEffect):
     """
     cargoAndOreHoldCapacityBonusICS1
 
@@ -11520,7 +11524,7 @@ class Effect3742(EffectDef):
                                skill='Industrial Command Ships')
 
 
-class Effect3744(EffectDef):
+class Effect3744(BaseEffect):
     """
     miningForemanBurstBonusICS2
 
@@ -11544,7 +11548,7 @@ class Effect3744(EffectDef):
                                       src.getModifiedItemAttr('shipBonusICS2'), skill='Industrial Command Ships')
 
 
-class Effect3745(EffectDef):
+class Effect3745(BaseEffect):
     """
     zColinOrcaSurveyScannerBonus
 
@@ -11560,7 +11564,7 @@ class Effect3745(EffectDef):
                                       src.getModifiedItemAttr('roleBonusSurveyScannerRange'))
 
 
-class Effect3765(EffectDef):
+class Effect3765(BaseEffect):
     """
     covertOpsStealthBomberSiegeMissileLauncherPowerNeedBonus
 
@@ -11576,7 +11580,7 @@ class Effect3765(EffectDef):
                                          'power', ship.getModifiedItemAttr('stealthBomberLauncherPower'))
 
 
-class Effect3766(EffectDef):
+class Effect3766(BaseEffect):
     """
     interceptorMWDSignatureRadiusBonus
 
@@ -11593,7 +11597,7 @@ class Effect3766(EffectDef):
                                       skill='Interceptors')
 
 
-class Effect3767(EffectDef):
+class Effect3767(BaseEffect):
     """
     eliteBonusCommandShipsHeavyMissileExplosionVelocityCS2
 
@@ -11610,7 +11614,7 @@ class Effect3767(EffectDef):
                                         skill='Command Ships')
 
 
-class Effect3771(EffectDef):
+class Effect3771(BaseEffect):
     """
     armorHPBonusAddPassive
 
@@ -11625,7 +11629,7 @@ class Effect3771(EffectDef):
         fit.ship.increaseItemAttr('armorHP', module.getModifiedItemAttr('armorHPBonusAdd') or 0)
 
 
-class Effect3773(EffectDef):
+class Effect3773(BaseEffect):
     """
     hardPointModifierEffect
 
@@ -11641,7 +11645,7 @@ class Effect3773(EffectDef):
         fit.ship.increaseItemAttr('launcherSlotsLeft', module.getModifiedItemAttr('launcherHardPointModifier'))
 
 
-class Effect3774(EffectDef):
+class Effect3774(BaseEffect):
     """
     slotModifier
 
@@ -11658,7 +11662,7 @@ class Effect3774(EffectDef):
         fit.ship.increaseItemAttr('lowSlots', module.getModifiedItemAttr('lowSlotModifier'))
 
 
-class Effect3782(EffectDef):
+class Effect3782(BaseEffect):
     """
     powerOutputAddPassive
 
@@ -11673,7 +11677,7 @@ class Effect3782(EffectDef):
         fit.ship.increaseItemAttr('powerOutput', module.getModifiedItemAttr('powerOutput'))
 
 
-class Effect3783(EffectDef):
+class Effect3783(BaseEffect):
     """
     cpuOutputAddCpuOutputPassive
 
@@ -11688,7 +11692,7 @@ class Effect3783(EffectDef):
         fit.ship.increaseItemAttr('cpuOutput', module.getModifiedItemAttr('cpuOutput'))
 
 
-class Effect3797(EffectDef):
+class Effect3797(BaseEffect):
     """
     droneBandwidthAddPassive
 
@@ -11703,7 +11707,7 @@ class Effect3797(EffectDef):
         fit.ship.increaseItemAttr('droneBandwidth', module.getModifiedItemAttr('droneBandwidth'))
 
 
-class Effect3799(EffectDef):
+class Effect3799(BaseEffect):
     """
     droneCapacityAdddroneCapacityPassive
 
@@ -11718,7 +11722,7 @@ class Effect3799(EffectDef):
         fit.ship.increaseItemAttr('droneCapacity', module.getModifiedItemAttr('droneCapacity'))
 
 
-class Effect3807(EffectDef):
+class Effect3807(BaseEffect):
     """
     maxTargetRangeAddPassive
 
@@ -11733,7 +11737,7 @@ class Effect3807(EffectDef):
         fit.ship.increaseItemAttr('maxTargetRange', module.getModifiedItemAttr('maxTargetRange'))
 
 
-class Effect3808(EffectDef):
+class Effect3808(BaseEffect):
     """
     signatureRadiusAddPassive
 
@@ -11749,7 +11753,7 @@ class Effect3808(EffectDef):
         fit.ship.increaseItemAttr('signatureRadius', module.getModifiedItemAttr('signatureRadius'))
 
 
-class Effect3810(EffectDef):
+class Effect3810(BaseEffect):
     """
     capacityAddPassive
 
@@ -11765,7 +11769,7 @@ class Effect3810(EffectDef):
         fit.ship.increaseItemAttr('capacity', subsystem.getModifiedItemAttr('cargoCapacityAdd') or 0)
 
 
-class Effect3811(EffectDef):
+class Effect3811(BaseEffect):
     """
     capacitorCapacityAddPassive
 
@@ -11780,7 +11784,7 @@ class Effect3811(EffectDef):
         fit.ship.increaseItemAttr('capacitorCapacity', module.getModifiedItemAttr('capacitorCapacity') or 0)
 
 
-class Effect3831(EffectDef):
+class Effect3831(BaseEffect):
     """
     shieldCapacityAddPassive
 
@@ -11795,7 +11799,7 @@ class Effect3831(EffectDef):
         fit.ship.increaseItemAttr('shieldCapacity', module.getModifiedItemAttr('shieldCapacity'))
 
 
-class Effect3857(EffectDef):
+class Effect3857(BaseEffect):
     """
     subsystemBonusAmarrPropulsionMaxVelocity
 
@@ -11811,7 +11815,7 @@ class Effect3857(EffectDef):
                                skill='Amarr Propulsion Systems')
 
 
-class Effect3859(EffectDef):
+class Effect3859(BaseEffect):
     """
     subsystemBonusCaldariPropulsionMaxVelocity
 
@@ -11827,7 +11831,7 @@ class Effect3859(EffectDef):
                                skill='Caldari Propulsion Systems')
 
 
-class Effect3860(EffectDef):
+class Effect3860(BaseEffect):
     """
     subsystemBonusMinmatarPropulsionMaxVelocity
 
@@ -11843,7 +11847,7 @@ class Effect3860(EffectDef):
                                skill='Minmatar Propulsion Systems')
 
 
-class Effect3861(EffectDef):
+class Effect3861(BaseEffect):
     """
     subsystemBonusMinmatarPropulsionAfterburnerSpeedFactor
 
@@ -11860,7 +11864,7 @@ class Effect3861(EffectDef):
                                       skill='Minmatar Propulsion Systems')
 
 
-class Effect3863(EffectDef):
+class Effect3863(BaseEffect):
     """
     subsystemBonusCaldariPropulsionAfterburnerSpeedFactor
 
@@ -11877,7 +11881,7 @@ class Effect3863(EffectDef):
                                       skill='Caldari Propulsion Systems')
 
 
-class Effect3864(EffectDef):
+class Effect3864(BaseEffect):
     """
     subsystemBonusAmarrPropulsionAfterburnerSpeedFactor
 
@@ -11894,7 +11898,7 @@ class Effect3864(EffectDef):
                                       skill='Amarr Propulsion Systems')
 
 
-class Effect3865(EffectDef):
+class Effect3865(BaseEffect):
     """
     subsystemBonusAmarrPropulsion2Agility
 
@@ -11910,7 +11914,7 @@ class Effect3865(EffectDef):
                                skill='Amarr Propulsion Systems')
 
 
-class Effect3866(EffectDef):
+class Effect3866(BaseEffect):
     """
     subsystemBonusCaldariPropulsion2Agility
 
@@ -11926,7 +11930,7 @@ class Effect3866(EffectDef):
                                skill='Caldari Propulsion Systems')
 
 
-class Effect3867(EffectDef):
+class Effect3867(BaseEffect):
     """
     subsystemBonusGallentePropulsion2Agility
 
@@ -11942,7 +11946,7 @@ class Effect3867(EffectDef):
                                skill='Gallente Propulsion Systems')
 
 
-class Effect3868(EffectDef):
+class Effect3868(BaseEffect):
     """
     subsystemBonusMinmatarPropulsion2Agility
 
@@ -11958,7 +11962,7 @@ class Effect3868(EffectDef):
                                skill='Minmatar Propulsion Systems')
 
 
-class Effect3869(EffectDef):
+class Effect3869(BaseEffect):
     """
     subsystemBonusMinmatarPropulsion2MWDPenalty
 
@@ -11975,7 +11979,7 @@ class Effect3869(EffectDef):
                                       skill='Minmatar Propulsion Systems')
 
 
-class Effect3872(EffectDef):
+class Effect3872(BaseEffect):
     """
     subsystemBonusAmarrPropulsion2MWDPenalty
 
@@ -11992,7 +11996,7 @@ class Effect3872(EffectDef):
                                       skill='Amarr Propulsion Systems')
 
 
-class Effect3875(EffectDef):
+class Effect3875(BaseEffect):
     """
     subsystemBonusGallentePropulsionABMWDCapNeed
 
@@ -12009,7 +12013,7 @@ class Effect3875(EffectDef):
                                       skill='Gallente Propulsion Systems')
 
 
-class Effect3893(EffectDef):
+class Effect3893(BaseEffect):
     """
     subsystemBonusMinmatarCoreScanStrengthLADAR
 
@@ -12025,7 +12029,7 @@ class Effect3893(EffectDef):
                                skill='Minmatar Core Systems')
 
 
-class Effect3895(EffectDef):
+class Effect3895(BaseEffect):
     """
     subsystemBonusGallenteCoreScanStrengthMagnetometric
 
@@ -12041,7 +12045,7 @@ class Effect3895(EffectDef):
                                skill='Gallente Core Systems')
 
 
-class Effect3897(EffectDef):
+class Effect3897(BaseEffect):
     """
     subsystemBonusCaldariCoreScanStrengthGravimetric
 
@@ -12056,7 +12060,7 @@ class Effect3897(EffectDef):
         fit.ship.boostItemAttr('scanGravimetricStrength', src.getModifiedItemAttr('subsystemBonusCaldariCore'), skill='Caldari Core Systems')
 
 
-class Effect3900(EffectDef):
+class Effect3900(BaseEffect):
     """
     subsystemBonusAmarrCoreScanStrengthRADAR
 
@@ -12072,7 +12076,7 @@ class Effect3900(EffectDef):
                                skill='Amarr Core Systems')
 
 
-class Effect3959(EffectDef):
+class Effect3959(BaseEffect):
     """
     subsystemBonusAmarrDefensiveArmorRepairAmount
 
@@ -12090,7 +12094,7 @@ class Effect3959(EffectDef):
                                       skill='Amarr Defensive Systems')
 
 
-class Effect3961(EffectDef):
+class Effect3961(BaseEffect):
     """
     subsystemBonusGallenteDefensiveArmorRepairAmount
 
@@ -12108,7 +12112,7 @@ class Effect3961(EffectDef):
                                       skill='Gallente Defensive Systems')
 
 
-class Effect3962(EffectDef):
+class Effect3962(BaseEffect):
     """
     subsystemBonusMinmatarDefensiveShieldArmorRepairAmount
 
@@ -12129,7 +12133,7 @@ class Effect3962(EffectDef):
                                       skill='Minmatar Defensive Systems')
 
 
-class Effect3964(EffectDef):
+class Effect3964(BaseEffect):
     """
     subsystemBonusCaldariDefensiveShieldBoostAmount
 
@@ -12147,7 +12151,7 @@ class Effect3964(EffectDef):
                                       skill='Caldari Defensive Systems')
 
 
-class Effect3976(EffectDef):
+class Effect3976(BaseEffect):
     """
     subsystemBonusCaldariDefensiveShieldHP
 
@@ -12163,7 +12167,7 @@ class Effect3976(EffectDef):
                                skill='Caldari Defensive Systems')
 
 
-class Effect3979(EffectDef):
+class Effect3979(BaseEffect):
     """
     subsystemBonusMinmatarDefensiveShieldArmorHP
 
@@ -12181,7 +12185,7 @@ class Effect3979(EffectDef):
                                skill='Minmatar Defensive Systems')
 
 
-class Effect3980(EffectDef):
+class Effect3980(BaseEffect):
     """
     subsystemBonusGallenteDefensiveArmorHP
 
@@ -12197,7 +12201,7 @@ class Effect3980(EffectDef):
                                skill='Gallente Defensive Systems')
 
 
-class Effect3982(EffectDef):
+class Effect3982(BaseEffect):
     """
     subsystemBonusAmarrDefensiveArmorHP
 
@@ -12213,7 +12217,7 @@ class Effect3982(EffectDef):
                                skill='Amarr Defensive Systems')
 
 
-class Effect3992(EffectDef):
+class Effect3992(BaseEffect):
     """
     systemShieldHP
 
@@ -12229,7 +12233,7 @@ class Effect3992(EffectDef):
         fit.ship.multiplyItemAttr('shieldCapacity', beacon.getModifiedItemAttr('shieldCapacityMultiplier'))
 
 
-class Effect3993(EffectDef):
+class Effect3993(BaseEffect):
     """
     systemTargetingRange
 
@@ -12247,7 +12251,7 @@ class Effect3993(EffectDef):
                                   stackingPenalties=True, penaltyGroup='postMul')
 
 
-class Effect3995(EffectDef):
+class Effect3995(BaseEffect):
     """
     systemSignatureRadius
 
@@ -12265,7 +12269,7 @@ class Effect3995(EffectDef):
                                   stackingPenalties=True, penaltyGroup='postMul')
 
 
-class Effect3996(EffectDef):
+class Effect3996(BaseEffect):
     """
     systemArmorEmResistance
 
@@ -12283,7 +12287,7 @@ class Effect3996(EffectDef):
                                stackingPenalties=True)
 
 
-class Effect3997(EffectDef):
+class Effect3997(BaseEffect):
     """
     systemArmorExplosiveResistance
 
@@ -12302,7 +12306,7 @@ class Effect3997(EffectDef):
                                stackingPenalties=True)
 
 
-class Effect3998(EffectDef):
+class Effect3998(BaseEffect):
     """
     systemArmorKineticResistance
 
@@ -12321,7 +12325,7 @@ class Effect3998(EffectDef):
                                stackingPenalties=True)
 
 
-class Effect3999(EffectDef):
+class Effect3999(BaseEffect):
     """
     systemArmorThermalResistance
 
@@ -12340,7 +12344,7 @@ class Effect3999(EffectDef):
                                stackingPenalties=True)
 
 
-class Effect4002(EffectDef):
+class Effect4002(BaseEffect):
     """
     systemMissileVelocity
 
@@ -12358,7 +12362,7 @@ class Effect4002(EffectDef):
                                            stackingPenalties=True, penaltyGroup='postMul')
 
 
-class Effect4003(EffectDef):
+class Effect4003(BaseEffect):
     """
     systemMaxVelocity
 
@@ -12375,7 +12379,7 @@ class Effect4003(EffectDef):
                                   stackingPenalties=True, penaltyGroup='postMul')
 
 
-class Effect4016(EffectDef):
+class Effect4016(BaseEffect):
     """
     systemDamageMultiplierGunnery
 
@@ -12393,7 +12397,7 @@ class Effect4016(EffectDef):
                                          stackingPenalties=True)
 
 
-class Effect4017(EffectDef):
+class Effect4017(BaseEffect):
     """
     systemDamageThermalMissiles
 
@@ -12411,7 +12415,7 @@ class Effect4017(EffectDef):
                                            stackingPenalties=True, penaltyGroup='postMul')
 
 
-class Effect4018(EffectDef):
+class Effect4018(BaseEffect):
     """
     systemDamageEmMissiles
 
@@ -12429,7 +12433,7 @@ class Effect4018(EffectDef):
                                            stackingPenalties=True, penaltyGroup='postMul')
 
 
-class Effect4019(EffectDef):
+class Effect4019(BaseEffect):
     """
     systemDamageExplosiveMissiles
 
@@ -12447,7 +12451,7 @@ class Effect4019(EffectDef):
                                            stackingPenalties=True, penaltyGroup='postMul')
 
 
-class Effect4020(EffectDef):
+class Effect4020(BaseEffect):
     """
     systemDamageKineticMissiles
 
@@ -12465,7 +12469,7 @@ class Effect4020(EffectDef):
                                            stackingPenalties=True, penaltyGroup='postMul')
 
 
-class Effect4021(EffectDef):
+class Effect4021(BaseEffect):
     """
     systemDamageDrones
 
@@ -12483,7 +12487,7 @@ class Effect4021(EffectDef):
                                         stackingPenalties=True, penaltyGroup='postMul')
 
 
-class Effect4022(EffectDef):
+class Effect4022(BaseEffect):
     """
     systemTracking
 
@@ -12501,7 +12505,7 @@ class Effect4022(EffectDef):
                                          stackingPenalties=True, penaltyGroup='postMul')
 
 
-class Effect4023(EffectDef):
+class Effect4023(BaseEffect):
     """
     systemAoeVelocity
 
@@ -12518,7 +12522,7 @@ class Effect4023(EffectDef):
                                            'aoeVelocity', beacon.getModifiedItemAttr('aoeVelocityMultiplier'))
 
 
-class Effect4033(EffectDef):
+class Effect4033(BaseEffect):
     """
     systemHeatDamage
 
@@ -12535,7 +12539,7 @@ class Effect4033(EffectDef):
                                          'heatDamage', module.getModifiedItemAttr('heatDamageMultiplier'))
 
 
-class Effect4034(EffectDef):
+class Effect4034(BaseEffect):
     """
     systemOverloadArmor
 
@@ -12552,7 +12556,7 @@ class Effect4034(EffectDef):
                                          'overloadArmorDamageAmount', module.getModifiedItemAttr('overloadBonusMultiplier'))
 
 
-class Effect4035(EffectDef):
+class Effect4035(BaseEffect):
     """
     systemOverloadDamageModifier
 
@@ -12569,7 +12573,7 @@ class Effect4035(EffectDef):
                                          'overloadDamageModifier', module.getModifiedItemAttr('overloadBonusMultiplier'))
 
 
-class Effect4036(EffectDef):
+class Effect4036(BaseEffect):
     """
     systemOverloadDurationBonus
 
@@ -12586,7 +12590,7 @@ class Effect4036(EffectDef):
                                          'overloadDurationBonus', module.getModifiedItemAttr('overloadBonusMultiplier'))
 
 
-class Effect4037(EffectDef):
+class Effect4037(BaseEffect):
     """
     systemOverloadEccmStrength
 
@@ -12603,7 +12607,7 @@ class Effect4037(EffectDef):
                                          'overloadECCMStrenghtBonus', module.getModifiedItemAttr('overloadBonusMultiplier'))
 
 
-class Effect4038(EffectDef):
+class Effect4038(BaseEffect):
     """
     systemOverloadEcmStrength
 
@@ -12620,7 +12624,7 @@ class Effect4038(EffectDef):
                                          'overloadECMStrenghtBonus', module.getModifiedItemAttr('overloadBonusMultiplier'))
 
 
-class Effect4039(EffectDef):
+class Effect4039(BaseEffect):
     """
     systemOverloadHardening
 
@@ -12637,7 +12641,7 @@ class Effect4039(EffectDef):
                                          'overloadHardeningBonus', module.getModifiedItemAttr('overloadBonusMultiplier'))
 
 
-class Effect4040(EffectDef):
+class Effect4040(BaseEffect):
     """
     systemOverloadRange
 
@@ -12654,7 +12658,7 @@ class Effect4040(EffectDef):
                                          'overloadRangeBonus', module.getModifiedItemAttr('overloadBonusMultiplier'))
 
 
-class Effect4041(EffectDef):
+class Effect4041(BaseEffect):
     """
     systemOverloadRof
 
@@ -12671,7 +12675,7 @@ class Effect4041(EffectDef):
                                          'overloadRofBonus', module.getModifiedItemAttr('overloadBonusMultiplier'))
 
 
-class Effect4042(EffectDef):
+class Effect4042(BaseEffect):
     """
     systemOverloadSelfDuration
 
@@ -12688,7 +12692,7 @@ class Effect4042(EffectDef):
                                          'overloadSelfDurationBonus', module.getModifiedItemAttr('overloadBonusMultiplier'))
 
 
-class Effect4043(EffectDef):
+class Effect4043(BaseEffect):
     """
     systemOverloadShieldBonus
 
@@ -12705,7 +12709,7 @@ class Effect4043(EffectDef):
                                          'overloadShieldBonus', module.getModifiedItemAttr('overloadBonusMultiplier'))
 
 
-class Effect4044(EffectDef):
+class Effect4044(BaseEffect):
     """
     systemOverloadSpeedFactor
 
@@ -12722,7 +12726,7 @@ class Effect4044(EffectDef):
                                          'overloadSpeedFactorBonus', module.getModifiedItemAttr('overloadBonusMultiplier'))
 
 
-class Effect4045(EffectDef):
+class Effect4045(BaseEffect):
     """
     systemSmartBombRange
 
@@ -12739,7 +12743,7 @@ class Effect4045(EffectDef):
                                          'empFieldRange', module.getModifiedItemAttr('empFieldRangeMultiplier'))
 
 
-class Effect4046(EffectDef):
+class Effect4046(BaseEffect):
     """
     systemSmartBombEmDamage
 
@@ -12756,7 +12760,7 @@ class Effect4046(EffectDef):
                                          'emDamage', module.getModifiedItemAttr('smartbombDamageMultiplier'))
 
 
-class Effect4047(EffectDef):
+class Effect4047(BaseEffect):
     """
     systemSmartBombThermalDamage
 
@@ -12773,7 +12777,7 @@ class Effect4047(EffectDef):
                                          'thermalDamage', module.getModifiedItemAttr('smartbombDamageMultiplier'))
 
 
-class Effect4048(EffectDef):
+class Effect4048(BaseEffect):
     """
     systemSmartBombKineticDamage
 
@@ -12790,7 +12794,7 @@ class Effect4048(EffectDef):
                                          'kineticDamage', module.getModifiedItemAttr('smartbombDamageMultiplier'))
 
 
-class Effect4049(EffectDef):
+class Effect4049(BaseEffect):
     """
     systemSmartBombExplosiveDamage
 
@@ -12807,7 +12811,7 @@ class Effect4049(EffectDef):
                                          'explosiveDamage', module.getModifiedItemAttr('smartbombDamageMultiplier'))
 
 
-class Effect4054(EffectDef):
+class Effect4054(BaseEffect):
     """
     systemSmallEnergyDamage
 
@@ -12825,7 +12829,7 @@ class Effect4054(EffectDef):
                                          stackingPenalties=True)
 
 
-class Effect4055(EffectDef):
+class Effect4055(BaseEffect):
     """
     systemSmallProjectileDamage
 
@@ -12843,7 +12847,7 @@ class Effect4055(EffectDef):
                                          stackingPenalties=True)
 
 
-class Effect4056(EffectDef):
+class Effect4056(BaseEffect):
     """
     systemSmallHybridDamage
 
@@ -12861,7 +12865,7 @@ class Effect4056(EffectDef):
                                          stackingPenalties=True)
 
 
-class Effect4057(EffectDef):
+class Effect4057(BaseEffect):
     """
     systemRocketEmDamage
 
@@ -12879,7 +12883,7 @@ class Effect4057(EffectDef):
                                            stackingPenalties=True, penaltyGroup='postMul')
 
 
-class Effect4058(EffectDef):
+class Effect4058(BaseEffect):
     """
     systemRocketExplosiveDamage
 
@@ -12897,7 +12901,7 @@ class Effect4058(EffectDef):
                                            stackingPenalties=True, penaltyGroup='postMul')
 
 
-class Effect4059(EffectDef):
+class Effect4059(BaseEffect):
     """
     systemRocketKineticDamage
 
@@ -12915,7 +12919,7 @@ class Effect4059(EffectDef):
                                            stackingPenalties=True, penaltyGroup='postMul')
 
 
-class Effect4060(EffectDef):
+class Effect4060(BaseEffect):
     """
     systemRocketThermalDamage
 
@@ -12933,7 +12937,7 @@ class Effect4060(EffectDef):
                                            stackingPenalties=True, penaltyGroup='postMul')
 
 
-class Effect4061(EffectDef):
+class Effect4061(BaseEffect):
     """
     systemStandardMissileThermalDamage
 
@@ -12951,7 +12955,7 @@ class Effect4061(EffectDef):
                                            stackingPenalties=True, penaltyGroup='postMul')
 
 
-class Effect4062(EffectDef):
+class Effect4062(BaseEffect):
     """
     systemStandardMissileEmDamage
 
@@ -12969,7 +12973,7 @@ class Effect4062(EffectDef):
                                            stackingPenalties=True, penaltyGroup='postMul')
 
 
-class Effect4063(EffectDef):
+class Effect4063(BaseEffect):
     """
     systemStandardMissileExplosiveDamage
 
@@ -12987,7 +12991,7 @@ class Effect4063(EffectDef):
                                            stackingPenalties=True, penaltyGroup='postMul')
 
 
-class Effect4086(EffectDef):
+class Effect4086(BaseEffect):
     """
     systemArmorRepairAmount
 
@@ -13006,7 +13010,7 @@ class Effect4086(EffectDef):
                                          stackingPenalties=True, penaltyGroup='postMul')
 
 
-class Effect4088(EffectDef):
+class Effect4088(BaseEffect):
     """
     systemArmorRemoteRepairAmount
 
@@ -13025,7 +13029,7 @@ class Effect4088(EffectDef):
                                          stackingPenalties=True)
 
 
-class Effect4089(EffectDef):
+class Effect4089(BaseEffect):
     """
     systemShieldRemoteRepairAmount
 
@@ -13043,7 +13047,7 @@ class Effect4089(EffectDef):
                                          stackingPenalties=True, penaltyGroup='postMul')
 
 
-class Effect4090(EffectDef):
+class Effect4090(BaseEffect):
     """
     systemCapacitorCapacity
 
@@ -13059,7 +13063,7 @@ class Effect4090(EffectDef):
         fit.ship.multiplyItemAttr('capacitorCapacity', beacon.getModifiedItemAttr('capacitorCapacityMultiplierSystem'))
 
 
-class Effect4091(EffectDef):
+class Effect4091(BaseEffect):
     """
     systemCapacitorRecharge
 
@@ -13076,7 +13080,7 @@ class Effect4091(EffectDef):
         fit.ship.multiplyItemAttr('rechargeRate', beacon.getModifiedItemAttr('rechargeRateMultiplier'))
 
 
-class Effect4093(EffectDef):
+class Effect4093(BaseEffect):
     """
     subsystemBonusAmarrOffensiveEnergyWeaponDamageMultiplier
 
@@ -13093,7 +13097,7 @@ class Effect4093(EffectDef):
                                       skill='Amarr Offensive Systems')
 
 
-class Effect4104(EffectDef):
+class Effect4104(BaseEffect):
     """
     subsystemBonusCaldariOffensiveHybridWeaponMaxRange
 
@@ -13110,7 +13114,7 @@ class Effect4104(EffectDef):
                                       skill='Caldari Offensive Systems')
 
 
-class Effect4106(EffectDef):
+class Effect4106(BaseEffect):
     """
     subsystemBonusGallenteOffensiveHybridWeaponFalloff
 
@@ -13127,7 +13131,7 @@ class Effect4106(EffectDef):
                                       skill='Gallente Offensive Systems')
 
 
-class Effect4114(EffectDef):
+class Effect4114(BaseEffect):
     """
     subsystemBonusMinmatarOffensiveProjectileWeaponFalloff
 
@@ -13144,7 +13148,7 @@ class Effect4114(EffectDef):
                                       skill='Minmatar Offensive Systems')
 
 
-class Effect4115(EffectDef):
+class Effect4115(BaseEffect):
     """
     subsystemBonusMinmatarOffensiveProjectileWeaponMaxRange
 
@@ -13161,7 +13165,7 @@ class Effect4115(EffectDef):
                                       skill='Minmatar Offensive Systems')
 
 
-class Effect4122(EffectDef):
+class Effect4122(BaseEffect):
     """
     subsystemBonusCaldariOffensive1LauncherROF
 
@@ -13178,7 +13182,7 @@ class Effect4122(EffectDef):
                                       'speed', src.getModifiedItemAttr('subsystemBonusCaldariOffensive'), skill='Caldari Offensive Systems')
 
 
-class Effect4135(EffectDef):
+class Effect4135(BaseEffect):
     """
     systemShieldEmResistance
 
@@ -13195,7 +13199,7 @@ class Effect4135(EffectDef):
                                stackingPenalties=True)
 
 
-class Effect4136(EffectDef):
+class Effect4136(BaseEffect):
     """
     systemShieldExplosiveResistance
 
@@ -13213,7 +13217,7 @@ class Effect4136(EffectDef):
                                stackingPenalties=True)
 
 
-class Effect4137(EffectDef):
+class Effect4137(BaseEffect):
     """
     systemShieldKineticResistance
 
@@ -13231,7 +13235,7 @@ class Effect4137(EffectDef):
                                stackingPenalties=True)
 
 
-class Effect4138(EffectDef):
+class Effect4138(BaseEffect):
     """
     systemShieldThermalResistance
 
@@ -13249,7 +13253,7 @@ class Effect4138(EffectDef):
                                stackingPenalties=True)
 
 
-class Effect4152(EffectDef):
+class Effect4152(BaseEffect):
     """
     subsystemBonusAmarrEngineeringHeatDamageReduction
 
@@ -13266,7 +13270,7 @@ class Effect4152(EffectDef):
                                       skill='Amarr Core Systems')
 
 
-class Effect4153(EffectDef):
+class Effect4153(BaseEffect):
     """
     subsystemBonusCaldariEngineeringHeatDamageReduction
 
@@ -13283,7 +13287,7 @@ class Effect4153(EffectDef):
                                       skill='Caldari Core Systems')
 
 
-class Effect4154(EffectDef):
+class Effect4154(BaseEffect):
     """
     subsystemBonusGallenteEngineeringHeatDamageReduction
 
@@ -13300,7 +13304,7 @@ class Effect4154(EffectDef):
                                       skill='Gallente Core Systems')
 
 
-class Effect4155(EffectDef):
+class Effect4155(BaseEffect):
     """
     subsystemBonusMinmatarEngineeringHeatDamageReduction
 
@@ -13317,7 +13321,7 @@ class Effect4155(EffectDef):
                                       skill='Minmatar Core Systems')
 
 
-class Effect4158(EffectDef):
+class Effect4158(BaseEffect):
     """
     subsystemBonusCaldariCoreCapacitorCapacity
 
@@ -13333,7 +13337,7 @@ class Effect4158(EffectDef):
                                skill='Caldari Core Systems')
 
 
-class Effect4159(EffectDef):
+class Effect4159(BaseEffect):
     """
     subsystemBonusAmarrCoreCapacitorCapacity
 
@@ -13348,7 +13352,7 @@ class Effect4159(EffectDef):
         fit.ship.boostItemAttr('capacitorCapacity', src.getModifiedItemAttr('subsystemBonusAmarrCore'), skill='Amarr Core Systems')
 
 
-class Effect4161(EffectDef):
+class Effect4161(BaseEffect):
     """
     baseMaxScanDeviationModifierRequiringAstrometrics
 
@@ -13368,7 +13372,7 @@ class Effect4161(EffectDef):
                                         container.getModifiedItemAttr('maxScanDeviationModifier') * level)
 
 
-class Effect4162(EffectDef):
+class Effect4162(BaseEffect):
     """
     baseSensorStrengthModifierRequiringAstrometrics
 
@@ -13392,7 +13396,7 @@ class Effect4162(EffectDef):
                                         stackingPenalties=penalized)
 
 
-class Effect4165(EffectDef):
+class Effect4165(BaseEffect):
     """
     shipBonusScanProbeStrengthCF
 
@@ -13409,7 +13413,7 @@ class Effect4165(EffectDef):
                                         skill='Caldari Frigate')
 
 
-class Effect4166(EffectDef):
+class Effect4166(BaseEffect):
     """
     shipBonusScanProbeStrengthMF
 
@@ -13426,7 +13430,7 @@ class Effect4166(EffectDef):
                                         skill='Minmatar Frigate')
 
 
-class Effect4167(EffectDef):
+class Effect4167(BaseEffect):
     """
     shipBonusScanProbeStrengthGF
 
@@ -13443,7 +13447,7 @@ class Effect4167(EffectDef):
                                         skill='Gallente Frigate')
 
 
-class Effect4168(EffectDef):
+class Effect4168(BaseEffect):
     """
     eliteBonusCoverOpsScanProbeStrength2
 
@@ -13460,7 +13464,7 @@ class Effect4168(EffectDef):
                                         skill='Covert Ops')
 
 
-class Effect4187(EffectDef):
+class Effect4187(BaseEffect):
     """
     shipBonusStrategicCruiserAmarrHeatDamage
 
@@ -13477,7 +13481,7 @@ class Effect4187(EffectDef):
                                       skill='Amarr Strategic Cruiser')
 
 
-class Effect4188(EffectDef):
+class Effect4188(BaseEffect):
     """
     shipBonusStrategicCruiserCaldariHeatDamage
 
@@ -13494,7 +13498,7 @@ class Effect4188(EffectDef):
                                       skill='Caldari Strategic Cruiser')
 
 
-class Effect4189(EffectDef):
+class Effect4189(BaseEffect):
     """
     shipBonusStrategicCruiserGallenteHeatDamage
 
@@ -13511,7 +13515,7 @@ class Effect4189(EffectDef):
                                       skill='Gallente Strategic Cruiser')
 
 
-class Effect4190(EffectDef):
+class Effect4190(BaseEffect):
     """
     shipBonusStrategicCruiserMinmatarHeatDamage
 
@@ -13528,7 +13532,7 @@ class Effect4190(EffectDef):
                                       skill='Minmatar Strategic Cruiser')
 
 
-class Effect4215(EffectDef):
+class Effect4215(BaseEffect):
     """
     subsystemBonusAmarrOffensive2EnergyWeaponCapacitorNeed
 
@@ -13545,7 +13549,7 @@ class Effect4215(EffectDef):
                                       skill='Amarr Offensive Systems')
 
 
-class Effect4216(EffectDef):
+class Effect4216(BaseEffect):
     """
     subsystemBonusAmarrCore2EnergyVampireAmount
 
@@ -13561,7 +13565,7 @@ class Effect4216(EffectDef):
                                       src.getModifiedItemAttr('subsystemBonusAmarrCore2'), skill='Amarr Core Systems')
 
 
-class Effect4217(EffectDef):
+class Effect4217(BaseEffect):
     """
     subsystemBonusAmarrCore2EnergyDestabilizerAmount
 
@@ -13577,7 +13581,7 @@ class Effect4217(EffectDef):
                                       src.getModifiedItemAttr('subsystemBonusAmarrCore2'), skill='Amarr Core Systems')
 
 
-class Effect4248(EffectDef):
+class Effect4248(BaseEffect):
     """
     subsystemBonusCaldariOffensive2MissileLauncherKineticDamage
 
@@ -13600,7 +13604,7 @@ class Effect4248(EffectDef):
                                         skill='Caldari Offensive Systems')
 
 
-class Effect4250(EffectDef):
+class Effect4250(BaseEffect):
     """
     subsystemBonusGallenteOffensiveDroneDamageHP
 
@@ -13626,7 +13630,7 @@ class Effect4250(EffectDef):
                                      skill='Gallente Offensive Systems')
 
 
-class Effect4251(EffectDef):
+class Effect4251(BaseEffect):
     """
     subsystemBonusMinmatarOffensive2ProjectileWeaponDamageMultiplier
 
@@ -13643,7 +13647,7 @@ class Effect4251(EffectDef):
                                       skill='Minmatar Offensive Systems')
 
 
-class Effect4256(EffectDef):
+class Effect4256(BaseEffect):
     """
     subsystemBonusMinmatarOffensive2MissileLauncherROF
 
@@ -13661,7 +13665,7 @@ class Effect4256(EffectDef):
                                       skill='Minmatar Offensive Systems')
 
 
-class Effect4264(EffectDef):
+class Effect4264(BaseEffect):
     """
     subsystemBonusMinmatarCoreCapacitorRecharge
 
@@ -13677,7 +13681,7 @@ class Effect4264(EffectDef):
                                skill='Minmatar Core Systems')
 
 
-class Effect4265(EffectDef):
+class Effect4265(BaseEffect):
     """
     subsystemBonusGallenteCoreCapacitorRecharge
 
@@ -13693,7 +13697,7 @@ class Effect4265(EffectDef):
                                skill='Gallente Core Systems')
 
 
-class Effect4269(EffectDef):
+class Effect4269(BaseEffect):
     """
     subsystemBonusAmarrCore3ScanResolution
 
@@ -13709,7 +13713,7 @@ class Effect4269(EffectDef):
                                skill='Amarr Core Systems')
 
 
-class Effect4270(EffectDef):
+class Effect4270(BaseEffect):
     """
     subsystemBonusMinmatarCore3ScanResolution
 
@@ -13725,7 +13729,7 @@ class Effect4270(EffectDef):
                                skill='Minmatar Core Systems')
 
 
-class Effect4271(EffectDef):
+class Effect4271(BaseEffect):
     """
     subsystemBonusCaldariCore2MaxTargetingRange
 
@@ -13740,7 +13744,7 @@ class Effect4271(EffectDef):
         fit.ship.boostItemAttr('maxTargetRange', src.getModifiedItemAttr('subsystemBonusCaldariCore2'), skill='Caldari Core Systems')
 
 
-class Effect4272(EffectDef):
+class Effect4272(BaseEffect):
     """
     subsystemBonusGallenteCore2MaxTargetingRange
 
@@ -13756,7 +13760,7 @@ class Effect4272(EffectDef):
                                skill='Gallente Core Systems')
 
 
-class Effect4273(EffectDef):
+class Effect4273(BaseEffect):
     """
     subsystemBonusGallenteCore2WarpScrambleRange
 
@@ -13772,7 +13776,7 @@ class Effect4273(EffectDef):
                                       src.getModifiedItemAttr('subsystemBonusGallenteCore2'), skill='Gallente Core Systems')
 
 
-class Effect4274(EffectDef):
+class Effect4274(BaseEffect):
     """
     subsystemBonusMinmatarCore2StasisWebifierRange
 
@@ -13788,7 +13792,7 @@ class Effect4274(EffectDef):
                                       'maxRange', src.getModifiedItemAttr('subsystemBonusMinmatarCore2'), skill='Minmatar Core Systems')
 
 
-class Effect4275(EffectDef):
+class Effect4275(BaseEffect):
     """
     subsystemBonusCaldariPropulsion2WarpSpeed
 
@@ -13804,7 +13808,7 @@ class Effect4275(EffectDef):
                                skill='Caldari Propulsion Systems')
 
 
-class Effect4277(EffectDef):
+class Effect4277(BaseEffect):
     """
     subsystemBonusGallentePropulsionWarpCapacitor
 
@@ -13820,7 +13824,7 @@ class Effect4277(EffectDef):
                                skill='Gallente Propulsion Systems')
 
 
-class Effect4278(EffectDef):
+class Effect4278(BaseEffect):
     """
     subsystemBonusGallentePropulsion2WarpSpeed
 
@@ -13836,7 +13840,7 @@ class Effect4278(EffectDef):
                                skill='Gallente Propulsion Systems')
 
 
-class Effect4280(EffectDef):
+class Effect4280(BaseEffect):
     """
     systemAgility
 
@@ -13852,7 +13856,7 @@ class Effect4280(EffectDef):
         fit.ship.multiplyItemAttr('agility', beacon.getModifiedItemAttr('agilityMultiplier'), stackingPenalties=True)
 
 
-class Effect4282(EffectDef):
+class Effect4282(BaseEffect):
     """
     subsystemBonusGallenteOffensive2HybridWeaponDamageMultiplier
 
@@ -13869,7 +13873,7 @@ class Effect4282(EffectDef):
                                       skill='Gallente Offensive Systems')
 
 
-class Effect4283(EffectDef):
+class Effect4283(BaseEffect):
     """
     subsystemBonusCaldariOffensive2HybridWeaponDamageMultiplier
 
@@ -13886,7 +13890,7 @@ class Effect4283(EffectDef):
                                       skill='Caldari Offensive Systems')
 
 
-class Effect4286(EffectDef):
+class Effect4286(BaseEffect):
     """
     subsystemBonusAmarrOffensive2RemoteArmorRepairCapUse
 
@@ -13902,7 +13906,7 @@ class Effect4286(EffectDef):
                                       src.getModifiedItemAttr('subsystemBonusAmarrOffensive2'), skill='Amarr Offensive Systems')
 
 
-class Effect4288(EffectDef):
+class Effect4288(BaseEffect):
     """
     subsystemBonusGallenteOffensive2RemoteArmorRepairCapUse
 
@@ -13918,7 +13922,7 @@ class Effect4288(EffectDef):
                                       src.getModifiedItemAttr('subsystemBonusGallenteOffensive2'), skill='Gallente Offensive Systems')
 
 
-class Effect4290(EffectDef):
+class Effect4290(BaseEffect):
     """
     subsystemBonusMinmatarOffensive2RemoteRepCapUse
 
@@ -13935,7 +13939,7 @@ class Effect4290(EffectDef):
                                       skill='Minmatar Offensive Systems')
 
 
-class Effect4292(EffectDef):
+class Effect4292(BaseEffect):
     """
     subsystemBonusCaldariOffensive2RemoteShieldBoosterCapUse
 
@@ -13952,7 +13956,7 @@ class Effect4292(EffectDef):
                                       skill='Caldari Offensive Systems')
 
 
-class Effect4321(EffectDef):
+class Effect4321(BaseEffect):
     """
     subsystemBonusCaldariCore2ECMStrengthRange
 
@@ -13976,7 +13980,7 @@ class Effect4321(EffectDef):
                                       src.getModifiedItemAttr('subsystemBonusCaldariCore2'), skill='Caldari Core Systems')
 
 
-class Effect4327(EffectDef):
+class Effect4327(BaseEffect):
     """
     subsystemBonusAmarrOffensive3DroneDamageHP
 
@@ -13998,7 +14002,7 @@ class Effect4327(EffectDef):
                                      'damageMultiplier', src.getModifiedItemAttr('subsystemBonusAmarrOffensive3'), skill='Amarr Offensive Systems')
 
 
-class Effect4330(EffectDef):
+class Effect4330(BaseEffect):
     """
     subsystemBonusAmarrOffensive3EnergyWeaponMaxRange
 
@@ -14015,7 +14019,7 @@ class Effect4330(EffectDef):
                                       skill='Amarr Offensive Systems')
 
 
-class Effect4331(EffectDef):
+class Effect4331(BaseEffect):
     """
     subsystemBonusCaldariOffensive3HMLHAMVelocity
 
@@ -14032,7 +14036,7 @@ class Effect4331(EffectDef):
                                         skill='Caldari Offensive Systems')
 
 
-class Effect4342(EffectDef):
+class Effect4342(BaseEffect):
     """
     subsystemBonusMinmatarCore2MaxTargetingRange
 
@@ -14048,7 +14052,7 @@ class Effect4342(EffectDef):
                                skill='Minmatar Core Systems')
 
 
-class Effect4343(EffectDef):
+class Effect4343(BaseEffect):
     """
     subsystemBonusAmarrCore2MaxTargetingRange
 
@@ -14064,7 +14068,7 @@ class Effect4343(EffectDef):
                                skill='Amarr Core Systems')
 
 
-class Effect4347(EffectDef):
+class Effect4347(BaseEffect):
     """
     subsystemBonusGallenteOffensive3TurretTracking
 
@@ -14082,7 +14086,7 @@ class Effect4347(EffectDef):
                                       skill='Gallente Offensive Systems')
 
 
-class Effect4351(EffectDef):
+class Effect4351(BaseEffect):
     """
     subsystemBonusMinmatarOffensive3TurretTracking
 
@@ -14099,7 +14103,7 @@ class Effect4351(EffectDef):
                                       skill='Minmatar Offensive Systems')
 
 
-class Effect4358(EffectDef):
+class Effect4358(BaseEffect):
     """
     ecmRangeBonusModuleEffect
 
@@ -14116,7 +14120,7 @@ class Effect4358(EffectDef):
                                       stackingPenalties=True)
 
 
-class Effect4360(EffectDef):
+class Effect4360(BaseEffect):
     """
     subsystemBonusAmarrOffensiveMissileLauncherROF
 
@@ -14133,7 +14137,7 @@ class Effect4360(EffectDef):
                                       'speed', src.getModifiedItemAttr('subsystemBonusAmarrOffensive'), skill='Amarr Offensive Systems')
 
 
-class Effect4362(EffectDef):
+class Effect4362(BaseEffect):
     """
     subsystemBonusAmarrOffensive2MissileDamage
 
@@ -14155,7 +14159,7 @@ class Effect4362(EffectDef):
                                         'thermalDamage', src.getModifiedItemAttr('subsystemBonusAmarrOffensive2'), skill='Amarr Offensive Systems')
 
 
-class Effect4366(EffectDef):
+class Effect4366(BaseEffect):
     """
     shipBonusMediumHybridDmgCC2
 
@@ -14171,7 +14175,7 @@ class Effect4366(EffectDef):
                                       'damageMultiplier', ship.getModifiedItemAttr('shipBonusCC2'), skill='Caldari Cruiser')
 
 
-class Effect4369(EffectDef):
+class Effect4369(BaseEffect):
     """
     subsystemBonusWarpBubbleImmune
 
@@ -14186,7 +14190,7 @@ class Effect4369(EffectDef):
         fit.ship.forceItemAttr('warpBubbleImmune', module.getModifiedItemAttr('warpBubbleImmuneModifier'))
 
 
-class Effect4370(EffectDef):
+class Effect4370(BaseEffect):
     """
     caldariShipEwFalloffRangeCC2
 
@@ -14203,7 +14207,7 @@ class Effect4370(EffectDef):
                                       skill='Caldari Cruiser')
 
 
-class Effect4372(EffectDef):
+class Effect4372(BaseEffect):
     """
     caldariShipEwFalloffRangeCB3
 
@@ -14220,7 +14224,7 @@ class Effect4372(EffectDef):
                                       skill='Caldari Battleship')
 
 
-class Effect4373(EffectDef):
+class Effect4373(BaseEffect):
     """
     subSystemBonusAmarrOffensiveCommandBursts
 
@@ -14266,7 +14270,7 @@ class Effect4373(EffectDef):
                                       'warfareBuff4Value', src.getModifiedItemAttr('subsystemBonusAmarrOffensive'), skill='Amarr Offensive Systems')
 
 
-class Effect4377(EffectDef):
+class Effect4377(BaseEffect):
     """
     shipBonusTorpedoVelocityGF2
 
@@ -14283,7 +14287,7 @@ class Effect4377(EffectDef):
                                         'maxVelocity', ship.getModifiedItemAttr('shipBonusGF2'), skill='Gallente Frigate')
 
 
-class Effect4378(EffectDef):
+class Effect4378(BaseEffect):
     """
     shipBonusTorpedoVelocityMF2
 
@@ -14299,7 +14303,7 @@ class Effect4378(EffectDef):
                                         'maxVelocity', ship.getModifiedItemAttr('shipBonusMF2'), skill='Minmatar Frigate')
 
 
-class Effect4379(EffectDef):
+class Effect4379(BaseEffect):
     """
     shipBonusTorpedoVelocity2AF
 
@@ -14315,7 +14319,7 @@ class Effect4379(EffectDef):
                                         'maxVelocity', ship.getModifiedItemAttr('shipBonus2AF'), skill='Amarr Frigate')
 
 
-class Effect4380(EffectDef):
+class Effect4380(BaseEffect):
     """
     shipBonusTorpedoVelocityCF2
 
@@ -14331,7 +14335,7 @@ class Effect4380(EffectDef):
                                         'maxVelocity', ship.getModifiedItemAttr('shipBonusCF2'), skill='Caldari Frigate')
 
 
-class Effect4384(EffectDef):
+class Effect4384(BaseEffect):
     """
     eliteReconBonusHeavyMissileVelocity
 
@@ -14348,7 +14352,7 @@ class Effect4384(EffectDef):
                                         skill='Recon Ships')
 
 
-class Effect4385(EffectDef):
+class Effect4385(BaseEffect):
     """
     eliteReconBonusHeavyAssaultMissileVelocity
 
@@ -14365,7 +14369,7 @@ class Effect4385(EffectDef):
                                         skill='Recon Ships')
 
 
-class Effect4393(EffectDef):
+class Effect4393(BaseEffect):
     """
     shipBonusEliteCover2TorpedoThermalDamage
 
@@ -14383,7 +14387,7 @@ class Effect4393(EffectDef):
                                         skill='Covert Ops')
 
 
-class Effect4394(EffectDef):
+class Effect4394(BaseEffect):
     """
     shipBonusEliteCover2TorpedoEMDamage
 
@@ -14399,7 +14403,7 @@ class Effect4394(EffectDef):
                                         'emDamage', ship.getModifiedItemAttr('eliteBonusCovertOps2'), skill='Covert Ops')
 
 
-class Effect4395(EffectDef):
+class Effect4395(BaseEffect):
     """
     shipBonusEliteCover2TorpedoExplosiveDamage
 
@@ -14417,7 +14421,7 @@ class Effect4395(EffectDef):
                                         skill='Covert Ops')
 
 
-class Effect4396(EffectDef):
+class Effect4396(BaseEffect):
     """
     shipBonusEliteCover2TorpedoKineticDamage
 
@@ -14434,7 +14438,7 @@ class Effect4396(EffectDef):
                                         skill='Covert Ops')
 
 
-class Effect4397(EffectDef):
+class Effect4397(BaseEffect):
     """
     shipBonusGFTorpedoExplosionVelocity
 
@@ -14450,7 +14454,7 @@ class Effect4397(EffectDef):
                                         'aoeVelocity', ship.getModifiedItemAttr('shipBonusGF'), skill='Gallente Frigate')
 
 
-class Effect4398(EffectDef):
+class Effect4398(BaseEffect):
     """
     shipBonusMF1TorpedoExplosionVelocity
 
@@ -14467,7 +14471,7 @@ class Effect4398(EffectDef):
                                         'aoeVelocity', ship.getModifiedItemAttr('shipBonusMF'), skill='Minmatar Frigate')
 
 
-class Effect4399(EffectDef):
+class Effect4399(BaseEffect):
     """
     shipBonusCF1TorpedoExplosionVelocity
 
@@ -14483,7 +14487,7 @@ class Effect4399(EffectDef):
                                         'aoeVelocity', ship.getModifiedItemAttr('shipBonusCF'), skill='Caldari Frigate')
 
 
-class Effect4400(EffectDef):
+class Effect4400(BaseEffect):
     """
     shipBonusAF1TorpedoExplosionVelocity
 
@@ -14499,7 +14503,7 @@ class Effect4400(EffectDef):
                                         'aoeVelocity', ship.getModifiedItemAttr('shipBonusAF'), skill='Amarr Frigate')
 
 
-class Effect4413(EffectDef):
+class Effect4413(BaseEffect):
     """
     shipBonusGF1TorpedoFlightTime
 
@@ -14515,7 +14519,7 @@ class Effect4413(EffectDef):
                                         'explosionDelay', ship.getModifiedItemAttr('shipBonusGF'), skill='Gallente Frigate')
 
 
-class Effect4415(EffectDef):
+class Effect4415(BaseEffect):
     """
     shipBonusMF1TorpedoFlightTime
 
@@ -14532,7 +14536,7 @@ class Effect4415(EffectDef):
                                         'explosionDelay', ship.getModifiedItemAttr('shipBonusMF'), skill='Minmatar Frigate')
 
 
-class Effect4416(EffectDef):
+class Effect4416(BaseEffect):
     """
     shipBonusCF1TorpedoFlightTime
 
@@ -14548,7 +14552,7 @@ class Effect4416(EffectDef):
                                         'explosionDelay', ship.getModifiedItemAttr('shipBonusCF'), skill='Caldari Frigate')
 
 
-class Effect4417(EffectDef):
+class Effect4417(BaseEffect):
     """
     shipBonusAF1TorpedoFlightTime
 
@@ -14564,7 +14568,7 @@ class Effect4417(EffectDef):
                                         'explosionDelay', ship.getModifiedItemAttr('shipBonusAF'), skill='Amarr Frigate')
 
 
-class Effect4451(EffectDef):
+class Effect4451(BaseEffect):
     """
     ScanRadarStrengthModifierEffect
 
@@ -14579,7 +14583,7 @@ class Effect4451(EffectDef):
         fit.ship.increaseItemAttr('scanRadarStrength', implant.getModifiedItemAttr('scanRadarStrengthModifier'))
 
 
-class Effect4452(EffectDef):
+class Effect4452(BaseEffect):
     """
     ScanLadarStrengthModifierEffect
 
@@ -14594,7 +14598,7 @@ class Effect4452(EffectDef):
         fit.ship.increaseItemAttr('scanLadarStrength', implant.getModifiedItemAttr('scanLadarStrengthModifier'))
 
 
-class Effect4453(EffectDef):
+class Effect4453(BaseEffect):
     """
     ScanGravimetricStrengthModifierEffect
 
@@ -14609,7 +14613,7 @@ class Effect4453(EffectDef):
         fit.ship.increaseItemAttr('scanGravimetricStrength', implant.getModifiedItemAttr('scanGravimetricStrengthModifier'))
 
 
-class Effect4454(EffectDef):
+class Effect4454(BaseEffect):
     """
     ScanMagnetometricStrengthModifierEffect
 
@@ -14625,7 +14629,7 @@ class Effect4454(EffectDef):
                                   implant.getModifiedItemAttr('scanMagnetometricStrengthModifier'))
 
 
-class Effect4456(EffectDef):
+class Effect4456(BaseEffect):
     """
     federationsetbonus3
 
@@ -14643,7 +14647,7 @@ class Effect4456(EffectDef):
                                                  implant.getModifiedItemAttr('implantSetFederationNavy'))
 
 
-class Effect4457(EffectDef):
+class Effect4457(BaseEffect):
     """
     imperialsetbonus3
 
@@ -14661,7 +14665,7 @@ class Effect4457(EffectDef):
                                                  implant.getModifiedItemAttr('implantSetImperialNavy'))
 
 
-class Effect4458(EffectDef):
+class Effect4458(BaseEffect):
     """
     republicsetbonus3
 
@@ -14679,7 +14683,7 @@ class Effect4458(EffectDef):
                                                  implant.getModifiedItemAttr('implantSetRepublicFleet'))
 
 
-class Effect4459(EffectDef):
+class Effect4459(BaseEffect):
     """
     caldarisetbonus3
 
@@ -14697,7 +14701,7 @@ class Effect4459(EffectDef):
                                                  implant.getModifiedItemAttr('implantSetCaldariNavy'))
 
 
-class Effect4460(EffectDef):
+class Effect4460(BaseEffect):
     """
     imperialsetLGbonus
 
@@ -14715,7 +14719,7 @@ class Effect4460(EffectDef):
                                                  implant.getModifiedItemAttr('implantSetLGImperialNavy'))
 
 
-class Effect4461(EffectDef):
+class Effect4461(BaseEffect):
     """
     federationsetLGbonus
 
@@ -14733,7 +14737,7 @@ class Effect4461(EffectDef):
                                                  implant.getModifiedItemAttr('implantSetLGFederationNavy'))
 
 
-class Effect4462(EffectDef):
+class Effect4462(BaseEffect):
     """
     caldarisetLGbonus
 
@@ -14751,7 +14755,7 @@ class Effect4462(EffectDef):
                                                  implant.getModifiedItemAttr('implantSetLGCaldariNavy'))
 
 
-class Effect4463(EffectDef):
+class Effect4463(BaseEffect):
     """
     republicsetLGbonus
 
@@ -14769,7 +14773,7 @@ class Effect4463(EffectDef):
                                                  implant.getModifiedItemAttr('implantSetLGRepublicFleet'))
 
 
-class Effect4464(EffectDef):
+class Effect4464(BaseEffect):
     """
     shipProjectileRofMF
 
@@ -14785,7 +14789,7 @@ class Effect4464(EffectDef):
                                       src.getModifiedItemAttr('shipBonusMF'), stackingPenalties=True, skill='Minmatar Frigate')
 
 
-class Effect4471(EffectDef):
+class Effect4471(BaseEffect):
     """
     shipBonusStasisMF2
 
@@ -14803,7 +14807,7 @@ class Effect4471(EffectDef):
                                       'maxRange', ship.getModifiedItemAttr('shipBonusMF2'), skill='Minmatar Frigate')
 
 
-class Effect4472(EffectDef):
+class Effect4472(BaseEffect):
     """
     shipProjectileDmgMC
 
@@ -14819,7 +14823,7 @@ class Effect4472(EffectDef):
                                       'damageMultiplier', ship.getModifiedItemAttr('shipBonusMC'), skill='Minmatar Cruiser')
 
 
-class Effect4473(EffectDef):
+class Effect4473(BaseEffect):
     """
     shipVelocityBonusATC1
 
@@ -14835,7 +14839,7 @@ class Effect4473(EffectDef):
         fit.ship.boostItemAttr('maxVelocity', ship.getModifiedItemAttr('shipBonusATC1'))
 
 
-class Effect4474(EffectDef):
+class Effect4474(BaseEffect):
     """
     shipMTMaxRangeBonusATC
 
@@ -14851,7 +14855,7 @@ class Effect4474(EffectDef):
                                       'maxRange', ship.getModifiedItemAttr('shipBonusATC2'))
 
 
-class Effect4475(EffectDef):
+class Effect4475(BaseEffect):
     """
     shipMTFalloffBonusATC
 
@@ -14867,7 +14871,7 @@ class Effect4475(EffectDef):
                                       'falloff', ship.getModifiedItemAttr('shipBonusATC2'))
 
 
-class Effect4476(EffectDef):
+class Effect4476(BaseEffect):
     """
     shipMTFalloffBonusATF
 
@@ -14883,7 +14887,7 @@ class Effect4476(EffectDef):
                                       'falloff', ship.getModifiedItemAttr('shipBonusATF2'))
 
 
-class Effect4477(EffectDef):
+class Effect4477(BaseEffect):
     """
     shipMTMaxRangeBonusATF
 
@@ -14899,7 +14903,7 @@ class Effect4477(EffectDef):
                                       'maxRange', ship.getModifiedItemAttr('shipBonusATF2'))
 
 
-class Effect4478(EffectDef):
+class Effect4478(BaseEffect):
     """
     shipBonusAfterburnerCapNeedATF
 
@@ -14915,7 +14919,7 @@ class Effect4478(EffectDef):
                                       'capacitorNeed', ship.getModifiedItemAttr('shipBonusATF1'))
 
 
-class Effect4479(EffectDef):
+class Effect4479(BaseEffect):
     """
     shipBonusSurveyProbeExplosionDelaySkillSurveyCovertOps3
 
@@ -14932,7 +14936,7 @@ class Effect4479(EffectDef):
                                         skill='Covert Ops')
 
 
-class Effect4482(EffectDef):
+class Effect4482(BaseEffect):
     """
     shipETOptimalRange2AF
 
@@ -14949,7 +14953,7 @@ class Effect4482(EffectDef):
                                       'maxRange', ship.getModifiedItemAttr('shipBonus2AF'), skill='Amarr Frigate')
 
 
-class Effect4484(EffectDef):
+class Effect4484(BaseEffect):
     """
     shipPTurretFalloffBonusGB
 
@@ -14965,7 +14969,7 @@ class Effect4484(EffectDef):
                                       'falloff', ship.getModifiedItemAttr('shipBonusGB'), skill='Gallente Battleship')
 
 
-class Effect4485(EffectDef):
+class Effect4485(BaseEffect):
     """
     shipBonusStasisWebSpeedFactorMB
 
@@ -14981,7 +14985,7 @@ class Effect4485(EffectDef):
                                       'speedFactor', ship.getModifiedItemAttr('shipBonusMB'), skill='Minmatar Battleship')
 
 
-class Effect4489(EffectDef):
+class Effect4489(BaseEffect):
     """
     superWeaponAmarr
 
@@ -14992,7 +14996,7 @@ class Effect4489(EffectDef):
     type = 'active'
 
 
-class Effect4490(EffectDef):
+class Effect4490(BaseEffect):
     """
     superWeaponCaldari
 
@@ -15003,7 +15007,7 @@ class Effect4490(EffectDef):
     type = 'active'
 
 
-class Effect4491(EffectDef):
+class Effect4491(BaseEffect):
     """
     superWeaponGallente
 
@@ -15014,7 +15018,7 @@ class Effect4491(EffectDef):
     type = 'active'
 
 
-class Effect4492(EffectDef):
+class Effect4492(BaseEffect):
     """
     superWeaponMinmatar
 
@@ -15025,7 +15029,7 @@ class Effect4492(EffectDef):
     type = 'active'
 
 
-class Effect4510(EffectDef):
+class Effect4510(BaseEffect):
     """
     shipStasisWebStrengthBonusMC2
 
@@ -15042,7 +15046,7 @@ class Effect4510(EffectDef):
                                       'speedFactor', ship.getModifiedItemAttr('shipBonusMC2'), skill='Minmatar Cruiser')
 
 
-class Effect4512(EffectDef):
+class Effect4512(BaseEffect):
     """
     shipPTurretFalloffBonusGC
 
@@ -15059,7 +15063,7 @@ class Effect4512(EffectDef):
                                       'falloff', ship.getModifiedItemAttr('shipBonusGC'), skill='Gallente Cruiser')
 
 
-class Effect4513(EffectDef):
+class Effect4513(BaseEffect):
     """
     shipStasisWebStrengthBonusMF2
 
@@ -15076,7 +15080,7 @@ class Effect4513(EffectDef):
                                       'speedFactor', ship.getModifiedItemAttr('shipBonusMF2'), skill='Minmatar Frigate')
 
 
-class Effect4515(EffectDef):
+class Effect4515(BaseEffect):
     """
     shipFalloffBonusMF
 
@@ -15093,7 +15097,7 @@ class Effect4515(EffectDef):
                                       'falloff', ship.getModifiedItemAttr('shipBonusMF'), skill='Minmatar Frigate')
 
 
-class Effect4516(EffectDef):
+class Effect4516(BaseEffect):
     """
     shipHTurretFalloffBonusGC
 
@@ -15110,7 +15114,7 @@ class Effect4516(EffectDef):
                                       'falloff', ship.getModifiedItemAttr('shipBonusGC'), skill='Gallente Cruiser')
 
 
-class Effect4527(EffectDef):
+class Effect4527(BaseEffect):
     """
     gunneryFalloffBonusOnline
 
@@ -15127,7 +15131,7 @@ class Effect4527(EffectDef):
                                       stackingPenalties=True)
 
 
-class Effect4555(EffectDef):
+class Effect4555(BaseEffect):
     """
     capitalLauncherSkillCruiseCitadelEmDamage1
 
@@ -15143,7 +15147,7 @@ class Effect4555(EffectDef):
                                         'emDamage', skill.getModifiedItemAttr('damageMultiplierBonus') * skill.level)
 
 
-class Effect4556(EffectDef):
+class Effect4556(BaseEffect):
     """
     capitalLauncherSkillCruiseCitadelExplosiveDamage1
 
@@ -15159,7 +15163,7 @@ class Effect4556(EffectDef):
                                         'explosiveDamage', skill.getModifiedItemAttr('damageMultiplierBonus') * skill.level)
 
 
-class Effect4557(EffectDef):
+class Effect4557(BaseEffect):
     """
     capitalLauncherSkillCruiseCitadelKineticDamage1
 
@@ -15175,7 +15179,7 @@ class Effect4557(EffectDef):
                                         'kineticDamage', skill.getModifiedItemAttr('damageMultiplierBonus') * skill.level)
 
 
-class Effect4558(EffectDef):
+class Effect4558(BaseEffect):
     """
     capitalLauncherSkillCruiseCitadelThermalDamage1
 
@@ -15191,7 +15195,7 @@ class Effect4558(EffectDef):
                                         'thermalDamage', skill.getModifiedItemAttr('damageMultiplierBonus') * skill.level)
 
 
-class Effect4559(EffectDef):
+class Effect4559(BaseEffect):
     """
     gunneryMaxRangeFalloffTrackingSpeedBonus
 
@@ -15209,7 +15213,7 @@ class Effect4559(EffectDef):
                                           stackingPenalties=True)
 
 
-class Effect4575(EffectDef):
+class Effect4575(BaseEffect):
     """
     industrialCoreEffect2
 
@@ -15329,7 +15333,7 @@ class Effect4575(EffectDef):
         fit.ship.increaseItemAttr('disallowDocking', src.getModifiedItemAttr('disallowDocking'))
 
 
-class Effect4576(EffectDef):
+class Effect4576(BaseEffect):
     """
     eliteBonusLogisticsTrackingLinkFalloffBonus1
 
@@ -15346,7 +15350,7 @@ class Effect4576(EffectDef):
                                       skill='Logistics Cruisers')
 
 
-class Effect4577(EffectDef):
+class Effect4577(BaseEffect):
     """
     eliteBonusLogisticsTrackingLinkFalloffBonus2
 
@@ -15363,7 +15367,7 @@ class Effect4577(EffectDef):
                                       skill='Logistics Cruisers')
 
 
-class Effect4579(EffectDef):
+class Effect4579(BaseEffect):
     """
     droneRigStasisWebSpeedFactorBonus
 
@@ -15379,7 +15383,7 @@ class Effect4579(EffectDef):
                                      'speedFactor', module.getModifiedItemAttr('webSpeedFactorBonus'))
 
 
-class Effect4619(EffectDef):
+class Effect4619(BaseEffect):
     """
     shipBonusDroneDamageGF2
 
@@ -15395,7 +15399,7 @@ class Effect4619(EffectDef):
                                      'damageMultiplier', ship.getModifiedItemAttr('shipBonusGF2'), skill='Gallente Frigate')
 
 
-class Effect4620(EffectDef):
+class Effect4620(BaseEffect):
     """
     shipBonusWarpScramblerMaxRangeGF2
 
@@ -15412,7 +15416,7 @@ class Effect4620(EffectDef):
                                       'maxRange', ship.getModifiedItemAttr('shipBonusGF2'), skill='Gallente Frigate')
 
 
-class Effect4621(EffectDef):
+class Effect4621(BaseEffect):
     """
     shipBonusHeatDamageATF1
 
@@ -15430,7 +15434,7 @@ class Effect4621(EffectDef):
                                       ship.getModifiedItemAttr('shipBonusATF1'))
 
 
-class Effect4622(EffectDef):
+class Effect4622(BaseEffect):
     """
     shipBonusSmallHybridMaxRangeATF2
 
@@ -15446,7 +15450,7 @@ class Effect4622(EffectDef):
                                       'maxRange', ship.getModifiedItemAttr('shipBonusATF2'))
 
 
-class Effect4623(EffectDef):
+class Effect4623(BaseEffect):
     """
     shipBonusSmallHybridTrackingSpeedATF2
 
@@ -15462,7 +15466,7 @@ class Effect4623(EffectDef):
                                       'trackingSpeed', ship.getModifiedItemAttr('shipBonusATF2'))
 
 
-class Effect4624(EffectDef):
+class Effect4624(BaseEffect):
     """
     shipBonusHybridTrackingATC2
 
@@ -15478,7 +15482,7 @@ class Effect4624(EffectDef):
                                       'trackingSpeed', ship.getModifiedItemAttr('shipBonusATC2'))
 
 
-class Effect4625(EffectDef):
+class Effect4625(BaseEffect):
     """
     shipBonusHybridFalloffATC2
 
@@ -15494,7 +15498,7 @@ class Effect4625(EffectDef):
                                       'falloff', ship.getModifiedItemAttr('shipBonusATC2'))
 
 
-class Effect4626(EffectDef):
+class Effect4626(BaseEffect):
     """
     shipBonusWarpScramblerMaxRangeGC2
 
@@ -15511,7 +15515,7 @@ class Effect4626(EffectDef):
                                       'maxRange', ship.getModifiedItemAttr('shipBonusGC2'), skill='Gallente Cruiser')
 
 
-class Effect4635(EffectDef):
+class Effect4635(BaseEffect):
     """
     eliteBonusMaraudersCruiseAndTorpedoDamageRole1
 
@@ -15530,7 +15534,7 @@ class Effect4635(EffectDef):
                 '{0}Damage'.format(damageType), ship.getModifiedItemAttr('eliteBonusViolatorsRole1'))
 
 
-class Effect4636(EffectDef):
+class Effect4636(BaseEffect):
     """
     shipBonusAoeVelocityCruiseAndTorpedoCB2
 
@@ -15547,7 +15551,7 @@ class Effect4636(EffectDef):
             'aoeVelocity', ship.getModifiedItemAttr('shipBonus2CB'), skill='Caldari Battleship')
 
 
-class Effect4637(EffectDef):
+class Effect4637(BaseEffect):
     """
     shipCruiseAndTorpedoVelocityBonusCB3
 
@@ -15565,7 +15569,7 @@ class Effect4637(EffectDef):
             'maxVelocity', ship.getModifiedItemAttr('shipBonusCB3'), skill='Caldari Battleship')
 
 
-class Effect4640(EffectDef):
+class Effect4640(BaseEffect):
     """
     shipArmorEMAndExpAndkinAndThmResistanceAC2
 
@@ -15585,7 +15589,7 @@ class Effect4640(EffectDef):
                                    skill='Amarr Cruiser')
 
 
-class Effect4643(EffectDef):
+class Effect4643(BaseEffect):
     """
     shipHeavyAssaultMissileEMAndExpAndKinAndThmDmgAC1
 
@@ -15604,7 +15608,7 @@ class Effect4643(EffectDef):
                                             skill='Amarr Cruiser')
 
 
-class Effect4645(EffectDef):
+class Effect4645(BaseEffect):
     """
     eliteBonusHeavyGunshipHeavyAndHeavyAssaultAndAssaultMissileLauncherROF
 
@@ -15622,7 +15626,7 @@ class Effect4645(EffectDef):
                                       skill='Heavy Assault Cruisers')
 
 
-class Effect4648(EffectDef):
+class Effect4648(BaseEffect):
     """
     eliteBonusBlackOpsECMGravAndLadarAndMagnetometricAndRadarStrength1
 
@@ -15640,7 +15644,7 @@ class Effect4648(EffectDef):
                                           ship.getModifiedItemAttr('eliteBonusBlackOps1'), skill='Black Ops')
 
 
-class Effect4649(EffectDef):
+class Effect4649(BaseEffect):
     """
     shipCruiseAndSiegeLauncherROFBonus2CB
 
@@ -15657,7 +15661,7 @@ class Effect4649(EffectDef):
                                       'speed', ship.getModifiedItemAttr('shipBonus2CB'), skill='Caldari Battleship')
 
 
-class Effect4667(EffectDef):
+class Effect4667(BaseEffect):
     """
     shipBonusNoctisSalvageCycle
 
@@ -15674,7 +15678,7 @@ class Effect4667(EffectDef):
                                       skill='ORE Industrial')
 
 
-class Effect4668(EffectDef):
+class Effect4668(BaseEffect):
     """
     shipBonusNoctisTractorCycle
 
@@ -15691,7 +15695,7 @@ class Effect4668(EffectDef):
                                       skill='ORE Industrial')
 
 
-class Effect4669(EffectDef):
+class Effect4669(BaseEffect):
     """
     shipBonusNoctisTractorVelocity
 
@@ -15708,7 +15712,7 @@ class Effect4669(EffectDef):
                                       skill='ORE Industrial')
 
 
-class Effect4670(EffectDef):
+class Effect4670(BaseEffect):
     """
     shipBonusNoctisTractorRange
 
@@ -15725,7 +15729,7 @@ class Effect4670(EffectDef):
                                       skill='ORE Industrial')
 
 
-class Effect4728(EffectDef):
+class Effect4728(BaseEffect):
     """
     OffensiveDefensiveReduction
 
@@ -15763,7 +15767,7 @@ class Effect4728(EffectDef):
                                       'damageMultiplier', beacon.getModifiedItemAttr('systemEffectDamageReduction'))
 
 
-class Effect4760(EffectDef):
+class Effect4760(BaseEffect):
     """
     subsystemBonusCaldariPropulsionWarpCapacitor
 
@@ -15779,7 +15783,7 @@ class Effect4760(EffectDef):
                                skill='Caldari Propulsion Systems')
 
 
-class Effect4775(EffectDef):
+class Effect4775(BaseEffect):
     """
     shipEnergyNeutralizerTransferAmountBonusAF2
 
@@ -15796,7 +15800,7 @@ class Effect4775(EffectDef):
                                       skill='Amarr Frigate')
 
 
-class Effect4782(EffectDef):
+class Effect4782(BaseEffect):
     """
     shipBonusSmallEnergyWeaponOptimalRangeATF2
 
@@ -15812,7 +15816,7 @@ class Effect4782(EffectDef):
                                       'maxRange', ship.getModifiedItemAttr('shipBonusATF2'))
 
 
-class Effect4789(EffectDef):
+class Effect4789(BaseEffect):
     """
     shipBonusSmallEnergyTurretDamageATF1
 
@@ -15828,7 +15832,7 @@ class Effect4789(EffectDef):
                                       'damageMultiplier', ship.getModifiedItemAttr('shipBonusATF1'))
 
 
-class Effect4793(EffectDef):
+class Effect4793(BaseEffect):
     """
     shipBonusMissileLauncherHeavyROFATC1
 
@@ -15844,7 +15848,7 @@ class Effect4793(EffectDef):
                                       'speed', ship.getModifiedItemAttr('shipBonusATC1'))
 
 
-class Effect4794(EffectDef):
+class Effect4794(BaseEffect):
     """
     shipBonusMissileLauncherAssaultROFATC1
 
@@ -15860,7 +15864,7 @@ class Effect4794(EffectDef):
                                       'speed', ship.getModifiedItemAttr('shipBonusATC1'))
 
 
-class Effect4795(EffectDef):
+class Effect4795(BaseEffect):
     """
     shipBonusMissileLauncherHeavyAssaultROFATC1
 
@@ -15876,7 +15880,7 @@ class Effect4795(EffectDef):
                                       'speed', ship.getModifiedItemAttr('shipBonusATC1'))
 
 
-class Effect4799(EffectDef):
+class Effect4799(BaseEffect):
     """
     eliteBonusBlackOpsECMBurstGravAndLadarAndMagnetoAndRadar
 
@@ -15895,7 +15899,7 @@ class Effect4799(EffectDef):
                                           ship.getModifiedItemAttr('eliteBonusBlackOps1'), skill='Black Ops')
 
 
-class Effect4804(EffectDef):
+class Effect4804(BaseEffect):
     """
     dataMiningSkillBoostAccessDifficultyBonusAbsolutePercent
 
@@ -15913,7 +15917,7 @@ class Effect4804(EffectDef):
                                          skill.getModifiedItemAttr('accessDifficultyBonusAbsolutePercent') * skill.level)
 
 
-class Effect4809(EffectDef):
+class Effect4809(BaseEffect):
     """
     ecmGravimetricStrengthBonusPercent
 
@@ -15930,7 +15934,7 @@ class Effect4809(EffectDef):
                                       stackingPenalties=True)
 
 
-class Effect4810(EffectDef):
+class Effect4810(BaseEffect):
     """
     ecmLadarStrengthBonusPercent
 
@@ -15947,7 +15951,7 @@ class Effect4810(EffectDef):
                                       stackingPenalties=True)
 
 
-class Effect4811(EffectDef):
+class Effect4811(BaseEffect):
     """
     ecmMagnetometricStrengthBonusPercent
 
@@ -15965,7 +15969,7 @@ class Effect4811(EffectDef):
                                       stackingPenalties=True)
 
 
-class Effect4812(EffectDef):
+class Effect4812(BaseEffect):
     """
     ecmRadarStrengthBonusPercent
 
@@ -15982,7 +15986,7 @@ class Effect4812(EffectDef):
                                       stackingPenalties=True)
 
 
-class Effect4814(EffectDef):
+class Effect4814(BaseEffect):
     """
     jumpPortalConsumptionBonusPercentSkill
 
@@ -15998,7 +16002,7 @@ class Effect4814(EffectDef):
                                       skill.getModifiedItemAttr('consumptionQuantityBonusPercent') * skill.level)
 
 
-class Effect4817(EffectDef):
+class Effect4817(BaseEffect):
     """
     salvagerModuleDurationReduction
 
@@ -16014,7 +16018,7 @@ class Effect4817(EffectDef):
                                       'duration', implant.getModifiedItemAttr('durationBonus'))
 
 
-class Effect4820(EffectDef):
+class Effect4820(BaseEffect):
     """
     bcLargeEnergyTurretPowerNeedBonus
 
@@ -16030,7 +16034,7 @@ class Effect4820(EffectDef):
                                          'power', ship.getModifiedItemAttr('bcLargeTurretPower'))
 
 
-class Effect4821(EffectDef):
+class Effect4821(BaseEffect):
     """
     bcLargeHybridTurretPowerNeedBonus
 
@@ -16047,7 +16051,7 @@ class Effect4821(EffectDef):
                                          'power', ship.getModifiedItemAttr('bcLargeTurretPower'))
 
 
-class Effect4822(EffectDef):
+class Effect4822(BaseEffect):
     """
     bcLargeProjectileTurretPowerNeedBonus
 
@@ -16063,7 +16067,7 @@ class Effect4822(EffectDef):
                                          'power', ship.getModifiedItemAttr('bcLargeTurretPower'))
 
 
-class Effect4823(EffectDef):
+class Effect4823(BaseEffect):
     """
     bcLargeEnergyTurretCPUNeedBonus
 
@@ -16079,7 +16083,7 @@ class Effect4823(EffectDef):
                                          'cpu', ship.getModifiedItemAttr('bcLargeTurretCPU'))
 
 
-class Effect4824(EffectDef):
+class Effect4824(BaseEffect):
     """
     bcLargeHybridTurretCPUNeedBonus
 
@@ -16096,7 +16100,7 @@ class Effect4824(EffectDef):
                                          'cpu', ship.getModifiedItemAttr('bcLargeTurretCPU'))
 
 
-class Effect4825(EffectDef):
+class Effect4825(BaseEffect):
     """
     bcLargeProjectileTurretCPUNeedBonus
 
@@ -16112,7 +16116,7 @@ class Effect4825(EffectDef):
                                          'cpu', ship.getModifiedItemAttr('bcLargeTurretCPU'))
 
 
-class Effect4826(EffectDef):
+class Effect4826(BaseEffect):
     """
     bcLargeEnergyTurretCapacitorNeedBonus
 
@@ -16128,7 +16132,7 @@ class Effect4826(EffectDef):
                                          'capacitorNeed', ship.getModifiedItemAttr('bcLargeTurretCap'))
 
 
-class Effect4827(EffectDef):
+class Effect4827(BaseEffect):
     """
     bcLargeHybridTurretCapacitorNeedBonus
 
@@ -16145,7 +16149,7 @@ class Effect4827(EffectDef):
                                          'capacitorNeed', ship.getModifiedItemAttr('bcLargeTurretCap'))
 
 
-class Effect4867(EffectDef):
+class Effect4867(BaseEffect):
     """
     setBonusChristmasPowergrid
 
@@ -16163,7 +16167,7 @@ class Effect4867(EffectDef):
                                                  implant.getModifiedItemAttr('implantSetChristmas'))
 
 
-class Effect4868(EffectDef):
+class Effect4868(BaseEffect):
     """
     setBonusChristmasCapacitorCapacity
 
@@ -16181,7 +16185,7 @@ class Effect4868(EffectDef):
                                                  implant.getModifiedItemAttr('implantSetChristmas'))
 
 
-class Effect4869(EffectDef):
+class Effect4869(BaseEffect):
     """
     setBonusChristmasCPUOutput
 
@@ -16198,7 +16202,7 @@ class Effect4869(EffectDef):
                                                  'cpuOutputBonus2', implant.getModifiedItemAttr('implantSetChristmas'))
 
 
-class Effect4871(EffectDef):
+class Effect4871(BaseEffect):
     """
     setBonusChristmasCapacitorRecharge2
 
@@ -16215,7 +16219,7 @@ class Effect4871(EffectDef):
                                                  'capRechargeBonus', implant.getModifiedItemAttr('implantSetChristmas'))
 
 
-class Effect4896(EffectDef):
+class Effect4896(BaseEffect):
     """
     shipBonusDroneHitpointsGF2
 
@@ -16231,7 +16235,7 @@ class Effect4896(EffectDef):
                                      'hp', ship.getModifiedItemAttr('shipBonusGF2'), skill='Gallente Frigate')
 
 
-class Effect4897(EffectDef):
+class Effect4897(BaseEffect):
     """
     shipBonusDroneArmorHitpointsGF2
 
@@ -16247,7 +16251,7 @@ class Effect4897(EffectDef):
                                      'armorHP', ship.getModifiedItemAttr('shipBonusGF2'), skill='Gallente Frigate')
 
 
-class Effect4898(EffectDef):
+class Effect4898(BaseEffect):
     """
     shipBonusDroneShieldHitpointsGF2
 
@@ -16263,7 +16267,7 @@ class Effect4898(EffectDef):
                                      'shieldCapacity', ship.getModifiedItemAttr('shipBonusGF2'), skill='Gallente Frigate')
 
 
-class Effect4901(EffectDef):
+class Effect4901(BaseEffect):
     """
     shipMissileSpeedBonusAF
 
@@ -16279,7 +16283,7 @@ class Effect4901(EffectDef):
                                       'speed', ship.getModifiedItemAttr('shipBonus2AF'), skill='Amarr Frigate')
 
 
-class Effect4902(EffectDef):
+class Effect4902(BaseEffect):
     """
     MWDSignatureRadiusRoleBonus
 
@@ -16297,7 +16301,7 @@ class Effect4902(EffectDef):
                                       'signatureRadiusBonus', ship.getModifiedItemAttr('MWDSignatureRadiusBonus'))
 
 
-class Effect4906(EffectDef):
+class Effect4906(BaseEffect):
     """
     systemDamageFighters
 
@@ -16315,7 +16319,7 @@ class Effect4906(EffectDef):
                                         stackingPenalties=True, penaltyGroup='postMul')
 
 
-class Effect4911(EffectDef):
+class Effect4911(BaseEffect):
     """
     modifyShieldRechargeRatePassive
 
@@ -16330,7 +16334,7 @@ class Effect4911(EffectDef):
         fit.ship.multiplyItemAttr('shieldRechargeRate', module.getModifiedItemAttr('shieldRechargeRateMultiplier'))
 
 
-class Effect4921(EffectDef):
+class Effect4921(BaseEffect):
     """
     microJumpDrive
 
@@ -16345,7 +16349,7 @@ class Effect4921(EffectDef):
         fit.ship.boostItemAttr('signatureRadius', module.getModifiedItemAttr('signatureRadiusBonusPercent'))
 
 
-class Effect4923(EffectDef):
+class Effect4923(BaseEffect):
     """
     skillMJDdurationBonus
 
@@ -16361,7 +16365,7 @@ class Effect4923(EffectDef):
                                       'duration', skill.getModifiedItemAttr('durationBonus') * skill.level)
 
 
-class Effect4928(EffectDef):
+class Effect4928(BaseEffect):
     """
     adaptiveArmorHardener
 
@@ -16492,7 +16496,7 @@ class Effect4928(EffectDef):
                 fit.ship.multiplyItemAttr(attr, average[i], stackingPenalties=True, penaltyGroup='preMul')
 
 
-class Effect4934(EffectDef):
+class Effect4934(BaseEffect):
     """
     shipArmorRepairingGF2
 
@@ -16509,7 +16513,7 @@ class Effect4934(EffectDef):
                                       skill='Gallente Frigate')
 
 
-class Effect4936(EffectDef):
+class Effect4936(BaseEffect):
     """
     fueledShieldBoosting
 
@@ -16527,7 +16531,7 @@ class Effect4936(EffectDef):
         fit.extraAttributes.increase('shieldRepair', amount / speed)
 
 
-class Effect4941(EffectDef):
+class Effect4941(BaseEffect):
     """
     shipHybridDamageBonusCF2
 
@@ -16544,7 +16548,7 @@ class Effect4941(EffectDef):
                                       'damageMultiplier', ship.getModifiedItemAttr('shipBonusCF2'), skill='Caldari Frigate')
 
 
-class Effect4942(EffectDef):
+class Effect4942(BaseEffect):
     """
     targetBreaker
 
@@ -16555,7 +16559,7 @@ class Effect4942(EffectDef):
     type = 'active'
 
 
-class Effect4945(EffectDef):
+class Effect4945(BaseEffect):
     """
     skillTargetBreakerDurationBonus2
 
@@ -16571,7 +16575,7 @@ class Effect4945(EffectDef):
                                       'duration', skill.getModifiedItemAttr('durationBonus') * skill.level)
 
 
-class Effect4946(EffectDef):
+class Effect4946(BaseEffect):
     """
     skillTargetBreakerCapNeedBonus2
 
@@ -16587,7 +16591,7 @@ class Effect4946(EffectDef):
                                       'capacitorNeed', skill.getModifiedItemAttr('capNeedBonus') * skill.level)
 
 
-class Effect4950(EffectDef):
+class Effect4950(BaseEffect):
     """
     shipBonusShieldBoosterMB1a
 
@@ -16603,7 +16607,7 @@ class Effect4950(EffectDef):
                                       'shieldBonus', ship.getModifiedItemAttr('shipBonusMB'), skill='Minmatar Battleship')
 
 
-class Effect4951(EffectDef):
+class Effect4951(BaseEffect):
     """
     shieldBoostAmplifierPassiveBooster
 
@@ -16622,7 +16626,7 @@ class Effect4951(EffectDef):
             'shieldBonus', container.getModifiedItemAttr('shieldBoostMultiplier'))
 
 
-class Effect4961(EffectDef):
+class Effect4961(BaseEffect):
     """
     systemShieldRepairAmountShieldSkills
 
@@ -16641,7 +16645,7 @@ class Effect4961(EffectDef):
                                          stackingPenalties=True, penaltyGroup='postMul')
 
 
-class Effect4967(EffectDef):
+class Effect4967(BaseEffect):
     """
     shieldBoosterDurationBonusShieldSkills
 
@@ -16658,7 +16662,7 @@ class Effect4967(EffectDef):
             'duration', module.getModifiedItemAttr('durationSkillBonus'))
 
 
-class Effect4970(EffectDef):
+class Effect4970(BaseEffect):
     """
     boosterShieldBoostAmountPenaltyShieldSkills
 
@@ -16680,7 +16684,7 @@ class Effect4970(EffectDef):
                                       src.getModifiedItemAttr('boosterShieldBoostAmountPenalty'))
 
 
-class Effect4972(EffectDef):
+class Effect4972(BaseEffect):
     """
     eliteBonusAssaultShipLightMissileROF
 
@@ -16696,7 +16700,7 @@ class Effect4972(EffectDef):
                                       'speed', ship.getModifiedItemAttr('eliteBonusGunship1'), skill='Assault Frigates')
 
 
-class Effect4973(EffectDef):
+class Effect4973(BaseEffect):
     """
     eliteBonusAssaultShipRocketROF
 
@@ -16712,7 +16716,7 @@ class Effect4973(EffectDef):
                                       'speed', ship.getModifiedItemAttr('eliteBonusGunship1'), skill='Assault Frigates')
 
 
-class Effect4974(EffectDef):
+class Effect4974(BaseEffect):
     """
     eliteBonusMarauderShieldBonus2a
 
@@ -16729,7 +16733,7 @@ class Effect4974(EffectDef):
                                       'shieldBonus', ship.getModifiedItemAttr('eliteBonusViolators2'), skill='Marauders')
 
 
-class Effect4975(EffectDef):
+class Effect4975(BaseEffect):
     """
     shipBonusMissileKineticlATF2
 
@@ -16745,7 +16749,7 @@ class Effect4975(EffectDef):
                                         'kineticDamage', ship.getModifiedItemAttr('shipBonusATF2'))
 
 
-class Effect4976(EffectDef):
+class Effect4976(BaseEffect):
     """
     skillReactiveArmorHardenerDurationBonus
 
@@ -16764,7 +16768,7 @@ class Effect4976(EffectDef):
                                       src.getModifiedItemAttr('durationBonus') * lvl)
 
 
-class Effect4989(EffectDef):
+class Effect4989(BaseEffect):
     """
     missileSkillAoeCloudSizeBonusAllIncludingCapitals
 
@@ -16780,7 +16784,7 @@ class Effect4989(EffectDef):
                                         'aoeCloudSize', implant.getModifiedItemAttr('aoeCloudSizeBonus'))
 
 
-class Effect4990(EffectDef):
+class Effect4990(BaseEffect):
     """
     shipEnergyTCapNeedBonusRookie
 
@@ -16797,7 +16801,7 @@ class Effect4990(EffectDef):
                                       'capacitorNeed', ship.getModifiedItemAttr('rookieSETCapBonus'))
 
 
-class Effect4991(EffectDef):
+class Effect4991(BaseEffect):
     """
     shipSETDmgBonusRookie
 
@@ -16815,7 +16819,7 @@ class Effect4991(EffectDef):
                                       'damageMultiplier', ship.getModifiedItemAttr('rookieSETDamageBonus'))
 
 
-class Effect4994(EffectDef):
+class Effect4994(BaseEffect):
     """
     shipArmorEMResistanceRookie
 
@@ -16834,7 +16838,7 @@ class Effect4994(EffectDef):
         fit.ship.boostItemAttr('armorEmDamageResonance', ship.getModifiedItemAttr('rookieArmorResistanceBonus'))
 
 
-class Effect4995(EffectDef):
+class Effect4995(BaseEffect):
     """
     shipArmorEXResistanceRookie
 
@@ -16853,7 +16857,7 @@ class Effect4995(EffectDef):
         fit.ship.boostItemAttr('armorExplosiveDamageResonance', ship.getModifiedItemAttr('rookieArmorResistanceBonus'))
 
 
-class Effect4996(EffectDef):
+class Effect4996(BaseEffect):
     """
     shipArmorKNResistanceRookie
 
@@ -16872,7 +16876,7 @@ class Effect4996(EffectDef):
         fit.ship.boostItemAttr('armorKineticDamageResonance', ship.getModifiedItemAttr('rookieArmorResistanceBonus'))
 
 
-class Effect4997(EffectDef):
+class Effect4997(BaseEffect):
     """
     shipArmorTHResistanceRookie
 
@@ -16891,7 +16895,7 @@ class Effect4997(EffectDef):
         fit.ship.boostItemAttr('armorThermalDamageResonance', ship.getModifiedItemAttr('rookieArmorResistanceBonus'))
 
 
-class Effect4999(EffectDef):
+class Effect4999(BaseEffect):
     """
     shipHybridRangeBonusRookie
 
@@ -16907,7 +16911,7 @@ class Effect4999(EffectDef):
                                       'maxRange', ship.getModifiedItemAttr('rookieSHTOptimalBonus'))
 
 
-class Effect5000(EffectDef):
+class Effect5000(BaseEffect):
     """
     shipMissileKineticDamageRookie
 
@@ -16923,7 +16927,7 @@ class Effect5000(EffectDef):
                                         'kineticDamage', ship.getModifiedItemAttr('rookieMissileKinDamageBonus'))
 
 
-class Effect5008(EffectDef):
+class Effect5008(BaseEffect):
     """
     shipShieldEMResistanceRookie
 
@@ -16940,7 +16944,7 @@ class Effect5008(EffectDef):
         fit.ship.boostItemAttr('shieldEmDamageResonance', ship.getModifiedItemAttr('rookieShieldResistBonus'))
 
 
-class Effect5009(EffectDef):
+class Effect5009(BaseEffect):
     """
     shipShieldExplosiveResistanceRookie
 
@@ -16957,7 +16961,7 @@ class Effect5009(EffectDef):
         fit.ship.boostItemAttr('shieldExplosiveDamageResonance', ship.getModifiedItemAttr('rookieShieldResistBonus'))
 
 
-class Effect5011(EffectDef):
+class Effect5011(BaseEffect):
     """
     shipShieldKineticResistanceRookie
 
@@ -16974,7 +16978,7 @@ class Effect5011(EffectDef):
         fit.ship.boostItemAttr('shieldKineticDamageResonance', ship.getModifiedItemAttr('rookieShieldResistBonus'))
 
 
-class Effect5012(EffectDef):
+class Effect5012(BaseEffect):
     """
     shipShieldThermalResistanceRookie
 
@@ -16991,7 +16995,7 @@ class Effect5012(EffectDef):
         fit.ship.boostItemAttr('shieldThermalDamageResonance', ship.getModifiedItemAttr('rookieShieldResistBonus'))
 
 
-class Effect5013(EffectDef):
+class Effect5013(BaseEffect):
     """
     shipSHTDmgBonusRookie
 
@@ -17009,7 +17013,7 @@ class Effect5013(EffectDef):
                                       'damageMultiplier', ship.getModifiedItemAttr('rookieSHTDamageBonus'))
 
 
-class Effect5014(EffectDef):
+class Effect5014(BaseEffect):
     """
     shipBonusDroneDamageMultiplierRookie
 
@@ -17029,7 +17033,7 @@ class Effect5014(EffectDef):
                                      'damageMultiplier', ship.getModifiedItemAttr('rookieDroneBonus'))
 
 
-class Effect5015(EffectDef):
+class Effect5015(BaseEffect):
     """
     shipBonusEwRemoteSensorDampenerMaxTargetRangeBonusRookie
 
@@ -17045,7 +17049,7 @@ class Effect5015(EffectDef):
                                       'maxTargetRangeBonus', ship.getModifiedItemAttr('rookieDampStrengthBonus'))
 
 
-class Effect5016(EffectDef):
+class Effect5016(BaseEffect):
     """
     shipBonusEwRemoteSensorDampenerScanResolutionBonusRookie
 
@@ -17061,7 +17065,7 @@ class Effect5016(EffectDef):
                                       'scanResolutionBonus', ship.getModifiedItemAttr('rookieDampStrengthBonus'))
 
 
-class Effect5017(EffectDef):
+class Effect5017(BaseEffect):
     """
     shipArmorRepairingRookie
 
@@ -17077,7 +17081,7 @@ class Effect5017(EffectDef):
                                       'armorDamageAmount', ship.getModifiedItemAttr('rookieArmorRepBonus'))
 
 
-class Effect5018(EffectDef):
+class Effect5018(BaseEffect):
     """
     shipVelocityBonusRookie
 
@@ -17092,7 +17096,7 @@ class Effect5018(EffectDef):
         fit.ship.boostItemAttr('maxVelocity', ship.getModifiedItemAttr('rookieShipVelocityBonus'))
 
 
-class Effect5019(EffectDef):
+class Effect5019(BaseEffect):
     """
     minmatarShipEwTargetPainterRookie
 
@@ -17108,7 +17112,7 @@ class Effect5019(EffectDef):
                                       'signatureRadiusBonus', ship.getModifiedItemAttr('rookieTargetPainterStrengthBonus'))
 
 
-class Effect5020(EffectDef):
+class Effect5020(BaseEffect):
     """
     shipSPTDmgBonusRookie
 
@@ -17125,7 +17129,7 @@ class Effect5020(EffectDef):
                                       'damageMultiplier', ship.getModifiedItemAttr('rookieSPTDamageBonus'))
 
 
-class Effect5021(EffectDef):
+class Effect5021(BaseEffect):
     """
     shipShieldBoostRookie
 
@@ -17142,7 +17146,7 @@ class Effect5021(EffectDef):
                                       'shieldBonus', ship.getModifiedItemAttr('rookieShieldBoostBonus'))
 
 
-class Effect5028(EffectDef):
+class Effect5028(BaseEffect):
     """
     shipECMScanStrengthBonusRookie
 
@@ -17160,7 +17164,7 @@ class Effect5028(EffectDef):
                                           ship.getModifiedItemAttr('rookieECMStrengthBonus'))
 
 
-class Effect5029(EffectDef):
+class Effect5029(BaseEffect):
     """
     shipBonusDroneMiningAmountRole
 
@@ -17178,7 +17182,7 @@ class Effect5029(EffectDef):
                                      )
 
 
-class Effect5030(EffectDef):
+class Effect5030(BaseEffect):
     """
     shipBonusMiningDroneAmountPercentRookie
 
@@ -17197,7 +17201,7 @@ class Effect5030(EffectDef):
                                      'miningAmount', container.getModifiedItemAttr('rookieDroneBonus'))
 
 
-class Effect5035(EffectDef):
+class Effect5035(BaseEffect):
     """
     shipBonusDroneHitpointsRookie
 
@@ -17219,7 +17223,7 @@ class Effect5035(EffectDef):
                                          type, ship.getModifiedItemAttr('rookieDroneBonus'))
 
 
-class Effect5036(EffectDef):
+class Effect5036(BaseEffect):
     """
     shipBonusSalvageCycleAF
 
@@ -17235,7 +17239,7 @@ class Effect5036(EffectDef):
                                       'duration', ship.getModifiedItemAttr('shipBonusAF'), skill='Amarr Frigate')
 
 
-class Effect5045(EffectDef):
+class Effect5045(BaseEffect):
     """
     shipBonusSalvageCycleCF
 
@@ -17251,7 +17255,7 @@ class Effect5045(EffectDef):
                                       'duration', ship.getModifiedItemAttr('shipBonusCF'), skill='Caldari Frigate')
 
 
-class Effect5048(EffectDef):
+class Effect5048(BaseEffect):
     """
     shipBonusSalvageCycleGF
 
@@ -17267,7 +17271,7 @@ class Effect5048(EffectDef):
                                       'duration', ship.getModifiedItemAttr('shipBonusGF'), skill='Amarr Frigate')
 
 
-class Effect5051(EffectDef):
+class Effect5051(BaseEffect):
     """
     shipBonusSalvageCycleMF
 
@@ -17283,7 +17287,7 @@ class Effect5051(EffectDef):
                                       'duration', ship.getModifiedItemAttr('shipBonusMF'), skill='Minmatar Frigate')
 
 
-class Effect5055(EffectDef):
+class Effect5055(BaseEffect):
     """
     iceHarvesterDurationMultiplier
 
@@ -17299,7 +17303,7 @@ class Effect5055(EffectDef):
                                          'duration', ship.getModifiedItemAttr('iceHarvestCycleBonus'))
 
 
-class Effect5058(EffectDef):
+class Effect5058(BaseEffect):
     """
     miningYieldMultiplyPassive
 
@@ -17315,7 +17319,7 @@ class Effect5058(EffectDef):
                                          'miningAmount', module.getModifiedItemAttr('miningAmountMultiplier'))
 
 
-class Effect5059(EffectDef):
+class Effect5059(BaseEffect):
     """
     shipBonusIceHarvesterDurationORE3
 
@@ -17332,7 +17336,7 @@ class Effect5059(EffectDef):
                                       'duration', container.getModifiedItemAttr('shipBonusORE3'), skill='Mining Barge')
 
 
-class Effect5066(EffectDef):
+class Effect5066(BaseEffect):
     """
     shipBonusTargetPainterOptimalMF1
 
@@ -17349,7 +17353,7 @@ class Effect5066(EffectDef):
                                       'maxRange', ship.getModifiedItemAttr('shipBonusMF'), skill='Minmatar Frigate')
 
 
-class Effect5067(EffectDef):
+class Effect5067(BaseEffect):
     """
     shipBonusOreHoldORE2
 
@@ -17364,7 +17368,7 @@ class Effect5067(EffectDef):
         fit.ship.boostItemAttr('specialOreHoldCapacity', ship.getModifiedItemAttr('shipBonusORE2'), skill='Mining Barge')
 
 
-class Effect5068(EffectDef):
+class Effect5068(BaseEffect):
     """
     shipBonusShieldCapacityORE2
 
@@ -17379,7 +17383,7 @@ class Effect5068(EffectDef):
         fit.ship.boostItemAttr('shieldCapacity', ship.getModifiedItemAttr('shipBonusORE2'), skill='Mining Barge')
 
 
-class Effect5069(EffectDef):
+class Effect5069(BaseEffect):
     """
     mercoxitCrystalBonus
 
@@ -17397,7 +17401,7 @@ class Effect5069(EffectDef):
                                         module.getModifiedItemAttr('miningAmountBonus'))
 
 
-class Effect5079(EffectDef):
+class Effect5079(BaseEffect):
     """
     shipMissileKineticDamageCF2
 
@@ -17413,7 +17417,7 @@ class Effect5079(EffectDef):
                                         'kineticDamage', ship.getModifiedItemAttr('shipBonusCF2'), skill='Caldari Frigate')
 
 
-class Effect5080(EffectDef):
+class Effect5080(BaseEffect):
     """
     shipMissileVelocityCF
 
@@ -17431,7 +17435,7 @@ class Effect5080(EffectDef):
                                         'maxVelocity', ship.getModifiedItemAttr('shipBonusCF'), skill='Caldari Frigate')
 
 
-class Effect5081(EffectDef):
+class Effect5081(BaseEffect):
     """
     maxTargetingRangeBonusPostPercentPassive
 
@@ -17447,7 +17451,7 @@ class Effect5081(EffectDef):
                                stackingPenalties=True)
 
 
-class Effect5087(EffectDef):
+class Effect5087(BaseEffect):
     """
     shipBonusDroneHitpointsGF
 
@@ -17466,7 +17470,7 @@ class Effect5087(EffectDef):
                                          layer, ship.getModifiedItemAttr('shipBonusGF'), skill='Gallente Frigate')
 
 
-class Effect5090(EffectDef):
+class Effect5090(BaseEffect):
     """
     shipShieldBoostMF
 
@@ -17483,7 +17487,7 @@ class Effect5090(EffectDef):
                                       'shieldBonus', ship.getModifiedItemAttr('shipBonusMF'), skill='Minmatar Frigate')
 
 
-class Effect5103(EffectDef):
+class Effect5103(BaseEffect):
     """
     shipBonusShieldTransferCapNeedCF
 
@@ -17499,7 +17503,7 @@ class Effect5103(EffectDef):
                                       'capacitorNeed', ship.getModifiedItemAttr('shipBonusCF'), skill='Caldari Frigate')
 
 
-class Effect5104(EffectDef):
+class Effect5104(BaseEffect):
     """
     shipBonusShieldTransferBoostAmountCF2
 
@@ -17515,7 +17519,7 @@ class Effect5104(EffectDef):
                                       'shieldBonus', ship.getModifiedItemAttr('shipBonusCF2'), skill='Caldari Frigate')
 
 
-class Effect5105(EffectDef):
+class Effect5105(BaseEffect):
     """
     shipBonusShieldTransferCapNeedMF
 
@@ -17531,7 +17535,7 @@ class Effect5105(EffectDef):
                                       'capacitorNeed', ship.getModifiedItemAttr('shipBonusMF'), skill='Minmatar Frigate')
 
 
-class Effect5106(EffectDef):
+class Effect5106(BaseEffect):
     """
     shipBonusShieldTransferBoostAmountMF2
 
@@ -17547,7 +17551,7 @@ class Effect5106(EffectDef):
                                       'shieldBonus', ship.getModifiedItemAttr('shipBonusMF2'), skill='Minmatar Frigate')
 
 
-class Effect5107(EffectDef):
+class Effect5107(BaseEffect):
     """
     shipBonusRemoteArmorRepairCapNeedGF
 
@@ -17563,7 +17567,7 @@ class Effect5107(EffectDef):
                                       src.getModifiedItemAttr('shipBonusGF'), skill='Gallente Frigate')
 
 
-class Effect5108(EffectDef):
+class Effect5108(BaseEffect):
     """
     shipBonusRemoteArmorRepairAmountGF2
 
@@ -17580,7 +17584,7 @@ class Effect5108(EffectDef):
                                       skill='Gallente Frigate')
 
 
-class Effect5109(EffectDef):
+class Effect5109(BaseEffect):
     """
     shipBonusRemoteArmorRepairCapNeedAF
 
@@ -17597,7 +17601,7 @@ class Effect5109(EffectDef):
                                       src.getModifiedItemAttr('shipBonusAF'), skill='Amarr Frigate')
 
 
-class Effect5110(EffectDef):
+class Effect5110(BaseEffect):
     """
     shipBonusRemoteArmorRepairAmount2AF
 
@@ -17614,7 +17618,7 @@ class Effect5110(EffectDef):
                                       'armorDamageAmount', src.getModifiedItemAttr('shipBonus2AF'), skill='Amarr Frigate')
 
 
-class Effect5111(EffectDef):
+class Effect5111(BaseEffect):
     """
     shipBonusDroneTrackingGF
 
@@ -17631,7 +17635,7 @@ class Effect5111(EffectDef):
                                      'trackingSpeed', ship.getModifiedItemAttr('shipBonusGF'), skill='Gallente Frigate')
 
 
-class Effect5119(EffectDef):
+class Effect5119(BaseEffect):
     """
     shipBonusScanProbeStrength2AF
 
@@ -17648,7 +17652,7 @@ class Effect5119(EffectDef):
                                         skill='Amarr Frigate')
 
 
-class Effect5121(EffectDef):
+class Effect5121(BaseEffect):
     """
     energyTransferArrayTransferAmountBonus
 
@@ -17665,7 +17669,7 @@ class Effect5121(EffectDef):
                                       'powerTransferAmount', ship.getModifiedItemAttr('energyTransferAmountBonus'))
 
 
-class Effect5122(EffectDef):
+class Effect5122(BaseEffect):
     """
     shipBonusShieldTransferCapneedMC1
 
@@ -17681,7 +17685,7 @@ class Effect5122(EffectDef):
                                       'capacitorNeed', ship.getModifiedItemAttr('shipBonusMC'), skill='Minmatar Cruiser')
 
 
-class Effect5123(EffectDef):
+class Effect5123(BaseEffect):
     """
     shipBonusRemoteArmorRepairCapNeedAC1
 
@@ -17697,7 +17701,7 @@ class Effect5123(EffectDef):
                                       src.getModifiedItemAttr('shipBonusAC'), skill='Amarr Cruiser')
 
 
-class Effect5124(EffectDef):
+class Effect5124(BaseEffect):
     """
     shipBonusRemoteArmorRepairAmountAC2
 
@@ -17713,7 +17717,7 @@ class Effect5124(EffectDef):
                                       'armorDamageAmount', src.getModifiedItemAttr('shipBonusAC2'), skill='Amarr Cruiser')
 
 
-class Effect5125(EffectDef):
+class Effect5125(BaseEffect):
     """
     shipBonusRemoteArmorRepairAmountGC2
 
@@ -17730,7 +17734,7 @@ class Effect5125(EffectDef):
                                       skill='Gallente Cruiser')
 
 
-class Effect5126(EffectDef):
+class Effect5126(BaseEffect):
     """
     shipBonusShieldTransferBoostAmountCC2
 
@@ -17746,7 +17750,7 @@ class Effect5126(EffectDef):
                                       'shieldBonus', ship.getModifiedItemAttr('shipBonusCC2'), skill='Caldari Cruiser')
 
 
-class Effect5127(EffectDef):
+class Effect5127(BaseEffect):
     """
     shipBonusShieldTransferBoostAmountMC2
 
@@ -17762,7 +17766,7 @@ class Effect5127(EffectDef):
                                       'shieldBonus', ship.getModifiedItemAttr('shipBonusMC2'), skill='Minmatar Cruiser')
 
 
-class Effect5128(EffectDef):
+class Effect5128(BaseEffect):
     """
     shipBonusEwRemoteSensorDampenerOptimalBonusGC1
 
@@ -17778,7 +17782,7 @@ class Effect5128(EffectDef):
                                       'maxRange', ship.getModifiedItemAttr('shipBonusGC'), skill='Gallente Cruiser')
 
 
-class Effect5129(EffectDef):
+class Effect5129(BaseEffect):
     """
     minmatarShipEwTargetPainterMC1
 
@@ -17796,7 +17800,7 @@ class Effect5129(EffectDef):
                                       skill='Minmatar Cruiser')
 
 
-class Effect5131(EffectDef):
+class Effect5131(BaseEffect):
     """
     shipMissileRofCC
 
@@ -17814,7 +17818,7 @@ class Effect5131(EffectDef):
                                       'speed', ship.getModifiedItemAttr('shipBonusCC'), skill='Caldari Cruiser')
 
 
-class Effect5132(EffectDef):
+class Effect5132(BaseEffect):
     """
     shipPTurretFalloffBonusMC2
 
@@ -17831,7 +17835,7 @@ class Effect5132(EffectDef):
                                       'falloff', ship.getModifiedItemAttr('shipBonusMC2'), skill='Minmatar Cruiser')
 
 
-class Effect5133(EffectDef):
+class Effect5133(BaseEffect):
     """
     shipHTDamageBonusCC
 
@@ -17847,7 +17851,7 @@ class Effect5133(EffectDef):
                                       'damageMultiplier', ship.getModifiedItemAttr('shipBonusCC'), skill='Caldari Cruiser')
 
 
-class Effect5136(EffectDef):
+class Effect5136(BaseEffect):
     """
     shipMETCDamageBonusAC
 
@@ -17866,7 +17870,7 @@ class Effect5136(EffectDef):
                                       'damageMultiplier', ship.getModifiedItemAttr('shipBonusAC'), skill='Amarr Cruiser')
 
 
-class Effect5139(EffectDef):
+class Effect5139(BaseEffect):
     """
     shipMiningBonusOREfrig1
 
@@ -17883,7 +17887,7 @@ class Effect5139(EffectDef):
                                       skill='Mining Frigate')
 
 
-class Effect5142(EffectDef):
+class Effect5142(BaseEffect):
     """
     GCHYieldMultiplyPassive
 
@@ -17900,7 +17904,7 @@ class Effect5142(EffectDef):
                                          'miningAmount', module.getModifiedItemAttr('miningAmountMultiplier'))
 
 
-class Effect5153(EffectDef):
+class Effect5153(BaseEffect):
     """
     shipMissileVelocityPirateFactionRocket
 
@@ -17917,7 +17921,7 @@ class Effect5153(EffectDef):
                                         'maxVelocity', ship.getModifiedItemAttr('shipBonusRole7'))
 
 
-class Effect5156(EffectDef):
+class Effect5156(BaseEffect):
     """
     shipGCHYieldBonusOREfrig2
 
@@ -17934,7 +17938,7 @@ class Effect5156(EffectDef):
                                       'duration', module.getModifiedItemAttr('shipBonusOREfrig2'), skill='Mining Frigate')
 
 
-class Effect5162(EffectDef):
+class Effect5162(BaseEffect):
     """
     skillReactiveArmorHardenerCapNeedBonus
 
@@ -17953,7 +17957,7 @@ class Effect5162(EffectDef):
                                       src.getModifiedItemAttr('capNeedBonus') * lvl)
 
 
-class Effect5165(EffectDef):
+class Effect5165(BaseEffect):
     """
     shipBonusDroneMWDboostrole
 
@@ -17970,7 +17974,7 @@ class Effect5165(EffectDef):
                                      'maxVelocity', ship.getModifiedItemAttr('shipBonusRole7'))
 
 
-class Effect5168(EffectDef):
+class Effect5168(BaseEffect):
     """
     droneSalvageBonus
 
@@ -17987,7 +17991,7 @@ class Effect5168(EffectDef):
                                         container.getModifiedItemAttr('accessDifficultyBonus') * container.level)
 
 
-class Effect5180(EffectDef):
+class Effect5180(BaseEffect):
     """
     sensorCompensationSensorStrengthBonusGravimetric
 
@@ -18003,7 +18007,7 @@ class Effect5180(EffectDef):
                                container.getModifiedItemAttr('sensorStrengthBonus') * container.level)
 
 
-class Effect5181(EffectDef):
+class Effect5181(BaseEffect):
     """
     sensorCompensationSensorStrengthBonusLadar
 
@@ -18018,7 +18022,7 @@ class Effect5181(EffectDef):
         fit.ship.boostItemAttr('scanLadarStrength', container.getModifiedItemAttr('sensorStrengthBonus') * container.level)
 
 
-class Effect5182(EffectDef):
+class Effect5182(BaseEffect):
     """
     sensorCompensationSensorStrengthBonusMagnetometric
 
@@ -18034,7 +18038,7 @@ class Effect5182(EffectDef):
                                container.getModifiedItemAttr('sensorStrengthBonus') * container.level)
 
 
-class Effect5183(EffectDef):
+class Effect5183(BaseEffect):
     """
     sensorCompensationSensorStrengthBonusRadar
 
@@ -18049,7 +18053,7 @@ class Effect5183(EffectDef):
         fit.ship.boostItemAttr('scanRadarStrength', container.getModifiedItemAttr('sensorStrengthBonus') * container.level)
 
 
-class Effect5185(EffectDef):
+class Effect5185(BaseEffect):
     """
     shipEnergyVampireAmountBonusFixedAF2
 
@@ -18066,7 +18070,7 @@ class Effect5185(EffectDef):
                                       skill='Amarr Frigate')
 
 
-class Effect5187(EffectDef):
+class Effect5187(BaseEffect):
     """
     shipBonusEwRemoteSensorDampenerFalloffBonusGC1
 
@@ -18083,7 +18087,7 @@ class Effect5187(EffectDef):
                                       skill='Gallente Cruiser')
 
 
-class Effect5188(EffectDef):
+class Effect5188(BaseEffect):
     """
     trackingSpeedBonusEffectHybrids
 
@@ -18100,7 +18104,7 @@ class Effect5188(EffectDef):
                                       stackingPenalties=True)
 
 
-class Effect5189(EffectDef):
+class Effect5189(BaseEffect):
     """
     trackingSpeedBonusEffectLasers
 
@@ -18117,7 +18121,7 @@ class Effect5189(EffectDef):
                                       stackingPenalties=True)
 
 
-class Effect5190(EffectDef):
+class Effect5190(BaseEffect):
     """
     trackingSpeedBonusEffectProjectiles
 
@@ -18134,7 +18138,7 @@ class Effect5190(EffectDef):
                                       stackingPenalties=True)
 
 
-class Effect5201(EffectDef):
+class Effect5201(BaseEffect):
     """
     armorUpgradesMassPenaltyReductionBonus
 
@@ -18151,7 +18155,7 @@ class Effect5201(EffectDef):
                                       'massAddition', container.getModifiedItemAttr('massPenaltyReduction') * level)
 
 
-class Effect5205(EffectDef):
+class Effect5205(BaseEffect):
     """
     shipSETTrackingBonusRookie
 
@@ -18167,7 +18171,7 @@ class Effect5205(EffectDef):
                                       'trackingSpeed', ship.getModifiedItemAttr('rookieSETTracking'))
 
 
-class Effect5206(EffectDef):
+class Effect5206(BaseEffect):
     """
     shipSETOptimalBonusRookie
 
@@ -18183,7 +18187,7 @@ class Effect5206(EffectDef):
                                       'maxRange', ship.getModifiedItemAttr('rookieSETOptimal'))
 
 
-class Effect5207(EffectDef):
+class Effect5207(BaseEffect):
     """
     shipNOSTransferAmountBonusRookie
 
@@ -18199,7 +18203,7 @@ class Effect5207(EffectDef):
                                       'powerTransferAmount', ship.getModifiedItemAttr('rookieNosDrain'))
 
 
-class Effect5208(EffectDef):
+class Effect5208(BaseEffect):
     """
     shipNeutDestabilizationAmountBonusRookie
 
@@ -18215,7 +18219,7 @@ class Effect5208(EffectDef):
                                       'energyNeutralizerAmount', ship.getModifiedItemAttr('rookieNeutDrain'))
 
 
-class Effect5209(EffectDef):
+class Effect5209(BaseEffect):
     """
     shipWebVelocityBonusRookie
 
@@ -18232,7 +18236,7 @@ class Effect5209(EffectDef):
                                       'speedFactor', ship.getModifiedItemAttr('rookieWebAmount'))
 
 
-class Effect5212(EffectDef):
+class Effect5212(BaseEffect):
     """
     shipDroneMWDSpeedBonusRookie
 
@@ -18248,7 +18252,7 @@ class Effect5212(EffectDef):
                                      'maxVelocity', ship.getModifiedItemAttr('rookieDroneMWDspeed'))
 
 
-class Effect5213(EffectDef):
+class Effect5213(BaseEffect):
     """
     shipRocketMaxVelocityBonusRookie
 
@@ -18264,7 +18268,7 @@ class Effect5213(EffectDef):
                                         'maxVelocity', ship.getModifiedItemAttr('rookieRocketVelocity'))
 
 
-class Effect5214(EffectDef):
+class Effect5214(BaseEffect):
     """
     shipLightMissileMaxVelocityBonusRookie
 
@@ -18280,7 +18284,7 @@ class Effect5214(EffectDef):
                                         'maxVelocity', ship.getModifiedItemAttr('rookieLightMissileVelocity'))
 
 
-class Effect5215(EffectDef):
+class Effect5215(BaseEffect):
     """
     shipSHTTrackingSpeedBonusRookie
 
@@ -18296,7 +18300,7 @@ class Effect5215(EffectDef):
                                       'trackingSpeed', ship.getModifiedItemAttr('rookieSHTTracking'))
 
 
-class Effect5216(EffectDef):
+class Effect5216(BaseEffect):
     """
     shipSHTFalloffBonusRookie
 
@@ -18312,7 +18316,7 @@ class Effect5216(EffectDef):
                                       'falloff', ship.getModifiedItemAttr('rookieSHTFalloff'))
 
 
-class Effect5217(EffectDef):
+class Effect5217(BaseEffect):
     """
     shipSPTTrackingSpeedBonusRookie
 
@@ -18328,7 +18332,7 @@ class Effect5217(EffectDef):
                                       'trackingSpeed', ship.getModifiedItemAttr('rookieSPTTracking'))
 
 
-class Effect5218(EffectDef):
+class Effect5218(BaseEffect):
     """
     shipSPTFalloffBonusRookie
 
@@ -18344,7 +18348,7 @@ class Effect5218(EffectDef):
                                       'falloff', ship.getModifiedItemAttr('rookieSPTFalloff'))
 
 
-class Effect5219(EffectDef):
+class Effect5219(BaseEffect):
     """
     shipSPTOptimalRangeBonusRookie
 
@@ -18360,7 +18364,7 @@ class Effect5219(EffectDef):
                                       'maxRange', ship.getModifiedItemAttr('rookieSPTOptimal'))
 
 
-class Effect5220(EffectDef):
+class Effect5220(BaseEffect):
     """
     shipProjectileDmgPirateCruiser
 
@@ -18376,7 +18380,7 @@ class Effect5220(EffectDef):
                                       'damageMultiplier', ship.getModifiedItemAttr('shipBonusRole7'))
 
 
-class Effect5221(EffectDef):
+class Effect5221(BaseEffect):
     """
     shipHeavyAssaultMissileEMDmgPirateCruiser
 
@@ -18392,7 +18396,7 @@ class Effect5221(EffectDef):
                                         'emDamage', ship.getModifiedItemAttr('shipBonusRole7'))
 
 
-class Effect5222(EffectDef):
+class Effect5222(BaseEffect):
     """
     shipHeavyAssaultMissileKinDmgPirateCruiser
 
@@ -18408,7 +18412,7 @@ class Effect5222(EffectDef):
                                         'kineticDamage', ship.getModifiedItemAttr('shipBonusRole7'))
 
 
-class Effect5223(EffectDef):
+class Effect5223(BaseEffect):
     """
     shipHeavyAssaultMissileThermDmgPirateCruiser
 
@@ -18424,7 +18428,7 @@ class Effect5223(EffectDef):
                                         'thermalDamage', ship.getModifiedItemAttr('shipBonusRole7'))
 
 
-class Effect5224(EffectDef):
+class Effect5224(BaseEffect):
     """
     shipHeavyAssaultMissileExpDmgPirateCruiser
 
@@ -18440,7 +18444,7 @@ class Effect5224(EffectDef):
                                         'explosiveDamage', ship.getModifiedItemAttr('shipBonusRole7'))
 
 
-class Effect5225(EffectDef):
+class Effect5225(BaseEffect):
     """
     shipHeavyMissileEMDmgPirateCruiser
 
@@ -18456,7 +18460,7 @@ class Effect5225(EffectDef):
                                         'emDamage', ship.getModifiedItemAttr('shipBonusRole7'))
 
 
-class Effect5226(EffectDef):
+class Effect5226(BaseEffect):
     """
     shipHeavyMissileExpDmgPirateCruiser
 
@@ -18472,7 +18476,7 @@ class Effect5226(EffectDef):
                                         'explosiveDamage', ship.getModifiedItemAttr('shipBonusRole7'))
 
 
-class Effect5227(EffectDef):
+class Effect5227(BaseEffect):
     """
     shipHeavyMissileKinDmgPirateCruiser
 
@@ -18488,7 +18492,7 @@ class Effect5227(EffectDef):
                                         'kineticDamage', ship.getModifiedItemAttr('shipBonusRole7'))
 
 
-class Effect5228(EffectDef):
+class Effect5228(BaseEffect):
     """
     shipHeavyMissileThermDmgPirateCruiser
 
@@ -18504,7 +18508,7 @@ class Effect5228(EffectDef):
                                         'thermalDamage', ship.getModifiedItemAttr('shipBonusRole7'))
 
 
-class Effect5229(EffectDef):
+class Effect5229(BaseEffect):
     """
     shipScanProbeStrengthBonusPirateCruiser
 
@@ -18524,7 +18528,7 @@ class Effect5229(EffectDef):
                                         'baseSensorStrength', container.getModifiedItemAttr('shipBonusRole8'))
 
 
-class Effect5230(EffectDef):
+class Effect5230(BaseEffect):
     """
     modifyActiveShieldResonancePostPercent
 
@@ -18543,7 +18547,7 @@ class Effect5230(EffectDef):
                                    stackingPenalties=True)
 
 
-class Effect5231(EffectDef):
+class Effect5231(BaseEffect):
     """
     modifyActiveArmorResonancePostPercent
 
@@ -18562,7 +18566,7 @@ class Effect5231(EffectDef):
                                    stackingPenalties=True)
 
 
-class Effect5234(EffectDef):
+class Effect5234(BaseEffect):
     """
     shipSmallMissileExpDmgCF2
 
@@ -18580,7 +18584,7 @@ class Effect5234(EffectDef):
             'explosiveDamage', ship.getModifiedItemAttr('shipBonusCF2'), skill='Caldari Frigate')
 
 
-class Effect5237(EffectDef):
+class Effect5237(BaseEffect):
     """
     shipSmallMissileKinDmgCF2
 
@@ -18597,7 +18601,7 @@ class Effect5237(EffectDef):
             'kineticDamage', ship.getModifiedItemAttr('shipBonusCF2'), skill='Caldari Frigate')
 
 
-class Effect5240(EffectDef):
+class Effect5240(BaseEffect):
     """
     shipSmallMissileThermDmgCF2
 
@@ -18615,7 +18619,7 @@ class Effect5240(EffectDef):
             'thermalDamage', ship.getModifiedItemAttr('shipBonusCF2'), skill='Caldari Frigate')
 
 
-class Effect5243(EffectDef):
+class Effect5243(BaseEffect):
     """
     shipSmallMissileEMDmgCF2
 
@@ -18633,7 +18637,7 @@ class Effect5243(EffectDef):
             'emDamage', ship.getModifiedItemAttr('shipBonusCF2'), skill='Caldari Frigate')
 
 
-class Effect5259(EffectDef):
+class Effect5259(BaseEffect):
     """
     reconShipCloakCpuBonus1
 
@@ -18650,7 +18654,7 @@ class Effect5259(EffectDef):
                                       'cpu', ship.getModifiedItemAttr('eliteBonusReconShip1'), skill='Recon Ships')
 
 
-class Effect5260(EffectDef):
+class Effect5260(BaseEffect):
     """
     covertOpsCloakCpuPercentBonus1
 
@@ -18667,7 +18671,7 @@ class Effect5260(EffectDef):
                                       'cpu', ship.getModifiedItemAttr('eliteBonusCovertOps1'), skill='Covert Ops')
 
 
-class Effect5261(EffectDef):
+class Effect5261(BaseEffect):
     """
     CovertCloakCPUAddition
 
@@ -18683,7 +18687,7 @@ class Effect5261(EffectDef):
         module.increaseItemAttr('cpu', module.getModifiedItemAttr('covertCloakCPUAdd') or 0)
 
 
-class Effect5262(EffectDef):
+class Effect5262(BaseEffect):
     """
     covertOpsCloakCpuPenalty
 
@@ -18699,7 +18703,7 @@ class Effect5262(EffectDef):
                                          'covertCloakCPUAdd', module.getModifiedItemAttr('covertCloakCPUPenalty'))
 
 
-class Effect5263(EffectDef):
+class Effect5263(BaseEffect):
     """
     covertCynoCpuPenalty
 
@@ -18715,7 +18719,7 @@ class Effect5263(EffectDef):
                                          'covertCloakCPUAdd', module.getModifiedItemAttr('covertCloakCPUPenalty'))
 
 
-class Effect5264(EffectDef):
+class Effect5264(BaseEffect):
     """
     warfareLinkCPUAddition
 
@@ -18731,7 +18735,7 @@ class Effect5264(EffectDef):
         module.increaseItemAttr('cpu', module.getModifiedItemAttr('warfareLinkCPUAdd') or 0)
 
 
-class Effect5265(EffectDef):
+class Effect5265(BaseEffect):
     """
     warfareLinkCpuPenalty
 
@@ -18747,7 +18751,7 @@ class Effect5265(EffectDef):
                                          'warfareLinkCPUAdd', module.getModifiedItemAttr('warfareLinkCPUPenalty'))
 
 
-class Effect5266(EffectDef):
+class Effect5266(BaseEffect):
     """
     blockadeRunnerCloakCpuPercentBonus
 
@@ -18765,7 +18769,7 @@ class Effect5266(EffectDef):
                                       skill='Transport Ships')
 
 
-class Effect5267(EffectDef):
+class Effect5267(BaseEffect):
     """
     drawbackRepairSystemsPGNeed
 
@@ -18782,7 +18786,7 @@ class Effect5267(EffectDef):
                                       'power', module.getModifiedItemAttr('drawback'))
 
 
-class Effect5268(EffectDef):
+class Effect5268(BaseEffect):
     """
     drawbackCapRepPGNeed
 
@@ -18799,7 +18803,7 @@ class Effect5268(EffectDef):
                                       'power', module.getModifiedItemAttr('drawback'))
 
 
-class Effect5275(EffectDef):
+class Effect5275(BaseEffect):
     """
     fueledArmorRepair
 
@@ -18825,7 +18829,7 @@ class Effect5275(EffectDef):
         fit.extraAttributes.increase('armorRepairFullSpool', rps)
 
 
-class Effect5293(EffectDef):
+class Effect5293(BaseEffect):
     """
     shipLaserCapNeed2AD1
 
@@ -18841,7 +18845,7 @@ class Effect5293(EffectDef):
                                       'capacitorNeed', ship.getModifiedItemAttr('shipBonusAD1'), skill='Amarr Destroyer')
 
 
-class Effect5294(EffectDef):
+class Effect5294(BaseEffect):
     """
     shipLaserTracking2AD2
 
@@ -18857,7 +18861,7 @@ class Effect5294(EffectDef):
                                       'trackingSpeed', ship.getModifiedItemAttr('shipBonusAD2'), skill='Amarr Destroyer')
 
 
-class Effect5295(EffectDef):
+class Effect5295(BaseEffect):
     """
     shipBonusDroneDamageMultiplierAD1
 
@@ -18873,7 +18877,7 @@ class Effect5295(EffectDef):
                                      src.getModifiedItemAttr('shipBonusAD1'), skill='Amarr Destroyer')
 
 
-class Effect5300(EffectDef):
+class Effect5300(BaseEffect):
     """
     shipBonusDroneHitpointsAD1
 
@@ -18893,7 +18897,7 @@ class Effect5300(EffectDef):
                                      src.getModifiedItemAttr('shipBonusAD1'), skill='Amarr Destroyer')
 
 
-class Effect5303(EffectDef):
+class Effect5303(BaseEffect):
     """
     shipHybridRange1CD1
 
@@ -18909,7 +18913,7 @@ class Effect5303(EffectDef):
                                       'maxRange', ship.getModifiedItemAttr('shipBonusCD1'), skill='Caldari Destroyer')
 
 
-class Effect5304(EffectDef):
+class Effect5304(BaseEffect):
     """
     shipHybridTrackingCD2
 
@@ -18925,7 +18929,7 @@ class Effect5304(EffectDef):
                                       'trackingSpeed', ship.getModifiedItemAttr('shipBonusCD2'), skill='Caldari Destroyer')
 
 
-class Effect5305(EffectDef):
+class Effect5305(BaseEffect):
     """
     shipBonusFrigateSizedMissileKineticDamageCD1
 
@@ -18942,7 +18946,7 @@ class Effect5305(EffectDef):
                                         skill='Caldari Destroyer')
 
 
-class Effect5306(EffectDef):
+class Effect5306(BaseEffect):
     """
     shipRocketKineticDmgCD1
 
@@ -18959,7 +18963,7 @@ class Effect5306(EffectDef):
                                         skill='Caldari Destroyer')
 
 
-class Effect5307(EffectDef):
+class Effect5307(BaseEffect):
     """
     shipBonusAoeVelocityRocketsCD2
 
@@ -18975,7 +18979,7 @@ class Effect5307(EffectDef):
                                         'aoeVelocity', ship.getModifiedItemAttr('shipBonusCD2'), skill='Caldari Destroyer')
 
 
-class Effect5308(EffectDef):
+class Effect5308(BaseEffect):
     """
     shipBonusAoeVelocityStandardMissilesCD2
 
@@ -18991,7 +18995,7 @@ class Effect5308(EffectDef):
                                         'aoeVelocity', ship.getModifiedItemAttr('shipBonusCD2'), skill='Caldari Destroyer')
 
 
-class Effect5309(EffectDef):
+class Effect5309(BaseEffect):
     """
     shipHybridFallOff1GD1
 
@@ -19007,7 +19011,7 @@ class Effect5309(EffectDef):
                                       'falloff', ship.getModifiedItemAttr('shipBonusGD1'), skill='Gallente Destroyer')
 
 
-class Effect5310(EffectDef):
+class Effect5310(BaseEffect):
     """
     shipHybridTracking1GD2
 
@@ -19024,7 +19028,7 @@ class Effect5310(EffectDef):
                                       'trackingSpeed', ship.getModifiedItemAttr('shipBonusGD2'), skill='Gallente Destroyer')
 
 
-class Effect5311(EffectDef):
+class Effect5311(BaseEffect):
     """
     shipBonusDroneDamageMultiplierGD1
 
@@ -19040,7 +19044,7 @@ class Effect5311(EffectDef):
                                      src.getModifiedItemAttr('shipBonusGD1'), skill='Gallente Destroyer')
 
 
-class Effect5316(EffectDef):
+class Effect5316(BaseEffect):
     """
     shipBonusDroneHitpointsGD1
 
@@ -19060,7 +19064,7 @@ class Effect5316(EffectDef):
                                      src.getModifiedItemAttr('shipBonusGD1'), skill='Gallente Destroyer')
 
 
-class Effect5317(EffectDef):
+class Effect5317(BaseEffect):
     """
     shipProjectileDamageMD1
 
@@ -19077,7 +19081,7 @@ class Effect5317(EffectDef):
                                       skill='Minmatar Destroyer')
 
 
-class Effect5318(EffectDef):
+class Effect5318(BaseEffect):
     """
     shipProjectileTracking1MD2
 
@@ -19093,7 +19097,7 @@ class Effect5318(EffectDef):
                                       'trackingSpeed', ship.getModifiedItemAttr('shipBonusMD2'), skill='Minmatar Destroyer')
 
 
-class Effect5319(EffectDef):
+class Effect5319(BaseEffect):
     """
     shipBonusFrigateSizedLightMissileExplosiveDamageMD1
 
@@ -19110,7 +19114,7 @@ class Effect5319(EffectDef):
                                         skill='Minmatar Destroyer')
 
 
-class Effect5320(EffectDef):
+class Effect5320(BaseEffect):
     """
     shipRocketExplosiveDmgMD1
 
@@ -19127,7 +19131,7 @@ class Effect5320(EffectDef):
                                         skill='Minmatar Destroyer')
 
 
-class Effect5321(EffectDef):
+class Effect5321(BaseEffect):
     """
     shipBonusMWDSignatureRadiusMD2
 
@@ -19144,7 +19148,7 @@ class Effect5321(EffectDef):
                                       skill='Minmatar Destroyer')
 
 
-class Effect5322(EffectDef):
+class Effect5322(BaseEffect):
     """
     shipArmorEMResistance1ABC1
 
@@ -19161,7 +19165,7 @@ class Effect5322(EffectDef):
                                skill='Amarr Battlecruiser')
 
 
-class Effect5323(EffectDef):
+class Effect5323(BaseEffect):
     """
     shipArmorExplosiveResistance1ABC1
 
@@ -19178,7 +19182,7 @@ class Effect5323(EffectDef):
                                skill='Amarr Battlecruiser')
 
 
-class Effect5324(EffectDef):
+class Effect5324(BaseEffect):
     """
     shipArmorKineticResistance1ABC1
 
@@ -19195,7 +19199,7 @@ class Effect5324(EffectDef):
                                skill='Amarr Battlecruiser')
 
 
-class Effect5325(EffectDef):
+class Effect5325(BaseEffect):
     """
     shipArmorThermResistance1ABC1
 
@@ -19212,7 +19216,7 @@ class Effect5325(EffectDef):
                                skill='Amarr Battlecruiser')
 
 
-class Effect5326(EffectDef):
+class Effect5326(BaseEffect):
     """
     shipBonusDroneDamageMultiplierABC2
 
@@ -19229,7 +19233,7 @@ class Effect5326(EffectDef):
                                      skill='Amarr Battlecruiser')
 
 
-class Effect5331(EffectDef):
+class Effect5331(BaseEffect):
     """
     shipBonusDroneHitpointsABC2
 
@@ -19246,7 +19250,7 @@ class Effect5331(EffectDef):
                                          layer, ship.getModifiedItemAttr('shipBonusABC2'), skill='Amarr Battlecruiser')
 
 
-class Effect5332(EffectDef):
+class Effect5332(BaseEffect):
     """
     shipLaserCapABC1
 
@@ -19263,7 +19267,7 @@ class Effect5332(EffectDef):
                                       skill='Amarr Battlecruiser')
 
 
-class Effect5333(EffectDef):
+class Effect5333(BaseEffect):
     """
     shipLaserDamageBonusABC2
 
@@ -19280,7 +19284,7 @@ class Effect5333(EffectDef):
                                       skill='Amarr Battlecruiser')
 
 
-class Effect5334(EffectDef):
+class Effect5334(BaseEffect):
     """
     shipHybridOptimal1CBC1
 
@@ -19296,7 +19300,7 @@ class Effect5334(EffectDef):
                                       'maxRange', ship.getModifiedItemAttr('shipBonusCBC1'), skill='Caldari Battlecruiser')
 
 
-class Effect5335(EffectDef):
+class Effect5335(BaseEffect):
     """
     shipShieldEmResistance1CBC2
 
@@ -19314,7 +19318,7 @@ class Effect5335(EffectDef):
                                skill='Caldari Battlecruiser')
 
 
-class Effect5336(EffectDef):
+class Effect5336(BaseEffect):
     """
     shipShieldExplosiveResistance1CBC2
 
@@ -19332,7 +19336,7 @@ class Effect5336(EffectDef):
                                skill='Caldari Battlecruiser')
 
 
-class Effect5337(EffectDef):
+class Effect5337(BaseEffect):
     """
     shipShieldKineticResistance1CBC2
 
@@ -19350,7 +19354,7 @@ class Effect5337(EffectDef):
                                skill='Caldari Battlecruiser')
 
 
-class Effect5338(EffectDef):
+class Effect5338(BaseEffect):
     """
     shipShieldThermalResistance1CBC2
 
@@ -19368,7 +19372,7 @@ class Effect5338(EffectDef):
                                skill='Caldari Battlecruiser')
 
 
-class Effect5339(EffectDef):
+class Effect5339(BaseEffect):
     """
     shipBonusHeavyAssaultMissileKineticDamageCBC1
 
@@ -19386,7 +19390,7 @@ class Effect5339(EffectDef):
                                         skill='Caldari Battlecruiser')
 
 
-class Effect5340(EffectDef):
+class Effect5340(BaseEffect):
     """
     shipBonusHeavyMissileKineticDamageCBC1
 
@@ -19404,7 +19408,7 @@ class Effect5340(EffectDef):
                                         skill='Caldari Battlecruiser')
 
 
-class Effect5341(EffectDef):
+class Effect5341(BaseEffect):
     """
     shipHybridDmg1GBC1
 
@@ -19421,7 +19425,7 @@ class Effect5341(EffectDef):
                                       skill='Gallente Battlecruiser')
 
 
-class Effect5342(EffectDef):
+class Effect5342(BaseEffect):
     """
     shipArmorRepairing1GBC2
 
@@ -19440,7 +19444,7 @@ class Effect5342(EffectDef):
                                       skill='Gallente Battlecruiser')
 
 
-class Effect5343(EffectDef):
+class Effect5343(BaseEffect):
     """
     shipBonusDroneDamageMultiplierGBC1
 
@@ -19457,7 +19461,7 @@ class Effect5343(EffectDef):
                                      skill='Gallente Battlecruiser')
 
 
-class Effect5348(EffectDef):
+class Effect5348(BaseEffect):
     """
     shipBonusDroneHitpointsGBC1
 
@@ -19474,7 +19478,7 @@ class Effect5348(EffectDef):
                                          layer, ship.getModifiedItemAttr('shipBonusGBC1'), skill='Gallente Battlecruiser')
 
 
-class Effect5349(EffectDef):
+class Effect5349(BaseEffect):
     """
     shipBonusHeavyMissileLauncherRofMBC2
 
@@ -19490,7 +19494,7 @@ class Effect5349(EffectDef):
                                       'speed', ship.getModifiedItemAttr('shipBonusMBC2'), skill='Minmatar Battlecruiser')
 
 
-class Effect5350(EffectDef):
+class Effect5350(BaseEffect):
     """
     shipBonusHeavyAssaultMissileLauncherRofMBC2
 
@@ -19506,7 +19510,7 @@ class Effect5350(EffectDef):
                                       'speed', ship.getModifiedItemAttr('shipBonusMBC2'), skill='Minmatar Battlecruiser')
 
 
-class Effect5351(EffectDef):
+class Effect5351(BaseEffect):
     """
     shipShieldBoost1MBC1
 
@@ -19524,7 +19528,7 @@ class Effect5351(EffectDef):
                                       skill='Minmatar Battlecruiser')
 
 
-class Effect5352(EffectDef):
+class Effect5352(BaseEffect):
     """
     shipBonusProjectileDamageMBC1
 
@@ -19541,7 +19545,7 @@ class Effect5352(EffectDef):
                                       skill='Minmatar Battlecruiser')
 
 
-class Effect5353(EffectDef):
+class Effect5353(BaseEffect):
     """
     shipProjectileRof1MBC2
 
@@ -19557,7 +19561,7 @@ class Effect5353(EffectDef):
                                       'speed', ship.getModifiedItemAttr('shipBonusMBC2'), skill='Minmatar Battlecruiser')
 
 
-class Effect5354(EffectDef):
+class Effect5354(BaseEffect):
     """
     shipLargeLaserCapABC1
 
@@ -19574,7 +19578,7 @@ class Effect5354(EffectDef):
                                       skill='Amarr Battlecruiser')
 
 
-class Effect5355(EffectDef):
+class Effect5355(BaseEffect):
     """
     shipLargeLaserDamageBonusABC2
 
@@ -19591,7 +19595,7 @@ class Effect5355(EffectDef):
                                       skill='Amarr Battlecruiser')
 
 
-class Effect5356(EffectDef):
+class Effect5356(BaseEffect):
     """
     shipHybridRangeBonusCBC1
 
@@ -19607,7 +19611,7 @@ class Effect5356(EffectDef):
                                       'maxRange', ship.getModifiedItemAttr('shipBonusCBC1'), skill='Caldari Battlecruiser')
 
 
-class Effect5357(EffectDef):
+class Effect5357(BaseEffect):
     """
     shipHybridDamageBonusCBC2
 
@@ -19624,7 +19628,7 @@ class Effect5357(EffectDef):
                                       skill='Caldari Battlecruiser')
 
 
-class Effect5358(EffectDef):
+class Effect5358(BaseEffect):
     """
     shipLargeHybridTrackingBonusGBC1
 
@@ -19641,7 +19645,7 @@ class Effect5358(EffectDef):
                                       skill='Gallente Battlecruiser')
 
 
-class Effect5359(EffectDef):
+class Effect5359(BaseEffect):
     """
     shipHybridDamageBonusGBC2
 
@@ -19658,7 +19662,7 @@ class Effect5359(EffectDef):
                                       skill='Gallente Battlecruiser')
 
 
-class Effect5360(EffectDef):
+class Effect5360(BaseEffect):
     """
     shipProjectileRofBonusMBC1
 
@@ -19674,7 +19678,7 @@ class Effect5360(EffectDef):
                                       'speed', ship.getModifiedItemAttr('shipBonusMBC1'), skill='Minmatar Battlecruiser')
 
 
-class Effect5361(EffectDef):
+class Effect5361(BaseEffect):
     """
     shipProjectileFalloffBonusMBC2
 
@@ -19690,7 +19694,7 @@ class Effect5361(EffectDef):
                                       'falloff', ship.getModifiedItemAttr('shipBonusMBC2'), skill='Minmatar Battlecruiser')
 
 
-class Effect5364(EffectDef):
+class Effect5364(BaseEffect):
     """
     armorAllRepairSystemsAmountBonusPassive
 
@@ -19709,7 +19713,7 @@ class Effect5364(EffectDef):
             'armorDamageAmount', booster.getModifiedItemAttr('armorDamageAmountBonus') or 0)
 
 
-class Effect5365(EffectDef):
+class Effect5365(BaseEffect):
     """
     eliteBonusViolatorsRepairSystemsArmorDamageAmount2
 
@@ -19727,7 +19731,7 @@ class Effect5365(EffectDef):
                                       skill='Marauders')
 
 
-class Effect5366(EffectDef):
+class Effect5366(BaseEffect):
     """
     shipBonusRepairSystemsBonusATC2
 
@@ -19743,7 +19747,7 @@ class Effect5366(EffectDef):
                                       'armorDamageAmount', ship.getModifiedItemAttr('shipBonusATC2'))
 
 
-class Effect5367(EffectDef):
+class Effect5367(BaseEffect):
     """
     shipBonusRepairSystemsArmorRepairAmountGB2
 
@@ -19760,7 +19764,7 @@ class Effect5367(EffectDef):
                                       skill='Gallente Battleship')
 
 
-class Effect5378(EffectDef):
+class Effect5378(BaseEffect):
     """
     shipHeavyMissileAOECloudSizeCBC1
 
@@ -19777,7 +19781,7 @@ class Effect5378(EffectDef):
                                         skill='Caldari Battlecruiser')
 
 
-class Effect5379(EffectDef):
+class Effect5379(BaseEffect):
     """
     shipHeavyAssaultMissileAOECloudSizeCBC1
 
@@ -19794,7 +19798,7 @@ class Effect5379(EffectDef):
                                         skill='Caldari Battlecruiser')
 
 
-class Effect5380(EffectDef):
+class Effect5380(BaseEffect):
     """
     shipHybridTrackingGBC2
 
@@ -19811,7 +19815,7 @@ class Effect5380(EffectDef):
                                       skill='Gallente Battlecruiser')
 
 
-class Effect5381(EffectDef):
+class Effect5381(BaseEffect):
     """
     shipEnergyTrackingABC1
 
@@ -19828,7 +19832,7 @@ class Effect5381(EffectDef):
                                       skill='Amarr Battlecruiser')
 
 
-class Effect5382(EffectDef):
+class Effect5382(BaseEffect):
     """
     shipBonusMETOptimalAC2
 
@@ -19845,7 +19849,7 @@ class Effect5382(EffectDef):
                                       'maxRange', ship.getModifiedItemAttr('shipBonusAC2'), skill='Amarr Cruiser')
 
 
-class Effect5383(EffectDef):
+class Effect5383(BaseEffect):
     """
     shipMissileEMDamageCC
 
@@ -19862,7 +19866,7 @@ class Effect5383(EffectDef):
                                         'emDamage', ship.getModifiedItemAttr('shipBonusCC'), skill='Caldari Cruiser')
 
 
-class Effect5384(EffectDef):
+class Effect5384(BaseEffect):
     """
     shipMissileThermDamageCC
 
@@ -19879,7 +19883,7 @@ class Effect5384(EffectDef):
                                         'thermalDamage', ship.getModifiedItemAttr('shipBonusCC'), skill='Caldari Cruiser')
 
 
-class Effect5385(EffectDef):
+class Effect5385(BaseEffect):
     """
     shipMissileExpDamageCC
 
@@ -19896,7 +19900,7 @@ class Effect5385(EffectDef):
                                         'explosiveDamage', ship.getModifiedItemAttr('shipBonusCC'), skill='Caldari Cruiser')
 
 
-class Effect5386(EffectDef):
+class Effect5386(BaseEffect):
     """
     shipMissileKinDamageCC2
 
@@ -19912,7 +19916,7 @@ class Effect5386(EffectDef):
                                         'kineticDamage', ship.getModifiedItemAttr('shipBonusCC2'), skill='Caldari Cruiser')
 
 
-class Effect5387(EffectDef):
+class Effect5387(BaseEffect):
     """
     shipHeavyAssaultMissileAOECloudSizeCC2
 
@@ -19928,7 +19932,7 @@ class Effect5387(EffectDef):
                                         'aoeCloudSize', ship.getModifiedItemAttr('shipBonusCC2'), skill='Caldari Cruiser')
 
 
-class Effect5388(EffectDef):
+class Effect5388(BaseEffect):
     """
     shipHeavyMissileAOECloudSizeCC2
 
@@ -19944,7 +19948,7 @@ class Effect5388(EffectDef):
                                         'aoeCloudSize', ship.getModifiedItemAttr('shipBonusCC2'), skill='Caldari Cruiser')
 
 
-class Effect5389(EffectDef):
+class Effect5389(BaseEffect):
     """
     shipBonusDroneTrackingGC
 
@@ -19960,7 +19964,7 @@ class Effect5389(EffectDef):
                                      'trackingSpeed', ship.getModifiedItemAttr('shipBonusGC'), skill='Gallente Cruiser')
 
 
-class Effect5390(EffectDef):
+class Effect5390(BaseEffect):
     """
     shipBonusDroneMWDboostGC
 
@@ -19976,7 +19980,7 @@ class Effect5390(EffectDef):
                                      'maxVelocity', ship.getModifiedItemAttr('shipBonusGC'), skill='Gallente Cruiser')
 
 
-class Effect5397(EffectDef):
+class Effect5397(BaseEffect):
     """
     baseMaxScanDeviationModifierModuleOnline2None
 
@@ -19994,7 +19998,7 @@ class Effect5397(EffectDef):
                                         stackingPenalties=True)
 
 
-class Effect5398(EffectDef):
+class Effect5398(BaseEffect):
     """
     systemScanDurationModuleModifier
 
@@ -20010,7 +20014,7 @@ class Effect5398(EffectDef):
                                       'duration', module.getModifiedItemAttr('scanDurationBonus'))
 
 
-class Effect5399(EffectDef):
+class Effect5399(BaseEffect):
     """
     baseSensorStrengthModifierModule
 
@@ -20027,7 +20031,7 @@ class Effect5399(EffectDef):
                                         stackingPenalties=True)
 
 
-class Effect5402(EffectDef):
+class Effect5402(BaseEffect):
     """
     shipMissileHeavyAssaultVelocityABC2
 
@@ -20044,7 +20048,7 @@ class Effect5402(EffectDef):
                                         skill='Amarr Battlecruiser')
 
 
-class Effect5403(EffectDef):
+class Effect5403(BaseEffect):
     """
     shipMissileHeavyVelocityABC2
 
@@ -20061,7 +20065,7 @@ class Effect5403(EffectDef):
                                         skill='Amarr Battlecruiser')
 
 
-class Effect5410(EffectDef):
+class Effect5410(BaseEffect):
     """
     shipLaserCap1ABC2
 
@@ -20078,7 +20082,7 @@ class Effect5410(EffectDef):
                                       skill='Amarr Battlecruiser')
 
 
-class Effect5411(EffectDef):
+class Effect5411(BaseEffect):
     """
     shipMissileVelocityCD1
 
@@ -20094,7 +20098,7 @@ class Effect5411(EffectDef):
                                         'maxVelocity', ship.getModifiedItemAttr('shipBonusCD1'), skill='Caldari Destroyer')
 
 
-class Effect5417(EffectDef):
+class Effect5417(BaseEffect):
     """
     shipBonusDroneDamageMultiplierAB
 
@@ -20110,7 +20114,7 @@ class Effect5417(EffectDef):
                                      'damageMultiplier', ship.getModifiedItemAttr('shipBonusAB'), skill='Amarr Battleship')
 
 
-class Effect5418(EffectDef):
+class Effect5418(BaseEffect):
     """
     shipBonusDroneArmorHitPointsAB
 
@@ -20126,7 +20130,7 @@ class Effect5418(EffectDef):
                                      'armorHP', ship.getModifiedItemAttr('shipBonusAB'), skill='Amarr Battleship')
 
 
-class Effect5419(EffectDef):
+class Effect5419(BaseEffect):
     """
     shipBonusDroneShieldHitPointsAB
 
@@ -20142,7 +20146,7 @@ class Effect5419(EffectDef):
                                      'shieldCapacity', ship.getModifiedItemAttr('shipBonusAB'), skill='Amarr Battleship')
 
 
-class Effect5420(EffectDef):
+class Effect5420(BaseEffect):
     """
     shipBonusDroneStructureHitPointsAB
 
@@ -20158,7 +20162,7 @@ class Effect5420(EffectDef):
                                      'hp', ship.getModifiedItemAttr('shipBonusAB'), skill='Amarr Battleship')
 
 
-class Effect5424(EffectDef):
+class Effect5424(BaseEffect):
     """
     shipLargeHybridTurretRofGB
 
@@ -20175,7 +20179,7 @@ class Effect5424(EffectDef):
                                       'speed', ship.getModifiedItemAttr('shipBonusGB'), skill='Gallente Battleship')
 
 
-class Effect5427(EffectDef):
+class Effect5427(BaseEffect):
     """
     shipBonusDroneTrackingGB
 
@@ -20191,7 +20195,7 @@ class Effect5427(EffectDef):
                                      'trackingSpeed', ship.getModifiedItemAttr('shipBonusGB'), skill='Gallente Battleship')
 
 
-class Effect5428(EffectDef):
+class Effect5428(BaseEffect):
     """
     shipBonusDroneOptimalRangeGB
 
@@ -20207,7 +20211,7 @@ class Effect5428(EffectDef):
                                      'maxRange', ship.getModifiedItemAttr('shipBonusGB'), skill='Gallente Battleship')
 
 
-class Effect5429(EffectDef):
+class Effect5429(BaseEffect):
     """
     shipBonusMissileAoeVelocityMB2
 
@@ -20224,7 +20228,7 @@ class Effect5429(EffectDef):
                                         skill='Minmatar Battleship')
 
 
-class Effect5430(EffectDef):
+class Effect5430(BaseEffect):
     """
     shipBonusAoeVelocityCruiseMissilesMB2
 
@@ -20241,7 +20245,7 @@ class Effect5430(EffectDef):
                                         skill='Minmatar Battleship')
 
 
-class Effect5431(EffectDef):
+class Effect5431(BaseEffect):
     """
     shipBonusLargeEnergyTurretTrackingAB
 
@@ -20258,7 +20262,7 @@ class Effect5431(EffectDef):
                                       'trackingSpeed', ship.getModifiedItemAttr('shipBonusAB'), skill='Amarr Battleship')
 
 
-class Effect5433(EffectDef):
+class Effect5433(BaseEffect):
     """
     hackingSkillVirusBonus
 
@@ -20279,7 +20283,7 @@ class Effect5433(EffectDef):
                                          'virusCoherence', container.getModifiedItemAttr('virusCoherenceBonus') * level)
 
 
-class Effect5437(EffectDef):
+class Effect5437(BaseEffect):
     """
     archaeologySkillVirusBonus
 
@@ -20299,7 +20303,7 @@ class Effect5437(EffectDef):
                                          'virusCoherence', container.getModifiedItemAttr('virusCoherenceBonus') * level)
 
 
-class Effect5440(EffectDef):
+class Effect5440(BaseEffect):
     """
     systemStandardMissileKineticDamage
 
@@ -20317,7 +20321,7 @@ class Effect5440(EffectDef):
                                            stackingPenalties=True, penaltyGroup='postMul')
 
 
-class Effect5444(EffectDef):
+class Effect5444(BaseEffect):
     """
     shipTorpedoAOECloudSize1CB
 
@@ -20333,7 +20337,7 @@ class Effect5444(EffectDef):
                                         'aoeCloudSize', ship.getModifiedItemAttr('shipBonusCB'), skill='Caldari Battleship')
 
 
-class Effect5445(EffectDef):
+class Effect5445(BaseEffect):
     """
     shipCruiseMissileAOECloudSize1CB
 
@@ -20349,7 +20353,7 @@ class Effect5445(EffectDef):
                                         'aoeCloudSize', ship.getModifiedItemAttr('shipBonusCB'), skill='Caldari Battleship')
 
 
-class Effect5456(EffectDef):
+class Effect5456(BaseEffect):
     """
     shipCruiseMissileROFCB
 
@@ -20365,7 +20369,7 @@ class Effect5456(EffectDef):
                                       'speed', ship.getModifiedItemAttr('shipBonusCB'), skill='Caldari Battleship')
 
 
-class Effect5457(EffectDef):
+class Effect5457(BaseEffect):
     """
     shipTorpedoROFCB
 
@@ -20381,7 +20385,7 @@ class Effect5457(EffectDef):
                                       'speed', ship.getModifiedItemAttr('shipBonusCB'), skill='Caldari Battleship')
 
 
-class Effect5459(EffectDef):
+class Effect5459(BaseEffect):
     """
     hackingVirusStrengthBonus
 
@@ -20396,7 +20400,7 @@ class Effect5459(EffectDef):
         fit.modules.filteredItemIncrease(lambda mod: mod.item.requiresSkill('Hacking'), 'virusStrength', src.getModifiedItemAttr('virusStrengthBonus'))
 
 
-class Effect5460(EffectDef):
+class Effect5460(BaseEffect):
     """
     minigameVirusStrengthBonus
 
@@ -20422,7 +20426,7 @@ class Effect5460(EffectDef):
             'virusStrength', container.getModifiedItemAttr('virusStrengthBonus') * level)
 
 
-class Effect5461(EffectDef):
+class Effect5461(BaseEffect):
     """
     shieldOperationRechargeratebonusPostPercentOnline
 
@@ -20437,7 +20441,7 @@ class Effect5461(EffectDef):
         fit.ship.boostItemAttr('shieldRechargeRate', module.getModifiedItemAttr('rechargeratebonus') or 0)
 
 
-class Effect5468(EffectDef):
+class Effect5468(BaseEffect):
     """
     shipBonusAgilityCI2
 
@@ -20452,7 +20456,7 @@ class Effect5468(EffectDef):
         fit.ship.boostItemAttr('agility', ship.getModifiedItemAttr('shipBonusCI2'), skill='Caldari Industrial')
 
 
-class Effect5469(EffectDef):
+class Effect5469(BaseEffect):
     """
     shipBonusAgilityMI2
 
@@ -20467,7 +20471,7 @@ class Effect5469(EffectDef):
         fit.ship.boostItemAttr('agility', ship.getModifiedItemAttr('shipBonusMI2'), skill='Minmatar Industrial')
 
 
-class Effect5470(EffectDef):
+class Effect5470(BaseEffect):
     """
     shipBonusAgilityGI2
 
@@ -20482,7 +20486,7 @@ class Effect5470(EffectDef):
         fit.ship.boostItemAttr('agility', ship.getModifiedItemAttr('shipBonusGI2'), skill='Gallente Industrial')
 
 
-class Effect5471(EffectDef):
+class Effect5471(BaseEffect):
     """
     shipBonusAgilityAI2
 
@@ -20497,7 +20501,7 @@ class Effect5471(EffectDef):
         fit.ship.boostItemAttr('agility', ship.getModifiedItemAttr('shipBonusAI2'), skill='Amarr Industrial')
 
 
-class Effect5476(EffectDef):
+class Effect5476(BaseEffect):
     """
     shipBonusOreCapacityGI2
 
@@ -20513,7 +20517,7 @@ class Effect5476(EffectDef):
                                skill='Gallente Industrial')
 
 
-class Effect5477(EffectDef):
+class Effect5477(BaseEffect):
     """
     shipBonusAmmoBayMI2
 
@@ -20529,7 +20533,7 @@ class Effect5477(EffectDef):
                                skill='Minmatar Industrial')
 
 
-class Effect5478(EffectDef):
+class Effect5478(BaseEffect):
     """
     shipBonusPICommoditiesHoldGI2
 
@@ -20545,7 +20549,7 @@ class Effect5478(EffectDef):
                                skill='Gallente Industrial')
 
 
-class Effect5479(EffectDef):
+class Effect5479(BaseEffect):
     """
     shipBonusMineralBayGI2
 
@@ -20561,7 +20565,7 @@ class Effect5479(EffectDef):
                                skill='Gallente Industrial')
 
 
-class Effect5480(EffectDef):
+class Effect5480(BaseEffect):
     """
     setBonusChristmasBonusVelocity
 
@@ -20578,7 +20582,7 @@ class Effect5480(EffectDef):
                                                  'implantBonusVelocity', implant.getModifiedItemAttr('implantSetChristmas'))
 
 
-class Effect5482(EffectDef):
+class Effect5482(BaseEffect):
     """
     setBonusChristmasAgilityBonus
 
@@ -20595,7 +20599,7 @@ class Effect5482(EffectDef):
                                                  'agilityBonus', implant.getModifiedItemAttr('implantSetChristmas'))
 
 
-class Effect5483(EffectDef):
+class Effect5483(BaseEffect):
     """
     setBonusChristmasShieldCapacityBonus
 
@@ -20612,7 +20616,7 @@ class Effect5483(EffectDef):
                                                  'shieldCapacityBonus', implant.getModifiedItemAttr('implantSetChristmas'))
 
 
-class Effect5484(EffectDef):
+class Effect5484(BaseEffect):
     """
     setBonusChristmasArmorHPBonus2
 
@@ -20629,7 +20633,7 @@ class Effect5484(EffectDef):
                                                  'armorHpBonus2', implant.getModifiedItemAttr('implantSetChristmas'))
 
 
-class Effect5485(EffectDef):
+class Effect5485(BaseEffect):
     """
     shipSPTOptimalBonusMF
 
@@ -20645,7 +20649,7 @@ class Effect5485(EffectDef):
                                       'maxRange', ship.getModifiedItemAttr('shipBonusMF'), skill='Minmatar Frigate')
 
 
-class Effect5486(EffectDef):
+class Effect5486(BaseEffect):
     """
     shipBonusProjectileDamageMBC2
 
@@ -20662,7 +20666,7 @@ class Effect5486(EffectDef):
                                       skill='Minmatar Battlecruiser')
 
 
-class Effect5496(EffectDef):
+class Effect5496(BaseEffect):
     """
     eliteBonusCommandShipHAMRoFCS1
 
@@ -20679,7 +20683,7 @@ class Effect5496(EffectDef):
                                       'speed', ship.getModifiedItemAttr('eliteBonusCommandShips1'), skill='Command Ships')
 
 
-class Effect5497(EffectDef):
+class Effect5497(BaseEffect):
     """
     eliteBonusCommandShipHMRoFCS1
 
@@ -20696,7 +20700,7 @@ class Effect5497(EffectDef):
                                       'speed', ship.getModifiedItemAttr('eliteBonusCommandShips1'), skill='Command Ships')
 
 
-class Effect5498(EffectDef):
+class Effect5498(BaseEffect):
     """
     eliteBonusCommandShipsHeavyAssaultMissileExplosionVelocityCS2
 
@@ -20713,7 +20717,7 @@ class Effect5498(EffectDef):
                                         skill='Command Ships')
 
 
-class Effect5499(EffectDef):
+class Effect5499(BaseEffect):
     """
     eliteBonusCommandShipsHeavyAssaultMissileExplosionRadiusCS2
 
@@ -20730,7 +20734,7 @@ class Effect5499(EffectDef):
                                         skill='Command Ships')
 
 
-class Effect5500(EffectDef):
+class Effect5500(BaseEffect):
     """
     eliteBonusCommandShipsHeavyMissileExplosionRadiusCS2
 
@@ -20747,7 +20751,7 @@ class Effect5500(EffectDef):
                                         skill='Command Ships')
 
 
-class Effect5501(EffectDef):
+class Effect5501(BaseEffect):
     """
     eliteBonusCommandShipMediumHybridDamageCS2
 
@@ -20764,7 +20768,7 @@ class Effect5501(EffectDef):
                                       skill='Command Ships')
 
 
-class Effect5502(EffectDef):
+class Effect5502(BaseEffect):
     """
     eliteBonusCommandShipMediumHybridTrackingCS1
 
@@ -20781,7 +20785,7 @@ class Effect5502(EffectDef):
                                       skill='Command Ships')
 
 
-class Effect5503(EffectDef):
+class Effect5503(BaseEffect):
     """
     eliteBonusCommandShipHeavyDroneTrackingCS2
 
@@ -20798,7 +20802,7 @@ class Effect5503(EffectDef):
                                      skill='Command Ships')
 
 
-class Effect5504(EffectDef):
+class Effect5504(BaseEffect):
     """
     eliteBonusCommandShipHeavyDroneVelocityCS2
 
@@ -20815,7 +20819,7 @@ class Effect5504(EffectDef):
                                      skill='Command Ships')
 
 
-class Effect5505(EffectDef):
+class Effect5505(BaseEffect):
     """
     eliteBonusCommandShipMediumHybridRoFCS1
 
@@ -20831,7 +20835,7 @@ class Effect5505(EffectDef):
                                       'speed', ship.getModifiedItemAttr('eliteBonusCommandShips1'), skill='Command Ships')
 
 
-class Effect5514(EffectDef):
+class Effect5514(BaseEffect):
     """
     eliteBonusCommandShipHeavyAssaultMissileDamageCS2
 
@@ -20850,7 +20854,7 @@ class Effect5514(EffectDef):
                                             ship.getModifiedItemAttr('eliteBonusCommandShips2'), skill='Command Ships')
 
 
-class Effect5521(EffectDef):
+class Effect5521(BaseEffect):
     """
     eliteBonusCommandShipHeavyMissileDamageCS2
 
@@ -20869,7 +20873,7 @@ class Effect5521(EffectDef):
                                             ship.getModifiedItemAttr('eliteBonusCommandShips2'), skill='Command Ships')
 
 
-class Effect5539(EffectDef):
+class Effect5539(BaseEffect):
     """
     shipBonusHMLKineticDamageAC
 
@@ -20885,7 +20889,7 @@ class Effect5539(EffectDef):
                                         'kineticDamage', ship.getModifiedItemAttr('shipBonusAC'), skill='Amarr Cruiser')
 
 
-class Effect5540(EffectDef):
+class Effect5540(BaseEffect):
     """
     shipBonusHMLEMDamageAC
 
@@ -20901,7 +20905,7 @@ class Effect5540(EffectDef):
                                         'emDamage', ship.getModifiedItemAttr('shipBonusAC'), skill='Amarr Cruiser')
 
 
-class Effect5541(EffectDef):
+class Effect5541(BaseEffect):
     """
     shipBonusHMLThermDamageAC
 
@@ -20917,7 +20921,7 @@ class Effect5541(EffectDef):
                                         'thermalDamage', ship.getModifiedItemAttr('shipBonusAC'), skill='Amarr Cruiser')
 
 
-class Effect5542(EffectDef):
+class Effect5542(BaseEffect):
     """
     shipBonusHMLExploDamageAC
 
@@ -20933,7 +20937,7 @@ class Effect5542(EffectDef):
                                         'explosiveDamage', ship.getModifiedItemAttr('shipBonusAC'), skill='Amarr Cruiser')
 
 
-class Effect5552(EffectDef):
+class Effect5552(BaseEffect):
     """
     shipBonusHMLVelocityEliteBonusHeavyGunship1
 
@@ -20950,7 +20954,7 @@ class Effect5552(EffectDef):
                                         skill='Heavy Assault Cruisers')
 
 
-class Effect5553(EffectDef):
+class Effect5553(BaseEffect):
     """
     shipBonusHAMVelocityEliteBonusHeavyGunship1
 
@@ -20967,7 +20971,7 @@ class Effect5553(EffectDef):
                                         skill='Heavy Assault Cruisers')
 
 
-class Effect5554(EffectDef):
+class Effect5554(BaseEffect):
     """
     shipBonusArmorRepAmountGC2
 
@@ -20984,7 +20988,7 @@ class Effect5554(EffectDef):
                                       skill='Gallente Cruiser')
 
 
-class Effect5555(EffectDef):
+class Effect5555(BaseEffect):
     """
     shipBonusHeavyDroneSpeedGC
 
@@ -21000,7 +21004,7 @@ class Effect5555(EffectDef):
                                      'maxVelocity', ship.getModifiedItemAttr('shipBonusGC'), skill='Gallente Cruiser')
 
 
-class Effect5556(EffectDef):
+class Effect5556(BaseEffect):
     """
     shipBonusHeavyDRoneTrackingGC
 
@@ -21016,7 +21020,7 @@ class Effect5556(EffectDef):
                                      'trackingSpeed', ship.getModifiedItemAttr('shipBonusGC'), skill='Gallente Cruiser')
 
 
-class Effect5557(EffectDef):
+class Effect5557(BaseEffect):
     """
     shipBonusSentryDroneOptimalRangeEliteBonusHeavyGunship2
 
@@ -21033,7 +21037,7 @@ class Effect5557(EffectDef):
                                      skill='Heavy Assault Cruisers')
 
 
-class Effect5558(EffectDef):
+class Effect5558(BaseEffect):
     """
     shipBonusSentryDroneTrackingEliteBonusHeavyGunship2
 
@@ -21050,7 +21054,7 @@ class Effect5558(EffectDef):
                                      skill='Heavy Assault Cruisers')
 
 
-class Effect5559(EffectDef):
+class Effect5559(BaseEffect):
     """
     shipBonusShieldBoostAmountMC2
 
@@ -21066,7 +21070,7 @@ class Effect5559(EffectDef):
                                       'shieldBonus', ship.getModifiedItemAttr('shipBonusMC2'), skill='Minmatar Cruiser')
 
 
-class Effect5560(EffectDef):
+class Effect5560(BaseEffect):
     """
     roleBonusMarauderMJDRReactivationDelayBonus
 
@@ -21082,7 +21086,7 @@ class Effect5560(EffectDef):
                                       'moduleReactivationDelay', ship.getModifiedItemAttr('roleBonusMarauder'))
 
 
-class Effect5564(EffectDef):
+class Effect5564(BaseEffect):
     """
     subSystemBonusCaldariOffensiveCommandBursts
 
@@ -21128,7 +21132,7 @@ class Effect5564(EffectDef):
                                       'warfareBuff2Value', src.getModifiedItemAttr('subsystemBonusCaldariOffensive'), skill='Caldari Offensive Systems')
 
 
-class Effect5568(EffectDef):
+class Effect5568(BaseEffect):
     """
     subSystemBonusGallenteOffensiveCommandBursts
 
@@ -21174,7 +21178,7 @@ class Effect5568(EffectDef):
                                       'warfareBuff4Value', src.getModifiedItemAttr('subsystemBonusGallenteOffensive'), skill='Gallente Offensive Systems')
 
 
-class Effect5570(EffectDef):
+class Effect5570(BaseEffect):
     """
     subSystemBonusMinmatarOffensiveCommandBursts
 
@@ -21221,7 +21225,7 @@ class Effect5570(EffectDef):
                                       'warfareBuff2Value', src.getModifiedItemAttr('subsystemBonusMinmatarOffensive'), skill='Minmatar Offensive Systems')
 
 
-class Effect5572(EffectDef):
+class Effect5572(BaseEffect):
     """
     eliteBonusCommandShipArmoredCS3
 
@@ -21245,7 +21249,7 @@ class Effect5572(EffectDef):
                                       src.getModifiedItemAttr('eliteBonusCommandShips3'), skill='Command Ships')
 
 
-class Effect5573(EffectDef):
+class Effect5573(BaseEffect):
     """
     eliteBonusCommandShipSiegeCS3
 
@@ -21269,7 +21273,7 @@ class Effect5573(EffectDef):
                                       src.getModifiedItemAttr('eliteBonusCommandShips3'), skill='Command Ships')
 
 
-class Effect5574(EffectDef):
+class Effect5574(BaseEffect):
     """
     eliteBonusCommandShipSkirmishCS3
 
@@ -21293,7 +21297,7 @@ class Effect5574(EffectDef):
                                       src.getModifiedItemAttr('eliteBonusCommandShips3'), skill='Command Ships')
 
 
-class Effect5575(EffectDef):
+class Effect5575(BaseEffect):
     """
     eliteBonusCommandShipInformationCS3
 
@@ -21317,7 +21321,7 @@ class Effect5575(EffectDef):
                                       src.getModifiedItemAttr('eliteBonusCommandShips3'), skill='Command Ships')
 
 
-class Effect5607(EffectDef):
+class Effect5607(BaseEffect):
     """
     capacitorEmissionSystemskill
 
@@ -21336,7 +21340,7 @@ class Effect5607(EffectDef):
                                       'capacitorNeed', container.getModifiedItemAttr('capNeedBonus') * level)
 
 
-class Effect5610(EffectDef):
+class Effect5610(BaseEffect):
     """
     shipBonusLargeEnergyTurretMaxRangeAB
 
@@ -21353,7 +21357,7 @@ class Effect5610(EffectDef):
                                       'maxRange', ship.getModifiedItemAttr('shipBonusAB'), skill='Amarr Battleship')
 
 
-class Effect5611(EffectDef):
+class Effect5611(BaseEffect):
     """
     shipBonusHTFalloffGB2
 
@@ -21369,7 +21373,7 @@ class Effect5611(EffectDef):
                                       'falloff', ship.getModifiedItemAttr('shipBonusGB2'), skill='Gallente Battleship')
 
 
-class Effect5618(EffectDef):
+class Effect5618(BaseEffect):
     """
     shipBonusRHMLROF2CB
 
@@ -21386,7 +21390,7 @@ class Effect5618(EffectDef):
                                       'speed', ship.getModifiedItemAttr('shipBonus2CB'), skill='Caldari Battleship')
 
 
-class Effect5619(EffectDef):
+class Effect5619(BaseEffect):
     """
     shipBonusRHMLROFCB
 
@@ -21402,7 +21406,7 @@ class Effect5619(EffectDef):
                                       'speed', ship.getModifiedItemAttr('shipBonusCB'), skill='Caldari Battleship')
 
 
-class Effect5620(EffectDef):
+class Effect5620(BaseEffect):
     """
     shipBonusRHMLROFMB
 
@@ -21418,7 +21422,7 @@ class Effect5620(EffectDef):
                                       'speed', ship.getModifiedItemAttr('shipBonusMB'), skill='Minmatar Battleship')
 
 
-class Effect5621(EffectDef):
+class Effect5621(BaseEffect):
     """
     shipBonusCruiseROFMB
 
@@ -21434,7 +21438,7 @@ class Effect5621(EffectDef):
                                       'speed', ship.getModifiedItemAttr('shipBonusMB'), skill='Minmatar Battleship')
 
 
-class Effect5622(EffectDef):
+class Effect5622(BaseEffect):
     """
     shipBonusTorpedoROFMB
 
@@ -21450,7 +21454,7 @@ class Effect5622(EffectDef):
                                       'speed', ship.getModifiedItemAttr('shipBonusMB'), skill='Minmatar Battleship')
 
 
-class Effect5628(EffectDef):
+class Effect5628(BaseEffect):
     """
     shipBonusCruiseMissileEMDmgMB
 
@@ -21466,7 +21470,7 @@ class Effect5628(EffectDef):
                                         'emDamage', ship.getModifiedItemAttr('shipBonusMB'), skill='Minmatar Battleship')
 
 
-class Effect5629(EffectDef):
+class Effect5629(BaseEffect):
     """
     shipBonusCruiseMissileThermDmgMB
 
@@ -21483,7 +21487,7 @@ class Effect5629(EffectDef):
                                         skill='Minmatar Battleship')
 
 
-class Effect5630(EffectDef):
+class Effect5630(BaseEffect):
     """
     shipBonusCruiseMissileKineticDmgMB
 
@@ -21500,7 +21504,7 @@ class Effect5630(EffectDef):
                                         skill='Minmatar Battleship')
 
 
-class Effect5631(EffectDef):
+class Effect5631(BaseEffect):
     """
     shipBonusCruiseMissileExploDmgMB
 
@@ -21517,7 +21521,7 @@ class Effect5631(EffectDef):
                                         skill='Minmatar Battleship')
 
 
-class Effect5632(EffectDef):
+class Effect5632(BaseEffect):
     """
     shipBonusTorpedoMissileExploDmgMB
 
@@ -21534,7 +21538,7 @@ class Effect5632(EffectDef):
                                         skill='Minmatar Battleship')
 
 
-class Effect5633(EffectDef):
+class Effect5633(BaseEffect):
     """
     shipBonusTorpedoMissileEMDmgMB
 
@@ -21550,7 +21554,7 @@ class Effect5633(EffectDef):
                                         'emDamage', ship.getModifiedItemAttr('shipBonusMB'), skill='Minmatar Battleship')
 
 
-class Effect5634(EffectDef):
+class Effect5634(BaseEffect):
     """
     shipBonusTorpedoMissileThermDmgMB
 
@@ -21567,7 +21571,7 @@ class Effect5634(EffectDef):
                                         skill='Minmatar Battleship')
 
 
-class Effect5635(EffectDef):
+class Effect5635(BaseEffect):
     """
     shipBonusTorpedoMissileKineticDmgMB
 
@@ -21584,7 +21588,7 @@ class Effect5635(EffectDef):
                                         skill='Minmatar Battleship')
 
 
-class Effect5636(EffectDef):
+class Effect5636(BaseEffect):
     """
     shipBonusHeavyMissileEMDmgMB
 
@@ -21600,7 +21604,7 @@ class Effect5636(EffectDef):
                                         'emDamage', ship.getModifiedItemAttr('shipBonusMB'), skill='Minmatar Battleship')
 
 
-class Effect5637(EffectDef):
+class Effect5637(BaseEffect):
     """
     shipBonusHeavyMissileThermDmgMB
 
@@ -21617,7 +21621,7 @@ class Effect5637(EffectDef):
                                         skill='Minmatar Battleship')
 
 
-class Effect5638(EffectDef):
+class Effect5638(BaseEffect):
     """
     shipBonusHeavyMissileKineticDmgMB
 
@@ -21634,7 +21638,7 @@ class Effect5638(EffectDef):
                                         skill='Minmatar Battleship')
 
 
-class Effect5639(EffectDef):
+class Effect5639(BaseEffect):
     """
     shipBonusHeavyMissileExploDmgMB
 
@@ -21651,7 +21655,7 @@ class Effect5639(EffectDef):
                                         skill='Minmatar Battleship')
 
 
-class Effect5644(EffectDef):
+class Effect5644(BaseEffect):
     """
     shipBonusMissileVelocityCC2
 
@@ -21667,7 +21671,7 @@ class Effect5644(EffectDef):
                                         'maxVelocity', ship.getModifiedItemAttr('shipBonusCC2'), skill='Caldari Cruiser')
 
 
-class Effect5647(EffectDef):
+class Effect5647(BaseEffect):
     """
     covertOpsCloakCPUPercentRoleBonus
 
@@ -21690,7 +21694,7 @@ class Effect5647(EffectDef):
                                       'cpu', ship.getModifiedItemAttr('shipBonusRole7'))
 
 
-class Effect5650(EffectDef):
+class Effect5650(BaseEffect):
     """
     shipArmorResistanceAF1
 
@@ -21708,7 +21712,7 @@ class Effect5650(EffectDef):
                                    skill='Amarr Frigate')
 
 
-class Effect5657(EffectDef):
+class Effect5657(BaseEffect):
     """
     Interceptor2ShieldResist
 
@@ -21726,7 +21730,7 @@ class Effect5657(EffectDef):
                                    ship.getModifiedItemAttr('eliteBonusInterceptor2'), skill='Interceptors')
 
 
-class Effect5673(EffectDef):
+class Effect5673(BaseEffect):
     """
     interceptor2ProjectileDamage
 
@@ -21743,7 +21747,7 @@ class Effect5673(EffectDef):
                                       skill='Interceptors')
 
 
-class Effect5676(EffectDef):
+class Effect5676(BaseEffect):
     """
     shipBonusSmallMissileExplosionRadiusCD2
 
@@ -21760,7 +21764,7 @@ class Effect5676(EffectDef):
             'aoeCloudSize', ship.getModifiedItemAttr('shipBonusCD2'), skill='Caldari Destroyer')
 
 
-class Effect5688(EffectDef):
+class Effect5688(BaseEffect):
     """
     shipBonusMissileVelocityAD2
 
@@ -21776,7 +21780,7 @@ class Effect5688(EffectDef):
                                         'maxVelocity', ship.getModifiedItemAttr('shipBonusAD2'), skill='Amarr Destroyer')
 
 
-class Effect5695(EffectDef):
+class Effect5695(BaseEffect):
     """
     eliteBonusInterdictorsArmorResist1
 
@@ -21793,7 +21797,7 @@ class Effect5695(EffectDef):
                                    ship.getModifiedItemAttr('eliteBonusInterdictors1'), skill='Interdictors')
 
 
-class Effect5717(EffectDef):
+class Effect5717(BaseEffect):
     """
     implantSetWarpSpeed
 
@@ -21810,7 +21814,7 @@ class Effect5717(EffectDef):
                                                  'WarpSBonus', implant.getModifiedItemAttr('implantSetWarpSpeed'))
 
 
-class Effect5721(EffectDef):
+class Effect5721(BaseEffect):
     """
     shipBonusMETOptimalRangePirateFaction
 
@@ -21826,7 +21830,7 @@ class Effect5721(EffectDef):
                                       'maxRange', ship.getModifiedItemAttr('shipBonusRole7'))
 
 
-class Effect5722(EffectDef):
+class Effect5722(BaseEffect):
     """
     shipHybridOptimalGD1
 
@@ -21842,7 +21846,7 @@ class Effect5722(EffectDef):
                                       'maxRange', ship.getModifiedItemAttr('shipBonusGD1'), skill='Gallente Destroyer')
 
 
-class Effect5723(EffectDef):
+class Effect5723(BaseEffect):
     """
     eliteBonusInterdictorsMWDSigRadius2
 
@@ -21859,7 +21863,7 @@ class Effect5723(EffectDef):
                                       skill='Interdictors')
 
 
-class Effect5724(EffectDef):
+class Effect5724(BaseEffect):
     """
     shipSHTOptimalBonusGF
 
@@ -21875,7 +21879,7 @@ class Effect5724(EffectDef):
                                       'maxRange', ship.getModifiedItemAttr('shipBonusGF'), skill='Gallente Frigate')
 
 
-class Effect5725(EffectDef):
+class Effect5725(BaseEffect):
     """
     shipBonusRemoteRepairAmountPirateFaction
 
@@ -21891,7 +21895,7 @@ class Effect5725(EffectDef):
                                       'armorDamageAmount', ship.getModifiedItemAttr('shipBonusRole7'))
 
 
-class Effect5726(EffectDef):
+class Effect5726(BaseEffect):
     """
     shipBonusLETOptimalRangePirateFaction
 
@@ -21907,7 +21911,7 @@ class Effect5726(EffectDef):
                                       'maxRange', ship.getModifiedItemAttr('shipBonusRole7'))
 
 
-class Effect5733(EffectDef):
+class Effect5733(BaseEffect):
     """
     eliteBonusMaraudersHeavyMissileDamageExpRole1
 
@@ -21923,7 +21927,7 @@ class Effect5733(EffectDef):
                                         'explosiveDamage', ship.getModifiedItemAttr('eliteBonusViolatorsRole1'))
 
 
-class Effect5734(EffectDef):
+class Effect5734(BaseEffect):
     """
     eliteBonusMaraudersHeavyMissileDamageKinRole1
 
@@ -21939,7 +21943,7 @@ class Effect5734(EffectDef):
                                         'kineticDamage', ship.getModifiedItemAttr('eliteBonusViolatorsRole1'))
 
 
-class Effect5735(EffectDef):
+class Effect5735(BaseEffect):
     """
     eliteBonusMaraudersHeavyMissileDamageEMRole1
 
@@ -21955,7 +21959,7 @@ class Effect5735(EffectDef):
                                         'emDamage', ship.getModifiedItemAttr('eliteBonusViolatorsRole1'))
 
 
-class Effect5736(EffectDef):
+class Effect5736(BaseEffect):
     """
     eliteBonusMaraudersHeavyMissileDamageThermRole1
 
@@ -21971,7 +21975,7 @@ class Effect5736(EffectDef):
                                         'thermalDamage', ship.getModifiedItemAttr('eliteBonusViolatorsRole1'))
 
 
-class Effect5737(EffectDef):
+class Effect5737(BaseEffect):
     """
     shipScanProbeStrengthBonusPirateFaction
 
@@ -21987,7 +21991,7 @@ class Effect5737(EffectDef):
                                         'baseSensorStrength', ship.getModifiedItemAttr('shipBonusRole7'))
 
 
-class Effect5738(EffectDef):
+class Effect5738(BaseEffect):
     """
     shipBonusRemoteRepairRangePirateFaction2
 
@@ -22005,7 +22009,7 @@ class Effect5738(EffectDef):
                                       'falloffEffectiveness', ship.getModifiedItemAttr('shipBonusRole8'))
 
 
-class Effect5754(EffectDef):
+class Effect5754(BaseEffect):
     """
     overloadSelfTrackingModuleBonus
 
@@ -22023,7 +22027,7 @@ class Effect5754(EffectDef):
         module.boostItemAttr('trackingSpeedBonus', module.getModifiedItemAttr('overloadTrackingModuleStrengthBonus'))
 
 
-class Effect5757(EffectDef):
+class Effect5757(BaseEffect):
     """
     overloadSelfSensorModuleBonus
 
@@ -22049,7 +22053,7 @@ class Effect5757(EffectDef):
             )
 
 
-class Effect5758(EffectDef):
+class Effect5758(BaseEffect):
     """
     overloadSelfPainterBonus
 
@@ -22064,7 +22068,7 @@ class Effect5758(EffectDef):
         module.boostItemAttr('signatureRadiusBonus', module.getModifiedItemAttr('overloadPainterStrengthBonus') or 0)
 
 
-class Effect5769(EffectDef):
+class Effect5769(BaseEffect):
     """
     repairDroneHullBonusBonus
 
@@ -22082,7 +22086,7 @@ class Effect5769(EffectDef):
                                      'structureDamageAmount', container.getModifiedItemAttr('damageHP') * level)
 
 
-class Effect5778(EffectDef):
+class Effect5778(BaseEffect):
     """
     shipMissileRoFMF2
 
@@ -22099,7 +22103,7 @@ class Effect5778(EffectDef):
                                       'speed', ship.getModifiedItemAttr('shipBonusMF2'), skill='Minmatar Frigate')
 
 
-class Effect5779(EffectDef):
+class Effect5779(BaseEffect):
     """
     shipBonusSPTFalloffMF2
 
@@ -22116,7 +22120,7 @@ class Effect5779(EffectDef):
                                       'falloff', ship.getModifiedItemAttr('shipBonusMF2'), skill='Minmatar Frigate')
 
 
-class Effect5793(EffectDef):
+class Effect5793(BaseEffect):
     """
     ewSkillTrackingDisruptionRangeDisruptionBonus
 
@@ -22135,7 +22139,7 @@ class Effect5793(EffectDef):
                                           attr, container.getModifiedItemAttr('scanSkillEwStrengthBonus') * level)
 
 
-class Effect5802(EffectDef):
+class Effect5802(BaseEffect):
     """
     shipBonusAfterburnerSpeedFactor2CB
 
@@ -22151,7 +22155,7 @@ class Effect5802(EffectDef):
                                       'speedFactor', module.getModifiedItemAttr('shipBonus2CB'), skill='Caldari Battleship')
 
 
-class Effect5803(EffectDef):
+class Effect5803(BaseEffect):
     """
     shipBonusSentryDroneDamageMultiplierPirateFaction
 
@@ -22167,7 +22171,7 @@ class Effect5803(EffectDef):
                                      'damageMultiplier', ship.getModifiedItemAttr('shipBonusRole7'))
 
 
-class Effect5804(EffectDef):
+class Effect5804(BaseEffect):
     """
     shipBonusHeavyDroneDamageMultiplierPirateFaction
 
@@ -22183,7 +22187,7 @@ class Effect5804(EffectDef):
                                      'damageMultiplier', ship.getModifiedItemAttr('shipBonusRole7'))
 
 
-class Effect5805(EffectDef):
+class Effect5805(BaseEffect):
     """
     shipBonusSentryDroneHPPirateFaction
 
@@ -22199,7 +22203,7 @@ class Effect5805(EffectDef):
                                      'hp', ship.getModifiedItemAttr('shipBonusRole7'))
 
 
-class Effect5806(EffectDef):
+class Effect5806(BaseEffect):
     """
     shipBonusSentryDroneArmorHpPirateFaction
 
@@ -22215,7 +22219,7 @@ class Effect5806(EffectDef):
                                      'armorHP', ship.getModifiedItemAttr('shipBonusRole7'))
 
 
-class Effect5807(EffectDef):
+class Effect5807(BaseEffect):
     """
     shipBonusSentryDroneShieldHpPirateFaction
 
@@ -22231,7 +22235,7 @@ class Effect5807(EffectDef):
                                      'shieldCapacity', ship.getModifiedItemAttr('shipBonusRole7'))
 
 
-class Effect5808(EffectDef):
+class Effect5808(BaseEffect):
     """
     shipBonusHeavyDroneShieldHpPirateFaction
 
@@ -22247,7 +22251,7 @@ class Effect5808(EffectDef):
                                      'shieldCapacity', ship.getModifiedItemAttr('shipBonusRole7'))
 
 
-class Effect5809(EffectDef):
+class Effect5809(BaseEffect):
     """
     shipBonusHeavyDroneArmorHpPirateFaction
 
@@ -22263,7 +22267,7 @@ class Effect5809(EffectDef):
                                      'armorHP', ship.getModifiedItemAttr('shipBonusRole7'))
 
 
-class Effect5810(EffectDef):
+class Effect5810(BaseEffect):
     """
     shipBonusHeavyDroneHPPirateFaction
 
@@ -22279,7 +22283,7 @@ class Effect5810(EffectDef):
                                      'hp', ship.getModifiedItemAttr('shipBonusRole7'))
 
 
-class Effect5811(EffectDef):
+class Effect5811(BaseEffect):
     """
     shipBonusKineticMissileDamageGB2
 
@@ -22296,7 +22300,7 @@ class Effect5811(EffectDef):
                                         skill='Gallente Battleship')
 
 
-class Effect5812(EffectDef):
+class Effect5812(BaseEffect):
     """
     shipBonusThermalMissileDamageGB2
 
@@ -22313,7 +22317,7 @@ class Effect5812(EffectDef):
                                         skill='Gallente Battleship')
 
 
-class Effect5813(EffectDef):
+class Effect5813(BaseEffect):
     """
     shipBonusAfterburnerSpeedFactorCF2
 
@@ -22330,7 +22334,7 @@ class Effect5813(EffectDef):
                                       'speedFactor', module.getModifiedItemAttr('shipBonusCF2'), skill='Caldari Frigate')
 
 
-class Effect5814(EffectDef):
+class Effect5814(BaseEffect):
     """
     shipBonusKineticMissileDamageGF
 
@@ -22347,7 +22351,7 @@ class Effect5814(EffectDef):
                                         'kineticDamage', ship.getModifiedItemAttr('shipBonusGF'), skill='Gallente Frigate')
 
 
-class Effect5815(EffectDef):
+class Effect5815(BaseEffect):
     """
     shipBonusThermalMissileDamageGF
 
@@ -22364,7 +22368,7 @@ class Effect5815(EffectDef):
                                         'thermalDamage', ship.getModifiedItemAttr('shipBonusGF'), skill='Gallente Frigate')
 
 
-class Effect5816(EffectDef):
+class Effect5816(BaseEffect):
     """
     shipBonusLightDroneDamageMultiplierPirateFaction
 
@@ -22381,7 +22385,7 @@ class Effect5816(EffectDef):
                                      'damageMultiplier', ship.getModifiedItemAttr('shipBonusRole7'))
 
 
-class Effect5817(EffectDef):
+class Effect5817(BaseEffect):
     """
     shipBonusLightDroneHPPirateFaction
 
@@ -22398,7 +22402,7 @@ class Effect5817(EffectDef):
                                      'hp', ship.getModifiedItemAttr('shipBonusRole7'))
 
 
-class Effect5818(EffectDef):
+class Effect5818(BaseEffect):
     """
     shipBonusLightDroneArmorHPPirateFaction
 
@@ -22415,7 +22419,7 @@ class Effect5818(EffectDef):
                                      'armorHP', ship.getModifiedItemAttr('shipBonusRole7'))
 
 
-class Effect5819(EffectDef):
+class Effect5819(BaseEffect):
     """
     shipBonusLightDroneShieldHPPirateFaction
 
@@ -22432,7 +22436,7 @@ class Effect5819(EffectDef):
                                      'shieldCapacity', ship.getModifiedItemAttr('shipBonusRole7'))
 
 
-class Effect5820(EffectDef):
+class Effect5820(BaseEffect):
     """
     shipBonusAfterburnerSpeedFactorCC2
 
@@ -22449,7 +22453,7 @@ class Effect5820(EffectDef):
                                       'speedFactor', module.getModifiedItemAttr('shipBonusCC2'), skill='Caldari Cruiser')
 
 
-class Effect5821(EffectDef):
+class Effect5821(BaseEffect):
     """
     shipBonusMediumDroneDamageMultiplierPirateFaction
 
@@ -22466,7 +22470,7 @@ class Effect5821(EffectDef):
                                      'damageMultiplier', ship.getModifiedItemAttr('shipBonusRole7'))
 
 
-class Effect5822(EffectDef):
+class Effect5822(BaseEffect):
     """
     shipBonusMediumDroneHPPirateFaction
 
@@ -22483,7 +22487,7 @@ class Effect5822(EffectDef):
                                      'hp', ship.getModifiedItemAttr('shipBonusRole7'))
 
 
-class Effect5823(EffectDef):
+class Effect5823(BaseEffect):
     """
     shipBonusMediumDroneArmorHPPirateFaction
 
@@ -22500,7 +22504,7 @@ class Effect5823(EffectDef):
                                      'armorHP', ship.getModifiedItemAttr('shipBonusRole7'))
 
 
-class Effect5824(EffectDef):
+class Effect5824(BaseEffect):
     """
     shipBonusMediumDroneShieldHPPirateFaction
 
@@ -22517,7 +22521,7 @@ class Effect5824(EffectDef):
                                      'shieldCapacity', ship.getModifiedItemAttr('shipBonusRole7'))
 
 
-class Effect5825(EffectDef):
+class Effect5825(BaseEffect):
     """
     shipBonusKineticMissileDamageGC2
 
@@ -22534,7 +22538,7 @@ class Effect5825(EffectDef):
                                         'kineticDamage', ship.getModifiedItemAttr('shipBonusGC2'), skill='Gallente Cruiser')
 
 
-class Effect5826(EffectDef):
+class Effect5826(BaseEffect):
     """
     shipBonusThermalMissileDamageGC2
 
@@ -22551,7 +22555,7 @@ class Effect5826(EffectDef):
                                         'thermalDamage', ship.getModifiedItemAttr('shipBonusGC2'), skill='Gallente Cruiser')
 
 
-class Effect5827(EffectDef):
+class Effect5827(BaseEffect):
     """
     shipBonusTDOptimalBonusAF1
 
@@ -22567,7 +22571,7 @@ class Effect5827(EffectDef):
                                       'maxRange', ship.getModifiedItemAttr('shipBonusAF'), skill='Amarr Frigate')
 
 
-class Effect5829(EffectDef):
+class Effect5829(BaseEffect):
     """
     shipBonusMiningDurationORE3
 
@@ -22584,7 +22588,7 @@ class Effect5829(EffectDef):
                                       'duration', ship.getModifiedItemAttr('shipBonusORE3'), skill='Mining Barge')
 
 
-class Effect5832(EffectDef):
+class Effect5832(BaseEffect):
     """
     shipBonusMiningIceHarvestingRangeORE2
 
@@ -22601,7 +22605,7 @@ class Effect5832(EffectDef):
             'maxRange', ship.getModifiedItemAttr('shipBonusORE2'), skill='Mining Barge')
 
 
-class Effect5839(EffectDef):
+class Effect5839(BaseEffect):
     """
     eliteBargeShieldResistance1
 
@@ -22618,7 +22622,7 @@ class Effect5839(EffectDef):
                                    ship.getModifiedItemAttr('eliteBonusBarge1'), skill='Exhumers')
 
 
-class Effect5840(EffectDef):
+class Effect5840(BaseEffect):
     """
     eliteBargeBonusMiningDurationBarge2
 
@@ -22634,7 +22638,7 @@ class Effect5840(EffectDef):
                                       'duration', ship.getModifiedItemAttr('eliteBonusBarge2'), skill='Exhumers')
 
 
-class Effect5852(EffectDef):
+class Effect5852(BaseEffect):
     """
     eliteBonusExpeditionMining1
 
@@ -22651,7 +22655,7 @@ class Effect5852(EffectDef):
                                       skill='Expedition Frigates')
 
 
-class Effect5853(EffectDef):
+class Effect5853(BaseEffect):
     """
     eliteBonusExpeditionSigRadius2
 
@@ -22667,7 +22671,7 @@ class Effect5853(EffectDef):
                                skill='Expedition Frigates')
 
 
-class Effect5862(EffectDef):
+class Effect5862(BaseEffect):
     """
     shipMissileEMDamageCB
 
@@ -22683,7 +22687,7 @@ class Effect5862(EffectDef):
                                         'emDamage', ship.getModifiedItemAttr('shipBonusCB'), skill='Caldari Battleship')
 
 
-class Effect5863(EffectDef):
+class Effect5863(BaseEffect):
     """
     shipMissileKinDamageCB
 
@@ -22700,7 +22704,7 @@ class Effect5863(EffectDef):
                                         skill='Caldari Battleship')
 
 
-class Effect5864(EffectDef):
+class Effect5864(BaseEffect):
     """
     shipMissileThermDamageCB
 
@@ -22717,7 +22721,7 @@ class Effect5864(EffectDef):
                                         skill='Caldari Battleship')
 
 
-class Effect5865(EffectDef):
+class Effect5865(BaseEffect):
     """
     shipMissileExploDamageCB
 
@@ -22734,7 +22738,7 @@ class Effect5865(EffectDef):
                                         skill='Caldari Battleship')
 
 
-class Effect5866(EffectDef):
+class Effect5866(BaseEffect):
     """
     shipBonusWarpScrambleMaxRangeGB
 
@@ -22750,7 +22754,7 @@ class Effect5866(EffectDef):
                                       'maxRange', ship.getModifiedItemAttr('shipBonusGB'), skill='Gallente Battleship')
 
 
-class Effect5867(EffectDef):
+class Effect5867(BaseEffect):
     """
     shipBonusMissileExplosionDelayPirateFaction2
 
@@ -22768,7 +22772,7 @@ class Effect5867(EffectDef):
                                         'explosionDelay', ship.getModifiedItemAttr('shipBonusRole8'))
 
 
-class Effect5868(EffectDef):
+class Effect5868(BaseEffect):
     """
     drawbackCargoCapacity
 
@@ -22783,7 +22787,7 @@ class Effect5868(EffectDef):
         fit.ship.boostItemAttr('capacity', module.getModifiedItemAttr('drawback'))
 
 
-class Effect5869(EffectDef):
+class Effect5869(BaseEffect):
     """
     eliteIndustrialWarpSpeedBonus1
 
@@ -22799,7 +22803,7 @@ class Effect5869(EffectDef):
                                skill='Transport Ships')
 
 
-class Effect5870(EffectDef):
+class Effect5870(BaseEffect):
     """
     shipBonusShieldBoostCI2
 
@@ -22815,7 +22819,7 @@ class Effect5870(EffectDef):
                                       'shieldBonus', ship.getModifiedItemAttr('shipBonusCI2'), skill='Caldari Industrial')
 
 
-class Effect5871(EffectDef):
+class Effect5871(BaseEffect):
     """
     shipBonusShieldBoostMI2
 
@@ -22831,7 +22835,7 @@ class Effect5871(EffectDef):
                                       'shieldBonus', ship.getModifiedItemAttr('shipBonusMI2'), skill='Minmatar Industrial')
 
 
-class Effect5872(EffectDef):
+class Effect5872(BaseEffect):
     """
     shipBonusArmorRepairAI2
 
@@ -22848,7 +22852,7 @@ class Effect5872(EffectDef):
                                       skill='Amarr Industrial')
 
 
-class Effect5873(EffectDef):
+class Effect5873(BaseEffect):
     """
     shipBonusArmorRepairGI2
 
@@ -22865,7 +22869,7 @@ class Effect5873(EffectDef):
                                       skill='Gallente Industrial')
 
 
-class Effect5874(EffectDef):
+class Effect5874(BaseEffect):
     """
     eliteIndustrialFleetCapacity1
 
@@ -22881,7 +22885,7 @@ class Effect5874(EffectDef):
                                skill='Transport Ships')
 
 
-class Effect5881(EffectDef):
+class Effect5881(BaseEffect):
     """
     eliteIndustrialShieldResists2
 
@@ -22899,7 +22903,7 @@ class Effect5881(EffectDef):
                                    ship.getModifiedItemAttr('eliteBonusIndustrial2'), skill='Transport Ships')
 
 
-class Effect5888(EffectDef):
+class Effect5888(BaseEffect):
     """
     eliteIndustrialArmorResists2
 
@@ -22917,7 +22921,7 @@ class Effect5888(EffectDef):
                                    ship.getModifiedItemAttr('eliteBonusIndustrial2'), skill='Transport Ships')
 
 
-class Effect5889(EffectDef):
+class Effect5889(BaseEffect):
     """
     eliteIndustrialABHeatBonus
 
@@ -22933,7 +22937,7 @@ class Effect5889(EffectDef):
                                       'overloadSpeedFactorBonus', ship.getModifiedItemAttr('roleBonusOverheatDST'))
 
 
-class Effect5890(EffectDef):
+class Effect5890(BaseEffect):
     """
     eliteIndustrialMWDHeatBonus
 
@@ -22949,7 +22953,7 @@ class Effect5890(EffectDef):
                                       'overloadSpeedFactorBonus', ship.getModifiedItemAttr('roleBonusOverheatDST'))
 
 
-class Effect5891(EffectDef):
+class Effect5891(BaseEffect):
     """
     eliteIndustrialArmorHardenerHeatBonus
 
@@ -22965,7 +22969,7 @@ class Effect5891(EffectDef):
                                       'overloadHardeningBonus', ship.getModifiedItemAttr('roleBonusOverheatDST'))
 
 
-class Effect5892(EffectDef):
+class Effect5892(BaseEffect):
     """
     eliteIndustrialReactiveArmorHardenerHeatBonus
 
@@ -22981,7 +22985,7 @@ class Effect5892(EffectDef):
                                       'overloadSelfDurationBonus', ship.getModifiedItemAttr('roleBonusOverheatDST'))
 
 
-class Effect5893(EffectDef):
+class Effect5893(BaseEffect):
     """
     eliteIndustrialShieldHardenerHeatBonus
 
@@ -22997,7 +23001,7 @@ class Effect5893(EffectDef):
                                       'overloadHardeningBonus', ship.getModifiedItemAttr('roleBonusOverheatDST'))
 
 
-class Effect5896(EffectDef):
+class Effect5896(BaseEffect):
     """
     eliteIndustrialShieldBoosterHeatBonus
 
@@ -23015,7 +23019,7 @@ class Effect5896(EffectDef):
                                       'overloadSelfDurationBonus', ship.getModifiedItemAttr('roleBonusOverheatDST'))
 
 
-class Effect5899(EffectDef):
+class Effect5899(BaseEffect):
     """
     eliteIndustrialArmorRepairHeatBonus
 
@@ -23033,7 +23037,7 @@ class Effect5899(EffectDef):
                                       'overloadSelfDurationBonus', ship.getModifiedItemAttr('roleBonusOverheatDST'))
 
 
-class Effect5900(EffectDef):
+class Effect5900(BaseEffect):
     """
     warpSpeedAddition
 
@@ -23048,7 +23052,7 @@ class Effect5900(EffectDef):
         fit.ship.increaseItemAttr('warpSpeedMultiplier', module.getModifiedItemAttr('warpSpeedAdd'))
 
 
-class Effect5901(EffectDef):
+class Effect5901(BaseEffect):
     """
     roleBonusBulkheadCPU
 
@@ -23065,7 +23069,7 @@ class Effect5901(EffectDef):
                                       'cpu', ship.getModifiedItemAttr('cpuNeedBonus'))
 
 
-class Effect5911(EffectDef):
+class Effect5911(BaseEffect):
     """
     onlineJumpDriveConsumptionAmountBonusPercentage
 
@@ -23082,7 +23086,7 @@ class Effect5911(EffectDef):
                                module.getModifiedItemAttr('consumptionQuantityBonusPercentage'), stackingPenalties=True)
 
 
-class Effect5912(EffectDef):
+class Effect5912(BaseEffect):
     """
     systemRemoteCapTransmitterAmount
 
@@ -23100,7 +23104,7 @@ class Effect5912(EffectDef):
                                          stackingPenalties=True, penaltyGroup='postMul')
 
 
-class Effect5913(EffectDef):
+class Effect5913(BaseEffect):
     """
     systemArmorHP
 
@@ -23116,7 +23120,7 @@ class Effect5913(EffectDef):
         fit.ship.multiplyItemAttr('armorHP', beacon.getModifiedItemAttr('armorHPMultiplier'))
 
 
-class Effect5914(EffectDef):
+class Effect5914(BaseEffect):
     """
     systemEnergyNeutMultiplier
 
@@ -23135,7 +23139,7 @@ class Effect5914(EffectDef):
                                          stackingPenalties=True, penaltyGroup='postMul')
 
 
-class Effect5915(EffectDef):
+class Effect5915(BaseEffect):
     """
     systemEnergyVampireMultiplier
 
@@ -23154,7 +23158,7 @@ class Effect5915(EffectDef):
                                          stackingPenalties=True, penaltyGroup='postMul')
 
 
-class Effect5916(EffectDef):
+class Effect5916(BaseEffect):
     """
     systemDamageExplosiveBombs
 
@@ -23172,7 +23176,7 @@ class Effect5916(EffectDef):
                                            stackingPenalties=True, penaltyGroup='postMul')
 
 
-class Effect5917(EffectDef):
+class Effect5917(BaseEffect):
     """
     systemDamageKineticBombs
 
@@ -23190,7 +23194,7 @@ class Effect5917(EffectDef):
                                            stackingPenalties=True, penaltyGroup='postMul')
 
 
-class Effect5918(EffectDef):
+class Effect5918(BaseEffect):
     """
     systemDamageThermalBombs
 
@@ -23208,7 +23212,7 @@ class Effect5918(EffectDef):
                                            stackingPenalties=True, penaltyGroup='postMul')
 
 
-class Effect5919(EffectDef):
+class Effect5919(BaseEffect):
     """
     systemDamageEMBombs
 
@@ -23226,7 +23230,7 @@ class Effect5919(EffectDef):
                                            stackingPenalties=True, penaltyGroup='postMul')
 
 
-class Effect5920(EffectDef):
+class Effect5920(BaseEffect):
     """
     systemAoeCloudSize
 
@@ -23243,7 +23247,7 @@ class Effect5920(EffectDef):
                                            'aoeCloudSize', beacon.getModifiedItemAttr('aoeCloudSizeMultiplier'))
 
 
-class Effect5921(EffectDef):
+class Effect5921(BaseEffect):
     """
     systemTargetPainterMultiplier
 
@@ -23262,7 +23266,7 @@ class Effect5921(EffectDef):
                                          stackingPenalties=True, penaltyGroup='postMul')
 
 
-class Effect5922(EffectDef):
+class Effect5922(BaseEffect):
     """
     systemWebifierStrengthMultiplier
 
@@ -23280,7 +23284,7 @@ class Effect5922(EffectDef):
                                          stackingPenalties=True, penaltyGroup='postMul')
 
 
-class Effect5923(EffectDef):
+class Effect5923(BaseEffect):
     """
     systemNeutBombs
 
@@ -23299,7 +23303,7 @@ class Effect5923(EffectDef):
                                            stackingPenalties=True, penaltyGroup='postMul')
 
 
-class Effect5924(EffectDef):
+class Effect5924(BaseEffect):
     """
     systemGravimetricECMBomb
 
@@ -23318,7 +23322,7 @@ class Effect5924(EffectDef):
                                            stackingPenalties=True, penaltyGroup='postMul')
 
 
-class Effect5925(EffectDef):
+class Effect5925(BaseEffect):
     """
     systemLadarECMBomb
 
@@ -23337,7 +23341,7 @@ class Effect5925(EffectDef):
                                            stackingPenalties=True, penaltyGroup='postMul')
 
 
-class Effect5926(EffectDef):
+class Effect5926(BaseEffect):
     """
     systemMagnetrometricECMBomb
 
@@ -23356,7 +23360,7 @@ class Effect5926(EffectDef):
                                            stackingPenalties=True, penaltyGroup='postMul')
 
 
-class Effect5927(EffectDef):
+class Effect5927(BaseEffect):
     """
     systemRadarECMBomb
 
@@ -23375,7 +23379,7 @@ class Effect5927(EffectDef):
                                            stackingPenalties=True, penaltyGroup='postMul')
 
 
-class Effect5929(EffectDef):
+class Effect5929(BaseEffect):
     """
     systemDroneTracking
 
@@ -23393,7 +23397,7 @@ class Effect5929(EffectDef):
                                         stackingPenalties=True, penaltyGroup='postMul')
 
 
-class Effect5934(EffectDef):
+class Effect5934(BaseEffect):
     """
     warpScrambleBlockMWDWithNPCEffect
 
@@ -23422,7 +23426,7 @@ class Effect5934(EffectDef):
                 mod.state = FittingModuleState.ONLINE
 
 
-class Effect5938(EffectDef):
+class Effect5938(BaseEffect):
     """
     shipBonusSmallMissileExplosionRadiusCF2
 
@@ -23439,7 +23443,7 @@ class Effect5938(EffectDef):
             'aoeCloudSize', ship.getModifiedItemAttr('shipBonusCF2'), skill='Caldari Frigate')
 
 
-class Effect5939(EffectDef):
+class Effect5939(BaseEffect):
     """
     shipRocketRoFBonusAF2
 
@@ -23455,7 +23459,7 @@ class Effect5939(EffectDef):
                                       'speed', ship.getModifiedItemAttr('shipBonus2AF'), skill='Amarr Frigate')
 
 
-class Effect5940(EffectDef):
+class Effect5940(BaseEffect):
     """
     eliteBonusInterdictorsSHTRoF1
 
@@ -23471,7 +23475,7 @@ class Effect5940(EffectDef):
                                       'speed', ship.getModifiedItemAttr('eliteBonusInterdictors1'), skill='Interdictors')
 
 
-class Effect5944(EffectDef):
+class Effect5944(BaseEffect):
     """
     shipMissileLauncherRoFAD1Fixed
 
@@ -23487,7 +23491,7 @@ class Effect5944(EffectDef):
                                       'speed', ship.getModifiedItemAttr('shipBonusAD1'), skill='Amarr Destroyer')
 
 
-class Effect5945(EffectDef):
+class Effect5945(BaseEffect):
     """
     cloakingPrototype
 
@@ -23508,7 +23512,7 @@ class Effect5945(EffectDef):
         fit.ship.multiplyItemAttr('maxVelocity', module.getModifiedItemAttr('maxVelocityModifier'))
 
 
-class Effect5951(EffectDef):
+class Effect5951(BaseEffect):
     """
     drawbackWarpSpeed
 
@@ -23523,7 +23527,7 @@ class Effect5951(EffectDef):
         fit.ship.boostItemAttr('warpSpeedMultiplier', module.getModifiedItemAttr('drawback'), stackingPenalties=True)
 
 
-class Effect5956(EffectDef):
+class Effect5956(BaseEffect):
     """
     shipMETDamageBonusAC2
 
@@ -23539,7 +23543,7 @@ class Effect5956(EffectDef):
                                       'damageMultiplier', ship.getModifiedItemAttr('shipBonusAC2'), skill='Amarr Cruiser')
 
 
-class Effect5957(EffectDef):
+class Effect5957(BaseEffect):
     """
     eliteBonusHeavyInterdictorsMETOptimal
 
@@ -23556,7 +23560,7 @@ class Effect5957(EffectDef):
                                       skill='Heavy Interdiction Cruisers')
 
 
-class Effect5958(EffectDef):
+class Effect5958(BaseEffect):
     """
     shipHybridTrackingGC
 
@@ -23573,7 +23577,7 @@ class Effect5958(EffectDef):
                                       'trackingSpeed', ship.getModifiedItemAttr('shipBonusGC'), skill='Gallente Cruiser')
 
 
-class Effect5959(EffectDef):
+class Effect5959(BaseEffect):
     """
     eliteBonusHeavyInterdictorsHybridOptimal1
 
@@ -23590,7 +23594,7 @@ class Effect5959(EffectDef):
                                       skill='Heavy Interdiction Cruisers')
 
 
-class Effect5994(EffectDef):
+class Effect5994(BaseEffect):
     """
     resistanceKillerHullAll
 
@@ -23607,7 +23611,7 @@ class Effect5994(EffectDef):
             fit.ship.forceItemAttr(tgtAttr, module.getModifiedItemAttr('resistanceKillerHull'))
 
 
-class Effect5995(EffectDef):
+class Effect5995(BaseEffect):
     """
     resistanceKillerShieldArmorAll
 
@@ -23625,7 +23629,7 @@ class Effect5995(EffectDef):
                 fit.ship.forceItemAttr(tgtAttr, module.getModifiedItemAttr('resistanceKiller'))
 
 
-class Effect5998(EffectDef):
+class Effect5998(BaseEffect):
     """
     freighterSMACapacityBonusO1
 
@@ -23642,7 +23646,7 @@ class Effect5998(EffectDef):
                                stackingPenalties=True)
 
 
-class Effect6001(EffectDef):
+class Effect6001(BaseEffect):
     """
     freighterAgilityBonus2O2
 
@@ -23658,7 +23662,7 @@ class Effect6001(EffectDef):
                                skill='ORE Freighter')
 
 
-class Effect6006(EffectDef):
+class Effect6006(BaseEffect):
     """
     shipSETDamageAmarrTacticalDestroyer1
 
@@ -23675,7 +23679,7 @@ class Effect6006(EffectDef):
                                       skill='Amarr Tactical Destroyer')
 
 
-class Effect6007(EffectDef):
+class Effect6007(BaseEffect):
     """
     shipSETCapNeedAmarrTacticalDestroyer2
 
@@ -23692,7 +23696,7 @@ class Effect6007(EffectDef):
                                       skill='Amarr Tactical Destroyer')
 
 
-class Effect6008(EffectDef):
+class Effect6008(BaseEffect):
     """
     shipHeatDamageAmarrTacticalDestroyer3
 
@@ -23709,7 +23713,7 @@ class Effect6008(EffectDef):
                                       skill='Amarr Tactical Destroyer')
 
 
-class Effect6009(EffectDef):
+class Effect6009(BaseEffect):
     """
     probeLauncherCPUPercentRoleBonusT3
 
@@ -23725,7 +23729,7 @@ class Effect6009(EffectDef):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Astrometrics'), 'cpu', src.getModifiedItemAttr('roleBonusT3ProbeCPU'))
 
 
-class Effect6010(EffectDef):
+class Effect6010(BaseEffect):
     """
     shipModeMaxTargetRangePostDiv
 
@@ -23745,7 +23749,7 @@ class Effect6010(EffectDef):
         )
 
 
-class Effect6011(EffectDef):
+class Effect6011(BaseEffect):
     """
     shipModeSETOptimalRangePostDiv
 
@@ -23766,7 +23770,7 @@ class Effect6011(EffectDef):
         )
 
 
-class Effect6012(EffectDef):
+class Effect6012(BaseEffect):
     """
     shipModeScanStrengthPostDiv
 
@@ -23787,7 +23791,7 @@ class Effect6012(EffectDef):
             )
 
 
-class Effect6014(EffectDef):
+class Effect6014(BaseEffect):
     """
     modeSigRadiusPostDiv
 
@@ -23804,7 +23808,7 @@ class Effect6014(EffectDef):
                                   stackingPenalties=True, penaltyGroup='postDiv')
 
 
-class Effect6015(EffectDef):
+class Effect6015(BaseEffect):
     """
     modeArmorResonancePostDiv
 
@@ -23830,7 +23834,7 @@ class Effect6015(EffectDef):
             )
 
 
-class Effect6016(EffectDef):
+class Effect6016(BaseEffect):
     """
     modeAgilityPostDiv
 
@@ -23850,7 +23854,7 @@ class Effect6016(EffectDef):
         )
 
 
-class Effect6017(EffectDef):
+class Effect6017(BaseEffect):
     """
     modeVelocityPostDiv
 
@@ -23870,7 +23874,7 @@ class Effect6017(EffectDef):
         )
 
 
-class Effect6020(EffectDef):
+class Effect6020(BaseEffect):
     """
     shipBonusEnergyNeutOptimalRS3
 
@@ -23886,7 +23890,7 @@ class Effect6020(EffectDef):
                                       src.getModifiedItemAttr('eliteBonusReconShip3'), skill='Recon Ships')
 
 
-class Effect6021(EffectDef):
+class Effect6021(BaseEffect):
     """
     shipBonusEnergyNosOptimalRS3
 
@@ -23902,7 +23906,7 @@ class Effect6021(EffectDef):
                                       src.getModifiedItemAttr('eliteBonusReconShip3'), skill='Recon Ships')
 
 
-class Effect6025(EffectDef):
+class Effect6025(BaseEffect):
     """
     eliteReconBonusMHTOptimalRange1
 
@@ -23918,7 +23922,7 @@ class Effect6025(EffectDef):
                                       'maxRange', ship.getModifiedItemAttr('eliteBonusReconShip1'), skill='Recon Ships')
 
 
-class Effect6027(EffectDef):
+class Effect6027(BaseEffect):
     """
     eliteReconBonusMPTdamage1
 
@@ -23935,7 +23939,7 @@ class Effect6027(EffectDef):
                                       skill='Recon Ships')
 
 
-class Effect6032(EffectDef):
+class Effect6032(BaseEffect):
     """
     remoteCapacitorTransmitterPowerNeedBonusEffect
 
@@ -23951,7 +23955,7 @@ class Effect6032(EffectDef):
                                       'power', ship.getModifiedItemAttr('powerTransferPowerNeedBonus'))
 
 
-class Effect6036(EffectDef):
+class Effect6036(BaseEffect):
     """
     shipHeatDamageMinmatarTacticalDestroyer3
 
@@ -23968,7 +23972,7 @@ class Effect6036(EffectDef):
                                       skill='Minmatar Tactical Destroyer')
 
 
-class Effect6037(EffectDef):
+class Effect6037(BaseEffect):
     """
     shipSPTDamageMinmatarTacticalDestroyer1
 
@@ -23985,7 +23989,7 @@ class Effect6037(EffectDef):
                                       skill='Minmatar Tactical Destroyer')
 
 
-class Effect6038(EffectDef):
+class Effect6038(BaseEffect):
     """
     shipSPTOptimalMinmatarTacticalDestroyer2
 
@@ -24002,7 +24006,7 @@ class Effect6038(EffectDef):
                                       skill='Minmatar Tactical Destroyer')
 
 
-class Effect6039(EffectDef):
+class Effect6039(BaseEffect):
     """
     shipModeSPTTrackingPostDiv
 
@@ -24023,7 +24027,7 @@ class Effect6039(EffectDef):
         )
 
 
-class Effect6040(EffectDef):
+class Effect6040(BaseEffect):
     """
     modeMWDSigRadiusPostDiv
 
@@ -24044,7 +24048,7 @@ class Effect6040(EffectDef):
         )
 
 
-class Effect6041(EffectDef):
+class Effect6041(BaseEffect):
     """
     modeShieldResonancePostDiv
 
@@ -24071,7 +24075,7 @@ class Effect6041(EffectDef):
             )
 
 
-class Effect6045(EffectDef):
+class Effect6045(BaseEffect):
     """
     shipBonusSentryDamageMultiplierGC3
 
@@ -24087,7 +24091,7 @@ class Effect6045(EffectDef):
                                      'damageMultiplier', ship.getModifiedItemAttr('shipBonusGC3'), skill='Gallente Cruiser')
 
 
-class Effect6046(EffectDef):
+class Effect6046(BaseEffect):
     """
     shipBonusSentryHPGC3
 
@@ -24103,7 +24107,7 @@ class Effect6046(EffectDef):
                                      'hp', ship.getModifiedItemAttr('shipBonusGC3'), skill='Gallente Cruiser')
 
 
-class Effect6047(EffectDef):
+class Effect6047(BaseEffect):
     """
     shipBonusSentryArmorHPGC3
 
@@ -24119,7 +24123,7 @@ class Effect6047(EffectDef):
                                      'armorHP', ship.getModifiedItemAttr('shipBonusGC3'), skill='Gallente Cruiser')
 
 
-class Effect6048(EffectDef):
+class Effect6048(BaseEffect):
     """
     shipBonusSentryShieldHPGC3
 
@@ -24135,7 +24139,7 @@ class Effect6048(EffectDef):
                                      'shieldCapacity', ship.getModifiedItemAttr('shipBonusGC3'), skill='Gallente Cruiser')
 
 
-class Effect6051(EffectDef):
+class Effect6051(BaseEffect):
     """
     shipBonusLightDroneDamageMultiplierGC2
 
@@ -24151,7 +24155,7 @@ class Effect6051(EffectDef):
                                      'damageMultiplier', ship.getModifiedItemAttr('shipBonusGC2'), skill='Gallente Cruiser')
 
 
-class Effect6052(EffectDef):
+class Effect6052(BaseEffect):
     """
     shipBonusMediumDroneDamageMultiplierGC2
 
@@ -24167,7 +24171,7 @@ class Effect6052(EffectDef):
                                      'damageMultiplier', ship.getModifiedItemAttr('shipBonusGC2'), skill='Gallente Cruiser')
 
 
-class Effect6053(EffectDef):
+class Effect6053(BaseEffect):
     """
     shipBonusHeavyDroneDamageMultiplierGC2
 
@@ -24183,7 +24187,7 @@ class Effect6053(EffectDef):
                                      'damageMultiplier', ship.getModifiedItemAttr('shipBonusGC2'), skill='Gallente Cruiser')
 
 
-class Effect6054(EffectDef):
+class Effect6054(BaseEffect):
     """
     shipBonusHeavyDroneHPGC2
 
@@ -24199,7 +24203,7 @@ class Effect6054(EffectDef):
                                      'hp', ship.getModifiedItemAttr('shipBonusGC2'), skill='Gallente Cruiser')
 
 
-class Effect6055(EffectDef):
+class Effect6055(BaseEffect):
     """
     shipBonusHeavyDroneArmorHPGC2
 
@@ -24215,7 +24219,7 @@ class Effect6055(EffectDef):
                                      'armorHP', ship.getModifiedItemAttr('shipBonusGC2'), skill='Gallente Cruiser')
 
 
-class Effect6056(EffectDef):
+class Effect6056(BaseEffect):
     """
     shipBonusHeavyDroneShieldHPGC2
 
@@ -24231,7 +24235,7 @@ class Effect6056(EffectDef):
                                      'shieldCapacity', ship.getModifiedItemAttr('shipBonusGC2'), skill='Gallente Cruiser')
 
 
-class Effect6057(EffectDef):
+class Effect6057(BaseEffect):
     """
     shipBonusMediumDroneShieldHPGC2
 
@@ -24247,7 +24251,7 @@ class Effect6057(EffectDef):
                                      'shieldCapacity', ship.getModifiedItemAttr('shipBonusGC2'), skill='Gallente Cruiser')
 
 
-class Effect6058(EffectDef):
+class Effect6058(BaseEffect):
     """
     shipBonusMediumDroneArmorHPGC2
 
@@ -24263,7 +24267,7 @@ class Effect6058(EffectDef):
                                      'armorHP', ship.getModifiedItemAttr('shipBonusGC2'), skill='Gallente Cruiser')
 
 
-class Effect6059(EffectDef):
+class Effect6059(BaseEffect):
     """
     shipBonusMediumDroneHPGC2
 
@@ -24279,7 +24283,7 @@ class Effect6059(EffectDef):
                                      'hp', ship.getModifiedItemAttr('shipBonusGC2'), skill='Gallente Cruiser')
 
 
-class Effect6060(EffectDef):
+class Effect6060(BaseEffect):
     """
     shipBonusLightDroneHPGC2
 
@@ -24295,7 +24299,7 @@ class Effect6060(EffectDef):
                                      'hp', ship.getModifiedItemAttr('shipBonusGC2'), skill='Gallente Cruiser')
 
 
-class Effect6061(EffectDef):
+class Effect6061(BaseEffect):
     """
     shipBonusLightDroneArmorHPGC2
 
@@ -24311,7 +24315,7 @@ class Effect6061(EffectDef):
                                      'armorHP', ship.getModifiedItemAttr('shipBonusGC2'), skill='Gallente Cruiser')
 
 
-class Effect6062(EffectDef):
+class Effect6062(BaseEffect):
     """
     shipBonusLightDroneShieldHPGC2
 
@@ -24327,7 +24331,7 @@ class Effect6062(EffectDef):
                                      'shieldCapacity', ship.getModifiedItemAttr('shipBonusGC2'), skill='Gallente Cruiser')
 
 
-class Effect6063(EffectDef):
+class Effect6063(BaseEffect):
     """
     entosisLink
 
@@ -24348,7 +24352,7 @@ class Effect6063(EffectDef):
             )
 
 
-class Effect6076(EffectDef):
+class Effect6076(BaseEffect):
     """
     shipModeMissileVelocityPostDiv
 
@@ -24369,7 +24373,7 @@ class Effect6076(EffectDef):
         )
 
 
-class Effect6077(EffectDef):
+class Effect6077(BaseEffect):
     """
     shipHeatDamageCaldariTacticalDestroyer3
 
@@ -24386,7 +24390,7 @@ class Effect6077(EffectDef):
                                       skill='Caldari Tactical Destroyer')
 
 
-class Effect6083(EffectDef):
+class Effect6083(BaseEffect):
     """
     shipSmallMissileDmgPirateFaction
 
@@ -24405,7 +24409,7 @@ class Effect6083(EffectDef):
                 '{0}Damage'.format(damageType), ship.getModifiedItemAttr('shipBonusRole7'))
 
 
-class Effect6085(EffectDef):
+class Effect6085(BaseEffect):
     """
     shipMissileRoFCaldariTacticalDestroyer1
 
@@ -24422,7 +24426,7 @@ class Effect6085(EffectDef):
                                       skill='Caldari Tactical Destroyer')
 
 
-class Effect6088(EffectDef):
+class Effect6088(BaseEffect):
     """
     shipBonusHeavyAssaultMissileAllDamageMC2
 
@@ -24441,7 +24445,7 @@ class Effect6088(EffectDef):
                                             skill='Minmatar Cruiser')
 
 
-class Effect6093(EffectDef):
+class Effect6093(BaseEffect):
     """
     shipBonusHeavyMissileAllDamageMC2
 
@@ -24460,7 +24464,7 @@ class Effect6093(EffectDef):
                                             skill='Minmatar Cruiser')
 
 
-class Effect6096(EffectDef):
+class Effect6096(BaseEffect):
     """
     shipBonusLightMissileAllDamageMC2
 
@@ -24479,7 +24483,7 @@ class Effect6096(EffectDef):
                                             skill='Minmatar Cruiser')
 
 
-class Effect6098(EffectDef):
+class Effect6098(BaseEffect):
     """
     shipMissileReloadTimeCaldariTacticalDestroyer2
 
@@ -24496,7 +24500,7 @@ class Effect6098(EffectDef):
                                       skill='Caldari Tactical Destroyer')
 
 
-class Effect6104(EffectDef):
+class Effect6104(BaseEffect):
     """
     entosisDurationMultiply
 
@@ -24512,7 +24516,7 @@ class Effect6104(EffectDef):
                                          'duration', ship.getModifiedItemAttr('entosisDurationMultiplier') or 1)
 
 
-class Effect6110(EffectDef):
+class Effect6110(BaseEffect):
     """
     missileVelocityBonusOnline
 
@@ -24529,7 +24533,7 @@ class Effect6110(EffectDef):
                                         stackingPenalties=True)
 
 
-class Effect6111(EffectDef):
+class Effect6111(BaseEffect):
     """
     missileExplosionDelayBonusOnline
 
@@ -24546,7 +24550,7 @@ class Effect6111(EffectDef):
                                         stackingPenalties=True)
 
 
-class Effect6112(EffectDef):
+class Effect6112(BaseEffect):
     """
     missileAOECloudSizeBonusOnline
 
@@ -24563,7 +24567,7 @@ class Effect6112(EffectDef):
                                         stackingPenalties=True)
 
 
-class Effect6113(EffectDef):
+class Effect6113(BaseEffect):
     """
     missileAOEVelocityBonusOnline
 
@@ -24581,7 +24585,7 @@ class Effect6113(EffectDef):
                                         stackingPenalties=True)
 
 
-class Effect6128(EffectDef):
+class Effect6128(BaseEffect):
     """
     scriptMissileGuidanceComputerAOECloudSizeBonusBonus
 
@@ -24597,7 +24601,7 @@ class Effect6128(EffectDef):
         module.boostItemAttr('aoeCloudSizeBonus', module.getModifiedChargeAttr('aoeCloudSizeBonusBonus'))
 
 
-class Effect6129(EffectDef):
+class Effect6129(BaseEffect):
     """
     scriptMissileGuidanceComputerAOEVelocityBonusBonus
 
@@ -24613,7 +24617,7 @@ class Effect6129(EffectDef):
         module.boostItemAttr('aoeVelocityBonus', module.getModifiedChargeAttr('aoeVelocityBonusBonus'))
 
 
-class Effect6130(EffectDef):
+class Effect6130(BaseEffect):
     """
     scriptMissileGuidanceComputerMissileVelocityBonusBonus
 
@@ -24628,7 +24632,7 @@ class Effect6130(EffectDef):
         module.boostItemAttr('missileVelocityBonus', module.getModifiedChargeAttr('missileVelocityBonusBonus'))
 
 
-class Effect6131(EffectDef):
+class Effect6131(BaseEffect):
     """
     scriptMissileGuidanceComputerExplosionDelayBonusBonus
 
@@ -24643,7 +24647,7 @@ class Effect6131(EffectDef):
         module.boostItemAttr('explosionDelayBonus', module.getModifiedChargeAttr('explosionDelayBonusBonus'))
 
 
-class Effect6135(EffectDef):
+class Effect6135(BaseEffect):
     """
     missileGuidanceComputerBonus4
 
@@ -24666,7 +24670,7 @@ class Effect6135(EffectDef):
                                             stackingPenalties=True)
 
 
-class Effect6144(EffectDef):
+class Effect6144(BaseEffect):
     """
     overloadSelfMissileGuidanceBonus5
 
@@ -24688,7 +24692,7 @@ class Effect6144(EffectDef):
             module.boostItemAttr(tgtAttr, module.getModifiedItemAttr('overloadTrackingModuleStrengthBonus'))
 
 
-class Effect6148(EffectDef):
+class Effect6148(BaseEffect):
     """
     shipHeatDamageGallenteTacticalDestroyer3
 
@@ -24705,7 +24709,7 @@ class Effect6148(EffectDef):
                                       skill='Gallente Tactical Destroyer')
 
 
-class Effect6149(EffectDef):
+class Effect6149(BaseEffect):
     """
     shipSHTRoFGallenteTacticalDestroyer1
 
@@ -24722,7 +24726,7 @@ class Effect6149(EffectDef):
                                       skill='Gallente Tactical Destroyer')
 
 
-class Effect6150(EffectDef):
+class Effect6150(BaseEffect):
     """
     shipSHTTrackingGallenteTacticalDestroyer2
 
@@ -24739,7 +24743,7 @@ class Effect6150(EffectDef):
                                       skill='Gallente Tactical Destroyer')
 
 
-class Effect6151(EffectDef):
+class Effect6151(BaseEffect):
     """
     modeHullResonancePostDiv
 
@@ -24763,7 +24767,7 @@ class Effect6151(EffectDef):
             )
 
 
-class Effect6152(EffectDef):
+class Effect6152(BaseEffect):
     """
     shipModeSHTOptimalRangePostDiv
 
@@ -24784,7 +24788,7 @@ class Effect6152(EffectDef):
         )
 
 
-class Effect6153(EffectDef):
+class Effect6153(BaseEffect):
     """
     modeMWDCapPostDiv
 
@@ -24803,7 +24807,7 @@ class Effect6153(EffectDef):
         )
 
 
-class Effect6154(EffectDef):
+class Effect6154(BaseEffect):
     """
     modeMWDBoostPostDiv
 
@@ -24824,7 +24828,7 @@ class Effect6154(EffectDef):
         )
 
 
-class Effect6155(EffectDef):
+class Effect6155(BaseEffect):
     """
     modeArmorRepDurationPostDiv
 
@@ -24843,7 +24847,7 @@ class Effect6155(EffectDef):
         )
 
 
-class Effect6163(EffectDef):
+class Effect6163(BaseEffect):
     """
     passiveSpeedLimit
 
@@ -24859,7 +24863,7 @@ class Effect6163(EffectDef):
         fit.extraAttributes['speedLimit'] = src.getModifiedItemAttr('speedLimit')
 
 
-class Effect6164(EffectDef):
+class Effect6164(BaseEffect):
     """
     systemMaxVelocityPercentage
 
@@ -24875,7 +24879,7 @@ class Effect6164(EffectDef):
         fit.ship.boostItemAttr('maxVelocity', beacon.getModifiedItemAttr('maxVelocityMultiplier'), stackingPenalties=True)
 
 
-class Effect6166(EffectDef):
+class Effect6166(BaseEffect):
     """
     shipBonusWDFGnullPenalties
 
@@ -24896,7 +24900,7 @@ class Effect6166(EffectDef):
                                       'massBonusPercentage', ship.getModifiedItemAttr('shipBonusAT'))
 
 
-class Effect6170(EffectDef):
+class Effect6170(BaseEffect):
     """
     entosisCPUPenalty
 
@@ -24912,7 +24916,7 @@ class Effect6170(EffectDef):
                                          'entosisCPUAdd', ship.getModifiedItemAttr('entosisCPUPenalty'))
 
 
-class Effect6171(EffectDef):
+class Effect6171(BaseEffect):
     """
     entosisCPUAddition
 
@@ -24927,7 +24931,7 @@ class Effect6171(EffectDef):
         module.increaseItemAttr('cpu', module.getModifiedItemAttr('entosisCPUAdd'))
 
 
-class Effect6172(EffectDef):
+class Effect6172(BaseEffect):
     """
     battlecruiserMETRange
 
@@ -24945,7 +24949,7 @@ class Effect6172(EffectDef):
                                       'falloff', ship.getModifiedItemAttr('roleBonusCBC'))
 
 
-class Effect6173(EffectDef):
+class Effect6173(BaseEffect):
     """
     battlecruiserMHTRange
 
@@ -24964,7 +24968,7 @@ class Effect6173(EffectDef):
                                       'falloff', ship.getModifiedItemAttr('roleBonusCBC'))
 
 
-class Effect6174(EffectDef):
+class Effect6174(BaseEffect):
     """
     battlecruiserMPTRange
 
@@ -24982,7 +24986,7 @@ class Effect6174(EffectDef):
                                       'falloff', ship.getModifiedItemAttr('roleBonusCBC'))
 
 
-class Effect6175(EffectDef):
+class Effect6175(BaseEffect):
     """
     battlecruiserMissileRange
 
@@ -24999,7 +25003,7 @@ class Effect6175(EffectDef):
                                         'maxVelocity', skill.getModifiedItemAttr('roleBonusCBC'))
 
 
-class Effect6176(EffectDef):
+class Effect6176(BaseEffect):
     """
     battlecruiserDroneSpeed
 
@@ -25016,7 +25020,7 @@ class Effect6176(EffectDef):
                                      'maxVelocity', ship.getModifiedItemAttr('roleBonusCBC'))
 
 
-class Effect6177(EffectDef):
+class Effect6177(BaseEffect):
     """
     shipHybridDmg1CBC2
 
@@ -25033,7 +25037,7 @@ class Effect6177(EffectDef):
                                       skill='Caldari Battlecruiser')
 
 
-class Effect6178(EffectDef):
+class Effect6178(BaseEffect):
     """
     shipBonusProjectileTrackingMBC2
 
@@ -25050,7 +25054,7 @@ class Effect6178(EffectDef):
                                       skill='Minmatar Battlecruiser')
 
 
-class Effect6184(EffectDef):
+class Effect6184(BaseEffect):
     """
     shipModuleRemoteCapacitorTransmitter
 
@@ -25074,7 +25078,7 @@ class Effect6184(EffectDef):
             fit.addDrain(src, duration, -amount, 0)
 
 
-class Effect6185(EffectDef):
+class Effect6185(BaseEffect):
     """
     shipModuleRemoteHullRepairer
 
@@ -25094,7 +25098,7 @@ class Effect6185(EffectDef):
         fit.extraAttributes.increase('hullRepair', bonus / duration)
 
 
-class Effect6186(EffectDef):
+class Effect6186(BaseEffect):
     """
     shipModuleRemoteShieldBooster
 
@@ -25112,7 +25116,7 @@ class Effect6186(EffectDef):
             fit.extraAttributes.increase('shieldRepair', bonus / duration, **kwargs)
 
 
-class Effect6187(EffectDef):
+class Effect6187(BaseEffect):
     """
     energyNeutralizerFalloff
 
@@ -25137,7 +25141,7 @@ class Effect6187(EffectDef):
             fit.addDrain(src, time, amount, 0)
 
 
-class Effect6188(EffectDef):
+class Effect6188(BaseEffect):
     """
     shipModuleRemoteArmorRepairer
 
@@ -25159,7 +25163,7 @@ class Effect6188(EffectDef):
             fit.extraAttributes.increase('armorRepairFullSpool', rps)
 
 
-class Effect6195(EffectDef):
+class Effect6195(BaseEffect):
     """
     expeditionFrigateShieldResistance1
 
@@ -25181,7 +25185,7 @@ class Effect6195(EffectDef):
                                skill='Expedition Frigates')
 
 
-class Effect6196(EffectDef):
+class Effect6196(BaseEffect):
     """
     expeditionFrigateBonusIceHarvestingCycleTime2
 
@@ -25197,7 +25201,7 @@ class Effect6196(EffectDef):
                                       src.getModifiedItemAttr('eliteBonusExpedition2'), skill='Expedition Frigates')
 
 
-class Effect6197(EffectDef):
+class Effect6197(BaseEffect):
     """
     energyNosferatuFalloff
 
@@ -25223,7 +25227,7 @@ class Effect6197(EffectDef):
             src.itemModifiedAttributes.force('capacitorNeed', -amount)
 
 
-class Effect6201(EffectDef):
+class Effect6201(BaseEffect):
     """
     doomsdaySlash
 
@@ -25234,7 +25238,7 @@ class Effect6201(EffectDef):
     type = 'active'
 
 
-class Effect6208(EffectDef):
+class Effect6208(BaseEffect):
     """
     microJumpPortalDrive
 
@@ -25250,7 +25254,7 @@ class Effect6208(EffectDef):
                                stackingPenalties=True)
 
 
-class Effect6214(EffectDef):
+class Effect6214(BaseEffect):
     """
     roleBonusCDLinksPGReduction
 
@@ -25267,7 +25271,7 @@ class Effect6214(EffectDef):
                                       src.getModifiedItemAttr('roleBonusCD'))
 
 
-class Effect6216(EffectDef):
+class Effect6216(BaseEffect):
     """
     structureEnergyNeutralizerFalloff
 
@@ -25293,7 +25297,7 @@ class Effect6216(EffectDef):
                 fit.addDrain(src, time, amount, 0)
 
 
-class Effect6222(EffectDef):
+class Effect6222(BaseEffect):
     """
     structureWarpScrambleBlockMWDWithNPCEffect
 
@@ -25316,7 +25320,7 @@ class Effect6222(EffectDef):
                         mod.state = FittingModuleState.ONLINE
 
 
-class Effect6230(EffectDef):
+class Effect6230(BaseEffect):
     """
     shipBonusEnergyNeutOptimalRS1
 
@@ -25332,7 +25336,7 @@ class Effect6230(EffectDef):
                                       src.getModifiedItemAttr('eliteBonusReconShip1'), skill='Recon Ships')
 
 
-class Effect6232(EffectDef):
+class Effect6232(BaseEffect):
     """
     shipBonusEnergyNeutFalloffRS2
 
@@ -25348,7 +25352,7 @@ class Effect6232(EffectDef):
                                       src.getModifiedItemAttr('eliteBonusReconShip2'), skill='Recon Ships')
 
 
-class Effect6233(EffectDef):
+class Effect6233(BaseEffect):
     """
     shipBonusEnergyNeutFalloffRS3
 
@@ -25364,7 +25368,7 @@ class Effect6233(EffectDef):
                                       src.getModifiedItemAttr('eliteBonusReconShip3'), skill='Recon Ships')
 
 
-class Effect6234(EffectDef):
+class Effect6234(BaseEffect):
     """
     shipBonusEnergyNosOptimalRS1
 
@@ -25380,7 +25384,7 @@ class Effect6234(EffectDef):
                                       src.getModifiedItemAttr('eliteBonusReconShip1'), skill='Recon Ships')
 
 
-class Effect6237(EffectDef):
+class Effect6237(BaseEffect):
     """
     shipBonusEnergyNosFalloffRS2
 
@@ -25396,7 +25400,7 @@ class Effect6237(EffectDef):
                                       src.getModifiedItemAttr('eliteBonusReconShip2'), skill='Recon Ships')
 
 
-class Effect6238(EffectDef):
+class Effect6238(BaseEffect):
     """
     shipBonusEnergyNosFalloffRS3
 
@@ -25412,7 +25416,7 @@ class Effect6238(EffectDef):
                                       src.getModifiedItemAttr('eliteBonusReconShip3'), skill='Recon Ships')
 
 
-class Effect6239(EffectDef):
+class Effect6239(BaseEffect):
     """
     miningFrigateBonusIceHarvestingCycleTime2
 
@@ -25428,7 +25432,7 @@ class Effect6239(EffectDef):
                                       src.getModifiedItemAttr('shipBonusOREfrig2'), skill='Mining Frigate')
 
 
-class Effect6241(EffectDef):
+class Effect6241(BaseEffect):
     """
     shipBonusEnergyNeutFalloffAD1
 
@@ -25444,7 +25448,7 @@ class Effect6241(EffectDef):
                                       src.getModifiedItemAttr('shipBonusAD1'), skill='Amarr Destroyer')
 
 
-class Effect6242(EffectDef):
+class Effect6242(BaseEffect):
     """
     shipBonusEnergyNeutOptimalAD2
 
@@ -25460,7 +25464,7 @@ class Effect6242(EffectDef):
                                       src.getModifiedItemAttr('shipBonusAD2'), skill='Amarr Destroyer')
 
 
-class Effect6245(EffectDef):
+class Effect6245(BaseEffect):
     """
     shipBonusEnergyNosOptimalAD2
 
@@ -25476,7 +25480,7 @@ class Effect6245(EffectDef):
                                       src.getModifiedItemAttr('shipBonusAD2'), skill='Amarr Destroyer')
 
 
-class Effect6246(EffectDef):
+class Effect6246(BaseEffect):
     """
     shipBonusEnergyNosFalloffAD1
 
@@ -25492,7 +25496,7 @@ class Effect6246(EffectDef):
                                       src.getModifiedItemAttr('shipBonusAD1'), skill='Amarr Destroyer')
 
 
-class Effect6253(EffectDef):
+class Effect6253(BaseEffect):
     """
     shipBonusEnergyNeutOptimalAB
 
@@ -25508,7 +25512,7 @@ class Effect6253(EffectDef):
                                       src.getModifiedItemAttr('shipBonusAB'), skill='Amarr Battleship')
 
 
-class Effect6256(EffectDef):
+class Effect6256(BaseEffect):
     """
     shipBonusEnergyNeutFalloffAB2
 
@@ -25524,7 +25528,7 @@ class Effect6256(EffectDef):
                                       src.getModifiedItemAttr('shipBonusAB2'), skill='Amarr Battleship')
 
 
-class Effect6257(EffectDef):
+class Effect6257(BaseEffect):
     """
     shipBonusEnergyNosOptimalAB
 
@@ -25540,7 +25544,7 @@ class Effect6257(EffectDef):
                                       src.getModifiedItemAttr('shipBonusAB'), skill='Amarr Battleship')
 
 
-class Effect6260(EffectDef):
+class Effect6260(BaseEffect):
     """
     shipBonusEnergyNosFalloffAB2
 
@@ -25556,7 +25560,7 @@ class Effect6260(EffectDef):
                                       src.getModifiedItemAttr('shipBonusAB2'), skill='Amarr Battleship')
 
 
-class Effect6267(EffectDef):
+class Effect6267(BaseEffect):
     """
     shipBonusEnergyNeutOptimalEAF1
 
@@ -25573,7 +25577,7 @@ class Effect6267(EffectDef):
                                       skill='Electronic Attack Ships')
 
 
-class Effect6272(EffectDef):
+class Effect6272(BaseEffect):
     """
     shipBonusEnergyNeutFalloffEAF3
 
@@ -25590,7 +25594,7 @@ class Effect6272(EffectDef):
                                       skill='Electronic Attack Ships')
 
 
-class Effect6273(EffectDef):
+class Effect6273(BaseEffect):
     """
     shipBonusEnergyNosOptimalEAF1
 
@@ -25607,7 +25611,7 @@ class Effect6273(EffectDef):
                                       skill='Electronic Attack Ships')
 
 
-class Effect6278(EffectDef):
+class Effect6278(BaseEffect):
     """
     shipBonusEnergyNosFalloffEAF3
 
@@ -25624,7 +25628,7 @@ class Effect6278(EffectDef):
                                       skill='Electronic Attack Ships')
 
 
-class Effect6281(EffectDef):
+class Effect6281(BaseEffect):
     """
     shipBonusEnergyNeutOptimalAF2
 
@@ -25640,7 +25644,7 @@ class Effect6281(EffectDef):
                                       src.getModifiedItemAttr('shipBonus2AF'), skill='Amarr Frigate')
 
 
-class Effect6285(EffectDef):
+class Effect6285(BaseEffect):
     """
     shipBonusEnergyNeutFalloffAF3
 
@@ -25656,7 +25660,7 @@ class Effect6285(EffectDef):
                                       src.getModifiedItemAttr('shipBonus3AF'), skill='Amarr Frigate')
 
 
-class Effect6287(EffectDef):
+class Effect6287(BaseEffect):
     """
     shipBonusEnergyNosOptimalAF2
 
@@ -25672,7 +25676,7 @@ class Effect6287(EffectDef):
                                       src.getModifiedItemAttr('shipBonus2AF'), skill='Amarr Frigate')
 
 
-class Effect6291(EffectDef):
+class Effect6291(BaseEffect):
     """
     shipBonusEnergyNosFalloffAF3
 
@@ -25688,7 +25692,7 @@ class Effect6291(EffectDef):
                                       src.getModifiedItemAttr('shipBonus3AF'), skill='Amarr Frigate')
 
 
-class Effect6294(EffectDef):
+class Effect6294(BaseEffect):
     """
     shipBonusEnergyNeutOptimalAC1
 
@@ -25704,7 +25708,7 @@ class Effect6294(EffectDef):
                                       src.getModifiedItemAttr('shipBonusAC'), skill='Amarr Cruiser')
 
 
-class Effect6299(EffectDef):
+class Effect6299(BaseEffect):
     """
     shipBonusEnergyNeutFalloffAC3
 
@@ -25720,7 +25724,7 @@ class Effect6299(EffectDef):
                                       src.getModifiedItemAttr('shipBonusAC3'), skill='Amarr Cruiser')
 
 
-class Effect6300(EffectDef):
+class Effect6300(BaseEffect):
     """
     shipBonusEnergyNosOptimalAC1
 
@@ -25736,7 +25740,7 @@ class Effect6300(EffectDef):
                                       src.getModifiedItemAttr('shipBonusAC'), skill='Amarr Cruiser')
 
 
-class Effect6301(EffectDef):
+class Effect6301(BaseEffect):
     """
     shipBonusNosOptimalFalloffAC2
 
@@ -25754,7 +25758,7 @@ class Effect6301(EffectDef):
                                       src.getModifiedItemAttr('shipBonusAC2'), skill='Amarr Cruiser')
 
 
-class Effect6305(EffectDef):
+class Effect6305(BaseEffect):
     """
     shipBonusEnergyNosFalloffAC3
 
@@ -25770,7 +25774,7 @@ class Effect6305(EffectDef):
                                       src.getModifiedItemAttr('shipBonusAC3'), skill='Amarr Cruiser')
 
 
-class Effect6307(EffectDef):
+class Effect6307(BaseEffect):
     """
     shipBonusThermMissileDmgMD1
 
@@ -25786,7 +25790,7 @@ class Effect6307(EffectDef):
                                         src.getModifiedItemAttr('shipBonusMD1'), skill='Minmatar Destroyer')
 
 
-class Effect6308(EffectDef):
+class Effect6308(BaseEffect):
     """
     shipBonusEMMissileDmgMD1
 
@@ -25802,7 +25806,7 @@ class Effect6308(EffectDef):
                                         src.getModifiedItemAttr('shipBonusMD1'), skill='Minmatar Destroyer')
 
 
-class Effect6309(EffectDef):
+class Effect6309(BaseEffect):
     """
     shipBonusKineticMissileDmgMD1
 
@@ -25818,7 +25822,7 @@ class Effect6309(EffectDef):
                                         src.getModifiedItemAttr('shipBonusMD1'), skill='Minmatar Destroyer')
 
 
-class Effect6310(EffectDef):
+class Effect6310(BaseEffect):
     """
     shipBonusExplosiveMissileDmgMD1
 
@@ -25835,7 +25839,7 @@ class Effect6310(EffectDef):
                                         skill='Minmatar Destroyer')
 
 
-class Effect6315(EffectDef):
+class Effect6315(BaseEffect):
     """
     eliteBonusCommandDestroyerSkirmish1
 
@@ -25860,7 +25864,7 @@ class Effect6315(EffectDef):
                                       src.getModifiedItemAttr('eliteBonusCommandDestroyer1'), skill='Command Destroyers')
 
 
-class Effect6316(EffectDef):
+class Effect6316(BaseEffect):
     """
     eliteBonusCommandDestroyerShield1
 
@@ -25885,7 +25889,7 @@ class Effect6316(EffectDef):
                                       src.getModifiedItemAttr('eliteBonusCommandDestroyer1'), skill='Command Destroyers')
 
 
-class Effect6317(EffectDef):
+class Effect6317(BaseEffect):
     """
     eliteBonusCommandDestroyerMJFGspool2
 
@@ -25901,7 +25905,7 @@ class Effect6317(EffectDef):
                                       src.getModifiedItemAttr('eliteBonusCommandDestroyer2'), skill='Command Destroyers')
 
 
-class Effect6318(EffectDef):
+class Effect6318(BaseEffect):
     """
     shipBonusEMShieldResistanceMD2
 
@@ -25917,7 +25921,7 @@ class Effect6318(EffectDef):
                                skill='Minmatar Destroyer')
 
 
-class Effect6319(EffectDef):
+class Effect6319(BaseEffect):
     """
     shipBonusKineticShieldResistanceMD2
 
@@ -25933,7 +25937,7 @@ class Effect6319(EffectDef):
                                skill='Minmatar Destroyer')
 
 
-class Effect6320(EffectDef):
+class Effect6320(BaseEffect):
     """
     shipBonusThermalShieldResistanceMD2
 
@@ -25949,7 +25953,7 @@ class Effect6320(EffectDef):
                                skill='Minmatar Destroyer')
 
 
-class Effect6321(EffectDef):
+class Effect6321(BaseEffect):
     """
     shipBonusExplosiveShieldResistanceMD2
 
@@ -25965,7 +25969,7 @@ class Effect6321(EffectDef):
                                skill='Minmatar Destroyer')
 
 
-class Effect6322(EffectDef):
+class Effect6322(BaseEffect):
     """
     scriptscanGravimetricStrengthBonusBonus
 
@@ -25981,7 +25985,7 @@ class Effect6322(EffectDef):
         src.boostItemAttr('scanGravimetricStrengthBonus', src.getModifiedChargeAttr('scanGravimetricStrengthBonusBonus'))
 
 
-class Effect6323(EffectDef):
+class Effect6323(BaseEffect):
     """
     scriptscanLadarStrengthBonusBonus
 
@@ -25997,7 +26001,7 @@ class Effect6323(EffectDef):
         src.boostItemAttr('scanLadarStrengthBonus', src.getModifiedChargeAttr('scanLadarStrengthBonusBonus'))
 
 
-class Effect6324(EffectDef):
+class Effect6324(BaseEffect):
     """
     scriptscanMagnetometricStrengthBonusBonus
 
@@ -26013,7 +26017,7 @@ class Effect6324(EffectDef):
         src.boostItemAttr('scanMagnetometricStrengthBonus', src.getModifiedChargeAttr('scanMagnetometricStrengthBonusBonus'))
 
 
-class Effect6325(EffectDef):
+class Effect6325(BaseEffect):
     """
     scriptscanRadarStrengthBonusBonus
 
@@ -26029,7 +26033,7 @@ class Effect6325(EffectDef):
         src.boostItemAttr('scanRadarStrengthBonus', src.getModifiedChargeAttr('scanRadarStrengthBonusBonus'))
 
 
-class Effect6326(EffectDef):
+class Effect6326(BaseEffect):
     """
     shipBonusThermalMissileDamageCD1
 
@@ -26045,7 +26049,7 @@ class Effect6326(EffectDef):
                                         src.getModifiedItemAttr('shipBonusCD1'), skill='Caldari Destroyer')
 
 
-class Effect6327(EffectDef):
+class Effect6327(BaseEffect):
     """
     shipBonusEMMissileDamageCD1
 
@@ -26061,7 +26065,7 @@ class Effect6327(EffectDef):
                                         src.getModifiedItemAttr('shipBonusCD1'), skill='Caldari Destroyer')
 
 
-class Effect6328(EffectDef):
+class Effect6328(BaseEffect):
     """
     shipBonusKineticMissileDamageCD1
 
@@ -26077,7 +26081,7 @@ class Effect6328(EffectDef):
                                         src.getModifiedItemAttr('shipBonusCD1'), skill='Caldari Destroyer')
 
 
-class Effect6329(EffectDef):
+class Effect6329(BaseEffect):
     """
     shipBonusExplosiveMissileDamageCD1
 
@@ -26094,7 +26098,7 @@ class Effect6329(EffectDef):
                                         skill='Caldari Destroyer')
 
 
-class Effect6330(EffectDef):
+class Effect6330(BaseEffect):
     """
     shipBonusShieldEMResistanceCD2
 
@@ -26110,7 +26114,7 @@ class Effect6330(EffectDef):
                                skill='Caldari Destroyer')
 
 
-class Effect6331(EffectDef):
+class Effect6331(BaseEffect):
     """
     shipBonusShieldThermalResistanceCD2
 
@@ -26126,7 +26130,7 @@ class Effect6331(EffectDef):
                                skill='Caldari Destroyer')
 
 
-class Effect6332(EffectDef):
+class Effect6332(BaseEffect):
     """
     shipBonusShieldKineticResistanceCD2
 
@@ -26142,7 +26146,7 @@ class Effect6332(EffectDef):
                                skill='Caldari Destroyer')
 
 
-class Effect6333(EffectDef):
+class Effect6333(BaseEffect):
     """
     shipBonusShieldExplosiveResistanceCD2
 
@@ -26158,7 +26162,7 @@ class Effect6333(EffectDef):
                                skill='Caldari Destroyer')
 
 
-class Effect6334(EffectDef):
+class Effect6334(BaseEffect):
     """
     eliteBonusCommandDestroyerInfo1
 
@@ -26183,7 +26187,7 @@ class Effect6334(EffectDef):
                                       src.getModifiedItemAttr('eliteBonusCommandDestroyer1'), skill='Command Destroyers')
 
 
-class Effect6335(EffectDef):
+class Effect6335(BaseEffect):
     """
     shipBonusKineticArmorResistanceAD2
 
@@ -26199,7 +26203,7 @@ class Effect6335(EffectDef):
                                skill='Amarr Destroyer')
 
 
-class Effect6336(EffectDef):
+class Effect6336(BaseEffect):
     """
     shipBonusThermalArmorResistanceAD2
 
@@ -26215,7 +26219,7 @@ class Effect6336(EffectDef):
                                skill='Amarr Destroyer')
 
 
-class Effect6337(EffectDef):
+class Effect6337(BaseEffect):
     """
     shipBonusEMArmorResistanceAD2
 
@@ -26230,7 +26234,7 @@ class Effect6337(EffectDef):
         fit.ship.boostItemAttr('armorEmDamageResonance', src.getModifiedItemAttr('shipBonusAD2'), skill='Amarr Destroyer')
 
 
-class Effect6338(EffectDef):
+class Effect6338(BaseEffect):
     """
     shipBonusExplosiveArmorResistanceAD2
 
@@ -26246,7 +26250,7 @@ class Effect6338(EffectDef):
                                skill='Amarr Destroyer')
 
 
-class Effect6339(EffectDef):
+class Effect6339(BaseEffect):
     """
     eliteBonusCommandDestroyerArmored1
 
@@ -26271,7 +26275,7 @@ class Effect6339(EffectDef):
                                       src.getModifiedItemAttr('eliteBonusCommandDestroyer1'), skill='Command Destroyers')
 
 
-class Effect6340(EffectDef):
+class Effect6340(BaseEffect):
     """
     shipBonusKineticArmorResistanceGD2
 
@@ -26287,7 +26291,7 @@ class Effect6340(EffectDef):
                                skill='Gallente Destroyer')
 
 
-class Effect6341(EffectDef):
+class Effect6341(BaseEffect):
     """
     shipBonusEMArmorResistanceGD2
 
@@ -26303,7 +26307,7 @@ class Effect6341(EffectDef):
                                skill='Gallente Destroyer')
 
 
-class Effect6342(EffectDef):
+class Effect6342(BaseEffect):
     """
     shipBonusThermalArmorResistanceGD2
 
@@ -26319,7 +26323,7 @@ class Effect6342(EffectDef):
                                skill='Gallente Destroyer')
 
 
-class Effect6343(EffectDef):
+class Effect6343(BaseEffect):
     """
     shipBonusExplosiveArmorResistanceGD2
 
@@ -26335,7 +26339,7 @@ class Effect6343(EffectDef):
                                skill='Gallente Destroyer')
 
 
-class Effect6350(EffectDef):
+class Effect6350(BaseEffect):
     """
     shipSmallMissileKinDmgCF3
 
@@ -26352,7 +26356,7 @@ class Effect6350(EffectDef):
             src.getModifiedItemAttr('shipBonus3CF'), skill='Caldari Frigate')
 
 
-class Effect6351(EffectDef):
+class Effect6351(BaseEffect):
     """
     shipMissileKinDamageCC3
 
@@ -26368,7 +26372,7 @@ class Effect6351(EffectDef):
                                         src.getModifiedItemAttr('shipBonusCC3'), skill='Caldari Cruiser')
 
 
-class Effect6352(EffectDef):
+class Effect6352(BaseEffect):
     """
     roleBonusWDRange
 
@@ -26386,7 +26390,7 @@ class Effect6352(EffectDef):
                                       src.getModifiedItemAttr('roleBonus'))
 
 
-class Effect6353(EffectDef):
+class Effect6353(BaseEffect):
     """
     roleBonusWDCapCPU
 
@@ -26404,7 +26408,7 @@ class Effect6353(EffectDef):
                                       src.getModifiedItemAttr('roleBonus'))
 
 
-class Effect6354(EffectDef):
+class Effect6354(BaseEffect):
     """
     shipBonusEwWeaponDisruptionStrengthAF2
 
@@ -26432,7 +26436,7 @@ class Effect6354(EffectDef):
                                       src.getModifiedItemAttr('shipBonus2AF'), skill='Amarr Frigate')
 
 
-class Effect6355(EffectDef):
+class Effect6355(BaseEffect):
     """
     roleBonusECMCapCPU
 
@@ -26449,7 +26453,7 @@ class Effect6355(EffectDef):
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'ECM', 'cpu', src.getModifiedItemAttr('roleBonus'))
 
 
-class Effect6356(EffectDef):
+class Effect6356(BaseEffect):
     """
     roleBonusECMRange
 
@@ -26467,7 +26471,7 @@ class Effect6356(EffectDef):
                                       src.getModifiedItemAttr('roleBonus'))
 
 
-class Effect6357(EffectDef):
+class Effect6357(BaseEffect):
     """
     shipBonusJustScramblerRangeGF2
 
@@ -26483,7 +26487,7 @@ class Effect6357(EffectDef):
                                       src.getModifiedItemAttr('shipBonusGF2'), skill='Gallente Frigate')
 
 
-class Effect6358(EffectDef):
+class Effect6358(BaseEffect):
     """
     roleBonusJustScramblerStrength
 
@@ -26499,7 +26503,7 @@ class Effect6358(EffectDef):
                                          'warpScrambleStrength', ship.getModifiedItemAttr('roleBonus'))
 
 
-class Effect6359(EffectDef):
+class Effect6359(BaseEffect):
     """
     shipBonusAoeVelocityRocketsMF
 
@@ -26515,7 +26519,7 @@ class Effect6359(EffectDef):
                                         src.getModifiedItemAttr('shipBonusMF'), skill='Minmatar Frigate')
 
 
-class Effect6360(EffectDef):
+class Effect6360(BaseEffect):
     """
     shipRocketEMThermKinDmgMF2
 
@@ -26535,7 +26539,7 @@ class Effect6360(EffectDef):
                                         src.getModifiedItemAttr('shipBonusMF2'), skill='Minmatar Frigate')
 
 
-class Effect6361(EffectDef):
+class Effect6361(BaseEffect):
     """
     shipRocketExpDmgMF3
 
@@ -26551,7 +26555,7 @@ class Effect6361(EffectDef):
                                         src.getModifiedItemAttr('shipBonus3MF'), skill='Minmatar Frigate')
 
 
-class Effect6362(EffectDef):
+class Effect6362(BaseEffect):
     """
     roleBonusStasisRange
 
@@ -26567,7 +26571,7 @@ class Effect6362(EffectDef):
                                       src.getModifiedItemAttr('roleBonus'))
 
 
-class Effect6368(EffectDef):
+class Effect6368(BaseEffect):
     """
     shieldTransporterFalloffBonus
 
@@ -26588,7 +26592,7 @@ class Effect6368(EffectDef):
                                       'falloffEffectiveness', src.getModifiedItemAttr('falloffBonus'))
 
 
-class Effect6369(EffectDef):
+class Effect6369(BaseEffect):
     """
     shipShieldTransferFalloffMC2
 
@@ -26604,7 +26608,7 @@ class Effect6369(EffectDef):
                                       src.getModifiedItemAttr('shipBonusMC2'), skill='Minmatar Cruiser')
 
 
-class Effect6370(EffectDef):
+class Effect6370(BaseEffect):
     """
     shipShieldTransferFalloffCC1
 
@@ -26621,7 +26625,7 @@ class Effect6370(EffectDef):
                                       src.getModifiedItemAttr('shipBonusCC'), skill='Caldari Cruiser')
 
 
-class Effect6371(EffectDef):
+class Effect6371(BaseEffect):
     """
     shipRemoteArmorFalloffGC1
 
@@ -26638,7 +26642,7 @@ class Effect6371(EffectDef):
                                       skill='Gallente Cruiser')
 
 
-class Effect6372(EffectDef):
+class Effect6372(BaseEffect):
     """
     shipRemoteArmorFalloffAC2
 
@@ -26655,7 +26659,7 @@ class Effect6372(EffectDef):
                                       skill='Amarr Cruiser')
 
 
-class Effect6373(EffectDef):
+class Effect6373(BaseEffect):
     """
     armorRepairProjectorFalloffBonus
 
@@ -26677,7 +26681,7 @@ class Effect6373(EffectDef):
                                       'falloffEffectiveness', src.getModifiedItemAttr('falloffBonus'))
 
 
-class Effect6374(EffectDef):
+class Effect6374(BaseEffect):
     """
     droneHullRepairBonusEffect
 
@@ -26695,7 +26699,7 @@ class Effect6374(EffectDef):
                                      src.getModifiedItemAttr('droneArmorDamageAmountBonus'))
 
 
-class Effect6377(EffectDef):
+class Effect6377(BaseEffect):
     """
     eliteBonusLogiFrigArmorRepSpeedCap1
 
@@ -26714,7 +26718,7 @@ class Effect6377(EffectDef):
                                       src.getModifiedItemAttr('eliteBonusLogiFrig1'), skill='Logistics Frigates')
 
 
-class Effect6378(EffectDef):
+class Effect6378(BaseEffect):
     """
     eliteBonusLogiFrigShieldRepSpeedCap1
 
@@ -26733,7 +26737,7 @@ class Effect6378(EffectDef):
                                       src.getModifiedItemAttr('eliteBonusLogiFrig1'), skill='Logistics Frigates')
 
 
-class Effect6379(EffectDef):
+class Effect6379(BaseEffect):
     """
     eliteBonusLogiFrigArmorHP2
 
@@ -26748,7 +26752,7 @@ class Effect6379(EffectDef):
         fit.ship.boostItemAttr('armorHP', src.getModifiedItemAttr('eliteBonusLogiFrig2'), skill='Logistics Frigates')
 
 
-class Effect6380(EffectDef):
+class Effect6380(BaseEffect):
     """
     eliteBonusLogiFrigShieldHP2
 
@@ -26763,7 +26767,7 @@ class Effect6380(EffectDef):
         fit.ship.boostItemAttr('shieldCapacity', src.getModifiedItemAttr('eliteBonusLogiFrig2'), skill='Logistics Frigates')
 
 
-class Effect6381(EffectDef):
+class Effect6381(BaseEffect):
     """
     eliteBonusLogiFrigSignature2
 
@@ -26780,7 +26784,7 @@ class Effect6381(EffectDef):
                                skill='Logistics Frigates')
 
 
-class Effect6384(EffectDef):
+class Effect6384(BaseEffect):
     """
     overloadSelfMissileGuidanceModuleBonus
 
@@ -26801,7 +26805,7 @@ class Effect6384(EffectDef):
             module.boostItemAttr(tgtAttr, module.getModifiedItemAttr('overloadTrackingModuleStrengthBonus'))
 
 
-class Effect6385(EffectDef):
+class Effect6385(BaseEffect):
     """
     ignoreCloakVelocityPenalty
 
@@ -26818,7 +26822,7 @@ class Effect6385(EffectDef):
                                       'maxVelocityModifier', src.getModifiedItemAttr('velocityPenaltyReduction'))
 
 
-class Effect6386(EffectDef):
+class Effect6386(BaseEffect):
     """
     ewSkillGuidanceDisruptionBonus
 
@@ -26842,7 +26846,7 @@ class Effect6386(EffectDef):
                                           attr, src.getModifiedItemAttr('scanSkillEwStrengthBonus') * level)
 
 
-class Effect6395(EffectDef):
+class Effect6395(BaseEffect):
     """
     shipBonusEwWeaponDisruptionStrengthAC1
 
@@ -26870,7 +26874,7 @@ class Effect6395(EffectDef):
                                       src.getModifiedItemAttr('shipBonusAC'), skill='Amarr Cruiser')
 
 
-class Effect6396(EffectDef):
+class Effect6396(BaseEffect):
     """
     skillStructureMissileDamageBonus
 
@@ -26889,7 +26893,7 @@ class Effect6396(EffectDef):
                                             skill='Structure Missile Systems')
 
 
-class Effect6400(EffectDef):
+class Effect6400(BaseEffect):
     """
     skillStructureElectronicSystemsCapNeedBonus
 
@@ -26907,7 +26911,7 @@ class Effect6400(EffectDef):
                                       skill='Structure Electronic Systems')
 
 
-class Effect6401(EffectDef):
+class Effect6401(BaseEffect):
     """
     skillStructureEngineeringSystemsCapNeedBonus
 
@@ -26925,7 +26929,7 @@ class Effect6401(EffectDef):
                                       skill='Structure Engineering Systems')
 
 
-class Effect6402(EffectDef):
+class Effect6402(BaseEffect):
     """
     structureRigAoeVelocityBonusSingleTargetMissiles
 
@@ -26944,7 +26948,7 @@ class Effect6402(EffectDef):
                                       stackingPenalties=True)
 
 
-class Effect6403(EffectDef):
+class Effect6403(BaseEffect):
     """
     structureRigVelocityBonusSingleTargetMissiles
 
@@ -26962,7 +26966,7 @@ class Effect6403(EffectDef):
                                       stackingPenalties=True)
 
 
-class Effect6404(EffectDef):
+class Effect6404(BaseEffect):
     """
     structureRigNeutralizerMaxRangeFalloffEffectiveness
 
@@ -26984,7 +26988,7 @@ class Effect6404(EffectDef):
                                       stackingPenalties=True)
 
 
-class Effect6405(EffectDef):
+class Effect6405(BaseEffect):
     """
     structureRigNeutralizerCapacitorNeed
 
@@ -27002,7 +27006,7 @@ class Effect6405(EffectDef):
                                       stackingPenalties=True)
 
 
-class Effect6406(EffectDef):
+class Effect6406(BaseEffect):
     """
     structureRigEWMaxRangeFalloff
 
@@ -27030,7 +27034,7 @@ class Effect6406(EffectDef):
                                       stackingPenalties=True)
 
 
-class Effect6407(EffectDef):
+class Effect6407(BaseEffect):
     """
     structureRigEWCapacitorNeed
 
@@ -27049,7 +27053,7 @@ class Effect6407(EffectDef):
                                       stackingPenalties=True)
 
 
-class Effect6408(EffectDef):
+class Effect6408(BaseEffect):
     """
     structureRigMaxTargets
 
@@ -27065,7 +27069,7 @@ class Effect6408(EffectDef):
         fit.extraAttributes.increase('maxTargetsLockedFromSkills', src.getModifiedItemAttr('structureRigMaxTargetBonus'))
 
 
-class Effect6409(EffectDef):
+class Effect6409(BaseEffect):
     """
     structureRigSensorResolution
 
@@ -27083,7 +27087,7 @@ class Effect6409(EffectDef):
                                stackingPenalties=True)
 
 
-class Effect6410(EffectDef):
+class Effect6410(BaseEffect):
     """
     structureRigExplosionRadiusBonusAoEMissiles
 
@@ -27101,7 +27105,7 @@ class Effect6410(EffectDef):
                                         stackingPenalties=True)
 
 
-class Effect6411(EffectDef):
+class Effect6411(BaseEffect):
     """
     structureRigVelocityBonusAoeMissiles
 
@@ -27119,7 +27123,7 @@ class Effect6411(EffectDef):
                                         stackingPenalties=True)
 
 
-class Effect6412(EffectDef):
+class Effect6412(BaseEffect):
     """
     structureRigPDBmaxRange
 
@@ -27137,7 +27141,7 @@ class Effect6412(EffectDef):
                                       stackingPenalties=True)
 
 
-class Effect6413(EffectDef):
+class Effect6413(BaseEffect):
     """
     structureRigPDBCapacitorNeed
 
@@ -27155,7 +27159,7 @@ class Effect6413(EffectDef):
                                       stackingPenalties=True)
 
 
-class Effect6417(EffectDef):
+class Effect6417(BaseEffect):
     """
     structureRigDoomsdayDamageLoss
 
@@ -27172,7 +27176,7 @@ class Effect6417(EffectDef):
                                          src.getModifiedItemAttr('structureRigDoomsdayDamageLossTargetBonus'))
 
 
-class Effect6422(EffectDef):
+class Effect6422(BaseEffect):
     """
     remoteSensorDampFalloff
 
@@ -27195,7 +27199,7 @@ class Effect6422(EffectDef):
                                stackingPenalties=True, *args, **kwargs)
 
 
-class Effect6423(EffectDef):
+class Effect6423(BaseEffect):
     """
     shipModuleGuidanceDisruptor
 
@@ -27219,7 +27223,7 @@ class Effect6423(EffectDef):
                                                 stackingPenalties=True, *args, **kwargs)
 
 
-class Effect6424(EffectDef):
+class Effect6424(BaseEffect):
     """
     shipModuleTrackingDisruptor
 
@@ -27243,7 +27247,7 @@ class Effect6424(EffectDef):
                                           stackingPenalties=True, *args, **kwargs)
 
 
-class Effect6425(EffectDef):
+class Effect6425(BaseEffect):
     """
     remoteTargetPaintFalloff
 
@@ -27260,7 +27264,7 @@ class Effect6425(EffectDef):
                                    stackingPenalties=True, *args, **kwargs)
 
 
-class Effect6426(EffectDef):
+class Effect6426(BaseEffect):
     """
     remoteWebifierFalloff
 
@@ -27280,7 +27284,7 @@ class Effect6426(EffectDef):
                                stackingPenalties=True, *args, **kwargs)
 
 
-class Effect6427(EffectDef):
+class Effect6427(BaseEffect):
     """
     remoteSensorBoostFalloff
 
@@ -27308,7 +27312,7 @@ class Effect6427(EffectDef):
             )
 
 
-class Effect6428(EffectDef):
+class Effect6428(BaseEffect):
     """
     shipModuleRemoteTrackingComputer
 
@@ -27332,7 +27336,7 @@ class Effect6428(EffectDef):
                                           stackingPenalties=True, **kwargs)
 
 
-class Effect6431(EffectDef):
+class Effect6431(BaseEffect):
     """
     fighterAbilityMissiles
 
@@ -27347,7 +27351,7 @@ class Effect6431(EffectDef):
     type = 'active'
 
 
-class Effect6434(EffectDef):
+class Effect6434(BaseEffect):
     """
     fighterAbilityEnergyNeutralizer
 
@@ -27373,7 +27377,7 @@ class Effect6434(EffectDef):
             fit.addDrain(src, time, amount, 0)
 
 
-class Effect6435(EffectDef):
+class Effect6435(BaseEffect):
     """
     fighterAbilityStasisWebifier
 
@@ -27394,7 +27398,7 @@ class Effect6435(EffectDef):
                                stackingPenalties=True)
 
 
-class Effect6436(EffectDef):
+class Effect6436(BaseEffect):
     """
     fighterAbilityWarpDisruption
 
@@ -27414,7 +27418,7 @@ class Effect6436(EffectDef):
         fit.ship.increaseItemAttr('warpScrambleStatus', src.getModifiedItemAttr('{}PointStrength'.format(cls.prefix)) * src.amountActive)
 
 
-class Effect6437(EffectDef):
+class Effect6437(BaseEffect):
     """
     fighterAbilityECM
 
@@ -27441,7 +27445,7 @@ class Effect6437(EffectDef):
         fit.ecmProjectedStr *= strModifier
 
 
-class Effect6439(EffectDef):
+class Effect6439(BaseEffect):
     """
     fighterAbilityEvasiveManeuvers
 
@@ -27478,7 +27482,7 @@ class Effect6439(EffectDef):
                                    stackingPenalties=True)
 
 
-class Effect6441(EffectDef):
+class Effect6441(BaseEffect):
     """
     fighterAbilityMicroWarpDrive
 
@@ -27500,7 +27504,7 @@ class Effect6441(EffectDef):
                              stackingPenalties=True)
 
 
-class Effect6443(EffectDef):
+class Effect6443(BaseEffect):
     """
     pointDefense
 
@@ -27511,7 +27515,7 @@ class Effect6443(EffectDef):
     type = 'active'
 
 
-class Effect6447(EffectDef):
+class Effect6447(BaseEffect):
     """
     lightningWeapon
 
@@ -27522,7 +27526,7 @@ class Effect6447(EffectDef):
     type = 'active'
 
 
-class Effect6448(EffectDef):
+class Effect6448(BaseEffect):
     """
     structureMissileGuidanceEnhancer
 
@@ -27546,7 +27550,7 @@ class Effect6448(EffectDef):
                                             stackingPenalties=True)
 
 
-class Effect6449(EffectDef):
+class Effect6449(BaseEffect):
     """
     structureBallisticControlSystem
 
@@ -27572,7 +27576,7 @@ class Effect6449(EffectDef):
                                          stackingPenalties=True)
 
 
-class Effect6465(EffectDef):
+class Effect6465(BaseEffect):
     """
     fighterAbilityAttackM
 
@@ -27586,7 +27590,7 @@ class Effect6465(EffectDef):
     type = 'active'
 
 
-class Effect6470(EffectDef):
+class Effect6470(BaseEffect):
     """
     remoteECMFalloff
 
@@ -27610,7 +27614,7 @@ class Effect6470(EffectDef):
             fit.ecmProjectedStr *= strModifier
 
 
-class Effect6472(EffectDef):
+class Effect6472(BaseEffect):
     """
     doomsdayBeamDOT
 
@@ -27621,7 +27625,7 @@ class Effect6472(EffectDef):
     type = 'active'
 
 
-class Effect6473(EffectDef):
+class Effect6473(BaseEffect):
     """
     doomsdayConeDOT
 
@@ -27632,7 +27636,7 @@ class Effect6473(EffectDef):
     type = 'active'
 
 
-class Effect6474(EffectDef):
+class Effect6474(BaseEffect):
     """
     doomsdayHOG
 
@@ -27643,7 +27647,7 @@ class Effect6474(EffectDef):
     type = 'active'
 
 
-class Effect6475(EffectDef):
+class Effect6475(BaseEffect):
     """
     structureRigDoomsdayTargetAmountBonus
 
@@ -27660,7 +27664,7 @@ class Effect6475(EffectDef):
                                          src.getModifiedItemAttr('structureRigDoomsdayTargetAmountBonus'))
 
 
-class Effect6476(EffectDef):
+class Effect6476(BaseEffect):
     """
     doomsdayAOEWeb
 
@@ -27679,7 +27683,7 @@ class Effect6476(EffectDef):
                                stackingPenalties=True, *args, **kwargs)
 
 
-class Effect6477(EffectDef):
+class Effect6477(BaseEffect):
     """
     doomsdayAOENeut
 
@@ -27705,7 +27709,7 @@ class Effect6477(EffectDef):
             fit.addDrain(src, time, amount, 0)
 
 
-class Effect6478(EffectDef):
+class Effect6478(BaseEffect):
     """
     doomsdayAOEPaint
 
@@ -27723,7 +27727,7 @@ class Effect6478(EffectDef):
                                    stackingPenalties=True, *args, **kwargs)
 
 
-class Effect6479(EffectDef):
+class Effect6479(BaseEffect):
     """
     doomsdayAOETrack
 
@@ -27758,7 +27762,7 @@ class Effect6479(EffectDef):
                                           stackingPenalties=True, *args, **kwargs)
 
 
-class Effect6481(EffectDef):
+class Effect6481(BaseEffect):
     """
     doomsdayAOEDamp
 
@@ -27781,7 +27785,7 @@ class Effect6481(EffectDef):
                                stackingPenalties=True, *args, **kwargs)
 
 
-class Effect6482(EffectDef):
+class Effect6482(BaseEffect):
     """
     doomsdayAOEBubble
 
@@ -27797,7 +27801,7 @@ class Effect6482(EffectDef):
         return
 
 
-class Effect6484(EffectDef):
+class Effect6484(BaseEffect):
     """
     emergencyHullEnergizer
 
@@ -27816,7 +27820,7 @@ class Effect6484(EffectDef):
                                       stackingPenalties=True, penaltyGroup='postMul')
 
 
-class Effect6485(EffectDef):
+class Effect6485(BaseEffect):
     """
     fighterAbilityLaunchBomb
 
@@ -27830,7 +27834,7 @@ class Effect6485(EffectDef):
     type = 'active'
 
 
-class Effect6487(EffectDef):
+class Effect6487(BaseEffect):
     """
     modifyEnergyWarfareResistance
 
@@ -27847,7 +27851,7 @@ class Effect6487(EffectDef):
                                stackingPenalties=True)
 
 
-class Effect6488(EffectDef):
+class Effect6488(BaseEffect):
     """
     scriptSensorBoosterSensorStrengthBonusBonus
 
@@ -27864,7 +27868,7 @@ class Effect6488(EffectDef):
                                  module.getModifiedChargeAttr('sensorStrengthBonusBonus'))
 
 
-class Effect6501(EffectDef):
+class Effect6501(BaseEffect):
     """
     shipBonusDreadnoughtA1DamageBonus
 
@@ -27880,7 +27884,7 @@ class Effect6501(EffectDef):
                                       src.getModifiedItemAttr('shipBonusDreadnoughtA1'), skill='Amarr Dreadnought')
 
 
-class Effect6502(EffectDef):
+class Effect6502(BaseEffect):
     """
     shipBonusDreadnoughtA2ArmorResists
 
@@ -27902,7 +27906,7 @@ class Effect6502(EffectDef):
                                skill='Amarr Dreadnought')
 
 
-class Effect6503(EffectDef):
+class Effect6503(BaseEffect):
     """
     shipBonusDreadnoughtA3CapNeed
 
@@ -27918,7 +27922,7 @@ class Effect6503(EffectDef):
                                       src.getModifiedItemAttr('shipBonusDreadnoughtA3'), skill='Amarr Dreadnought')
 
 
-class Effect6504(EffectDef):
+class Effect6504(BaseEffect):
     """
     shipBonusDreadnoughtC1DamageBonus
 
@@ -27956,7 +27960,7 @@ class Effect6504(EffectDef):
                                         src.getModifiedItemAttr('shipBonusDreadnoughtC1'), skill='Caldari Dreadnought')
 
 
-class Effect6505(EffectDef):
+class Effect6505(BaseEffect):
     """
     shipBonusDreadnoughtC2ShieldResists
 
@@ -27978,7 +27982,7 @@ class Effect6505(EffectDef):
                                skill='Caldari Dreadnought')
 
 
-class Effect6506(EffectDef):
+class Effect6506(BaseEffect):
     """
     shipBonusDreadnoughtG1DamageBonus
 
@@ -27994,7 +27998,7 @@ class Effect6506(EffectDef):
                                       src.getModifiedItemAttr('shipBonusDreadnoughtG1'), skill='Gallente Dreadnought')
 
 
-class Effect6507(EffectDef):
+class Effect6507(BaseEffect):
     """
     shipBonusDreadnoughtG2ROFBonus
 
@@ -28010,7 +28014,7 @@ class Effect6507(EffectDef):
                                       src.getModifiedItemAttr('shipBonusDreadnoughtG2'), skill='Gallente Dreadnought')
 
 
-class Effect6508(EffectDef):
+class Effect6508(BaseEffect):
     """
     shipBonusDreadnoughtG3RepairTime
 
@@ -28026,7 +28030,7 @@ class Effect6508(EffectDef):
                                       src.getModifiedItemAttr('shipBonusDreadnoughtG3'), skill='Gallente Dreadnought')
 
 
-class Effect6509(EffectDef):
+class Effect6509(BaseEffect):
     """
     shipBonusDreadnoughtM1DamageBonus
 
@@ -28042,7 +28046,7 @@ class Effect6509(EffectDef):
                                       src.getModifiedItemAttr('shipBonusDreadnoughtM1'), skill='Minmatar Dreadnought')
 
 
-class Effect6510(EffectDef):
+class Effect6510(BaseEffect):
     """
     shipBonusDreadnoughtM2ROFBonus
 
@@ -28058,7 +28062,7 @@ class Effect6510(EffectDef):
                                       src.getModifiedItemAttr('shipBonusDreadnoughtM2'), skill='Minmatar Dreadnought')
 
 
-class Effect6511(EffectDef):
+class Effect6511(BaseEffect):
     """
     shipBonusDreadnoughtM3RepairTime
 
@@ -28074,7 +28078,7 @@ class Effect6511(EffectDef):
                                       src.getModifiedItemAttr('shipBonusDreadnoughtM2'), skill='Minmatar Dreadnought')
 
 
-class Effect6513(EffectDef):
+class Effect6513(BaseEffect):
     """
     doomsdayAOEECM
 
@@ -28098,7 +28102,7 @@ class Effect6513(EffectDef):
             fit.ecmProjectedStr *= strModifier
 
 
-class Effect6526(EffectDef):
+class Effect6526(BaseEffect):
     """
     shipBonusForceAuxiliaryA1RemoteRepairAndCapAmount
 
@@ -28120,7 +28124,7 @@ class Effect6526(EffectDef):
                                       skill='Amarr Carrier')
 
 
-class Effect6527(EffectDef):
+class Effect6527(BaseEffect):
     """
     shipBonusForceAuxiliaryA2ArmorResists
 
@@ -28142,7 +28146,7 @@ class Effect6527(EffectDef):
                                skill='Amarr Carrier')
 
 
-class Effect6533(EffectDef):
+class Effect6533(BaseEffect):
     """
     shipBonusForceAuxiliaryA4WarfareLinksBonus
 
@@ -28171,7 +28175,7 @@ class Effect6533(EffectDef):
                                       'warfareBuff2Value', src.getModifiedItemAttr('shipBonusForceAuxiliaryA4'), skill='Amarr Carrier')
 
 
-class Effect6534(EffectDef):
+class Effect6534(BaseEffect):
     """
     shipBonusForceAuxiliaryM4WarfareLinksBonus
 
@@ -28200,7 +28204,7 @@ class Effect6534(EffectDef):
             'warfareBuff4Value', src.getModifiedItemAttr('shipBonusForceAuxiliaryM4'), skill='Minmatar Carrier')
 
 
-class Effect6535(EffectDef):
+class Effect6535(BaseEffect):
     """
     shipBonusForceAuxiliaryG4WarfareLinksBonus
 
@@ -28229,7 +28233,7 @@ class Effect6535(EffectDef):
             'warfareBuff1Value', src.getModifiedItemAttr('shipBonusForceAuxiliaryG4'), skill='Gallente Carrier')
 
 
-class Effect6536(EffectDef):
+class Effect6536(BaseEffect):
     """
     shipBonusForceAuxiliaryC4WarfareLinksBonus
 
@@ -28258,7 +28262,7 @@ class Effect6536(EffectDef):
             'warfareBuff1Value', src.getModifiedItemAttr('shipBonusForceAuxiliaryC4'), skill='Caldari Carrier')
 
 
-class Effect6537(EffectDef):
+class Effect6537(BaseEffect):
     """
     shipBonusRole1CommandBurstCPUBonus
 
@@ -28274,7 +28278,7 @@ class Effect6537(EffectDef):
                                       src.getModifiedItemAttr('shipBonusRole1'))
 
 
-class Effect6545(EffectDef):
+class Effect6545(BaseEffect):
     """
     shipBonusForceAuxiliaryC1RemoteBoostAndCapAmount
 
@@ -28299,7 +28303,7 @@ class Effect6545(EffectDef):
                                       skill='Caldari Carrier')
 
 
-class Effect6546(EffectDef):
+class Effect6546(BaseEffect):
     """
     shipBonusForceAuxiliaryC2ShieldResists
 
@@ -28321,7 +28325,7 @@ class Effect6546(EffectDef):
                                skill='Caldari Carrier')
 
 
-class Effect6548(EffectDef):
+class Effect6548(BaseEffect):
     """
     shipBonusForceAuxiliaryG1RemoteCycleTime
 
@@ -28343,7 +28347,7 @@ class Effect6548(EffectDef):
                                       skill='Gallente Carrier')
 
 
-class Effect6549(EffectDef):
+class Effect6549(BaseEffect):
     """
     shipBonusForceAuxiliaryG2LocalRepairAmount
 
@@ -28361,7 +28365,7 @@ class Effect6549(EffectDef):
                                       src.getModifiedItemAttr('shipBonusForceAuxiliaryG2'), skill='Gallente Carrier')
 
 
-class Effect6551(EffectDef):
+class Effect6551(BaseEffect):
     """
     shipBonusForceAuxiliaryM1RemoteDuration
 
@@ -28384,7 +28388,7 @@ class Effect6551(EffectDef):
                                       skill='Minmatar Carrier')
 
 
-class Effect6552(EffectDef):
+class Effect6552(BaseEffect):
     """
     shipBonusForceAuxiliaryM2LocalBoostAmount
 
@@ -28402,7 +28406,7 @@ class Effect6552(EffectDef):
                                       src.getModifiedItemAttr('shipBonusForceAuxiliaryM2'), skill='Minmatar Carrier')
 
 
-class Effect6555(EffectDef):
+class Effect6555(BaseEffect):
     """
     moduleBonusDroneNavigationComputer
 
@@ -28420,7 +28424,7 @@ class Effect6555(EffectDef):
                                      src.getModifiedItemAttr('speedFactor'), stackingPenalties=True)
 
 
-class Effect6556(EffectDef):
+class Effect6556(BaseEffect):
     """
     moduleBonusDroneDamageAmplifier
 
@@ -28447,7 +28451,7 @@ class Effect6556(EffectDef):
                                      src.getModifiedItemAttr('droneDamageBonus'), stackingPenalties=True)
 
 
-class Effect6557(EffectDef):
+class Effect6557(BaseEffect):
     """
     moduleBonusOmnidirectionalTrackingLink
 
@@ -28496,7 +28500,7 @@ class Effect6557(EffectDef):
                                        stackingPenalties=True)
 
 
-class Effect6558(EffectDef):
+class Effect6558(BaseEffect):
     """
     moduleBonusOmnidirectionalTrackingLinkOverload
 
@@ -28516,7 +28520,7 @@ class Effect6558(EffectDef):
         module.boostItemAttr('aoeVelocityBonus', overloadBonus)
 
 
-class Effect6559(EffectDef):
+class Effect6559(BaseEffect):
     """
     moduleBonusOmnidirectionalTrackingEnhancer
 
@@ -28565,7 +28569,7 @@ class Effect6559(EffectDef):
                                        src.getModifiedItemAttr('maxRangeBonus'), stackingPenalties=True)
 
 
-class Effect6560(EffectDef):
+class Effect6560(BaseEffect):
     """
     skillBonusFighters
 
@@ -28589,7 +28593,7 @@ class Effect6560(EffectDef):
                                        src.getModifiedItemAttr('damageMultiplierBonus') * lvl)
 
 
-class Effect6561(EffectDef):
+class Effect6561(BaseEffect):
     """
     skillBonusLightFighters
 
@@ -28606,7 +28610,7 @@ class Effect6561(EffectDef):
                                        src.getModifiedItemAttr('maxVelocityBonus') * lvl)
 
 
-class Effect6562(EffectDef):
+class Effect6562(BaseEffect):
     """
     skillBonusSupportFightersShield
 
@@ -28623,7 +28627,7 @@ class Effect6562(EffectDef):
                                        src.getModifiedItemAttr('shieldBonus') * lvl)
 
 
-class Effect6563(EffectDef):
+class Effect6563(BaseEffect):
     """
     skillBonusHeavyFighters
 
@@ -28647,7 +28651,7 @@ class Effect6563(EffectDef):
                                        src.getModifiedItemAttr('damageMultiplierBonus') * lvl)
 
 
-class Effect6565(EffectDef):
+class Effect6565(BaseEffect):
     """
     citadelRigBonus
 
@@ -28677,7 +28681,7 @@ class Effect6565(EffectDef):
                                       attr, src.getModifiedItemAttr('structureRoleBonus'))
 
 
-class Effect6566(EffectDef):
+class Effect6566(BaseEffect):
     """
     moduleBonusFighterSupportUnit
 
@@ -28704,7 +28708,7 @@ class Effect6566(EffectDef):
                                        src.getModifiedItemAttr('fighterBonusShieldRechargePercent'))
 
 
-class Effect6567(EffectDef):
+class Effect6567(BaseEffect):
     """
     moduleBonusNetworkedSensorArray
 
@@ -28739,7 +28743,7 @@ class Effect6567(EffectDef):
                                       'capacitorNeed', src.getModifiedItemAttr('ewCapacitorNeedBonus'))
 
 
-class Effect6570(EffectDef):
+class Effect6570(BaseEffect):
     """
     skillBonusFighterHangarManagement
 
@@ -28755,7 +28759,7 @@ class Effect6570(EffectDef):
         fit.ship.boostItemAttr('fighterCapacity', src.getModifiedItemAttr('skillBonusFighterHangarSize') * lvl)
 
 
-class Effect6571(EffectDef):
+class Effect6571(BaseEffect):
     """
     skillBonusCapitalAutocannonSpecialization
 
@@ -28772,7 +28776,7 @@ class Effect6571(EffectDef):
                                       'damageMultiplier', src.getModifiedItemAttr('damageMultiplierBonus') * lvl)
 
 
-class Effect6572(EffectDef):
+class Effect6572(BaseEffect):
     """
     skillBonusCapitalArtillerySpecialization
 
@@ -28789,7 +28793,7 @@ class Effect6572(EffectDef):
                                       'damageMultiplier', src.getModifiedItemAttr('damageMultiplierBonus') * lvl)
 
 
-class Effect6573(EffectDef):
+class Effect6573(BaseEffect):
     """
     skillBonusCapitalBlasterSpecialization
 
@@ -28806,7 +28810,7 @@ class Effect6573(EffectDef):
                                       'damageMultiplier', src.getModifiedItemAttr('damageMultiplierBonus') * lvl)
 
 
-class Effect6574(EffectDef):
+class Effect6574(BaseEffect):
     """
     skillBonusCapitalRailgunSpecialization
 
@@ -28823,7 +28827,7 @@ class Effect6574(EffectDef):
                                       'damageMultiplier', src.getModifiedItemAttr('damageMultiplierBonus') * lvl)
 
 
-class Effect6575(EffectDef):
+class Effect6575(BaseEffect):
     """
     skillBonusCapitalPulseLaserSpecialization
 
@@ -28840,7 +28844,7 @@ class Effect6575(EffectDef):
                                       'damageMultiplier', src.getModifiedItemAttr('damageMultiplierBonus') * lvl)
 
 
-class Effect6576(EffectDef):
+class Effect6576(BaseEffect):
     """
     skillBonusCapitalBeamLaserSpecialization
 
@@ -28857,7 +28861,7 @@ class Effect6576(EffectDef):
                                       'damageMultiplier', src.getModifiedItemAttr('damageMultiplierBonus') * lvl)
 
 
-class Effect6577(EffectDef):
+class Effect6577(BaseEffect):
     """
     skillBonusXLCruiseMissileSpecialization
 
@@ -28874,7 +28878,7 @@ class Effect6577(EffectDef):
                                       src.getModifiedItemAttr('rofBonus') * lvl)
 
 
-class Effect6578(EffectDef):
+class Effect6578(BaseEffect):
     """
     skillBonusXLTorpedoSpecialization
 
@@ -28891,7 +28895,7 @@ class Effect6578(EffectDef):
                                       src.getModifiedItemAttr('rofBonus') * lvl)
 
 
-class Effect6580(EffectDef):
+class Effect6580(BaseEffect):
     """
     shipBonusRole2LogisticDroneRepAmountBonus
 
@@ -28911,7 +28915,7 @@ class Effect6580(EffectDef):
                                      src.getModifiedItemAttr('shipBonusRole2'))
 
 
-class Effect6581(EffectDef):
+class Effect6581(BaseEffect):
     """
     moduleBonusTriageModule
 
@@ -28993,7 +28997,7 @@ class Effect6581(EffectDef):
         fit.ship.forceItemAttr('disallowDocking', src.getModifiedItemAttr('disallowDocking'))
 
 
-class Effect6582(EffectDef):
+class Effect6582(BaseEffect):
     """
     moduleBonusSiegeModule
 
@@ -29063,7 +29067,7 @@ class Effect6582(EffectDef):
         fit.ship.forceItemAttr('disallowTethering', src.getModifiedItemAttr('disallowTethering'))
 
 
-class Effect6591(EffectDef):
+class Effect6591(BaseEffect):
     """
     shipBonusSupercarrierA3WarpStrength
 
@@ -29080,7 +29084,7 @@ class Effect6591(EffectDef):
                                   skill='Amarr Carrier')
 
 
-class Effect6592(EffectDef):
+class Effect6592(BaseEffect):
     """
     shipBonusSupercarrierC3WarpStrength
 
@@ -29097,7 +29101,7 @@ class Effect6592(EffectDef):
                                   skill='Caldari Carrier')
 
 
-class Effect6593(EffectDef):
+class Effect6593(BaseEffect):
     """
     shipBonusSupercarrierG3WarpStrength
 
@@ -29113,7 +29117,7 @@ class Effect6593(EffectDef):
                                   skill='Gallente Carrier')
 
 
-class Effect6594(EffectDef):
+class Effect6594(BaseEffect):
     """
     shipBonusSupercarrierM3WarpStrength
 
@@ -29130,7 +29134,7 @@ class Effect6594(EffectDef):
                                   skill='Minmatar Carrier')
 
 
-class Effect6595(EffectDef):
+class Effect6595(BaseEffect):
     """
     shipBonusCarrierA4WarfareLinksBonus
 
@@ -29159,7 +29163,7 @@ class Effect6595(EffectDef):
             'warfareBuff2Value', src.getModifiedItemAttr('shipBonusCarrierA4'), skill='Amarr Carrier')
 
 
-class Effect6596(EffectDef):
+class Effect6596(BaseEffect):
     """
     shipBonusCarrierC4WarfareLinksBonus
 
@@ -29188,7 +29192,7 @@ class Effect6596(EffectDef):
             'warfareBuff1Value', src.getModifiedItemAttr('shipBonusCarrierC4'), skill='Caldari Carrier')
 
 
-class Effect6597(EffectDef):
+class Effect6597(BaseEffect):
     """
     shipBonusCarrierG4WarfareLinksBonus
 
@@ -29217,7 +29221,7 @@ class Effect6597(EffectDef):
             'warfareBuff1Value', src.getModifiedItemAttr('shipBonusCarrierG4'), skill='Gallente Carrier')
 
 
-class Effect6598(EffectDef):
+class Effect6598(BaseEffect):
     """
     shipBonusCarrierM4WarfareLinksBonus
 
@@ -29246,7 +29250,7 @@ class Effect6598(EffectDef):
             'buffDuration', src.getModifiedItemAttr('shipBonusCarrierM4'), skill='Minmatar Carrier')
 
 
-class Effect6599(EffectDef):
+class Effect6599(BaseEffect):
     """
     shipBonusCarrierA1ArmorResists
 
@@ -29268,7 +29272,7 @@ class Effect6599(EffectDef):
                                skill='Amarr Carrier')
 
 
-class Effect6600(EffectDef):
+class Effect6600(BaseEffect):
     """
     shipBonusCarrierC1ShieldResists
 
@@ -29290,7 +29294,7 @@ class Effect6600(EffectDef):
                                skill='Caldari Carrier')
 
 
-class Effect6601(EffectDef):
+class Effect6601(BaseEffect):
     """
     shipBonusCarrierG1FighterDamage
 
@@ -29313,7 +29317,7 @@ class Effect6601(EffectDef):
                                        src.getModifiedItemAttr('shipBonusCarrierG1'), skill='Gallente Carrier')
 
 
-class Effect6602(EffectDef):
+class Effect6602(BaseEffect):
     """
     shipBonusCarrierM1FighterDamage
 
@@ -29336,7 +29340,7 @@ class Effect6602(EffectDef):
                                        src.getModifiedItemAttr('shipBonusCarrierM1'), skill='Minmatar Carrier')
 
 
-class Effect6603(EffectDef):
+class Effect6603(BaseEffect):
     """
     shipBonusSupercarrierA1FighterDamage
 
@@ -29360,7 +29364,7 @@ class Effect6603(EffectDef):
                                        src.getModifiedItemAttr('shipBonusSupercarrierA1'), skill='Amarr Carrier')
 
 
-class Effect6604(EffectDef):
+class Effect6604(BaseEffect):
     """
     shipBonusSupercarrierC1FighterDamage
 
@@ -29384,7 +29388,7 @@ class Effect6604(EffectDef):
                                        src.getModifiedItemAttr('shipBonusSupercarrierC1'), skill='Caldari Carrier')
 
 
-class Effect6605(EffectDef):
+class Effect6605(BaseEffect):
     """
     shipBonusSupercarrierG1FighterDamage
 
@@ -29407,7 +29411,7 @@ class Effect6605(EffectDef):
                                        src.getModifiedItemAttr('shipBonusSupercarrierG1'), skill='Gallente Carrier')
 
 
-class Effect6606(EffectDef):
+class Effect6606(BaseEffect):
     """
     shipBonusSupercarrierM1FighterDamage
 
@@ -29430,7 +29434,7 @@ class Effect6606(EffectDef):
                                        src.getModifiedItemAttr('shipBonusSupercarrierM1'), skill='Minmatar Carrier')
 
 
-class Effect6607(EffectDef):
+class Effect6607(BaseEffect):
     """
     shipBonusSupercarrierA5WarfareLinksBonus
 
@@ -29459,7 +29463,7 @@ class Effect6607(EffectDef):
             'warfareBuff1Value', src.getModifiedItemAttr('shipBonusSupercarrierA5'), skill='Amarr Carrier')
 
 
-class Effect6608(EffectDef):
+class Effect6608(BaseEffect):
     """
     shipBonusSupercarrierC5WarfareLinksBonus
 
@@ -29488,7 +29492,7 @@ class Effect6608(EffectDef):
             'warfareBuff3Value', src.getModifiedItemAttr('shipBonusSupercarrierC5'), skill='Caldari Carrier')
 
 
-class Effect6609(EffectDef):
+class Effect6609(BaseEffect):
     """
     shipBonusSupercarrierG5WarfareLinksBonus
 
@@ -29517,7 +29521,7 @@ class Effect6609(EffectDef):
             'warfareBuff4Value', src.getModifiedItemAttr('shipBonusSupercarrierG5'), skill='Gallente Carrier')
 
 
-class Effect6610(EffectDef):
+class Effect6610(BaseEffect):
     """
     shipBonusSupercarrierM5WarfareLinksBonus
 
@@ -29546,7 +29550,7 @@ class Effect6610(EffectDef):
             'warfareBuff2Value', src.getModifiedItemAttr('shipBonusSupercarrierM5'), skill='Minmatar Carrier')
 
 
-class Effect6611(EffectDef):
+class Effect6611(BaseEffect):
     """
     shipBonusSupercarrierC2AfterburnerBonus
 
@@ -29562,7 +29566,7 @@ class Effect6611(EffectDef):
                                       src.getModifiedItemAttr('shipBonusSupercarrierC2'), skill='Caldari Carrier')
 
 
-class Effect6612(EffectDef):
+class Effect6612(BaseEffect):
     """
     shipBonusSupercarrierA2FighterApplicationBonus
 
@@ -29582,7 +29586,7 @@ class Effect6612(EffectDef):
                                        src.getModifiedItemAttr('shipBonusSupercarrierA2'), skill='Amarr Carrier')
 
 
-class Effect6613(EffectDef):
+class Effect6613(BaseEffect):
     """
     shipBonusSupercarrierRole1NumWarfareLinks
 
@@ -29598,7 +29602,7 @@ class Effect6613(EffectDef):
                                          src.getModifiedItemAttr('shipBonusRole1'))
 
 
-class Effect6614(EffectDef):
+class Effect6614(BaseEffect):
     """
     shipBonusSupercarrierRole2ArmorShieldModuleBonus
 
@@ -29616,7 +29620,7 @@ class Effect6614(EffectDef):
                                       src.getModifiedItemAttr('shipBonusRole2'))
 
 
-class Effect6615(EffectDef):
+class Effect6615(BaseEffect):
     """
     shipBonusSupercarrierA4BurstProjectorBonus
 
@@ -29633,7 +29637,7 @@ class Effect6615(EffectDef):
                                       src.getModifiedItemAttr('shipBonusSupercarrierA4'), skill='Amarr Carrier')
 
 
-class Effect6616(EffectDef):
+class Effect6616(BaseEffect):
     """
     shipBonusSupercarrierC4BurstProjectorBonus
 
@@ -29650,7 +29654,7 @@ class Effect6616(EffectDef):
                                       skill='Caldari Carrier')
 
 
-class Effect6617(EffectDef):
+class Effect6617(BaseEffect):
     """
     shipBonusSupercarrierG4BurstProjectorBonus
 
@@ -29667,7 +29671,7 @@ class Effect6617(EffectDef):
                                       src.getModifiedItemAttr('shipBonusSupercarrierG4'), skill='Gallente Carrier')
 
 
-class Effect6618(EffectDef):
+class Effect6618(BaseEffect):
     """
     shipBonusSupercarrierM4BurstProjectorBonus
 
@@ -29684,7 +29688,7 @@ class Effect6618(EffectDef):
                                       src.getModifiedItemAttr('shipBonusSupercarrierM4'), skill='Minmatar Carrier')
 
 
-class Effect6619(EffectDef):
+class Effect6619(BaseEffect):
     """
     shipBonusCarrierRole1NumWarfareLinks
 
@@ -29700,7 +29704,7 @@ class Effect6619(EffectDef):
                                          src.getModifiedItemAttr('shipBonusRole1'))
 
 
-class Effect6620(EffectDef):
+class Effect6620(BaseEffect):
     """
     shipBonusDreadnoughtC3ReloadBonus
 
@@ -29716,7 +29720,7 @@ class Effect6620(EffectDef):
                                       src.getModifiedItemAttr('shipBonusDreadnoughtC3'), skill='Caldari Dreadnought')
 
 
-class Effect6621(EffectDef):
+class Effect6621(BaseEffect):
     """
     shipBonusSupercarrierA2ArmorResists
 
@@ -29738,7 +29742,7 @@ class Effect6621(EffectDef):
                                skill='Amarr Carrier')
 
 
-class Effect6622(EffectDef):
+class Effect6622(BaseEffect):
     """
     shipBonusSupercarrierC2ShieldResists
 
@@ -29760,7 +29764,7 @@ class Effect6622(EffectDef):
                                skill='Caldari Carrier')
 
 
-class Effect6623(EffectDef):
+class Effect6623(BaseEffect):
     """
     shipBonusSupercarrierG2FighterHitpoints
 
@@ -29776,7 +29780,7 @@ class Effect6623(EffectDef):
                                        src.getModifiedItemAttr('shipBonusSupercarrierG2'), skill='Gallente Carrier')
 
 
-class Effect6624(EffectDef):
+class Effect6624(BaseEffect):
     """
     shipBonusSupercarrierM2FighterVelocity
 
@@ -29793,7 +29797,7 @@ class Effect6624(EffectDef):
                                        src.getModifiedItemAttr('shipBonusSupercarrierM2'), skill='Minmatar Carrier')
 
 
-class Effect6625(EffectDef):
+class Effect6625(BaseEffect):
     """
     shipBonusCarrierA2SupportFighterBonus
 
@@ -29812,7 +29816,7 @@ class Effect6625(EffectDef):
                                        src.getModifiedItemAttr('shipBonusCarrierA2'), skill='Amarr Carrier')
 
 
-class Effect6626(EffectDef):
+class Effect6626(BaseEffect):
     """
     shipBonusCarrierC2SupportFighterBonus
 
@@ -29831,7 +29835,7 @@ class Effect6626(EffectDef):
                                        skill='Caldari Carrier')
 
 
-class Effect6627(EffectDef):
+class Effect6627(BaseEffect):
     """
     shipBonusCarrierG2SupportFighterBonus
 
@@ -29850,7 +29854,7 @@ class Effect6627(EffectDef):
                                        skill='Gallente Carrier')
 
 
-class Effect6628(EffectDef):
+class Effect6628(BaseEffect):
     """
     shipBonusCarrierM2SupportFighterBonus
 
@@ -29869,7 +29873,7 @@ class Effect6628(EffectDef):
                                        src.getModifiedItemAttr('shipBonusCarrierM2'), skill='Minmatar Carrier')
 
 
-class Effect6629(EffectDef):
+class Effect6629(BaseEffect):
     """
     scriptResistanceBonusBonus
 
@@ -29888,7 +29892,7 @@ class Effect6629(EffectDef):
         src.boostItemAttr('thermalDamageResistanceBonus', src.getModifiedChargeAttr('thermalDamageResistanceBonusBonus'))
 
 
-class Effect6634(EffectDef):
+class Effect6634(BaseEffect):
     """
     shipBonusTitanA1DamageBonus
 
@@ -29904,7 +29908,7 @@ class Effect6634(EffectDef):
                                       src.getModifiedItemAttr('shipBonusTitanA1'), skill='Amarr Titan')
 
 
-class Effect6635(EffectDef):
+class Effect6635(BaseEffect):
     """
     shipBonusTitanC1KinDamageBonus
 
@@ -29924,7 +29928,7 @@ class Effect6635(EffectDef):
                                         src.getModifiedItemAttr('shipBonusTitanC1'), skill='Caldari Titan')
 
 
-class Effect6636(EffectDef):
+class Effect6636(BaseEffect):
     """
     shipBonusTitanG1DamageBonus
 
@@ -29940,7 +29944,7 @@ class Effect6636(EffectDef):
                                       src.getModifiedItemAttr('shipBonusTitanG1'), skill='Gallente Titan')
 
 
-class Effect6637(EffectDef):
+class Effect6637(BaseEffect):
     """
     shipBonusTitanM1DamageBonus
 
@@ -29956,7 +29960,7 @@ class Effect6637(EffectDef):
                                       src.getModifiedItemAttr('shipBonusTitanM1'), skill='Minmatar Titan')
 
 
-class Effect6638(EffectDef):
+class Effect6638(BaseEffect):
     """
     shipBonusTitanC2ROFBonus
 
@@ -29976,7 +29980,7 @@ class Effect6638(EffectDef):
                                       src.getModifiedItemAttr('shipBonusTitanC2'), skill='Caldari Titan')
 
 
-class Effect6639(EffectDef):
+class Effect6639(BaseEffect):
     """
     shipBonusSupercarrierA4FighterApplicationBonus
 
@@ -29996,7 +30000,7 @@ class Effect6639(EffectDef):
                                        src.getModifiedItemAttr('shipBonusSupercarrierA4'), skill='Amarr Carrier')
 
 
-class Effect6640(EffectDef):
+class Effect6640(BaseEffect):
     """
     shipBonusRole1NumWarfareLinks
 
@@ -30012,7 +30016,7 @@ class Effect6640(EffectDef):
                                          src.getModifiedItemAttr('shipBonusRole1'))
 
 
-class Effect6641(EffectDef):
+class Effect6641(BaseEffect):
     """
     shipBonusRole2ArmorPlates&ShieldExtendersBonus
 
@@ -30030,7 +30034,7 @@ class Effect6641(EffectDef):
                                       src.getModifiedItemAttr('shipBonusRole2'))
 
 
-class Effect6642(EffectDef):
+class Effect6642(BaseEffect):
     """
     skillBonusDoomsdayRapidFiring
 
@@ -30047,7 +30051,7 @@ class Effect6642(EffectDef):
                                       src.getModifiedItemAttr('rofBonus') * lvl)
 
 
-class Effect6647(EffectDef):
+class Effect6647(BaseEffect):
     """
     shipBonusTitanA3WarpStrength
 
@@ -30062,7 +30066,7 @@ class Effect6647(EffectDef):
         fit.ship.increaseItemAttr('warpScrambleStatus', src.getModifiedItemAttr('shipBonusTitanA3'), skill='Amarr Titan')
 
 
-class Effect6648(EffectDef):
+class Effect6648(BaseEffect):
     """
     shipBonusTitanC3WarpStrength
 
@@ -30077,7 +30081,7 @@ class Effect6648(EffectDef):
         fit.ship.increaseItemAttr('warpScrambleStatus', src.getModifiedItemAttr('shipBonusTitanC3'), skill='Caldari Titan')
 
 
-class Effect6649(EffectDef):
+class Effect6649(BaseEffect):
     """
     shipBonusTitanG3WarpStrength
 
@@ -30093,7 +30097,7 @@ class Effect6649(EffectDef):
         fit.ship.increaseItemAttr('warpScrambleStatus', src.getModifiedItemAttr('shipBonusTitanG3'), skill='Gallente Titan')
 
 
-class Effect6650(EffectDef):
+class Effect6650(BaseEffect):
     """
     shipBonusTitanM3WarpStrength
 
@@ -30108,7 +30112,7 @@ class Effect6650(EffectDef):
         fit.ship.increaseItemAttr('warpScrambleStatus', src.getModifiedItemAttr('shipBonusTitanM3'), skill='Minmatar Titan')
 
 
-class Effect6651(EffectDef):
+class Effect6651(BaseEffect):
     """
     shipModuleAncillaryRemoteArmorRepairer
 
@@ -30137,7 +30141,7 @@ class Effect6651(EffectDef):
         fit.extraAttributes.increase('armorRepairFullSpool', rps)
 
 
-class Effect6652(EffectDef):
+class Effect6652(BaseEffect):
     """
     shipModuleAncillaryRemoteShieldBooster
 
@@ -30157,7 +30161,7 @@ class Effect6652(EffectDef):
         fit.extraAttributes.increase('shieldRepair', amount / speed, **kwargs)
 
 
-class Effect6653(EffectDef):
+class Effect6653(BaseEffect):
     """
     shipBonusTitanA2CapNeed
 
@@ -30173,7 +30177,7 @@ class Effect6653(EffectDef):
                                       src.getModifiedItemAttr('shipBonusTitanA2'), skill='Amarr Titan')
 
 
-class Effect6654(EffectDef):
+class Effect6654(BaseEffect):
     """
     shipBonusTitanG2ROFBonus
 
@@ -30189,7 +30193,7 @@ class Effect6654(EffectDef):
                                       src.getModifiedItemAttr('shipBonusTitanG2'), skill='Gallente Titan')
 
 
-class Effect6655(EffectDef):
+class Effect6655(BaseEffect):
     """
     shipBonusTitanM2ROFBonus
 
@@ -30205,7 +30209,7 @@ class Effect6655(EffectDef):
                                       src.getModifiedItemAttr('shipBonusTitanM2'), skill='Minmatar Titan')
 
 
-class Effect6656(EffectDef):
+class Effect6656(BaseEffect):
     """
     shipBonusRole3XLTorpdeoVelocityBonus
 
@@ -30221,7 +30225,7 @@ class Effect6656(EffectDef):
                                         src.getModifiedItemAttr('shipBonusRole3'))
 
 
-class Effect6657(EffectDef):
+class Effect6657(BaseEffect):
     """
     shipBonusTitanC5AllDamageBonus
 
@@ -30253,7 +30257,7 @@ class Effect6657(EffectDef):
                                         src.getModifiedItemAttr('shipBonusTitanC5'), skill='Caldari Titan')
 
 
-class Effect6658(EffectDef):
+class Effect6658(BaseEffect):
     """
     moduleBonusBastionModule
 
@@ -30331,7 +30335,7 @@ class Effect6658(EffectDef):
         fit.ship.forceItemAttr('disallowTethering', src.getModifiedItemAttr('disallowTethering'))
 
 
-class Effect6661(EffectDef):
+class Effect6661(BaseEffect):
     """
     shipBonusCarrierM3FighterVelocity
 
@@ -30347,7 +30351,7 @@ class Effect6661(EffectDef):
                                        src.getModifiedItemAttr('shipBonusCarrierM3'), skill='Minmatar Carrier')
 
 
-class Effect6662(EffectDef):
+class Effect6662(BaseEffect):
     """
     shipBonusCarrierG3FighterHitpoints
 
@@ -30363,7 +30367,7 @@ class Effect6662(EffectDef):
                                        src.getModifiedItemAttr('shipBonusCarrierG3'), skill='Gallente Carrier')
 
 
-class Effect6663(EffectDef):
+class Effect6663(BaseEffect):
     """
     skillBonusDroneInterfacing
 
@@ -30391,7 +30395,7 @@ class Effect6663(EffectDef):
                                      src.getModifiedItemAttr('miningAmountBonus') * lvl)
 
 
-class Effect6664(EffectDef):
+class Effect6664(BaseEffect):
     """
     skillBonusDroneSharpshooting
 
@@ -30416,7 +30420,7 @@ class Effect6664(EffectDef):
                                        src.getModifiedItemAttr('rangeSkillBonus') * lvl)
 
 
-class Effect6665(EffectDef):
+class Effect6665(BaseEffect):
     """
     skillBonusDroneDurability
 
@@ -30439,7 +30443,7 @@ class Effect6665(EffectDef):
                                        src.getModifiedItemAttr('shieldCapacityBonus') * lvl)
 
 
-class Effect6667(EffectDef):
+class Effect6667(BaseEffect):
     """
     skillBonusDroneNavigation
 
@@ -30458,7 +30462,7 @@ class Effect6667(EffectDef):
                                        src.getModifiedItemAttr('maxVelocityBonus') * lvl)
 
 
-class Effect6669(EffectDef):
+class Effect6669(BaseEffect):
     """
     moduleBonusCapitalDroneDurabilityEnhancer
 
@@ -30481,7 +30485,7 @@ class Effect6669(EffectDef):
         fit.ship.boostItemAttr('cpuOutput', src.getModifiedItemAttr('drawback'))
 
 
-class Effect6670(EffectDef):
+class Effect6670(BaseEffect):
     """
     moduleBonusCapitalDroneScopeChip
 
@@ -30506,7 +30510,7 @@ class Effect6670(EffectDef):
         fit.ship.boostItemAttr('cpuOutput', src.getModifiedItemAttr('drawback'))
 
 
-class Effect6671(EffectDef):
+class Effect6671(BaseEffect):
     """
     moduleBonusCapitalDroneSpeedAugmentor
 
@@ -30525,7 +30529,7 @@ class Effect6671(EffectDef):
         fit.ship.boostItemAttr('cpuOutput', src.getModifiedItemAttr('drawback'))
 
 
-class Effect6672(EffectDef):
+class Effect6672(BaseEffect):
     """
     structureCombatRigSecurityModification
 
@@ -30552,7 +30556,7 @@ class Effect6672(EffectDef):
         module.multiplyItemAttr('structureRigMaxTargetRangeBonus', secModifier)
 
 
-class Effect6679(EffectDef):
+class Effect6679(BaseEffect):
     """
     skillStructureDoomsdayDurationBonus
 
@@ -30569,7 +30573,7 @@ class Effect6679(EffectDef):
                                       skill='Structure Doomsday Operation')
 
 
-class Effect6681(EffectDef):
+class Effect6681(BaseEffect):
     """
     shipBonusRole3NumWarfareLinks
 
@@ -30585,7 +30589,7 @@ class Effect6681(EffectDef):
                                          src.getModifiedItemAttr('shipBonusRole3'))
 
 
-class Effect6682(EffectDef):
+class Effect6682(BaseEffect):
     """
     structureModuleEffectStasisWebifier
 
@@ -30603,7 +30607,7 @@ class Effect6682(EffectDef):
                                stackingPenalties=True, *args, **kwargs)
 
 
-class Effect6683(EffectDef):
+class Effect6683(BaseEffect):
     """
     structureModuleEffectTargetPainter
 
@@ -30620,7 +30624,7 @@ class Effect6683(EffectDef):
                                    stackingPenalties=True, *args, **kwargs)
 
 
-class Effect6684(EffectDef):
+class Effect6684(BaseEffect):
     """
     structureModuleEffectRemoteSensorDampener
 
@@ -30642,7 +30646,7 @@ class Effect6684(EffectDef):
                                stackingPenalties=True, *args, **kwargs)
 
 
-class Effect6685(EffectDef):
+class Effect6685(BaseEffect):
     """
     structureModuleEffectECM
 
@@ -30661,7 +30665,7 @@ class Effect6685(EffectDef):
             fit.ecmProjectedStr *= strModifier
 
 
-class Effect6686(EffectDef):
+class Effect6686(BaseEffect):
     """
     structureModuleEffectWeaponDisruption
 
@@ -30695,7 +30699,7 @@ class Effect6686(EffectDef):
                                           stackingPenalties=True, *args, **kwargs)
 
 
-class Effect6687(EffectDef):
+class Effect6687(BaseEffect):
     """
     npcEntityRemoteArmorRepairer
 
@@ -30716,7 +30720,7 @@ class Effect6687(EffectDef):
             fit.extraAttributes.increase('armorRepairFullSpool', rps)
 
 
-class Effect6688(EffectDef):
+class Effect6688(BaseEffect):
     """
     npcEntityRemoteShieldBooster
 
@@ -30734,7 +30738,7 @@ class Effect6688(EffectDef):
             fit.extraAttributes.increase('shieldRepair', bonus / duration)
 
 
-class Effect6689(EffectDef):
+class Effect6689(BaseEffect):
     """
     npcEntityRemoteHullRepairer
 
@@ -30754,7 +30758,7 @@ class Effect6689(EffectDef):
         fit.extraAttributes.increase('hullRepair', bonus / duration)
 
 
-class Effect6690(EffectDef):
+class Effect6690(BaseEffect):
     """
     remoteWebifierEntity
 
@@ -30772,7 +30776,7 @@ class Effect6690(EffectDef):
                                stackingPenalties=True, *args, **kwargs)
 
 
-class Effect6691(EffectDef):
+class Effect6691(BaseEffect):
     """
     entityEnergyNeutralizerFalloff
 
@@ -30796,7 +30800,7 @@ class Effect6691(EffectDef):
             fit.addDrain(src, time, amount, 0)
 
 
-class Effect6692(EffectDef):
+class Effect6692(BaseEffect):
     """
     remoteTargetPaintEntity
 
@@ -30813,7 +30817,7 @@ class Effect6692(EffectDef):
                                    stackingPenalties=True, *args, **kwargs)
 
 
-class Effect6693(EffectDef):
+class Effect6693(BaseEffect):
     """
     remoteSensorDampEntity
 
@@ -30835,7 +30839,7 @@ class Effect6693(EffectDef):
                                stackingPenalties=True, *args, **kwargs)
 
 
-class Effect6694(EffectDef):
+class Effect6694(BaseEffect):
     """
     npcEntityWeaponDisruptor
 
@@ -30859,7 +30863,7 @@ class Effect6694(EffectDef):
                                           stackingPenalties=True, *args, **kwargs)
 
 
-class Effect6695(EffectDef):
+class Effect6695(BaseEffect):
     """
     entityECMFalloff
 
@@ -30882,7 +30886,7 @@ class Effect6695(EffectDef):
             fit.ecmProjectedStr *= strModifier
 
 
-class Effect6697(EffectDef):
+class Effect6697(BaseEffect):
     """
     rigDrawbackReductionArmor
 
@@ -30901,7 +30905,7 @@ class Effect6697(EffectDef):
                                       src.getModifiedItemAttr('rigDrawbackBonus') * lvl)
 
 
-class Effect6698(EffectDef):
+class Effect6698(BaseEffect):
     """
     rigDrawbackReductionAstronautics
 
@@ -30920,7 +30924,7 @@ class Effect6698(EffectDef):
                                       src.getModifiedItemAttr('rigDrawbackBonus') * lvl)
 
 
-class Effect6699(EffectDef):
+class Effect6699(BaseEffect):
     """
     rigDrawbackReductionDrones
 
@@ -30937,7 +30941,7 @@ class Effect6699(EffectDef):
                                       src.getModifiedItemAttr('rigDrawbackBonus') * lvl)
 
 
-class Effect6700(EffectDef):
+class Effect6700(BaseEffect):
     """
     rigDrawbackReductionElectronic
 
@@ -30958,7 +30962,7 @@ class Effect6700(EffectDef):
                                       src.getModifiedItemAttr('rigDrawbackBonus') * lvl)
 
 
-class Effect6701(EffectDef):
+class Effect6701(BaseEffect):
     """
     rigDrawbackReductionProjectile
 
@@ -30975,7 +30979,7 @@ class Effect6701(EffectDef):
                                       src.getModifiedItemAttr('rigDrawbackBonus') * lvl)
 
 
-class Effect6702(EffectDef):
+class Effect6702(BaseEffect):
     """
     rigDrawbackReductionEnergyWeapon
 
@@ -30992,7 +30996,7 @@ class Effect6702(EffectDef):
                                       src.getModifiedItemAttr('rigDrawbackBonus') * lvl)
 
 
-class Effect6703(EffectDef):
+class Effect6703(BaseEffect):
     """
     rigDrawbackReductionHybrid
 
@@ -31009,7 +31013,7 @@ class Effect6703(EffectDef):
                                       src.getModifiedItemAttr('rigDrawbackBonus') * lvl)
 
 
-class Effect6704(EffectDef):
+class Effect6704(BaseEffect):
     """
     rigDrawbackReductionLauncher
 
@@ -31026,7 +31030,7 @@ class Effect6704(EffectDef):
                                       src.getModifiedItemAttr('rigDrawbackBonus') * lvl)
 
 
-class Effect6705(EffectDef):
+class Effect6705(BaseEffect):
     """
     rigDrawbackReductionShield
 
@@ -31043,7 +31047,7 @@ class Effect6705(EffectDef):
                                       src.getModifiedItemAttr('rigDrawbackBonus') * lvl)
 
 
-class Effect6706(EffectDef):
+class Effect6706(BaseEffect):
     """
     setBonusAsklepian
 
@@ -31060,7 +31064,7 @@ class Effect6706(EffectDef):
                                                  'armorRepairBonus', src.getModifiedItemAttr('implantSetSerpentis2'))
 
 
-class Effect6708(EffectDef):
+class Effect6708(BaseEffect):
     """
     armorRepairAmountBonusSubcap
 
@@ -31076,7 +31080,7 @@ class Effect6708(EffectDef):
                                       'armorDamageAmount', src.getModifiedItemAttr('armorRepairBonus'))
 
 
-class Effect6709(EffectDef):
+class Effect6709(BaseEffect):
     """
     shipBonusRole1CapitalHybridDamageBonus
 
@@ -31092,7 +31096,7 @@ class Effect6709(EffectDef):
                                       'damageMultiplier', ship.getModifiedItemAttr('shipBonusRole1'))
 
 
-class Effect6710(EffectDef):
+class Effect6710(BaseEffect):
     """
     shipBonusDreadnoughtM1WebStrengthBonus
 
@@ -31108,7 +31112,7 @@ class Effect6710(EffectDef):
                                       src.getModifiedItemAttr('shipBonusDreadnoughtM1'), skill='Minmatar Dreadnought')
 
 
-class Effect6711(EffectDef):
+class Effect6711(BaseEffect):
     """
     shipBonusRole3CapitalHybridDamageBonus
 
@@ -31124,7 +31128,7 @@ class Effect6711(EffectDef):
                                       src.getModifiedItemAttr('shipBonusRole3'))
 
 
-class Effect6712(EffectDef):
+class Effect6712(BaseEffect):
     """
     shipBonusTitanM1WebStrengthBonus
 
@@ -31140,7 +31144,7 @@ class Effect6712(EffectDef):
                                       src.getModifiedItemAttr('shipBonusTitanM1'), skill='Minmatar Titan')
 
 
-class Effect6713(EffectDef):
+class Effect6713(BaseEffect):
     """
     shipBonusSupercarrierM1BurstProjectorWebBonus
 
@@ -31157,7 +31161,7 @@ class Effect6713(EffectDef):
                                       src.getModifiedItemAttr('shipBonusSupercarrierM1'), skill='Minmatar Carrier')
 
 
-class Effect6714(EffectDef):
+class Effect6714(BaseEffect):
     """
     ECMBurstJammer
 
@@ -31180,7 +31184,7 @@ class Effect6714(EffectDef):
             fit.ecmProjectedStr *= strModifier
 
 
-class Effect6717(EffectDef):
+class Effect6717(BaseEffect):
     """
     roleBonusIceOreMiningDurationCap
 
@@ -31202,7 +31206,7 @@ class Effect6717(EffectDef):
                                       src.getModifiedItemAttr('miningDurationRoleBonus'))
 
 
-class Effect6720(EffectDef):
+class Effect6720(BaseEffect):
     """
     shipBonusDroneRepairMC1
 
@@ -31222,7 +31226,7 @@ class Effect6720(EffectDef):
                                      src.getModifiedItemAttr('shipBonusMC'), skill='Minmatar Cruiser')
 
 
-class Effect6721(EffectDef):
+class Effect6721(BaseEffect):
     """
     eliteBonusLogisticRemoteArmorRepairOptimalFalloff1
 
@@ -31244,7 +31248,7 @@ class Effect6721(EffectDef):
                                       skill='Logistics Cruisers')
 
 
-class Effect6722(EffectDef):
+class Effect6722(BaseEffect):
     """
     roleBonusRemoteArmorRepairOptimalFalloff
 
@@ -31264,7 +31268,7 @@ class Effect6722(EffectDef):
                                       src.getModifiedItemAttr('roleBonusRepairRange'))
 
 
-class Effect6723(EffectDef):
+class Effect6723(BaseEffect):
     """
     shipBonusCloakCpuMC2
 
@@ -31280,7 +31284,7 @@ class Effect6723(EffectDef):
                                       src.getModifiedItemAttr('shipBonusMC2'), skill='Minmatar Cruiser')
 
 
-class Effect6724(EffectDef):
+class Effect6724(BaseEffect):
     """
     eliteBonusLogisticRemoteArmorRepairDuration3
 
@@ -31296,7 +31300,7 @@ class Effect6724(EffectDef):
                                       src.getModifiedItemAttr('eliteBonusLogistics3'), skill='Logistics Cruisers')
 
 
-class Effect6725(EffectDef):
+class Effect6725(BaseEffect):
     """
     shipBonusSETFalloffAF2
 
@@ -31312,7 +31316,7 @@ class Effect6725(EffectDef):
                                       src.getModifiedItemAttr('shipBonus2AF'), skill='Amarr Frigate')
 
 
-class Effect6726(EffectDef):
+class Effect6726(BaseEffect):
     """
     shipBonusCloakCpuMF1
 
@@ -31328,7 +31332,7 @@ class Effect6726(EffectDef):
                                       src.getModifiedItemAttr('shipBonusMF'), skill='Minmatar Frigate')
 
 
-class Effect6727(EffectDef):
+class Effect6727(BaseEffect):
     """
     eliteBonusCoverOpsNOSNeutFalloff1
 
@@ -31345,7 +31349,7 @@ class Effect6727(EffectDef):
                                       stackingPenalties=True, skill='Covert Ops')
 
 
-class Effect6730(EffectDef):
+class Effect6730(BaseEffect):
     """
     moduleBonusMicrowarpdrive
 
@@ -31367,7 +31371,7 @@ class Effect6730(EffectDef):
                                stackingPenalties=True)
 
 
-class Effect6731(EffectDef):
+class Effect6731(BaseEffect):
     """
     moduleBonusAfterburner
 
@@ -31387,7 +31391,7 @@ class Effect6731(EffectDef):
         fit.ship.boostItemAttr('maxVelocity', speedBoost * thrust / mass)
 
 
-class Effect6732(EffectDef):
+class Effect6732(BaseEffect):
     """
     moduleBonusWarfareLinkArmor
 
@@ -31408,7 +31412,7 @@ class Effect6732(EffectDef):
                     fit.addCommandBonus(id, value, module, kwargs['effect'])
 
 
-class Effect6733(EffectDef):
+class Effect6733(BaseEffect):
     """
     moduleBonusWarfareLinkShield
 
@@ -31429,7 +31433,7 @@ class Effect6733(EffectDef):
                     fit.addCommandBonus(id, value, module, kwargs['effect'])
 
 
-class Effect6734(EffectDef):
+class Effect6734(BaseEffect):
     """
     moduleBonusWarfareLinkSkirmish
 
@@ -31450,7 +31454,7 @@ class Effect6734(EffectDef):
                     fit.addCommandBonus(id, value, module, kwargs['effect'])
 
 
-class Effect6735(EffectDef):
+class Effect6735(BaseEffect):
     """
     moduleBonusWarfareLinkInfo
 
@@ -31471,7 +31475,7 @@ class Effect6735(EffectDef):
                     fit.addCommandBonus(id, value, module, kwargs['effect'])
 
 
-class Effect6736(EffectDef):
+class Effect6736(BaseEffect):
     """
     moduleBonusWarfareLinkMining
 
@@ -31492,7 +31496,7 @@ class Effect6736(EffectDef):
                     fit.addCommandBonus(id, value, module, kwargs['effect'])
 
 
-class Effect6737(EffectDef):
+class Effect6737(BaseEffect):
     """
     chargeBonusWarfareCharge
 
@@ -31509,7 +31513,7 @@ class Effect6737(EffectDef):
             module.multiplyItemAttr('warfareBuff{}Value'.format(x), value)
 
 
-class Effect6753(EffectDef):
+class Effect6753(BaseEffect):
     """
     moduleTitanEffectGenerator
 
@@ -31530,7 +31534,7 @@ class Effect6753(EffectDef):
                     fit.addCommandBonus(id, value, module, kwargs['effect'])
 
 
-class Effect6762(EffectDef):
+class Effect6762(BaseEffect):
     """
     miningDroneSpecBonus
 
@@ -31549,7 +31553,7 @@ class Effect6762(EffectDef):
                                      src.getModifiedItemAttr('maxVelocityBonus') * lvl)
 
 
-class Effect6763(EffectDef):
+class Effect6763(BaseEffect):
     """
     iceHarvestingDroneOperationDurationBonus
 
@@ -31566,7 +31570,7 @@ class Effect6763(EffectDef):
         fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill('Ice Harvesting Drone Operation'), 'duration', src.getModifiedItemAttr('rofBonus') * lvl)
 
 
-class Effect6764(EffectDef):
+class Effect6764(BaseEffect):
     """
     iceHarvestingDroneSpecBonus
 
@@ -31585,7 +31589,7 @@ class Effect6764(EffectDef):
                                      'maxVelocity', src.getModifiedItemAttr('maxVelocityBonus') * lvl)
 
 
-class Effect6765(EffectDef):
+class Effect6765(BaseEffect):
     """
     spatialPhenomenaGenerationDurationBonus
 
@@ -31602,7 +31606,7 @@ class Effect6765(EffectDef):
                                       src.getModifiedItemAttr('durationBonus') * lvl)
 
 
-class Effect6766(EffectDef):
+class Effect6766(BaseEffect):
     """
     commandProcessorEffect
 
@@ -31620,7 +31624,7 @@ class Effect6766(EffectDef):
                                          src.getModifiedItemAttr('maxGangModules'))
 
 
-class Effect6769(EffectDef):
+class Effect6769(BaseEffect):
     """
     commandBurstAoEBonus
 
@@ -31638,7 +31642,7 @@ class Effect6769(EffectDef):
                                       src.getModifiedItemAttr('areaOfEffectBonus') * src.level)
 
 
-class Effect6770(EffectDef):
+class Effect6770(BaseEffect):
     """
     armoredCommandDurationBonus
 
@@ -31655,7 +31659,7 @@ class Effect6770(EffectDef):
                                       src.getModifiedItemAttr('durationBonus') * lvl)
 
 
-class Effect6771(EffectDef):
+class Effect6771(BaseEffect):
     """
     shieldCommandDurationBonus
 
@@ -31672,7 +31676,7 @@ class Effect6771(EffectDef):
                                       src.getModifiedItemAttr('durationBonus') * lvl)
 
 
-class Effect6772(EffectDef):
+class Effect6772(BaseEffect):
     """
     informationCommandDurationBonus
 
@@ -31689,7 +31693,7 @@ class Effect6772(EffectDef):
                                       src.getModifiedItemAttr('durationBonus') * lvl)
 
 
-class Effect6773(EffectDef):
+class Effect6773(BaseEffect):
     """
     skirmishCommandDurationBonus
 
@@ -31706,7 +31710,7 @@ class Effect6773(EffectDef):
                                       src.getModifiedItemAttr('durationBonus') * lvl)
 
 
-class Effect6774(EffectDef):
+class Effect6774(BaseEffect):
     """
     miningForemanDurationBonus
 
@@ -31723,7 +31727,7 @@ class Effect6774(EffectDef):
                                       src.getModifiedItemAttr('durationBonus') * lvl)
 
 
-class Effect6776(EffectDef):
+class Effect6776(BaseEffect):
     """
     armoredCommandStrengthBonus
 
@@ -31746,7 +31750,7 @@ class Effect6776(EffectDef):
                                         src.getModifiedItemAttr('commandStrengthBonus') * lvl)
 
 
-class Effect6777(EffectDef):
+class Effect6777(BaseEffect):
     """
     shieldCommandStrengthBonus
 
@@ -31769,7 +31773,7 @@ class Effect6777(EffectDef):
                                         src.getModifiedItemAttr('commandStrengthBonus') * lvl)
 
 
-class Effect6778(EffectDef):
+class Effect6778(BaseEffect):
     """
     informationCommandStrengthBonus
 
@@ -31792,7 +31796,7 @@ class Effect6778(EffectDef):
                                         src.getModifiedItemAttr('commandStrengthBonus') * lvl)
 
 
-class Effect6779(EffectDef):
+class Effect6779(BaseEffect):
     """
     skirmishCommandStrengthBonus
 
@@ -31815,7 +31819,7 @@ class Effect6779(EffectDef):
                                         src.getModifiedItemAttr('commandStrengthBonus') * lvl)
 
 
-class Effect6780(EffectDef):
+class Effect6780(BaseEffect):
     """
     miningForemanStrengthBonus
 
@@ -31834,7 +31838,7 @@ class Effect6780(EffectDef):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Mining Foreman'), 'warfareBuff1Value', src.getModifiedItemAttr('commandStrengthBonus') * lvl)
 
 
-class Effect6782(EffectDef):
+class Effect6782(BaseEffect):
     """
     commandBurstReloadTimeBonus
 
@@ -31852,7 +31856,7 @@ class Effect6782(EffectDef):
                                       src.getModifiedItemAttr('reloadTimeBonus') * lvl)
 
 
-class Effect6783(EffectDef):
+class Effect6783(BaseEffect):
     """
     commandBurstAoERoleBonus
 
@@ -31876,7 +31880,7 @@ class Effect6783(EffectDef):
                                       src.getModifiedItemAttr('roleBonusCommandBurstAoERange'))
 
 
-class Effect6786(EffectDef):
+class Effect6786(BaseEffect):
     """
     shieldCommandBurstBonusICS3
 
@@ -31900,7 +31904,7 @@ class Effect6786(EffectDef):
                                       src.getModifiedItemAttr('shipBonusICS3'), skill='Industrial Command Ships')
 
 
-class Effect6787(EffectDef):
+class Effect6787(BaseEffect):
     """
     shipBonusDroneHPDamageMiningICS4
 
@@ -31943,7 +31947,7 @@ class Effect6787(EffectDef):
                                      )
 
 
-class Effect6788(EffectDef):
+class Effect6788(BaseEffect):
     """
     shipBonusDroneIceHarvestingICS5
 
@@ -31962,7 +31966,7 @@ class Effect6788(EffectDef):
                                      )
 
 
-class Effect6789(EffectDef):
+class Effect6789(BaseEffect):
     """
     industrialBonusDroneDamage
 
@@ -31986,7 +31990,7 @@ class Effect6789(EffectDef):
                                      src.getModifiedItemAttr('industrialBonusDroneDamage'))
 
 
-class Effect6790(EffectDef):
+class Effect6790(BaseEffect):
     """
     shipBonusDroneIceHarvestingRole
 
@@ -32002,7 +32006,7 @@ class Effect6790(EffectDef):
                                      src.getModifiedItemAttr('roleBonusDroneIceHarvestingSpeed'))
 
 
-class Effect6792(EffectDef):
+class Effect6792(BaseEffect):
     """
     shipBonusDroneHPDamageMiningORECapital4
 
@@ -32045,7 +32049,7 @@ class Effect6792(EffectDef):
                                      )
 
 
-class Effect6793(EffectDef):
+class Effect6793(BaseEffect):
     """
     miningForemanBurstBonusORECapital2
 
@@ -32069,7 +32073,7 @@ class Effect6793(EffectDef):
                                       src.getModifiedItemAttr('shipBonusORECapital2'), skill='Capital Industrial Ships')
 
 
-class Effect6794(EffectDef):
+class Effect6794(BaseEffect):
     """
     shieldCommandBurstBonusORECapital3
 
@@ -32093,7 +32097,7 @@ class Effect6794(EffectDef):
                                       src.getModifiedItemAttr('shipBonusORECapital3'), skill='Capital Industrial Ships')
 
 
-class Effect6795(EffectDef):
+class Effect6795(BaseEffect):
     """
     shipBonusDroneIceHarvestingORECapital5
 
@@ -32112,7 +32116,7 @@ class Effect6795(EffectDef):
                                      )
 
 
-class Effect6796(EffectDef):
+class Effect6796(BaseEffect):
     """
     shipModeSHTDamagePostDiv
 
@@ -32133,7 +32137,7 @@ class Effect6796(EffectDef):
         )
 
 
-class Effect6797(EffectDef):
+class Effect6797(BaseEffect):
     """
     shipModeSPTDamagePostDiv
 
@@ -32154,7 +32158,7 @@ class Effect6797(EffectDef):
         )
 
 
-class Effect6798(EffectDef):
+class Effect6798(BaseEffect):
     """
     shipModeSETDamagePostDiv
 
@@ -32175,7 +32179,7 @@ class Effect6798(EffectDef):
         )
 
 
-class Effect6799(EffectDef):
+class Effect6799(BaseEffect):
     """
     shipModeSmallMissileDamagePostDiv
 
@@ -32196,7 +32200,7 @@ class Effect6799(EffectDef):
                                                penaltyGroup='postDiv')
 
 
-class Effect6800(EffectDef):
+class Effect6800(BaseEffect):
     """
     modeDampTDResistsPostDiv
 
@@ -32212,7 +32216,7 @@ class Effect6800(EffectDef):
         fit.ship.multiplyItemAttr('sensorDampenerResistance', 1 / module.getModifiedItemAttr('modeEwarResistancePostDiv'))
 
 
-class Effect6801(EffectDef):
+class Effect6801(BaseEffect):
     """
     modeMWDandABBoostPostDiv
 
@@ -32234,7 +32238,7 @@ class Effect6801(EffectDef):
         )
 
 
-class Effect6807(EffectDef):
+class Effect6807(BaseEffect):
     """
     invulnerabilityCoreDurationBonus
 
@@ -32253,7 +32257,7 @@ class Effect6807(EffectDef):
                                       src.getModifiedItemAttr('durationBonus') * lvl)
 
 
-class Effect6844(EffectDef):
+class Effect6844(BaseEffect):
     """
     skillMultiplierDefenderMissileVelocity
 
@@ -32269,7 +32273,7 @@ class Effect6844(EffectDef):
                                         'maxVelocity', skill.getModifiedItemAttr('missileVelocityBonus') * skill.level)
 
 
-class Effect6845(EffectDef):
+class Effect6845(BaseEffect):
     """
     shipBonusCommandDestroyerRole1DefenderBonus
 
@@ -32285,7 +32289,7 @@ class Effect6845(EffectDef):
                                       'moduleReactivationDelay', ship.getModifiedItemAttr('shipBonusRole1'))
 
 
-class Effect6851(EffectDef):
+class Effect6851(BaseEffect):
     """
     shipBonusRole3CapitalEnergyDamageBonus
 
@@ -32301,7 +32305,7 @@ class Effect6851(EffectDef):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Capital Energy Turret'), 'damageMultiplier', src.getModifiedItemAttr('shipBonusRole3'))
 
 
-class Effect6852(EffectDef):
+class Effect6852(BaseEffect):
     """
     shipBonusTitanM1WebRangeBonus
 
@@ -32317,7 +32321,7 @@ class Effect6852(EffectDef):
                                       'maxRange', src.getModifiedItemAttr('shipBonusTitanM1'), skill='Minmatar Titan')
 
 
-class Effect6853(EffectDef):
+class Effect6853(BaseEffect):
     """
     shipBonusTitanA1EnergyWarfareAmountBonus
 
@@ -32335,7 +32339,7 @@ class Effect6853(EffectDef):
                                       'energyNeutralizerAmount', src.getModifiedItemAttr('shipBonusTitanA1'), skill='Amarr Titan')
 
 
-class Effect6855(EffectDef):
+class Effect6855(BaseEffect):
     """
     shipBonusDreadnoughtA1EnergyWarfareAmountBonus
 
@@ -32353,7 +32357,7 @@ class Effect6855(EffectDef):
                                       'energyNeutralizerAmount', src.getModifiedItemAttr('shipBonusDreadnoughtA1'), skill='Amarr Dreadnought')
 
 
-class Effect6856(EffectDef):
+class Effect6856(BaseEffect):
     """
     shipBonusDreadnoughtM1WebRangeBonus
 
@@ -32369,7 +32373,7 @@ class Effect6856(EffectDef):
                                       'maxRange', src.getModifiedItemAttr('shipBonusDreadnoughtM1'), skill='Minmatar Dreadnought')
 
 
-class Effect6857(EffectDef):
+class Effect6857(BaseEffect):
     """
     shipBonusForceAuxiliaryA1NosferatuRangeBonus
 
@@ -32387,7 +32391,7 @@ class Effect6857(EffectDef):
                                       'falloffEffectiveness', src.getModifiedItemAttr('shipBonusForceAuxiliaryA1'), skill='Amarr Carrier')
 
 
-class Effect6858(EffectDef):
+class Effect6858(BaseEffect):
     """
     shipBonusForceAuxiliaryA1NosferatuDrainAmount
 
@@ -32403,7 +32407,7 @@ class Effect6858(EffectDef):
                                       'powerTransferAmount', src.getModifiedItemAttr('shipBonusForceAuxiliaryA1'), skill='Amarr Carrier')
 
 
-class Effect6859(EffectDef):
+class Effect6859(BaseEffect):
     """
     shipBonusRole4NosferatuCPUBonus
 
@@ -32419,7 +32423,7 @@ class Effect6859(EffectDef):
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Energy Nosferatu', 'cpu', src.getModifiedItemAttr('shipBonusRole4'))
 
 
-class Effect6860(EffectDef):
+class Effect6860(BaseEffect):
     """
     shipBonusRole5RemoteArmorRepairPowergridBonus
 
@@ -32435,7 +32439,7 @@ class Effect6860(EffectDef):
                                       src.getModifiedItemAttr('shipBonusRole5'))
 
 
-class Effect6861(EffectDef):
+class Effect6861(BaseEffect):
     """
     shipBonusRole5CapitalRemoteArmorRepairPowergridBonus
 
@@ -32450,7 +32454,7 @@ class Effect6861(EffectDef):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Capital Remote Armor Repair Systems'), 'power', src.getModifiedItemAttr('shipBonusRole5'))
 
 
-class Effect6862(EffectDef):
+class Effect6862(BaseEffect):
     """
     shipBonusForceAuxiliaryM1RemoteArmorRepairDuration
 
@@ -32466,7 +32470,7 @@ class Effect6862(EffectDef):
                                       'duration', src.getModifiedItemAttr('shipBonusForceAuxiliaryM1'), skill='Minmatar Carrier')
 
 
-class Effect6865(EffectDef):
+class Effect6865(BaseEffect):
     """
     eliteBonusCoverOpsWarpVelocity1
 
@@ -32481,7 +32485,7 @@ class Effect6865(EffectDef):
         fit.ship.boostItemAttr('warpSpeedMultiplier', src.getModifiedItemAttr('eliteBonusCovertOps1'), skill='Covert Ops')
 
 
-class Effect6866(EffectDef):
+class Effect6866(BaseEffect):
     """
     shipBonusSmallMissileFlightTimeCF1
 
@@ -32499,7 +32503,7 @@ class Effect6866(EffectDef):
                                         'explosionDelay', src.getModifiedItemAttr('shipBonusCF'), skill='Caldari Frigate')
 
 
-class Effect6867(EffectDef):
+class Effect6867(BaseEffect):
     """
     shipBonusSPTRoFMF
 
@@ -32515,7 +32519,7 @@ class Effect6867(EffectDef):
                                       'speed', src.getModifiedItemAttr('shipBonusMF'), skill='Minmatar Frigate')
 
 
-class Effect6871(EffectDef):
+class Effect6871(BaseEffect):
     """
     concordSecStatusTankBonus
 
@@ -32544,7 +32548,7 @@ class Effect6871(EffectDef):
                                       'shieldBonus', bonus, stackingPenalties=True)
 
 
-class Effect6872(EffectDef):
+class Effect6872(BaseEffect):
     """
     eliteReconStasisWebBonus1
 
@@ -32559,7 +32563,7 @@ class Effect6872(EffectDef):
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Stasis Web', 'maxRange', src.getModifiedItemAttr('eliteBonusReconShip1'), skill='Recon Ships')
 
 
-class Effect6873(EffectDef):
+class Effect6873(BaseEffect):
     """
     eliteBonusReconWarpVelocity3
 
@@ -32574,7 +32578,7 @@ class Effect6873(EffectDef):
         fit.ship.boostItemAttr('warpSpeedMultiplier', src.getModifiedItemAttr('eliteBonusReconShip3'), skill='Recon Ships')
 
 
-class Effect6874(EffectDef):
+class Effect6874(BaseEffect):
     """
     shipBonusMedMissileFlightTimeCC2
 
@@ -32592,7 +32596,7 @@ class Effect6874(EffectDef):
                                         'explosionDelay', src.getModifiedItemAttr('shipBonusCC2'), skill='Caldari Cruiser')
 
 
-class Effect6877(EffectDef):
+class Effect6877(BaseEffect):
     """
     eliteBonusBlackOpsWarpVelocity1
 
@@ -32607,7 +32611,7 @@ class Effect6877(EffectDef):
         fit.ship.boostItemAttr('warpSpeedMultiplier', src.getModifiedItemAttr('eliteBonusBlackOps1'), stackingPenalties=True, skill='Black Ops')
 
 
-class Effect6878(EffectDef):
+class Effect6878(BaseEffect):
     """
     eliteBonusBlackOpsScramblerRange4
 
@@ -32623,7 +32627,7 @@ class Effect6878(EffectDef):
                                       src.getModifiedItemAttr('eliteBonusBlackOps4'), stackingPenalties=True, skill='Black Ops')
 
 
-class Effect6879(EffectDef):
+class Effect6879(BaseEffect):
     """
     eliteBonusBlackOpsWebRange3
 
@@ -32639,7 +32643,7 @@ class Effect6879(EffectDef):
                                       src.getModifiedItemAttr('eliteBonusBlackOps3'), stackingPenalties=True, skill='Black Ops')
 
 
-class Effect6880(EffectDef):
+class Effect6880(BaseEffect):
     """
     shipBonusLauncherRoF2CB
 
@@ -32659,7 +32663,7 @@ class Effect6880(EffectDef):
                                       src.getModifiedItemAttr('shipBonus2CB'), skill='Caldari Battleship')
 
 
-class Effect6881(EffectDef):
+class Effect6881(BaseEffect):
     """
     shipBonusLargeMissileFlightTimeCB1
 
@@ -32677,7 +32681,7 @@ class Effect6881(EffectDef):
                                         src.getModifiedItemAttr('shipBonusCB'), skill='Caldari Battleship')
 
 
-class Effect6883(EffectDef):
+class Effect6883(BaseEffect):
     """
     shipBonusForceAuxiliaryM2LocalRepairAmount
 
@@ -32695,7 +32699,7 @@ class Effect6883(EffectDef):
                                       'armorDamageAmount', src.getModifiedItemAttr('shipBonusForceAuxiliaryM2'), skill='Minmatar Carrier')
 
 
-class Effect6894(EffectDef):
+class Effect6894(BaseEffect):
     """
     subsystemEnergyNeutFittingReduction
 
@@ -32713,7 +32717,7 @@ class Effect6894(EffectDef):
                                       'power', src.getModifiedItemAttr('subsystemEnergyNeutFittingReduction'))
 
 
-class Effect6895(EffectDef):
+class Effect6895(BaseEffect):
     """
     subsystemMETFittingReduction
 
@@ -32731,7 +32735,7 @@ class Effect6895(EffectDef):
                                       'power', src.getModifiedItemAttr('subsystemMETFittingReduction'))
 
 
-class Effect6896(EffectDef):
+class Effect6896(BaseEffect):
     """
     subsystemMHTFittingReduction
 
@@ -32751,7 +32755,7 @@ class Effect6896(EffectDef):
                                       'power', src.getModifiedItemAttr('subsystemMHTFittingReduction'))
 
 
-class Effect6897(EffectDef):
+class Effect6897(BaseEffect):
     """
     subsystemMPTFittingReduction
 
@@ -32769,7 +32773,7 @@ class Effect6897(EffectDef):
                                       'cpu', src.getModifiedItemAttr('subsystemMPTFittingReduction'))
 
 
-class Effect6898(EffectDef):
+class Effect6898(BaseEffect):
     """
     subsystemMRARFittingReduction
 
@@ -32789,7 +32793,7 @@ class Effect6898(EffectDef):
                                       'power', src.getModifiedItemAttr('subsystemMRARFittingReduction'))
 
 
-class Effect6899(EffectDef):
+class Effect6899(BaseEffect):
     """
     subsystemMRSBFittingReduction
 
@@ -32810,7 +32814,7 @@ class Effect6899(EffectDef):
                                       'power', src.getModifiedItemAttr('subsystemMRSBFittingReduction'))
 
 
-class Effect6900(EffectDef):
+class Effect6900(BaseEffect):
     """
     subsystemMMissileFittingReduction
 
@@ -32831,7 +32835,7 @@ class Effect6900(EffectDef):
                                       'power', src.getModifiedItemAttr('subsystemMMissileFittingReduction'))
 
 
-class Effect6908(EffectDef):
+class Effect6908(BaseEffect):
     """
     shipBonusStrategicCruiserCaldariNaniteRepairTime2
 
@@ -32848,7 +32852,7 @@ class Effect6908(EffectDef):
                                       skill='Caldari Strategic Cruiser')
 
 
-class Effect6909(EffectDef):
+class Effect6909(BaseEffect):
     """
     shipBonusStrategicCruiserAmarrNaniteRepairTime2
 
@@ -32865,7 +32869,7 @@ class Effect6909(EffectDef):
                                       skill='Amarr Strategic Cruiser')
 
 
-class Effect6910(EffectDef):
+class Effect6910(BaseEffect):
     """
     shipBonusStrategicCruiserGallenteNaniteRepairTime2
 
@@ -32882,7 +32886,7 @@ class Effect6910(EffectDef):
                                       skill='Gallente Strategic Cruiser')
 
 
-class Effect6911(EffectDef):
+class Effect6911(BaseEffect):
     """
     shipBonusStrategicCruiserMinmatarNaniteRepairTime2
 
@@ -32899,7 +32903,7 @@ class Effect6911(EffectDef):
                                       skill='Minmatar Strategic Cruiser')
 
 
-class Effect6920(EffectDef):
+class Effect6920(BaseEffect):
     """
     structureHPBonusAddPassive
 
@@ -32915,7 +32919,7 @@ class Effect6920(EffectDef):
         fit.ship.increaseItemAttr('hp', module.getModifiedItemAttr('structureHPBonusAdd') or 0)
 
 
-class Effect6921(EffectDef):
+class Effect6921(BaseEffect):
     """
     subSystemBonusAmarrDefensive2ScanProbeStrength
 
@@ -32932,7 +32936,7 @@ class Effect6921(EffectDef):
                                         skill='Amarr Defensive Systems')
 
 
-class Effect6923(EffectDef):
+class Effect6923(BaseEffect):
     """
     subsystemBonusMinmatarOffensive1HMLHAMVelo
 
@@ -32949,7 +32953,7 @@ class Effect6923(EffectDef):
                                       skill='Minmatar Offensive Systems')
 
 
-class Effect6924(EffectDef):
+class Effect6924(BaseEffect):
     """
     subsystemBonusMinmatarOffensive3MissileExpVelo
 
@@ -32966,7 +32970,7 @@ class Effect6924(EffectDef):
                                       skill='Minmatar Offensive Systems')
 
 
-class Effect6925(EffectDef):
+class Effect6925(BaseEffect):
     """
     subsystemBonusGallenteOffensive2DroneVeloTracking
 
@@ -32986,7 +32990,7 @@ class Effect6925(EffectDef):
                                      skill='Gallente Offensive Systems')
 
 
-class Effect6926(EffectDef):
+class Effect6926(BaseEffect):
     """
     subsystemBonusAmarrPropulsionWarpCapacitor
 
@@ -33001,7 +33005,7 @@ class Effect6926(EffectDef):
         fit.ship.boostItemAttr('warpCapacitorNeed', src.getModifiedItemAttr('subsystemBonusAmarrPropulsion'), skill='Amarr Propulsion Systems')
 
 
-class Effect6927(EffectDef):
+class Effect6927(BaseEffect):
     """
     subsystemBonusMinmatarPropulsionWarpCapacitor
 
@@ -33017,7 +33021,7 @@ class Effect6927(EffectDef):
                                skill='Minmatar Propulsion Systems')
 
 
-class Effect6928(EffectDef):
+class Effect6928(BaseEffect):
     """
     subsystemBonusCaldariPropulsion2PropModHeatBenefit
 
@@ -33034,7 +33038,7 @@ class Effect6928(EffectDef):
                                       skill='Caldari Propulsion Systems')
 
 
-class Effect6929(EffectDef):
+class Effect6929(BaseEffect):
     """
     subsystemBonusGallentePropulsion2PropModHeatBenefit
 
@@ -33051,7 +33055,7 @@ class Effect6929(EffectDef):
                                       skill='Gallente Propulsion Systems')
 
 
-class Effect6930(EffectDef):
+class Effect6930(BaseEffect):
     """
     subsystemBonusAmarrCore2EnergyResistance
 
@@ -33066,7 +33070,7 @@ class Effect6930(EffectDef):
         fit.ship.boostItemAttr('energyWarfareResistance', src.getModifiedItemAttr('subsystemBonusAmarrCore2'), skill='Amarr Core Systems')
 
 
-class Effect6931(EffectDef):
+class Effect6931(BaseEffect):
     """
     subsystemBonusMinmatarCore2EnergyResistance
 
@@ -33082,7 +33086,7 @@ class Effect6931(EffectDef):
                                skill='Minmatar Core Systems')
 
 
-class Effect6932(EffectDef):
+class Effect6932(BaseEffect):
     """
     subsystemBonusGallenteCore2EnergyResistance
 
@@ -33098,7 +33102,7 @@ class Effect6932(EffectDef):
                                skill='Gallente Core Systems')
 
 
-class Effect6933(EffectDef):
+class Effect6933(BaseEffect):
     """
     subsystemBonusCaldariCore2EnergyResistance
 
@@ -33114,7 +33118,7 @@ class Effect6933(EffectDef):
                                skill='Caldari Core Systems')
 
 
-class Effect6934(EffectDef):
+class Effect6934(BaseEffect):
     """
     shipMaxLockedTargetsBonusAddPassive
 
@@ -33131,7 +33135,7 @@ class Effect6934(EffectDef):
         fit.ship.increaseItemAttr('maxLockedTargets', src.getModifiedItemAttr('maxLockedTargetsBonus'))
 
 
-class Effect6935(EffectDef):
+class Effect6935(BaseEffect):
     """
     subsystemBonusAmarrCore3EnergyWarHeatBonus
 
@@ -33147,7 +33151,7 @@ class Effect6935(EffectDef):
                                       src.getModifiedItemAttr('subsystemBonusAmarrCore3'), skill='Amarr Core Systems')
 
 
-class Effect6936(EffectDef):
+class Effect6936(BaseEffect):
     """
     subsystemBonusMinmatarCore3StasisWebHeatBonus
 
@@ -33164,7 +33168,7 @@ class Effect6936(EffectDef):
                                       skill='Minmatar Core Systems')
 
 
-class Effect6937(EffectDef):
+class Effect6937(BaseEffect):
     """
     subsystemBonusGallenteCore3WarpScramHeatBonus
 
@@ -33180,7 +33184,7 @@ class Effect6937(EffectDef):
                                       src.getModifiedItemAttr('subsystemBonusGallenteCore3'), skill='Gallente Core Systems')
 
 
-class Effect6938(EffectDef):
+class Effect6938(BaseEffect):
     """
     subsystemBonusCaldariCore3ECMHeatBonus
 
@@ -33196,7 +33200,7 @@ class Effect6938(EffectDef):
                                       src.getModifiedItemAttr('subsystemBonusCaldariCore3'), skill='Caldari Core Systems')
 
 
-class Effect6939(EffectDef):
+class Effect6939(BaseEffect):
     """
     subsystemBonusAmarrDefensive2HardenerHeat
 
@@ -33214,7 +33218,7 @@ class Effect6939(EffectDef):
                                       src.getModifiedItemAttr('subsystemBonusAmarrDefensive2'), skill='Amarr Defensive Systems')
 
 
-class Effect6940(EffectDef):
+class Effect6940(BaseEffect):
     """
     subsystemBonusGallenteDefensive2HardenerHeat
 
@@ -33232,7 +33236,7 @@ class Effect6940(EffectDef):
                                       src.getModifiedItemAttr('subsystemBonusGallenteDefensive2'), skill='Gallente Defensive Systems')
 
 
-class Effect6941(EffectDef):
+class Effect6941(BaseEffect):
     """
     subsystemBonusCaldariDefensive2HardenerHeat
 
@@ -33249,7 +33253,7 @@ class Effect6941(EffectDef):
                                       skill='Caldari Defensive Systems')
 
 
-class Effect6942(EffectDef):
+class Effect6942(BaseEffect):
     """
     subsystemBonusMinmatarDefensive2HardenerHeat
 
@@ -33269,7 +33273,7 @@ class Effect6942(EffectDef):
                                       src.getModifiedItemAttr('subsystemBonusMinmatarDefensive2'), skill='Minmatar Defensive Systems')
 
 
-class Effect6943(EffectDef):
+class Effect6943(BaseEffect):
     """
     subsystemBonusAmarrDefensive3ArmorRepHeat
 
@@ -33290,7 +33294,7 @@ class Effect6943(EffectDef):
                                       skill='Amarr Defensive Systems')
 
 
-class Effect6944(EffectDef):
+class Effect6944(BaseEffect):
     """
     subsystemBonusGallenteDefensive3ArmorRepHeat
 
@@ -33311,7 +33315,7 @@ class Effect6944(EffectDef):
                                       skill='Gallente Defensive Systems')
 
 
-class Effect6945(EffectDef):
+class Effect6945(BaseEffect):
     """
     subsystemBonusCaldariDefensive3ShieldBoostHeat
 
@@ -33332,7 +33336,7 @@ class Effect6945(EffectDef):
                                       skill='Caldari Defensive Systems')
 
 
-class Effect6946(EffectDef):
+class Effect6946(BaseEffect):
     """
     subsystemBonusMinmatarDefensive3LocalRepHeat
 
@@ -33353,7 +33357,7 @@ class Effect6946(EffectDef):
                                       skill='Minmatar Defensive Systems')
 
 
-class Effect6947(EffectDef):
+class Effect6947(BaseEffect):
     """
     subSystemBonusCaldariDefensive2ScanProbeStrength
 
@@ -33370,7 +33374,7 @@ class Effect6947(EffectDef):
                                         skill='Caldari Defensive Systems')
 
 
-class Effect6949(EffectDef):
+class Effect6949(BaseEffect):
     """
     subSystemBonusGallenteDefensive2ScanProbeStrength
 
@@ -33386,7 +33390,7 @@ class Effect6949(EffectDef):
                                         src.getModifiedItemAttr('subsystemBonusGallenteDefensive2'), skill='Gallente Defensive Systems')
 
 
-class Effect6951(EffectDef):
+class Effect6951(BaseEffect):
     """
     subSystemBonusMinmatarDefensive2ScanProbeStrength
 
@@ -33402,7 +33406,7 @@ class Effect6951(EffectDef):
                                         src.getModifiedItemAttr('subsystemBonusMinmatarDefensive2'), skill='Minmatar Defensive Systems')
 
 
-class Effect6953(EffectDef):
+class Effect6953(BaseEffect):
     """
     mediumRemoteRepFittingAdjustment
 
@@ -33421,7 +33425,7 @@ class Effect6953(EffectDef):
         module.multiplyItemAttr('cpu', module.getModifiedItemAttr('mediumRemoteRepFittingMultiplier'))
 
 
-class Effect6954(EffectDef):
+class Effect6954(BaseEffect):
     """
     subsystemBonusCommandBurstFittingReduction
 
@@ -33439,7 +33443,7 @@ class Effect6954(EffectDef):
                                       src.getModifiedItemAttr('subsystemCommandBurstFittingReduction'))
 
 
-class Effect6955(EffectDef):
+class Effect6955(BaseEffect):
     """
     subsystemRemoteShieldBoostFalloffBonus
 
@@ -33456,7 +33460,7 @@ class Effect6955(EffectDef):
                                       'falloffEffectiveness', src.getModifiedItemAttr('remoteShieldBoosterFalloffBonus'))
 
 
-class Effect6956(EffectDef):
+class Effect6956(BaseEffect):
     """
     subsystemRemoteArmorRepairerOptimalBonus
 
@@ -33472,7 +33476,7 @@ class Effect6956(EffectDef):
                                       'maxRange', src.getModifiedItemAttr('remoteArmorRepairerOptimalBonus'))
 
 
-class Effect6957(EffectDef):
+class Effect6957(BaseEffect):
     """
     subsystemRemoteArmorRepairerFalloffBonus
 
@@ -33488,7 +33492,7 @@ class Effect6957(EffectDef):
                                       'falloffEffectiveness', src.getModifiedItemAttr('remoteArmorRepairerFalloffBonus'))
 
 
-class Effect6958(EffectDef):
+class Effect6958(BaseEffect):
     """
     subsystemBonusAmarrOffensive3RemoteArmorRepairHeat
 
@@ -33504,7 +33508,7 @@ class Effect6958(EffectDef):
                                       src.getModifiedItemAttr('subsystemBonusAmarrOffensive3'), skill='Amarr Offensive Systems')
 
 
-class Effect6959(EffectDef):
+class Effect6959(BaseEffect):
     """
     subsystemBonusGallenteOffensive3RemoteArmorRepairHeat
 
@@ -33520,7 +33524,7 @@ class Effect6959(EffectDef):
                                       src.getModifiedItemAttr('subsystemBonusGallenteOffensive3'), skill='Gallente Offensive Systems')
 
 
-class Effect6960(EffectDef):
+class Effect6960(BaseEffect):
     """
     subsystemBonusCaldariOffensive3RemoteShieldBoosterHeat
 
@@ -33537,7 +33541,7 @@ class Effect6960(EffectDef):
                                       skill='Caldari Offensive Systems')
 
 
-class Effect6961(EffectDef):
+class Effect6961(BaseEffect):
     """
     subsystemBonusMinmatarOffensive3RemoteRepHeat
 
@@ -33554,7 +33558,7 @@ class Effect6961(EffectDef):
                                       skill='Minmatar Offensive Systems')
 
 
-class Effect6962(EffectDef):
+class Effect6962(BaseEffect):
     """
     subsystemBonusAmarrPropulsion2WarpSpeed
 
@@ -33570,7 +33574,7 @@ class Effect6962(EffectDef):
                                skill='Amarr Propulsion Systems')
 
 
-class Effect6963(EffectDef):
+class Effect6963(BaseEffect):
     """
     subsystemBonusMinmatarPropulsion2WarpSpeed
 
@@ -33586,7 +33590,7 @@ class Effect6963(EffectDef):
                                skill='Minmatar Propulsion Systems')
 
 
-class Effect6964(EffectDef):
+class Effect6964(BaseEffect):
     """
     subsystemBonusGallentePropulsionWarpSpeed
 
@@ -33602,7 +33606,7 @@ class Effect6964(EffectDef):
                                skill='Gallente Propulsion Systems')
 
 
-class Effect6981(EffectDef):
+class Effect6981(BaseEffect):
     """
     shipBonusTitanG1KinThermDamageBonus
 
@@ -33628,7 +33632,7 @@ class Effect6981(EffectDef):
                                       src.getModifiedItemAttr('shipBonusTitanG1'), skill='Gallente Titan')
 
 
-class Effect6982(EffectDef):
+class Effect6982(BaseEffect):
     """
     shipBonusTitanG2EMExplosiveDamageBonus
 
@@ -33654,7 +33658,7 @@ class Effect6982(EffectDef):
                                       src.getModifiedItemAttr('shipBonusTitanG2'), skill='Gallente Titan')
 
 
-class Effect6983(EffectDef):
+class Effect6983(BaseEffect):
     """
     shipBonusTitanC1ShieldResists
 
@@ -33672,7 +33676,7 @@ class Effect6983(EffectDef):
         fit.ship.boostItemAttr('shieldThermalDamageResonance', src.getModifiedItemAttr('shipBonusTitanC1'), skill='Caldari Titan')
 
 
-class Effect6984(EffectDef):
+class Effect6984(BaseEffect):
     """
     shipBonusRole4FighterDamageAndHitpoints
 
@@ -33695,7 +33699,7 @@ class Effect6984(EffectDef):
                                        src.getModifiedItemAttr('shipBonusRole4'))
 
 
-class Effect6985(EffectDef):
+class Effect6985(BaseEffect):
     """
     shipBonusDreadnoughtG1KinThermDamageBonus
 
@@ -33721,7 +33725,7 @@ class Effect6985(EffectDef):
                                       src.getModifiedItemAttr('shipBonusDreadnoughtG1'), skill='Gallente Dreadnought')
 
 
-class Effect6986(EffectDef):
+class Effect6986(BaseEffect):
     """
     shipBonusForceAuxiliaryG1RemoteShieldBoostAmount
 
@@ -33737,7 +33741,7 @@ class Effect6986(EffectDef):
                                       src.getModifiedItemAttr('shipBonusForceAuxiliaryG1'), skill='Gallente Carrier')
 
 
-class Effect6987(EffectDef):
+class Effect6987(BaseEffect):
     """
     shipBonusRole2LogisticDroneRepAmountAndHitpointBonus
 
@@ -33763,7 +33767,7 @@ class Effect6987(EffectDef):
                                         'hp', src.getModifiedItemAttr('shipBonusRole2'))
 
 
-class Effect6992(EffectDef):
+class Effect6992(BaseEffect):
     """
     roleBonusMHTDamage1
 
@@ -33778,7 +33782,7 @@ class Effect6992(EffectDef):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Hybrid Turret'), 'damageMultiplier', src.getModifiedItemAttr('shipBonusRole1'))
 
 
-class Effect6993(EffectDef):
+class Effect6993(BaseEffect):
     """
     roleBonus2BoosterPenaltyReduction
 
@@ -33805,7 +33809,7 @@ class Effect6993(EffectDef):
         fit.boosters.filteredItemBoost(lambda mod: mod.item.group.name == 'Booster', 'boosterMaxVelocityPenalty', src.getModifiedItemAttr('shipBonusRole2'))
 
 
-class Effect6994(EffectDef):
+class Effect6994(BaseEffect):
     """
     eliteReconBonusMHTDamage1
 
@@ -33821,7 +33825,7 @@ class Effect6994(EffectDef):
                                       src.getModifiedItemAttr('eliteBonusReconShip1'), skill='Recon Ships')
 
 
-class Effect6995(EffectDef):
+class Effect6995(BaseEffect):
     """
     targetABCAttack
 
@@ -33837,7 +33841,7 @@ class Effect6995(EffectDef):
         module.reloadTime = 1000
 
 
-class Effect6996(EffectDef):
+class Effect6996(BaseEffect):
     """
     eliteReconBonusArmorRepAmount3
 
@@ -33853,7 +33857,7 @@ class Effect6996(EffectDef):
                                       src.getModifiedItemAttr('eliteBonusReconShip3'), skill='Recon Ships')
 
 
-class Effect6997(EffectDef):
+class Effect6997(BaseEffect):
     """
     eliteCovertOpsBonusArmorRepAmount4
 
@@ -33869,7 +33873,7 @@ class Effect6997(EffectDef):
                                       src.getModifiedItemAttr('eliteBonusCovertOps4'), skill='Covert Ops')
 
 
-class Effect6999(EffectDef):
+class Effect6999(BaseEffect):
     """
     covertOpsStealthBomberSiegeMissileLauncherCPUNeedBonus
 
@@ -33885,7 +33889,7 @@ class Effect6999(EffectDef):
                                          'cpu', ship.getModifiedItemAttr('stealthBomberLauncherCPU'))
 
 
-class Effect7000(EffectDef):
+class Effect7000(BaseEffect):
     """
     shipBonusSHTFalloffGF1
 
@@ -33901,7 +33905,7 @@ class Effect7000(EffectDef):
                                       src.getModifiedItemAttr('shipBonusGF'), skill='Gallente Frigate')
 
 
-class Effect7001(EffectDef):
+class Effect7001(BaseEffect):
     """
     roleBonusTorpRoF1
 
@@ -33916,7 +33920,7 @@ class Effect7001(EffectDef):
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Missile Launcher Torpedo', 'speed', src.getModifiedItemAttr('shipBonusRole1'))
 
 
-class Effect7002(EffectDef):
+class Effect7002(BaseEffect):
     """
     roleBonusBombLauncherPWGCPU3
 
@@ -33932,7 +33936,7 @@ class Effect7002(EffectDef):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Bomb Deployment'), 'cpu', src.getModifiedItemAttr('shipBonusRole3'))
 
 
-class Effect7003(EffectDef):
+class Effect7003(BaseEffect):
     """
     eliteBonusCovertOpsSHTDamage3
 
@@ -33948,7 +33952,7 @@ class Effect7003(EffectDef):
                                       src.getModifiedItemAttr('eliteBonusCovertOps3'), skill='Covert Ops')
 
 
-class Effect7008(EffectDef):
+class Effect7008(BaseEffect):
     """
     structureFullPowerStateHitpointModifier
 
@@ -33964,7 +33968,7 @@ class Effect7008(EffectDef):
         fit.ship.multiplyItemAttr('armorHP', src.getModifiedItemAttr('structureFullPowerStateHitpointMultiplier') or 0)
 
 
-class Effect7009(EffectDef):
+class Effect7009(BaseEffect):
     """
     serviceModuleFullPowerHitpointPostAssign
 
@@ -33984,7 +33988,7 @@ class Effect7009(EffectDef):
         fit.ship.forceItemAttr('structureFullPowerStateHitpointMultiplier', src.getModifiedItemAttr('serviceModuleFullPowerStateHitpointMultiplier'))
 
 
-class Effect7012(EffectDef):
+class Effect7012(BaseEffect):
     """
     moduleBonusAssaultDamageControl
 
@@ -34006,7 +34010,7 @@ class Effect7012(EffectDef):
                 src.forceItemAttr(booster, src.getModifiedItemAttr('resistanceMultiplier'))
 
 
-class Effect7013(EffectDef):
+class Effect7013(BaseEffect):
     """
     eliteBonusGunshipKineticMissileDamage1
 
@@ -34022,7 +34026,7 @@ class Effect7013(EffectDef):
                                         src.getModifiedItemAttr('eliteBonusGunship1'), skill='Assault Frigates')
 
 
-class Effect7014(EffectDef):
+class Effect7014(BaseEffect):
     """
     eliteBonusGunshipThermalMissileDamage1
 
@@ -34038,7 +34042,7 @@ class Effect7014(EffectDef):
                                         src.getModifiedItemAttr('eliteBonusGunship1'), skill='Assault Frigates')
 
 
-class Effect7015(EffectDef):
+class Effect7015(BaseEffect):
     """
     eliteBonusGunshipEMMissileDamage1
 
@@ -34054,7 +34058,7 @@ class Effect7015(EffectDef):
                                         src.getModifiedItemAttr('eliteBonusGunship1'), skill='Assault Frigates')
 
 
-class Effect7016(EffectDef):
+class Effect7016(BaseEffect):
     """
     eliteBonusGunshipExplosiveMissileDamage1
 
@@ -34070,7 +34074,7 @@ class Effect7016(EffectDef):
                                         src.getModifiedItemAttr('eliteBonusGunship1'), skill='Assault Frigates')
 
 
-class Effect7017(EffectDef):
+class Effect7017(BaseEffect):
     """
     eliteBonusGunshipExplosionVelocity2
 
@@ -34086,7 +34090,7 @@ class Effect7017(EffectDef):
                                         src.getModifiedItemAttr('eliteBonusGunship2'), stackingPenalties=True, skill='Assault Frigates')
 
 
-class Effect7018(EffectDef):
+class Effect7018(BaseEffect):
     """
     shipSETROFAF
 
@@ -34102,7 +34106,7 @@ class Effect7018(EffectDef):
                                       src.getModifiedItemAttr('shipBonusAF'), stackingPenalties=False, skill='Amarr Frigate')
 
 
-class Effect7020(EffectDef):
+class Effect7020(BaseEffect):
     """
     remoteWebifierMaxRangeBonus
 
@@ -34119,7 +34123,7 @@ class Effect7020(EffectDef):
                                       src.getModifiedItemAttr('stasisWebRangeBonus'), stackingPenalties=False)
 
 
-class Effect7021(EffectDef):
+class Effect7021(BaseEffect):
     """
     structureRigMaxTargetRange
 
@@ -34136,7 +34140,7 @@ class Effect7021(EffectDef):
         fit.ship.boostItemAttr('maxTargetRange', module.getModifiedItemAttr('structureRigMaxTargetRangeBonus'))
 
 
-class Effect7024(EffectDef):
+class Effect7024(BaseEffect):
     """
     shipBonusDroneTrackingEliteGunship2
 
@@ -34152,7 +34156,7 @@ class Effect7024(EffectDef):
                                      src.getModifiedItemAttr('eliteBonusGunship2'), skill='Assault Frigates')
 
 
-class Effect7026(EffectDef):
+class Effect7026(BaseEffect):
     """
     scriptStandupWarpScram
 
@@ -34168,7 +34172,7 @@ class Effect7026(EffectDef):
         src.boostItemAttr('maxRange', src.getModifiedChargeAttr('warpScrambleRangeBonus'))
 
 
-class Effect7027(EffectDef):
+class Effect7027(BaseEffect):
     """
     structureCapacitorCapacityBonus
 
@@ -34183,7 +34187,7 @@ class Effect7027(EffectDef):
         fit.ship.increaseItemAttr('capacitorCapacity', ship.getModifiedItemAttr('capacitorBonus'))
 
 
-class Effect7028(EffectDef):
+class Effect7028(BaseEffect):
     """
     structureModifyPowerRechargeRate
 
@@ -34198,7 +34202,7 @@ class Effect7028(EffectDef):
         fit.ship.multiplyItemAttr('rechargeRate', module.getModifiedItemAttr('capacitorRechargeRateMultiplier'))
 
 
-class Effect7029(EffectDef):
+class Effect7029(BaseEffect):
     """
     structureArmorHPBonus
 
@@ -34214,7 +34218,7 @@ class Effect7029(EffectDef):
         fit.ship.boostItemAttr('hiddenArmorHPMultiplier', src.getModifiedItemAttr('armorHpBonus'), stackingPenalties=True)
 
 
-class Effect7030(EffectDef):
+class Effect7030(BaseEffect):
     """
     structureAoERoFRoleBonus
 
@@ -34235,7 +34239,7 @@ class Effect7030(EffectDef):
                                           attr, ship.getModifiedItemAttr('structureAoERoFRoleBonus'))
 
 
-class Effect7031(EffectDef):
+class Effect7031(BaseEffect):
     """
     shipBonusHeavyMissileKineticDamageCBC2
 
@@ -34251,7 +34255,7 @@ class Effect7031(EffectDef):
                                         src.getModifiedItemAttr('shipBonusCBC2'), skill='Caldari Battlecruiser')
 
 
-class Effect7032(EffectDef):
+class Effect7032(BaseEffect):
     """
     shipBonusHeavyMissileThermalDamageCBC2
 
@@ -34267,7 +34271,7 @@ class Effect7032(EffectDef):
                                         src.getModifiedItemAttr('shipBonusCBC2'), skill='Caldari Battlecruiser')
 
 
-class Effect7033(EffectDef):
+class Effect7033(BaseEffect):
     """
     shipBonusHeavyMissileEMDamageCBC2
 
@@ -34283,7 +34287,7 @@ class Effect7033(EffectDef):
                                         'emDamage', src.getModifiedItemAttr('shipBonusCBC2'), skill='Caldari Battlecruiser')
 
 
-class Effect7034(EffectDef):
+class Effect7034(BaseEffect):
     """
     shipBonusHeavyMissileExplosiveDamageCBC2
 
@@ -34299,7 +34303,7 @@ class Effect7034(EffectDef):
                                         src.getModifiedItemAttr('shipBonusCBC2'), skill='Caldari Battlecruiser')
 
 
-class Effect7035(EffectDef):
+class Effect7035(BaseEffect):
     """
     shipBonusHeavyAssaultMissileExplosiveDamageCBC2
 
@@ -34315,7 +34319,7 @@ class Effect7035(EffectDef):
                                         src.getModifiedItemAttr('shipBonusCBC2'), skill='Caldari Battlecruiser')
 
 
-class Effect7036(EffectDef):
+class Effect7036(BaseEffect):
     """
     shipBonusHeavyAssaultMissileEMDamageCBC2
 
@@ -34331,7 +34335,7 @@ class Effect7036(EffectDef):
                                         src.getModifiedItemAttr('shipBonusCBC2'), skill='Caldari Battlecruiser')
 
 
-class Effect7037(EffectDef):
+class Effect7037(BaseEffect):
     """
     shipBonusHeavyAssaultMissileThermalDamageCBC2
 
@@ -34347,7 +34351,7 @@ class Effect7037(EffectDef):
                                         'thermalDamage', src.getModifiedItemAttr('shipBonusCBC2'), skill='Caldari Battlecruiser')
 
 
-class Effect7038(EffectDef):
+class Effect7038(BaseEffect):
     """
     shipBonusHeavyAssaultMissileKineticDamageCBC2
 
@@ -34363,7 +34367,7 @@ class Effect7038(EffectDef):
                                         'kineticDamage', src.getModifiedItemAttr('shipBonusCBC2'), skill='Caldari Battlecruiser')
 
 
-class Effect7039(EffectDef):
+class Effect7039(BaseEffect):
     """
     structureHiddenMissileDamageMultiplier
 
@@ -34382,7 +34386,7 @@ class Effect7039(EffectDef):
                                                src.getModifiedItemAttr('hiddenMissileDamageMultiplier'))
 
 
-class Effect7040(EffectDef):
+class Effect7040(BaseEffect):
     """
     structureHiddenArmorHPMultiplier
 
@@ -34397,7 +34401,7 @@ class Effect7040(EffectDef):
         fit.ship.multiplyItemAttr('armorHP', src.getModifiedItemAttr('hiddenArmorHPMultiplier') or 0)
 
 
-class Effect7042(EffectDef):
+class Effect7042(BaseEffect):
     """
     shipArmorHitPointsAC1
 
@@ -34412,7 +34416,7 @@ class Effect7042(EffectDef):
         fit.ship.boostItemAttr('armorHP', src.getModifiedItemAttr('shipBonusAC'), skill='Amarr Cruiser')
 
 
-class Effect7043(EffectDef):
+class Effect7043(BaseEffect):
     """
     shipShieldHitpointsCC1
 
@@ -34427,7 +34431,7 @@ class Effect7043(EffectDef):
         fit.ship.boostItemAttr('shieldCapacity', src.getModifiedItemAttr('shipBonusCC'), skill='Caldari Cruiser')
 
 
-class Effect7044(EffectDef):
+class Effect7044(BaseEffect):
     """
     shipAgilityBonusGC1
 
@@ -34442,7 +34446,7 @@ class Effect7044(EffectDef):
         fit.ship.boostItemAttr('agility', src.getModifiedItemAttr('shipBonusGC'), skill='Gallente Cruiser')
 
 
-class Effect7045(EffectDef):
+class Effect7045(BaseEffect):
     """
     shipSignatureRadiusMC1
 
@@ -34457,7 +34461,7 @@ class Effect7045(EffectDef):
         fit.ship.boostItemAttr('signatureRadius', src.getModifiedItemAttr('shipBonusMC'), skill='Minmatar Cruiser')
 
 
-class Effect7046(EffectDef):
+class Effect7046(BaseEffect):
     """
     eliteBonusFlagCruiserAllResistances1
 
@@ -34483,7 +34487,7 @@ class Effect7046(EffectDef):
         fit.ship.boostItemAttr('emDamageResonance', src.getModifiedItemAttr('eliteBonusFlagCruisers1'), skill='Flag Cruisers')
 
 
-class Effect7047(EffectDef):
+class Effect7047(BaseEffect):
     """
     roleBonusFlagCruiserModuleFittingReduction
 
@@ -34506,7 +34510,7 @@ class Effect7047(EffectDef):
                                       'power', src.getModifiedItemAttr('flagCruiserFittingBonusPainterProbes'))
 
 
-class Effect7050(EffectDef):
+class Effect7050(BaseEffect):
     """
     aoe_beacon_bioluminescence_cloud
 
@@ -34528,7 +34532,7 @@ class Effect7050(EffectDef):
                     fit.addCommandBonus(id, value, beacon, kwargs['effect'], 'early')
 
 
-class Effect7051(EffectDef):
+class Effect7051(BaseEffect):
     """
     aoe_beacon_caustic_cloud
 
@@ -34550,7 +34554,7 @@ class Effect7051(EffectDef):
                     fit.addCommandBonus(id, value, beacon, kwargs['effect'], 'early')
 
 
-class Effect7052(EffectDef):
+class Effect7052(BaseEffect):
     """
     roleBonusFlagCruiserTargetPainterModifications
 
@@ -34568,7 +34572,7 @@ class Effect7052(EffectDef):
                                       src.getModifiedItemAttr('targetPainterRangeModifierFlagCruisers'))
 
 
-class Effect7055(EffectDef):
+class Effect7055(BaseEffect):
     """
     shipLargeWeaponsDamageBonus
 
@@ -34612,7 +34616,7 @@ class Effect7055(EffectDef):
                                         src.getModifiedItemAttr('shipBonusRole7'))
 
 
-class Effect7058(EffectDef):
+class Effect7058(BaseEffect):
     """
     aoe_beacon_filament_cloud
 
@@ -34634,7 +34638,7 @@ class Effect7058(EffectDef):
                     fit.addCommandBonus(id, value, beacon, kwargs['effect'], 'early')
 
 
-class Effect7059(EffectDef):
+class Effect7059(BaseEffect):
     """
     weather_caustic_toxin
 
@@ -34658,7 +34662,7 @@ class Effect7059(EffectDef):
                     fit.addCommandBonus(id, value, beacon, kwargs['effect'], 'early')
 
 
-class Effect7060(EffectDef):
+class Effect7060(BaseEffect):
     """
     weather_darkness
 
@@ -34682,7 +34686,7 @@ class Effect7060(EffectDef):
                     fit.addCommandBonus(id, value, beacon, kwargs['effect'], 'early')
 
 
-class Effect7061(EffectDef):
+class Effect7061(BaseEffect):
     """
     weather_electric_storm
 
@@ -34706,7 +34710,7 @@ class Effect7061(EffectDef):
                     fit.addCommandBonus(id, value, beacon, kwargs['effect'], 'early')
 
 
-class Effect7062(EffectDef):
+class Effect7062(BaseEffect):
     """
     weather_infernal
 
@@ -34730,7 +34734,7 @@ class Effect7062(EffectDef):
                     fit.addCommandBonus(id, value, beacon, kwargs['effect'], 'early')
 
 
-class Effect7063(EffectDef):
+class Effect7063(BaseEffect):
     """
     weather_xenon_gas
 
@@ -34754,7 +34758,7 @@ class Effect7063(EffectDef):
                     fit.addCommandBonus(id, value, beacon, kwargs['effect'], 'early')
 
 
-class Effect7064(EffectDef):
+class Effect7064(BaseEffect):
     """
     weather_basic
 
@@ -34766,7 +34770,7 @@ class Effect7064(EffectDef):
     type = ('projected', 'passive')
 
 
-class Effect7071(EffectDef):
+class Effect7071(BaseEffect):
     """
     smallPrecursorTurretDmgBonusRequiredSkill
 
@@ -34783,7 +34787,7 @@ class Effect7071(EffectDef):
                                       'damageMultiplier', container.getModifiedItemAttr('damageMultiplierBonus') * level)
 
 
-class Effect7072(EffectDef):
+class Effect7072(BaseEffect):
     """
     mediumPrecursorTurretDmgBonusRequiredSkill
 
@@ -34800,7 +34804,7 @@ class Effect7072(EffectDef):
                                       'damageMultiplier', container.getModifiedItemAttr('damageMultiplierBonus') * level)
 
 
-class Effect7073(EffectDef):
+class Effect7073(BaseEffect):
     """
     largePrecursorTurretDmgBonusRequiredSkill
 
@@ -34817,7 +34821,7 @@ class Effect7073(EffectDef):
                                       'damageMultiplier', container.getModifiedItemAttr('damageMultiplierBonus') * level)
 
 
-class Effect7074(EffectDef):
+class Effect7074(BaseEffect):
     """
     smallDisintegratorSkillDmgBonus
 
@@ -34834,7 +34838,7 @@ class Effect7074(EffectDef):
                                       'damageMultiplier', container.getModifiedItemAttr('damageMultiplierBonus') * level)
 
 
-class Effect7075(EffectDef):
+class Effect7075(BaseEffect):
     """
     mediumDisintegratorSkillDmgBonus
 
@@ -34851,7 +34855,7 @@ class Effect7075(EffectDef):
                                       'damageMultiplier', container.getModifiedItemAttr('damageMultiplierBonus') * level)
 
 
-class Effect7076(EffectDef):
+class Effect7076(BaseEffect):
     """
     largeDisintegratorSkillDmgBonus
 
@@ -34868,7 +34872,7 @@ class Effect7076(EffectDef):
                                       'damageMultiplier', container.getModifiedItemAttr('damageMultiplierBonus') * level)
 
 
-class Effect7077(EffectDef):
+class Effect7077(BaseEffect):
     """
     disintegratorWeaponDamageMultiply
 
@@ -34885,7 +34889,7 @@ class Effect7077(EffectDef):
                                          stackingPenalties=True)
 
 
-class Effect7078(EffectDef):
+class Effect7078(BaseEffect):
     """
     disintegratorWeaponSpeedMultiply
 
@@ -34902,7 +34906,7 @@ class Effect7078(EffectDef):
                                          stackingPenalties=True)
 
 
-class Effect7079(EffectDef):
+class Effect7079(BaseEffect):
     """
     shipPCBSSPeedBonusPCBS1
 
@@ -34918,7 +34922,7 @@ class Effect7079(EffectDef):
                                       'speed', ship.getModifiedItemAttr('shipBonusPBS1'), skill='Precursor Battleship')
 
 
-class Effect7080(EffectDef):
+class Effect7080(BaseEffect):
     """
     shipPCBSDmgBonusPCBS2
 
@@ -34934,7 +34938,7 @@ class Effect7080(EffectDef):
                                       'damageMultiplier', ship.getModifiedItemAttr('shipBonusPBS2'), skill='Precursor Battleship')
 
 
-class Effect7085(EffectDef):
+class Effect7085(BaseEffect):
     """
     shipbonusPCTDamagePC1
 
@@ -34951,7 +34955,7 @@ class Effect7085(EffectDef):
                                       'damageMultiplier', ship.getModifiedItemAttr('shipBonusPC1'), skill='Precursor Cruiser')
 
 
-class Effect7086(EffectDef):
+class Effect7086(BaseEffect):
     """
     shipbonusPCTTrackingPC2
 
@@ -34968,7 +34972,7 @@ class Effect7086(EffectDef):
                                       'trackingSpeed', ship.getModifiedItemAttr('shipBonusPC2'), skill='Precursor Cruiser')
 
 
-class Effect7087(EffectDef):
+class Effect7087(BaseEffect):
     """
     shipbonusPCTOptimalPF2
 
@@ -34985,7 +34989,7 @@ class Effect7087(EffectDef):
                                       'maxRange', ship.getModifiedItemAttr('shipBonusPF2'), skill='Precursor Frigate')
 
 
-class Effect7088(EffectDef):
+class Effect7088(BaseEffect):
     """
     shipbonusPCTDamagePF1
 
@@ -35002,7 +35006,7 @@ class Effect7088(EffectDef):
                                       'damageMultiplier', ship.getModifiedItemAttr('shipBonusPF1'), skill='Precursor Frigate')
 
 
-class Effect7091(EffectDef):
+class Effect7091(BaseEffect):
     """
     shipBonusNosNeutCapNeedRoleBonus2
 
@@ -35017,7 +35021,7 @@ class Effect7091(EffectDef):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Capacitor Emission Systems'), 'capacitorNeed', src.getModifiedItemAttr('shipBonusRole2'))
 
 
-class Effect7092(EffectDef):
+class Effect7092(BaseEffect):
     """
     shipBonusRemoteRepCapNeedRoleBonus2
 
@@ -35039,7 +35043,7 @@ class Effect7092(EffectDef):
                                       'capacitorNeed', ship.getModifiedItemAttr('shipBonusRole2'))
 
 
-class Effect7093(EffectDef):
+class Effect7093(BaseEffect):
     """
     shipBonusSmartbombCapNeedRoleBonus2
 
@@ -35062,7 +35066,7 @@ class Effect7093(EffectDef):
                                       'capacitorNeed', ship.getModifiedItemAttr('shipBonusRole2'))
 
 
-class Effect7094(EffectDef):
+class Effect7094(BaseEffect):
     """
     shipBonusRemoteRepMaxRangeRoleBonus1
 
@@ -35084,7 +35088,7 @@ class Effect7094(EffectDef):
                                       'maxRange', ship.getModifiedItemAttr('shipBonusRole1'))
 
 
-class Effect7097(EffectDef):
+class Effect7097(BaseEffect):
     """
     surgicalStrikeDamageMultiplierBonusPostPercentDamageMultiplierLocationShipGroupPrecursorTurret
 
@@ -35100,7 +35104,7 @@ class Effect7097(EffectDef):
                                       'damageMultiplier', skill.getModifiedItemAttr('damageMultiplierBonus') * skill.level)
 
 
-class Effect7111(EffectDef):
+class Effect7111(BaseEffect):
     """
     systemSmallPrecursorTurretDamage
 
@@ -35118,7 +35122,7 @@ class Effect7111(EffectDef):
                                          stackingPenalties=True)
 
 
-class Effect7112(EffectDef):
+class Effect7112(BaseEffect):
     """
     shipBonusNeutCapNeedRoleBonus2
 
@@ -35140,7 +35144,7 @@ class Effect7112(EffectDef):
                                       src.getModifiedItemAttr('shipBonusRole2'))
 
 
-class Effect7116(EffectDef):
+class Effect7116(BaseEffect):
     """
     eliteBonusReconScanProbeStrength2
 
@@ -35156,7 +35160,7 @@ class Effect7116(EffectDef):
                                         src.getModifiedItemAttr('eliteBonusReconShip2'), skill='Recon Ships')
 
 
-class Effect7117(EffectDef):
+class Effect7117(BaseEffect):
     """
     roleBonusWarpSpeed
 
@@ -35175,7 +35179,7 @@ class Effect7117(EffectDef):
         fit.ship.boostItemAttr('warpSpeedMultiplier', src.getModifiedItemAttr('shipRoleBonusWarpSpeed'))
 
 
-class Effect7118(EffectDef):
+class Effect7118(BaseEffect):
     """
     eliteBonusCovertOps3PCTdamagePerCycle
 
@@ -35191,7 +35195,7 @@ class Effect7118(EffectDef):
                                          src.getModifiedItemAttr('eliteBonusCovertOps3'), skill='Covert Ops')
 
 
-class Effect7119(EffectDef):
+class Effect7119(BaseEffect):
     """
     eliteBonusReconShip3PCTdamagePerCycle
 
@@ -35207,7 +35211,7 @@ class Effect7119(EffectDef):
                                          src.getModifiedItemAttr('eliteBonusReconShip3'), skill='Recon Ships')
 
 
-class Effect7142(EffectDef):
+class Effect7142(BaseEffect):
     """
     massEntanglerEffect5
 
@@ -35230,7 +35234,7 @@ class Effect7142(EffectDef):
         fit.ship.boostItemAttr('maxVelocity', src.getModifiedItemAttr('maxVelocityBonus'), stackingPenalties=True)
 
 
-class Effect7154(EffectDef):
+class Effect7154(BaseEffect):
     """
     shipBonusPD1DisintegratorDamage
 
@@ -35247,7 +35251,7 @@ class Effect7154(EffectDef):
                                       skill='Precursor Destroyer')
 
 
-class Effect7155(EffectDef):
+class Effect7155(BaseEffect):
     """
     shipBonusPBC1DisintegratorDamage
 
@@ -35264,7 +35268,7 @@ class Effect7155(EffectDef):
                                       skill='Precursor Battlecruiser')
 
 
-class Effect7156(EffectDef):
+class Effect7156(BaseEffect):
     """
     smallDisintegratorMaxRangeBonus
 
@@ -35280,7 +35284,7 @@ class Effect7156(EffectDef):
                                       'maxRange', ship.getModifiedItemAttr('maxRangeBonus'))
 
 
-class Effect7157(EffectDef):
+class Effect7157(BaseEffect):
     """
     shipBonusPD2DisintegratorMaxRange
 
@@ -35297,7 +35301,7 @@ class Effect7157(EffectDef):
                                       skill='Precursor Destroyer')
 
 
-class Effect7158(EffectDef):
+class Effect7158(BaseEffect):
     """
     shipArmorKineticResistancePBC2
 
@@ -35313,7 +35317,7 @@ class Effect7158(EffectDef):
                                skill='Precursor Battlecruiser')
 
 
-class Effect7159(EffectDef):
+class Effect7159(BaseEffect):
     """
     shipArmorThermalResistancePBC2
 
@@ -35329,7 +35333,7 @@ class Effect7159(EffectDef):
                                skill='Precursor Battlecruiser')
 
 
-class Effect7160(EffectDef):
+class Effect7160(BaseEffect):
     """
     shipArmorEMResistancePBC2
 
@@ -35345,7 +35349,7 @@ class Effect7160(EffectDef):
                                skill='Precursor Battlecruiser')
 
 
-class Effect7161(EffectDef):
+class Effect7161(BaseEffect):
     """
     shipArmorExplosiveResistancePBC2
 
@@ -35361,7 +35365,7 @@ class Effect7161(EffectDef):
                                skill='Precursor Battlecruiser')
 
 
-class Effect7162(EffectDef):
+class Effect7162(BaseEffect):
     """
     shipRoleDisintegratorMaxRangeCBC
 
@@ -35377,7 +35381,7 @@ class Effect7162(EffectDef):
                                       'maxRange', ship.getModifiedItemAttr('roleBonusCBC'))
 
 
-class Effect7166(EffectDef):
+class Effect7166(BaseEffect):
     """
     ShipModuleRemoteArmorMutadaptiveRepairer
 
@@ -35405,7 +35409,7 @@ class Effect7166(EffectDef):
             fit.extraAttributes.increase('armorRepairFullSpool', rpsFullSpool, **kwargs)
 
 
-class Effect7167(EffectDef):
+class Effect7167(BaseEffect):
     """
     shipBonusRemoteCapacitorTransferRangeRole1
 
@@ -35420,7 +35424,7 @@ class Effect7167(EffectDef):
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Remote Capacitor Transmitter', 'maxRange', src.getModifiedItemAttr('shipBonusRole1'))
 
 
-class Effect7168(EffectDef):
+class Effect7168(BaseEffect):
     """
     shipBonusMutadaptiveRemoteRepairRangeRole3
 
@@ -35435,7 +35439,7 @@ class Effect7168(EffectDef):
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Mutadaptive Remote Armor Repairer', 'maxRange', src.getModifiedItemAttr('shipBonusRole3'))
 
 
-class Effect7169(EffectDef):
+class Effect7169(BaseEffect):
     """
     shipBonusMutadaptiveRepAmountPC1
 
@@ -35450,7 +35454,7 @@ class Effect7169(EffectDef):
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Mutadaptive Remote Armor Repairer', 'armorDamageAmount', src.getModifiedItemAttr('shipBonusPC1'), skill='Precursor Cruiser')
 
 
-class Effect7170(EffectDef):
+class Effect7170(BaseEffect):
     """
     shipBonusMutadaptiveRepCapNeedPC2
 
@@ -35465,7 +35469,7 @@ class Effect7170(EffectDef):
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Mutadaptive Remote Armor Repairer', 'capacitorNeed', src.getModifiedItemAttr('shipBonusPC2'), skill='Precursor Cruiser')
 
 
-class Effect7171(EffectDef):
+class Effect7171(BaseEffect):
     """
     shipBonusMutadaptiveRemoteRepRangePC1
 
@@ -35480,7 +35484,7 @@ class Effect7171(EffectDef):
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Mutadaptive Remote Armor Repairer', 'maxRange', src.getModifiedItemAttr('shipBonusPC1'), skill='Precursor Cruiser')
 
 
-class Effect7172(EffectDef):
+class Effect7172(BaseEffect):
     """
     shipBonusMutadaptiveRemoteRepCapNeedeliteBonusLogisitics1
 
@@ -35495,7 +35499,7 @@ class Effect7172(EffectDef):
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Mutadaptive Remote Armor Repairer', 'capacitorNeed', src.getModifiedItemAttr('eliteBonusLogistics1'), skill='Logistics Cruisers')
 
 
-class Effect7173(EffectDef):
+class Effect7173(BaseEffect):
     """
     shipBonusMutadaptiveRemoteRepAmounteliteBonusLogisitics2
 
@@ -35510,7 +35514,7 @@ class Effect7173(EffectDef):
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Mutadaptive Remote Armor Repairer', 'armorDamageAmount', src.getModifiedItemAttr('eliteBonusLogistics2'), skill='Logistics Cruisers')
 
 
-class Effect7176(EffectDef):
+class Effect7176(BaseEffect):
     """
     skillBonusDroneInterfacingNotFighters
 
@@ -35527,7 +35531,7 @@ class Effect7176(EffectDef):
                                      src.getModifiedItemAttr('damageMultiplierBonus'))
 
 
-class Effect7177(EffectDef):
+class Effect7177(BaseEffect):
     """
     skillBonusDroneDurabilityNotFighters
 
@@ -35547,7 +35551,7 @@ class Effect7177(EffectDef):
                                      src.getModifiedItemAttr('shieldCapacityBonus'))
 
 
-class Effect7179(EffectDef):
+class Effect7179(BaseEffect):
     """
     stripMinerDurationMultiplier
 
@@ -35563,7 +35567,7 @@ class Effect7179(EffectDef):
                                       'duration', module.getModifiedItemAttr('miningDurationMultiplier'))
 
 
-class Effect7180(EffectDef):
+class Effect7180(BaseEffect):
     """
     miningDurationMultiplierOnline
 
@@ -35579,7 +35583,7 @@ class Effect7180(EffectDef):
                                       'duration', module.getModifiedItemAttr('miningDurationMultiplier'))
 
 
-class Effect7183(EffectDef):
+class Effect7183(BaseEffect):
     """
     implantWarpScrambleRangeBonus
 
diff --git a/eos/gamedata.py b/eos/gamedata.py
index 07f25ae51..a2f4962dc 100644
--- a/eos/gamedata.py
+++ b/eos/gamedata.py
@@ -140,7 +140,7 @@ class Effect(EqBase):
         Whether this effect is implemented in code or not,
         unimplemented effects simply do nothing at all when run
         """
-        return self.handler is not eos.effects.EffectDef.handler
+        return self.__effectDef is not None
 
     def isType(self, type):
         """
@@ -157,7 +157,7 @@ class Effect(EqBase):
             effectDefName = "Effect{}".format(self.ID)
             pyfalog.debug("Loading {0} ({1})".format(self.name, effectDefName))
             self.__effectDef = effectDef = getattr(eos.effects, effectDefName)
-            self.__handler = getattr(effectDef, "handler", eos.effects.EffectDef.handler)
+            self.__handler = getattr(effectDef, "handler", eos.effects.BaseEffect.handler)
             self.__runTime = getattr(effectDef, "runTime", "normal")
             self.__activeByDefault = getattr(effectDef, "activeByDefault", True)
             effectType = getattr(effectDef, "type", None)
@@ -165,20 +165,20 @@ class Effect(EqBase):
             self.__type = effectType
         except ImportError as e:
             # Effect probably doesn't exist, so create a dummy effect and flag it with a warning.
-            self.__handler = eos.effects.EffectDef.handler
+            self.__handler = eos.effects.DummyEffect.handler
             self.__runTime = "normal"
             self.__activeByDefault = True
             self.__type = None
             pyfalog.debug("ImportError generating handler: {0}", e)
         except AttributeError as e:
             # Effect probably exists but there is an issue with it.  Turn it into a dummy effect so we can continue, but flag it with an error.
-            self.__handler = eos.effects.EffectDef.handler
+            self.__handler = eos.effects.DummyEffect.handler
             self.__runTime = "normal"
             self.__activeByDefault = True
             self.__type = None
             pyfalog.error("AttributeError generating handler: {0}", e)
         except Exception as e:
-            self.__handler = eos.effects.EffectDef.handler
+            self.__handler = eos.effects.DummyEffect.handler
             self.__runTime = "normal"
             self.__activeByDefault = True
             self.__type = None
diff --git a/eos/saveddata/boosterSideEffect.py b/eos/saveddata/boosterSideEffect.py
index ad0814928..32c467232 100644
--- a/eos/saveddata/boosterSideEffect.py
+++ b/eos/saveddata/boosterSideEffect.py
@@ -57,7 +57,7 @@ class BoosterSideEffect(object):
     def name(self):
         return "{0}% {1}".format(
             self.booster.getModifiedItemAttr(self.attr),
-            self.__effect.getattr('displayName') or self.__effect.handlerName,
+            self.__effect.getattr('displayName') or self.__effect.name,
         )
 
     @property
diff --git a/eos/saveddata/fighter.py b/eos/saveddata/fighter.py
index 8024b0681..46cf2e6c8 100644
--- a/eos/saveddata/fighter.py
+++ b/eos/saveddata/fighter.py
@@ -56,7 +56,7 @@ class Fighter(HandledItem, HandledCharge, ItemAttrShortcut, ChargeAttrShortcut):
 
         standardAttackActive = False
         for ability in self.abilities:
-            if ability.effect.isImplemented and ability.effect.handlerName == 'fighterabilityattackm':
+            if ability.effect.isImplemented and ability.effect.name == 'fighterAbilityAttackM':
                 # Activate "standard attack" if available
                 ability.active = True
                 standardAttackActive = True
@@ -64,8 +64,8 @@ class Fighter(HandledItem, HandledCharge, ItemAttrShortcut, ChargeAttrShortcut):
                 # Activate all other abilities (Neut, Web, etc) except propmods if no standard attack is active
                 if ability.effect.isImplemented and \
                                 standardAttackActive is False and \
-                                ability.effect.handlerName != 'fighterabilitymicrowarpdrive' and \
-                                ability.effect.handlerName != 'fighterabilityevasivemaneuvers':
+                                ability.effect.name != 'fighterAbilityMicroWarpDrive' and \
+                                ability.effect.name != 'fighterAbilityEvasiveManeuvers':
                     ability.active = True
 
     @reconstructor
diff --git a/eos/saveddata/fighterAbility.py b/eos/saveddata/fighterAbility.py
index 684ceec94..f9cfb608f 100644
--- a/eos/saveddata/fighterAbility.py
+++ b/eos/saveddata/fighterAbility.py
@@ -73,7 +73,7 @@ class FighterAbility(object):
 
     @property
     def name(self):
-        return self.__effect.getattr('displayName') or self.__effect.handlerName
+        return self.__effect.getattr('displayName') or self.__effect.name
 
     @property
     def attrPrefix(self):
diff --git a/gui/builtinItemStatsViews/itemEffects.py b/gui/builtinItemStatsViews/itemEffects.py
index 37b37c608..0b87a0cbd 100644
--- a/gui/builtinItemStatsViews/itemEffects.py
+++ b/gui/builtinItemStatsViews/itemEffects.py
@@ -21,8 +21,6 @@ class ItemEffects(wx.Panel):
         self.SetSizer(mainSizer)
 
         self.Bind(wx.EVT_LIST_ITEM_ACTIVATED, self.OnClick, self.effectList)
-        if config.debug:
-            self.Bind(wx.EVT_LIST_ITEM_RIGHT_CLICK, self.OnRightClick, self.effectList)
 
         self.PopulateList()
 
@@ -100,26 +98,6 @@ class ItemEffects(wx.Panel):
 
         self.RefreshValues(event)
 
-    def OnRightClick(self, event):
-        """
-        Debug use: open effect file with default application.
-        If effect file does not exist, create it
-        """
-
-        effect = self.effects[event.GetText()]
-
-        file_ = os.path.join(config.pyfaPath, "eos", "effects", "%s.py" % effect.handlerName)
-
-        if not os.path.isfile(file_):
-            open(file_, 'a').close()
-
-        if 'wxMSW' in wx.PlatformInfo:
-            os.startfile(file_)
-        elif 'wxMac' in wx.PlatformInfo:
-            os.system("open " + file_)
-        else:
-            subprocess.call(["xdg-open", file_])
-
     def RefreshValues(self, event):
         self.Freeze()
         self.effectList.ClearAll()

From b836ceb216c9bc335cb8a42befce9b9a5805cbfe Mon Sep 17 00:00:00 2001
From: Ryan Holmes <holmes.ryan.90@gmail.com>
Date: Sat, 23 Mar 2019 22:07:08 -0400
Subject: [PATCH 26/32] Use checked api instead of bitmap for factor reload
 (#1897)

---
 gui/builtinContextMenus/factorReload.py |  9 +++------
 gui/contextMenu.py                      | 10 +++++++++-
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/gui/builtinContextMenus/factorReload.py b/gui/builtinContextMenus/factorReload.py
index 5600c4c5c..c70028efc 100644
--- a/gui/builtinContextMenus/factorReload.py
+++ b/gui/builtinContextMenus/factorReload.py
@@ -29,12 +29,9 @@ class FactorReload(ContextMenu):
         sFit.refreshFit(fitID)
         wx.PostEvent(self.mainFrame, GE.FitChanged(fitID=fitID))
 
-    def getBitmap(self, context, selection):
+    @property
+    def checked(self):
         sFit = Fit.getInstance()
-        if sFit.serviceFittingOptions["useGlobalForceReload"]:
-            return BitmapLoader.getBitmap("state_active_small", "gui")
-        else:
-            return None
-
+        return sFit.serviceFittingOptions["useGlobalForceReload"]
 
 FactorReload.register()
diff --git a/gui/contextMenu.py b/gui/contextMenu.py
index b479ab913..ec9048429 100644
--- a/gui/contextMenu.py
+++ b/gui/contextMenu.py
@@ -79,7 +79,8 @@ class ContextMenu(object):
                     multiple = not isinstance(bitmap, wx.Bitmap)
                     for it, text in enumerate(texts):
                         id = cls.nextID()
-                        rootItem = wx.MenuItem(rootMenu, id, text)
+                        check = m.checked
+                        rootItem = wx.MenuItem(rootMenu, id, text, kind=wx.ITEM_NORMAL if m.checked is None else wx.ITEM_CHECK)
                         rootMenu.info[id] = (m, fullContext, it)
 
                         sub = m.getSubMenu(srcContext, selection, rootMenu, it, rootItem)
@@ -114,6 +115,9 @@ class ContextMenu(object):
 
                         rootMenu.Append(rootItem)
 
+                        if check is not None:
+                            rootItem.Check(check)
+
                     empty = False
 
             if display_amount > 0 and i != len(fullContexts) - 1:
@@ -177,6 +181,10 @@ class ContextMenu(object):
     def getBitmap(self, context, selection):
         return None
 
+    @property
+    def checked(self):
+        '''If menu item is toggleable, this should return bool value'''
+        return None
 
 # noinspection PyUnresolvedReferences
 from gui.builtinContextMenus import (  # noqa: E402,F401

From 2b817c5d225aca62879436ba075b83396c7bc6f9 Mon Sep 17 00:00:00 2001
From: Ryan Holmes <holmes.ryan.90@gmail.com>
Date: Sun, 24 Mar 2019 07:18:16 -0400
Subject: [PATCH 27/32] Allow platforms that can use a checked image to use
 one, otherwise this should fallback to plain check (for GTK)

---
 gui/contextMenu.py | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/gui/contextMenu.py b/gui/contextMenu.py
index ec9048429..cf6cea49a 100644
--- a/gui/contextMenu.py
+++ b/gui/contextMenu.py
@@ -20,6 +20,7 @@
 # noinspection PyPackageRequirements
 import wx
 from logbook import Logger
+from gui.bitmap_loader import BitmapLoader
 
 pyfalog = Logger(__name__)
 
@@ -80,7 +81,12 @@ class ContextMenu(object):
                     for it, text in enumerate(texts):
                         id = cls.nextID()
                         check = m.checked
-                        rootItem = wx.MenuItem(rootMenu, id, text, kind=wx.ITEM_NORMAL if m.checked is None else wx.ITEM_CHECK)
+                        if check is not None:
+                            rootItem = wx.MenuItem(rootMenu, id, text, kind=wx.ITEM_CHECK)
+                            rootItem.SetBitmap(BitmapLoader.getBitmap("state_active_small", "gui"))
+                        else:
+                            rootItem = wx.MenuItem(rootMenu, id, text, kind=wx.ITEM_NORMAL)
+
                         rootMenu.info[id] = (m, fullContext, it)
 
                         sub = m.getSubMenu(srcContext, selection, rootMenu, it, rootItem)

From 8ba05409e0540099e455d62ac0bcaff56d4d001d Mon Sep 17 00:00:00 2001
From: Ryan Holmes <holmes.ryan.90@gmail.com>
Date: Sun, 24 Mar 2019 07:21:43 -0400
Subject: [PATCH 28/32] nvm, it doesn't

Revert "Allow platforms that can use a checked image to use one, otherwise this should fallback to plain check (for GTK)"

This reverts commit 2b817c5d225aca62879436ba075b83396c7bc6f9.
---
 gui/contextMenu.py | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/gui/contextMenu.py b/gui/contextMenu.py
index cf6cea49a..ec9048429 100644
--- a/gui/contextMenu.py
+++ b/gui/contextMenu.py
@@ -20,7 +20,6 @@
 # noinspection PyPackageRequirements
 import wx
 from logbook import Logger
-from gui.bitmap_loader import BitmapLoader
 
 pyfalog = Logger(__name__)
 
@@ -81,12 +80,7 @@ class ContextMenu(object):
                     for it, text in enumerate(texts):
                         id = cls.nextID()
                         check = m.checked
-                        if check is not None:
-                            rootItem = wx.MenuItem(rootMenu, id, text, kind=wx.ITEM_CHECK)
-                            rootItem.SetBitmap(BitmapLoader.getBitmap("state_active_small", "gui"))
-                        else:
-                            rootItem = wx.MenuItem(rootMenu, id, text, kind=wx.ITEM_NORMAL)
-
+                        rootItem = wx.MenuItem(rootMenu, id, text, kind=wx.ITEM_NORMAL if m.checked is None else wx.ITEM_CHECK)
                         rootMenu.info[id] = (m, fullContext, it)
 
                         sub = m.getSubMenu(srcContext, selection, rootMenu, it, rootItem)

From d40a7c2efa68aa4664c1f888f1a835c4acfcf55e Mon Sep 17 00:00:00 2001
From: Ryan Holmes <holmes.ryan.90@gmail.com>
Date: Sun, 24 Mar 2019 08:17:49 -0400
Subject: [PATCH 29/32] Fix for GTK - you can only enable a menu item after
 it's been added to menu

---
 gui/builtinContextMenus/metaSwap.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/gui/builtinContextMenus/metaSwap.py b/gui/builtinContextMenus/metaSwap.py
index d9a34599e..edab076bf 100644
--- a/gui/builtinContextMenus/metaSwap.py
+++ b/gui/builtinContextMenus/metaSwap.py
@@ -117,11 +117,12 @@ class MetaSwap(ContextMenu):
 
             id = ContextMenu.nextID()
             mitem = wx.MenuItem(rootMenu, id, item.name)
-            mitem.Enable(fit.canFit(item))
             bindmenu.Bind(wx.EVT_MENU, self.handleModule, mitem)
 
             self.moduleLookup[id] = item, context
             m.Append(mitem)
+            mitem.Enable(fit.canFit(item))
+
         return m
 
     def handleModule(self, event):

From be579cfaebfff500be2b8eef8362a609e53f1ada Mon Sep 17 00:00:00 2001
From: Ryan Holmes <holmes.ryan.90@gmail.com>
Date: Sun, 24 Mar 2019 10:46:44 -0400
Subject: [PATCH 30/32] bump version

---
 version.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/version.yml b/version.yml
index e35fb355c..ac7723914 100644
--- a/version.yml
+++ b/version.yml
@@ -1 +1 @@
-version: v2.7.5
+version: v2.8.0

From 656a7fc784f11f1b0e50424529853eee63abd074 Mon Sep 17 00:00:00 2001
From: Ryan Holmes <holmes.ryan.90@gmail.com>
Date: Sun, 24 Mar 2019 16:59:18 -0400
Subject: [PATCH 31/32] Do not attempted to remove from projected panel if
 nothing of interest is selected (#1899)

---
 gui/builtinAdditionPanes/projectedView.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/gui/builtinAdditionPanes/projectedView.py b/gui/builtinAdditionPanes/projectedView.py
index 1b941fd83..59d046761 100644
--- a/gui/builtinAdditionPanes/projectedView.py
+++ b/gui/builtinAdditionPanes/projectedView.py
@@ -129,8 +129,10 @@ class ProjectedView(d.Display):
             sFit = Fit.getInstance()
             row = self.GetFirstSelected()
             if row != -1:
-                sFit.removeProjected(fitID, self.get(row))
-                wx.PostEvent(self.mainFrame, GE.FitChanged(fitID=fitID))
+                thing = self.get(row)
+                if thing:
+                    sFit.removeProjected(fitID, self.get(row))
+                    wx.PostEvent(self.mainFrame, GE.FitChanged(fitID=fitID))
 
     def handleDrag(self, type, fitID):
         # Those are drags coming from pyfa sources, NOT builtin wx drags

From 37ad2faa8e79a13dd415554661546872e615e828 Mon Sep 17 00:00:00 2001
From: DarkPhoenix <phoenix@mail.ru>
Date: Mon, 25 Mar 2019 10:07:23 +0300
Subject: [PATCH 32/32] Fix fit XML export

---
 gui/copySelectDialog.py | 4 ++--
 gui/mainFrame.py        | 2 +-
 service/port/port.py    | 4 ++--
 service/port/xml.py     | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/gui/copySelectDialog.py b/gui/copySelectDialog.py
index 985b98d01..55b02e535 100644
--- a/gui/copySelectDialog.py
+++ b/gui/copySelectDialog.py
@@ -174,7 +174,7 @@ class CopySelectDialog(wx.Dialog):
 
     def exportXml(self, options, callback):
         fit = getFit(self.mainFrame.getActiveFit())
-        Port.exportXml(None, fit, callback)
+        Port.exportXml([fit], None, callback)
 
     def exportMultiBuy(self, options, callback):
         fit = getFit(self.mainFrame.getActiveFit())
@@ -182,4 +182,4 @@ class CopySelectDialog(wx.Dialog):
 
     def exportEfs(self, options, callback):
         fit = getFit(self.mainFrame.getActiveFit())
-        EfsPort.exportEfs(fit, 0, callback)
\ No newline at end of file
+        EfsPort.exportEfs(fit, 0, callback)
diff --git a/gui/mainFrame.py b/gui/mainFrame.py
index 78126fa80..a185bc96a 100644
--- a/gui/mainFrame.py
+++ b/gui/mainFrame.py
@@ -418,7 +418,7 @@ class MainFrame(wx.Frame):
             format_ = dlg.GetFilterIndex()
             path = dlg.GetPath()
             if format_ == 0:
-                output = Port.exportXml(None, fit)
+                output = Port.exportXml([fit], None)
                 if '.' not in os.path.basename(path):
                     path += ".xml"
             else:
diff --git a/service/port/port.py b/service/port/port.py
index 1f961f6c1..a82f6c27b 100644
--- a/service/port/port.py
+++ b/service/port/port.py
@@ -284,8 +284,8 @@ class Port(object):
         return importXml(text, iportuser)
 
     @staticmethod
-    def exportXml(iportuser=None, callback=None, *fits):
-        return exportXml(iportuser, callback=callback, *fits)
+    def exportXml(fits, iportuser=None, callback=None):
+        return exportXml(fits, iportuser, callback=callback)
 
     # Multibuy-related methods
     @staticmethod
diff --git a/service/port/xml.py b/service/port/xml.py
index 0e1f1e9ed..5d577f8f7 100644
--- a/service/port/xml.py
+++ b/service/port/xml.py
@@ -226,7 +226,7 @@ def importXml(text, iportuser):
     return fit_list
 
 
-def exportXml(iportuser, callback, *fits):
+def exportXml(fits, iportuser, callback):
     doc = xml.dom.minidom.Document()
     fittings = doc.createElement("fittings")
     # fit count