Update static data and effects

Author: DarkFenX

eos/effects.py

@@ -20770,22 +20770,6 @@ def handler(fit, ship, context, projectionRange, **kwargs):
                                       skill='Command Ships', **kwargs)
 
 
-class Effect5505(BaseEffect):
-    """
-    eliteBonusCommandShipMediumHybridRoFCS1
-
-    Used by:
-    Ship: Astarte
-    """
-
-    type = 'passive'
-
-    @staticmethod
-    def handler(fit, ship, context, projectionRange, **kwargs):
-        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Hybrid Turret'),
-                                      'speed', ship.getModifiedItemAttr('eliteBonusCommandShips1'), skill='Command Ships', **kwargs)
-
-
 class Effect5514(BaseEffect):
     """
     eliteBonusCommandShipHeavyAssaultMissileDamageCS2
@@ -43321,7 +43305,7 @@ def handler(fit, ship, context, projectionRange, **kwargs):
 
 class Effect12873(BaseEffect):
     """
-    shipBonusCarrierA6JumpDriveBonus
+    shipBonusCarrierA6ConduitJumpPassengerCount
 
     Used by:
     Ship: Salvation
@@ -43331,7 +43315,7 @@ class Effect12873(BaseEffect):
 
     @staticmethod
     def handler(fit, ship, context, projectionRange, **kwargs):
-        fit.ship.boostItemAttr('jumpDriveRange', ship.getModifiedItemAttr('shipBonusCarrierA6'), skill='Amarr Carrier', **kwargs)
+        fit.ship.boostItemAttr('conduitJumpPassengerCount', ship.getModifiedItemAttr('shipBonusCarrierA6'), skill='Amarr Carrier', **kwargs)
 
 
 class Effect12875(BaseEffect):
@@ -43433,7 +43417,7 @@ def handler(fit, ship, context, projectionRange, **kwargs):
 
 class Effect12881(BaseEffect):
     """
-    shipBonusCarrierC6JumpDriveBonus
+    shipBonusCarrierC6ConduitJumpPassengerCount
 
     Used by:
     Ship: Simurgh
@@ -43443,7 +43427,7 @@ class Effect12881(BaseEffect):
 
     @staticmethod
     def handler(fit, ship, context, projectionRange, **kwargs):
-        fit.ship.boostItemAttr('jumpDriveRange', ship.getModifiedItemAttr('shipBonusCarrierC6'), skill='Caldari Carrier', **kwargs)
+        fit.ship.boostItemAttr('conduitJumpPassengerCount', ship.getModifiedItemAttr('shipBonusCarrierC6'), skill='Caldari Carrier', **kwargs)
 
 
 class Effect12882(BaseEffect):
@@ -43465,7 +43449,7 @@ def handler(fit, ship, context, projectionRange, **kwargs):
 
 class Effect12883(BaseEffect):
     """
-    shipBonusCarrierG7JumpDriveBonus
+    shipBonusCarrierG7ConduitJumpPassengerCount
 
     Used by:
     Ship: Gaia
@@ -43475,7 +43459,7 @@ class Effect12883(BaseEffect):
 
     @staticmethod
     def handler(fit, ship, context, projectionRange, **kwargs):
-        fit.ship.boostItemAttr('jumpDriveRange', ship.getModifiedItemAttr('shipBonusCarrierG7'), skill='Gallente Carrier', **kwargs)
+        fit.ship.boostItemAttr('conduitJumpPassengerCount', ship.getModifiedItemAttr('shipBonusCarrierG7'), skill='Gallente Carrier', **kwargs)
 
 
 class Effect12884(BaseEffect):
@@ -43497,7 +43481,7 @@ def handler(fit, ship, context, projectionRange, **kwargs):
 
 class Effect12885(BaseEffect):
     """
-    shipBonusCarrierM7JumpDriveBonus
+    shipBonusCarrierM7ConduitJumpPassengerCount
 
     Used by:
     Ship: Ymir
@@ -43507,7 +43491,7 @@ class Effect12885(BaseEffect):
 
     @staticmethod
     def handler(fit, ship, context, projectionRange, **kwargs):
-        fit.ship.boostItemAttr('jumpDriveRange', ship.getModifiedItemAttr('shipBonusCarrierM7'), skill='Minmatar Carrier', **kwargs)
+        fit.ship.boostItemAttr('conduitJumpPassengerCount', ship.getModifiedItemAttr('shipBonusCarrierM7'), skill='Minmatar Carrier', **kwargs)
 
 
 class Effect12887(BaseEffect):
@@ -43603,3 +43587,37 @@ def handler(fit, ship, context, projectionRange, **kwargs):
             fit.modules.filteredChargeBoost(
                 lambda mod: mod.charge.requiresSkill('Heavy Assault Missiles'), f'{damageType}Damage',
                 ship.getModifiedItemAttr('shipBonusMBC2'), skill='Minmatar Battlecruiser', **kwargs)
+
+
+class Effect12894(BaseEffect):
+    """
+    shipBonusCommandCarrierCMJDShipJumpCap
+
+    Used by:
+    Ships from group: Command Carrier (4 of 4)
+    """
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context, projectionRange, **kwargs):
+        fit.modules.filteredItemBoost(
+            lambda mod: mod.item.requiresSkill('Capital Micro Jump Drive Operation'), 'mjdShipJumpCap',
+            ship.getModifiedItemAttr('shipBonusCommandCarrierCMJDShipJumpCap'), **kwargs)
+
+
+class Effect12897(BaseEffect):
+    """
+    eliteBonusCommandShipMediumHybridDamageCS1
+
+    Used by:
+    Ship: Astarte
+    """
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context, projectionRange, **kwargs):
+        fit.modules.filteredItemBoost(
+            lambda mod: mod.item.requiresSkill('Medium Hybrid Turret'), 'damageMultiplier',
+            ship.getModifiedItemAttr('eliteBonusCommandShips1'), skill='Command Ships', **kwargs)

staticdata/fsd_built/dogmaattributes.0.json

@@ -49694,5 +49694,16 @@
     "name": "shipBonusCarrierM8", 
     "published": 0, 
     "stackable": 1
+  }, 
+  "6210": {
+    "attributeID": 6210, 
+    "categoryID": 37, 
+    "dataType": 5, 
+    "defaultValue": 0.0, 
+    "displayWhenZero": 0, 
+    "highIsGood": 1, 
+    "name": "shipBonusCommandCarrierCMJDShipJumpCap", 
+    "published": 1, 
+    "stackable": 1
   }
 }

staticdata/fsd_built/dogmaeffects.0.json

@@ -101175,7 +101175,7 @@
     "disallowAutoRepeat": 0, 
     "effectCategory": 0, 
     "effectID": 12873, 
-    "effectName": "shipBonusCarrierA6JumpDriveBonus", 
+    "effectName": "shipBonusCarrierA6ConduitJumpPassengerCount", 
     "electronicChance": 0, 
     "isAssistance": 0, 
     "isOffensive": 0, 
@@ -101184,14 +101184,13 @@
       {
         "domain": "shipID", 
         "func": "ItemModifier", 
-        "modifiedAttributeID": 867, 
+        "modifiedAttributeID": 3133, 
         "modifyingAttributeID": 6191, 
         "operation": 6
       }
     ], 
     "propulsionChance": 0, 
     "published": 0, 
-    "rangeAttributeID": 54, 
     "rangeChance": 0
   }, 
   "12875": {
@@ -101491,7 +101490,7 @@
     "disallowAutoRepeat": 0, 
     "effectCategory": 0, 
     "effectID": 12881, 
-    "effectName": "shipBonusCarrierC6JumpDriveBonus", 
+    "effectName": "shipBonusCarrierC6ConduitJumpPassengerCount", 
     "electronicChance": 0, 
     "isAssistance": 0, 
     "isOffensive": 0, 
@@ -101500,7 +101499,7 @@
       {
         "domain": "shipID", 
         "func": "ItemModifier", 
-        "modifiedAttributeID": 867, 
+        "modifiedAttributeID": 3133, 
         "modifyingAttributeID": 6196, 
         "operation": 6
       }
@@ -101536,7 +101535,7 @@
     "disallowAutoRepeat": 0, 
     "effectCategory": 0, 
     "effectID": 12883, 
-    "effectName": "shipBonusCarrierG7JumpDriveBonus", 
+    "effectName": "shipBonusCarrierG7ConduitJumpPassengerCount", 
     "electronicChance": 0, 
     "isAssistance": 0, 
     "isOffensive": 0, 
@@ -101545,7 +101544,7 @@
       {
         "domain": "shipID", 
         "func": "ItemModifier", 
-        "modifiedAttributeID": 867, 
+        "modifiedAttributeID": 3133, 
         "modifyingAttributeID": 6197, 
         "operation": 6
       }
@@ -101581,7 +101580,7 @@
     "disallowAutoRepeat": 0, 
     "effectCategory": 0, 
     "effectID": 12885, 
-    "effectName": "shipBonusCarrierM7JumpDriveBonus", 
+    "effectName": "shipBonusCarrierM7ConduitJumpPassengerCount", 
     "electronicChance": 0, 
     "isAssistance": 0, 
     "isOffensive": 0, 
@@ -101590,7 +101589,7 @@
       {
         "domain": "shipID", 
         "func": "ItemModifier", 
-        "modifiedAttributeID": 867, 
+        "modifiedAttributeID": 3133, 
         "modifyingAttributeID": 6200, 
         "operation": 6
       }
@@ -101761,5 +101760,61 @@
     "propulsionChance": 0, 
     "published": 0, 
     "rangeChance": 0
+  }, 
+  "12894": {
+    "disallowAutoRepeat": 0, 
+    "effectCategory": 0, 
+    "effectID": 12894, 
+    "effectName": "shipBonusCommandCarrierCMJDShipJumpCap", 
+    "electronicChance": 0, 
+    "isAssistance": 0, 
+    "isOffensive": 0, 
+    "isWarpSafe": 0, 
+    "modifierInfo": [
+      {
+        "domain": "shipID", 
+        "func": "LocationRequiredSkillModifier", 
+        "modifiedAttributeID": 2832, 
+        "modifyingAttributeID": 6210, 
+        "operation": 6, 
+        "skillTypeID": 83464
+      }
+    ], 
+    "propulsionChance": 0, 
+    "published": 0, 
+    "rangeChance": 0
+  }, 
+  "12897": {
+    "description_de": "Automatically generated effect", 
+    "description_en-us": "Automatically generated effect", 
+    "description_es": "Automatically generated effect", 
+    "description_fr": "Automatically generated effect", 
+    "description_it": "Automatically generated effect", 
+    "description_ja": "Automatically generated effect", 
+    "description_ko": "Automatically generated effect", 
+    "description_ru": "Automatically generated effect", 
+    "description_zh": "Automatically generated effect", 
+    "descriptionID": 1046024, 
+    "disallowAutoRepeat": 0, 
+    "effectCategory": 0, 
+    "effectID": 12897, 
+    "effectName": "eliteBonusCommandShipMediumHybridDamageCS1", 
+    "electronicChance": 0, 
+    "isAssistance": 0, 
+    "isOffensive": 0, 
+    "isWarpSafe": 0, 
+    "modifierInfo": [
+      {
+        "domain": "shipID", 
+        "func": "LocationRequiredSkillModifier", 
+        "modifiedAttributeID": 64, 
+        "modifyingAttributeID": 1000, 
+        "operation": 6, 
+        "skillTypeID": 3304
+      }
+    ], 
+    "propulsionChance": 0, 
+    "published": 0, 
+    "rangeChance": 0
   }
 }

staticdata/fsd_built/typedogma.0.json

@@ -1068627,15 +1068627,15 @@
       }, 
       {
         "attributeID": 747, 
-        "value": 7.5
+        "value": 10.0
       }, 
       {
         "attributeID": 999, 
         "value": 10.0
       }, 
       {
         "attributeID": 1000, 
-        "value": -7.5
+        "value": 10.0
       }, 
       {
         "attributeID": 1132, 
@@ -1068755,10 +1068755,6 @@
         "effectID": 5342, 
         "isDefault": 0
       }, 
-      {
-        "effectID": 5505, 
-        "isDefault": 0
-      }, 
       {
         "effectID": 5572, 
         "isDefault": 0
@@ -1068770,6 +1068766,10 @@
       {
         "effectID": 6783, 
         "isDefault": 0
+      }, 
+      {
+        "effectID": 12897, 
+        "isDefault": 0
       }
     ]
   },