Merge branch 'master' into ammo_graph

eos/saveddata/module.py

@@ -322,20 +322,12 @@ class Module(HandledItem, HandledCharge, ItemAttrShortcut, ChargeAttrShortcut):
             maxRange = self.getModifiedItemAttr(attr, None)
             if maxRange is not None:
                 return maxRange
-        if self.charge is not None:
-            try:
-                chargeName = self.charge.group.name
-            except AttributeError:
-                pass
-            else:
-                if chargeName in ("Scanner Probe", "Survey Probe"):
-                    return None
-                missileMaxRangeData = self.missileMaxRangeData
-                if missileMaxRangeData is None:
-                    return None
-                lowerRange, higherRange, higherChance = missileMaxRangeData
-                maxRange = lowerRange * (1 - higherChance) + higherRange * higherChance
-                return maxRange
+        missileMaxRangeData = self.missileMaxRangeData
+        if missileMaxRangeData is None:
+            return None
+        lowerRange, higherRange, higherChance = missileMaxRangeData
+        maxRange = lowerRange * (1 - higherChance) + higherRange * higherChance
+        return maxRange
 
     @property
     def missileMaxRangeData(self):
@@ -361,7 +353,11 @@ class Module(HandledItem, HandledCharge, ItemAttrShortcut, ChargeAttrShortcut):
             return maxRange
 
         maxVelocity = self.getModifiedChargeAttr("maxVelocity")
-        flightTime = floatUnerr(self.getModifiedChargeAttr("explosionDelay") / 1000.0)
+        if not maxVelocity:
+            return None
+        shipRadius = self.owner.ship.getModifiedItemAttr("radius")
+        # Flight time has bonus based on ship radius, see https://github.com/pyfa-org/Pyfa/issues/2083
+        flightTime = floatUnerr(self.getModifiedChargeAttr("explosionDelay") / 1000 + shipRadius / maxVelocity)
         mass = self.getModifiedChargeAttr("mass")
         agility = self.getModifiedChargeAttr("agility")
         lowerTime = math.floor(flightTime)
@@ -375,7 +371,6 @@ class Module(HandledItem, HandledCharge, ItemAttrShortcut, ChargeAttrShortcut):
                 lowerRange = min(lowerRange, rangeLimit)
                 higherRange = min(higherRange, rangeLimit)
         # Make range center-to-surface, as missiles spawn in the center of the ship
-        shipRadius = self.owner.ship.getModifiedItemAttr("radius")
         lowerRange = max(0, lowerRange - shipRadius)
         higherRange = max(0, higherRange - shipRadius)
         higherChance = flightTime - lowerTime