Merge branch 'master' into wx3

config.py

@@ -18,10 +18,10 @@ debug = False
 saveInRoot = False
 
 # Version data
-version = "1.14.1"
-tag = "git"
-expansionName = "Galatea"
-expansionVersion = "1.2"
+version = "1.15.0"
+tag = "Stable"
+expansionName = "Vanguard"
+expansionVersion = "1.0"
 evemonMinVersion = "4081"
 
 pyfaPath = None

eos/effects/battlecruiserdronespeed.py

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

eos/effects/battlecruisermetrange.py

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

eos/effects/battlecruisermhtrange.py

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

eos/effects/battlecruisermissilerange.py

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

eos/effects/battlecruisermptrange.py

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

eos/effects/boosterarmorhppenalty.py

@@ -1,7 +1,7 @@
 # boosterArmorHpPenalty
 #
 # Used by:
-# Implants from group: Booster (12 of 37)
+# Implants from group: Booster (12 of 39)
 type = "boosterSideEffect"
 def handler(fit, booster, context):
     fit.ship.boostItemAttr("armorHP", booster.getModifiedItemAttr("boosterArmorHPPenalty"))

eos/effects/boosterarmorrepairamountpenalty.py

@@ -1,7 +1,7 @@
 # boosterArmorRepairAmountPenalty
 #
 # Used by:
-# Implants from group: Booster (9 of 37)
+# Implants from group: Booster (9 of 39)
 type = "boosterSideEffect"
 def handler(fit, booster, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Armor Repair Unit",

eos/effects/boostermaxvelocitypenalty.py

@@ -1,7 +1,7 @@
 # boosterMaxVelocityPenalty
 #
 # Used by:
-# Implants from group: Booster (12 of 37)
+# Implants from group: Booster (12 of 39)
 type = "boosterSideEffect"
 def handler(fit, booster, context):
     fit.ship.boostItemAttr("maxVelocity", booster.getModifiedItemAttr("boosterMaxVelocityPenalty"))

eos/effects/boostershieldcapacitypenalty.py

@@ -1,7 +1,7 @@
 # boosterShieldCapacityPenalty
 #
 # Used by:
-# Implants from group: Booster (12 of 37)
+# Implants from group: Booster (12 of 39)
 type = "boosterSideEffect"
 def handler(fit, booster, context):
     fit.ship.boostItemAttr("shieldCapacity", booster.getModifiedItemAttr("boosterShieldCapacityPenalty"))

eos/effects/boosterturretoptimalrangepenalty.py

@@ -1,7 +1,7 @@
 # boosterTurretOptimalRangePenalty
 #
 # Used by:
-# Implants from group: Booster (9 of 37)
+# Implants from group: Booster (9 of 39)
 type = "boosterSideEffect"
 def handler(fit, booster, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Gunnery"),

eos/effects/entosiscpuaddition.py

@@ -0,0 +1,8 @@
+# entosisCPUAddition
+#
+# Used by:
+# Modules from group: Entosis Link (2 of 2)
+type = "passive"
+def handler(fit, module, context):
+    module.increaseItemAttr("cpu", module.getModifiedItemAttr("entosisCPUAdd"))
+

eos/effects/entosiscpupenalty.py

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

eos/effects/missileskillrapidlauncherrof.py

@@ -1,7 +1,7 @@
 # missileSkillRapidLauncherRoF
 #
 # Used by:
-# Implants named like: Cerebral Accelerator (3 of 3)
+# Implants named like: Cerebral Accelerator (3 of 5)
 # Implants named like: Zainou 'Deadeye' Rapid Launch RL (6 of 6)
 # Implant: Whelan Machorin's Ballistic Smartlink
 # Skill: Missile Launcher Operation

eos/effects/shipbonusprojectiletrackingmbc2.py

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

eos/effects/shipbonuswdfgnullpenalties.py

@@ -1,4 +1,4 @@
-# shipBonusWDFGnullSpeedEffects
+# shipBonusWDFGnullPenalties
 #
 # Used by:
 # Ship: Fiend

eos/effects/shipheavyassaultmissilevelocitycbc2.py

@@ -1,8 +0,0 @@
-# shipHeavyAssaultMissileVelocityCBC2
-#
-# Used by:
-# Ship: Drake Navy Issue
-type = "passive"
-def handler(fit, ship, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Assault Missiles"),
-                                    "maxVelocity", ship.getModifiedItemAttr("shipBonusCBC2"), skill="Caldari Battlecruiser")

eos/effects/shipheavymissilevelocitycbc2.py

@@ -1,8 +0,0 @@
-# shipHeavyMissileVelocityCBC2
-#
-# Used by:
-# Ship: Drake Navy Issue
-type = "passive"
-def handler(fit, ship, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Missiles"),
-                                    "maxVelocity", ship.getModifiedItemAttr("shipBonusCBC2"), skill="Caldari Battlecruiser")

eos/effects/shiphybriddmg1cbc2.py

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

eos/effects/shipprojectilerof1mbc2.py

@@ -1,7 +1,7 @@
 # shipProjectileRof1MBC2
 #
 # Used by:
-# Ships named like: Hurricane (2 of 2)
+# Ship: Hurricane
 type = "passive"
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Projectile Turret"),

eos/effects/shipshieldemresistance1cbc2.py

@@ -1,9 +1,8 @@
 # shipShieldEmResistance1CBC2
 #
 # Used by:
-# Variations of ship: Ferox (2 of 2)
-# Ship: Drake
-# Ship: Nighthawk
+# Variations of ship: Drake (3 of 3)
+# Ship: Vulture
 type = "passive"
 def handler(fit, ship, context):
     fit.ship.boostItemAttr("shieldEmDamageResonance", ship.getModifiedItemAttr("shipBonusCBC2"), skill="Caldari Battlecruiser")

eos/effects/shipshieldexplosiveresistance1cbc2.py

@@ -1,9 +1,8 @@
 # shipShieldExplosiveResistance1CBC2
 #
 # Used by:
-# Variations of ship: Ferox (2 of 2)
-# Ship: Drake
-# Ship: Nighthawk
+# Variations of ship: Drake (3 of 3)
+# Ship: Vulture
 type = "passive"
 def handler(fit, ship, context):
     fit.ship.boostItemAttr("shieldExplosiveDamageResonance", ship.getModifiedItemAttr("shipBonusCBC2"), skill="Caldari Battlecruiser")

eos/effects/shipshieldkineticresistance1cbc2.py

@@ -1,9 +1,8 @@
 # shipShieldKineticResistance1CBC2
 #
 # Used by:
-# Variations of ship: Ferox (2 of 2)
-# Ship: Drake
-# Ship: Nighthawk
+# Variations of ship: Drake (3 of 3)
+# Ship: Vulture
 type = "passive"
 def handler(fit, ship, context):
     fit.ship.boostItemAttr("shieldKineticDamageResonance", ship.getModifiedItemAttr("shipBonusCBC2"), skill="Caldari Battlecruiser")

eos/effects/shipshieldthermalresistance1cbc2.py

@@ -1,9 +1,8 @@
 # shipShieldThermalResistance1CBC2
 #
 # Used by:
-# Variations of ship: Ferox (2 of 2)
-# Ship: Drake
-# Ship: Nighthawk
+# Variations of ship: Drake (3 of 3)
+# Ship: Vulture
 type = "passive"
 def handler(fit, ship, context):
     fit.ship.boostItemAttr("shieldThermalDamageResonance", ship.getModifiedItemAttr("shipBonusCBC2"), skill="Caldari Battlecruiser")

eos/effects/surgicalstrikedamagemultiplierbonuspostpercentdamagemultiplierlocationshipmodulesrequiringgunnery.py

@@ -1,7 +1,7 @@
 # surgicalStrikeDamageMultiplierBonusPostPercentDamageMultiplierLocationShipModulesRequiringGunnery
 #
 # Used by:
-# Implants named like: Cerebral Accelerator (3 of 3)
+# Implants named like: Cerebral Accelerator (3 of 5)
 # Implants named like: Eifyr and Co. 'Gunslinger' Surgical Strike SS (6 of 6)
 type = "passive"
 def handler(fit, implant, context):

gui/builtinViewColumns/ammo.py

@@ -32,15 +32,16 @@ class Ammo(ViewColumn):
 
     def getText(self, stuff):
         if getattr(stuff, "charge", None) is not None:
-            shots = stuff.numShots
-            if shots > 0:
-                text = "%s (%s)" % (stuff.charge.name, stuff.numShots)
+            charges = stuff.numCharges
+            if charges > 0:
+                cycles = stuff.numShots
+                if charges != cycles:
+                    return "%s (%d, %d cycles)" % (stuff.charge.name, charges, cycles)
+                else:
+                    return "%s (%d)" % (stuff.charge.name, charges)
             else:
-                text = stuff.charge.name
-        else:
-            text = ""
-
-        return text
+                return stuff.charge.name
+        return ""
 
     def getImageId(self, mod):
         return -1

gui/shipBrowser.py

@@ -1642,7 +1642,17 @@ class FitItem(SFItem.SFBrowserItem):
             self.RestoreEditButton()
             return
 
-        self.deleteFit()
+        # to prevent accidental deletion, give dialog confirmation unless shift is depressed
+        if wx.GetMouseState().ShiftDown() or wx.GetMouseState().MiddleDown():
+            self.deleteFit()
+        else:
+            dlg = wx.MessageDialog(self,
+                 "Do you really want to delete this fit?",
+                 "Confirm Delete", wx.OK | wx.CANCEL | wx.ICON_QUESTION)
+            result = dlg.ShowModal()
+            dlg.Destroy()
+            if result == wx.ID_OK:
+                self.deleteFit()
 
     def deleteFit(self, event=None):
         if self.deleted:

service/fit.py

@@ -181,7 +181,8 @@ class Fit(object):
         # refresh any fits this fit is projected onto. Otherwise, if we have
         # already loaded those fits, they will not reflect the changes
         for projection in fit.projectedOnto.values():
-            eos.db.saveddata_session.refresh(projection.victim_fit)
+            if projection.victim_fit in eos.db.saveddata_session:  # GH issue #359
+                eos.db.saveddata_session.refresh(projection.victim_fit)
 
     def copyFit(self, fitID):
         fit = eos.db.getFit(fitID)