Merge branch 'master' into wx3

eos/effectHandlerHelpers.py

@@ -159,6 +159,10 @@ class HandledModuleList(HandledList):
             dummy.position = index
             self[index] = dummy
 
+    def toModule(self, index, mod):
+        mod.position = index
+        self[index] = mod
+
     def freeSlot(self, slot):
         for i in range(len(self) -1, -1, -1):
             mod = self[i]

eos/effects/entosislink.py

@@ -4,4 +4,4 @@
 # Modules from group: Entosis Link (2 of 2)
 type = "active"
 def handler(fit, module, context):
-    pass
+    fit.ship.forceItemAttr("disallowAssistance", module.getModifiedItemAttr("disallowAssistance"))

eos/effects/passivemassadd.py

@@ -1,7 +0,0 @@
-# passiveMassAdd
-#
-# Used by:
-# Modules from group: Entosis Link (2 of 2)
-type = "offline"
-def handler(fit, module, context):
-    fit.ship.increaseItemAttr("mass", module.getModifiedItemAttr("massAddition"))

eos/effects/passivespeedlimit.py

@@ -0,0 +1,8 @@
+# passiveSpeedLimit
+#
+# Used by:
+# Modules from group: Entosis Link (2 of 2)
+runtime = "late"
+type = "passive"
+def handler(fit, src, context):
+    fit.extraAttributes['speedLimit'] = src.getModifiedItemAttr("speedLimit")

eos/effects/shipbonusafterburnerspeedfactorcc2.py

@@ -1,6 +1,7 @@
 # shipBonusAfterburnerSpeedFactorCC2
 #
 # Used by:
+# Ship: Fiend
 # Ship: Phantasm
 type = "passive"
 def handler(fit, module, context):

eos/effects/shipbonusafterburnerspeedfactorcf2.py

@@ -1,6 +1,7 @@
 # shipBonusAfterburnerSpeedFactorCF2
 #
 # Used by:
+# Ship: Imp
 # Ship: Succubus
 type = "passive"
 def handler(fit, module, context):

eos/effects/shipbonusmediumenergyturretdamagepiratefaction.py

@@ -2,6 +2,7 @@
 #
 # Used by:
 # Ship: Ashimmu
+# Ship: Fiend
 # Ship: Gnosis
 # Ship: Phantasm
 type = "passive"

eos/effects/shipbonusmediumenergyturrettrackingac2.py

@@ -1,6 +1,7 @@
 # shipBonusMediumEnergyTurretTrackingAC2
 #
 # Used by:
+# Ship: Fiend
 # Ship: Phantasm
 type = "passive"
 def handler(fit, ship, context):

eos/effects/shipbonussmallenergyturretdamagepiratefaction.py

@@ -3,6 +3,7 @@
 # Used by:
 # Ship: Confessor
 # Ship: Cruor
+# Ship: Imp
 # Ship: Succubus
 type = "passive"
 def handler(fit, ship, context):

eos/effects/shipbonussmallenergyturrettracking2af.py

@@ -1,6 +1,7 @@
 # shipBonusSmallEnergyTurretTracking2AF
 #
 # Used by:
+# Ship: Imp
 # Ship: Succubus
 type = "passive"
 def handler(fit, ship, context):

eos/effects/systemdamagedrones.py

@@ -1,7 +1,6 @@
 # systemDamageDrones
 #
 # Used by:
-# Celestials named like: Drifter Incursion (6 of 6)
 # Celestials named like: Magnetar Effect Beacon Class (6 of 6)
 runTime = "early"
 type = ("projected", "offline")

eos/effects/systemdamageemmissiles.py

@@ -1,7 +1,6 @@
 # systemDamageEmMissiles
 #
 # Used by:
-# Celestials named like: Drifter Incursion (6 of 6)
 # Celestials named like: Magnetar Effect Beacon Class (6 of 6)
 runTime = "early"
 type = ("projected", "offline")

eos/effects/systemdamageexplosivemissiles.py

@@ -1,7 +1,6 @@
 # systemDamageExplosiveMissiles
 #
 # Used by:
-# Celestials named like: Drifter Incursion (6 of 6)
 # Celestials named like: Magnetar Effect Beacon Class (6 of 6)
 runTime = "early"
 type = ("projected", "offline")

eos/effects/systemdamagekineticmissiles.py

@@ -1,7 +1,6 @@
 # systemDamageKineticMissiles
 #
 # Used by:
-# Celestials named like: Drifter Incursion (6 of 6)
 # Celestials named like: Magnetar Effect Beacon Class (6 of 6)
 runTime = "early"
 type = ("projected", "offline")

eos/effects/systemdamagemultipliergunnery.py

@@ -1,7 +1,6 @@
 # systemDamageMultiplierGunnery
 #
 # Used by:
-# Celestials named like: Drifter Incursion (6 of 6)
 # Celestials named like: Magnetar Effect Beacon Class (6 of 6)
 runTime = "early"
 type = ("projected", "offline")

eos/effects/systemdamagethermalmissiles.py

@@ -1,7 +1,6 @@
 # systemDamageThermalMissiles
 #
 # Used by:
-# Celestials named like: Drifter Incursion (6 of 6)
 # Celestials named like: Magnetar Effect Beacon Class (6 of 6)
 runTime = "early"
 type = ("projected", "offline")

eos/effects/systemmaxvelocity.py

@@ -2,7 +2,6 @@
 #
 # Used by:
 # Celestials named like: Black Hole Effect Beacon Class (6 of 6)
-# Celestials named like: Drifter Incursion (6 of 6)
 runTime = "early"
 type = ("projected", "offline")
 def handler(fit, beacon, context):

eos/effects/systemmaxvelocitypercentage.py

@@ -0,0 +1,8 @@
+# systemMaxVelocityPercentage
+#
+# Used by:
+# Celestials named like: Drifter Incursion (6 of 6)
+runTime = "early"
+type = ("projected", "offline")
+def handler(fit, beacon, context):
+    fit.ship.boostItemAttr("maxVelocity", beacon.getModifiedItemAttr("maxVelocityMultiplier"), stackingPenalties=True)

eos/effects/systemsmartbombemdamage.py

@@ -1,7 +1,6 @@
 # systemSmartBombEmDamage
 #
 # Used by:
-# Celestials named like: Drifter Incursion (6 of 6)
 # Celestials named like: Red Giant Beacon Class (6 of 6)
 runTime = "early"
 type = ("projected", "offline")

eos/effects/systemsmartbombexplosivedamage.py

@@ -1,7 +1,6 @@
 # systemSmartBombExplosiveDamage
 #
 # Used by:
-# Celestials named like: Drifter Incursion (6 of 6)
 # Celestials named like: Red Giant Beacon Class (6 of 6)
 runTime = "early"
 type = ("projected", "offline")

eos/effects/systemsmartbombkineticdamage.py

@@ -1,7 +1,6 @@
 # systemSmartBombKineticDamage
 #
 # Used by:
-# Celestials named like: Drifter Incursion (6 of 6)
 # Celestials named like: Red Giant Beacon Class (6 of 6)
 runTime = "early"
 type = ("projected", "offline")

eos/effects/systemsmartbombthermaldamage.py

@@ -1,7 +1,6 @@
 # systemSmartBombThermalDamage
 #
 # Used by:
-# Celestials named like: Drifter Incursion (6 of 6)
 # Celestials named like: Red Giant Beacon Class (6 of 6)
 runTime = "early"
 type = ("projected", "offline")

eos/effects/velocitybonusonline.py

@@ -1,6 +1,7 @@
 # velocityBonusOnline
 #
 # Used by:
+# Modules from group: Entosis Link (2 of 2)
 # Modules from group: Nanofiber Internal Structure (7 of 7)
 # Modules from group: Overdrive Injector System (7 of 7)
 type = "passive"

eos/saveddata/fit.py

@@ -303,6 +303,14 @@ class Fit(object):
     def jamChance(self):
         return (1-self.ecmProjectedStr)*100
 
+    @property
+    def maxSpeed(self):
+        speedLimit = self.ship.getModifiedItemAttr("speedLimit")
+        if speedLimit and self.ship.getModifiedItemAttr("maxVelocity") > speedLimit:
+            return speedLimit
+
+        return self.ship.getModifiedItemAttr("maxVelocity")
+
     @property
     def alignTime(self):
         agility = self.ship.getModifiedItemAttr("agility")

eos/saveddata/ship.py

@@ -35,6 +35,10 @@ class Ship(ItemAttrShortcut, HandledItem):
         "droneControlRange": 20000,
         "cloaked": False,
         "siege": False
+        # We also have speedLimit for Entosis Link, but there seems to be an
+        # issue with naming it exactly "speedLimit" due to unknown reasons.
+        # Regardless, we don't have to put it here anyways - it will come up
+        # as None unless the Entosis effect sets it.
     }
 
     def __init__(self, item):