Add latest changes from Singularity

pyfa-org · May 21, 2015 · 26122f6 · 26122f6
1 parent cca7f11
commit 26122f6
Show file tree

Hide file tree

Showing 39 changed files with 113 additions and 98 deletions.
diff --git a/config.py b/config.py
@@ -15,8 +15,8 @@
 # Version data
 version = "1.11.1"
 tag = "git"
-expansionName = "Mosaic"
-expansionVersion = "1.0"
+expansionName = "Singularity"
+expansionVersion = "883859"
 evemonMinVersion = "4081"
 
 # Database version (int ONLY)

diff --git a/eos/effects/addtosignatureradius2.py b/eos/effects/addtosignatureradius2.py
@@ -2,7 +2,7 @@
 #
 # Used by:
 # Modules from group: Missile Launcher Bomb (2 of 2)
-# Modules from group: Shield Extender (37 of 37)
+# Modules from group: Shield Extender (25 of 25)
 type = "passive"
 def handler(fit, module, context):
     fit.ship.increaseItemAttr("signatureRadius", module.getModifiedItemAttr("signatureRadiusAdd"))
diff --git a/eos/effects/armorhpbonusadd.py b/eos/effects/armorhpbonusadd.py
@@ -1,7 +1,7 @@
 # armorHPBonusAdd
 #
 # Used by:
-# Modules from group: Armor Reinforcer (57 of 57)
+# Modules from group: Armor Reinforcer (38 of 38)
 type = "passive"
 def handler(fit, module, context):
     fit.ship.increaseItemAttr("armorHP", module.getModifiedItemAttr("armorHPBonusAdd"))
diff --git a/eos/effects/armorreinforcermassadd.py b/eos/effects/armorreinforcermassadd.py
@@ -1,7 +1,7 @@
 # armorReinforcerMassAdd
 #
 # Used by:
-# Modules from group: Armor Reinforcer (57 of 57)
+# Modules from group: Armor Reinforcer (38 of 38)
 # Modules from group: Entosis Link (2 of 2)
 type = "passive"
 def handler(fit, module, context):

diff --git a/eos/effects/capacitorcapacitymultiply.py b/eos/effects/capacitorcapacitymultiply.py
@@ -4,7 +4,7 @@
 # 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 (107 of 107)
+# Modules from group: Propulsion Module (114 of 114)
 # 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)

diff --git a/eos/effects/minmatarshipewtargetpaintermc1.py b/eos/effects/minmatarshipewtargetpaintermc1.py
@@ -2,6 +2,7 @@
 #
 # Used by:
 # Ship: Bellicose
+# Ship: Rapier
 type = "passive"
 def handler(fit, ship, context):
     level = fit.character.getSkill("Minmatar Cruiser").level

diff --git a/eos/effects/minmatarshipewtargetpaintermc2.py b/eos/effects/minmatarshipewtargetpaintermc2.py
@@ -2,7 +2,6 @@
 #
 # Used by:
 # Ship: Huginn
-# Ship: Rapier
 type = "passive"
 def handler(fit, ship, context):
     level = fit.character.getSkill("Minmatar Cruiser").level

diff --git a/eos/effects/modeagilitypostdiv.py b/eos/effects/modeagilitypostdiv.py
@@ -1,7 +1,7 @@
 # modeAgilityPostDiv
 #
 # Used by:
-# Modules named like: Propulsion Mode (2 of 2)
+# Modules named like: Propulsion Mode (3 of 3)
 type = "passive"
 def handler(fit, module, context):
     fit.ship.multiplyItemAttr(

diff --git a/eos/effects/modearmorresonancepostdiv.py b/eos/effects/modearmorresonancepostdiv.py
@@ -1,7 +1,8 @@
 # modeArmorResonancePostDiv
 #
 # Used by:
-# Modules named like: Defense Mode (2 of 2)
+# Module: Confessor Defense Mode
+# Module: Svipul Defense Mode
 type = "passive"
 def handler(fit, module, context):
     for srcResType, tgtResType in (

diff --git a/eos/effects/modeshieldresonancepostdiv.py b/eos/effects/modeshieldresonancepostdiv.py
@@ -1,6 +1,7 @@
 # modeShieldResonancePostDiv
 #
 # Used by:
+# Module: Jackdaw Defense Mode
 # Module: Svipul Defense Mode
 type = "passive"
 def handler(fit, module, context):

diff --git a/eos/effects/modesigradiuspostdiv.py b/eos/effects/modesigradiuspostdiv.py
@@ -2,7 +2,8 @@
 #
 # 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")
+    fit.ship.multiplyItemAttr("signatureRadius", 1 / module.getModifiedItemAttr("modeSignatureRadiusPostDiv"),
+                              stackingPenalties=True, penaltyGroup="postDiv")
diff --git a/eos/effects/modevelocitypostdiv.py b/eos/effects/modevelocitypostdiv.py
@@ -1,7 +1,7 @@
 # modeVelocityPostDiv
 #
 # Used by:
-# Modules named like: Propulsion Mode (2 of 2)
+# Modules named like: Propulsion Mode (3 of 3)
 type = "passive"
 def handler(fit, module, context):
     fit.ship.multiplyItemAttr(

diff --git a/eos/effects/overloadselfspeedbonus.py b/eos/effects/overloadselfspeedbonus.py
@@ -1,7 +1,7 @@
 # overloadSelfSpeedBonus
 #
 # Used by:
-# Modules from group: Propulsion Module (107 of 107)
+# Modules from group: Propulsion Module (114 of 114)
 type = "overheat"
 def handler(fit, module, context):
     module.boostItemAttr("speedFactor", module.getModifiedItemAttr("overloadSpeedFactorBonus"),

diff --git a/eos/effects/probelaunchercpupercentbonustacticaldestroyer.py b/eos/effects/probelaunchercpupercentbonustacticaldestroyer.py
@@ -1,7 +1,7 @@
 # probeLauncherCPUPercentBonusTacticalDestroyer
 #
 # Used by:
-# Ships from group: Tactical Destroyer (2 of 2)
+# Ships from group: Tactical Destroyer (3 of 3)
 type = "passive"
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Astrometrics"),

diff --git a/eos/effects/shieldcapacitybonusonline.py b/eos/effects/shieldcapacitybonusonline.py
@@ -2,7 +2,7 @@
 #
 # Used by:
 # Modules from group: Shield Amplifier (88 of 88)
-# Modules from group: Shield Extender (37 of 37)
+# Modules from group: Shield Extender (25 of 25)
 type = "passive"
 def handler(fit, module, context):
     fit.ship.increaseItemAttr("shieldCapacity", module.getModifiedItemAttr("capacityBonus"))
diff --git a/eos/effects/shipbonusheavyassaultmissilealldamagemc2.py b/eos/effects/shipbonusheavyassaultmissilealldamagemc2.py
@@ -0,0 +1,11 @@
+# shipBonusHeavyAssaultMissileAllDamageMC2
+#
+# Used by:
+# Ship: Rapier
+# Ship: Scythe Fleet Issue
+type = "passive"
+def handler(fit, ship, context):
+    level = fit.character.getSkill("Minmatar Cruiser").level
+    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") * level)
diff --git a/eos/effects/shipbonusheavymissilealldamagemc2.py b/eos/effects/shipbonusheavymissilealldamagemc2.py
@@ -0,0 +1,11 @@
+# shipBonusHeavyMissileAllDamageMC2
+#
+# Used by:
+# Ship: Rapier
+# Ship: Scythe Fleet Issue
+type = "passive"
+def handler(fit, ship, context):
+    level = fit.character.getSkill("Minmatar Cruiser").level
+    for damageType in ("em", "explosive", "kinetic", "thermal"):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Missiles"),
+                                        "{0}Damage".format(damageType), ship.getModifiedItemAttr("shipBonusMC2") * level)
diff --git a/eos/effects/shipbonuslightmissilealldamagemc2.py b/eos/effects/shipbonuslightmissilealldamagemc2.py
@@ -0,0 +1,11 @@
+# shipBonusLightMissileAllDamageMC2
+#
+# Used by:
+# Ship: Rapier
+# Ship: Scythe Fleet Issue
+type = "passive"
+def handler(fit, ship, context):
+    level = fit.character.getSkill("Minmatar Cruiser").level
+    for damageType in ("em", "explosive", "kinetic", "thermal"):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Light Missiles"),
+                                        "{0}Damage".format(damageType), ship.getModifiedItemAttr("shipBonusMC2") * level)
diff --git a/eos/effects/shipheatdamagecaldaritacticaldestroyer3.py b/eos/effects/shipheatdamagecaldaritacticaldestroyer3.py
@@ -0,0 +1,9 @@
+# shipHeatDamageCaldariTacticalDestroyer3
+#
+# Used by:
+# Ship: Jackdaw
+type = "passive"
+def handler(fit, ship, context):
+    level = fit.character.getSkill("Caldari Tactical Destroyer").level
+    fit.modules.filteredItemBoost(lambda mod: True, "heatDamage",
+                                  ship.getModifiedItemAttr("shipBonusTacticalDestroyerCaldari3") * level)
diff --git a/eos/effects/shipmissilebonusemdmgmc.py b/eos/effects/shipmissilebonusemdmgmc.py
diff --git a/eos/effects/shipmissilebonusexpdmgmc.py b/eos/effects/shipmissilebonusexpdmgmc.py
diff --git a/eos/effects/shipmissilebonuskindmgmc.py b/eos/effects/shipmissilebonuskindmgmc.py
diff --git a/eos/effects/shipmissilebonusthermdmgmc.py b/eos/effects/shipmissilebonusthermdmgmc.py
diff --git a/eos/effects/shipmissileemdamagemc2.py b/eos/effects/shipmissileemdamagemc2.py
diff --git a/eos/effects/shipmissileexpdamagemc2.py b/eos/effects/shipmissileexpdamagemc2.py
diff --git a/eos/effects/shipmissilekineticdamagemc2.py b/eos/effects/shipmissilekineticdamagemc2.py
diff --git a/eos/effects/shipmissilereloadtimecaldaritacticaldestroyer2.py b/eos/effects/shipmissilereloadtimecaldaritacticaldestroyer2.py
@@ -0,0 +1,9 @@
+# shipMissileReloadTimeCaldariTacticalDestroyer2
+#
+# Used by:
+# Ship: Jackdaw
+type = "passive"
+def handler(fit, ship, context):
+    level = fit.character.getSkill("Caldari Tactical Destroyer").level
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Missile Launcher Operation"),
+                                  "reloadTime", ship.getModifiedItemAttr("shipBonusTacticalDestroyerCaldari2") * level)
diff --git a/eos/effects/shipmissilerofcaldaritacticaldestroyer1.py b/eos/effects/shipmissilerofcaldaritacticaldestroyer1.py
@@ -0,0 +1,11 @@
+# shipMissileRoFCaldariTacticalDestroyer1
+#
+# Used by:
+# Ship: Jackdaw
+type = "passive"
+def handler(fit, ship, context):
+    level = fit.character.getSkill("Caldari Tactical Destroyer").level
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Missile Launcher Operation"),
+                                  "speed", ship.getModifiedItemAttr("shipBonusTacticalDestroyerCaldari1") * level)
+
+
diff --git a/eos/effects/shipmissilethermdamagemc2.py b/eos/effects/shipmissilethermdamagemc2.py
diff --git a/eos/effects/shipmodemaxtargetrangepostdiv.py b/eos/effects/shipmodemaxtargetrangepostdiv.py
@@ -1,7 +1,7 @@
 # shipModeMaxTargetRangePostDiv
 #
 # Used by:
-# Modules named like: Sharpshooter Mode (2 of 2)
+# Modules named like: Sharpshooter Mode (3 of 3)
 type = "passive"
 def handler(fit, module, context):
     fit.ship.multiplyItemAttr(

diff --git a/eos/effects/shipmodemissilevelocitypostdiv.py b/eos/effects/shipmodemissilevelocitypostdiv.py
@@ -0,0 +1,13 @@
+# 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/shipmodescanrespostdiv.py b/eos/effects/shipmodescanrespostdiv.py
@@ -1,7 +1,7 @@
 # shipModeScanResPostDiv
 #
 # Used by:
-# Modules named like: Sharpshooter Mode (2 of 2)
+# Modules named like: Sharpshooter Mode (3 of 3)
 type = "passive"
 def handler(fit, module, context):
     fit.ship.multiplyItemAttr(

diff --git a/eos/effects/shipmodescanstrengthpostdiv.py b/eos/effects/shipmodescanstrengthpostdiv.py
@@ -1,7 +1,7 @@
 # shipModeScanStrengthPostDiv
 #
 # Used by:
-# Modules named like: Sharpshooter Mode (2 of 2)
+# Modules named like: Sharpshooter Mode (3 of 3)
 type = "passive"
 def handler(fit, module, context):
     for scanType in ("Gravimetric", "Magnetometric", "Radar", "Ladar"):

diff --git a/eos/effects/shipsmallmissiledmgpiratefaction.py b/eos/effects/shipsmallmissiledmgpiratefaction.py
@@ -0,0 +1,9 @@
+# shipSmallMissileDmgPirateFaction
+#
+# Used by:
+# Ship: Jackdaw
+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("shipBonusPirateFaction"))
diff --git a/eos/effects/speedboostmassaddition.py b/eos/effects/speedboostmassaddition.py
@@ -1,10 +1,9 @@
 # speedBoostMassAddition
 #
 # Used by:
-# Variations of module: 100MN Afterburner I (24 of 24)
-# Variations of module: 10MN Afterburner I (14 of 14)
-# Variations of module: 1MN Afterburner I (15 of 15)
-# Module: Civilian Afterburner
+# Variations of module: 100MN Afterburner I (25 of 25)
+# Variations of module: 10MN Afterburner I (15 of 15)
+# Variations of module: 1MN Afterburner I (16 of 16)
 type = "active"
 runTime = "late"
 def handler(fit, module, context):

diff --git a/eos/effects/speedboostmasssigrad.py b/eos/effects/speedboostmasssigrad.py
@@ -1,9 +1,9 @@
 # speedBoostMassSigRad
 #
 # Used by:
-# Variations of module: 100MN Microwarpdrive I (24 of 24)
-# Variations of module: 10MN Microwarpdrive I (14 of 14)
-# Variations of module: 1MN Microwarpdrive I (15 of 15)
+# Variations of module: 500MN Microwarpdrive I (26 of 26)
+# Variations of module: 50MN Microwarpdrive I (16 of 16)
+# Variations of module: 5MN Microwarpdrive I (16 of 16)
 type = "active"
 runTime = "late"
 def handler(fit, module, context):

diff --git a/eos/saveddata/ship.py b/eos/saveddata/ship.py
@@ -112,7 +112,8 @@ def _getModeItems(self):
         items = []
         g = eos.db.getGroup(modeGroupID, eager=("items.icon", "items.attributes"))
         for item in g.items:
-            if item.raceID == self.item.raceID:
+            # Rely on name detection because race is not reliable
+            if item.name.lower().startswith(self.item.name.lower()):
                 items.append(item)
 
         return items

diff --git a/staticdata/eve.db b/staticdata/eve.db
diff --git a/staticdata/icons/ships/34828.png b/staticdata/icons/ships/34828.png