Merge branch 'master' into singularity

# Conflicts:
#	eos/effects.py
#	staticdata/fsd_built/dogmaeffects.0.json
#	staticdata/fsd_built/iconids.0.json
#	staticdata/fsd_built/marketgroups.0.json
#	staticdata/fsd_built/types.4.json
#	staticdata/fsd_built/types.5.json
#	staticdata/phobos/metadata.0.json
#	version.yml

Author: DarkFenX

eos/effects.py

@@ -25267,6 +25267,7 @@ class Effect6281(BaseEffect):
     shipBonusEnergyNeutOptimalAF2
 
     Used by:
+    Ship: Cruor
     Ship: Malice
     """
 
@@ -25283,6 +25284,7 @@ class Effect6285(BaseEffect):
     shipBonusEnergyNeutFalloffAF3
 
     Used by:
+    Ship: Cruor
     Ship: Malice
     """
 
@@ -25299,6 +25301,7 @@ class Effect6287(BaseEffect):
     shipBonusEnergyNosOptimalAF2
 
     Used by:
+    Ship: Cruor
     Ship: Malice
     """
 
@@ -25315,6 +25318,7 @@ class Effect6291(BaseEffect):
     shipBonusEnergyNosFalloffAF3
 
     Used by:
+    Ship: Cruor
     Ship: Malice
     """
 
@@ -25347,6 +25351,7 @@ class Effect6299(BaseEffect):
     shipBonusEnergyNeutFalloffAC3
 
     Used by:
+    Ship: Ashimmu
     Ship: Vangel
     """
 
@@ -25397,6 +25402,7 @@ class Effect6305(BaseEffect):
     shipBonusEnergyNosFalloffAC3
 
     Used by:
+    Ship: Ashimmu
     Ship: Vangel
     """
 
@@ -42232,6 +42238,40 @@ def handler(fit, src, context, projectionRange, **kwargs):
             src.getModifiedItemAttr('shipMiningBonusYieldOreDestroyerRoleBonus'), **kwargs)
 
 
+class Effect12739(BaseEffect):
+    """
+    shipBonusEnergyNeutOptimalAC2
+
+    Used by:
+    Ship: Ashimmu
+    """
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context, projectionRange, **kwargs):
+        fit.modules.filteredItemBoost(
+            lambda mod: mod.item.group.name == 'Energy Neutralizer', 'maxRange',
+            src.getModifiedItemAttr('shipBonusAC2'), skill='Amarr Cruiser', **kwargs)
+
+
+class Effect12740(BaseEffect):
+    """
+    shipBonusEnergyNosOptimalAC2
+
+    Used by:
+    Ship: Ashimmu
+    """
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context, projectionRange, **kwargs):
+        fit.modules.filteredItemBoost(
+            lambda mod: mod.item.group.name == 'Energy Nosferatu', 'maxRange',
+            src.getModifiedItemAttr('shipBonusAC2'), skill='Amarr Cruiser', **kwargs)
+
+
 class Effect12753(BaseEffect):
     """
     shipRoleBonusOREExecutiveIssueMiningCriticalHitChanceBonus

staticdata/fsd_built/typedogma.0.json

@@ -824833,6 +824833,10 @@
         "attributeID": 633, 
         "value": 8.0
       }, 
+      {
+        "attributeID": 656, 
+        "value": 20.0
+      }, 
       {
         "attributeID": 659, 
         "value": 20.0
@@ -824847,7 +824851,7 @@
       }, 
       {
         "attributeID": 793, 
-        "value": 100.0
+        "value": 125.0
       }, 
       {
         "attributeID": 1132, 
@@ -824933,6 +824937,10 @@
         "attributeID": 2045, 
         "value": 1.0
       }, 
+      {
+        "attributeID": 2070, 
+        "value": 10.0
+      }, 
       {
         "attributeID": 2113, 
         "value": 1.0
@@ -824966,6 +824974,22 @@
       {
         "effectID": 5854, 
         "isDefault": 0
+      }, 
+      {
+        "effectID": 6299, 
+        "isDefault": 0
+      }, 
+      {
+        "effectID": 6305, 
+        "isDefault": 0
+      }, 
+      {
+        "effectID": 12739, 
+        "isDefault": 0
+      }, 
+      {
+        "effectID": 12740, 
+        "isDefault": 0
       }
     ]
   }, 
@@ -825579,6 +825603,10 @@
         "attributeID": 484, 
         "value": 0.75
       }, 
+      {
+        "attributeID": 485, 
+        "value": 20.0
+      }, 
       {
         "attributeID": 511, 
         "value": 0.0
@@ -825621,7 +825649,7 @@
       }, 
       {
         "attributeID": 793, 
-        "value": 100.0
+        "value": 125.0
       }, 
       {
         "attributeID": 1132, 
@@ -825691,6 +825719,10 @@
         "attributeID": 1555, 
         "value": 38.0
       }, 
+      {
+        "attributeID": 1623, 
+        "value": 10.0
+      }, 
       {
         "attributeID": 1692, 
         "value": 4.0
@@ -825740,6 +825772,22 @@
       {
         "effectID": 5854, 
         "isDefault": 0
+      }, 
+      {
+        "effectID": 6281, 
+        "isDefault": 0
+      }, 
+      {
+        "effectID": 6285, 
+        "isDefault": 0
+      }, 
+      {
+        "effectID": 6287, 
+        "isDefault": 0
+      }, 
+      {
+        "effectID": 6291, 
+        "isDefault": 0
       }
     ]
   },