Specify requests version

.appveyor.yml

@@ -11,7 +11,7 @@ for:
     environment:
       APPVEYOR_SSH_KEY: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDJDW/+oYNGOiPvwuwAL9tc/LQgg58aosIVpMYfepQZ20V+VZnHpZh8IRDA8Jo5xht19p2PksA+hFgqA0kpKtrSkuiWdE8rATQItfk4gf7yB0yGasJGGQZYazy9k/9XtmYkq2HHOOeEqdxvrICddJQ88MLCLT9lJENSUP/YS/yGcjZFXVxE11pTeIcqlCRU+3eYa1v7BeNvXIKNhZoK5orXWrtuH3cy8jrSns/u70aYfJ6B2jA8CnWnDbuvpeQtEY61SQqlKUsSArNa8NAsXj41wr3Ar9gAG9330w7EMTqlutk8HZO35uHI0q5qinUhaQYufPPrVkb2L/N+ZCfu0fnh appveyor"
       APPIMAGE_TOOL: appimagetool-x86_64.AppImage
-      PYTHON_APPIMAGE: python3.7.15-cp37-cp37m-manylinux2014_x86_64.AppImage
+      PYTHON_APPIMAGE: python3.7.16-cp37-cp37m-manylinux2014_x86_64.AppImage
       DEPLOY_DIR: AppDir/opt/pyfa
 #      APPVEYOR_SSH_BLOCK: true
     cache:

db_update.py

@@ -641,6 +641,140 @@ def update_db():
             effect.effectName = effectName
             item.effects[effectName] = effect
 
+    def hardcodeGeri():
+        attrMap = {
+            # Fitting
+            'powerOutput': 50,
+            'cpuOutput': 200,
+            'capacitorCapacity': 325,
+            'rechargeRate': 130000,
+            # Slots
+            'hiSlots': 5,
+            'medSlots': 4,
+            'lowSlots': 4,
+            'launcherSlotsLeft': 3,
+            'turretSlotsLeft': 2,
+            # Rigs
+            'rigSlots': 2,
+            'rigSize': 1,
+            'upgradeCapacity': 400,
+            # Shield
+            'shieldCapacity': 1000,
+            'shieldEmDamageResonance': 1 - 0.75,
+            'shieldThermalDamageResonance': 1 - 0.6,
+            'shieldKineticDamageResonance': 1 - 0.4,
+            'shieldExplosiveDamageResonance': 1 - 0.5,
+            # Armor
+            'armorHP': 1000,
+            'armorEmDamageResonance': 1 - 0.9,
+            'armorThermalDamageResonance': 1 - 0.675,
+            'armorKineticDamageResonance': 1 - 0.25,
+            'armorExplosiveDamageResonance': 1 - 0.1,
+            # Structure
+            'hp': 700,
+            'emDamageResonance': 1 - 0.33,
+            'thermalDamageResonance': 1 - 0.33,
+            'kineticDamageResonance': 1 - 0.33,
+            'explosiveDamageResonance': 1 - 0.33,
+            'mass': 1309000,
+            'volume': 27289,
+            'capacity': 260,
+            # Navigation
+            'maxVelocity': 440,
+            'agility': 2.5,
+            'warpSpeedMultiplier': 5.5,
+            # Drones
+            'droneCapacity': 50,
+            'droneBandwidth': 10,
+            # Targeting
+            'maxTargetRange': 42000,
+            'maxLockedTargets': 6,
+            'scanRadarStrength': 0,
+            'scanLadarStrength': 12,
+            'scanMagnetometricStrength': 0,
+            'scanGravimetricStrength': 0,
+            'signatureRadius': 33,
+            'scanResolution': 770}
+        effectMap = {
+            100100: 'pyfaCustomGeriAfExploVel',
+            100101: 'pyfaCustomGeriAfRof',
+            100102: 'pyfaCustomGeriMfDmg',
+            100103: 'pyfaCustomGeriMfRep',
+            100104: 'pyfaCustomGeriRoleWebDroneStr',
+            100105: 'pyfaCustomGeriRoleWebDroneHP',
+            100106: 'pyfaCustomGeriRoleWebDroneSpeed',
+            100107: 'pyfaCustomGeriRoleMWDSigBloom'}
+        _hardcodeAttribs(74141, attrMap)
+        _hardcodeEffects(74141, effectMap)
+
+    def hardcodeBestla():
+        attrMap = {
+            # Fitting
+            'powerOutput': 1300,
+            'cpuOutput': 500,
+            'capacitorCapacity': 1500,
+            'rechargeRate': 200000,
+            'hiSlots': 6,
+            'medSlots': 5,
+            'lowSlots': 5,
+            'launcherSlotsLeft': 4,
+            'turretSlotsLeft': 2,
+            # Rigs
+            'rigSlots': 2,
+            'rigSize': 2,
+            'upgradeCapacity': 400,
+            # Shield
+            'shieldCapacity': 3000,
+            'shieldEmDamageResonance': 1 - 0.75,
+            'shieldThermalDamageResonance': 1 - 0.6,
+            'shieldKineticDamageResonance': 1 - 0.4,
+            'shieldExplosiveDamageResonance': 1 - 0.5,
+            # Armor
+            'armorHP': 3000,
+            'armorEmDamageResonance': 1 - 0.9,
+            'armorThermalDamageResonance': 1 - 0.675,
+            'armorKineticDamageResonance': 1 - 0.25,
+            'armorExplosiveDamageResonance': 1 - 0.1,
+            # Structure
+            'hp': 1600,
+            'emDamageResonance': 1 - 0.33,
+            'thermalDamageResonance': 1 - 0.33,
+            'kineticDamageResonance': 1 - 0.33,
+            'explosiveDamageResonance': 1 - 0.33,
+            'mass': 11650000,
+            'volume': 96000,
+            'capacity': 660,
+            # Navigation
+            'maxVelocity': 300,
+            'agility': 0.47,
+            'warpSpeedMultiplier': 4.5,
+            # Drones
+            'droneCapacity': 125,
+            'droneBandwidth': 20,
+            # Targeting
+            'maxTargetRange': 80000,
+            'maxLockedTargets': 7,
+            'scanRadarStrength': 0,
+            'scanLadarStrength': 22,
+            'scanMagnetometricStrength': 0,
+            'scanGravimetricStrength': 0,
+            'signatureRadius': 120,
+            'scanResolution': 340}
+        effectMap = {
+            100200: 'pyfaCustomBestlaHacExploVel',
+            100201: 'pyfaCustomBestlaHacRof',
+            100202: 'pyfaCustomBestlaMcDmg',
+            100203: 'pyfaCustomBestlaMcRep',
+            100204: 'pyfaCustomBestlaRoleWebDroneStr',
+            100205: 'pyfaCustomBestlaRoleWebDroneHP',
+            100206: 'pyfaCustomBestlaRoleWebDroneSpeed'}
+        _hardcodeAttribs(74316, attrMap)
+        _hardcodeEffects(74316, effectMap)
+
+    hardcodeGeri()
+    hardcodeBestla()
+
+
     eos.db.gamedata_session.commit()
     eos.db.gamedata_engine.execute('VACUUM')
 

eos/effects.py

@@ -1850,7 +1850,7 @@ class Effect596(BaseEffect):
     ammoInfluenceRange
 
     Used by:
-    Items from category: Charge (608 of 1008)
+    Items from category: Charge (608 of 1010)
     """
 
     type = 'passive'
@@ -1865,7 +1865,7 @@ class Effect598(BaseEffect):
     ammoSpeedMultiplier
 
     Used by:
-    Charges from group: Festival Charges (38 of 38)
+    Charges from group: Festival Charges (40 of 40)
     Charges from group: Interdiction Probe (2 of 2)
     Charges from group: Structure Festival Charges (2 of 2)
     Special Edition Assetss from group: Festival Charges Expired (4 of 4)
@@ -2425,7 +2425,7 @@ class Effect804(BaseEffect):
     ammoInfluenceCapNeed
 
     Used by:
-    Items from category: Charge (538 of 1008)
+    Items from category: Charge (538 of 1010)
     """
 
     type = 'passive'
@@ -6801,7 +6801,6 @@ class Effect2296(BaseEffect):
 
     Used by:
     Implants named like: Halcyon Y Booster (5 of 5)
-    Implants named like: Tetrimon Resistance Booster (4 of 4)
     """
 
     type = 'passive'
@@ -7000,7 +6999,6 @@ class Effect2432(BaseEffect):
     Implants named like: Halcyon Y Booster (5 of 5)
     Implants named like: Inherent Implants 'Squire' Capacitor Management EM (6 of 6)
     Implants named like: Mindflood Booster (4 of 4)
-    Implants named like: Tetrimon Capacitor Booster (4 of 4)
     Modules named like: Semiconductor Memory Cell (8 of 8)
     Implant: Antipharmakon Aeolis
     Implant: Basic Capsuleer Engineering Augmentation Chip
@@ -7624,7 +7622,6 @@ class Effect2696(BaseEffect):
     maxRangeBonusEffectLasers
 
     Used by:
-    Implants named like: Tetrimon Precision Booster (4 of 4)
     Modules named like: Energy Locus Coordinator (8 of 8)
     """
 
@@ -8375,8 +8372,8 @@ class Effect2803(BaseEffect):
     energyWeaponDamageMultiplyPassive
 
     Used by:
-    Implants named like: Harvest Damage Booster (4 of 4)
     Modules named like: Energy Collision Accelerator (8 of 8)
+    Items from market group: Implants & Boosters > Booster > Booster Slot 17 (96 of 96)
     """
 
     type = 'passive'
@@ -9711,7 +9708,7 @@ class Effect3212(BaseEffect):
     @staticmethod
     def handler(fit, container, context, projectionRange, **kwargs):
         level = container.level if 'skill' in context else 1
-        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('FoF Missiles'),
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Auto-Targeting Missiles'),
                                         'aoeCloudSize', container.getModifiedItemAttr('aoeCloudSizeBonus') * level, **kwargs)
 
 
@@ -11116,54 +11113,6 @@ class Effect3617(BaseEffect):
         module.boostItemAttr('signatureRadiusBonus', module.getModifiedChargeAttr('signatureRadiusBonusBonus'), **kwargs)
 
 
-class Effect3618(BaseEffect):
-    """
-    scriptMassBonusPercentageBonus
-
-    Used by:
-    Charges from group: Warp Disruption Script (2 of 2)
-    """
-
-    runTime = 'early'
-    type = 'passive'
-
-    @staticmethod
-    def handler(fit, module, context, projectionRange, **kwargs):
-        module.boostItemAttr('massBonusPercentage', module.getModifiedChargeAttr('massBonusPercentageBonus'), **kwargs)
-
-
-class Effect3619(BaseEffect):
-    """
-    scriptSpeedBoostFactorBonusBonus
-
-    Used by:
-    Charges from group: Warp Disruption Script (2 of 2)
-    """
-
-    runTime = 'early'
-    type = 'passive'
-
-    @staticmethod
-    def handler(fit, module, context, projectionRange, **kwargs):
-        module.boostItemAttr('speedBoostFactorBonus', module.getModifiedChargeAttr('speedBoostFactorBonusBonus'), **kwargs)
-
-
-class Effect3620(BaseEffect):
-    """
-    scriptSpeedFactorBonusBonus
-
-    Used by:
-    Charges from group: Warp Disruption Script (2 of 2)
-    """
-
-    runTime = 'early'
-    type = 'passive'
-
-    @staticmethod
-    def handler(fit, module, context, projectionRange, **kwargs):
-        module.boostItemAttr('speedFactorBonus', module.getModifiedChargeAttr('speedFactorBonusBonus'), **kwargs)
-
-
 class Effect3648(BaseEffect):
     """
     scriptWarpScrambleRangeBonus
@@ -12396,6 +12345,7 @@ class Effect3993(BaseEffect):
     Used by:
     Celestials named like: Class Black Hole Effects (6 of 6)
     Celestials named like: Class Magnetar Effects (6 of 6)
+    Celestial: Turnur Aftermath
     """
 
     runTime = 'early'
@@ -16354,7 +16304,7 @@ class Effect4902(BaseEffect):
     MWDSignatureRadiusRoleBonus
 
     Used by:
-    Ships from group: Assault Frigate (9 of 13)
+    Ships from group: Assault Frigate (9 of 14)
     Ships from group: Command Destroyer (5 of 5)
     """
 
@@ -18066,7 +18016,6 @@ class Effect5189(BaseEffect):
     trackingSpeedBonusEffectLasers
 
     Used by:
-    Implants named like: Tetrimon Precision Booster (4 of 4)
     Modules named like: Energy Metastasis Adjuster (8 of 8)
     """
 
@@ -32955,9 +32904,12 @@ class Effect6946(BaseEffect):
 
     @staticmethod
     def handler(fit, src, context, projectionRange, **kwargs):
-        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Repair Systems') or mod.item.requiresSkill('Shield Operation'),
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Repair Systems'),
                                       'overloadArmorDamageAmount', src.getModifiedItemAttr('subsystemBonusMinmatarDefensive3'),
                                       skill='Minmatar Defensive Systems', **kwargs)
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Shield Operation'),
+                                      'overloadShieldBonus', src.getModifiedItemAttr('subsystemBonusMinmatarDefensive3'),
+                                      skill='Minmatar Defensive Systems', **kwargs)
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Repair Systems') or mod.item.requiresSkill('Shield Operation'),
                                       'overloadSelfDurationBonus', src.getModifiedItemAttr('subsystemBonusMinmatarDefensive3'),
                                       skill='Minmatar Defensive Systems', **kwargs)
@@ -35591,6 +35543,7 @@ class Effect7237(BaseEffect):
 
     Used by:
     Celestial: Dazh Liminality Locus
+    Celestial: Turnur Aftermath
     """
 
     runTime = 'early'
@@ -36377,6 +36330,23 @@ class Effect8076(BaseEffect):
                                stackingPenalties=True, **kwargs)
 
 
+class Effect8082(BaseEffect):
+    """
+    systemScanResolutionBonus
+
+    Used by:
+    Celestial: Turnur Aftermath
+    """
+
+    runTime = 'early'
+    type = ('projected', 'passive')
+
+    @staticmethod
+    def handler(fit, beacon, context, projectionRange, **kwargs):
+        fit.ship.boostItemAttr('scanResolution', beacon.getModifiedItemAttr('scanResolutionBonus'),
+                               stackingPenalties=True, **kwargs)
+
+
 class Effect8091(BaseEffect):
     """
     shipBonusForceAuxiliaryG2CapBoosterStrength
@@ -37628,65 +37598,12 @@ class Effect8264(BaseEffect):
             skill='Industrial Command Ships', **kwargs)
 
 
-class Effect8267(BaseEffect):
-    """
-    weaponDisruptorResistanceBonusPassive
-
-    Used by:
-    Implants named like: Harvest Anti Disruptor Booster (4 of 4)
-    """
-
-    type = 'passive'
-
-    @staticmethod
-    def handler(fit, container, context, projectionRange, **kwargs):
-        fit.ship.boostItemAttr(
-            'weaponDisruptionResistance',
-            container.getModifiedItemAttr('weaponDisruptionResistanceBonus'), **kwargs)
-
-
-
-class Effect8268(BaseEffect):
-    """
-    nosferatuDurationBonusPassive
-
-    Used by:
-    Implants named like: Harvest Nosferatu Booster (4 of 4)
-    """
-
-    type = 'passive'
-
-    @staticmethod
-    def handler(fit, module, context, projectionRange, **kwargs):
-        fit.modules.filteredItemBoost(
-            lambda mod: mod.item.group.name == 'Energy Nosferatu', 'duration',
-            module.getModifiedItemAttr('durationBonus'), **kwargs)
-
-
-class Effect8269(BaseEffect):
-    """
-    stasisWebifierMaxRangeAddPassive
-
-    Used by:
-    Implants named like: Harvest Webifier Booster (4 of 4)
-    """
-
-    type = 'passive'
-
-    @staticmethod
-    def handler(fit, module, context, projectionRange, **kwargs):
-        fit.modules.filteredItemIncrease(
-            lambda mod: mod.item.group.name == 'Stasis Web', 'maxRange',
-            module.getModifiedItemAttr('stasisWebRangeAdd'), **kwargs)
-
-
 class Effect8270(BaseEffect):
     """
     capacitorWarfareResistanceBonusPassive
 
     Used by:
     Implants named like: Halcyon Y Booster (5 of 5)
-    Implants named like: Tetrimon Anti Drain Booster (4 of 4)
     """
 
     type = 'passive'
@@ -38556,7 +38473,7 @@ class Effect11373(BaseEffect):
 
 class Effect11374(BaseEffect):
     """
-    shipBonusDreadnoughtA4EnergyWarfareAmountBonus
+    shipBonusDreadnoughtA4EnergyWarfareRangeAmountBonus
 
     Used by:
     Ship: Revelation Navy Issue
@@ -38572,26 +38489,6 @@ class Effect11374(BaseEffect):
                 ship.getModifiedItemAttr('shipBonusDreadnoughtA4'), skill='Amarr Dreadnought', **kwargs)
 
 
-class Effect11375(BaseEffect):
-    """
-    shipBonusDreadnoughtA4EnergyWarfareRangeBonus
-
-    Used by:
-    Ship: Revelation Navy Issue
-    """
-
-    type = 'passive'
-
-    @staticmethod
-    def handler(fit, ship, context, projectionRange, **kwargs):
-        fit.modules.filteredItemBoost(
-            lambda mod: mod.item.group.name == 'Energy Nosferatu', 'powerTransferRange',
-            ship.getModifiedItemAttr('shipBonusDreadnoughtA4'), skill='Amarr Dreadnought', **kwargs)
-        fit.modules.filteredItemBoost(
-            lambda mod: mod.item.group.name == 'Energy Neutralizer', 'energyNeutralizerRangeOptimal',
-            ship.getModifiedItemAttr('shipBonusDreadnoughtA4'), skill='Amarr Dreadnought', **kwargs)
-
-
 class Effect11376(BaseEffect):
     """
     shipBonusDreadnoughtG1OptimalRangeBonus
@@ -39370,6 +39267,24 @@ class Effect11432(BaseEffect):
             ship.getModifiedItemAttr('eliteBonusGunship2'), skill='Assault Frigates', **kwargs)
 
 
+class Effect11445(BaseEffect):
+    """
+    systemSensorStrengthBonus
+
+    Used by:
+    Celestial: Turnur Aftermath
+    """
+
+    runTime = 'early'
+    type = ('projected', 'passive')
+
+    @staticmethod
+    def handler(fit, beacon, context, projectionRange, **kwargs):
+        for sensor_type in ('Gravimetric', 'Ladar', 'Magnetometric', 'Radar'):
+            fit.ship.boostItemAttr(f'scan{sensor_type}Strength', beacon.getModifiedItemAttr('sensorStrengthBonus'),
+                                   stackingPenalties=True, **kwargs)
+
+
 class Effect11446(BaseEffect):
     """
     shipBonusDreadnoughtG4DamageBonus
@@ -39419,3 +39334,283 @@ class Effect11452(BaseEffect):
         fit.modules.filteredItemBoost(
             lambda mod: mod.item.group.name == 'Warp Scrambler', 'warpScrambleStrength',
             ship.getModifiedItemAttr('shipBonusDreadnoughtG5'), skill='Gallente Dreadnought', **kwargs)
+
+
+class Effect11454(BaseEffect):
+    """
+    shipBonusGrapplerFalloffM4
+
+    Used by:
+    Ship: Naglfar Fleet Issue
+    """
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context, projectionRange, **kwargs):
+        fit.modules.filteredItemBoost(
+            lambda mod: mod.item.group.name == 'Stasis Grappler', 'falloffEffectiveness',
+            ship.getModifiedItemAttr('shipBonusDreadnoughtM4'), skill='Minmatar Dreadnought', **kwargs)
+
+
+class Effect100100(BaseEffect):
+    """
+    pyfaCustomGeriAfExploVel
+
+    Used by:
+    Ship: Geri
+    """
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context, projectionRange, **kwargs):
+        fit.modules.filteredChargeBoost(
+            lambda mod: mod.charge.requiresSkill('Light Missiles') or mod.charge.requiresSkill('Rockets'),
+            'aoeVelocity', 7.5, skill='Assault Frigates', **kwargs)
+
+
+
+class Effect100101(BaseEffect):
+    """
+    pyfaCustomGeriAfRof
+
+    Used by:
+    Ship: Geri
+    """
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context, projectionRange, **kwargs):
+        fit.modules.filteredItemBoost(
+            lambda mod: mod.item.group.name in ('Missile Launcher Rocket', 'Missile Launcher Light'),
+            'speed', -7.5, skill='Assault Frigates', **kwargs)
+
+
+
+class Effect100102(BaseEffect):
+    """
+    pyfaCustomGeriMfDmg
+
+    Used by:
+    Ship: Geri
+    """
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context, projectionRange, **kwargs):
+        for dmgType in ('em', 'kinetic', 'explosive', 'thermal'):
+            fit.modules.filteredChargeBoost(
+                lambda mod: mod.charge.requiresSkill('Light Missiles') or mod.charge.requiresSkill('Rockets'),
+                f'{dmgType}Damage', 7.5, skill='Minmatar Frigate', **kwargs)
+
+
+class Effect100103(BaseEffect):
+    """
+    pyfaCustomGeriMfRep
+
+    Used by:
+    Ship: Geri
+    """
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context, projectionRange, **kwargs):
+        fit.modules.filteredItemBoost(
+            lambda mod: mod.item.requiresSkill('Shield Operation'),
+            'shieldBonus', 7.5, skill='Minmatar Frigate', **kwargs)
+        fit.modules.filteredItemBoost(
+            lambda mod: mod.item.requiresSkill('Repair Systems'),
+            'armorDamageAmount', 7.5, skill='Minmatar Frigate', **kwargs)
+
+
+class Effect100104(BaseEffect):
+    """
+    pyfaCustomGeriRoleWebDroneStr
+
+    Used by:
+    Ship: Geri
+    """
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context, projectionRange, **kwargs):
+        fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Drones'), 'speedFactor', 500, **kwargs)
+
+
+class Effect100105(BaseEffect):
+    """
+    pyfaCustomGeriRoleWebDroneHP
+
+    Used by:
+    Ship: Geri
+    """
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context, projectionRange, **kwargs):
+        for layer in ('shieldCapacity', 'armorHP', 'hp'):
+            fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Drones'), layer, 250, **kwargs)
+
+
+class Effect100106(BaseEffect):
+    """
+    pyfaCustomGeriRoleWebDroneSpeed
+
+    Used by:
+    Ship: Geri
+    """
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context, projectionRange, **kwargs):
+        fit.drones.filteredItemBoost(
+            lambda drone: drone.item.requiresSkill('Drones'), 'maxVelocity', 50, **kwargs)
+
+
+class Effect100107(BaseEffect):
+    """
+    pyfaCustomGeriRoleMWDSigBloom
+
+    Used by:
+    Ship: Geri
+    """
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context, projectionRange, **kwargs):
+        fit.modules.filteredItemBoost(
+            lambda mod: mod.item.requiresSkill('High Speed Maneuvering'),
+            'signatureRadiusBonus', -50, **kwargs)
+
+
+class Effect100200(BaseEffect):
+    """
+    pyfaCustomBestlaHacExploVel
+
+    Used by:
+    Ship: Bestla
+    """
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context, projectionRange, **kwargs):
+        fit.modules.filteredChargeBoost(
+            lambda mod: mod.charge.requiresSkill('Heavy Assault Missiles') or mod.charge.requiresSkill('Heavy Missiles'),
+            'aoeVelocity', 10, skill='Heavy Assault Cruisers', **kwargs)
+
+
+
+class Effect100201(BaseEffect):
+    """
+    pyfaCustomBestlaHacRof
+
+    Used by:
+    Ship: Bestla
+    """
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context, projectionRange, **kwargs):
+        fit.modules.filteredItemBoost(
+            lambda mod: mod.item.group.name in (
+                'Missile Launcher Heavy Assault', 'Missile Launcher Heavy', 'Missile Launcher Rapid Light'),
+            'speed', -10, skill='Heavy Assault Cruisers', **kwargs)
+
+
+
+class Effect100202(BaseEffect):
+    """
+    pyfaCustomBestlaMcDmg
+
+    Used by:
+    Ship: Bestla
+    """
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context, projectionRange, **kwargs):
+        for dmgType in ('em', 'kinetic', 'explosive', 'thermal'):
+            fit.modules.filteredChargeBoost(
+                lambda mod: (
+                    mod.charge.requiresSkill('Light Missiles')
+                    or mod.charge.requiresSkill('Heavy Assault Missiles')
+                    or mod.charge.requiresSkill('Heavy Missiles')),
+                f'{dmgType}Damage', 10, skill='Minmatar Cruiser', **kwargs)
+
+
+class Effect100203(BaseEffect):
+    """
+    pyfaCustomBestlaMcRep
+
+    Used by:
+    Ship: Bestla
+    """
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context, projectionRange, **kwargs):
+        fit.modules.filteredItemBoost(
+            lambda mod: mod.item.requiresSkill('Shield Operation'),
+            'shieldBonus', 10, skill='Minmatar Cruiser', **kwargs)
+        fit.modules.filteredItemBoost(
+            lambda mod: mod.item.requiresSkill('Repair Systems'),
+            'armorDamageAmount', 10, skill='Minmatar Cruiser', **kwargs)
+
+
+class Effect100204(BaseEffect):
+    """
+    pyfaCustomBestlaRoleWebDroneStr
+
+    Used by:
+    Ship: Bestla
+    """
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context, projectionRange, **kwargs):
+        fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Drones'), 'speedFactor', 500, **kwargs)
+
+
+class Effect100205(BaseEffect):
+    """
+    pyfaCustomBestlaRoleWebDroneHP
+
+    Used by:
+    Ship: Bestla
+    """
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context, projectionRange, **kwargs):
+        for layer in ('shieldCapacity', 'armorHP', 'hp'):
+            fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Drones'), layer, 500, **kwargs)
+
+
+class Effect100206(BaseEffect):
+    """
+    pyfaCustomBestlaRoleWebDroneSpeed
+
+    Used by:
+    Ship: Bestla
+    """
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context, projectionRange, **kwargs):
+        fit.drones.filteredItemBoost(
+            lambda drone: drone.item.requiresSkill('Drones'), 'maxVelocity', 50, **kwargs)

gui/builtinContextMenus/commandFitAdd.py

@@ -44,7 +44,6 @@ class AddCommandFit(ContextMenuUnconditional):
     def display(self, callingWindow, srcContext):
         if self.mainFrame.getActiveFit() is None or len(self.__class__.commandFits) == 0 or srcContext != "commandView":
             return False
-
         return True
 
     def getText(self, callingWindow, itmContext):
@@ -52,6 +51,8 @@ class AddCommandFit(ContextMenuUnconditional):
 
     def addFit(self, menu, fit, includeShip=False):
         label = fit.name if not includeShip else "({}) {}".format(fit.ship.item.name, fit.name)
+        if not label:
+            label = ' '
         id = ContextMenuUnconditional.nextID()
         self.fitMenuItemIds[id] = fit
         menuItem = wx.MenuItem(menu, id, label)

gui/builtinContextMenus/envEffectAdd.py

@@ -123,7 +123,7 @@ class AddEnvironmentEffect(ContextMenuUnconditional):
         data.groups[_t('Abyssal Weather')] = self.getAbyssalWeather()
         data.groups[_t('Sansha Incursion')] = self.getEffectBeacons(
             _t('ContextMenu|ProjectedEffectManipulation|Sansha Incursion'))
-        data.groups[_t('Triglavian Invasion')] = self.getDestructibleBeacons()
+        data.groups[_t('Triglavian Invasion')] = self.getInvasionBeacons()
         return data
 
     def getEffectBeacons(self, *groups, extra_garbage=()):
@@ -231,5 +231,12 @@ class AddEnvironmentEffect(ContextMenuUnconditional):
         data.sort()
         return data
 
+    def getInvasionBeacons(self):
+        data = self.getDestructibleBeacons()
+        # Turnur weather
+        item = Market.getInstance().getItem(74002)
+        data.items.append(Entry(item.ID, item.name, item.name))
+        return data
+
 
 AddEnvironmentEffect.register()

requirements.txt

@@ -3,7 +3,7 @@ logbook >= 1.0.0
 numpy == 1.19.2
 matplotlib == 3.2.2
 python-dateutil
-requests >= 2.0.0
+requests == 2.28.1
 sqlalchemy == 1.3.23
 cryptography >= 2.3
 markdown2 >= 2.3.5

service/conversions/releaseFeb2023.py

@@ -0,0 +1,16 @@
+"""
+Conversion pack for February 2023 release
+"""
+
+CONVERSIONS = {
+    # Renamed items
+    "Restrained Interdiction Nullifier": "Enduring Interdiction Nullifier",
+    "Synthetic Hull Conversion Inertia Stabilizers": "Synthetic Hull Conversion Inertial Stabilizers",
+    "Tobias's Modified Torpedo Launcher": "Tobias' Modified Torpedo Launcher",
+    "Vepas's Modified Torpedo Launcher": "Vepas' Modified Torpedo Launcher",
+    "Vepas's Modified Kinetic Shield Hardener": "Vepas' Modified Kinetic Shield Hardener",
+    "Vepas's Modified EM Shield Hardener": "Vepas' Modified EM Shield Hardener",
+    "Vepas's Modified Explosive Shield Hardener": "Vepas' Modified Explosive Shield Hardener",
+    "Vepas's Modified Thermal Shield Hardener": "Vepas' Modified Thermal Shield Hardener",
+    "Vepas's Modified Multispectrum Shield Hardener": "Vepas' Modified Multispectrum Shield Hardener",
+}

service/market.py

@@ -319,6 +319,8 @@ class Market:
             "Raiju"                       : self.les_grp,  # AT17 prize
             "Laelaps"                     : self.les_grp,  # AT17 prize
             "Boobook"                     : self.les_grp,  # 19th EVE anniversary gift
+            "Geri"                        : self.les_grp,  # AT18 prize
+            "Bestla"                      : self.les_grp,  # AT18 prize
         }
 
         self.ITEMS_FORCEGROUP_R = self.__makeRevDict(self.ITEMS_FORCEGROUP)

service/port/eft.py

@@ -204,7 +204,7 @@ def exportFighters(fighters):
 
     def fighterSorter(fighter):
         groupName = Market.getInstance().getGroupByItem(fighter.item).name
-        return (FIGHTER_ORDER.index(groupName), fighter.fullName)
+        return (FIGHTER_ORDER.index(groupName), fighter.item.typeName)
 
     fighterLines = []
     for fighter in sorted(fighters, key=fighterSorter):

staticdata/fsd_binary/categories.0.json

@@ -310,7 +310,7 @@
     "categoryID": 26, 
     "categoryName_de": "WeltRaum", 
     "categoryName_en-us": "WorldSpace", 
-    "categoryName_es": "Lugares del mundo", 
+    "categoryName_es": "WorldSpace", 
     "categoryName_fr": "Espace planétaire", 
     "categoryName_it": "WorldSpace", 
     "categoryName_ja": "ワールドスペース", 
@@ -406,7 +406,7 @@
   }, 
   "40": {
     "categoryID": 40, 
-    "categoryName_de": "Souveränitätsstrukturen ", 
+    "categoryName_de": "Souveränitätsstrukturen", 
     "categoryName_en-us": "Sovereignty Structures", 
     "categoryName_es": "Estructuras de soberanía", 
     "categoryName_fr": "Structures de souveraineté", 
@@ -624,21 +624,21 @@
     "categoryName_ja": "採掘", 
     "categoryName_ko": "채굴", 
     "categoryName_ru": "Бурение", 
-    "categoryName_zh": "Mining", 
+    "categoryName_zh": "采矿", 
     "categoryNameID": 587126, 
     "published": 0
   }, 
   "2118": {
     "categoryID": 2118, 
-    "categoryName_de": "Personalization", 
+    "categoryName_de": "Anpassung", 
     "categoryName_en-us": "Personalization", 
-    "categoryName_es": "Personalization", 
-    "categoryName_fr": "Personalization", 
+    "categoryName_es": "Personalización", 
+    "categoryName_fr": "Personnalisation", 
     "categoryName_it": "Personalization", 
-    "categoryName_ja": "Personalization", 
-    "categoryName_ko": "Personalization", 
-    "categoryName_ru": "Personalization", 
-    "categoryName_zh": "Personalization", 
+    "categoryName_ja": "カスタマイズ", 
+    "categoryName_ko": "개인화", 
+    "categoryName_ru": "Персонализация", 
+    "categoryName_zh": "个性化定制", 
     "categoryNameID": 631766, 
     "published": 1
   }, 

staticdata/fsd_binary/dogmaattributes.0.json

@@ -685,7 +685,7 @@
     "displayName_ja": "サイクルあたりチャージ", 
     "displayName_ko": "주기당 충전량", 
     "displayName_ru": "Зарядов за цикл", 
-    "displayName_zh": "单次消耗量 ", 
+    "displayName_zh": "单次消耗量", 
     "displayNameID": 233609, 
     "displayWhenZero": 0, 
     "highIsGood": 1, 
@@ -1656,7 +1656,7 @@
     "dataType": 8, 
     "defaultValue": 0.0, 
     "description": "Explosive damage done.", 
-    "displayName_de": "Explosivschaden ", 
+    "displayName_de": "Explosivschaden", 
     "displayName_en-us": "Explosive damage", 
     "displayName_es": "Daño explosivo", 
     "displayName_fr": "Dégâts explosifs", 
@@ -2498,13 +2498,13 @@
     "defaultValue": 1.0, 
     "description": "distance from maximum range at which accuracy has fallen by half", 
     "displayName_de": "Präzisionsabfall", 
-    "displayName_en-us": "Accuracy falloff ", 
-    "displayName_es": "Alcance efectivo de precisión ", 
-    "displayName_fr": "Distance de perte de précision ", 
-    "displayName_it": "Accuracy falloff ", 
-    "displayName_ja": " 精度低下", 
-    "displayName_ko": "명중률 유효사거리 ", 
-    "displayName_ru": "Добавочная дальность ", 
+    "displayName_en-us": "Accuracy falloff", 
+    "displayName_es": "Alcance efectivo de precisión", 
+    "displayName_fr": "Distance de perte de précision", 
+    "displayName_it": "Accuracy falloff", 
+    "displayName_ja": "精度低下", 
+    "displayName_ko": "명중률 유효사거리", 
+    "displayName_ru": "Добавочная дальность", 
     "displayName_zh": "失准范围", 
     "displayNameID": 233554, 
     "displayWhenZero": 0, 
@@ -3103,7 +3103,7 @@
     "displayName_ja": "カーゴスキャンレジスタンス", 
     "displayName_ko": "화물 스캔 저항", 
     "displayName_ru": "Экранирование грузового отсека", 
-    "displayName_zh": "Cargo Scan Resistance", 
+    "displayName_zh": "货柜扫描抗性", 
     "displayNameID": 600128, 
     "displayWhenZero": 0, 
     "highIsGood": 1, 
@@ -4227,7 +4227,7 @@
     "tooltipDescription_it": "Shield hitpoints recharge over time and can be recovered more quickly with the use of modules", 
     "tooltipDescription_ja": "時間経過で再充電し、モジュールを使用すればさらに素早く回復します", 
     "tooltipDescription_ko": "실드 내구도는 시간이 지나면 충전되며 모듈을 사용하면 더 빨리 회복됩니다.", 
-    "tooltipDescription_ru": "Запас прочности силового поля восстанавливается со временем; с помощью модулей его можно восстановить быстрее ", 
+    "tooltipDescription_ru": "Запас прочности силового поля восстанавливается со временем; с помощью модулей его можно восстановить быстрее", 
     "tooltipDescription_zh": "护盾会随时间自动恢复，使用装备还可以使恢复速度加快", 
     "tooltipDescriptionID": 295211, 
     "tooltipTitleID": 295210, 
@@ -4513,13 +4513,13 @@
     "defaultValue": 0.0, 
     "description": "This attribute is a multiplier to the number of skill points required to train. Skill points required to train a skill = 250 * skillTimeConstant * sqrt(32)^(skillLevel - 1)", 
     "displayName_de": "Trainingszeit-Multiplikator", 
-    "displayName_en-us": "Training time multiplier ", 
-    "displayName_es": "Multiplicador de tiempo de desarrollo ", 
-    "displayName_fr": "Multiplicateur du temps de formation ", 
-    "displayName_it": "Training time multiplier ", 
-    "displayName_ja": " トレーニング時間乗数", 
-    "displayName_ko": "훈련시간 배수 ", 
-    "displayName_ru": "Множитель ", 
+    "displayName_en-us": "Training time multiplier", 
+    "displayName_es": "Multiplicador de tiempo de desarrollo", 
+    "displayName_fr": "Multiplicateur du temps de formation", 
+    "displayName_it": "Training time multiplier", 
+    "displayName_ja": "トレーニング時間乗数", 
+    "displayName_ko": "훈련시간 배수", 
+    "displayName_ru": "Множитель", 
     "displayName_zh": "训练时间倍增系数", 
     "displayNameID": 233205, 
     "displayWhenZero": 0, 
@@ -5949,13 +5949,13 @@
     "defaultValue": 100.0, 
     "description": "Production time multiplier when manufacturing amarr tech   ", 
     "displayName_de": "Amarr Tech", 
-    "displayName_en-us": "Amarr Tech ", 
-    "displayName_es": "Tecnología amarriana ", 
-    "displayName_fr": "Technologie amarr ", 
-    "displayName_it": "Amarr Tech ", 
-    "displayName_ja": " アマー技術", 
-    "displayName_ko": "아마르 기술 ", 
-    "displayName_ru": "Амаррская технология ", 
+    "displayName_en-us": "Amarr Tech", 
+    "displayName_es": "Tecnología amarriana", 
+    "displayName_fr": "Technologie amarr", 
+    "displayName_it": "Amarr Tech", 
+    "displayName_ja": "アマー技術", 
+    "displayName_ko": "아마르 기술", 
+    "displayName_ru": "Амаррская технология", 
     "displayName_zh": "艾玛科技", 
     "displayNameID": 232951, 
     "displayWhenZero": 0, 
@@ -5972,13 +5972,13 @@
     "defaultValue": 100.0, 
     "description": "Production time multiplier when manufacturing Minmatar tech   ", 
     "displayName_de": "Minmatar Tech", 
-    "displayName_en-us": "Minmatar Tech ", 
-    "displayName_es": "Tecnología minmatariana ", 
-    "displayName_fr": "Technologie minmatar ", 
-    "displayName_it": "Minmatar Tech ", 
-    "displayName_ja": " ミンマターテクノロジー", 
-    "displayName_ko": "민마타 기술 ", 
-    "displayName_ru": "Минматарская технология ", 
+    "displayName_en-us": "Minmatar Tech", 
+    "displayName_es": "Tecnología minmatariana", 
+    "displayName_fr": "Technologie minmatar", 
+    "displayName_it": "Minmatar Tech", 
+    "displayName_ja": "ミンマターテクノロジー", 
+    "displayName_ko": "민마타 기술", 
+    "displayName_ru": "Минматарская технология", 
     "displayName_zh": "米玛塔尔科技", 
     "displayNameID": 233355, 
     "displayWhenZero": 0, 
@@ -5994,15 +5994,15 @@
     "dataType": 4, 
     "defaultValue": 0.0, 
     "description": "Production time multiplier when manufacturing Gallente tech   ", 
-    "displayName_de": "Gallente Tech ", 
-    "displayName_en-us": "Gallente Tech ", 
-    "displayName_es": "Tecnología gallente ", 
-    "displayName_fr": "Technologie gallente ", 
-    "displayName_it": "Gallente Tech ", 
-    "displayName_ja": "ガレンテテック ", 
-    "displayName_ko": "갈란테 기술 ", 
-    "displayName_ru": "Галлентская технология ", 
-    "displayName_zh": "盖伦特科技 ", 
+    "displayName_de": "Gallente Tech", 
+    "displayName_en-us": "Gallente Tech", 
+    "displayName_es": "Tecnología gallente", 
+    "displayName_fr": "Technologie gallente", 
+    "displayName_it": "Gallente Tech", 
+    "displayName_ja": "ガレンテテック", 
+    "displayName_ko": "갈란테 기술", 
+    "displayName_ru": "Галлентская технология", 
+    "displayName_zh": "盖伦特科技", 
     "displayNameID": 233209, 
     "displayWhenZero": 0, 
     "highIsGood": 1, 
@@ -6018,13 +6018,13 @@
     "defaultValue": 0.0, 
     "description": "Production time multiplier when manufacturing caldari tech   ", 
     "displayName_de": "Caldari Tech", 
-    "displayName_en-us": "Caldari Tech ", 
-    "displayName_es": "Tecnología caldari ", 
-    "displayName_fr": "Technologie caldari ", 
-    "displayName_it": "Caldari Tech ", 
-    "displayName_ja": " カルダリテクノロジー", 
-    "displayName_ko": "칼다리 기술 ", 
-    "displayName_ru": "Калдарская технология ", 
+    "displayName_en-us": "Caldari Tech", 
+    "displayName_es": "Tecnología caldari", 
+    "displayName_fr": "Technologie caldari", 
+    "displayName_it": "Caldari Tech", 
+    "displayName_ja": "カルダリテクノロジー", 
+    "displayName_ko": "칼다리 기술", 
+    "displayName_ru": "Калдарская технология", 
     "displayName_zh": "加达里科技", 
     "displayNameID": 233001, 
     "displayWhenZero": 0, 
@@ -6187,7 +6187,7 @@
     "dataType": 4, 
     "defaultValue": 100.0, 
     "description": "Refining time Multiplier", 
-    "displayName_de": "Raffinierzeit-Multiplikator ", 
+    "displayName_de": "Raffinierzeit-Multiplikator", 
     "displayName_en-us": "Refining time Multiplier", 
     "displayName_es": "Multiplicador de tiempo de refinado", 
     "displayName_fr": "Multiplicateur de temps de raffinage", 
@@ -8085,7 +8085,7 @@
     "tooltipDescription_ja": "キャパシタに貯められる最大エネルギー量です", 
     "tooltipDescription_ko": "캐패시터 최대 용량입니다.", 
     "tooltipDescription_ru": "Предельный заряд бортового накопителя", 
-    "tooltipDescription_zh": " 电容器的最大容量", 
+    "tooltipDescription_zh": "电容器的最大容量", 
     "tooltipDescriptionID": 295334, 
     "tooltipTitleID": 295333, 
     "unitID": 114
@@ -8661,13 +8661,13 @@
     "defaultValue": 0.0, 
     "description": "", 
     "displayName_de": "Forschung-Skill benötigt", 
-    "displayName_en-us": "Research Skill Required ", 
-    "displayName_es": "Habilidad de investigación necesaria ", 
-    "displayName_fr": "Compétence de recherche requise ", 
-    "displayName_it": "Research Skill Required ", 
-    "displayName_ja": " 必須研究スキル", 
-    "displayName_ko": "연구 스킬 필요 ", 
-    "displayName_ru": "Требуемый навык для исследований ", 
+    "displayName_en-us": "Research Skill Required", 
+    "displayName_es": "Habilidad de investigación necesaria", 
+    "displayName_fr": "Compétence de recherche requise", 
+    "displayName_it": "Research Skill Required", 
+    "displayName_ja": "必須研究スキル", 
+    "displayName_ko": "연구 스킬 필요", 
+    "displayName_ru": "Требуемый навык для исследований", 
     "displayName_zh": "需要研究技能", 
     "displayNameID": 233301, 
     "displayWhenZero": 0, 
@@ -8684,13 +8684,13 @@
     "defaultValue": 0.0, 
     "description": "", 
     "displayName_de": "Benötigter Produktion-Skill", 
-    "displayName_en-us": "Required Manufacturing Skill ", 
-    "displayName_es": "Habilidad de fabricación necesaria ", 
-    "displayName_fr": "Compétence de production requise ", 
-    "displayName_it": "Required Manufacturing Skill ", 
-    "displayName_ja": " 必須製造スキル", 
-    "displayName_ko": "필요 제조 스킬 ", 
-    "displayName_ru": "Требуемый навык для производства ", 
+    "displayName_en-us": "Required Manufacturing Skill", 
+    "displayName_es": "Habilidad de fabricación necesaria", 
+    "displayName_fr": "Compétence de production requise", 
+    "displayName_it": "Required Manufacturing Skill", 
+    "displayName_ja": "必須製造スキル", 
+    "displayName_ko": "필요 제조 스킬", 
+    "displayName_ru": "Требуемый навык для производства", 
     "displayName_zh": "所需制造技能", 
     "displayNameID": 233305, 
     "displayWhenZero": 0, 
@@ -11860,7 +11860,7 @@
     "dataType": 4, 
     "defaultValue": 0.0, 
     "description": "The maximum distance at which the object can be used.", 
-    "displayName_de": "Max. Bedienungsentfernung ", 
+    "displayName_de": "Max. Bedienungsentfernung", 
     "displayName_en-us": "Maximum Operational Distance", 
     "displayName_es": "Distancia máxima de funcionamiento", 
     "displayName_fr": "Distance opérationnelle maximale", 
@@ -12862,7 +12862,7 @@
     "displayName_it": "Asteroid Specialization Yield Modifier", 
     "displayName_ja": "アステロイド専門採掘量修正乗数", 
     "displayName_ko": "특화 광석 채굴량 배수", 
-    "displayName_ru": "Модификатор выработки для специализованности ", 
+    "displayName_ru": "Модификатор выработки для специализованности", 
     "displayName_zh": "专精矿种产量调整", 
     "displayNameID": 233439, 
     "displayWhenZero": 0, 
@@ -12958,7 +12958,7 @@
     "displayName_ja": "クリスタル損耗", 
     "displayName_ko": "크리스탈 피해량", 
     "displayName_ru": "Кристаллы получают повреждения", 
-    "displayName_zh": "晶体损耗 ", 
+    "displayName_zh": "晶体损耗", 
     "displayNameID": 233613, 
     "displayWhenZero": 0, 
     "highIsGood": 1, 
@@ -16407,7 +16407,7 @@
     "displayName_ja": "オートリピート不可", 
     "displayName_ko": "자동 반복 불가", 
     "displayName_ru": "Автоповтор недоступен", 
-    "displayName_zh": "无法自动重复 ", 
+    "displayName_zh": "无法自动重复", 
     "displayNameID": 233618, 
     "displayWhenZero": 0, 
     "highIsGood": 1, 
@@ -17065,7 +17065,7 @@
     "dataType": 5, 
     "defaultValue": 0.0, 
     "description": "Used for ships that are supposed to be able to use fuel.", 
-    "displayName_de": "Frachtraumgröße für Treibstoff ", 
+    "displayName_de": "Frachtraumgröße für Treibstoff", 
     "displayName_en-us": "Fuel Cargo Capacity", 
     "displayName_es": "Capacidad de carga de combustible", 
     "displayName_fr": "Capacité du conteneur carburant", 
@@ -20354,7 +20354,7 @@
     "description": "Just for the UI to display the ship warp speed.", 
     "displayName_de": "Warpgeschwindigkeit", 
     "displayName_en-us": "Ship Warp Speed", 
-    "displayName_es": "Velocidad warp ", 
+    "displayName_es": "Velocidad warp", 
     "displayName_fr": "Vitesse de warp du vaisseau", 
     "displayName_it": "Ship Warp Speed", 
     "displayName_ja": "シップワープ速度", 
@@ -20644,7 +20644,7 @@
     "displayName_de": "Bonus auf den Verbrauch von Nanite-Reparaturpaste", 
     "displayName_en-us": "Nanite Repair Paste Consumption Bonus", 
     "displayName_es": "Bonificación de consumo de fluido reparador de nanobots", 
-    "displayName_fr": "Bonus d'utilisation des nanites de réparation ", 
+    "displayName_fr": "Bonus d'utilisation des nanites de réparation", 
     "displayName_it": "Nanite Repair Paste Consumption Bonus", 
     "displayName_ja": "ナノマシンリペアペイスト使用ボーナス", 
     "displayName_ko": "나노기기 수리용액 소모량 보너스", 
@@ -24726,7 +24726,7 @@
     "displayName_ja": "採掘ホールド容量", 
     "displayName_ko": "채굴 저장고 적재량", 
     "displayName_ru": "Объём отсека для руды", 
-    "displayName_zh": "矿石舱容量", 
+    "displayName_zh": "矿舱容量", 
     "displayNameID": 233539, 
     "displayWhenZero": 0, 
     "highIsGood": 1, 
@@ -24742,7 +24742,7 @@
     "tooltipDescription_ja": "採掘ホールドに積載できる総量", 
     "tooltipDescription_ko": "채굴 저장고에 보관할 수 있는 최대 용량", 
     "tooltipDescription_ru": "Максимальный объём, допустимый к размещению в бортовом отсеке для руды", 
-    "tooltipDescription_zh": "矿石舱能装载的总体积", 
+    "tooltipDescription_zh": "矿舱的容量", 
     "tooltipDescriptionID": 295316, 
     "tooltipTitleID": 295315, 
     "unitID": 9
@@ -24777,7 +24777,7 @@
     "tooltipDescription_ja": "ガスホールドに積載できる総量", 
     "tooltipDescription_ko": "가스 저장고에 보관할 수 있는 최대 용량", 
     "tooltipDescription_ru": "Максимальный объём, допустимый к размещению в газовом отсеке", 
-    "tooltipDescription_zh": "The total volume that can be stored in the gas hold", 
+    "tooltipDescription_zh": "气云舱的容量", 
     "tooltipDescriptionID": 592043, 
     "tooltipTitleID": 592042, 
     "unitID": 9
@@ -25299,7 +25299,7 @@
     "dataType": 4, 
     "defaultValue": 0.0, 
     "description": "The required minimum military development index level", 
-    "displayName_de": "Erforderlicher Entwicklungsindex (Militär) ", 
+    "displayName_de": "Erforderlicher Entwicklungsindex (Militär)", 
     "displayName_en-us": "Required Development Index Level (Military)", 
     "displayName_es": "Nivel de índice de desarrollo necesario (militar)", 
     "displayName_fr": "Niveau d'index de développement requis (militaire)", 
@@ -25321,7 +25321,7 @@
     "dataType": 4, 
     "defaultValue": 0.0, 
     "description": "The minimum required industrial development index level", 
-    "displayName_de": "Erforderlicher Entwicklungsindex (Industrie) ", 
+    "displayName_de": "Erforderlicher Entwicklungsindex (Industrie)", 
     "displayName_en-us": "Required Development Index Level (Industrial)", 
     "displayName_es": "Nivel de índice de desarrollo necesario (industrial)", 
     "displayName_fr": "Niveau d'index de développement requis (industriel)", 
@@ -25767,7 +25767,7 @@
     "dataType": 4, 
     "defaultValue": 0.0, 
     "description": "Transport capacity (bandwidth) in m3 per hour.", 
-    "displayName_de": "Logistische Kapazität ", 
+    "displayName_de": "Logistische Kapazität", 
     "displayName_en-us": "Logistical Capacity", 
     "displayName_es": "Capacidad logística", 
     "displayName_fr": "Capacité logistique", 
@@ -28116,7 +28116,7 @@
     "displayName_ja": "MWDのシグネチャペナルティとキャパシタ消費軽減ボーナス", 
     "displayName_ko": "MWD 시그니처 페널티 및 캐패시터 사용량 보너스", 
     "displayName_ru": "Уменьшение потребления накопителя и влияния микроварп-ускорителя на радиус сигнатуры", 
-    "displayName_zh": "MWD sig penalty and cap need bonus", 
+    "displayName_zh": "微型跃迁推进器信号半径惩罚和电容消耗加成", 
     "displayNameID": 595366, 
     "displayWhenZero": 0, 
     "highIsGood": 0, 
@@ -28312,7 +28312,7 @@
     "dataType": 5, 
     "defaultValue": 1.0, 
     "description": "", 
-    "displayName_de": "Energy Leech Reflektionswert ", 
+    "displayName_de": "Energy Leech Reflektionswert", 
     "displayName_en-us": "Energy Leech Reflect Amount", 
     "displayName_es": "Cantidad de reflejo de la absorción energética", 
     "displayName_fr": "Quantité renvoyée par la sangsue énergétique", 
@@ -34871,7 +34871,7 @@
     "displayName_de": "Neutralisationswert beim Aufwärmen", 
     "displayName_en-us": "Warm-up Neutralization Amount", 
     "displayName_es": "Cantidad de neutralización del calentamiento", 
-    "displayName_fr": "Échauffement – capacité de neutralisation ", 
+    "displayName_fr": "Échauffement – capacité de neutralisation", 
     "displayName_it": "Warm-up Neutralization Amount", 
     "displayName_ja": "無効化量の上昇", 
     "displayName_ko": "가동 전 뉴트럴라이제이션 수치", 
@@ -35654,7 +35654,7 @@
     "displayName_ja": "シージミサイルダメージボーナス", 
     "displayName_ko": "공성 미사일 피해 보너스", 
     "displayName_ru": "Увеличение урона от осадных ракет", 
-    "displayName_zh": "导弹伤害加成", 
+    "displayName_zh": "会战型导弹伤害加成", 
     "displayNameID": 311932, 
     "displayWhenZero": 0, 
     "highIsGood": 1, 
@@ -36281,7 +36281,7 @@
     "displayName_zh": "装甲维修器/护盾回充增量器运转周期加成", 
     "displayNameID": 312084, 
     "displayWhenZero": 0, 
-    "highIsGood": 1, 
+    "highIsGood": 0, 
     "iconID": 2104, 
     "name": "siegeLocalLogisticsDurationBonus", 
     "published": 1, 
@@ -44387,7 +44387,7 @@
     "displayName_ja": "ワープスクランブル強度ボーナス", 
     "displayName_ko": "워프 스크램블 강도 보너스", 
     "displayName_ru": "Влияние на мощность глушения варп-двигателей", 
-    "displayName_zh": "Warp Scramble Strength Bonus", 
+    "displayName_zh": "跃迁干扰强度加成", 
     "displayNameID": 600129, 
     "displayWhenZero": 0, 
     "highIsGood": 1, 
@@ -45202,7 +45202,7 @@
     "displayName_ja": "アイスホールド容量", 
     "displayName_ko": "아이스 저장고 적재량", 
     "displayName_ru": "Объём отсека для льда", 
-    "displayName_zh": "Ice Hold Capacity", 
+    "displayName_zh": "冰矿舱容量", 
     "displayNameID": 584247, 
     "displayWhenZero": 0, 
     "highIsGood": 1, 
@@ -45218,7 +45218,7 @@
     "tooltipDescription_ja": "アイスホールドに積載できる総量", 
     "tooltipDescription_ko": "아이스 저장고에 보관할 수 있는 최대 용량", 
     "tooltipDescription_ru": "Максимальный объём, допустимый к размещению в бортовом отсеке для льда", 
-    "tooltipDescription_zh": "The total volume that can be stored in the ice hold", 
+    "tooltipDescription_zh": "冰矿舱的容量", 
     "tooltipDescriptionID": 584249, 
     "tooltipTitleID": 584248, 
     "unitID": 9
@@ -45237,7 +45237,7 @@
     "displayName_ja": "有効なターゲットタイプ", 
     "displayName_ko": "유효한 타겟팅 대상", 
     "displayName_ru": "Доступные типы целей", 
-    "displayName_zh": "Valid target types", 
+    "displayName_zh": "无效的目标类型", 
     "displayNameID": 593750, 
     "displayWhenZero": 0, 
     "highIsGood": 0, 
@@ -45259,7 +45259,7 @@
     "displayName_ja": "残留物体積乗数", 
     "displayName_ko": "손실 배수", 
     "displayName_ru": "Коэффициент объёма отходов", 
-    "displayName_zh": "Residue Volume Multiplier", 
+    "displayName_zh": "残渣体积系数", 
     "displayNameID": 589052, 
     "displayWhenZero": 1, 
     "highIsGood": 0, 
@@ -45282,7 +45282,7 @@
     "displayName_ja": "残留物率", 
     "displayName_ko": "손실 확률", 
     "displayName_ru": "Шанс получения отходов", 
-    "displayName_zh": "Residue Probability", 
+    "displayName_zh": "残渣几率", 
     "displayNameID": 589053, 
     "displayWhenZero": 1, 
     "highIsGood": 0, 
@@ -45329,7 +45329,7 @@
     "displayName_ja": "残留物体積乗数ボーナス", 
     "displayName_ko": "손실량 배수 보너스", 
     "displayName_ru": "Прибавка к коэффициенту объёма отходов", 
-    "displayName_zh": "Residue Volume Multiplier Bonus", 
+    "displayName_zh": "残渣体积系数加成", 
     "displayNameID": 591643, 
     "displayWhenZero": 1, 
     "highIsGood": 0, 
@@ -45352,7 +45352,7 @@
     "displayName_ja": "残留物率ボーナス", 
     "displayName_ko": "손실 확률 보너스", 
     "displayName_ru": "Прибавка к шансу получения отходов", 
-    "displayName_zh": "Residue Probability Bonus", 
+    "displayName_zh": "残渣几率加成", 
     "displayNameID": 591644, 
     "displayWhenZero": 1, 
     "highIsGood": 0, 
@@ -45375,7 +45375,7 @@
     "displayName_ja": "アステロイドスペシャリゼーション継続時間乗数", 
     "displayName_ko": "소행성 특화 지속시간 배수", 
     "displayName_ru": "Коэффициент длительности при специализации на астероидах", 
-    "displayName_zh": "Asteroid Specialization Duration Multiplier", 
+    "displayName_zh": "小行星矿专精运转周期系数", 
     "displayNameID": 587593, 
     "displayWhenZero": 0, 
     "highIsGood": 0, 
@@ -45398,7 +45398,7 @@
     "displayName_ja": "ドロップ率の上書き", 
     "displayName_ko": "Drop Chance Overwrite", 
     "displayName_ru": "Изменение шанса выпадения добычи", 
-    "displayName_zh": "Drop Chance Overwrite", 
+    "displayName_zh": "掉率改写", 
     "displayNameID": 588129, 
     "displayWhenZero": 0, 
     "highIsGood": 1, 
@@ -45413,7 +45413,7 @@
     "tooltipDescription_ja": "プレイヤー艦のドロップ率を上書き。値が0の場合、戦利品のドロップなし", 
     "tooltipDescription_ko": "Overwriting loot chance of drop from player ship, value 0 = no loot dropped", 
     "tooltipDescription_ru": "Изменяет шанс выпадения добычи из корабля игрока. 0 = добыча не выпадает", 
-    "tooltipDescription_zh": "Overwriting loot chance of drop from player ship, value 0 = no loot dropped", 
+    "tooltipDescription_zh": "改写玩家爆船的掉率，0=无掉落", 
     "tooltipDescriptionID": 588131, 
     "tooltipTitleID": 588130
   }, 
@@ -45430,7 +45430,7 @@
     "displayName_ja": "プローブ強度ボーナス", 
     "displayName_ko": "프로브 강도 보너스", 
     "displayName_ru": "Увеличение чувствительности зондов", 
-    "displayName_zh": "Probe Strength Bonus", 
+    "displayName_zh": "探针强度加成", 
     "displayNameID": 588464, 
     "displayWhenZero": 0, 
     "highIsGood": 1, 
@@ -45541,7 +45541,7 @@
     "displayName_ja": "サイレントターゲットロック", 
     "displayName_ko": "Target Lock Silently", 
     "displayName_ru": "Незаметный захват цели", 
-    "displayName_zh": "Target Lock Silently", 
+    "displayName_zh": "暗中锁定目标", 
     "displayNameID": 588475, 
     "displayWhenZero": 0, 
     "highIsGood": 0, 
@@ -45556,7 +45556,7 @@
     "tooltipDescription_ja": "艦船などがプレイヤーにロックを行ったりエフェクトを適用している際に、その艦船などがプレイヤーに対して黄色点滅状態になるのを防ぐために使用されます。", 
     "tooltipDescription_ko": "Used to prevent the ship or entity from yellow flashing to the player when the ship or entity has the player locked and if applying an effect on the player.", 
     "tooltipDescription_ru": "Used to prevent the ship or entity from yellow flashing to the player when the ship or entity has the player locked and if applying an effect on the player.", 
-    "tooltipDescription_zh": "Used to prevent the ship or entity from yellow flashing to the player when the ship or entity has the player locked and if applying an effect on the player.", 
+    "tooltipDescription_zh": "防止舰船或其他实体因锁定玩家或对玩家施放效果而闪黄。", 
     "tooltipDescriptionID": 588477, 
     "tooltipTitleID": 588476
   }, 
@@ -45871,7 +45871,7 @@
     "displayName_ja": "ステイシスウェビファイヤーの最大範囲ボーナス", 
     "displayName_ko": "스테이시스 웹 생성기 사거리 보너스", 
     "displayName_ru": "Бонус к макс. дальности стазис-индуктора", 
-    "displayName_zh": "Stasis Webifier Maximum Range Bonus", 
+    "displayName_zh": "停滞缠绕光束最大范围加成", 
     "displayNameID": 589016, 
     "displayWhenZero": 0, 
     "highIsGood": 1, 
@@ -46037,7 +46037,7 @@
     "displayName_ja": "アステロイドホールド容量", 
     "displayName_ko": "소행성 저장고 적재량", 
     "displayName_ru": "Объём отсека для астероидов", 
-    "displayName_zh": "Asteroid Hold Capacity", 
+    "displayName_zh": "小行星矿石舱容量", 
     "displayNameID": 591098, 
     "displayWhenZero": 0, 
     "highIsGood": 1, 
@@ -46053,7 +46053,7 @@
     "tooltipDescription_ja": "アステロイドホールドに積載できる総量", 
     "tooltipDescription_ko": "소행성 저장고에 보관할 수 있는 최대 용량", 
     "tooltipDescription_ru": "Максимальный объём, допустимый к размещению в бортовом отсеке для астероидов", 
-    "tooltipDescription_zh": "The total volume that can be stored in the Asteroid Hold", 
+    "tooltipDescription_zh": "小行星矿石舱的容量", 
     "tooltipDescriptionID": 591100, 
     "tooltipTitleID": 591099, 
     "unitID": 9
@@ -46126,9 +46126,10 @@
   }, 
   "3236": {
     "attributeID": 3236, 
-    "categoryID": 9, 
+    "categoryID": 51, 
     "dataType": 3, 
     "defaultValue": 0.0, 
+    "description": "If set to true, this results in no mining waste.", 
     "displayWhenZero": 0, 
     "highIsGood": 0, 
     "name": "ignoreMiningWaste", 
@@ -46203,7 +46204,7 @@
     "displayName_ja": "最適射程距離", 
     "displayName_ko": "최적사거리", 
     "displayName_ru": "Оптимальная дальность", 
-    "displayName_zh": "Optimal Range", 
+    "displayName_zh": "最佳射程", 
     "displayNameID": 593073, 
     "displayWhenZero": 0, 
     "highIsGood": 1, 
@@ -46237,7 +46238,7 @@
     "displayName_ja": "圧縮可能なアイテム", 
     "displayName_ko": "압축 가능한 아이템", 
     "displayName_ru": "Сжимаемые ресурсы", 
-    "displayName_zh": "Compressible Items", 
+    "displayName_zh": "可压缩", 
     "displayNameID": 594759, 
     "displayWhenZero": 0, 
     "highIsGood": 0, 
@@ -46259,7 +46260,7 @@
     "displayName_ja": "ワープスクランブラーの最適射程距離ボーナス", 
     "displayName_ko": "워프 스크램블러 최적사거리 보너스", 
     "displayName_ru": "Влияние на оптимальную дальность действия варп-глушителя", 
-    "displayName_zh": "Warp Scrambler Optimal Range Bonus", 
+    "displayName_zh": "跃迁扰频器最佳射程加成", 
     "displayNameID": 595177, 
     "displayWhenZero": 0, 
     "highIsGood": 1, 
@@ -46282,7 +46283,7 @@
     "displayName_ja": "船体ダメージレジスタンスボーナス", 
     "displayName_ko": "선체 저항력 보너스", 
     "displayName_ru": "Увеличение сопротивляемости корпуса", 
-    "displayName_zh": "Hull Damage Resistance Bonus", 
+    "displayName_zh": "结构伤害抗性加成", 
     "displayNameID": 595367, 
     "displayWhenZero": 0, 
     "highIsGood": 0, 
@@ -46304,7 +46305,7 @@
     "displayName_ja": "ガス減圧効率ボーナス", 
     "displayName_ko": "가스 압축해제 효율 보너스", 
     "displayName_ru": "Бонус к эффективности декомпрессии газа", 
-    "displayName_zh": "Gas Decompression Efficiency Bonus", 
+    "displayName_zh": "气云解压效率加成", 
     "displayNameID": 595397, 
     "displayWhenZero": 0, 
     "highIsGood": 1, 
@@ -46527,7 +46528,7 @@
     "displayName_ja": "ドローン追跡速度ボーナス", 
     "displayName_ko": "드론 트래킹 속도 보너스", 
     "displayName_ru": "Бонус к скорости наведения дронов", 
-    "displayName_zh": "Drone Tracking Speed Bonus", 
+    "displayName_zh": "无人机跟踪速度加成", 
     "displayNameID": 598958, 
     "displayWhenZero": 0, 
     "highIsGood": 1, 
@@ -46550,7 +46551,7 @@
     "displayName_ja": "シールド修復を停止させるDPSしきい値", 
     "displayName_ko": "실드 수리가 멈추는 기준 피해량", 
     "displayName_ru": "Порог урона/сек. для приостановки восстановления щитов", 
-    "displayName_zh": "DPS threshold to pause shield repair", 
+    "displayName_zh": "停止护盾维修的DPS阈值", 
     "displayNameID": 598991, 
     "displayWhenZero": 0, 
     "highIsGood": 1, 
@@ -46572,7 +46573,7 @@
     "displayName_ja": "アーマー修復を停止させるDPSしきい値", 
     "displayName_ko": "장갑 수리가 멈추는 기준 피해량", 
     "displayName_ru": "Порог урона/сек. для приостановки восстановления брони", 
-    "displayName_zh": "DPS threshold to pause armor repair", 
+    "displayName_zh": "停止装甲维修的DPS阈值", 
     "displayNameID": 598992, 
     "displayWhenZero": 0, 
     "highIsGood": 1, 
@@ -46594,7 +46595,7 @@
     "displayName_ja": "船体修復を停止させるDPSしきい値", 
     "displayName_ko": "선체 수리가 멈추는 기준 피해량", 
     "displayName_ru": "Порог урона/сек. для приостановки восстановления корпуса", 
-    "displayName_zh": "DPS threshold to pause hull repair", 
+    "displayName_zh": "停止结构维修的DPS阈值", 
     "displayNameID": 598993, 
     "displayWhenZero": 0, 
     "highIsGood": 1, 
@@ -46616,7 +46617,7 @@
     "displayName_ja": "ステイシスウェビファイヤーレジスタンスボーナス", 
     "displayName_ko": "스테이시스 웹 생성기 저항 보너스", 
     "displayName_ru": "Влияние на сопротивляемость стазис-индукторов", 
-    "displayName_zh": "Stasis Webifier Resistance Bonus", 
+    "displayName_zh": "停滞缠绕抗性加成", 
     "displayNameID": 600127, 
     "displayWhenZero": 0, 
     "highIsGood": 0, 
@@ -46639,7 +46640,7 @@
     "displayName_ja": "アーマーダメージレジスタンスボーナス", 
     "displayName_ko": "장갑 피해 저항력 보너스", 
     "displayName_ru": "Влияние на сопротивляемость брони", 
-    "displayName_zh": "Armor Damage Resistance Bonus", 
+    "displayName_zh": "装甲伤害抗性加成", 
     "displayNameID": 600536, 
     "displayWhenZero": 0, 
     "highIsGood": 0, 
@@ -46730,15 +46731,15 @@
     "dataType": 3, 
     "defaultValue": 0.0, 
     "description": "It is a Boolean Value that defaults to false. If true, it will only allow players to Hack if they belong to the Faction that is an enemy of the Occupier of the Star System.", 
-    "displayName_de": "Allow Only Factional Warfare Attackers", 
+    "displayName_de": "Nur Angreifer aus dem Fraktionskrieg zulassen", 
     "displayName_en-us": "Allow Only Factional Warfare Attackers", 
-    "displayName_es": "Allow Only Factional Warfare Attackers", 
-    "displayName_fr": "Allow Only Factional Warfare Attackers", 
+    "displayName_es": "Permitir solo atacantes de la guerra de facciones", 
+    "displayName_fr": "N'autoriser que les assaillants de la guerre de faction", 
     "displayName_it": "Allow Only Factional Warfare Attackers", 
-    "displayName_ja": "Allow Only Factional Warfare Attackers", 
-    "displayName_ko": "Allow Only Factional Warfare Attackers", 
-    "displayName_ru": "Allow Only Factional Warfare Attackers", 
-    "displayName_zh": "Allow Only Factional Warfare Attackers", 
+    "displayName_ja": "国家間戦争の攻撃側のみが利用可能", 
+    "displayName_ko": "팩션 전쟁 공격 측 입장 가능", 
+    "displayName_ru": "Допускать только нападающую сторону МВ", 
+    "displayName_zh": "只允许势力战争攻击方", 
     "displayNameID": 635862, 
     "displayWhenZero": 0, 
     "highIsGood": 0, 
@@ -47069,5 +47070,28 @@
     "name": "shipBonusGB3", 
     "published": 0, 
     "stackable": 1
+  }, 
+  "5248": {
+    "attributeID": 5248, 
+    "categoryID": 37, 
+    "dataType": 5, 
+    "defaultValue": 0.0, 
+    "displayWhenZero": 0, 
+    "highIsGood": 1, 
+    "name": "shipBonusDreadnoughtM4", 
+    "published": 0, 
+    "stackable": 1
+  }, 
+  "5265": {
+    "attributeID": 5265, 
+    "categoryID": 9, 
+    "dataType": 3, 
+    "defaultValue": 0.0, 
+    "description": "All players will be flagged as suspect when looting a wreck with this attribute.", 
+    "displayWhenZero": 0, 
+    "highIsGood": 1, 
+    "name": "flagAllAsSuspectOnLootWreck", 
+    "published": 0, 
+    "stackable": 1
   }
 }

staticdata/fsd_binary/dogmaeffects.0.json

@@ -63142,6 +63142,13 @@
         "modifiedAttributeID": 2294, 
         "modifyingAttributeID": 280, 
         "operation": 0
+      }, 
+      {
+        "domain": "shipID", 
+        "func": "ItemModifier", 
+        "modifiedAttributeID": 5248, 
+        "modifyingAttributeID": 280, 
+        "operation": 0
       }
     ], 
     "propulsionChance": 0, 
@@ -73175,15 +73182,15 @@
     "rangeChance": 0
   }, 
   "6805": {
-    "description_de": "Struktur-Modifikation-Materialeffekt für die Herstellung von Ausrüstung ", 
-    "description_en-us": "Structure Rig Material effect on Manufacturing of equipment ", 
-    "description_es": "Efecto de material de complementos para estructuras al fabricar equipo. ", 
-    "description_fr": "Optimisation – Productivité matérielle de la production d'équipement (Structure) ", 
-    "description_it": "Structure Rig Material effect on Manufacturing of equipment ", 
-    "description_ja": "ストラクチャリグ 装置の製造に対して材料効果 ", 
-    "description_ko": "장비 제조의 자원효율성을 향상시키는 구조물 리그입니다. ", 
-    "description_ru": "Эффект модификатора сооружений: экономия материалов при производстве оборудования ", 
-    "description_zh": "建筑改装件对制造设备的材料影响效果 ", 
+    "description_de": "Struktur-Modifikation-Materialeffekt für die Herstellung von Ausrüstung", 
+    "description_en-us": "Structure Rig Material effect on Manufacturing of equipment", 
+    "description_es": "Efecto de material de complementos para estructuras al fabricar equipo.", 
+    "description_fr": "Optimisation – Productivité matérielle de la production d'équipement (Structure)", 
+    "description_it": "Structure Rig Material effect on Manufacturing of equipment", 
+    "description_ja": "ストラクチャリグ 装置の製造に対して材料効果", 
+    "description_ko": "장비 제조의 자원효율성을 향상시키는 구조물 리그입니다.", 
+    "description_ru": "Эффект модификатора сооружений: экономия материалов при производстве оборудования", 
+    "description_zh": "建筑改装件对制造设备的材料影响效果", 
     "descriptionID": 315454, 
     "disallowAutoRepeat": 0, 
     "effectCategory": 0, 
@@ -91239,7 +91246,7 @@
     "disallowAutoRepeat": 0, 
     "effectCategory": 0, 
     "effectID": 11374, 
-    "effectName": "shipBonusDreadnoughtA4EnergyWarfareAmountBonus", 
+    "effectName": "shipBonusDreadnoughtA4EnergyWarfareRangeAmountBonus", 
     "electronicChance": 0, 
     "guid": "", 
     "isAssistance": 0, 
@@ -91267,40 +91274,6 @@
     "published": 0, 
     "rangeChance": 0
   }, 
-  "11375": {
-    "disallowAutoRepeat": 0, 
-    "effectCategory": 0, 
-    "effectID": 11375, 
-    "effectName": "shipBonusDreadnoughtA4EnergyWarfareRangeBonus", 
-    "electronicChance": 0, 
-    "guid": "", 
-    "isAssistance": 0, 
-    "isOffensive": 0, 
-    "isWarpSafe": 0, 
-    "modifierInfo": [
-      {
-        "domain": "shipID", 
-        "func": "LocationGroupModifier", 
-        "groupID": 71, 
-        "modifiedAttributeID": 98, 
-        "modifyingAttributeID": 5214, 
-        "operation": 6, 
-        "skillTypeID": 3423
-      }, 
-      {
-        "domain": "shipID", 
-        "func": "LocationGroupModifier", 
-        "groupID": 68, 
-        "modifiedAttributeID": 91, 
-        "modifyingAttributeID": 5214, 
-        "operation": 6, 
-        "skillTypeID": 3423
-      }
-    ], 
-    "propulsionChance": 0, 
-    "published": 0, 
-    "rangeChance": 0
-  }, 
   "11376": {
     "disallowAutoRepeat": 0, 
     "effectCategory": 0, 
@@ -91325,81 +91298,6 @@
     "published": 0, 
     "rangeChance": 0
   }, 
-  "11377": {
-    "disallowAutoRepeat": 0, 
-    "effectCategory": 0, 
-    "effectID": 1587, 
-    "effectName": "capitalTurretSkillHybridOptimalRange", 
-    "electronicChance": 0, 
-    "guid": "", 
-    "iconID": 0, 
-    "isAssistance": 0, 
-    "isOffensive": 0, 
-    "isWarpSafe": 0, 
-    "modifierInfo": [
-      {
-        "domain": "shipID", 
-        "func": "LocationRequiredSkillModifier", 
-        "modifiedAttributeID": 64, 
-        "modifyingAttributeID": 292, 
-        "operation": 6, 
-        "skillTypeID": 21666
-      }
-    ], 
-    "propulsionChance": 0, 
-    "published": 0, 
-    "rangeChance": 0
-  }, 
-  "11378": {
-    "disallowAutoRepeat": 0, 
-    "effectCategory": 0, 
-    "effectID": 2868, 
-    "effectName": "armorDamageAmountBonusCapitalArmorRepairers", 
-    "electronicChance": 0, 
-    "guid": "None", 
-    "iconID": 0, 
-    "isAssistance": 0, 
-    "isOffensive": 0, 
-    "isWarpSafe": 0, 
-    "modifierInfo": [
-      {
-        "domain": "shipID", 
-        "func": "LocationRequiredSkillModifier", 
-        "modifiedAttributeID": 84, 
-        "modifyingAttributeID": 806, 
-        "operation": 6, 
-        "skillTypeID": 21803
-      }
-    ], 
-    "propulsionChance": 0, 
-    "published": 0, 
-    "rangeChance": 0, 
-    "sfxName": "None"
-  }, 
-  "11379": {
-    "disallowAutoRepeat": 0, 
-    "effectCategory": 0, 
-    "effectID": 6509, 
-    "effectName": "shipBonusDreadnoughtM1DamageBonus", 
-    "electronicChance": 0, 
-    "guid": "", 
-    "isAssistance": 0, 
-    "isOffensive": 0, 
-    "isWarpSafe": 0, 
-    "modifierInfo": [
-      {
-        "domain": "shipID", 
-        "func": "LocationRequiredSkillModifier", 
-        "modifiedAttributeID": 64, 
-        "modifyingAttributeID": 2292, 
-        "operation": 6, 
-        "skillTypeID": 21667
-      }
-    ], 
-    "propulsionChance": 0, 
-    "published": 0, 
-    "rangeChance": 0
-  }, 
   "11380": {
     "disallowAutoRepeat": 0, 
     "effectCategory": 0, 
@@ -91448,15 +91346,15 @@
     "rangeChance": 0
   }, 
   "11382": {
-    "description_de": "Automatically generated effect ( copy )", 
+    "description_de": "Automatisch erzeugter Effekt", 
     "description_en-us": "Automatically generated effect ( copy )", 
-    "description_es": "Automatically generated effect ( copy )", 
+    "description_es": "Efecto generado automáticamente (copia)", 
     "description_fr": "Automatically generated effect ( copy )", 
     "description_it": "Automatically generated effect ( copy )", 
-    "description_ja": "Automatically generated effect ( copy )", 
-    "description_ko": "Automatically generated effect ( copy )", 
-    "description_ru": "Automatically generated effect ( copy )", 
-    "description_zh": "Automatically generated effect ( copy )", 
+    "description_ja": "自動生成効果（コピー）", 
+    "description_ko": "자동 생성 효과 (복제)", 
+    "description_ru": "Автоматически созданный эффект", 
+    "description_zh": "自动生成效果", 
     "descriptionID": 638155, 
     "disallowAutoRepeat": 0, 
     "effectCategory": 0, 
@@ -91505,15 +91403,15 @@
     "rangeChance": 0
   }, 
   "11388": {
-    "description_de": "Automatically generated effect", 
+    "description_de": "Automatisch erzeugter Effekt", 
     "description_en-us": "Automatically generated effect", 
-    "description_es": "Automatically generated effect", 
+    "description_es": "Efecto generado automáticamente.", 
     "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", 
+    "description_ja": "自動生成効果", 
+    "description_ko": "자동 생성 효과", 
+    "description_ru": "Автоматически созданный эффект", 
+    "description_zh": "自动生成效果", 
     "descriptionID": 638201, 
     "disallowAutoRepeat": 0, 
     "effectCategory": 0, 
@@ -91538,15 +91436,15 @@
     "rangeChance": 0
   }, 
   "11390": {
-    "description_de": "Automatically generated effect", 
+    "description_de": "Automatisch erzeugter Effekt", 
     "description_en-us": "Automatically generated effect", 
-    "description_es": "Automatically generated effect", 
+    "description_es": "Efecto generado automáticamente.", 
     "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", 
+    "description_ja": "自動生成効果", 
+    "description_ko": "자동 생성 효과", 
+    "description_ru": "Автоматически созданный эффект", 
+    "description_zh": "自动生成效果", 
     "descriptionID": 638262, 
     "disallowAutoRepeat": 0, 
     "effectCategory": 0, 
@@ -91643,15 +91541,15 @@
     "rangeChance": 0
   }, 
   "11394": {
-    "description_de": "Automatically generated effect", 
+    "description_de": "Automatisch erzeugter Effekt", 
     "description_en-us": "Automatically generated effect", 
-    "description_es": "Automatically generated effect", 
+    "description_es": "Efecto generado automáticamente.", 
     "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", 
+    "description_ja": "自動生成効果", 
+    "description_ko": "자동 생성 효과", 
+    "description_ru": "Автоматически созданный эффект", 
+    "description_zh": "自动生成效果", 
     "descriptionID": 638276, 
     "disallowAutoRepeat": 0, 
     "effectCategory": 0, 
@@ -91676,15 +91574,15 @@
     "rangeChance": 0
   }, 
   "11395": {
-    "description_de": "Automatically generated effect", 
+    "description_de": "Automatisch erzeugter Effekt", 
     "description_en-us": "Automatically generated effect", 
-    "description_es": "Automatically generated effect", 
+    "description_es": "Efecto generado automáticamente.", 
     "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", 
+    "description_ja": "自動生成効果", 
+    "description_ko": "자동 생성 효과", 
+    "description_ru": "Автоматически созданный эффект", 
+    "description_zh": "自动生成效果", 
     "descriptionID": 638278, 
     "disallowAutoRepeat": 0, 
     "effectCategory": 0, 
@@ -91756,15 +91654,15 @@
     "rangeChance": 0
   }, 
   "11398": {
-    "description_de": "Automatically generated effect", 
+    "description_de": "Automatisch erzeugter Effekt", 
     "description_en-us": "Automatically generated effect", 
-    "description_es": "Automatically generated effect", 
+    "description_es": "Efecto generado automáticamente.", 
     "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", 
+    "description_ja": "自動生成効果", 
+    "description_ko": "자동 생성 효과", 
+    "description_ru": "Автоматически созданный эффект", 
+    "description_zh": "自动生成效果", 
     "descriptionID": 638286, 
     "disallowAutoRepeat": 0, 
     "effectCategory": 0, 
@@ -91836,15 +91734,15 @@
     "rangeChance": 0
   }, 
   "11401": {
-    "description_de": "Automatically generated effect", 
+    "description_de": "Automatisch erzeugter Effekt", 
     "description_en-us": "Automatically generated effect", 
-    "description_es": "Automatically generated effect", 
+    "description_es": "Efecto generado automáticamente.", 
     "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", 
+    "description_ja": "自動生成効果", 
+    "description_ko": "자동 생성 효과", 
+    "description_ru": "Автоматически созданный эффект", 
+    "description_zh": "自动生成效果", 
     "descriptionID": 638392, 
     "disallowAutoRepeat": 0, 
     "effectCategory": 0, 
@@ -91870,15 +91768,15 @@
     "rangeChance": 0
   }, 
   "11402": {
-    "description_de": "Automatically generated effect ( copy )", 
+    "description_de": "Automatisch erzeugter Effekt", 
     "description_en-us": "Automatically generated effect ( copy )", 
-    "description_es": "Automatically generated effect ( copy )", 
+    "description_es": "Efecto generado automáticamente (copia)", 
     "description_fr": "Automatically generated effect ( copy )", 
     "description_it": "Automatically generated effect ( copy )", 
-    "description_ja": "Automatically generated effect ( copy )", 
-    "description_ko": "Automatically generated effect ( copy )", 
-    "description_ru": "Automatically generated effect ( copy )", 
-    "description_zh": "Automatically generated effect ( copy )", 
+    "description_ja": "自動生成効果（コピー）", 
+    "description_ko": "자동 생성 효과 (복제)", 
+    "description_ru": "Автоматически созданный эффект", 
+    "description_zh": "自动生成效果", 
     "descriptionID": 638289, 
     "disallowAutoRepeat": 0, 
     "effectCategory": 0, 
@@ -92718,6 +92616,49 @@
     "published": 0, 
     "rangeChance": 0
   }, 
+  "11445": {
+    "disallowAutoRepeat": 0, 
+    "effectCategory": 7, 
+    "effectID": 11445, 
+    "effectName": "systemSensorStrengthBonus", 
+    "electronicChance": 0, 
+    "isAssistance": 0, 
+    "isOffensive": 0, 
+    "isWarpSafe": 0, 
+    "modifierInfo": [
+      {
+        "domain": "shipID", 
+        "func": "ItemModifier", 
+        "modifiedAttributeID": 208, 
+        "modifyingAttributeID": 1851, 
+        "operation": 6
+      }, 
+      {
+        "domain": "shipID", 
+        "func": "ItemModifier", 
+        "modifiedAttributeID": 209, 
+        "modifyingAttributeID": 1851, 
+        "operation": 6
+      }, 
+      {
+        "domain": "shipID", 
+        "func": "ItemModifier", 
+        "modifiedAttributeID": 210, 
+        "modifyingAttributeID": 1851, 
+        "operation": 6
+      }, 
+      {
+        "domain": "shipID", 
+        "func": "ItemModifier", 
+        "modifiedAttributeID": 211, 
+        "modifyingAttributeID": 1851, 
+        "operation": 6
+      }
+    ], 
+    "propulsionChance": 0, 
+    "published": 0, 
+    "rangeChance": 0
+  }, 
   "11446": {
     "disallowAutoRepeat": 0, 
     "effectCategory": 0, 
@@ -92944,5 +92885,46 @@
     "propulsionChance": 0, 
     "published": 0, 
     "rangeChance": 0
+  }, 
+  "11453": {
+    "disallowAutoRepeat": 0, 
+    "dischargeAttributeID": 2674, 
+    "distribution": 2, 
+    "durationAttributeID": 2490, 
+    "effectCategory": 2, 
+    "effectID": 11453, 
+    "effectName": "npcBehaviorFakeMiningLaser", 
+    "electronicChance": 0, 
+    "guid": "effects.Laser", 
+    "isAssistance": 0, 
+    "isOffensive": 0, 
+    "isWarpSafe": 0, 
+    "propulsionChance": 0, 
+    "published": 0, 
+    "rangeAttributeID": 2673, 
+    "rangeChance": 0
+  }, 
+  "11454": {
+    "disallowAutoRepeat": 0, 
+    "effectCategory": 0, 
+    "effectID": 11454, 
+    "effectName": "shipBonusGrapplerFalloffM4", 
+    "electronicChance": 0, 
+    "isAssistance": 0, 
+    "isOffensive": 0, 
+    "isWarpSafe": 0, 
+    "modifierInfo": [
+      {
+        "domain": "shipID", 
+        "func": "LocationGroupModifier", 
+        "groupID": 1672, 
+        "modifiedAttributeID": 2044, 
+        "modifyingAttributeID": 5248, 
+        "operation": 6
+      }
+    ], 
+    "propulsionChance": 0, 
+    "published": 0, 
+    "rangeChance": 0
   }
 }

staticdata/fsd_binary/dogmaunits.0.json

@@ -12,7 +12,7 @@
     "descriptionID": 77965, 
     "displayName_de": "m", 
     "displayName_en-us": "m", 
-    "displayName_es": " m", 
+    "displayName_es": "m", 
     "displayName_fr": "m", 
     "displayName_it": "m", 
     "displayName_ja": "m", 
@@ -35,7 +35,7 @@
     "descriptionID": 77966, 
     "displayName_de": "kg", 
     "displayName_en-us": "kg", 
-    "displayName_es": " kg", 
+    "displayName_es": "kg", 
     "displayName_fr": "kg", 
     "displayName_it": "kg", 
     "displayName_ja": "kg", 
@@ -58,7 +58,7 @@
     "descriptionID": 77967, 
     "displayName_de": "s", 
     "displayName_en-us": "sec", 
-    "displayName_es": " s", 
+    "displayName_es": "s", 
     "displayName_fr": "sec", 
     "displayName_it": "sec", 
     "displayName_ja": "sec", 
@@ -104,7 +104,7 @@
     "descriptionID": 77969, 
     "displayName_de": "K", 
     "displayName_en-us": "K", 
-    "displayName_es": " K", 
+    "displayName_es": "K", 
     "displayName_fr": "K", 
     "displayName_it": "K", 
     "displayName_ja": "K", 
@@ -127,7 +127,7 @@
     "descriptionID": 77970, 
     "displayName_de": "mol", 
     "displayName_en-us": "mol", 
-    "displayName_es": " mol", 
+    "displayName_es": "mol", 
     "displayName_fr": "mol", 
     "displayName_it": "mol", 
     "displayName_ja": "mol", 
@@ -150,7 +150,7 @@
     "descriptionID": 77971, 
     "displayName_de": "cd", 
     "displayName_en-us": "cd", 
-    "displayName_es": " cd", 
+    "displayName_es": "cd", 
     "displayName_fr": "cd", 
     "displayName_it": "cd", 
     "displayName_ja": "cd", 
@@ -173,7 +173,7 @@
     "descriptionID": 77972, 
     "displayName_de": "m2", 
     "displayName_en-us": "m2", 
-    "displayName_es": " m²", 
+    "displayName_es": "m²", 
     "displayName_fr": "m2", 
     "displayName_it": "m2", 
     "displayName_ja": "m2", 
@@ -196,7 +196,7 @@
     "descriptionID": 77973, 
     "displayName_de": "m3", 
     "displayName_en-us": "m3", 
-    "displayName_es": " m³", 
+    "displayName_es": "m³", 
     "displayName_fr": "m³", 
     "displayName_it": "m3", 
     "displayName_ja": "m3", 
@@ -214,12 +214,12 @@
     "description_it": "Meter per second", 
     "description_ja": "メートル毎秒", 
     "description_ko": "m/s", 
-    "description_ru": "метр в секунду ", 
+    "description_ru": "метр в секунду", 
     "description_zh": "米/秒", 
     "descriptionID": 77974, 
     "displayName_de": "m/s", 
     "displayName_en-us": "m/sec", 
-    "displayName_es": " m/s", 
+    "displayName_es": "m/s", 
     "displayName_fr": "m/sec", 
     "displayName_it": "m/sec", 
     "displayName_ja": "m/sec", 
@@ -242,7 +242,7 @@
     "descriptionID": 77975, 
     "displayName_de": "m/s", 
     "displayName_en-us": "m/sec", 
-    "displayName_es": " m/s", 
+    "displayName_es": "m/s", 
     "displayName_fr": "m/sec", 
     "displayName_it": "m/sec", 
     "displayName_ja": "m/sec", 
@@ -265,7 +265,7 @@
     "descriptionID": 77976, 
     "displayName_de": "m-1", 
     "displayName_en-us": "m-1", 
-    "displayName_es": " m-1", 
+    "displayName_es": "m-1", 
     "displayName_fr": "m-1", 
     "displayName_it": "m-1", 
     "displayName_ja": "m-1", 
@@ -288,7 +288,7 @@
     "descriptionID": 77977, 
     "displayName_de": "kg/m3", 
     "displayName_en-us": "kg/m3", 
-    "displayName_es": " kg/m³", 
+    "displayName_es": "kg/m³", 
     "displayName_fr": "kg/m³", 
     "displayName_it": "kg/m3", 
     "displayName_ja": "kg/m3", 
@@ -311,7 +311,7 @@
     "descriptionID": 77978, 
     "displayName_de": "m3/kg", 
     "displayName_en-us": "m3/kg", 
-    "displayName_es": " m³/kg", 
+    "displayName_es": "m³/kg", 
     "displayName_fr": "m³/kg", 
     "displayName_it": "m3/kg", 
     "displayName_ja": "m3/kg", 
@@ -334,7 +334,7 @@
     "descriptionID": 77979, 
     "displayName_de": "A/m2", 
     "displayName_en-us": "A/m2", 
-    "displayName_es": " A/m²", 
+    "displayName_es": "A/m²", 
     "displayName_fr": "A/m2", 
     "displayName_it": "A/m2", 
     "displayName_ja": "A/m2", 
@@ -357,7 +357,7 @@
     "descriptionID": 77980, 
     "displayName_de": "A/m", 
     "displayName_en-us": "A/m", 
-    "displayName_es": " A/m", 
+    "displayName_es": "A/m", 
     "displayName_fr": "A/m", 
     "displayName_it": "A/m", 
     "displayName_ja": "A/m", 
@@ -380,7 +380,7 @@
     "descriptionID": 77981, 
     "displayName_de": "mol/m3", 
     "displayName_en-us": "mol/m3", 
-    "displayName_es": " mol/m³", 
+    "displayName_es": "mol/m³", 
     "displayName_fr": "mol/m³", 
     "displayName_it": "mol/m3", 
     "displayName_ja": "mol/m3", 
@@ -403,7 +403,7 @@
     "descriptionID": 77982, 
     "displayName_de": "cd/m2", 
     "displayName_en-us": "cd/m2", 
-    "displayName_es": " cd/m²", 
+    "displayName_es": "cd/m²", 
     "displayName_fr": "cd/m2", 
     "displayName_it": "cd/m2", 
     "displayName_ja": "cd/m2", 
@@ -439,7 +439,7 @@
   "101": {
     "displayName_de": "s", 
     "displayName_en-us": "s", 
-    "displayName_es": " s", 
+    "displayName_es": "s", 
     "displayName_fr": "s", 
     "displayName_it": "s", 
     "displayName_ja": "s", 
@@ -452,7 +452,7 @@
   "102": {
     "displayName_de": "mm", 
     "displayName_en-us": "mm", 
-    "displayName_es": " mm", 
+    "displayName_es": "mm", 
     "displayName_fr": "mm", 
     "displayName_it": "mm", 
     "displayName_ja": "mm", 
@@ -478,7 +478,7 @@
     "descriptionID": 77984, 
     "displayName_de": "x", 
     "displayName_en-us": "x", 
-    "displayName_es": " x", 
+    "displayName_es": "x", 
     "displayName_fr": "x", 
     "displayName_it": "x", 
     "displayName_ja": "x", 
@@ -491,7 +491,7 @@
   "105": {
     "displayName_de": "%", 
     "displayName_en-us": "%", 
-    "displayName_es": " %", 
+    "displayName_es": "%", 
     "displayName_fr": "%", 
     "displayName_it": "%", 
     "displayName_ja": "%", 
@@ -504,7 +504,7 @@
   "106": {
     "displayName_de": "tf", 
     "displayName_en-us": "tf", 
-    "displayName_es": " tf", 
+    "displayName_es": "tf", 
     "displayName_fr": "tf", 
     "displayName_it": "tf", 
     "displayName_ja": "tf", 
@@ -517,7 +517,7 @@
   "107": {
     "displayName_de": "MW", 
     "displayName_en-us": "MW", 
-    "displayName_es": " MW", 
+    "displayName_es": "MW", 
     "displayName_fr": "MW", 
     "displayName_it": "MW", 
     "displayName_ja": "MW", 
@@ -529,18 +529,18 @@
   }, 
   "108": {
     "description_de": "Für Resistenzen verwendet.\r\n0,0 = 100%\r\n1,0 = 0%", 
-    "description_en-us": "Used for resistance.\r\n0.0 = 100% 1.0 = 0%\r\n", 
-    "description_es": "Se usa en la resistencia.\n\n0,0 = 100% 1,0 = 0%\n\n", 
-    "description_fr": "Utilisé pour la résistance. 0,0 = 100% 1,0 = 0 %\n", 
-    "description_it": "Used for resistance.\r\n0.0 = 100% 1.0 = 0%\r\n", 
-    "description_ja": "抵抗で使用。\n0.0 = 100% 1.0 = 0%\r\n", 
-    "description_ko": "저항력 표기에 사용됩니다.<br>0.0 = 100% 1.0 = 0%\n", 
+    "description_en-us": "Used for resistance.\r\n0.0 = 100% 1.0 = 0%", 
+    "description_es": "Se usa en la resistencia.\n\n0,0 = 100% 1,0 = 0%", 
+    "description_fr": "Utilisé pour la résistance. 0,0 = 100% 1,0 = 0 %", 
+    "description_it": "Used for resistance.\r\n0.0 = 100% 1.0 = 0%", 
+    "description_ja": "抵抗で使用。\n0.0 = 100% 1.0 = 0%", 
+    "description_ko": "저항력 표기에 사용됩니다.<br>0.0 = 100% 1.0 = 0%", 
     "description_ru": "Используется для обозначения силы сопротивления.\n0.0 = 100%\n1.0 = 0%", 
     "description_zh": "用于抗性。0.0 = 100% 1.0 = 0%", 
     "descriptionID": 77985, 
     "displayName_de": "%", 
     "displayName_en-us": "%", 
-    "displayName_es": " %", 
+    "displayName_es": "%", 
     "displayName_fr": "%", 
     "displayName_it": "%", 
     "displayName_ja": "%", 
@@ -559,11 +559,11 @@
     "description_ja": "% として表示される乗数で使用：1.1＝+10%、0.9＝-10%", 
     "description_ko": "%로 나타낸 승수 표기에 사용됩니다. 1.1 = +10%, 0.9 = -10%", 
     "description_ru": "Используется для множителей в виде %. 1,1 = +10%; 0,9 = -10%", 
-    "description_zh": "用于乘数，显示为 %\n1.1 = +10%\n0.9 = -10%", 
+    "description_zh": "用于乘数，显示为 %1.1 = +10%0.9 = -10%", 
     "descriptionID": 77986, 
     "displayName_de": "%", 
     "displayName_en-us": "%", 
-    "displayName_es": " %", 
+    "displayName_es": "%", 
     "displayName_fr": "%", 
     "displayName_it": "%", 
     "displayName_ja": "%", 
@@ -586,7 +586,7 @@
     "descriptionID": 77987, 
     "displayName_de": "%", 
     "displayName_en-us": "%", 
-    "displayName_es": " %", 
+    "displayName_es": "%", 
     "displayName_fr": "%", 
     "displayName_it": "%", 
     "displayName_ja": "%", 
@@ -609,7 +609,7 @@
     "descriptionID": 77988, 
     "displayName_de": "rad/s", 
     "displayName_en-us": "rad/sec", 
-    "displayName_es": " rad/s", 
+    "displayName_es": "rad/s", 
     "displayName_fr": "rad/sec", 
     "displayName_it": "rad/sec", 
     "displayName_ja": "rad/sec", 
@@ -622,7 +622,7 @@
   "113": {
     "displayName_de": "HP", 
     "displayName_en-us": "HP", 
-    "displayName_es": " PV", 
+    "displayName_es": "PV", 
     "displayName_fr": "PV", 
     "displayName_it": "HP", 
     "displayName_ja": "HP", 
@@ -645,7 +645,7 @@
     "descriptionID": 77989, 
     "displayName_de": "GJ", 
     "displayName_en-us": "GJ", 
-    "displayName_es": " GJ", 
+    "displayName_es": "GJ", 
     "displayName_fr": "GJ", 
     "displayName_it": "GJ", 
     "displayName_ja": "GJ", 
@@ -756,7 +756,7 @@
     "descriptionID": 77990, 
     "displayName_de": "%", 
     "displayName_en-us": "%", 
-    "displayName_es": " %", 
+    "displayName_es": "%", 
     "displayName_fr": "%", 
     "displayName_it": "%", 
     "displayName_ja": "%", 
@@ -782,7 +782,7 @@
     "descriptionID": 77991, 
     "displayName_de": "s", 
     "displayName_en-us": "sec", 
-    "displayName_es": " s", 
+    "displayName_es": "s", 
     "displayName_fr": "sec", 
     "displayName_it": "sec", 
     "displayName_ja": "sec", 
@@ -805,7 +805,7 @@
     "descriptionID": 77992, 
     "displayName_de": "%", 
     "displayName_en-us": "%", 
-    "displayName_es": " %", 
+    "displayName_es": "%", 
     "displayName_fr": "%", 
     "displayName_it": "%", 
     "displayName_ja": "%", 
@@ -818,7 +818,7 @@
   "125": {
     "displayName_de": "N", 
     "displayName_en-us": "N", 
-    "displayName_es": " N", 
+    "displayName_es": "N", 
     "displayName_fr": "N", 
     "displayName_it": "N", 
     "displayName_ja": "N", 
@@ -854,7 +854,7 @@
     "descriptionID": 77993, 
     "displayName_de": "%", 
     "displayName_en-us": "%", 
-    "displayName_es": " %", 
+    "displayName_es": "%", 
     "displayName_fr": "%", 
     "displayName_it": "%", 
     "displayName_ja": "%", 
@@ -895,7 +895,7 @@
     "description_it": "Hours", 
     "description_ja": "時間", 
     "description_ko": "h", 
-    "description_ru": "часы\n", 
+    "description_ru": "часы", 
     "description_zh": "小时", 
     "descriptionID": 77995, 
     "name": "Hours"
@@ -913,7 +913,7 @@
     "descriptionID": 77996, 
     "displayName_de": "ISK", 
     "displayName_en-us": "ISK", 
-    "displayName_es": " ISK", 
+    "displayName_es": "ISK", 
     "displayName_fr": "ISK", 
     "displayName_it": "ISK", 
     "displayName_ja": "ISK", 
@@ -936,7 +936,7 @@
     "descriptionID": 77997, 
     "displayName_de": "m3/Stunde", 
     "displayName_en-us": "m3/hour", 
-    "displayName_es": " m³/hora", 
+    "displayName_es": "m³/hora", 
     "displayName_fr": "m³/heure", 
     "displayName_it": "m3/hour", 
     "displayName_ja": "m3/hour", 
@@ -959,7 +959,7 @@
     "descriptionID": 77998, 
     "displayName_de": "AE", 
     "displayName_en-us": "AU", 
-    "displayName_es": " UA", 
+    "displayName_es": "UA", 
     "displayName_fr": "UA", 
     "displayName_it": "AU", 
     "displayName_ja": "AU", 
@@ -1146,7 +1146,7 @@
     "descriptionID": 561538, 
     "displayName_de": "AE/s", 
     "displayName_en-us": "AU/s", 
-    "displayName_es": " UA/s", 
+    "displayName_es": "UA/s", 
     "displayName_fr": "UA/s", 
     "displayName_it": "AU/s", 
     "displayName_ja": "AU/秒", 
@@ -1165,12 +1165,12 @@
     "description_ja": "% として表示される乗数で使用：10＝+10%、-10＝-10%、3.6＝+3.6%", 
     "description_ko": "%로 나타낸 승수 표기에 사용됩니다. 10 = +10%, -10 = -10%, 3.6 = +3.6%", 
     "description_ru": "Используется для множителей в виде %. 10 = +10%; -10 = -10%; 3,6 = +3,6%", 
-    "description_zh": "Used for multipliers displayed as % 10 is +10% -10 is -10% 3.6 is +3.6%", 
+    "description_zh": "用于乘数，显示为 % 10 is +10% -10 is -10% 3.6 is +3.6%", 
     "descriptionID": 592242, 
-    "displayName_de": " %", 
+    "displayName_de": "%", 
     "displayName_en-us": "%", 
-    "displayName_es": " %", 
-    "displayName_fr": " %", 
+    "displayName_es": "%", 
+    "displayName_fr": "%", 
     "displayName_it": "%", 
     "displayName_ja": "%", 
     "displayName_ko": "%", 

staticdata/fsd_binary/groups.0.json

@@ -516,7 +516,7 @@
     "groupName_ja": "ハウラー", 
     "groupName_ko": "운반선", 
     "groupName_ru": "Перевозчик", 
-    "groupName_zh": "工业舰", 
+    "groupName_zh": "运载舰", 
     "groupNameID": 63600, 
     "published": 1, 
     "useBasePrice": 0
@@ -977,7 +977,7 @@
     "groupNameID": 63623, 
     "iconID": 0, 
     "published": 1, 
-    "useBasePrice": 0
+    "useBasePrice": 1
   }, 
   "63": {
     "anchorable": 0, 
@@ -1367,7 +1367,7 @@
     "groupID": 92, 
     "groupName_de": "Mine", 
     "groupName_en-us": "Mine", 
-    "groupName_es": "Extraer", 
+    "groupName_es": "Minería", 
     "groupName_fr": "Mine", 
     "groupName_it": "Mine", 
     "groupName_ja": "機雷", 
@@ -1628,7 +1628,7 @@
     "groupName_ja": "ハウラー設計図", 
     "groupName_ko": "운반선 블루프린트", 
     "groupName_ru": "Hauler Blueprint", 
-    "groupName_zh": "工业舰蓝图", 
+    "groupName_zh": "运载舰蓝图", 
     "groupNameID": 63656, 
     "published": 1, 
     "useBasePrice": 1
@@ -4157,7 +4157,7 @@
     "groupID": 314, 
     "groupName_de": "Diverse", 
     "groupName_en-us": "Miscellaneous", 
-    "groupName_es": "Otro", 
+    "groupName_es": "Varios", 
     "groupName_fr": "Divers", 
     "groupName_it": "Miscellaneous", 
     "groupName_ja": "その他", 
@@ -6715,7 +6715,7 @@
     "groupID": 471, 
     "groupName_de": "Corporation-Hangar-Struktur", 
     "groupName_en-us": "Corporate Hangar Array", 
-    "groupName_es": "Dársena de hangares corporativos", 
+    "groupName_es": "Dársenas de hangares corporativos", 
     "groupName_fr": "Module du hangar corporatif", 
     "groupName_it": "Corporate Hangar Array", 
     "groupName_ja": "コーポハンガー施設", 
@@ -6895,7 +6895,7 @@
     "groupID": 480, 
     "groupName_de": "Tarnkappensendeanlage", 
     "groupName_en-us": "Stealth Emitter Array", 
-    "groupName_es": "Sistema emisor de sigilo", 
+    "groupName_es": "Sistema emisor sigiloso", 
     "groupName_fr": "Module d'émission furtif", 
     "groupName_it": "Stealth Emitter Array", 
     "groupName_ja": "ステルスエミッター施設", 
@@ -7321,7 +7321,7 @@
     "groupName_ja": "エリートハウラー設計図", 
     "groupName_ko": "엘리트 운반선 블루프린트", 
     "groupName_ru": "Elite Hauler Blueprint", 
-    "groupName_zh": "精英工业舰蓝图", 
+    "groupName_zh": "精英运载舰蓝图", 
     "groupNameID": 63936, 
     "iconID": 0, 
     "published": 1, 
@@ -10033,7 +10033,7 @@
     "categoryID": 11, 
     "fittableNonSingleton": 0, 
     "groupID": 667, 
-    "groupName_de": "Missionen: Amarr Empire-Schlachtschiff ", 
+    "groupName_de": "Missionen: Amarr Empire-Schlachtschiff", 
     "groupName_en-us": "Mission Amarr Empire Battleship", 
     "groupName_es": "Acorazado de misión del Imperio Amarr", 
     "groupName_fr": "Cuirassé Empire amarr mission", 
@@ -11299,7 +11299,7 @@
     "groupName_ja": "ガス雲スクープ", 
     "groupName_ko": "가스 수집기", 
     "groupName_ru": "Газочерпатели", 
-    "groupName_zh": "气云采集器", 
+    "groupName_zh": "气云回收装置", 
     "groupNameID": 64127, 
     "iconID": 0, 
     "published": 1, 
@@ -13113,7 +13113,7 @@
     "groupID": 832, 
     "groupName_de": "Logistik", 
     "groupName_en-us": "Logistics", 
-    "groupName_es": "Naves logísticas", 
+    "groupName_es": "Logística", 
     "groupName_fr": "Logistique", 
     "groupName_it": "Logistics", 
     "groupName_ja": "支援型巡洋艦", 
@@ -13233,7 +13233,7 @@
     "groupID": 838, 
     "groupName_de": "Anziehungsgeneratoranlage", 
     "groupName_en-us": "Cynosural Generator Array", 
-    "groupName_es": "Sistema generador cinosural", 
+    "groupName_es": "Sistemas generadores cinosurales", 
     "groupName_fr": "Module de génération cynosurale", 
     "groupName_it": "Cynosural Generator Array", 
     "groupName_ja": "サイノシュアル生成施設", 
@@ -13993,7 +13993,7 @@
     "groupID": 877, 
     "groupName_de": "Zielmarkierungsbatterie", 
     "groupName_en-us": "Target Painting Battery", 
-    "groupName_es": "Batería de revelación de objetivos", 
+    "groupName_es": "Batería de revelador de objetivo", 
     "groupName_fr": "Batterie de marquage de cible", 
     "groupName_it": "Target Painting Battery", 
     "groupName_ja": "ターゲットペインティングバッテリー", 
@@ -14231,7 +14231,7 @@
     "categoryID": 9, 
     "fittableNonSingleton": 0, 
     "groupID": 890, 
-    "groupName_de": "Blueprints zur Eiskomprimierung ", 
+    "groupName_de": "Blueprints zur Eiskomprimierung", 
     "groupName_en-us": "Ice Compression Blueprints", 
     "groupName_es": "Planos de compresores de hielo", 
     "groupName_fr": "Plans de construction Compression de glace", 
@@ -14869,7 +14869,7 @@
     "groupName_ja": "ミッション勢力別ハウラー", 
     "groupName_ko": "미션 팩션 운반선", 
     "groupName_ru": "Mission Faction Haulers", 
-    "groupName_zh": "任务势力工业舰", 
+    "groupName_zh": "任务势力运载舰", 
     "groupNameID": 64290, 
     "published": 0, 
     "useBasePrice": 0
@@ -14901,7 +14901,7 @@
     "groupID": 935, 
     "groupName_de": "WeltRaum", 
     "groupName_en-us": "WorldSpace", 
-    "groupName_es": "Lugares del mundo", 
+    "groupName_es": "WorldSpace", 
     "groupName_fr": "Espace planétaire", 
     "groupName_it": "WorldSpace", 
     "groupName_ja": "ワールドスペース", 
@@ -15417,7 +15417,7 @@
     "categoryID": 35, 
     "fittableNonSingleton": 0, 
     "groupID": 979, 
-    "groupName_de": "Decryptors - Hybrid ", 
+    "groupName_de": "Decryptors - Hybrid", 
     "groupName_en-us": "Decryptors - Hybrid", 
     "groupName_es": "Desencriptadores híbridos", 
     "groupName_fr": "Décrypteurs - Hybride", 
@@ -15443,7 +15443,7 @@
     "groupName_it": "Deadspace Sleeper Sleepless Defender", 
     "groupName_ja": "デッドスペーススリーパー眠らないディフェンダー", 
     "groupName_ko": "잠들지 않는 데드스페이스 슬리퍼 디펜더", 
-    "groupName_ru": "Deadspace Sleeper Sleepless Defender ", 
+    "groupName_ru": "Deadspace Sleeper Sleepless Defender", 
     "groupName_zh": "死亡空间冬眠者长明防卫者", 
     "groupNameID": 64316, 
     "iconID": 0, 
@@ -15523,7 +15523,7 @@
     "groupName_it": "Deadspace Sleeper Emergent Defender", 
     "groupName_ja": "デッドスペーススリーパー緊急ディフェンダー", 
     "groupName_ko": "이머전트 데드스페이스 슬리퍼 디펜더", 
-    "groupName_ru": "Deadspace Sleeper Emergent Defender ", 
+    "groupName_ru": "Deadspace Sleeper Emergent Defender", 
     "groupName_zh": "死亡空间冬眠者新生防卫者", 
     "groupNameID": 64322, 
     "iconID": 0, 
@@ -15536,7 +15536,7 @@
     "categoryID": 11, 
     "fittableNonSingleton": 0, 
     "groupID": 987, 
-    "groupName_de": "Raumverwerfung: Sleeper-Nachwuchspatrouille ", 
+    "groupName_de": "Raumverwerfung: Sleeper-Nachwuchspatrouille", 
     "groupName_en-us": "Deadspace Sleeper Emergent Patroller", 
     "groupName_es": "Patrullero emergente de sleepers del espacio muerto", 
     "groupName_fr": "Patrouilleur sleeper émergent Deadspace", 
@@ -15582,7 +15582,7 @@
     "groupName_it": "Sleeper Electronics Relics", 
     "groupName_ja": "スリーパー遺物（エレクトロニクス）", 
     "groupName_ko": "슬리퍼 전자 시스템 유물", 
-    "groupName_ru": "Древние электронные устройства Sleeper ", 
+    "groupName_ru": "Древние электронные устройства Sleeper", 
     "groupName_zh": "冬眠者的古老电子装备", 
     "groupNameID": 64338, 
     "published": 1, 
@@ -15620,7 +15620,7 @@
     "groupName_it": "Sleeper Engineering Relics", 
     "groupName_ja": "スリーパー遺物（エンジニアリング）", 
     "groupName_ko": "슬리퍼 엔지니어링 시스템 유물", 
-    "groupName_ru": "Древние инженерные установки Sleeper ", 
+    "groupName_ru": "Древние инженерные установки Sleeper", 
     "groupName_zh": "冬眠者的古老工程设备", 
     "groupNameID": 64339, 
     "published": 1, 
@@ -15639,7 +15639,7 @@
     "groupName_it": "Sleeper Defensive Relics", 
     "groupName_ja": "スリーパー遺物（防御）", 
     "groupName_ko": "슬리퍼 방어용 시스템 유물", 
-    "groupName_ru": "Древние защитные устройства Sleeper ", 
+    "groupName_ru": "Древние защитные устройства Sleeper", 
     "groupName_zh": "冬眠者的古老防御装备", 
     "groupNameID": 64336, 
     "published": 1, 
@@ -15696,7 +15696,7 @@
     "groupName_it": "Sleeper Hull Relics", 
     "groupName_ja": "スリーパー遺物（船体）", 
     "groupName_ko": "슬리퍼 선체 시스템 유물", 
-    "groupName_ru": "Древние корпуса Sleeper ", 
+    "groupName_ru": "Древние корпуса Sleeper", 
     "groupName_zh": "冬眠者船体", 
     "groupNameID": 64337, 
     "published": 1, 
@@ -16341,7 +16341,7 @@
     "groupName_es": "Nave capital de incursión de la Nación Sansha", 
     "groupName_fr": "Vaisseau capital Sansha's Nation incursion", 
     "groupName_it": "Incursion Sansha's Nation Capital", 
-    "groupName_ja": "インカージョンサンシャ国キャピタル", 
+    "groupName_ja": "サンシャ国侵略キャピタル", 
     "groupName_ko": "인커젼 산샤 네이션 캐피탈", 
     "groupName_ru": "Корабль большого тоннажа Флота вторжения Нации Sansha", 
     "groupName_zh": "入侵萨沙旗舰", 
@@ -16360,7 +16360,7 @@
     "groupName_es": "Fragata de incursión de la Nación Sansha", 
     "groupName_fr": "Frégate Sansha's Nation incursion", 
     "groupName_it": "Incursion Sansha's Nation Frigate", 
-    "groupName_ja": "インカージョンサンシャ国フリゲート", 
+    "groupName_ja": "サンシャ国侵略フリゲート", 
     "groupName_ko": "인커젼 산샤 네이션 프리깃", 
     "groupName_ru": "Фрегат Флота вторжения Нации Sansha", 
     "groupName_zh": "入侵萨沙护卫舰", 
@@ -16379,7 +16379,7 @@
     "groupName_es": "Crucero de incursión de la Nación Sansha", 
     "groupName_fr": "Croiseur Sansha's Nation incursion", 
     "groupName_it": "Incursion Sansha's Nation Cruiser", 
-    "groupName_ja": "インカージョンサンシャ国巡洋艦", 
+    "groupName_ja": "サンシャ国侵略巡洋艦", 
     "groupName_ko": "인커젼 산샤 네이션 크루저", 
     "groupName_ru": "Крейсер Флота вторжения Нации Sansha", 
     "groupName_zh": "入侵萨沙巡洋舰", 
@@ -16398,7 +16398,7 @@
     "groupName_es": "Acorazado de incursión de la Nación Sansha", 
     "groupName_fr": "Cuirassé Sansha's Nation incursion", 
     "groupName_it": "Incursion Sansha's Nation Battleship", 
-    "groupName_ja": "インカージョンサンシャ国戦艦", 
+    "groupName_ja": "サンシャ国侵略戦艦", 
     "groupName_ko": "인커젼 산샤 네이션 배틀쉽", 
     "groupName_ru": "Линкор Флота вторжения Нации Sansha", 
     "groupName_zh": "入侵萨沙战列舰", 
@@ -17250,7 +17250,7 @@
     "categoryID": 9, 
     "fittableNonSingleton": 0, 
     "groupID": 1151, 
-    "groupName_de": "Blueprint für Panzerungsverstärker mit Beständigkeitsanpassung ", 
+    "groupName_de": "Blueprint für Panzerungsverstärker mit Beständigkeitsanpassung", 
     "groupName_en-us": "Armor Resistance Shift Hardener Blueprint", 
     "groupName_es": "Plano de endurecedor de cambio de resistencia de blindaje", 
     "groupName_fr": "Plan de construction Renforcement de résistance de blindage adaptatif", 
@@ -17850,7 +17850,7 @@
     "groupName_ja": "マイクロジャンプドライブブループリント", 
     "groupName_ko": "마이크로 점프 드라이브 블루프린트", 
     "groupName_ru": "Чертежи маневрового гипердвигателя", 
-    "groupName_zh": "微型跳跃引擎蓝图 ", 
+    "groupName_zh": "微型跳跃引擎蓝图", 
     "groupNameID": 283702, 
     "published": 1, 
     "useBasePrice": 1
@@ -18166,7 +18166,7 @@
     "categoryID": 16, 
     "fittableNonSingleton": 0, 
     "groupID": 1218, 
-    "groupName_de": "Ressourcenverarbeitung ", 
+    "groupName_de": "Ressourcenverarbeitung", 
     "groupName_en-us": "Resource Processing", 
     "groupName_es": "Procesamiento de recursos", 
     "groupName_fr": "Traitement des ressources", 
@@ -19466,7 +19466,7 @@
     "groupID": 1319, 
     "groupName_de": "Verschiedenes", 
     "groupName_en-us": "Miscellaneous", 
-    "groupName_es": "Otro", 
+    "groupName_es": "Varios", 
     "groupName_fr": "Divers", 
     "groupName_it": "Miscellaneous", 
     "groupName_ja": "その他", 
@@ -20564,7 +20564,7 @@
     "groupName_ja": "誘導ボム", 
     "groupName_ko": "유도 폭탄", 
     "groupName_ru": "Направляемая бомба", 
-    "groupName_zh": "建筑制导炸弹", 
+    "groupName_zh": "制导炸弹", 
     "groupNameID": 510637, 
     "published": 1, 
     "useBasePrice": 0
@@ -23397,15 +23397,15 @@
     "categoryID": 11, 
     "fittableNonSingleton": 0, 
     "groupID": 1792, 
-    "groupName_de": "Hidden Zenith Caldari Schlachtschiff ", 
-    "groupName_en-us": "Hidden Zenith Caldari Battleship ", 
-    "groupName_es": "Acorazado caldari de Zenith oculto ", 
-    "groupName_fr": "Cuirassé caldari Hidden Zenith ", 
-    "groupName_it": "Hidden Zenith Caldari Battleship ", 
-    "groupName_ja": "隠されたゼニスのカルダリ戦艦 ", 
-    "groupName_ko": "숨겨진 제니스 칼다리 배틀쉽 ", 
-    "groupName_ru": "Калдарский линкор «Скрытого зенита» ", 
-    "groupName_zh": "隐藏的天穹加达里战列舰 ", 
+    "groupName_de": "Hidden Zenith Caldari Schlachtschiff", 
+    "groupName_en-us": "Hidden Zenith Caldari Battleship", 
+    "groupName_es": "Acorazado caldari de Zenith oculto", 
+    "groupName_fr": "Cuirassé caldari Hidden Zenith", 
+    "groupName_it": "Hidden Zenith Caldari Battleship", 
+    "groupName_ja": "隠されたゼニスのカルダリ戦艦", 
+    "groupName_ko": "숨겨진 제니스 칼다리 배틀쉽", 
+    "groupName_ru": "Калдарский линкор «Скрытого зенита»", 
+    "groupName_zh": "隐藏的天穹加达里战列舰", 
     "groupNameID": 518831, 
     "published": 0, 
     "useBasePrice": 0
@@ -25092,15 +25092,15 @@
     "categoryID": 11, 
     "fittableNonSingleton": 0, 
     "groupID": 1896, 
-    "groupName_de": "♦ Industrie-Kommandoschiff ", 
-    "groupName_en-us": "♦ Industrial Command ", 
-    "groupName_es": "♦ Mando de nave industrial ", 
+    "groupName_de": "♦ Industrie-Kommandoschiff", 
+    "groupName_en-us": "♦ Industrial Command", 
+    "groupName_es": "♦ Mando de nave industrial", 
     "groupName_fr": "♦ Commandement industriel", 
-    "groupName_it": "♦ Industrial Command ", 
+    "groupName_it": "♦ Industrial Command", 
     "groupName_ja": "♦ 指揮型輸送艦", 
-    "groupName_ko": "♦ 인더스트리얼 커맨드쉽 ", 
-    "groupName_ru": "♦ Буровой корабль ", 
-    "groupName_zh": "♦ 工业指挥舰 ", 
+    "groupName_ko": "♦ 인더스트리얼 커맨드쉽", 
+    "groupName_ru": "♦ Буровой корабль", 
+    "groupName_zh": "♦ 工业指挥舰", 
     "groupNameID": 528285, 
     "published": 0, 
     "useBasePrice": 0
@@ -25922,7 +25922,7 @@
     "groupName_ja": "アビサルモジュール", 
     "groupName_ko": "어비설 모듈", 
     "groupName_ru": "Модули Бездны", 
-    "groupName_zh": "Abyssal Modules", 
+    "groupName_zh": "深渊装备", 
     "groupNameID": 532741, 
     "published": 0, 
     "useBasePrice": 0
@@ -26302,7 +26302,7 @@
     "groupName_ja": "フィラメントの痕跡", 
     "groupName_ko": "필라멘트 흔적", 
     "groupName_ru": "След нити", 
-    "groupName_zh": "深渊痕迹", 
+    "groupName_zh": "纤维痕迹", 
     "groupNameID": 536427, 
     "published": 0, 
     "useBasePrice": 0
@@ -27659,7 +27659,7 @@
     "groupName_ja": "未確認エンティティ", 
     "groupName_ko": "미확인 객체", 
     "groupName_ru": "Неопознанные объекты", 
-    "groupName_zh": "Unidentified Entities", 
+    "groupName_zh": "不明实体", 
     "groupNameID": 576839, 
     "published": 0, 
     "useBasePrice": 0
@@ -27678,7 +27678,7 @@
     "groupName_ja": "AIRエンティティI", 
     "groupName_ko": "AIR 객체 I", 
     "groupName_ru": "Объекты АМИ I", 
-    "groupName_zh": "AIR Entities I", 
+    "groupName_zh": "星空会实体 I", 
     "groupNameID": 576840, 
     "published": 0, 
     "useBasePrice": 0
@@ -27794,7 +27794,7 @@
     "groupName_ja": "AIRエンティティII", 
     "groupName_ko": "AIR 객체 II", 
     "groupName_ru": "Объекты АМИ II", 
-    "groupName_zh": "AIR Entities II", 
+    "groupName_zh": "星空会实体 II", 
     "groupNameID": 582726, 
     "published": 0, 
     "useBasePrice": 0
@@ -27813,7 +27813,7 @@
     "groupName_ja": "未確認エンティティII", 
     "groupName_ko": "미확인 객체 II", 
     "groupName_ru": "Неопознанные объекты II", 
-    "groupName_zh": "Unidentified Entities II", 
+    "groupName_zh": "不明实体 II", 
     "groupNameID": 583913, 
     "published": 0, 
     "useBasePrice": 0
@@ -27832,7 +27832,7 @@
     "groupName_ja": "移動式解析ビーコン", 
     "groupName_ko": "이동식 분석 비컨", 
     "groupName_ru": "Мобильный маяк анализа", 
-    "groupName_zh": "Mobile Analysis Beacon", 
+    "groupName_zh": "移动式分析信标", 
     "groupNameID": 586787, 
     "published": 1, 
     "useBasePrice": 1
@@ -27851,7 +27851,7 @@
     "groupName_ja": "ガス雲採掘機", 
     "groupName_ko": "가스 하베스터", 
     "groupName_ru": "Сборщики газовых облаков", 
-    "groupName_zh": "Gas Cloud Harvesters", 
+    "groupName_zh": "气云采集器", 
     "groupNameID": 587196, 
     "published": 1, 
     "useBasePrice": 0
@@ -27870,7 +27870,7 @@
     "groupName_ja": "ガス採掘機設計図", 
     "groupName_ko": "가스 하베스터 블루프린트", 
     "groupName_ru": "Чертёж установки для сбора газа", 
-    "groupName_zh": "Gas Harvester Blueprint", 
+    "groupName_zh": "气云采集器蓝图", 
     "groupNameID": 587314, 
     "published": 1, 
     "useBasePrice": 1
@@ -27889,7 +27889,7 @@
     "groupName_ja": "移動式解析ビーコン設計図", 
     "groupName_ko": "이동식 분석 비컨 블루프린트", 
     "groupName_ru": "Чертёж мобильного маяка анализа", 
-    "groupName_zh": "Mobile Analysis Beacon Blueprint", 
+    "groupName_zh": "移动式分析信标蓝图", 
     "groupNameID": 588137, 
     "published": 1, 
     "useBasePrice": 1
@@ -27908,7 +27908,7 @@
     "groupName_ja": "ローグドローン解析データ", 
     "groupName_ko": "로그 드론 분석 데이터", 
     "groupName_ru": "Данные анализа восставших дронов", 
-    "groupName_zh": "Rogue Drone Analysis Data", 
+    "groupName_zh": "自由无人机分析数据", 
     "groupNameID": 588315, 
     "published": 1, 
     "useBasePrice": 1
@@ -27927,7 +27927,7 @@
     "groupName_ja": "ワープマトリクス・フィラメント", 
     "groupName_ko": "워프 매트릭스 필라멘트", 
     "groupName_ru": "Варп-матричные нити", 
-    "groupName_zh": "Warp Matrix Filaments", 
+    "groupName_zh": "跃迁矩阵纤维", 
     "groupNameID": 588713, 
     "published": 1, 
     "useBasePrice": 1
@@ -27946,7 +27946,7 @@
     "groupName_ja": "AIR鉱石アステロイド資源", 
     "groupName_ko": "AIR 소행성 광물", 
     "groupName_ru": "AIR Ore Asteroid Resources", 
-    "groupName_zh": "AIR Ore Asteroid Resources", 
+    "groupName_zh": "星空会矿石小行星资源", 
     "groupNameID": 592233, 
     "published": 0, 
     "useBasePrice": 1
@@ -27965,7 +27965,7 @@
     "groupName_ja": "奇妙な資源", 
     "groupName_ko": "기묘한 재료", 
     "groupName_ru": "Любопытные материалы", 
-    "groupName_zh": "Peculiar Materials", 
+    "groupName_zh": "奇特材料", 
     "groupNameID": 592992, 
     "published": 1, 
     "useBasePrice": 1
@@ -27984,7 +27984,7 @@
     "groupName_ja": "圧縮ガス", 
     "groupName_ko": "압축된 가스", 
     "groupName_ru": "Сжатый газ", 
-    "groupName_zh": "Compressed Gas", 
+    "groupName_zh": "高密度气云", 
     "groupNameID": 594612, 
     "iconID": 25169, 
     "published": 1, 
@@ -28004,7 +28004,7 @@
     "groupName_ja": "圧縮装置", 
     "groupName_ko": "압축기", 
     "groupName_ru": "Компрессоры", 
-    "groupName_zh": "Compressors", 
+    "groupName_zh": "压缩装置", 
     "groupNameID": 595063, 
     "iconID": 25152, 
     "published": 1, 
@@ -28024,7 +28024,7 @@
     "groupName_ja": "圧縮装置設計図", 
     "groupName_ko": "압축기 블루프린트", 
     "groupName_ru": "Чертежи компрессоров", 
-    "groupName_zh": "Compressors Blueprints", 
+    "groupName_zh": "压缩装置蓝图", 
     "groupNameID": 595230, 
     "published": 1, 
     "useBasePrice": 1
@@ -28043,7 +28043,7 @@
     "groupName_ja": "インダストリアル・ジャンプポータルジェネレーター", 
     "groupName_ko": "인더스트리얼 점프 포탈 생성기", 
     "groupName_ru": "Industrial Jump Portal Generator", 
-    "groupName_zh": "Industrial Jump Portal Generator", 
+    "groupName_zh": "工业舰跳跃通道发生器", 
     "groupNameID": 596753, 
     "iconID": 0, 
     "published": 1, 
@@ -28063,7 +28063,7 @@
     "groupName_ja": "ストラクチャ領域拒否弾薬", 
     "groupName_ko": "구조물 반접근 탄약", 
     "groupName_ru": "Боеприпасы для систем обороны сооружений", 
-    "groupName_zh": "Structure Area Denial Ammunition", 
+    "groupName_zh": "建筑区域拒止弹药", 
     "groupNameID": 597623, 
     "iconID": 1304, 
     "published": 1, 
@@ -28083,7 +28083,7 @@
     "groupName_ja": "ストラクチャ領域拒否弾薬設計図", 
     "groupName_ko": "구조물 반접근 탄약 블루프린트", 
     "groupName_ru": "Structure Area Denial Ammo Blueprint", 
-    "groupName_zh": "Structure Area Denial Ammo Blueprint", 
+    "groupName_zh": "建筑区域拒止弹药蓝图", 
     "groupNameID": 597627, 
     "published": 1, 
     "useBasePrice": 1
@@ -28096,13 +28096,13 @@
     "groupID": 4430, 
     "groupName_de": "Asteroidengürtel", 
     "groupName_en-us": "Asteroid Belt", 
-    "groupName_es": "Asteroid Belt", 
+    "groupName_es": "Cinturón de asteroides", 
     "groupName_fr": "Ceinture d'astéroïdes", 
     "groupName_it": "Asteroid Belt", 
     "groupName_ja": "アステロイドベルト", 
     "groupName_ko": "소행성 벨트", 
     "groupName_ru": "Asteroid Belt", 
-    "groupName_zh": "Asteroid Belt", 
+    "groupName_zh": "小行星带", 
     "groupNameID": 623561, 
     "published": 0, 
     "useBasePrice": 0
@@ -28115,13 +28115,13 @@
     "groupID": 4431, 
     "groupName_de": "FW Schlachtschiff des Imperiums der Amarr", 
     "groupName_en-us": "FW Amarr Empire Battleship", 
-    "groupName_es": "FW Amarr Empire Battleship", 
+    "groupName_es": "Acorazado de GF del Imperio Amarr", 
     "groupName_fr": "Cuirassé de l'Empire amarr GF", 
     "groupName_it": "FW Amarr Empire Battleship", 
     "groupName_ja": "FWアマー帝国戦艦", 
     "groupName_ko": "FW 아마르 배틀쉽", 
     "groupName_ru": "FW Amarr Empire Battleship", 
-    "groupName_zh": "FW Amarr Empire Battleship", 
+    "groupName_zh": "势力战争艾玛帝国战列舰", 
     "groupNameID": 623607, 
     "published": 1, 
     "useBasePrice": 0
@@ -28134,13 +28134,13 @@
     "groupID": 4432, 
     "groupName_de": "FW Schlachtschiff des Staats der Caldari", 
     "groupName_en-us": "FW Caldari State Battleship", 
-    "groupName_es": "FW Caldari State Battleship", 
+    "groupName_es": "Acorazado de GF del Estado Caldari", 
     "groupName_fr": "Cuirassé de l'État caldari GF", 
     "groupName_it": "FW Caldari State Battleship", 
     "groupName_ja": "FWカルダリ連合戦艦", 
     "groupName_ko": "FW 칼다리 배틀쉽", 
     "groupName_ru": "FW Caldari State Battleship", 
-    "groupName_zh": "FW Caldari State Battleship", 
+    "groupName_zh": "势力战争加达里合众国战列舰", 
     "groupNameID": 623608, 
     "published": 1, 
     "useBasePrice": 0
@@ -28153,13 +28153,13 @@
     "groupID": 4433, 
     "groupName_de": "FW Schlachtschiff der Föderation der Gallente", 
     "groupName_en-us": "FW Gallente Federation Battleship", 
-    "groupName_es": "FW Gallente Federation Battleship", 
+    "groupName_es": "Acorazado de GF de la Federación Gallente", 
     "groupName_fr": "Cuirassé de la Fédération gallente GF", 
     "groupName_it": "FW Gallente Federation Battleship", 
     "groupName_ja": "FWガレンテ連邦戦艦", 
     "groupName_ko": "FW 갈란테 배틀쉽", 
     "groupName_ru": "FW Gallente Federation Battleship", 
-    "groupName_zh": "FW Gallente Federation Battleship", 
+    "groupName_zh": "势力战争盖伦特联邦战列舰", 
     "groupNameID": 623609, 
     "published": 1, 
     "useBasePrice": 0
@@ -28172,13 +28172,13 @@
     "groupID": 4434, 
     "groupName_de": "FW Schlachtschiff der Republik Minmatar", 
     "groupName_en-us": "FW Minmatar Republic Battleship", 
-    "groupName_es": "FW Minmatar Republic Battleship", 
+    "groupName_es": "Acorazado de GF de la República Minmatar", 
     "groupName_fr": "Cuirassé de la République minmatar GF", 
     "groupName_it": "FW Minmatar Republic Battleship", 
     "groupName_ja": "FWミンマター共和国戦艦", 
     "groupName_ko": "FW 민마타 배틀쉽", 
     "groupName_ru": "FW Minmatar Republic Battleship", 
-    "groupName_zh": "FW Minmatar Republic Battleship", 
+    "groupName_zh": "势力战争米玛塔尔共和国战列舰", 
     "groupNameID": 623610, 
     "published": 1, 
     "useBasePrice": 0
@@ -28189,15 +28189,15 @@
     "categoryID": 2118, 
     "fittableNonSingleton": 0, 
     "groupID": 4471, 
-    "groupName_de": "Ship Personalization", 
+    "groupName_de": "Schiffsanpassung", 
     "groupName_en-us": "Ship Personalization", 
-    "groupName_es": "Ship Personalization", 
-    "groupName_fr": "Ship Personalization", 
+    "groupName_es": "Personalización de naves", 
+    "groupName_fr": "Personnalisation de vaisseau", 
     "groupName_it": "Ship Personalization", 
-    "groupName_ja": "Ship Personalization", 
-    "groupName_ko": "Ship Personalization", 
-    "groupName_ru": "Ship Personalization", 
-    "groupName_zh": "Ship Personalization", 
+    "groupName_ja": "艦船カスタマイズ", 
+    "groupName_ko": "함선 개인화", 
+    "groupName_ru": "Персонализация корабля", 
+    "groupName_zh": "舰船个性化", 
     "groupNameID": 631767, 
     "published": 1, 
     "useBasePrice": 0
@@ -28208,15 +28208,15 @@
     "categoryID": 22, 
     "fittableNonSingleton": 0, 
     "groupID": 4477, 
-    "groupName_de": "Mobiles Ziel", 
+    "groupName_de": "FK-Propaganda-Sendeanlage", 
     "groupName_en-us": "FW Propaganda Broadcast Structure", 
-    "groupName_es": "FW Propaganda Broadcast Structure", 
-    "groupName_fr": "Objectif mobile", 
+    "groupName_es": "Estructura de transmisión de propaganda de la GF", 
+    "groupName_fr": "Structure de diffusion de propagande de GF", 
     "groupName_it": "FW Propaganda Broadcast Structure", 
-    "groupName_ja": "移動目標", 
-    "groupName_ko": "이동형 목표물", 
-    "groupName_ru": "Подвижная цель", 
-    "groupName_zh": "FW Propaganda Broadcast Structure", 
+    "groupName_ja": "国家間戦争プロパガンダ放送ストラクチャ", 
+    "groupName_ko": "팩션 전쟁 선전용 방송시설", 
+    "groupName_ru": "Сооружение для передачи пропаганды МВ", 
+    "groupName_zh": "势力战争广播宣传建筑", 
     "groupNameID": 635229, 
     "published": 1, 
     "useBasePrice": 1
@@ -28227,15 +28227,15 @@
     "categoryID": 9, 
     "fittableNonSingleton": 0, 
     "groupID": 4493, 
-    "groupName_de": "Mobile Objective Blueprint", 
+    "groupName_de": "Blaupause für mobile Ziele", 
     "groupName_en-us": "Mobile Objective Blueprint", 
-    "groupName_es": "Mobile Objective Blueprint", 
-    "groupName_fr": "Mobile Objective Blueprint", 
+    "groupName_es": "Plano de objetivo móvil", 
+    "groupName_fr": "Plan de construction Objectif mobile", 
     "groupName_it": "Mobile Objective Blueprint", 
-    "groupName_ja": "Mobile Objective Blueprint", 
-    "groupName_ko": "Mobile Objective Blueprint", 
-    "groupName_ru": "Mobile Objective Blueprint", 
-    "groupName_zh": "Mobile Objective Blueprint", 
+    "groupName_ja": "移動式施設設計図", 
+    "groupName_ko": "이동형 목표물 블루프린트", 
+    "groupName_ru": "Чертёж подвижной цели", 
+    "groupName_zh": "移动目标蓝图", 
     "groupNameID": 636346, 
     "published": 1, 
     "useBasePrice": 1
@@ -28246,15 +28246,15 @@
     "categoryID": 11, 
     "fittableNonSingleton": 0, 
     "groupID": 4494, 
-    "groupName_de": "Control Point", 
+    "groupName_de": "Kontrollpunkt", 
     "groupName_en-us": "Control Point", 
-    "groupName_es": "Control Point", 
-    "groupName_fr": "Control Point", 
+    "groupName_es": "Punto de control", 
+    "groupName_fr": "Point de contrôle", 
     "groupName_it": "Control Point", 
-    "groupName_ja": "Control Point", 
-    "groupName_ko": "Control Point", 
-    "groupName_ru": "Control Point", 
-    "groupName_zh": "Control Point", 
+    "groupName_ja": "コントロールポイント", 
+    "groupName_ko": "컨트롤 포인트", 
+    "groupName_ru": "Контрольная точка", 
+    "groupName_zh": "控制点", 
     "groupNameID": 637132, 
     "published": 0, 
     "useBasePrice": 0
@@ -28265,19 +28265,118 @@
     "categoryID": 22, 
     "fittableNonSingleton": 0, 
     "groupID": 4499, 
-    "groupName_de": "FW Listening Outpost", 
+    "groupName_de": "FK-Horchaußenposten", 
     "groupName_en-us": "FW Listening Outpost", 
-    "groupName_es": "FW Listening Outpost", 
-    "groupName_fr": "FW Listening Outpost", 
+    "groupName_es": "Puesto avanzado de escucha de la GF", 
+    "groupName_fr": "Avant-poste d'écoute de la GF", 
     "groupName_it": "FW Listening Outpost", 
-    "groupName_ja": "FW Listening Outpost", 
-    "groupName_ko": "FW Listening Outpost", 
-    "groupName_ru": "FW Listening Outpost", 
-    "groupName_zh": "FW Listening Outpost", 
+    "groupName_ja": "国家間戦争のリスニングアウトポスト", 
+    "groupName_ko": "팩션 전쟁 감청기지", 
+    "groupName_ru": "Прослушивающий форпост МВ", 
+    "groupName_zh": "势力战争监听站", 
     "groupNameID": 638199, 
     "published": 1, 
     "useBasePrice": 1
   }, 
+  "4501": {
+    "anchorable": 0, 
+    "anchored": 0, 
+    "categoryID": 11, 
+    "fittableNonSingleton": 0, 
+    "groupID": 4501, 
+    "groupName_de": "Missionen: Standard-Kapseln", 
+    "groupName_en-us": "Mission Generic Capsules", 
+    "groupName_es": "Capsulas de misión genéricas", 
+    "groupName_fr": "Capsules standard de mission", 
+    "groupName_it": "Mission Generic Capsules", 
+    "groupName_ja": "ミッション一般カプセル", 
+    "groupName_ko": "미션 일반 캡슐", 
+    "groupName_ru": "Mission Generic Capsules", 
+    "groupName_zh": "任务通用太空舱", 
+    "groupNameID": 639247, 
+    "published": 0, 
+    "useBasePrice": 0
+  }, 
+  "4513": {
+    "anchorable": 0, 
+    "anchored": 1, 
+    "categoryID": 25, 
+    "fittableNonSingleton": 0, 
+    "groupID": 4513, 
+    "groupName_de": "Mordunium", 
+    "groupName_en-us": "Mordunium", 
+    "groupName_es": "Mordunium", 
+    "groupName_fr": "Mordunium", 
+    "groupName_it": "Mordunium", 
+    "groupName_ja": "モードゥニウム", 
+    "groupName_ko": "모르두늄", 
+    "groupName_ru": "Mordunium", 
+    "groupName_zh": "Mordunium", 
+    "groupNameID": 640735, 
+    "iconID": 15, 
+    "published": 1, 
+    "useBasePrice": 0
+  }, 
+  "4514": {
+    "anchorable": 0, 
+    "anchored": 1, 
+    "categoryID": 25, 
+    "fittableNonSingleton": 0, 
+    "groupID": 4514, 
+    "groupName_de": "Ytirium", 
+    "groupName_en-us": "Ytirium", 
+    "groupName_es": "Ytirium", 
+    "groupName_fr": "Ytirium", 
+    "groupName_it": "Ytirium", 
+    "groupName_ja": "イティリウム", 
+    "groupName_ko": "이티륨", 
+    "groupName_ru": "Ютирий", 
+    "groupName_zh": "Ytirium", 
+    "groupNameID": 640736, 
+    "iconID": 15, 
+    "published": 1, 
+    "useBasePrice": 0
+  }, 
+  "4515": {
+    "anchorable": 0, 
+    "anchored": 1, 
+    "categoryID": 25, 
+    "fittableNonSingleton": 0, 
+    "groupID": 4515, 
+    "groupName_de": "Eifyrium", 
+    "groupName_en-us": "Eifyrium", 
+    "groupName_es": "Eifyrium", 
+    "groupName_fr": "Eifyrium", 
+    "groupName_it": "Eifyrium", 
+    "groupName_ja": "エイフィリウム", 
+    "groupName_ko": "에이피륨", 
+    "groupName_ru": "Эйфирий", 
+    "groupName_zh": "Eifyrium", 
+    "groupNameID": 640737, 
+    "iconID": 15, 
+    "published": 1, 
+    "useBasePrice": 0
+  }, 
+  "4516": {
+    "anchorable": 0, 
+    "anchored": 1, 
+    "categoryID": 25, 
+    "fittableNonSingleton": 0, 
+    "groupID": 4516, 
+    "groupName_de": "Ducinium", 
+    "groupName_en-us": "Ducinium", 
+    "groupName_es": "Ducinium", 
+    "groupName_fr": "Ducinium", 
+    "groupName_it": "Ducinium", 
+    "groupName_ja": "ドゥシニウム", 
+    "groupName_ko": "두시늄", 
+    "groupName_ru": "Дачиний", 
+    "groupName_zh": "Ducinium", 
+    "groupNameID": 640738, 
+    "iconID": 15, 
+    "published": 1, 
+    "useBasePrice": 0
+  }, 
   "350858": {
     "anchorable": 0, 
     "anchored": 0, 
@@ -28405,7 +28504,7 @@
     "groupName_it": "Infantry Skill Enhancers", 
     "groupName_ja": "歩兵スキルエンハンサー", 
     "groupName_ko": "보병 스킬 향상장치", 
-    "groupName_ru": "Пехотные усилители навыков ", 
+    "groupName_ru": "Пехотные усилители навыков", 
     "groupName_zh": "Infantry Skill Enhancers", 
     "groupNameID": 278213, 
     "published": 0, 
@@ -28455,15 +28554,15 @@
     "categoryID": 350001, 
     "fittableNonSingleton": 0, 
     "groupID": 367487, 
-    "groupName_de": "Leistungen ", 
-    "groupName_en-us": "Services ", 
-    "groupName_es": "Servicios ", 
-    "groupName_fr": "Services ", 
-    "groupName_it": "Servizi ", 
-    "groupName_ja": "サービス ", 
-    "groupName_ko": "서비스 ", 
-    "groupName_ru": "Услуги ", 
-    "groupName_zh": "服务 ", 
+    "groupName_de": "Leistungen", 
+    "groupName_en-us": "Services", 
+    "groupName_es": "Servicios", 
+    "groupName_fr": "Services", 
+    "groupName_it": "Servizi", 
+    "groupName_ja": "サービス", 
+    "groupName_ko": "서비스", 
+    "groupName_ru": "Услуги", 
+    "groupName_zh": "服务", 
     "groupNameID": 296571, 
     "published": 0, 
     "useBasePrice": 0

staticdata/fsd_binary/iconids.0.json

@@ -9275,7 +9275,7 @@
     "iconFile": "res:/UI/Texture/Icons/Inventory/AbyssalRandomFilament_L5Active.png"
   }, 
   "24328": {
-    "iconFile": "res:/ui/texture/classes/achievements/mouseBtnMiddle.png", 
+    "iconFile": "res:/UI/Texture/Shared/mouse_button_middle.png", 
     "iconType": "png"
   }, 
   "24329": {
@@ -11974,5 +11974,8 @@
   }, 
   "25475": {
     "iconFile": "res:/ui/texture/icons/evermarks.png"
+  }, 
+  "25547": {
+    "iconFile": "res:/ui/texture/WindowIcons/assets.png"
   }
 }

staticdata/fsd_binary/requiredskillsfortypes.0.json

@@ -27588,10 +27588,10 @@
     "21718": 1
   }, 
   "72811": {
-    "33098": 1
+    "33098": 2
   }, 
   "72812": {
-    "33096": 1
+    "33096": 2
   }, 
   "72818": {
     "3405": 1
@@ -27699,10 +27699,10 @@
     "3402": 1
   }, 
   "72869": {
-    "33097": 1
+    "33097": 2
   }, 
   "72872": {
-    "33095": 1
+    "33095": 2
   }, 
   "72879": {
     "9955": 5, 
@@ -27710,16 +27710,16 @@
     "21718": 5
   }, 
   "72903": {
-    "3329": 1
+    "3329": 2
   }, 
   "72904": {
-    "3330": 1
+    "3330": 2
   }, 
   "72907": {
-    "3331": 1
+    "3331": 2
   }, 
   "72913": {
-    "3328": 1
+    "3328": 2
   }, 
   "73036": {
     "21718": 2
@@ -27774,40 +27774,598 @@
   }, 
   "73787": {
     "3456": 1, 
-    "20532": 1, 
+    "20532": 2, 
     "20533": 1
   }, 
   "73789": {
-    "33091": 1
+    "33091": 2
   }, 
   "73790": {
     "3456": 1, 
-    "20525": 1, 
+    "20525": 2, 
     "20533": 1
   }, 
   "73792": {
     "3456": 1, 
-    "20531": 1, 
+    "20531": 2, 
     "20533": 1
   }, 
   "73793": {
     "3456": 1, 
-    "20530": 1, 
+    "20530": 2, 
     "20533": 1
   }, 
   "73794": {
-    "33094": 1
+    "33094": 2
   }, 
   "73795": {
-    "33092": 1
+    "33092": 2
   }, 
   "73796": {
-    "33093": 1
+    "33093": 2
   }, 
   "73910": {
     "33407": 5
   }, 
   "73912": {
     "25235": 5
+  }, 
+  "74141": {
+    "3329": 5, 
+    "12095": 1
+  }, 
+  "74161": {
+    "3402": 1
+  }, 
+  "74162": {
+    "3402": 1
+  }, 
+  "74163": {
+    "3402": 1
+  }, 
+  "74199": {
+    "3405": 1
+  }, 
+  "74200": {
+    "3405": 1
+  }, 
+  "74201": {
+    "3405": 1
+  }, 
+  "74202": {
+    "3405": 1
+  }, 
+  "74203": {
+    "3405": 1
+  }, 
+  "74204": {
+    "3405": 1
+  }, 
+  "74205": {
+    "3405": 1
+  }, 
+  "74206": {
+    "3405": 1
+  }, 
+  "74207": {
+    "3405": 1
+  }, 
+  "74208": {
+    "3405": 1
+  }, 
+  "74209": {
+    "3405": 1
+  }, 
+  "74210": {
+    "3405": 1
+  }, 
+  "74211": {
+    "3405": 1
+  }, 
+  "74212": {
+    "3405": 1
+  }, 
+  "74213": {
+    "3405": 1
+  }, 
+  "74214": {
+    "3405": 1
+  }, 
+  "74215": {
+    "3405": 1
+  }, 
+  "74216": {
+    "3405": 1
+  }, 
+  "74255": {
+    "3426": 1, 
+    "9955": 5
+  }, 
+  "74256": {
+    "3386": 1, 
+    "9955": 5
+  }, 
+  "74257": {
+    "3405": 1
+  }, 
+  "74258": {
+    "3405": 1
+  }, 
+  "74259": {
+    "3405": 1
+  }, 
+  "74260": {
+    "3405": 1
+  }, 
+  "74261": {
+    "3405": 1
+  }, 
+  "74262": {
+    "3405": 1
+  }, 
+  "74316": {
+    "3333": 5, 
+    "16591": 1
+  }, 
+  "74448": {
+    "9955": 5, 
+    "25863": 1
+  }, 
+  "74521": {
+    "3386": 1
+  }, 
+  "74522": {
+    "3386": 1
+  }, 
+  "74523": {
+    "3386": 1
+  }, 
+  "74524": {
+    "3386": 1
+  }, 
+  "74525": {
+    "3386": 1
+  }, 
+  "74526": {
+    "3386": 1
+  }, 
+  "74527": {
+    "3386": 1
+  }, 
+  "74528": {
+    "3386": 1
+  }, 
+  "74529": {
+    "3386": 1
+  }, 
+  "74530": {
+    "3386": 1
+  }, 
+  "74531": {
+    "3386": 1
+  }, 
+  "74532": {
+    "3386": 1
+  }, 
+  "74533": {
+    "3386": 1
+  }, 
+  "74534": {
+    "3386": 1
+  }, 
+  "74535": {
+    "3386": 1
+  }, 
+  "74536": {
+    "3386": 1
+  }, 
+  "75275": {
+    "3386": 1
+  }, 
+  "75276": {
+    "3386": 1
+  }, 
+  "75277": {
+    "3386": 1
+  }, 
+  "75278": {
+    "3386": 1
+  }, 
+  "75279": {
+    "3386": 1
+  }, 
+  "75280": {
+    "3386": 1
+  }, 
+  "75281": {
+    "3386": 1
+  }, 
+  "75282": {
+    "3386": 1
+  }, 
+  "75283": {
+    "3386": 1
+  }, 
+  "75284": {
+    "3386": 1
+  }, 
+  "75285": {
+    "3386": 1
+  }, 
+  "75286": {
+    "3386": 1
+  }, 
+  "75287": {
+    "3386": 1
+  }, 
+  "75288": {
+    "3386": 1
+  }, 
+  "75289": {
+    "3386": 1
+  }, 
+  "75290": {
+    "3386": 1
+  }, 
+  "75326": {
+    "3402": 1
+  }, 
+  "75327": {
+    "3402": 1
+  }, 
+  "75328": {
+    "3402": 1
+  }, 
+  "75677": {
+    "9955": 5, 
+    "11584": 3
+  }, 
+  "76050": {
+    "3405": 1
+  }, 
+  "76051": {
+    "3405": 1
+  }, 
+  "76052": {
+    "3405": 1
+  }, 
+  "76053": {
+    "3405": 1
+  }, 
+  "76054": {
+    "3405": 1
+  }, 
+  "76055": {
+    "3405": 1
+  }, 
+  "76056": {
+    "3405": 1
+  }, 
+  "76057": {
+    "3405": 1
+  }, 
+  "76058": {
+    "3405": 1
+  }, 
+  "76059": {
+    "3405": 1
+  }, 
+  "76060": {
+    "3405": 1
+  }, 
+  "76061": {
+    "3405": 1
+  }, 
+  "76062": {
+    "3405": 1
+  }, 
+  "76063": {
+    "3405": 1
+  }, 
+  "76064": {
+    "3405": 1
+  }, 
+  "76065": {
+    "3405": 1
+  }, 
+  "76066": {
+    "3405": 1
+  }, 
+  "76067": {
+    "3405": 1
+  }, 
+  "76068": {
+    "3405": 1
+  }, 
+  "76069": {
+    "3405": 1
+  }, 
+  "76070": {
+    "3405": 1
+  }, 
+  "76071": {
+    "3405": 1
+  }, 
+  "76072": {
+    "3405": 1
+  }, 
+  "76073": {
+    "3405": 1
+  }, 
+  "76074": {
+    "3405": 1
+  }, 
+  "76075": {
+    "3405": 1
+  }, 
+  "76076": {
+    "3405": 1
+  }, 
+  "76077": {
+    "3405": 1
+  }, 
+  "76078": {
+    "3405": 1
+  }, 
+  "76079": {
+    "3405": 1
+  }, 
+  "76080": {
+    "3405": 1
+  }, 
+  "76081": {
+    "3405": 1
+  }, 
+  "76082": {
+    "3405": 1
+  }, 
+  "76083": {
+    "3405": 1
+  }, 
+  "76084": {
+    "3405": 1
+  }, 
+  "76085": {
+    "3405": 1
+  }, 
+  "76086": {
+    "3405": 1
+  }, 
+  "76087": {
+    "3405": 1
+  }, 
+  "76088": {
+    "3405": 1
+  }, 
+  "76089": {
+    "3405": 1
+  }, 
+  "76090": {
+    "3405": 1
+  }, 
+  "76091": {
+    "3405": 1
+  }, 
+  "76092": {
+    "3405": 1
+  }, 
+  "76093": {
+    "3405": 1
+  }, 
+  "76094": {
+    "3405": 1
+  }, 
+  "76095": {
+    "3405": 1
+  }, 
+  "76096": {
+    "3405": 1
+  }, 
+  "76097": {
+    "3405": 1
+  }, 
+  "76098": {
+    "3405": 1
+  }, 
+  "76099": {
+    "3405": 1
+  }, 
+  "76100": {
+    "3405": 1
+  }, 
+  "76101": {
+    "3405": 1
+  }, 
+  "76102": {
+    "3405": 1
+  }, 
+  "76103": {
+    "3405": 1
+  }, 
+  "76104": {
+    "3405": 1
+  }, 
+  "76105": {
+    "3405": 1
+  }, 
+  "76106": {
+    "3405": 1
+  }, 
+  "76107": {
+    "3405": 1
+  }, 
+  "76108": {
+    "3405": 1
+  }, 
+  "76109": {
+    "3405": 1
+  }, 
+  "76110": {
+    "3405": 1
+  }, 
+  "76111": {
+    "3405": 1
+  }, 
+  "76112": {
+    "3405": 1
+  }, 
+  "76113": {
+    "3405": 1
+  }, 
+  "76114": {
+    "3405": 1
+  }, 
+  "76115": {
+    "3405": 1
+  }, 
+  "76116": {
+    "3405": 1
+  }, 
+  "76117": {
+    "3405": 1
+  }, 
+  "76118": {
+    "3405": 1
+  }, 
+  "76119": {
+    "3405": 1
+  }, 
+  "76120": {
+    "3405": 1
+  }, 
+  "76121": {
+    "3405": 1
+  }, 
+  "76122": {
+    "3405": 1
+  }, 
+  "76123": {
+    "3405": 1
+  }, 
+  "76124": {
+    "3405": 1
+  }, 
+  "76125": {
+    "3405": 1
+  }, 
+  "76126": {
+    "3405": 1
+  }, 
+  "76127": {
+    "3405": 1
+  }, 
+  "76128": {
+    "3405": 1
+  }, 
+  "76129": {
+    "3405": 1
+  }, 
+  "76130": {
+    "3405": 1
+  }, 
+  "76131": {
+    "3405": 1
+  }, 
+  "76132": {
+    "3405": 1
+  }, 
+  "76133": {
+    "3405": 1
+  }, 
+  "76134": {
+    "3405": 1
+  }, 
+  "76135": {
+    "3405": 1
+  }, 
+  "76136": {
+    "3405": 1
+  }, 
+  "76137": {
+    "3405": 1
+  }, 
+  "76138": {
+    "3405": 1
+  }, 
+  "76139": {
+    "3405": 1
+  }, 
+  "76140": {
+    "3405": 1
+  }, 
+  "76141": {
+    "3405": 1
+  }, 
+  "76142": {
+    "3405": 1
+  }, 
+  "76143": {
+    "3405": 1
+  }, 
+  "76144": {
+    "3405": 1
+  }, 
+  "76145": {
+    "3405": 1
+  }, 
+  "76179": {
+    "21718": 1
+  }, 
+  "76180": {
+    "21718": 1
+  }, 
+  "76181": {
+    "21718": 1
+  }, 
+  "76182": {
+    "21718": 1
+  }, 
+  "76183": {
+    "21718": 1
+  }, 
+  "76184": {
+    "21718": 1
+  }, 
+  "76185": {
+    "21718": 1
+  }, 
+  "76186": {
+    "21718": 1
+  }, 
+  "76187": {
+    "21718": 1
+  }, 
+  "76188": {
+    "21718": 1
+  }, 
+  "76189": {
+    "21718": 1
+  }, 
+  "76190": {
+    "21718": 1
+  }, 
+  "76191": {
+    "25863": 1
+  }, 
+  "76192": {
+    "25863": 1
+  }, 
+  "76193": {
+    "25863": 1
+  }, 
+  "76194": {
+    "25863": 1
+  }, 
+  "76260": {
+    "25863": 1
+  }, 
+  "76318": {
+    "25863": 1
+  }, 
+  "76319": {
+    "25863": 1
+  }, 
+  "76320": {
+    "25863": 1
   }
 }

staticdata/fsd_binary/typedogma.0.json

@@ -350511,7 +350511,7 @@
       }, 
       {
         "attributeID": 11, 
-        "value": 950.0
+        "value": 925.0
       }, 
       {
         "attributeID": 12, 
@@ -350930,7 +350930,7 @@
       }, 
       {
         "attributeID": 76, 
-        "value": 55000.0
+        "value": 60000.0
       }, 
       {
         "attributeID": 79, 
@@ -351724,7 +351724,7 @@
       }, 
       {
         "attributeID": 37, 
-        "value": 190.0
+        "value": 160.0
       }, 
       {
         "attributeID": 48, 
@@ -356320,7 +356320,7 @@
       }, 
       {
         "attributeID": 11, 
-        "value": 42.0
+        "value": 50.0
       }, 
       {
         "attributeID": 12, 
@@ -356352,7 +356352,7 @@
       }, 
       {
         "attributeID": 48, 
-        "value": 161.0
+        "value": 170.0
       }, 
       {
         "attributeID": 49, 
@@ -359181,6 +359181,10 @@
       {
         "attributeID": 280, 
         "value": 0.0
+      }, 
+      {
+        "attributeID": 2450, 
+        "value": 1.0
       }
     ], 
     "dogmaEffects": [
@@ -961759,10 +961763,6 @@
         "attributeID": 1299, 
         "value": 898.0
       }, 
-      {
-        "attributeID": 1302, 
-        "value": 11019.0
-      }, 
       {
         "attributeID": 1333, 
         "value": 1.0

staticdata/fsd_binary/typedogma.1.json

@@ -419241,18 +419241,6 @@
         "attributeID": 9, 
         "value": 1000000.0
       }, 
-      {
-        "attributeID": 54, 
-        "value": 0.0
-      }, 
-      {
-        "attributeID": 158, 
-        "value": 0.0
-      }, 
-      {
-        "attributeID": 160, 
-        "value": 0.0
-      }, 
       {
         "attributeID": 247, 
         "value": 0.0
@@ -419273,10 +419261,6 @@
         "attributeID": 470, 
         "value": 1200000000.0
       }, 
-      {
-        "attributeID": 482, 
-        "value": 2700.0
-      }, 
       {
         "attributeID": 525, 
         "value": 1.0
@@ -419285,17 +419269,13 @@
         "attributeID": 552, 
         "value": 500.0
       }, 
-      {
-        "attributeID": 665, 
-        "value": 0.0
-      }, 
       {
         "attributeID": 854, 
         "value": 1.0
       }, 
       {
         "attributeID": 901, 
-        "value": 20.0
+        "value": 25.0
       }, 
       {
         "attributeID": 903, 
@@ -420900,36 +420880,12 @@
     "dogmaAttributes": [
       {
         "attributeID": 9, 
-        "value": 100.0
+        "value": 150.0
       }, 
       {
-        "attributeID": 54, 
+        "attributeID": 55, 
         "value": 0.0
       }, 
-      {
-        "attributeID": 114, 
-        "value": 0.0
-      }, 
-      {
-        "attributeID": 116, 
-        "value": 0.0
-      }, 
-      {
-        "attributeID": 117, 
-        "value": 0.0
-      }, 
-      {
-        "attributeID": 118, 
-        "value": 0.0
-      }, 
-      {
-        "attributeID": 158, 
-        "value": 0.0
-      }, 
-      {
-        "attributeID": 160, 
-        "value": 1.0
-      }, 
       {
         "attributeID": 208, 
         "value": 6.0
@@ -420956,36 +420912,40 @@
       }, 
       {
         "attributeID": 263, 
-        "value": 100.0
+        "value": 63.0
       }, 
       {
         "attributeID": 265, 
-        "value": 100.0
+        "value": 156.0
       }, 
       {
         "attributeID": 416, 
         "value": 0.0
       }, 
+      {
+        "attributeID": 479, 
+        "value": 625000.0
+      }, 
+      {
+        "attributeID": 481, 
+        "value": 0.0
+      }, 
+      {
+        "attributeID": 482, 
+        "value": 0.0
+      }, 
       {
         "attributeID": 552, 
-        "value": 45.0
+        "value": 25.0
+      }, 
+      {
+        "attributeID": 562, 
+        "value": 0.0
       }, 
       {
         "attributeID": 563, 
         "value": 5.0
       }, 
-      {
-        "attributeID": 620, 
-        "value": 45.0
-      }, 
-      {
-        "attributeID": 645, 
-        "value": 1.5
-      }, 
-      {
-        "attributeID": 646, 
-        "value": 1.5
-      }, 
       {
         "attributeID": 665, 
         "value": 0.0
@@ -539854,18 +539814,6 @@
         "attributeID": 1319, 
         "value": 0.0
       }, 
-      {
-        "attributeID": 1324, 
-        "value": -100.0
-      }, 
-      {
-        "attributeID": 1325, 
-        "value": -100.0
-      }, 
-      {
-        "attributeID": 1326, 
-        "value": -100.0
-      }, 
       {
         "attributeID": 1327, 
         "value": 50.0
@@ -539888,18 +539836,6 @@
         "effectID": 3617, 
         "isDefault": 0
       }, 
-      {
-        "effectID": 3618, 
-        "isDefault": 0
-      }, 
-      {
-        "effectID": 3619, 
-        "isDefault": 0
-      }, 
-      {
-        "effectID": 3620, 
-        "isDefault": 0
-      }, 
       {
         "effectID": 3648, 
         "isDefault": 0
@@ -546500,7 +546436,7 @@
       }, 
       {
         "attributeID": 111, 
-        "value": 0.0
+        "value": 0.001
       }, 
       {
         "attributeID": 113, 
@@ -553299,7 +553235,7 @@
       }, 
       {
         "attributeID": 111, 
-        "value": 0.0
+        "value": 0.001
       }, 
       {
         "attributeID": 113, 
@@ -553326,6 +553262,10 @@
         "attributeID": 9, 
         "value": 1000000000.0
       }, 
+      {
+        "attributeID": 55, 
+        "value": 0.0
+      }, 
       {
         "attributeID": 109, 
         "value": 0.001
@@ -553336,16 +553276,28 @@
       }, 
       {
         "attributeID": 111, 
-        "value": 0.0
+        "value": 0.001
       }, 
       {
         "attributeID": 113, 
         "value": 0.001
       }, 
+      {
+        "attributeID": 481, 
+        "value": 0.0
+      }, 
+      {
+        "attributeID": 482, 
+        "value": 0.0
+      }, 
       {
         "attributeID": 525, 
         "value": 1.0
       }, 
+      {
+        "attributeID": 562, 
+        "value": 0.0
+      }, 
       {
         "attributeID": 854, 
         "value": 1.0
@@ -553373,7 +553325,7 @@
       }, 
       {
         "attributeID": 111, 
-        "value": 0.0
+        "value": 0.001
       }, 
       {
         "attributeID": 113, 
@@ -553410,7 +553362,7 @@
       }, 
       {
         "attributeID": 111, 
-        "value": 0.0
+        "value": 0.001
       }, 
       {
         "attributeID": 113, 
@@ -553447,7 +553399,7 @@
       }, 
       {
         "attributeID": 111, 
-        "value": 0.0
+        "value": 0.001
       }, 
       {
         "attributeID": 113, 
@@ -553484,7 +553436,7 @@
       }, 
       {
         "attributeID": 111, 
-        "value": 0.0
+        "value": 0.001
       }, 
       {
         "attributeID": 113, 
@@ -553521,7 +553473,7 @@
       }, 
       {
         "attributeID": 111, 
-        "value": 0.0
+        "value": 0.001
       }, 
       {
         "attributeID": 113, 
@@ -553558,7 +553510,7 @@
       }, 
       {
         "attributeID": 111, 
-        "value": 0.0
+        "value": 0.001
       }, 
       {
         "attributeID": 113, 
@@ -553595,7 +553547,7 @@
       }, 
       {
         "attributeID": 111, 
-        "value": 0.0
+        "value": 0.001
       }, 
       {
         "attributeID": 113, 
@@ -556862,7 +556814,7 @@
       }, 
       {
         "attributeID": 111, 
-        "value": 0.0
+        "value": 0.001
       }, 
       {
         "attributeID": 113, 
@@ -556899,7 +556851,7 @@
       }, 
       {
         "attributeID": 111, 
-        "value": 0.0
+        "value": 0.001
       }, 
       {
         "attributeID": 113, 
@@ -556936,7 +556888,7 @@
       }, 
       {
         "attributeID": 111, 
-        "value": 0.0
+        "value": 0.001
       }, 
       {
         "attributeID": 113, 
@@ -556973,7 +556925,7 @@
       }, 
       {
         "attributeID": 111, 
-        "value": 0.0
+        "value": 0.001
       }, 
       {
         "attributeID": 113, 
@@ -557010,7 +556962,7 @@
       }, 
       {
         "attributeID": 111, 
-        "value": 0.0
+        "value": 0.001
       }, 
       {
         "attributeID": 113, 
@@ -557047,7 +556999,7 @@
       }, 
       {
         "attributeID": 111, 
-        "value": 0.0
+        "value": 0.001
       }, 
       {
         "attributeID": 113, 
@@ -557074,6 +557026,10 @@
         "attributeID": 9, 
         "value": 1000000000.0
       }, 
+      {
+        "attributeID": 55, 
+        "value": 0.0
+      }, 
       {
         "attributeID": 109, 
         "value": 0.001
@@ -557084,16 +557040,28 @@
       }, 
       {
         "attributeID": 111, 
-        "value": 0.0
+        "value": 0.001
       }, 
       {
         "attributeID": 113, 
         "value": 0.001
       }, 
+      {
+        "attributeID": 481, 
+        "value": 0.0
+      }, 
+      {
+        "attributeID": 482, 
+        "value": 0.0
+      }, 
       {
         "attributeID": 525, 
         "value": 1.0
       }, 
+      {
+        "attributeID": 562, 
+        "value": 0.0
+      }, 
       {
         "attributeID": 854, 
         "value": 1.0
@@ -557111,6 +557079,10 @@
         "attributeID": 9, 
         "value": 1000000000.0
       }, 
+      {
+        "attributeID": 55, 
+        "value": 0.0
+      }, 
       {
         "attributeID": 109, 
         "value": 0.001
@@ -557121,16 +557093,28 @@
       }, 
       {
         "attributeID": 111, 
-        "value": 0.0
+        "value": 0.001
       }, 
       {
         "attributeID": 113, 
         "value": 0.001
       }, 
+      {
+        "attributeID": 481, 
+        "value": 0.0
+      }, 
+      {
+        "attributeID": 482, 
+        "value": 0.0
+      }, 
       {
         "attributeID": 525, 
         "value": 1.0
       }, 
+      {
+        "attributeID": 562, 
+        "value": 0.0
+      }, 
       {
         "attributeID": 854, 
         "value": 1.0
@@ -557148,6 +557132,10 @@
         "attributeID": 9, 
         "value": 10000000000.0
       }, 
+      {
+        "attributeID": 55, 
+        "value": 0.0
+      }, 
       {
         "attributeID": 109, 
         "value": 0.001
@@ -557158,16 +557146,28 @@
       }, 
       {
         "attributeID": 111, 
-        "value": 0.0
+        "value": 0.001
       }, 
       {
         "attributeID": 113, 
         "value": 0.001
       }, 
+      {
+        "attributeID": 481, 
+        "value": 0.0
+      }, 
+      {
+        "attributeID": 482, 
+        "value": 0.0
+      }, 
       {
         "attributeID": 525, 
         "value": 1.0
       }, 
+      {
+        "attributeID": 562, 
+        "value": 0.0
+      }, 
       {
         "attributeID": 854, 
         "value": 1.0
@@ -715919,7 +715919,7 @@
       }, 
       {
         "attributeID": 11, 
-        "value": 13500.0
+        "value": 14500.0
       }, 
       {
         "attributeID": 12, 
@@ -716115,7 +716115,7 @@
       }, 
       {
         "attributeID": 500, 
-        "value": 5.0
+        "value": 7.5
       }, 
       {
         "attributeID": 524, 
@@ -890892,7 +890892,7 @@
       }, 
       {
         "attributeID": 554, 
-        "value": 50.0
+        "value": 40.0
       }, 
       {
         "attributeID": 604, 
@@ -956966,11 +956966,11 @@
       }, 
       {
         "attributeID": 2489, 
-        "value": 51.0
+        "value": 16.0
       }, 
       {
         "attributeID": 2490, 
-        "value": 60000.0
+        "value": 1920000.0
       }, 
       {
         "attributeID": 2673, 
@@ -956987,7 +956987,7 @@
         "isDefault": 0
       }, 
       {
-        "effectID": 6901, 
+        "effectID": 11453, 
         "isDefault": 0
       }
     ]
@@ -957128,11 +957128,11 @@
       }, 
       {
         "attributeID": 2489, 
-        "value": 307.0
+        "value": 16.0
       }, 
       {
         "attributeID": 2490, 
-        "value": 162000.0
+        "value": 840000.0
       }, 
       {
         "attributeID": 2673, 
@@ -957149,7 +957149,7 @@
         "isDefault": 0
       }, 
       {
-        "effectID": 6901, 
+        "effectID": 11453, 
         "isDefault": 0
       }
     ]
@@ -957286,11 +957286,11 @@
       }, 
       {
         "attributeID": 2489, 
-        "value": 307.0
+        "value": 16.0
       }, 
       {
         "attributeID": 2490, 
-        "value": 146000.0
+        "value": 760000.0
       }, 
       {
         "attributeID": 2673, 
@@ -957307,7 +957307,7 @@
         "isDefault": 0
       }, 
       {
-        "effectID": 6901, 
+        "effectID": 11453, 
         "isDefault": 0
       }
     ]
@@ -998816,18 +998816,6 @@
         "attributeID": 1319, 
         "value": 0.0
       }, 
-      {
-        "attributeID": 1324, 
-        "value": -100.0
-      }, 
-      {
-        "attributeID": 1325, 
-        "value": -100.0
-      }, 
-      {
-        "attributeID": 1326, 
-        "value": -100.0
-      }, 
       {
         "attributeID": 1327, 
         "value": -20.0
@@ -998850,18 +998838,6 @@
         "effectID": 3617, 
         "isDefault": 0
       }, 
-      {
-        "effectID": 3618, 
-        "isDefault": 0
-      }, 
-      {
-        "effectID": 3619, 
-        "isDefault": 0
-      }, 
-      {
-        "effectID": 3620, 
-        "isDefault": 0
-      }, 
       {
         "effectID": 3648, 
         "isDefault": 0

staticdata/fsd_lite/dbuffcollections.0.json

@@ -2508,7 +2508,7 @@
     "displayName_ja": "ダメージレジスタンスボーナス", 
     "displayName_ko": "피해 저항력 보너스", 
     "displayName_ru": "Усиление сопротивляемости урону", 
-    "displayName_zh": "Damage Resistance Bonus", 
+    "displayName_zh": "伤害抗性加成", 
     "displayNameID": 587608, 
     "itemModifiers": [
       {
@@ -2565,7 +2565,7 @@
     "displayName_ja": "小型エネルギータレットダメージボーナス", 
     "displayName_ko": "소형 에너지 터렛 피해량 보너스", 
     "displayName_ru": "Бонус к урону от малых лазерных орудий", 
-    "displayName_zh": "Small Energy Turret Damage Bonus", 
+    "displayName_zh": "小型能量炮台伤害加成", 
     "displayNameID": 588970, 
     "itemModifiers": [], 
     "locationGroupModifiers": [], 
@@ -2590,7 +2590,7 @@
     "displayName_ja": "エネルギー戦強度ボーナス", 
     "displayName_ko": "에너지전 효과 보너스", 
     "displayName_ru": "Бонус к мощности средств воздействия на накопитель", 
-    "displayName_zh": "Energy Warfare Strength Bonus", 
+    "displayName_zh": "能量战强度加成", 
     "displayNameID": 588971, 
     "itemModifiers": [], 
     "locationGroupModifiers": [
@@ -2619,7 +2619,7 @@
     "displayName_ja": "タレットダメージボーナス", 
     "displayName_ko": "터렛 피해량 보너스", 
     "displayName_ru": "Увеличение урона от турелей", 
-    "displayName_zh": "Turret Damage Bonus", 
+    "displayName_zh": "炮台伤害加成", 
     "displayNameID": 589384, 
     "itemModifiers": [], 
     "locationGroupModifiers": [], 
@@ -2644,7 +2644,7 @@
     "displayName_ja": "ミサイルダメージボーナス", 
     "displayName_ko": "미사일 피해량 보너스", 
     "displayName_ru": "Увеличение урона от ракет", 
-    "displayName_zh": "Missile Damage Bonuus", 
+    "displayName_zh": "导弹伤害加成", 
     "displayNameID": 589393, 
     "itemModifiers": [], 
     "locationGroupModifiers": [], 
@@ -2681,7 +2681,7 @@
     "displayName_ja": "AB速度増加ボーナス", 
     "displayName_ko": "애프터버너 속도 증가 보너스", 
     "displayName_ru": "Бонус к увеличению скорости форсажного ускорителя", 
-    "displayName_zh": "AB speed increase bonus", 
+    "displayName_zh": "加力燃烧器速度增量加成", 
     "displayNameID": 591759, 
     "itemModifiers": [], 
     "locationGroupModifiers": [], 
@@ -2706,7 +2706,7 @@
     "displayName_ja": "航行速度", 
     "displayName_ko": "함선 속도", 
     "displayName_ru": "Скорость корабля", 
-    "displayName_zh": "Ship Velocity", 
+    "displayName_zh": "舰船最大速度", 
     "displayNameID": 592692, 
     "itemModifiers": [
       {
@@ -2730,7 +2730,7 @@
     "displayName_ja": "艦船の慣性", 
     "displayName_ko": "관성 계수", 
     "displayName_ru": "Инертность корабля", 
-    "displayName_zh": "Ship Inertia", 
+    "displayName_zh": "舰船惯性调整系数", 
     "displayNameID": 592693, 
     "itemModifiers": [
       {
@@ -2754,7 +2754,7 @@
     "displayName_ja": "シールドとキャパシタの充電速度", 
     "displayName_ko": "실드 및 캐패시터 충전 속도", 
     "displayName_ru": "Скорость перезарядки щита и накопителя", 
-    "displayName_zh": "Shield and Capacitor Recharge Rate", 
+    "displayName_zh": "护盾和电容回充速率", 
     "displayNameID": 592694, 
     "itemModifiers": [
       {
@@ -2781,7 +2781,7 @@
     "displayName_ja": "モジュールのサイクルとリロード速度", 
     "displayName_ko": "모듈 사이클 시간 및 재장전 속도", 
     "displayName_ru": "Время и скорость перезарядки модуля", 
-    "displayName_zh": "Module Cycle and Reload Speed", 
+    "displayName_zh": "装备循环时间和装填速度", 
     "displayNameID": 592695, 
     "itemModifiers": [], 
     "locationGroupModifiers": [], 
@@ -2811,7 +2811,7 @@
     "displayName_ja": "タレットの追跡速度とミサイルの爆発速度", 
     "displayName_ko": "터렛 트래킹 및 미사일 폭발 속도", 
     "displayName_ru": "Скорость наведения орудий и распространения взрыва ракет", 
-    "displayName_zh": "Turret Tracking and Missile Explosion Velocity", 
+    "displayName_zh": "炮台跟踪速度和导弹爆炸速度", 
     "displayNameID": 593084, 
     "itemModifiers": [], 
     "locationGroupModifiers": [], 
@@ -2840,7 +2840,7 @@
     "displayName_ja": "追加ベース船体HP", 
     "displayName_ko": "추가 선체 내구도", 
     "displayName_ru": "Увеличение основного запаса прочности корпуса", 
-    "displayName_zh": "Additional Base Hull Hitpoints", 
+    "displayName_zh": "额外的基础结构值", 
     "displayNameID": 594653, 
     "itemModifiers": [
       {
@@ -2864,7 +2864,7 @@
     "displayName_ja": "タレットのトラッキング", 
     "displayName_ko": "터렛 트래킹", 
     "displayName_ru": "Скорость наведения турелей", 
-    "displayName_zh": "Turret Tracking", 
+    "displayName_zh": "炮台跟踪速度", 
     "displayNameID": 594691, 
     "itemModifiers": [], 
     "locationGroupModifiers": [], 
@@ -2889,7 +2889,7 @@
     "displayName_ja": "タレットの精度低下範囲ボーナス", 
     "displayName_ko": "터렛 유효사거리 보너스", 
     "displayName_ru": "Увеличение остаточной дальности стрельбы турелей", 
-    "displayName_zh": "Turret Falloff Bonus", 
+    "displayName_zh": "炮台失准范围加成", 
     "displayNameID": 594692, 
     "itemModifiers": [], 
     "locationGroupModifiers": [], 
@@ -2929,7 +2929,7 @@
     "displayName_ja": "タレットの最適射程距離", 
     "displayName_ko": "터렛 최적사거리", 
     "displayName_ru": "Оптимальность турели", 
-    "displayName_zh": "Turret Optimal Bonus", 
+    "displayName_zh": "炮台最佳射程加成", 
     "displayNameID": 596685, 
     "itemModifiers": [], 
     "locationGroupModifiers": [], 
@@ -2954,7 +2954,7 @@
     "displayName_ja": "タレットのキャパシタ消費", 
     "displayName_ko": "터렛 캐패시터 소모", 
     "displayName_ru": "Расход энергии накопителя турелей", 
-    "displayName_zh": "Turret Cap Consumption", 
+    "displayName_zh": "炮台电容消耗", 
     "displayNameID": 596686, 
     "itemModifiers": [], 
     "locationGroupModifiers": [], 
@@ -2979,7 +2979,7 @@
     "displayName_ja": "HPボーナス", 
     "displayName_ko": "내구도 보너스", 
     "displayName_ru": "Увеличение запаса прочности", 
-    "displayName_zh": "Hitpoint Bonus", 
+    "displayName_zh": "HP加成", 
     "displayNameID": 597492, 
     "itemModifiers": [
       {
@@ -3009,7 +3009,7 @@
     "displayName_ja": "速度ボーナス", 
     "displayName_ko": "속도 보너스", 
     "displayName_ru": "Повышение скорости", 
-    "displayName_zh": "Velocity Bonus", 
+    "displayName_zh": "速度加成", 
     "displayNameID": 597614, 
     "itemModifiers": [
       {
@@ -3033,7 +3033,7 @@
     "displayName_ja": "慣性ペナルティ", 
     "displayName_ko": "관성 계수 페널티", 
     "displayName_ru": "Снижение инертности", 
-    "displayName_zh": "Inertia Penalty", 
+    "displayName_zh": "惯性系数惩罚", 
     "displayNameID": 597615, 
     "itemModifiers": [
       {
@@ -3057,7 +3057,7 @@
     "displayName_ja": "キャパシタボーナス", 
     "displayName_ko": "캐패시터 보너스", 
     "displayName_ru": "Увеличение запаса энергии", 
-    "displayName_zh": "Capacitor Bonus", 
+    "displayName_zh": "电容加成", 
     "displayNameID": 597616, 
     "itemModifiers": [
       {
@@ -3081,7 +3081,7 @@
     "displayName_ja": "アーマーとシールドのHPボーナス", 
     "displayName_ko": "장갑 내구도 및 실드량 보너스", 
     "displayName_ru": "Повышение прочности щитов и брони", 
-    "displayName_zh": "Armor and Shield HP Bonus", 
+    "displayName_zh": "装甲值和护盾值加成", 
     "displayNameID": 597617, 
     "itemModifiers": [
       {
@@ -3108,7 +3108,7 @@
     "displayName_ja": "ミサイル飛行時間ボーナス", 
     "displayName_ko": "미사일 비행시간 보너스", 
     "displayName_ru": "Увеличение времени полёта ракет", 
-    "displayName_zh": "Missile Flight Time Bonus", 
+    "displayName_zh": "导弹飞行时间加成", 
     "displayNameID": 597618, 
     "itemModifiers": [], 
     "locationGroupModifiers": [], 
@@ -3133,7 +3133,7 @@
     "displayName_ja": "質量増加", 
     "displayName_ko": "질량 증가", 
     "displayName_ru": "Увеличение массы", 
-    "displayName_zh": "Mass Increase", 
+    "displayName_zh": "质量增加", 
     "displayNameID": 597619, 
     "itemModifiers": [
       {
@@ -3157,7 +3157,7 @@
     "displayName_ja": "キャパシタ充電速度", 
     "displayName_ko": "캐패시터 충전 속도", 
     "displayName_ru": "Скорость перезарядки накопителя", 
-    "displayName_zh": "Capacitor Recharge Rate", 
+    "displayName_zh": "电容回充速率", 
     "displayNameID": 597771, 
     "itemModifiers": [
       {
@@ -3181,7 +3181,7 @@
     "displayName_ja": "シグネチャ半径", 
     "displayName_ko": "시그니처 반경", 
     "displayName_ru": "Радиус сигнатуры", 
-    "displayName_zh": "Signature Radius", 
+    "displayName_zh": "信号半径", 
     "displayNameID": 597772, 
     "itemModifiers": [
       {
@@ -3205,7 +3205,7 @@
     "displayName_ja": "タレットとミサイルのダメージ", 
     "displayName_ko": "터렛 및 미사일 피해량", 
     "displayName_ru": "Урон от турелей и ракет", 
-    "displayName_zh": "Turret and Missile Damage", 
+    "displayName_zh": "炮台和导弹伤害", 
     "displayNameID": 597773, 
     "itemModifiers": [], 
     "locationGroupModifiers": [], 
@@ -3246,7 +3246,7 @@
     "displayName_ja": "センサー強度ボーナス", 
     "displayName_ko": "센서 강도 보너스", 
     "displayName_ru": "Увеличение мощности сенсоров", 
-    "displayName_zh": "Sensor Strength bonus", 
+    "displayName_zh": "感应强度加成", 
     "displayNameID": 600979, 
     "itemModifiers": [
       {
@@ -3279,7 +3279,7 @@
     "displayName_ja": "シグネチャ半径ボーナス", 
     "displayName_ko": "시그니처 반경 보너스", 
     "displayName_ru": "Уменьшение радиуса сигнатуры", 
-    "displayName_zh": "Signature Radius bonus", 
+    "displayName_zh": "信号半径加成", 
     "displayNameID": 600983, 
     "itemModifiers": [
       {
@@ -3327,7 +3327,7 @@
     "displayName_ja": "追加基本アーマーヒットポイント", 
     "displayName_ko": "추가 기본 장갑 내구도", 
     "displayName_ru": "Увеличение основного запаса прочности брони", 
-    "displayName_zh": "Additional Base Armor Hitpoints", 
+    "displayName_zh": "额外的基础装甲值", 
     "displayNameID": 629466, 
     "itemModifiers": [
       {
@@ -3351,7 +3351,7 @@
     "displayName_ja": "追加基本シールドヒットポイント", 
     "displayName_ko": "추가 기본 실드 내구도", 
     "displayName_ru": "Увеличение основного запаса прочности щитов", 
-    "displayName_zh": "Additional Base Shield Hitpoints", 
+    "displayName_zh": "额外的基础护盾值", 
     "displayNameID": 629467, 
     "itemModifiers": [
       {
@@ -3375,7 +3375,7 @@
     "displayName_ja": "キネティックミサイルダメージボーナス", 
     "displayName_ko": "키네틱 미사일 피해량 보너스", 
     "displayName_ru": "Увеличение урона от кинетических ракет", 
-    "displayName_zh": "Kinetic Missile Damage Bonus", 
+    "displayName_zh": "动能导弹伤害加成", 
     "displayNameID": 631461, 
     "itemModifiers": [], 
     "locationGroupModifiers": [], 
@@ -3400,7 +3400,7 @@
     "displayName_ja": "小型ハイブリッドタレットダメージボーナス", 
     "displayName_ko": "소형 하이브리드 터렛 피해량 보너스", 
     "displayName_ru": "Увеличение урона от малых гибридных орудий", 
-    "displayName_zh": "Small Hybrid Turret Damage Bonus", 
+    "displayName_zh": "小型混合炮台伤害加成", 
     "displayNameID": 631462, 
     "itemModifiers": [], 
     "locationGroupModifiers": [], 
@@ -3425,7 +3425,7 @@
     "displayName_ja": "小型ハイブリッドタレット最適射程距離ボーナス", 
     "displayName_ko": "소형 하이브리드 터렛 최적사거리 보너스", 
     "displayName_ru": "Бонус к оптимальной дальности малых гибридных орудий", 
-    "displayName_zh": "Small Hybrid Turret Optimal Range Bonus", 
+    "displayName_zh": "小型混合炮台最佳射程加成", 
     "displayNameID": 631463, 
     "itemModifiers": [], 
     "locationGroupModifiers": [], 
@@ -3452,5 +3452,87 @@
     "locationRequiredSkillModifiers": [], 
     "operationName": "PostAssignment", 
     "showOutputValueInUI": "ShowNormal"
+  }, 
+  "2185": {
+    "aggregateMode": "Maximum", 
+    "developerDescription": "Tethering Restricted By Security", 
+    "displayName_de": "Anbindung ist blockiert", 
+    "displayName_en-us": "Tether blocked", 
+    "displayName_es": "Amarre bloqueado", 
+    "displayName_fr": "Accostage verrouillé", 
+    "displayName_it": "Tether blocked", 
+    "displayName_ja": "テザリングブロック中", 
+    "displayName_ko": "테더링 차단", 
+    "displayName_ru": "Швартовка недоступна", 
+    "displayName_zh": "驻留被阻止", 
+    "displayNameID": 639276, 
+    "itemModifiers": [
+      {
+        "dogmaAttributeID": 2343
+      }
+    ], 
+    "locationGroupModifiers": [], 
+    "locationModifiers": [], 
+    "locationRequiredSkillModifiers": [], 
+    "operationName": "ModAdd", 
+    "showOutputValueInUI": "Hide"
+  }, 
+  "2186": {
+    "aggregateMode": "Maximum", 
+    "developerDescription": "Proving AB/MWD Speed Increase", 
+    "displayName_de": "Bonus auf die Geschwindigkeitserhöhung von Nachbrenner-/Mikrowarpantrieb-Modulen", 
+    "displayName_en-us": "AB/MWD module speed increase bonus", 
+    "displayName_es": "Bonificación de aumento de velocidad de módulo de PQ/MMW", 
+    "displayName_fr": "Bonus à la vitesse des SPC/PMW", 
+    "displayName_it": "AB/MWD module speed increase bonus", 
+    "displayName_ja": "AB/MWDモジュールのスピード増加量ボーナス", 
+    "displayName_ko": "애프터버너/마이크로 워프 드라이브 최대 속도 증가", 
+    "displayName_ru": "Увеличение скорости форсажных и микроварп-ускорителей", 
+    "displayName_zh": "加力燃烧器/微型跃迁推进器速度增量加成", 
+    "displayNameID": 639612, 
+    "itemModifiers": [], 
+    "locationGroupModifiers": [], 
+    "locationModifiers": [], 
+    "locationRequiredSkillModifiers": [
+      {
+        "dogmaAttributeID": 20, 
+        "skillID": 3450
+      }, 
+      {
+        "dogmaAttributeID": 20, 
+        "skillID": 3454
+      }
+    ], 
+    "operationName": "PostPercent", 
+    "showOutputValueInUI": "ShowNormal"
+  }, 
+  "2187": {
+    "aggregateMode": "Minimum", 
+    "developerDescription": "Proving AB/MWD Cap Need Reduction", 
+    "displayName_de": "Bonus auf den Energiespeicherbedarf von Nachbrennern/Mikrowarpantrieben", 
+    "displayName_en-us": "AB/MWD capacitor consumption bonus", 
+    "displayName_es": "Bonificación de consumo del condensador de PQ/MMW", 
+    "displayName_fr": "Bonus à la consommation de capaciteur des SPC/PMW", 
+    "displayName_it": "AB/MWD capacitor consumption bonus", 
+    "displayName_ja": "AB/MWDのキャパシタ消費量ボーナス", 
+    "displayName_ko": "애프터버너/마이크로 워프 드라이브 캐패시터 사용량 감소", 
+    "displayName_ru": "Снижение расхода энергии форсажных и микроварп-ускорителей", 
+    "displayName_zh": "加力燃烧器/微型跃迁推进器电容消耗加成", 
+    "displayNameID": 639613, 
+    "itemModifiers": [], 
+    "locationGroupModifiers": [], 
+    "locationModifiers": [], 
+    "locationRequiredSkillModifiers": [
+      {
+        "dogmaAttributeID": 6, 
+        "skillID": 3450
+      }, 
+      {
+        "dogmaAttributeID": 6, 
+        "skillID": 3454
+      }
+    ], 
+    "operationName": "PostPercent", 
+    "showOutputValueInUI": "ShowNormal"
   }
 }

staticdata/phobos/metadata.0.json

@@ -1,10 +1,10 @@
 [
   {
     "field_name": "client_build", 
-    "field_value": 2149503
+    "field_value": 2214901
   }, 
   {
     "field_name": "dump_time", 
-    "field_value": 1667379783
+    "field_value": 1676373103
   }
 ]

version.yml

@@ -1 +1 @@
-version: v2.48.0dev3
+version: v2.50.0