Merge branch 'master' into test-3

# Conflicts:
#	eos/capSim.py
#	eos/effects/structurewarpscrambleblockmwdwithnpceffect.py
#	eos/effects/warpdisruptsphere.py

eos/effects/doomsdaybeamdot.py

@@ -0,0 +1,9 @@
+# doomsdayBeamDOT
+#
+# Used by:
+# Module: Lance type modules
+type = "active"
+
+
+def handler(fit, src, context):
+    pass

eos/effects/doomsdayconedot.py

@@ -0,0 +1,9 @@
+# doomsdayConeDOT
+#
+# Used by:
+# Module: Bosonic Field Generator
+type = "active"
+
+
+def handler(fit, src, context):
+    pass

eos/effects/doomsdayhog.py

@@ -0,0 +1,9 @@
+# doomsdayHOG
+#
+# Used by:
+# Module: GTFO - Gravitational Transportation Field Oscillator
+type = "active"
+
+
+def handler(fit, src, context):
+    pass

eos/effects/doomsdayslash.py

@@ -0,0 +1,9 @@
+# doomsdaySlash
+#
+# Used by:
+# Module: Reaper type modules
+type = "active"
+
+
+def handler(fit, src, context):
+    pass

eos/effects/microjumpportaldrive.py

@@ -0,0 +1,9 @@
+# microJumpPortalDrive
+#
+# Used by:
+# Module: MJFG - Micro Jump Field Generator (used on command destroyers)
+type = "active"
+
+
+def handler(fit, src, context):
+    pass

eos/effects/structurewarpscrambleblockmwdwithnpceffect.py

@@ -11,8 +11,7 @@ def handler(fit, module, context):
         fit.ship.increaseItemAttr("warpScrambleStatus", module.getModifiedItemAttr("warpScrambleStrength"))
         if module.charge is not None and module.charge.ID == 47336:
             for mod in fit.modules:
-                if not mod.isEmpty and mod.state > State.ONLINE and (
-                        mod.item.requiresSkill("High Speed Maneuvering")
-                        or mod.item.requiresSkill("Micro Jump Drive Operation")
-                ):
+                if not mod.isEmpty and mod.item.requiresSkill("High Speed Maneuvering") and mod.state > State.ONLINE:
+                    mod.state = State.ONLINE
+                if not mod.isEmpty and mod.item.requiresSkill("Micro Jump Drive Operation") and mod.state > State.ONLINE:
                     mod.state = State.ONLINE

eos/effects/usemissiles.py

@@ -15,12 +15,13 @@ def handler(fit, src, context):
         if src.item.group.name == 'Missile Launcher Bomb':
             # Bomb Launcher Cooldown Timer
             moduleReactivationDelay = src.getModifiedItemAttr("moduleReactivationDelay")
+            speed = src.getModifiedItemAttr("speed")
 
             # Void and Focused Void Bombs
             neutAmount = src.getModifiedChargeAttr("energyNeutralizerAmount")
 
-            if moduleReactivationDelay and neutAmount:
-                fit.addDrain(src, moduleReactivationDelay, neutAmount, 0)
+            if moduleReactivationDelay and neutAmount and speed:
+                fit.addDrain(src, speed + moduleReactivationDelay, neutAmount, 0)
 
             # Lockbreaker Bombs
             ecmStrengthBonus = src.getModifiedChargeAttr("scan{0}StrengthBonus".format(fit.scanType))

eos/effects/warpdisruptsphere.py

@@ -1,4 +1,3 @@
-
 # warpDisruptSphere
 #
 # Used by:
@@ -11,7 +10,6 @@ runTime = "early"
 
 def handler(fit, module, context):
 
-
     if "projected" in context:
         fit.ship.increaseItemAttr("warpScrambleStatus", module.getModifiedItemAttr("warpScrambleStrength"))
         if module.charge is not None and module.charge.ID == 45010:

eos/effects/warpscrambleblockmwdwithnpceffect.py

@@ -21,3 +21,5 @@ def handler(fit, module, context):
                 or mod.item.requiresSkill("High Speed Maneuvering")
         ):
             mod.state = State.ONLINE
+        if not mod.isEmpty and mod.item.requiresSkill("Micro Jump Drive Operation") and mod.state > State.ONLINE:
+            mod.state = State.ONLINE