Merge remote-tracking branch 'blitzmann/singularity' into singularity

eos/effects/modeagilitypostdiv.py

@@ -1,7 +1,7 @@
 # modeAgilityPostDiv
 #
 # Used by:
-# Module: Amarr Tactical Destroyer Propulsion Mode
+# Modules named like: Propulsion Mode (2 of 2)
 type = "passive"
 def handler(fit, module, context):
     fit.ship.multiplyItemAttr("agility", 1/module.getModifiedItemAttr("modeAgilityPostDiv"),

eos/effects/modearmorresonancepostdiv.py

@@ -1,7 +1,7 @@
 # modeArmorResonancePostDiv
 #
 # Used by:
-# Module: Amarr Tactical Destroyer Defense Mode
+# Modules named like: Defense Mode (2 of 2)
 type = "passive"
 def handler(fit, module, context):
     for resType in ("Em", "Explosive", "Kinetic"):

eos/effects/modemwdsigradiuspostdiv.py

@@ -0,0 +1,9 @@
+# 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")

eos/effects/modeshieldresonancepostdiv.py

@@ -0,0 +1,15 @@
+# modeShieldResonancePostDiv
+#
+# Used by:
+# Module: Svipul Defense Mode
+type = "passive"
+def handler(fit, module, context):
+    for resType in ("Em", "Explosive", "Kinetic"):
+        fit.ship.multiplyItemAttr("shield{0}DamageResonance".format(resType),
+                            1/module.getModifiedItemAttr("mode{0}ResistancePostDiv".format(resType)),
+                            stackingPenalties = True, penaltyGroup="postDiv")
+
+    # Thermal != Thermic
+    fit.ship.multiplyItemAttr("shieldThermalDamageResonance",
+                            1/module.getModifiedItemAttr("modeThermicResistancePostDiv"),
+                            stackingPenalties = True, penaltyGroup="postDiv")

eos/effects/modesigradiuspostdiv.py

@@ -1,7 +1,7 @@
 # modeSigRadiusPostDiv
 #
 # Used by:
-# Module: Amarr Tactical Destroyer Defense Mode
+# Module: Confessor Defense Mode
 type = "passive"
 def handler(fit, module, context):
     fit.ship.multiplyItemAttr("signatureRadius", 1/module.getModifiedItemAttr("modeSignatureRadiusPostDiv"),

eos/effects/modevelocitypostdiv.py

@@ -1,7 +1,7 @@
 # modeVelocityPostDiv
 #
 # Used by:
-# Module: Amarr Tactical Destroyer Propulsion Mode
+# Modules named like: Propulsion Mode (2 of 2)
 type = "passive"
 def handler(fit, module, context):
     fit.ship.multiplyItemAttr("maxVelocity", 1/module.getModifiedItemAttr("modeVelocityPostDiv"),

eos/effects/probelaunchercpupercentbonustacticaldestroyer.py

@@ -1,7 +1,7 @@
 # probeLauncherCPUPercentBonusTacticalDestroyer
 #
 # Used by:
-# Ship: Confessor
+# Ships from group: Tactical Destroyer (2 of 2)
 type = "passive"
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Astrometrics"),

eos/effects/remotecapacitortransmitterpowerneedbonuseffect.py

@@ -1,4 +1,4 @@
-# energyTransferPowerNeedBonusEffect
+# remoteCapacitorTransmitterPowerNeedBonusEffect
 #
 # Used by:
 # Ships from group: Logistics (3 of 5)

eos/effects/shipheatdamageminmatartacticaldestroyer3.py

@@ -0,0 +1,9 @@
+# shipHeatDamageMinmatarTacticalDestroyer3
+#
+# Used by:
+# Ship: Svipul
+type = "passive"
+def handler(fit, ship, context):
+    level = fit.character.getSkill("Minmatar Tactical Destroyer").level
+    fit.modules.filteredItemBoost(lambda mod: True, "heatDamage",
+                                  ship.getModifiedItemAttr("shipBonusTacticalDestroyerMinmatar3") * level)

eos/effects/shipmodemaxtargetrangepostdiv.py

@@ -1,7 +1,7 @@
 # shipModeMaxTargetRangePostDiv
 #
 # Used by:
-# Module: Amarr Tactical Destroyer Sharpshooter Mode
+# Modules named like: Sharpshooter Mode (2 of 2)
 type = "passive"
 def handler(fit, module, context):
     fit.ship.multiplyItemAttr("maxTargetRange", 1/module.getModifiedItemAttr("modeMaxTargetRangePostDiv"),

eos/effects/shipmodescanrespostdiv.py

@@ -1,7 +1,7 @@
 # shipModeScanResPostDiv
 #
 # Used by:
-# Module: Amarr Tactical Destroyer Sharpshooter Mode
+# Modules named like: Sharpshooter Mode (2 of 2)
 type = "passive"
 def handler(fit, module, context):
     fit.ship.multiplyItemAttr("scanResolution", 1/module.getModifiedItemAttr("modeScanResPostDiv"),

eos/effects/shipmodescanstrengthpostdiv.py

@@ -1,7 +1,7 @@
 # shipModeScanStrengthPostDiv
 #
 # Used by:
-# Module: Amarr Tactical Destroyer Sharpshooter Mode
+# Modules named like: Sharpshooter Mode (2 of 2)
 type = "passive"
 def handler(fit, module, context):
     fit.ship.multiplyItemAttr("scanRadarStrength", 1/module.getModifiedItemAttr("modeRadarStrengthPostDiv"),

eos/effects/shipmodesetoptimalrangepostdiv.py

@@ -1,7 +1,7 @@
 # shipModeSETOptimalRangePostDiv
 #
 # Used by:
-# Module: Amarr Tactical Destroyer Sharpshooter Mode
+# Module: Confessor Sharpshooter Mode
 type = "passive"
 def handler(fit, module, context):
     fit.modules.filteredItemMultiply(lambda mod: mod.item.requiresSkill("Small Energy Turret"),

eos/effects/shipmodespttrackingpostdiv.py

@@ -0,0 +1,9 @@
+# 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")

eos/effects/shipsptdamageminmatartacticaldestroyer1.py

@@ -0,0 +1,9 @@
+# shipSPTDamageMinmatarTacticalDestroyer1
+#
+# Used by:
+# Ship: Svipul
+type = "passive"
+def handler(fit, ship, context):
+    level = fit.character.getSkill("Minmatar Tactical Destroyer").level
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Projectile Turret"),
+                                  "damageMultiplier", ship.getModifiedItemAttr("shipBonusTacticalDestroyerMinmatar1") * level)

eos/effects/shipsptoptimalminmatartacticaldestroyer2.py

@@ -0,0 +1,9 @@
+# shipSPTOptimalMinmatarTacticalDestroyer2
+#
+# Used by:
+# Ship: Svipul
+type = "passive"
+def handler(fit, ship, context):
+    level = fit.character.getSkill("Minmatar Tactical Destroyer").level
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Projectile Turret"),
+                                  "maxRange", ship.getModifiedItemAttr("shipBonusTacticalDestroyerMinmatar2") * level)

service/conversions/releaseTiamat.py

@@ -0,0 +1,17 @@
+"""
+Conversion pack for Tiamat Module Tiericide
+"""
+
+CONVERSIONS = {
+    "Enduring Cargo Scanner": "Type-E Enduring Cargo Scanner",
+    "Scoped Cargo Scanner": "PL-0 Scoped Cargo Scanner",
+    "Compact Ship Scanner": "Ta3 Compact Ship Scanner",
+    "Scoped Survey Scanner": "ML-3 Scoped Survey Scanner",
+    "Compact Light Missile Launcher": "Arbalest Compact Light Missile Launcher",
+    "Ample Light Missile Launcher": "TE-2100 Ample Light Missile Launcher",
+    "Compact Capacitor Flux Coil": "Mark I Compact Capacitor Flux Coil",
+    "Restrained Capacitor Flux Coil": "Type-D Restrained Capacitor Flux Coil",
+    "Compact Reactor Control Unit": "Mark I Compact Reactor Control Unit",
+    "Upgraded Co-Processor": "Photonic Upgraded Co-Processor",
+    "Compact Micro Auxiliary Power Core": "Vigor Compact Micro Auxiliary Power Core"
+}

service/market.py

@@ -228,6 +228,7 @@ class Market():
             u"\u6bd2\u8725\u7ea7YC117\u5e74\u7279\u522b\u7248": False,
             u"\u4f0a\u4ec0\u5854\u7ea7YC117\u5e74\u7279\u522b\u7248": False,
             u"\u94f6\u9e70\u7ea7YC117\u5e74\u7279\u522b\u7248": False,
+            "Council Diplomatic Shuttle": False,  # Not sure yet
         }
 
         # do not publish ships that we convert