From a49269b75905153b6be69a663427df359be68803 Mon Sep 17 00:00:00 2001
From: blitzmann <ryan.xgamer99@gmail.com>
Date: Tue, 9 Dec 2014 18:49:40 -0500
Subject: [PATCH] Edit effect headers and fix effects script

---
 eos/effects/drawbackarmorhp.py                             | 2 +-
 eos/effects/drawbackwarpspeed.py                           | 2 +-
 eos/effects/dreadnoughtmd1projdmgbonus.py                  | 2 +-
 eos/effects/dreadnoughtmd3projrofbonus.py                  | 2 +-
 eos/effects/dreadnoughtshipbonushybriddmgg1.py             | 2 +-
 eos/effects/dreadnoughtshipbonushybridrofg2.py             | 2 +-
 eos/effects/dreadnoughtshipbonuslasercapneeda1.py          | 2 +-
 eos/effects/dreadnoughtshipbonuslaserrofa2.py              | 2 +-
 eos/effects/dreadnoughtshipbonusshieldresistancesc2.py     | 2 +-
 ...evasivemaneuveringagilitybonuspostpercentagilityship.py | 2 +-
 eos/effects/freighteragilitybonus2o2.py                    | 4 ++++
 eos/effects/freightersmacapacitybonuso1.py                 | 4 ++++
 eos/effects/massreductionbonuspassive.py                   | 2 +-
 eos/effects/modeagilitypostdiv.py                          | 4 ++++
 eos/effects/modearmorresonancepostdiv.py                   | 4 ++++
 eos/effects/modesigradiuspostdiv.py                        | 4 ++++
 eos/effects/modevelocitypostdiv.py                         | 4 ++++
 .../navigationvelocitybonuspostpercentmaxvelocityship.py   | 2 +-
 .../probelaunchercpupercentbonustacticaldestroyer.py       | 4 ++++
 eos/effects/rolebonusbulkheadcpu.py                        | 2 +-
 eos/effects/shipadvancedspaceshipcommandagilitybonus.py    | 2 +-
 eos/effects/shipbonusdreadcitadelcruiserofc1.py            | 2 +-
 eos/effects/shipbonusdreadcitadeltorprofc1.py              | 2 +-
 eos/effects/shipheatdamageamarrtacticaldestroyer3.py       | 4 ++++
 eos/effects/shipmodemaxtargetrangepostdiv.py               | 4 ++++
 eos/effects/shipmodescanrespostdiv.py                      | 4 ++++
 eos/effects/shipmodescanstrengthpostdiv.py                 | 4 ++++
 eos/effects/shipmodesetoptimalrangepostdiv.py              | 4 ++++
 eos/effects/shipsetcapneedamarrtacticaldestroyer2.py       | 4 ++++
 eos/effects/shipsetdamageamarrtacticaldestroyer1.py        | 4 ++++
 eos/effects/shipxlprojectiledamagerole.py                  | 2 +-
 scripts/effectUsedBy.py                                    | 7 +++++--
 32 files changed, 78 insertions(+), 19 deletions(-)

diff --git a/eos/effects/drawbackarmorhp.py b/eos/effects/drawbackarmorhp.py
index d60b1369a..28d24015e 100644
--- a/eos/effects/drawbackarmorhp.py
+++ b/eos/effects/drawbackarmorhp.py
@@ -1,7 +1,7 @@
 # drawbackArmorHP
 #
 # Used by:
-# Modules from group: Rig Navigation (48 of 68)
+# Modules from group: Rig Navigation (48 of 64)
 type = "passive"
 def handler(fit, module, context):
     fit.ship.boostItemAttr("armorHP", module.getModifiedItemAttr("drawback"))
\ No newline at end of file
diff --git a/eos/effects/drawbackwarpspeed.py b/eos/effects/drawbackwarpspeed.py
index 70ae85e3b..229a6cd14 100644
--- a/eos/effects/drawbackwarpspeed.py
+++ b/eos/effects/drawbackwarpspeed.py
@@ -1,7 +1,7 @@
 # drawbackWarpSpeed
 #
 # Used by:
-# Modules named like: Higgs Anchor I (4 of 4)
+# 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/dreadnoughtmd1projdmgbonus.py b/eos/effects/dreadnoughtmd1projdmgbonus.py
index 303d8b87f..4f3d7f264 100644
--- a/eos/effects/dreadnoughtmd1projdmgbonus.py
+++ b/eos/effects/dreadnoughtmd1projdmgbonus.py
@@ -1,7 +1,7 @@
 # dreadnoughtMD1ProjDmgBonus
 #
 # Used by:
-# Ship: Naglfar
+# Ships named like: Naglfar (2 of 2)
 type = "passive"
 def handler(fit, ship, context):
     level = fit.character.getSkill("Minmatar Dreadnought").level
diff --git a/eos/effects/dreadnoughtmd3projrofbonus.py b/eos/effects/dreadnoughtmd3projrofbonus.py
index 639985a44..6ecbc500d 100644
--- a/eos/effects/dreadnoughtmd3projrofbonus.py
+++ b/eos/effects/dreadnoughtmd3projrofbonus.py
@@ -1,7 +1,7 @@
 # dreadnoughtMD3ProjRoFBonus
 #
 # Used by:
-# Ship: Naglfar
+# Ships named like: Naglfar (2 of 2)
 type = "passive"
 def handler(fit, ship, context):
     level = fit.character.getSkill("Minmatar Dreadnought").level
diff --git a/eos/effects/dreadnoughtshipbonushybriddmgg1.py b/eos/effects/dreadnoughtshipbonushybriddmgg1.py
index c0921b5d3..75e111b79 100644
--- a/eos/effects/dreadnoughtshipbonushybriddmgg1.py
+++ b/eos/effects/dreadnoughtshipbonushybriddmgg1.py
@@ -1,7 +1,7 @@
 # dreadnoughtShipBonusHybridDmgG1
 #
 # Used by:
-# Ship: Moros
+# Ships named like: Moros (2 of 2)
 type = "passive"
 def handler(fit, ship, context):
     level = fit.character.getSkill("Gallente Dreadnought").level
diff --git a/eos/effects/dreadnoughtshipbonushybridrofg2.py b/eos/effects/dreadnoughtshipbonushybridrofg2.py
index ca1a8325e..f28c752a1 100644
--- a/eos/effects/dreadnoughtshipbonushybridrofg2.py
+++ b/eos/effects/dreadnoughtshipbonushybridrofg2.py
@@ -1,7 +1,7 @@
 # dreadnoughtShipBonusHybridRoFG2
 #
 # Used by:
-# Ship: Moros
+# Ships named like: Moros (2 of 2)
 type = "passive"
 def handler(fit, ship, context):
     level = fit.character.getSkill("Gallente Dreadnought").level
diff --git a/eos/effects/dreadnoughtshipbonuslasercapneeda1.py b/eos/effects/dreadnoughtshipbonuslasercapneeda1.py
index 53912cfb1..d5cce7464 100644
--- a/eos/effects/dreadnoughtshipbonuslasercapneeda1.py
+++ b/eos/effects/dreadnoughtshipbonuslasercapneeda1.py
@@ -1,7 +1,7 @@
 # dreadnoughtShipBonusLaserCapNeedA1
 #
 # Used by:
-# Ship: Revelation
+# Ships named like: Revelation (2 of 2)
 type = "passive"
 def handler(fit, ship, context):
     level = fit.character.getSkill("Amarr Dreadnought").level
diff --git a/eos/effects/dreadnoughtshipbonuslaserrofa2.py b/eos/effects/dreadnoughtshipbonuslaserrofa2.py
index d01246d24..dee4b663b 100644
--- a/eos/effects/dreadnoughtshipbonuslaserrofa2.py
+++ b/eos/effects/dreadnoughtshipbonuslaserrofa2.py
@@ -1,7 +1,7 @@
 # dreadnoughtShipBonusLaserRofA2
 #
 # Used by:
-# Ship: Revelation
+# Ships named like: Revelation (2 of 2)
 type = "passive"
 def handler(fit, ship, context):
     level = fit.character.getSkill("Amarr Dreadnought").level
diff --git a/eos/effects/dreadnoughtshipbonusshieldresistancesc2.py b/eos/effects/dreadnoughtshipbonusshieldresistancesc2.py
index a837c7a36..3f1ef0feb 100644
--- a/eos/effects/dreadnoughtshipbonusshieldresistancesc2.py
+++ b/eos/effects/dreadnoughtshipbonusshieldresistancesc2.py
@@ -1,7 +1,7 @@
 # dreadnoughtShipBonusShieldResistancesC2
 #
 # Used by:
-# Ship: Phoenix
+# Ships named like: Phoenix (2 of 2)
 type = "passive"
 def handler(fit, ship, context):
     level = fit.character.getSkill("Caldari Dreadnought").level
diff --git a/eos/effects/evasivemaneuveringagilitybonuspostpercentagilityship.py b/eos/effects/evasivemaneuveringagilitybonuspostpercentagilityship.py
index febd7cf0d..ebb16ac65 100644
--- a/eos/effects/evasivemaneuveringagilitybonuspostpercentagilityship.py
+++ b/eos/effects/evasivemaneuveringagilitybonuspostpercentagilityship.py
@@ -1,9 +1,9 @@
 # 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: Higgs Anchor I (4 of 4)
 # Modules named like: Low Friction Nozzle Joints (8 of 8)
 # Implant: Genolution Core Augmentation CA-4
 # Skill: Evasive Maneuvering
diff --git a/eos/effects/freighteragilitybonus2o2.py b/eos/effects/freighteragilitybonus2o2.py
index 7364d2015..2472ae51f 100644
--- a/eos/effects/freighteragilitybonus2o2.py
+++ b/eos/effects/freighteragilitybonus2o2.py
@@ -1,3 +1,7 @@
+# freighterAgilityBonus2O2
+#
+# Used by:
+# Ship: Bowhead
 type = "passive"
 def handler(fit, ship, context):
     level = fit.character.getSkill("ORE Freighter").level
diff --git a/eos/effects/freightersmacapacitybonuso1.py b/eos/effects/freightersmacapacitybonuso1.py
index 4b1e591e8..ff5861137 100644
--- a/eos/effects/freightersmacapacitybonuso1.py
+++ b/eos/effects/freightersmacapacitybonuso1.py
@@ -1,3 +1,7 @@
+# freighterSMACapacityBonusO1
+#
+# Used by:
+# Ship: Bowhead
 type = "passive"
 def handler(fit, ship, context):
     level = fit.character.getSkill("ORE Freighter").level
diff --git a/eos/effects/massreductionbonuspassive.py b/eos/effects/massreductionbonuspassive.py
index f3d5c8f6f..13e72f726 100644
--- a/eos/effects/massreductionbonuspassive.py
+++ b/eos/effects/massreductionbonuspassive.py
@@ -1,7 +1,7 @@
 # massReductionBonusPassive
 #
 # Used by:
-# Modules named like: Higgs Anchor I (4 of 4)
+# 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/modeagilitypostdiv.py b/eos/effects/modeagilitypostdiv.py
index 8251e2852..022951098 100644
--- a/eos/effects/modeagilitypostdiv.py
+++ b/eos/effects/modeagilitypostdiv.py
@@ -1,3 +1,7 @@
+# modeAgilityPostDiv
+#
+# Used by:
+# Module: Amarr Tactical Destroyer Propulsion Mode
 type = "passive"
 def handler(fit, module, context):
     fit.ship.multiplyItemAttr("agility", 1/module.getModifiedItemAttr("modeAgilityPostDiv"),
diff --git a/eos/effects/modearmorresonancepostdiv.py b/eos/effects/modearmorresonancepostdiv.py
index 56e4bef1e..af767b63b 100644
--- a/eos/effects/modearmorresonancepostdiv.py
+++ b/eos/effects/modearmorresonancepostdiv.py
@@ -1,3 +1,7 @@
+# modeArmorResonancePostDiv
+#
+# Used by:
+# Module: Amarr Tactical Destroyer Defense Mode
 type = "passive"
 def handler(fit, module, context):
     for resType in ("Em", "Explosive", "Kinetic"):
diff --git a/eos/effects/modesigradiuspostdiv.py b/eos/effects/modesigradiuspostdiv.py
index 20e530328..72e955f73 100644
--- a/eos/effects/modesigradiuspostdiv.py
+++ b/eos/effects/modesigradiuspostdiv.py
@@ -1,3 +1,7 @@
+# modeSigRadiusPostDiv
+#
+# Used by:
+# Module: Amarr Tactical Destroyer Defense Mode
 type = "passive"
 def handler(fit, module, context):
     level = fit.character.getSkill("Minmatar Destroyer").level
diff --git a/eos/effects/modevelocitypostdiv.py b/eos/effects/modevelocitypostdiv.py
index 91dc341cd..a38c9ddb8 100644
--- a/eos/effects/modevelocitypostdiv.py
+++ b/eos/effects/modevelocitypostdiv.py
@@ -1,3 +1,7 @@
+# modeVelocityPostDiv
+#
+# Used by:
+# Module: Amarr Tactical Destroyer Propulsion Mode
 type = "passive"
 def handler(fit, module, context):
     fit.ship.multiplyItemAttr("maxVelocity", 1/module.getModifiedItemAttr("modeVelocityPostDiv"),
diff --git a/eos/effects/navigationvelocitybonuspostpercentmaxvelocityship.py b/eos/effects/navigationvelocitybonuspostpercentmaxvelocityship.py
index 188a237fd..19cb4e928 100644
--- a/eos/effects/navigationvelocitybonuspostpercentmaxvelocityship.py
+++ b/eos/effects/navigationvelocitybonuspostpercentmaxvelocityship.py
@@ -1,9 +1,9 @@
 # navigationVelocityBonusPostPercentMaxVelocityShip
 #
 # Used by:
+# Modules from group: Rig Anchor (4 of 4)
 # Implants named like: grade Snake (16 of 18)
 # Modules named like: Auxiliary Thrusters (8 of 8)
-# Modules named like: Higgs Anchor I (4 of 4)
 # Implant: Quafe Zero
 # Skill: Navigation
 type = "passive"
diff --git a/eos/effects/probelaunchercpupercentbonustacticaldestroyer.py b/eos/effects/probelaunchercpupercentbonustacticaldestroyer.py
index 026fb0818..1efb4913c 100644
--- a/eos/effects/probelaunchercpupercentbonustacticaldestroyer.py
+++ b/eos/effects/probelaunchercpupercentbonustacticaldestroyer.py
@@ -1,3 +1,7 @@
+# probeLauncherCPUPercentBonusTacticalDestroyer
+#
+# Used by:
+# Ship: Confessor
 type = "passive"
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Astrometrics"),
diff --git a/eos/effects/rolebonusbulkheadcpu.py b/eos/effects/rolebonusbulkheadcpu.py
index 31cae7b4e..c6cbac5c5 100644
--- a/eos/effects/rolebonusbulkheadcpu.py
+++ b/eos/effects/rolebonusbulkheadcpu.py
@@ -1,7 +1,7 @@
 # roleBonusBulkheadCPU
 #
 # Used by:
-# Ships from group: Freighter (4 of 4)
+# Ships from group: Freighter (4 of 5)
 # Ships from group: Jump Freighter (4 of 4)
 type = "passive"
 def handler(fit, ship, context):
diff --git a/eos/effects/shipadvancedspaceshipcommandagilitybonus.py b/eos/effects/shipadvancedspaceshipcommandagilitybonus.py
index 7e2acb881..bbc33a174 100644
--- a/eos/effects/shipadvancedspaceshipcommandagilitybonus.py
+++ b/eos/effects/shipadvancedspaceshipcommandagilitybonus.py
@@ -1,7 +1,7 @@
 # shipAdvancedSpaceshipCommandAgilityBonus
 #
 # Used by:
-# Items from market group: Ships > Capital Ships (27 of 29)
+# Items from market group: Ships > Capital Ships (32 of 34)
 type = "passive"
 def handler(fit, ship, context):
     skill = fit.character.getSkill("Advanced Spaceship Command")
diff --git a/eos/effects/shipbonusdreadcitadelcruiserofc1.py b/eos/effects/shipbonusdreadcitadelcruiserofc1.py
index d97580dbc..92427cdc7 100644
--- a/eos/effects/shipbonusdreadcitadelcruiserofc1.py
+++ b/eos/effects/shipbonusdreadcitadelcruiserofc1.py
@@ -1,7 +1,7 @@
 # shipBonusDreadCitadelCruiseRofC1
 #
 # Used by:
-# Ship: Phoenix
+# Ships named like: Phoenix (2 of 2)
 type = "passive"
 def handler(fit, ship, context):
     level = fit.character.getSkill("Caldari Dreadnought").level
diff --git a/eos/effects/shipbonusdreadcitadeltorprofc1.py b/eos/effects/shipbonusdreadcitadeltorprofc1.py
index ae624dbd5..1371a87e5 100644
--- a/eos/effects/shipbonusdreadcitadeltorprofc1.py
+++ b/eos/effects/shipbonusdreadcitadeltorprofc1.py
@@ -1,7 +1,7 @@
 # shipBonusDreadCitadelTorpRofC1
 #
 # Used by:
-# Ship: Phoenix
+# Ships named like: Phoenix (2 of 2)
 type = "passive"
 def handler(fit, ship, context):
     level = fit.character.getSkill("Caldari Dreadnought").level
diff --git a/eos/effects/shipheatdamageamarrtacticaldestroyer3.py b/eos/effects/shipheatdamageamarrtacticaldestroyer3.py
index 9585d71c7..b8fb82149 100644
--- a/eos/effects/shipheatdamageamarrtacticaldestroyer3.py
+++ b/eos/effects/shipheatdamageamarrtacticaldestroyer3.py
@@ -1,3 +1,7 @@
+# shipHeatDamageAmarrTacticalDestroyer3
+#
+# Used by:
+# Ship: Confessor
 type = "passive"
 def handler(fit, ship, context):
     level = fit.character.getSkill("Amarr Tactical Destroyer").level
diff --git a/eos/effects/shipmodemaxtargetrangepostdiv.py b/eos/effects/shipmodemaxtargetrangepostdiv.py
index 0a7d0304a..d9cb50254 100644
--- a/eos/effects/shipmodemaxtargetrangepostdiv.py
+++ b/eos/effects/shipmodemaxtargetrangepostdiv.py
@@ -1,3 +1,7 @@
+# shipModeMaxTargetRangePostDiv
+#
+# Used by:
+# Module: Amarr Tactical Destroyer Sharpshooter Mode
 type = "passive"
 def handler(fit, module, context):
     fit.ship.multiplyItemAttr("maxTargetRange", 1/module.getModifiedItemAttr("modeMaxTargetRangePostDiv"),
diff --git a/eos/effects/shipmodescanrespostdiv.py b/eos/effects/shipmodescanrespostdiv.py
index 2df22198c..07db84ad5 100644
--- a/eos/effects/shipmodescanrespostdiv.py
+++ b/eos/effects/shipmodescanrespostdiv.py
@@ -1,3 +1,7 @@
+# shipModeScanResPostDiv
+#
+# Used by:
+# Module: Amarr Tactical Destroyer Sharpshooter Mode
 type = "passive"
 def handler(fit, module, context):
     fit.ship.multiplyItemAttr("scanResolution", 1/module.getModifiedItemAttr("modeScanResPostDiv"),
diff --git a/eos/effects/shipmodescanstrengthpostdiv.py b/eos/effects/shipmodescanstrengthpostdiv.py
index 3dbc07954..cdf2b20f3 100644
--- a/eos/effects/shipmodescanstrengthpostdiv.py
+++ b/eos/effects/shipmodescanstrengthpostdiv.py
@@ -1,3 +1,7 @@
+# shipModeScanStrengthPostDiv
+#
+# Used by:
+# Module: Amarr Tactical Destroyer Sharpshooter Mode
 type = "passive"
 def handler(fit, module, context):
     fit.ship.multiplyItemAttr("scanRadarStrength", 1/module.getModifiedItemAttr("modeRadarStrengthPostDiv"),
diff --git a/eos/effects/shipmodesetoptimalrangepostdiv.py b/eos/effects/shipmodesetoptimalrangepostdiv.py
index baf3f6864..bafceea86 100644
--- a/eos/effects/shipmodesetoptimalrangepostdiv.py
+++ b/eos/effects/shipmodesetoptimalrangepostdiv.py
@@ -1,3 +1,7 @@
+# shipModeSETOptimalRangePostDiv
+#
+# Used by:
+# Module: Amarr Tactical Destroyer Sharpshooter Mode
 type = "passive"
 def handler(fit, module, context):
     fit.modules.filteredItemMultiply(lambda mod: mod.item.requiresSkill("Small Energy Turret"),
diff --git a/eos/effects/shipsetcapneedamarrtacticaldestroyer2.py b/eos/effects/shipsetcapneedamarrtacticaldestroyer2.py
index 048c17a26..4f015f818 100644
--- a/eos/effects/shipsetcapneedamarrtacticaldestroyer2.py
+++ b/eos/effects/shipsetcapneedamarrtacticaldestroyer2.py
@@ -1,3 +1,7 @@
+# shipSETCapNeedAmarrTacticalDestroyer2
+#
+# Used by:
+# Ship: Confessor
 type = "passive"
 def handler(fit, ship, context):
     level = fit.character.getSkill("Amarr Tactical Destroyer").level
diff --git a/eos/effects/shipsetdamageamarrtacticaldestroyer1.py b/eos/effects/shipsetdamageamarrtacticaldestroyer1.py
index 3bca59b8e..a959549d3 100644
--- a/eos/effects/shipsetdamageamarrtacticaldestroyer1.py
+++ b/eos/effects/shipsetdamageamarrtacticaldestroyer1.py
@@ -1,3 +1,7 @@
+# shipSETDamageAmarrTacticalDestroyer1
+#
+# Used by:
+# Ship: Confessor
 type = "passive"
 def handler(fit, ship, context):
     level = fit.character.getSkill("Amarr Tactical Destroyer").level
diff --git a/eos/effects/shipxlprojectiledamagerole.py b/eos/effects/shipxlprojectiledamagerole.py
index fbbb39202..00d66ce05 100644
--- a/eos/effects/shipxlprojectiledamagerole.py
+++ b/eos/effects/shipxlprojectiledamagerole.py
@@ -1,7 +1,7 @@
 # shipXLProjectileDamageRole
 #
 # Used by:
-# Ship: Naglfar
+# Ships named like: Naglfar (2 of 2)
 type = "passive"
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Projectile Turret"),
diff --git a/scripts/effectUsedBy.py b/scripts/effectUsedBy.py
index ad949af9e..7f186b634 100755
--- a/scripts/effectUsedBy.py
+++ b/scripts/effectUsedBy.py
@@ -57,7 +57,7 @@ import re
 import sqlite3
 from optparse import OptionParser
 
-script_dir = os.path.dirname(unicode(__file__, sys.getfilesystemencoding()))
+script_dir = os.path.dirname(__file__)
 
 # Form list of effects for processing
 effects_path = os.path.join(script_dir, "..", "eos", "effects")
@@ -123,7 +123,10 @@ db = sqlite3.connect(os.path.expanduser(options.database))
 cursor = db.cursor()
 
 # Force some of the items to make them published
-FORCEPUB_TYPES = ("Ibis", "Impairor", "Velator", "Reaper")
+FORCEPUB_TYPES = ("Ibis", "Impairor", "Velator", "Reaper",
+                  "Amarr Tactical Destroyer Propulsion Mode",
+                  "Amarr Tactical Destroyer Sharpshooter Mode",
+                  "Amarr Tactical Destroyer Defense Mode")
 OVERRIDES_TYPEPUB = 'UPDATE invtypes SET published = 1 WHERE typeName = ?'
 for typename in FORCEPUB_TYPES:
     cursor.execute(OVERRIDES_TYPEPUB, (typename,))