Bump to stable version

This creates a new migration module that include upgrade logic files, one file for each DB version. It should be noted that this will not support downgrades (the previous method didn't really support them either)

config.py

@@ -13,12 +13,16 @@ debug = False
 saveInRoot = False
 
 # Version data
-version = "1.3.1"
+version = "1.5.0"
-tag = "git"
+tag = "Stable"
-expansionName = "Crius"
+expansionName = "Oceanus"
 expansionVersion = "1.0"
 evemonMinVersion = "4081"
 
+# Database version (int ONLY)
+# Increment every time we need to flag for user database upgrade/modification
+dbversion = 1
+
 pyfaPath = None
 savePath = None
 staticPath = None

eos/db/__init__.py

@@ -49,7 +49,6 @@ if saveddata_connectionstring is not None:
 
     saveddata_meta = MetaData()
     saveddata_meta.bind = saveddata_engine
-    migration.update(saveddata_engine)
     saveddata_session = sessionmaker(bind=saveddata_engine, autoflush=False, expire_on_commit=False)()
 
 # Lock controlling any changes introduced to session
@@ -66,7 +65,7 @@ from eos.db.saveddata.queries import getUser, getCharacter, getFit, getFitsWithS
                                      getCharacterList, getPrice, getDamagePatternList, getDamagePattern, \
                                      getFitList, getFleetList, getFleet, save, remove, commit, add, \
                                      getCharactersForUser, getMiscData, getSquadsIDsWithFitID, getWing, \
-                                     getSquad, getBoosterFits, getProjectedFits
+                                     getSquad, getBoosterFits, getProjectedFits, getTargetResistsList, getTargetResists
 
 #If using in memory saveddata, you'll want to reflect it so the data structure is good.
 if config.saveddata_connectionstring == "sqlite:///:memory:":

eos/db/migration.py

@@ -1,59 +1,32 @@
-import sqlalchemy
+import config
+import shutil
+import time
+
+def getVersion(db):
+    cursor = db.execute('PRAGMA user_version')
+    return cursor.fetchone()[0]
 
 def update(saveddata_engine):
-    checkPriceFailures(saveddata_engine)
+    currversion = getVersion(saveddata_engine)
-    checkApiDefaultChar(saveddata_engine)
-    checkFitBooster(saveddata_engine)
 
-def checkPriceFailures(saveddata_engine):
+    if currversion == config.dbversion:
-    # Check if we have 'failed' column
+        return
-    try:
-        saveddata_engine.execute("SELECT failed FROM prices")
-    except sqlalchemy.exc.DatabaseError:
-        # As we don't have any important data there, let's just drop
-        # and recreate whole table
-        from eos.db.saveddata.price import prices_table
-        # Attempt to drop/create table only if it's already there
-        try:
-            prices_table.drop(saveddata_engine)
-            prices_table.create(saveddata_engine)
-        except sqlalchemy.exc.DatabaseError:
-            pass
 
+    if currversion < config.dbversion:
+        # Automatically backup database
+        toFile = "%s/saveddata_migration_%d-%d_%s.db"%(
+            config.savePath,
+            currversion,
+            config.dbversion,
+            time.strftime("%Y%m%d_%H%M%S"))
 
-def checkApiDefaultChar(saveddata_engine):
+        shutil.copyfile(config.saveDB, toFile)
-    try:
-        saveddata_engine.execute("SELECT * FROM characters LIMIT 1")
-    # If table doesn't exist, it means we're doing everything from scratch
-    # and sqlalchemy will process everything as needed
-    except sqlalchemy.exc.DatabaseError:
-        pass
-    # If not, we're running on top of existing DB
-    else:
-        # Check that we have columns
-        try:
-            saveddata_engine.execute("SELECT defaultChar, chars FROM characters LIMIT 1")
-        # If we don't, create them
-        # This is ugly as hell, but we can't use proper migrate packages as it
-        # will require us to rebuild skeletons, including mac
-        except sqlalchemy.exc.DatabaseError:
-            saveddata_engine.execute("ALTER TABLE characters ADD COLUMN defaultChar INTEGER;")
-            saveddata_engine.execute("ALTER TABLE characters ADD COLUMN chars VARCHAR;")
 
-def checkFitBooster(saveddata_engine):
+        for version in xrange(currversion, config.dbversion):
-    try:
+            module = __import__('eos.db.migrations.upgrade%d'%(version+1), fromlist=True)
-        saveddata_engine.execute("SELECT * FROM fits LIMIT 1")
+            upgrade = getattr(module, "upgrade", False)
-    # If table doesn't exist, it means we're doing everything from scratch
+            if upgrade:
-    # and sqlalchemy will process everything as needed
+                upgrade(saveddata_engine)
-    except sqlalchemy.exc.DatabaseError:
+
-        pass
+        # when all is said and done, set version to current
-    # If not, we're running on top of existing DB
+        saveddata_engine.execute('PRAGMA user_version = %d'%config.dbversion)
-    else:
-        # Check that we have columns
-        try:
-            saveddata_engine.execute("SELECT booster FROM fits LIMIT 1")
-        # If we don't, create them
-        except sqlalchemy.exc.DatabaseError:
-            saveddata_engine.execute("ALTER TABLE fits ADD COLUMN booster BOOLEAN;")
-        # Set NULL data to 0 (needed in case of downgrade, see GH issue #62
-        saveddata_engine.execute("UPDATE fits SET booster = 0 WHERE booster IS NULL;")

eos/db/migrations/__init__.py

@@ -0,0 +1,9 @@
+"""
+The migration module includes migration logic to update database scheme and/or
+data for the user database.
+
+To create a migration, simply create a file upgrade<migration number>.py and
+define an upgrade() function with the logic. Please note that there must be as
+many upgrade files as there are database versions (version 5 would include
+upgrade files 1-5)
+"""

eos/db/migrations/upgrade1.py

@@ -0,0 +1,97 @@
+"""
+Migration 1
+
+- Alters fits table to introduce target resist attribute
+- Converts modules based on Oceanus Module Tiericide
+    Some modules have been deleted, which causes pyfa to crash when fits are
+    loaded as they no longer exist in the database. We therefore replace these
+    modules with their new replacements
+
+    Based on http://community.eveonline.com/news/patch-notes/patch-notes-for-oceanus/
+    and output of itemDiff.py
+"""
+
+import sqlalchemy
+
+CONVERSIONS = {
+    6135: [  # Scoped Cargo Scanner
+        6133,  # Interior Type-E Cargo Identifier
+    ],
+    6527: [  # Compact Ship Scanner
+        6525,  # Ta3 Perfunctory Vessel Probe
+        6529,  # Speculative Ship Identifier I
+        6531,  # Practical Type-E Ship Probe
+    ],
+    6569: [  # Scoped Survey Scanner
+        6567,  # ML-3 Amphilotite Mining Probe
+        6571,  # Rock-Scanning Sensor Array I
+        6573,  # 'Dactyl' Type-E Asteroid Analyzer
+    ],
+    509: [  # 'Basic' Capacitor Flux Coil
+        8163,  # Partial Power Plant Manager: Capacitor Flux
+        8165,  # Alpha Reactor Control: Capacitor Flux
+        8167,  # Type-E Power Core Modification: Capacitor Flux
+        8169,  # Marked Generator Refitting: Capacitor Flux
+    ],
+    8135: [  # Restrained Capacitor Flux Coil
+        8131,  # Local Power Plant Manager: Capacitor Flux I
+    ],
+    8133: [  # Compact Capacitor Flux Coil
+        8137,  # Mark I Generator Refitting: Capacitor Flux
+    ],
+    3469: [  # Basic Co-Processor
+        8744,  # Nanoelectrical Co-Processor
+        8743,  # Nanomechanical CPU Enhancer
+        8746,  # Quantum Co-Processor
+        8745,  # Photonic CPU Enhancer
+        15425,  # Naiyon's Modified Co-Processor (never existed but convert
+                # anyway as some fits may include it)
+    ],
+    8748: [  # Upgraded Co-Processor
+        8747,  # Nanomechanical CPU Enhancer I
+        8750,  # Quantum Co-Processor I
+        8749,  # Photonic CPU Enhancer I
+    ],
+    1351: [  # Basic Reactor Control Unit
+        8251,  # Partial Power Plant Manager: Reaction Control
+        8253,  # Alpha Reactor Control: Reaction Control
+        8257,  # Marked Generator Refitting: Reaction Control
+    ],
+    8263: [  # Compact Reactor Control Unit
+        8259,  # Local Power Plant Manager: Reaction Control I
+        8265,  # Mark I Generator Refitting: Reaction Control
+        8261,  # Beta Reactor Control: Reaction Control I
+    ],
+    16537: [  # Compact Micro Auxiliary Power Core
+        16539,  # Micro B88 Core Augmentation
+        16541,  # Micro K-Exhaust Core Augmentation
+    ],
+    31936: [  # Navy Micro Auxiliary Power Core
+        16543,  # Micro 'Vigor' Core Augmentation
+    ],
+    8089: [  # Compact Light Missile Launcher
+       8093,  # Prototype 'Arbalest' Light Missile Launcher
+    ],
+    8091: [  # Ample Light Missile Launcher
+        7993,  # Experimental TE-2100 Light Missile Launcher
+    ],
+    # Surface Cargo Scanner I was removed from game, however no mention of
+    # replacement module in patch notes. Morphing it to meta 0 module to be safe
+    442: [  # Cargo Scanner I
+        6129,  # Surface Cargo Scanner I
+    ]
+}
+
+def upgrade(saveddata_engine):
+    # Update fits schema
+    try:
+        saveddata_engine.execute("SELECT targetResistsID FROM fits LIMIT 1")
+    except sqlalchemy.exc.DatabaseError:
+        saveddata_engine.execute("ALTER TABLE fits ADD COLUMN targetResistsID INTEGER;")
+
+    # Convert modules
+    for replacement_item, list in CONVERSIONS.iteritems():
+        for retired_item in list:
+            saveddata_engine.execute('UPDATE "modules" SET "itemID" = ? WHERE "itemID" = ?', (replacement_item, retired_item))
+            saveddata_engine.execute('UPDATE "cargo" SET "itemID" = ? WHERE "itemID" = ?', (replacement_item, retired_item))
+

eos/db/saveddata/__init__.py

@@ -1,3 +1,3 @@
 __all__ = ["character", "fit", "module", "user", "skill", "price",
            "booster", "drone", "implant", "fleet", "damagePattern",
-           "miscData"]
+           "miscData", "targetResists"]

eos/db/saveddata/fit.py

@@ -26,10 +26,11 @@ from eos.db.saveddata.module import modules_table
 from eos.db.saveddata.drone import drones_table
 from eos.db.saveddata.cargo import cargo_table
 from eos.db.saveddata.implant import fitImplants_table
-from eos.types import Fit, Module, User, Booster, Drone, Cargo, Implant, Character, DamagePattern
+from eos.types import Fit, Module, User, Booster, Drone, Cargo, Implant, Character, DamagePattern, TargetResists
 from eos.effectHandlerHelpers import HandledModuleList, HandledDroneList, \
 HandledImplantBoosterList, HandledProjectedModList, HandledProjectedDroneList, \
 HandledProjectedFitList, HandledCargoList
+
 fits_table = Table("fits", saveddata_meta,
                          Column("ID", Integer, primary_key = True),
                          Column("ownerID", ForeignKey("users.ID"), nullable = True, index = True),
@@ -38,7 +39,8 @@ fits_table = Table("fits", saveddata_meta,
                          Column("timestamp", Integer, nullable = False),
                          Column("characterID", ForeignKey("characters.ID"), nullable = True),
                          Column("damagePatternID", ForeignKey("damagePatterns.ID"), nullable=True),
-                         Column("booster", Boolean, nullable = False, index = True, default = 0))
+                         Column("booster", Boolean, nullable = False, index = True, default = 0),
+                         Column("targetResistsID", ForeignKey("targetResists.ID"), nullable=True))
 
 projectedFits_table = Table("projectedFits", saveddata_meta,
                             Column("sourceID", ForeignKey("fits.ID"), primary_key = True),
@@ -64,6 +66,7 @@ mapper(Fit, fits_table,
                                                  secondary = fitImplants_table),
                      "_Fit__character" : relation(Character, backref = "fits"),
                      "_Fit__damagePattern" : relation(DamagePattern),
+                     "_Fit__targetResists" : relation(TargetResists),
                      "_Fit__projectedFits" : relation(Fit,
                                                       primaryjoin = projectedFits_table.c.victimID == fits_table.c.ID,
                                                       secondaryjoin = fits_table.c.ID == projectedFits_table.c.sourceID,

eos/db/saveddata/queries.py

@@ -19,7 +19,7 @@
 
 from eos.db.util import processEager, processWhere
 from eos.db import saveddata_session, sd_lock
-from eos.types import User, Character, Fit, Price, DamagePattern, Fleet, MiscData, Wing, Squad
+from eos.types import User, Character, Fit, Price, DamagePattern, Fleet, MiscData, Wing, Squad, TargetResists
 from eos.db.saveddata.fleet import squadmembers_table
 from eos.db.saveddata.fit import projectedFits_table
 from sqlalchemy.sql import and_
@@ -322,6 +322,12 @@ def getDamagePatternList(eager=None):
         patterns = saveddata_session.query(DamagePattern).options(*eager).all()
     return patterns
 
+def getTargetResistsList(eager=None):
+    eager = processEager(eager)
+    with sd_lock:
+        patterns = saveddata_session.query(TargetResists).options(*eager).all()
+    return patterns
+
 @cachedQuery(DamagePattern, 1, "lookfor")
 def getDamagePattern(lookfor, eager=None):
     if isinstance(lookfor, int):
@@ -340,6 +346,24 @@ def getDamagePattern(lookfor, eager=None):
         raise TypeError("Need integer or string as argument")
     return pattern
 
+@cachedQuery(TargetResists, 1, "lookfor")
+def getTargetResists(lookfor, eager=None):
+    if isinstance(lookfor, int):
+        if eager is None:
+            with sd_lock:
+                pattern = saveddata_session.query(TargetResists).get(lookfor)
+        else:
+            eager = processEager(eager)
+            with sd_lock:
+                pattern = saveddata_session.query(TargetResists).options(*eager).filter(TargetResists.ID == lookfor).first()
+    elif isinstance(lookfor, basestring):
+        eager = processEager(eager)
+        with sd_lock:
+            pattern = saveddata_session.query(TargetResists).options(*eager).filter(TargetResists.name == lookfor).first()
+    else:
+        raise TypeError("Need integer or string as argument")
+    return pattern
+
 def searchFits(nameLike, where=None, eager=None):
     if not isinstance(nameLike, basestring):
         raise TypeError("Need string as argument")
@@ -361,7 +385,7 @@ def getSquadsIDsWithFitID(fitID):
             return squads
     else:
         raise TypeError("Need integer as argument")
-        
+
 def getProjectedFits(fitID):
     if isinstance(fitID, int):
         with sd_lock:
@@ -369,7 +393,7 @@ def getProjectedFits(fitID):
             fits = saveddata_session.query(Fit).filter(filter).all()
             return fits
     else:
-        raise TypeError("Need integer as argument")        
+        raise TypeError("Need integer as argument")
 
 def add(stuff):
     with sd_lock:

eos/db/saveddata/targetResists.py

@@ -0,0 +1,35 @@
+#===============================================================================
+# Copyright (C) 2014 Ryan Holmes
+#
+# 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/>.
+#===============================================================================
+
+from sqlalchemy import Table, Column, Integer, Float, ForeignKey, String
+from sqlalchemy.orm import mapper
+
+from eos.db import saveddata_meta
+from eos.types import TargetResists
+
+targetResists_table = Table("targetResists", saveddata_meta,
+                             Column("ID", Integer, primary_key = True),
+                             Column("name", String),
+                             Column("emAmount", Float),
+                             Column("thermalAmount", Float),
+                             Column("kineticAmount", Float),
+                             Column("explosiveAmount", Float),
+                             Column("ownerID", ForeignKey("users.ID"), nullable=True))
+
+mapper(TargetResists, targetResists_table)

eos/effects/accerationcontrolcapneedbonuspostpercentcapacitorneedlocationshipgroupafterburner.py

@@ -1,3 +1,5 @@
+# accerationControlCapNeedBonusPostPercentCapacitorNeedLocationShipGroupAfterburner
+#
 # Used by:
 # Modules named like: Dynamic Fuel Valve (8 of 8)
 type = "passive"

eos/effects/accerationcontrolskillabmwdspeedboost.py

@@ -1,3 +1,5 @@
+# accerationControlSkillAb&MwdSpeedBoost
+#
 # Used by:
 # Implant: Zor's Custom Navigation Hyper-Link
 # Skill: Acceleration Control

eos/effects/accerationcontrolspeedfbonuspostpercentspeedfactorlocationshipgroupafterburner.py

@@ -1,3 +1,5 @@
+# accerationControlSpeedFBonusPostPercentSpeedFactorLocationShipGroupAfterburner
+#
 # Used by:
 # Implants named like: Eifyr and Co. 'Rogue' Acceleration Control AC (6 of 6)
 type = "passive"

eos/effects/accessdifficultybonusmodifierrequiringarchaelogy.py

@@ -1,3 +1,5 @@
+# accessDifficultyBonusModifierRequiringArchaelogy
+#
 # Used by:
 # Modules named like: Emission Scope Sharpener (8 of 8)
 # Implant: Poteque 'Prospector' Archaeology AC-905

eos/effects/accessdifficultybonusmodifierrequiringhacking.py

@@ -1,3 +1,5 @@
+# accessDifficultyBonusModifierRequiringHacking
+#
 # Used by:
 # Modules named like: Memetic Algorithm Bank (8 of 8)
 # Implant: Poteque 'Prospector' Environmental Analysis EY-1005

eos/effects/adaptivearmorhardener.py

@@ -1,3 +1,5 @@
+# adaptiveArmorHardener
+#
 # Used by:
 # Module: Reactive Armor Hardener
 type = "active"

eos/effects/addtosignatureradius2.py

@@ -1,3 +1,5 @@
+# addToSignatureRadius2
+#
 # Used by:
 # Modules from group: Shield Extender (37 of 37)
 type = "passive"

eos/effects/advanceddroneinterfacingmaxgroupdcuskilllevel.py

@@ -1,3 +1,5 @@
+# advancedDroneInterfacingMaxGroupDCUSkillLevel
+#
 # Used by:
 # Skill: Advanced Drone Interfacing
 type = "passive"

eos/effects/afterburnerdurationbonuspostpercentdurationlocationshipmodulesrequiringafterburner.py

@@ -1,3 +1,5 @@
+# afterburnerDurationBonusPostPercentDurationLocationShipModulesRequiringAfterburner
+#
 # Used by:
 # Implants named like: Eifyr and Co. 'Rogue' Afterburner AB (6 of 6)
 # Implant: Zor's Custom Navigation Link

eos/effects/agilitymultipliereffect.py

@@ -1,3 +1,5 @@
+# agilityMultiplierEffect
+#
 # Used by:
 # Modules from group: Inertia Stabilizer (12 of 12)
 # Modules from group: Nanofiber Internal Structure (14 of 14)

eos/effects/agilitymultipliereffectpassive.py

@@ -1,3 +1,5 @@
+# agilityMultiplierEffectPassive
+#
 # Used by:
 # Modules named like: Polycarbon Engine Housing (8 of 8)
 type = "passive"

eos/effects/ammofallofmultiplier.py

@@ -1,3 +1,5 @@
+# ammoFallofMultiplier
+#
 # Used by:
 # Charges from group: Advanced Artillery Ammo (6 of 6)
 # Charges from group: Advanced Autocannon Ammo (6 of 6)

eos/effects/ammoinfluencecapneed.py

@@ -1,3 +1,5 @@
+# ammoInfluenceCapNeed
+#
 # Used by:
 # Items from category: Charge (458 of 828)
 type = "passive"

eos/effects/ammoinfluencerange.py

@@ -1,3 +1,5 @@
+# ammoInfluenceRange
+#
 # Used by:
 # Items from category: Charge (559 of 828)
 type = "passive"

eos/effects/ammospeedmultiplier.py

@@ -1,3 +1,5 @@
+# ammoSpeedMultiplier
+#
 # Used by:
 # Charges from group: Festival Charges (8 of 8)
 # Charges from group: Survey Probe (3 of 3)

eos/effects/ammotrackingmultiplier.py

@@ -1,3 +1,5 @@
+# ammoTrackingMultiplier
+#
 # Used by:
 # Charges from group: Advanced Artillery Ammo (6 of 6)
 # Charges from group: Advanced Autocannon Ammo (6 of 6)

eos/effects/angelsetbonus.py

@@ -1,3 +1,5 @@
+# angelsetbonus
+#
 # Used by:
 # Implants named like: grade Halo (18 of 18)
 runTime = "early"

eos/effects/antiwarpscramblingpassive.py

@@ -1,3 +1,5 @@
+# antiWarpScramblingPassive
+#
 # Used by:
 # Modules from group: Warp Core Stabilizer (8 of 8)
 type = "passive"

eos/effects/archaeologyskillvirusbonus.py

@@ -1,3 +1,5 @@
+# archaeologySkillVirusBonus
+#
 # Used by:
 # Modules named like: Emission Scope Sharpener (8 of 8)
 # Implant: Poteque 'Prospector' Archaeology AC-905

eos/effects/armorallrepairsystemsamountbonuspassive.py

@@ -1,3 +1,5 @@
+# armorAllRepairSystemsAmountBonusPassive
+#
 # Used by:
 # Implants named like: Exile Booster (4 of 4)
 type = "passive"

eos/effects/armordamageamountbonuscapitalarmorrepairers.py

@@ -1,3 +1,5 @@
+# armorDamageAmountBonusCapitalArmorRepairers
+#
 # Used by:
 # Modules named like: Auxiliary Nano Pump (8 of 8)
 type = "passive"

eos/effects/armoredsquadroncommand.py

@@ -1,3 +1,5 @@
+# armoredSquadronCommand
+#
 # Used by:
 # Skill: Armored Warfare Specialist
 runTime = "early"

eos/effects/armoredwarfaremindlink.py

@@ -1,3 +1,5 @@
+# armoredWarfareMindlink
+#
 # Used by:
 # Implant: Armored Warfare Mindlink
 # Implant: Federation Navy Warfare Mindlink

eos/effects/armorhpbonusadd.py

@@ -1,3 +1,5 @@
+# armorHPBonusAdd
+#
 # Used by:
 # Modules from group: Armor Reinforcer (57 of 57)
 type = "passive"

eos/effects/armorhpbonusaddpassive.py

@@ -1,3 +1,5 @@
+# armorHPBonusAddPassive
+#
 # Used by:
 # Subsystems from group: Defensive Systems (16 of 16)
 type = "passive"

eos/effects/armorhpmultiply.py

@@ -1,3 +1,5 @@
+# armorHPMultiply
+#
 # Used by:
 # Modules from group: Armor Coating (202 of 202)
 # Modules from group: Armor Plating Energized (187 of 187)

eos/effects/armorreinforcermassadd.py

@@ -1,3 +1,5 @@
+# armorReinforcerMassAdd
+#
 # Used by:
 # Modules from group: Armor Reinforcer (57 of 57)
 type = "passive"

eos/effects/armorrepair.py

@@ -1,3 +1,5 @@
+# armorRepair
+#
 # Used by:
 # Modules from group: Armor Repair Unit (100 of 100)
 runTime = "late"

eos/effects/armorrepairprojectormaxrangebonus.py

@@ -1,3 +1,5 @@
+# armorRepairProjectorMaxRangeBonus
+#
 # Used by:
 # Ship: Augoror
 # Ship: Exequror

eos/effects/armortankinggang.py

@@ -1,3 +1,5 @@
+# armorTankingGang
+#
 # Used by:
 # Skill: Armored Warfare
 type = "gang"

eos/effects/armortankinggang2.py

@@ -1,3 +1,5 @@
+# armorTankingGang2
+#
 # Used by:
 # Implant: Armored Warfare Mindlink
 # Implant: Federation Navy Warfare Mindlink

eos/effects/armorupgradesmasspenaltyreductionbonus.py

@@ -1,3 +1,5 @@
+# armorUpgradesMassPenaltyReductionBonus
+#
 # Used by:
 # Skill: Armor Layering
 type = "passive"

eos/effects/astrogeologyminingamountbonuspostpercentminingamountlocationshipmodulesrequiringmining.py

@@ -1,3 +1,5 @@
+# astrogeologyMiningAmountBonusPostPercentMiningAmountLocationShipModulesRequiringMining
+#
 # Used by:
 # Implants named like: Inherent Implants 'Highwall' Mining MX (3 of 3)
 # Implant: Michi's Excavation Augmentor

eos/effects/basemaxscandeviationmodifiermoduleonline2none.py

@@ -1,3 +1,5 @@
+# baseMaxScanDeviationModifierModuleOnline2None
+#
 # Used by:
 # Variations of module: Scan Pinpointing Array I (2 of 2)
 type = "passive"

eos/effects/basemaxscandeviationmodifierrequiringastrometrics.py

@@ -1,3 +1,5 @@
+# baseMaxScanDeviationModifierRequiringAstrometrics
+#
 # Used by:
 # Implants named like: Poteque 'Prospector' Astrometric Pinpointing AP (3 of 3)
 # Skill: Astrometric Pinpointing

eos/effects/basesensorstrengthmodifiermodule.py

@@ -1,3 +1,5 @@
+# baseSensorStrengthModifierModule
+#
 # Used by:
 # Variations of module: Scan Rangefinding Array I (2 of 2)
 type = "passive"

eos/effects/basesensorstrengthmodifierrequiringastrometrics.py

@@ -1,3 +1,5 @@
+# baseSensorStrengthModifierRequiringAstrometrics
+#
 # Used by:
 # Modules from group: Scan Probe Launcher (4 of 7)
 # Implants named like: Poteque 'Prospector' Astrometric Rangefinding AR (3 of 3)

eos/effects/bclargeenergyturretcapacitorneedbonus.py

@@ -1,3 +1,5 @@
+# bcLargeEnergyTurretCapacitorNeedBonus
+#
 # Used by:
 # Ship: Oracle
 type = "passive"

eos/effects/bclargeenergyturretcpuneedbonus.py

@@ -1,3 +1,5 @@
+# bcLargeEnergyTurretCPUNeedBonus
+#
 # Used by:
 # Ship: Oracle
 type = "passive"

eos/effects/bclargeenergyturretpowerneedbonus.py

@@ -1,3 +1,5 @@
+# bcLargeEnergyTurretPowerNeedBonus
+#
 # Used by:
 # Ship: Oracle
 type = "passive"

eos/effects/bclargehybridturretcapacitorneedbonus.py

@@ -1,3 +1,5 @@
+# bcLargeHybridTurretCapacitorNeedBonus
+#
 # Used by:
 # Ship: Naga
 # Ship: Talos

eos/effects/bclargehybridturretcpuneedbonus.py

@@ -1,3 +1,5 @@
+# bcLargeHybridTurretCPUNeedBonus
+#
 # Used by:
 # Ship: Naga
 # Ship: Talos

eos/effects/bclargehybridturretpowerneedbonus.py

@@ -1,3 +1,5 @@
+# bcLargeHybridTurretPowerNeedBonus
+#
 # Used by:
 # Ship: Naga
 # Ship: Talos

eos/effects/bclargeprojectileturretcpuneedbonus.py

@@ -1,3 +1,5 @@
+# bcLargeProjectileTurretCPUNeedBonus
+#
 # Used by:
 # Ship: Tornado
 type = "passive"

eos/effects/bclargeprojectileturretpowerneedbonus.py

@@ -1,3 +1,5 @@
+# bcLargeProjectileTurretPowerNeedBonus
+#
 # Used by:
 # Ship: Tornado
 type = "passive"

eos/effects/biologytimebonusfixed.py

@@ -1,3 +1,5 @@
+# biologyTimeBonusFixed
+#
 # Used by:
 # Implants named like: Eifyr and Co. 'Alchemist' Biology BY (2 of 2)
 # Skill: Biology

eos/effects/blockaderunnercloakcpupercentbonus.py

@@ -1,3 +1,5 @@
+# blockadeRunnerCloakCpuPercentBonus
+#
 # Used by:
 # Ships from group: Blockade Runner (4 of 4)
 type = "passive"

eos/effects/boosterarmorhppenalty.py

@@ -1,3 +1,5 @@
+# boosterArmorHpPenalty
+#
 # Used by:
 # Implants from group: Booster (12 of 37)
 type = "boosterSideEffect"

eos/effects/boosterarmorrepairamountpenalty.py

@@ -1,3 +1,5 @@
+# boosterArmorRepairAmountPenalty
+#
 # Used by:
 # Implants from group: Booster (9 of 37)
 type = "boosterSideEffect"

eos/effects/boostercapacitorcapacitypenalty.py

@@ -1,3 +1,5 @@
+# boosterCapacitorCapacityPenalty
+#
 # Used by:
 # Implants named like: Blue Pill Booster (3 of 5)
 # Implants named like: Exile Booster (3 of 4)

eos/effects/boostermaxvelocitypenalty.py

@@ -1,3 +1,5 @@
+# boosterMaxVelocityPenalty
+#
 # Used by:
 # Implants from group: Booster (12 of 37)
 type = "boosterSideEffect"

eos/effects/boostermissileexplosioncloudpenaltyfixed.py

@@ -1,3 +1,5 @@
+# boosterMissileExplosionCloudPenaltyFixed
+#
 # Used by:
 # Implants named like: Exile Booster (3 of 4)
 # Implants named like: Mindflood Booster (3 of 4)

eos/effects/boostermissileexplosionvelocitypenalty.py

@@ -1,3 +1,5 @@
+# boosterMissileExplosionVelocityPenalty
+#
 # Used by:
 # Implants named like: Blue Pill Booster (3 of 5)
 type = "boosterSideEffect"

eos/effects/boostermissilevelocitypenalty.py

@@ -1,3 +1,5 @@
+# boosterMissileVelocityPenalty
+#
 # Used by:
 # Implants named like: Crash Booster (3 of 4)
 # Implants named like: X Instinct Booster (3 of 4)

eos/effects/boostermodifyboosterarmorpenalties.py

@@ -1,5 +1,7 @@
+# boosterModifyBoosterArmorPenalties
+#
 # Used by:
-# Implants named like: Eifyr and Co. 'Alchemist' Nanite Control NC (2 of 2)
+# Implants named like: Eifyr and Co. 'Alchemist' Neurotoxin Control NC (2 of 2)
 # Implants named like: grade Edge (10 of 12)
 # Skill: Neurotoxin Control
 type = "passive"

eos/effects/boostermodifyboostermaxvelocityandcapacitorpenalty.py

@@ -1,5 +1,7 @@
+# boosterModifyBoosterMaxVelocityAndCapacitorPenalty
+#
 # Used by:
-# Implants named like: Eifyr and Co. 'Alchemist' Nanite Control NC (2 of 2)
+# Implants named like: Eifyr and Co. 'Alchemist' Neurotoxin Control NC (2 of 2)
 # Implants named like: grade Edge (10 of 12)
 # Skill: Neurotoxin Control
 type = "passive"

eos/effects/boostermodifyboostermissilepenalty.py

@@ -1,5 +1,7 @@
+# boosterModifyBoosterMissilePenalty
+#
 # Used by:
-# Implants named like: Eifyr and Co. 'Alchemist' Nanite Control NC (2 of 2)
+# Implants named like: Eifyr and Co. 'Alchemist' Neurotoxin Control NC (2 of 2)
 # Implants named like: grade Edge (10 of 12)
 # Skill: Neurotoxin Control
 type = "passive"

eos/effects/boostermodifyboostershieldpenalty.py

@@ -1,5 +1,7 @@
+# boosterModifyBoosterShieldPenalty
+#
 # Used by:
-# Implants named like: Eifyr and Co. 'Alchemist' Nanite Control NC (2 of 2)
+# Implants named like: Eifyr and Co. 'Alchemist' Neurotoxin Control NC (2 of 2)
 # Implants named like: grade Edge (10 of 12)
 # Skill: Neurotoxin Control
 type = "passive"

eos/effects/boostermodifyboosterturretpenalty.py

@@ -1,5 +1,7 @@
+# boosterModifyBoosterTurretPenalty
+#
 # Used by:
-# Implants named like: Eifyr and Co. 'Alchemist' Nanite Control NC (2 of 2)
+# Implants named like: Eifyr and Co. 'Alchemist' Neurotoxin Control NC (2 of 2)
 # Implants named like: grade Edge (10 of 12)
 # Skill: Neurotoxin Control
 type = "passive"

eos/effects/boostershieldcapacitypenalty.py

@@ -1,3 +1,5 @@
+# boosterShieldCapacityPenalty
+#
 # Used by:
 # Implants from group: Booster (12 of 37)
 type = "boosterSideEffect"

eos/effects/boosterturretfalloffpenalty.py

@@ -1,3 +1,5 @@
+# boosterTurretFalloffPenalty
+#
 # Used by:
 # Implants named like: Drop Booster (3 of 4)
 # Implants named like: X Instinct Booster (3 of 4)

eos/effects/boosterturretoptimalrangepenalty.py

@@ -1,3 +1,5 @@
+# boosterTurretOptimalRangePenalty
+#
 # Used by:
 # Implants from group: Booster (9 of 37)
 type = "boosterSideEffect"

eos/effects/boosterturrettrackingpenalty.py

@@ -1,3 +1,5 @@
+# boosterTurretTrackingPenalty
+#
 # Used by:
 # Implants named like: Exile Booster (3 of 4)
 # Implants named like: Frentix Booster (3 of 4)

eos/effects/caldarisetbonus3.py

@@ -1,3 +1,5 @@
+# caldarisetbonus3
+#
 # Used by:
 # Implants named like: High grade Talon (6 of 6)
 runTime = "early"

eos/effects/caldarisetlgbonus.py

@@ -1,3 +1,5 @@
+# caldarisetLGbonus
+#
 # Used by:
 # Implants named like: Low grade Talon (6 of 6)
 runTime = "early"

eos/effects/caldarishipecmburstoptimalrangecb3.py

@@ -1,3 +1,5 @@
+# caldariShipECMBurstOptimalRangeCB3
+#
 # Used by:
 # Ship: Scorpion
 # Ship: Scorpion Ishukone Watch

eos/effects/caldarishipewcapacitorneedcc.py

@@ -1,4 +1,7 @@
+# caldariShipEwCapacitorNeedCC
+#
 # Used by:
+# Ship: Chameleon
 # Ship: Falcon
 # Ship: Rook
 type = "passive"

eos/effects/caldarishipewcapacitorneedcf2.py

@@ -1,3 +1,5 @@
+# caldariShipEwCapacitorNeedCF2
+#
 # Used by:
 # Variations of ship: Griffin (2 of 2)
 type = "passive"

eos/effects/caldarishipewfalloffrangecb3.py

@@ -1,3 +1,5 @@
+# caldariShipEwFalloffRangeCB3
+#
 # Used by:
 # Ship: Scorpion
 # Ship: Scorpion Ishukone Watch

eos/effects/caldarishipewfalloffrangecc2.py

@@ -1,3 +1,5 @@
+# caldariShipEwFalloffRangeCC2
+#
 # Used by:
 # Ship: Blackbird
 type = "passive"

eos/effects/caldarishipewoptimalrangecb3.py

@@ -1,3 +1,5 @@
+# caldariShipEwOptimalRangeCB3
+#
 # Used by:
 # Ship: Scorpion
 # Ship: Scorpion Ishukone Watch

eos/effects/caldarishipewoptimalrangecc2.py

@@ -1,3 +1,5 @@
+# caldariShipEwOptimalRangeCC2
+#
 # Used by:
 # Ship: Blackbird
 type = "passive"

eos/effects/caldarishipewstrengthcb.py

@@ -1,3 +1,5 @@
+# caldariShipEwStrengthCB
+#
 # Used by:
 # Ship: Scorpion
 # Ship: Scorpion Ishukone Watch

eos/effects/capacitorcapacityaddpassive.py

@@ -1,3 +1,5 @@
+# capacitorCapacityAddPassive
+#
 # Used by:
 # Subsystems from group: Engineering Systems (16 of 16)
 # Subsystem: Tengu Offensive - Magnetic Infusion Basin

eos/effects/capacitorcapacitybonus.py

@@ -1,3 +1,5 @@
+# capacitorCapacityBonus
+#
 # Used by:
 # Modules from group: Capacitor Battery (27 of 27)
 type = "passive"

eos/effects/capacitorcapacitymultiply.py

@@ -1,9 +1,11 @@
+# capacitorCapacityMultiply
+#
 # Used by:
-# Modules from group: Capacitor Flux Coil (12 of 12)
+# Modules from group: Capacitor Flux Coil (6 of 6)
 # Modules from group: Capacitor Power Relay (26 of 26)
 # Modules from group: Power Diagnostic System (31 of 31)
 # Modules from group: Propulsion Module (107 of 107)
-# Modules from group: Reactor Control Unit (28 of 28)
+# Modules from group: Reactor Control Unit (22 of 22)
 # Modules from group: Shield Flux Coil (11 of 11)
 # Modules from group: Shield Power Relay (11 of 11)
 type = "passive"

eos/effects/capacitoremissionsystemskill.py

@@ -1,5 +1,7 @@
+# capacitorEmissionSystemskill
+#
 # Used by:
-# Implants named like: Inherent Implants 'Squire' Energy Emission Systems ES (6 of 6)
+# Implants named like: Inherent Implants 'Squire' Capacitor Emission Systems ES (6 of 6)
 # Modules named like: Egress Port Maximizer (8 of 8)
 # Skill: Capacitor Emission Systems
 type = "passive"

eos/effects/capacityaddpassive.py

@@ -1,3 +1,5 @@
+# capacityAddPassive
+#
 # Used by:
 # Subsystems from group: Defensive Systems (16 of 16)
 type = "passive"

eos/effects/capitallauncherskillcitadelemdamage.py

@@ -1,3 +1,5 @@
+# capitalLauncherSkillCitadelEmDamage
+#
 # Used by:
 # Implants named like: Hardwiring Zainou 'Sharpshooter' ZMX (6 of 6)
 # Skill: Citadel Torpedoes

eos/effects/capitallauncherskillcitadelexplosivedamage.py

@@ -1,3 +1,5 @@
+# capitalLauncherSkillCitadelExplosiveDamage
+#
 # Used by:
 # Implants named like: Hardwiring Zainou 'Sharpshooter' ZMX (6 of 6)
 # Skill: Citadel Torpedoes

eos/effects/capitallauncherskillcitadelkineticdamage.py

@@ -1,3 +1,5 @@
+# capitalLauncherSkillCitadelKineticDamage
+#
 # Used by:
 # Implants named like: Hardwiring Zainou 'Sharpshooter' ZMX (6 of 6)
 # Skill: Citadel Torpedoes

eos/effects/capitallauncherskillcitadelthermaldamage.py

@@ -1,3 +1,5 @@
+# capitalLauncherSkillCitadelThermalDamage
+#
 # Used by:
 # Implants named like: Hardwiring Zainou 'Sharpshooter' ZMX (6 of 6)
 # Skill: Citadel Torpedoes

eos/effects/capitallauncherskillcruisecitadelemdamage1.py

@@ -1,3 +1,5 @@
+# 	capitalLauncherSkillCruiseCitadelEmDamage1
+#
 # Used by:
 # Skill: Citadel Cruise Missiles
 type = "passive"

eos/effects/capitallauncherskillcruisecitadelexplosivedamage1.py

@@ -1,3 +1,5 @@
+# capitalLauncherSkillCruiseCitadelExplosiveDamage1
+#
 # Used by:
 # Skill: Citadel Cruise Missiles
 type = "passive"

eos/effects/capitallauncherskillcruisecitadelkineticdamage1.py

@@ -1,3 +1,5 @@
+# capitalLauncherSkillCruiseCitadelKineticDamage1
+#
 # Used by:
 # Skill: Citadel Cruise Missiles
 type = "passive"

eos/effects/capitallauncherskillcruisecitadelthermaldamage1.py

@@ -1,3 +1,5 @@
+# capitalLauncherSkillCruiseCitadelThermalDamage1
+#
 # Used by:
 # Skill: Citadel Cruise Missiles
 type = "passive"

eos/effects/capitalremotearmorrepairercapneedbonusskill.py

@@ -1,3 +1,5 @@
+# capitalRemoteArmorRepairerCapNeedBonusSkill
+#
 # Used by:
 # Variations of module: Capital Remote Repair Augmentor I (2 of 2)
 # Skill: Capital Remote Armor Repair Systems

eos/effects/capitalremoteenergytransfercapneedbonusskill.py

@@ -1,3 +1,5 @@
+# capitalRemoteEnergyTransferCapNeedBonusSkill
+#
 # Used by:
 # Skill: Capital Capacitor Emission Systems
 type = "passive"

eos/effects/capitalremoteshieldtransfercapneedbonusskill.py

@@ -1,3 +1,5 @@
+# capitalRemoteShieldTransferCapNeedBonusSkill
+#
 # Used by:
 # Skill: Capital Shield Emission Systems
 type = "passive"

eos/effects/capitalrepairsystemsskilldurationbonus.py

@@ -1,3 +1,5 @@
+# capitalRepairSystemsSkillDurationBonus
+#
 # Used by:
 # Modules named like: Nanobot Accelerator (8 of 8)
 # Skill: Capital Repair Systems

eos/effects/capitalshieldoperationskillcapacitorneedbonus.py

@@ -1,3 +1,5 @@
+# capitalShieldOperationSkillCapacitorNeedBonus
+#
 # Used by:
 # Modules named like: Core Defense Capacitor Safeguard (8 of 8)
 # Skill: Capital Shield Operation