Fix vargur damage bonus

I18n

CONTRIBUTING.md

@@ -2,7 +2,7 @@
 
 ## Requirements
 
-- Python 3.6
+- Python 3.7
 - Git CLI installed
 - Python, pip and git are all available as command-line commands (add to the path if needed)
 
@@ -41,13 +41,18 @@ Check that the libs from *requirements.txt* are installed
 pip list
 ```
 
+Build translations and database:
+```
+python scripts\compile_lang.py
+python db_update.py
+```
+
 Test that the project is starting properly
 ```
 python PyfaDEV\pyfa.py
 ```
 
 
-
 ## Setting up the project with PyCharm/IntelliJ
 
 Install PyCharm / Other IntelliJ product with Python plugin
@@ -99,4 +104,4 @@ python -m pytest
 py.test
 ```
 
-More information on tests can be found on appropriate [Wiki page](https://github.com/pyfa-org/Pyfa/wiki/Developers:-Writing-Tests-for-Pyfa).
+More information on tests can be found on appropriate [Wiki page](https://github.com/pyfa-org/Pyfa/wiki/Developers:-Writing-Tests-for-Pyfa).

eos/effects.py

@@ -639,6 +639,8 @@ class Effect157(BaseEffect):
 
     Used by:
     Implants named like: Zainou 'Deadeye' Large Hybrid Turret LH (6 of 6)
+    Implant: Festival-only 'Longbow' HD4 Dose
+    Implant: Festival-only 'Longbow' HD6 Dose
     Skill: Large Hybrid Turret
     """
 
@@ -657,6 +659,8 @@ class Effect159(BaseEffect):
 
     Used by:
     Implants named like: Inherent Implants 'Lancer' Medium Energy Turret ME (6 of 6)
+    Implant: Festival-only 'Longbow' ED3 Dose
+    Implant: Festival-only 'Longbow' ED6 Dose
     Skill: Medium Energy Turret
     """
 
@@ -675,6 +679,8 @@ class Effect160(BaseEffect):
 
     Used by:
     Implants named like: Zainou 'Deadeye' Medium Hybrid Turret MH (6 of 6)
+    Implant: Festival-only 'Longbow' HD3 Dose
+    Implant: Festival-only 'Longbow' HD6 Dose
     Skill: Medium Hybrid Turret
     """
 
@@ -693,6 +699,8 @@ class Effect161(BaseEffect):
 
     Used by:
     Implants named like: Eifyr and Co. 'Gunslinger' Medium Projectile Turret MP (6 of 6)
+    Implant: Festival-only 'Longbow' PD3 Dose
+    Implant: Festival-only 'Longbow' PD6 Dose
     Skill: Medium Projectile Turret
     """
 
@@ -711,6 +719,8 @@ class Effect162(BaseEffect):
 
     Used by:
     Implants named like: Inherent Implants 'Lancer' Large Energy Turret LE (6 of 6)
+    Implant: Festival-only 'Longbow' ED4 Dose
+    Implant: Festival-only 'Longbow' ED6 Dose
     Implant: Pashan's Turret Handling Mindlink
     Skill: Large Energy Turret
     """
@@ -730,6 +740,8 @@ class Effect172(BaseEffect):
 
     Used by:
     Implants named like: Inherent Implants 'Lancer' Small Energy Turret SE (6 of 6)
+    Implant: Festival-only 'Longbow' ED2 Dose
+    Implant: Festival-only 'Longbow' ED6 Dose
     Skill: Small Energy Turret
     """
 
@@ -748,6 +760,8 @@ class Effect173(BaseEffect):
 
     Used by:
     Implants named like: Zainou 'Deadeye' Small Hybrid Turret SH (6 of 6)
+    Implant: Festival-only 'Longbow' HD2 Dose
+    Implant: Festival-only 'Longbow' HD6 Dose
     Skill: Small Hybrid Turret
     """
 
@@ -766,6 +780,8 @@ class Effect174(BaseEffect):
 
     Used by:
     Implants named like: Eifyr and Co. 'Gunslinger' Small Projectile Turret SP (6 of 6)
+    Implant: Festival-only 'Longbow' PD2 Dose
+    Implant: Festival-only 'Longbow' PD6 Dose
     Skill: Small Projectile Turret
     """
 
@@ -851,6 +867,7 @@ class Effect230(BaseEffect):
 
     Used by:
     Implants named like: Eifyr and Co. 'Rogue' Afterburner AB (6 of 6)
+    Implants named like: Eifyr and Co. 'Rogue' Agility (2 of 2)
     Implant: Zor's Custom Navigation Link
     Skill: Afterburner
     """
@@ -885,6 +902,7 @@ class Effect242(BaseEffect):
 
     Used by:
     Implants named like: Eifyr and Co. 'Rogue' Acceleration Control AC (6 of 6)
+    Implants named like: Eifyr and Co. 'Rogue' Agility (2 of 2)
     """
 
     type = 'passive'
@@ -1084,6 +1102,7 @@ class Effect391(BaseEffect):
 
     Used by:
     Implants named like: Inherent Implants 'Highwall' Mining MX (3 of 3)
+    Implants named like: ORE 'Harvester' Efficiency (2 of 2)
     Implant: Michi's Excavation Augmentor
     Skill: Astrogeology
     Skill: Mining
@@ -1103,6 +1122,8 @@ class Effect392(BaseEffect):
     mechanicHullHpBonusPostPercentHpShip
 
     Used by:
+    Implants named like: Capsuleer Defense Augmentation Chip (3 of 3)
+    Implants named like: Festival only 'Rock' HH Dose (4 of 4)
     Implants named like: Inherent Implants 'Noble' Mechanic MC (6 of 6)
     Modules named like: Transverse Bulkhead (8 of 8)
     Skill: Mechanics
@@ -1193,6 +1214,7 @@ class Effect397(BaseEffect):
     Implants named like: Zainou 'Gypsy' CPU Management EE (6 of 6)
     Modules named like: Processor Overclocking Unit (8 of 8)
     Subsystems named like: Core Electronic Efficiency Gate (2 of 2)
+    Implant: Basic Capsuleer Engineering Augmentation Chip
     Implant: Genolution Core Augmentation CA-2
     Skill: CPU Management
     """
@@ -1211,6 +1233,8 @@ class Effect408(BaseEffect):
 
     Used by:
     Implants named like: Eifyr and Co. 'Gunslinger' Large Projectile Turret LP (6 of 6)
+    Implant: Festival-only 'Longbow' PD4 Dose
+    Implant: Festival-only 'Longbow' PD6 Dose
     Skill: Large Projectile Turret
     """
 
@@ -1247,6 +1271,8 @@ class Effect446(BaseEffect):
     shieldManagementShieldCapacityBonusPostPercentCapacityLocationShipGroupShield
 
     Used by:
+    Implants named like: Capsuleer Defense Augmentation Chip (3 of 3)
+    Implants named like: Festival only 'Rock' SH Dose (4 of 4)
     Implants named like: Zainou 'Gnome' Shield Management SM (6 of 6)
     Modules named like: Core Defense Field Extender (8 of 8)
     Implant: Genolution Core Augmentation CA-3
@@ -1264,11 +1290,13 @@ class Effect446(BaseEffect):
 
 class Effect485(BaseEffect):
     """
-    energysystemsoperationCapRechargeBonusPostPercentRechargeRateLocationShipGroupCapacitor
+    capacitorRechargeTimeBonusPostPercentPassive
 
     Used by:
     Implants named like: Inherent Implants 'Squire' Capacitor Systems Operation EO (6 of 6)
+    Implants named like: grade Rapture (15 of 18)
     Modules named like: Capacitor Control Circuit (8 of 8)
+    Implant: Basic Capsuleer Engineering Augmentation Chip
     Implant: Genolution Core Augmentation CA-2
     Skill: Capacitor Systems Operation
     """
@@ -1308,6 +1336,7 @@ class Effect490(BaseEffect):
     Implants named like: Inherent Implants 'Squire' Power Grid Management EG (6 of 6)
     Modules named like: Ancillary Current Router (8 of 8)
     Subsystems named like: Core Augmented Reactor (4 of 4)
+    Implant: Basic Capsuleer Engineering Augmentation Chip
     Implant: Genolution Core Augmentation CA-1
     Skill: Power Grid Management
     """
@@ -1784,7 +1813,7 @@ class Effect596(BaseEffect):
     ammoInfluenceRange
 
     Used by:
-    Items from category: Charge (608 of 974)
+    Items from category: Charge (608 of 978)
     """
 
     type = 'passive'
@@ -1799,7 +1828,7 @@ class Effect598(BaseEffect):
     ammoSpeedMultiplier
 
     Used by:
-    Charges from group: Festival Charges (29 of 29)
+    Charges from group: Festival Charges (33 of 33)
     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)
@@ -1880,7 +1909,7 @@ class Effect604(BaseEffect):
     shipPTspeedBonusMB2
 
     Used by:
-    Variations of ship: Tempest (4 of 4)
+    Variations of ship: Tempest (3 of 4)
     Ship: Maelstrom
     Ship: Marshal
     Ship: Panther
@@ -2372,7 +2401,7 @@ class Effect804(BaseEffect):
     ammoInfluenceCapNeed
 
     Used by:
-    Items from category: Charge (514 of 974)
+    Items from category: Charge (514 of 978)
     """
 
     type = 'passive'
@@ -2440,6 +2469,7 @@ class Effect856(BaseEffect):
     warpSkillSpeed
 
     Used by:
+    Implants named like: Eifyr and Co. 'Rogue' Agility (2 of 2)
     Implants named like: Eifyr and Co. 'Rogue' Warp Drive Speed WS (6 of 6)
     Implants named like: grade Ascendancy (10 of 12)
     Modules named like: Hyperspatial Velocity Optimizer (8 of 8)
@@ -3757,6 +3787,7 @@ class Effect1190(BaseEffect):
 
     Used by:
     Implants named like: Inherent Implants 'Yeti' Ice Harvesting IH (3 of 3)
+    Implants named like: ORE 'Harvester' Efficiency (2 of 2)
     Module: Medium Ice Harvester Accelerator I
     Skill: Ice Harvesting
     """
@@ -4266,6 +4297,7 @@ class Effect1409(BaseEffect):
 
     Used by:
     Implants named like: Poteque 'Prospector' Astrometric Acquisition AQ (3 of 3)
+    Implants named like: Poteque 'Prospector' Sharpeye (2 of 2)
     Skill: Astrometric Acquisition
     Skill: Astrometrics
     """
@@ -5248,7 +5280,7 @@ class Effect1730(BaseEffect):
     droneDmgBonus
 
     Used by:
-    Skills from group: Drones (8 of 26)
+    Skills from group: Drones (8 of 27)
     """
 
     type = 'passive'
@@ -6984,6 +7016,7 @@ class Effect2432(BaseEffect):
     Implants named like: Mindflood Booster (4 of 4)
     Modules named like: Semiconductor Memory Cell (8 of 8)
     Implant: Antipharmakon Aeolis
+    Implant: Basic Capsuleer Engineering Augmentation Chip
     Implant: Genolution Core Augmentation CA-1
     Skill: Capacitor Management
     """
@@ -7088,6 +7121,8 @@ class Effect2485(BaseEffect):
     implantArmorHpBonus2
 
     Used by:
+    Implants named like: Capsuleer Defense Augmentation Chip (3 of 3)
+    Implants named like: Festival only 'Rock' AH Dose (4 of 4)
     Implants named like: Inherent Implants 'Noble' Hull Upgrades HG (7 of 7)
     Implant: Genolution Core Augmentation CA-4
     Implant: Imperial Navy Modified 'Noble' Implant
@@ -7818,7 +7853,8 @@ class Effect2734(BaseEffect):
     shipECMScanStrengthBonusCF
 
     Used by:
-    Variations of ship: Griffin (3 of 3)
+    Ship: Griffin
+    Ship: Kitsune
     """
 
     type = 'passive'
@@ -7837,10 +7873,7 @@ class Effect2735(BaseEffect):
     boosterArmorHpPenalty
 
     Used by:
-    Implants named like: Crash Booster (3 of 4)
-    Implants named like: Exile Booster (3 of 4)
-    Implants named like: Frentix Booster (3 of 4)
-    Implants named like: X Instinct Booster (3 of 4)
+    Implants named like: Booster (12 of 40)
     """
 
     attr = 'boosterArmorHPPenalty'
@@ -8690,6 +8723,8 @@ class Effect2881(BaseEffect):
 
     Used by:
     Implants named like: Zainou 'Snapshot' Cruise Missiles CM (6 of 6)
+    Implant: Festival-only 'Longbow' CM3 Dose
+    Implant: Festival-only 'Longbow' MD6 Dose
     """
 
     type = 'passive'
@@ -8706,6 +8741,8 @@ class Effect2882(BaseEffect):
 
     Used by:
     Implants named like: Zainou 'Snapshot' Cruise Missiles CM (6 of 6)
+    Implant: Festival-only 'Longbow' CM3 Dose
+    Implant: Festival-only 'Longbow' MD6 Dose
     """
 
     type = 'passive'
@@ -8722,6 +8759,8 @@ class Effect2883(BaseEffect):
 
     Used by:
     Implants named like: Zainou 'Snapshot' Cruise Missiles CM (6 of 6)
+    Implant: Festival-only 'Longbow' CM3 Dose
+    Implant: Festival-only 'Longbow' MD6 Dose
     """
 
     type = 'passive'
@@ -8738,6 +8777,8 @@ class Effect2884(BaseEffect):
 
     Used by:
     Implants named like: Zainou 'Snapshot' Cruise Missiles CM (6 of 6)
+    Implant: Festival-only 'Longbow' CM3 Dose
+    Implant: Festival-only 'Longbow' MD6 Dose
     """
 
     type = 'passive'
@@ -8754,6 +8795,7 @@ class Effect2885(BaseEffect):
 
     Used by:
     Implants named like: Eifyr and Co. 'Alchemist' Gas Harvesting GH (3 of 3)
+    Implants named like: ORE 'Harvester' Efficiency (2 of 2)
     """
 
     type = 'passive'
@@ -8770,6 +8812,8 @@ class Effect2887(BaseEffect):
 
     Used by:
     Implants named like: Zainou 'Snapshot' Rockets RD (6 of 6)
+    Implant: Festival-only 'Longbow' MD6 Dose
+    Implant: Festival-only 'Longbow' RD2 Dose
     """
 
     type = 'passive'
@@ -8786,6 +8830,8 @@ class Effect2888(BaseEffect):
 
     Used by:
     Implants named like: Zainou 'Snapshot' Rockets RD (6 of 6)
+    Implant: Festival-only 'Longbow' MD6 Dose
+    Implant: Festival-only 'Longbow' RD2 Dose
     """
 
     type = 'passive'
@@ -8802,6 +8848,8 @@ class Effect2889(BaseEffect):
 
     Used by:
     Implants named like: Zainou 'Snapshot' Rockets RD (6 of 6)
+    Implant: Festival-only 'Longbow' MD6 Dose
+    Implant: Festival-only 'Longbow' RD2 Dose
     """
 
     type = 'passive'
@@ -8818,6 +8866,8 @@ class Effect2890(BaseEffect):
 
     Used by:
     Implants named like: Zainou 'Snapshot' Rockets RD (6 of 6)
+    Implant: Festival-only 'Longbow' MD6 Dose
+    Implant: Festival-only 'Longbow' RD2 Dose
     """
 
     type = 'passive'
@@ -8833,6 +8883,7 @@ class Effect2891(BaseEffect):
     missileEMDmgBonusStandard
 
     Used by:
+    Implants named like: Festival only 'Longbow' MD Dose (2 of 2)
     Implants named like: Zainou 'Snapshot' Light Missiles LM (6 of 6)
     """
 
@@ -8849,6 +8900,7 @@ class Effect2892(BaseEffect):
     missileExplosiveDmgBonusStandard
 
     Used by:
+    Implants named like: Festival only 'Longbow' MD Dose (2 of 2)
     Implants named like: Zainou 'Snapshot' Light Missiles LM (6 of 6)
     """
 
@@ -8865,6 +8917,7 @@ class Effect2893(BaseEffect):
     missileKineticDmgBonusStandard
 
     Used by:
+    Implants named like: Festival only 'Longbow' MD Dose (2 of 2)
     Implants named like: Zainou 'Snapshot' Light Missiles LM (6 of 6)
     """
 
@@ -8881,6 +8934,7 @@ class Effect2894(BaseEffect):
     missileThermalDmgBonusStandard
 
     Used by:
+    Implants named like: Festival only 'Longbow' MD Dose (2 of 2)
     Implants named like: Zainou 'Snapshot' Light Missiles LM (6 of 6)
     """
 
@@ -8898,6 +8952,8 @@ class Effect2899(BaseEffect):
 
     Used by:
     Implants named like: Zainou 'Snapshot' Heavy Missiles HM (6 of 6)
+    Implant: Festival-only 'Longbow' HM4 Dose
+    Implant: Festival-only 'Longbow' MD6 Dose
     """
 
     type = 'passive'
@@ -8914,6 +8970,8 @@ class Effect2900(BaseEffect):
 
     Used by:
     Implants named like: Zainou 'Snapshot' Heavy Missiles HM (6 of 6)
+    Implant: Festival-only 'Longbow' HM4 Dose
+    Implant: Festival-only 'Longbow' MD6 Dose
     """
 
     type = 'passive'
@@ -8930,6 +8988,8 @@ class Effect2901(BaseEffect):
 
     Used by:
     Implants named like: Zainou 'Snapshot' Heavy Missiles HM (6 of 6)
+    Implant: Festival-only 'Longbow' HM4 Dose
+    Implant: Festival-only 'Longbow' MD6 Dose
     """
 
     type = 'passive'
@@ -8946,6 +9006,8 @@ class Effect2902(BaseEffect):
 
     Used by:
     Implants named like: Zainou 'Snapshot' Heavy Missiles HM (6 of 6)
+    Implant: Festival-only 'Longbow' HM4 Dose
+    Implant: Festival-only 'Longbow' MD6 Dose
     """
 
     type = 'passive'
@@ -8962,6 +9024,8 @@ class Effect2903(BaseEffect):
 
     Used by:
     Implants named like: Zainou 'Snapshot' Heavy Assault Missiles AM (6 of 6)
+    Implant: Festival-only 'Longbow' HAM4 Dose
+    Implant: Festival-only 'Longbow' MD6 Dose
     """
 
     type = 'passive'
@@ -8978,6 +9042,8 @@ class Effect2904(BaseEffect):
 
     Used by:
     Implants named like: Zainou 'Snapshot' Heavy Assault Missiles AM (6 of 6)
+    Implant: Festival-only 'Longbow' HAM4 Dose
+    Implant: Festival-only 'Longbow' MD6 Dose
     """
 
     type = 'passive'
@@ -8994,6 +9060,8 @@ class Effect2905(BaseEffect):
 
     Used by:
     Implants named like: Zainou 'Snapshot' Heavy Assault Missiles AM (6 of 6)
+    Implant: Festival-only 'Longbow' HAM4 Dose
+    Implant: Festival-only 'Longbow' MD6 Dose
     """
 
     type = 'passive'
@@ -9010,6 +9078,8 @@ class Effect2906(BaseEffect):
 
     Used by:
     Implants named like: Zainou 'Snapshot' Heavy Assault Missiles AM (6 of 6)
+    Implant: Festival-only 'Longbow' HAM4 Dose
+    Implant: Festival-only 'Longbow' MD6 Dose
     """
 
     type = 'passive'
@@ -9026,6 +9096,8 @@ class Effect2907(BaseEffect):
 
     Used by:
     Implants named like: Zainou 'Snapshot' Torpedoes TD (6 of 6)
+    Implant: Festival-only 'Longbow' MD6 Dose
+    Implant: Festival-only 'Longbow' TP3 Dose
     """
 
     type = 'passive'
@@ -9042,6 +9114,8 @@ class Effect2908(BaseEffect):
 
     Used by:
     Implants named like: Zainou 'Snapshot' Torpedoes TD (6 of 6)
+    Implant: Festival-only 'Longbow' MD6 Dose
+    Implant: Festival-only 'Longbow' TP3 Dose
     """
 
     type = 'passive'
@@ -9058,6 +9132,8 @@ class Effect2909(BaseEffect):
 
     Used by:
     Implants named like: Zainou 'Snapshot' Torpedoes TD (6 of 6)
+    Implant: Festival-only 'Longbow' MD6 Dose
+    Implant: Festival-only 'Longbow' TP3 Dose
     """
 
     type = 'passive'
@@ -9074,6 +9150,8 @@ class Effect2910(BaseEffect):
 
     Used by:
     Implants named like: Zainou 'Snapshot' Torpedoes TD (6 of 6)
+    Implant: Festival-only 'Longbow' MD6 Dose
+    Implant: Festival-only 'Longbow' TP3 Dose
     """
 
     type = 'passive'
@@ -12506,6 +12584,7 @@ class Effect3999(BaseEffect):
     Used by:
     Celestials named like: Class Pulsar Effects (6 of 6)
     Celestials named like: Incursion Effect (2 of 2)
+    Celestials named like: Volatile Ice Storm (2 of 2)
     Celestial: Strong Metaliminal Plasma Firestorm
     Celestial: Weak Metaliminal Plasma Firestorm
     """
@@ -13450,6 +13529,7 @@ class Effect4138(BaseEffect):
 
     Used by:
     Celestials named like: Class Wolf Rayet Effects (6 of 6)
+    Celestials named like: Volatile Ice Storm (2 of 2)
     Celestial: Strong Metaliminal Plasma Firestorm
     Celestial: Weak Metaliminal Plasma Firestorm
     """
@@ -13569,6 +13649,7 @@ class Effect4161(BaseEffect):
 
     Used by:
     Implants named like: Poteque 'Prospector' Astrometric Pinpointing AP (3 of 3)
+    Implants named like: Poteque 'Prospector' Sharpeye (2 of 2)
     Skill: Astrometric Pinpointing
     Skill: Astrometrics
     """
@@ -13590,6 +13671,7 @@ class Effect4162(BaseEffect):
     Used by:
     Modules from group: Scan Probe Launcher (4 of 7)
     Implants named like: Poteque 'Prospector' Astrometric Rangefinding AR (3 of 3)
+    Implants named like: Poteque 'Prospector' Sharpeye (2 of 2)
     Implants named like: grade Virtue (10 of 12)
     Modules named like: Gravity Capacitor Upgrade (8 of 8)
     Implant: Serenity YC122.9 Season Booster - Probe Scanning Strength
@@ -14624,28 +14706,11 @@ class Effect4396(BaseEffect):
                                         skill='Covert Ops', **kwargs)
 
 
-class Effect4397(BaseEffect):
-    """
-    shipBonusGFTorpedoExplosionVelocity
-
-    Used by:
-    Ship: Nemesis
-    """
-
-    type = 'passive'
-
-    @staticmethod
-    def handler(fit, ship, context, projectionRange, **kwargs):
-        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Torpedoes'),
-                                        'aoeVelocity', ship.getModifiedItemAttr('shipBonusGF'), skill='Gallente Frigate', **kwargs)
-
-
 class Effect4398(BaseEffect):
     """
     shipBonusMF1TorpedoExplosionVelocity
 
     Used by:
-    Ship: Hound
     Ship: Virtuoso
     """
 
@@ -14657,38 +14722,6 @@ class Effect4398(BaseEffect):
                                         'aoeVelocity', ship.getModifiedItemAttr('shipBonusMF'), skill='Minmatar Frigate', **kwargs)
 
 
-class Effect4399(BaseEffect):
-    """
-    shipBonusCF1TorpedoExplosionVelocity
-
-    Used by:
-    Ship: Manticore
-    """
-
-    type = 'passive'
-
-    @staticmethod
-    def handler(fit, ship, context, projectionRange, **kwargs):
-        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Torpedoes'),
-                                        'aoeVelocity', ship.getModifiedItemAttr('shipBonusCF'), skill='Caldari Frigate', **kwargs)
-
-
-class Effect4400(BaseEffect):
-    """
-    shipBonusAF1TorpedoExplosionVelocity
-
-    Used by:
-    Ship: Purifier
-    """
-
-    type = 'passive'
-
-    @staticmethod
-    def handler(fit, ship, context, projectionRange, **kwargs):
-        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Torpedoes'),
-                                        'aoeVelocity', ship.getModifiedItemAttr('shipBonusAF'), skill='Amarr Frigate', **kwargs)
-
-
 class Effect4413(BaseEffect):
     """
     shipBonusGF1TorpedoFlightTime
@@ -18154,9 +18187,9 @@ class Effect5168(BaseEffect):
 
     @staticmethod
     def handler(fit, container, context, projectionRange, **kwargs):
-        fit.drones.filteredItemIncrease(lambda drone: drone.item.requiresSkill('Salvage Drone Operation'),
-                                        'accessDifficultyBonus',
-                                        container.getModifiedItemAttr('accessDifficultyBonus') * container.level, **kwargs)
+        fit.drones.filteredItemIncrease(
+            lambda drone: drone.item.requiresSkill('Salvage Drone Operation'), 'accessDifficultyBonus',
+            container.getModifiedItemAttr('accessDifficultyBonus') * container.level, **kwargs)
 
 
 class Effect5180(BaseEffect):
@@ -26382,41 +26415,6 @@ class Effect6354(BaseEffect):
                                           src.getModifiedItemAttr('shipBonus2AF'), skill='Amarr Frigate', **kwargs)
 
 
-class Effect6355(BaseEffect):
-    """
-    roleBonusECMCapCPU
-
-    Used by:
-    Ship: Griffin Navy Issue
-    """
-
-    type = 'passive'
-
-    @staticmethod
-    def handler(fit, src, context, projectionRange, **kwargs):
-        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'ECM', 'capacitorNeed',
-                                      src.getModifiedItemAttr('roleBonus'), **kwargs)
-        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'ECM', 'cpu', src.getModifiedItemAttr('roleBonus'), **kwargs)
-
-
-class Effect6356(BaseEffect):
-    """
-    roleBonusECMRange
-
-    Used by:
-    Ship: Griffin Navy Issue
-    """
-
-    type = 'passive'
-
-    @staticmethod
-    def handler(fit, src, context, projectionRange, **kwargs):
-        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'ECM', 'falloffEffectiveness',
-                                      src.getModifiedItemAttr('roleBonus'), **kwargs)
-        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'ECM', 'maxRange',
-                                      src.getModifiedItemAttr('roleBonus'), **kwargs)
-
-
 class Effect6357(BaseEffect):
     """
     shipBonusJustScramblerRangeGF2
@@ -30299,14 +30297,15 @@ class Effect6658(BaseEffect):
     @staticmethod
     def handler(fit, src, context, projectionRange, **kwargs):
         # Resistances
-        for layer, attrPrefix in (('shield', 'shield'), ('armor', 'armor'), ('hull', '')):
-            for damageType in ('Kinetic', 'Thermal', 'Explosive', 'Em'):
-                bonus = '%s%sDamageResonance' % (attrPrefix, damageType)
-                bonus = '%s%s' % (bonus[0].lower(), bonus[1:])
-                booster = '%s%sDamageResonance' % (layer, damageType)
-                penalize = False if layer == 'hull' else True
-                fit.ship.multiplyItemAttr(bonus, src.getModifiedItemAttr(booster),
-                                          stackingPenalties=penalize, penaltyGroup='preMul', **kwargs)
+        # Expressions for resistances were removed, possibly due to mistake on CCP part
+        # for layer, attrPrefix in (('shield', 'shield'), ('armor', 'armor'), ('hull', '')):
+        #     for damageType in ('Kinetic', 'Thermal', 'Explosive', 'Em'):
+        #         bonus = '%s%sDamageResonance' % (attrPrefix, damageType)
+        #         bonus = '%s%s' % (bonus[0].lower(), bonus[1:])
+        #         booster = '%s%sDamageResonance' % (layer, damageType)
+        #         penalize = False if layer == 'hull' else True
+        #         fit.ship.multiplyItemAttr(bonus, src.getModifiedItemAttr(booster),
+        #                                   stackingPenalties=penalize, penaltyGroup='preMul', **kwargs)
 
         # Turrets
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Large Energy Turret') or
@@ -30318,13 +30317,22 @@ class Effect6658(BaseEffect):
                                                   mod.item.requiresSkill('Large Hybrid Turret') or
                                                   mod.item.requiresSkill('Large Projectile Turret'),
                                       'falloff', src.getModifiedItemAttr('falloffBonus'),
-                                      stackingPenalties=True, **kwargs)
+                                      stackingPenalties=True, penaltyGroup='postPerc', **kwargs)
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Large Energy Turret') or
+                                                  mod.item.requiresSkill('Large Hybrid Turret') or
+                                                  mod.item.requiresSkill('Large Projectile Turret'),
+                                      'speed', src.getModifiedItemAttr('siegeTurretDamageBonus'),
+                                      stackingPenalties=True, penaltyGroup='postPerc', **kwargs)
 
         # Missiles
         fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Torpedoes') or
                                                     mod.charge.requiresSkill('Cruise Missiles') or
                                                     mod.charge.requiresSkill('Heavy Missiles'),
                                         'maxVelocity', src.getModifiedItemAttr('missileVelocityBonus'), **kwargs)
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Cruise Missiles') or
+                                                  mod.item.requiresSkill('Torpedoes'),
+                                      'speed', src.getModifiedItemAttr('siegeTurretDamageBonus'),
+                                      stackingPenalties=True, **kwargs)
 
         # Tanking
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Repair Systems'),
@@ -30337,7 +30345,6 @@ class Effect6658(BaseEffect):
         # Speed penalty
         fit.ship.boostItemAttr('maxVelocity', src.getModifiedItemAttr('speedFactor'), **kwargs)
 
-        # @todo: test these for April 2016 release
         # Max locked targets
         fit.ship.forceItemAttr('maxLockedTargets', src.getModifiedItemAttr('maxLockedTargets'), **kwargs)
 
@@ -30350,6 +30357,7 @@ class Effect6658(BaseEffect):
         fit.ship.boostItemAttr('remoteRepairImpedance', src.getModifiedItemAttr('remoteRepairImpedanceBonus'), **kwargs)
         fit.ship.boostItemAttr('remoteAssistanceImpedance', src.getModifiedItemAttr('remoteAssistanceImpedanceBonus'), **kwargs)
         fit.ship.boostItemAttr('sensorDampenerResistance', src.getModifiedItemAttr('sensorDampenerResistanceBonus'), **kwargs)
+        # This one was removed from expressions, but somehow MJD is still blocked, so leaving it here
         fit.modules.filteredItemIncrease(lambda mod: mod.item.requiresSkill('Micro Jump Drive Operation'),
                                          'activationBlocked', src.getModifiedItemAttr('activationBlockedStrenght'), **kwargs)
         fit.ship.boostItemAttr('targetPainterResistance', src.getModifiedItemAttr('targetPainterResistanceBonus'), **kwargs)
@@ -36526,7 +36534,6 @@ class Effect8039(BaseEffect):
     upwellSkillaoeVelocityaoeCloudSizeBonus
 
     Used by:
-    Implants named like: EDENCOM Vorton Booster GU (3 of 3)
     Skill: Vorton Arc Guidance
     """
 
@@ -36760,22 +36767,6 @@ class Effect8062(BaseEffect):
         module.multiplyItemAttr('aoeVelocity', module.getModifiedChargeAttr('aoeVelocityBonus') or 0, **kwargs)
 
 
-class Effect8064(BaseEffect):
-    """
-    vortonProjectorOptimalRangeBonus
-
-    Used by:
-    Implants named like: EDENCOM Vorton Booster RA (3 of 3)
-    """
-
-    type = 'passive'
-
-    @staticmethod
-    def handler(fit, implant, context, projectionRange, **kwargs):
-        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Vorton Projector Operation'),
-                                      'maxRange', implant.getModifiedItemAttr('rangeSkillBonus'), **kwargs)
-
-
 class Effect8065(BaseEffect):
     """
     vortonProjectorSkillRangeBonus
@@ -36792,22 +36783,6 @@ class Effect8065(BaseEffect):
                                       'maxRange', skill.getModifiedItemAttr('rangeSkillBonus') * skill.level, **kwargs)
 
 
-class Effect8066(BaseEffect):
-    """
-    vortonProjectorDamageBonus
-
-    Used by:
-    Implants named like: EDENCOM Vorton Booster DA (3 of 3)
-    """
-
-    type = 'passive'
-
-    @staticmethod
-    def handler(fit, implant, context, projectionRange, **kwargs):
-        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Vorton Projector Operation'),
-                                      'damageMultiplier', implant.getModifiedItemAttr('damageMultiplierBonus'), **kwargs)
-
-
 class Effect8068(BaseEffect):
     """
     shipShieldResistanceBonusMBC1
@@ -36934,6 +36909,7 @@ class Effect8076(BaseEffect):
     systemHullThermalResistance
 
     Used by:
+    Celestials named like: Volatile Ice Storm (2 of 2)
     Celestial: Strong Metaliminal Plasma Firestorm
     Celestial: Weak Metaliminal Plasma Firestorm
     """
@@ -37236,3 +37212,134 @@ class Effect8098(BaseEffect):
     def handler(fit, ship, context, projectionRange, **kwargs):
         fit.ship.boostItemAttr('armorHP', ship.getModifiedItemAttr('shipBonusAD2'),
                                skill='Amarr Destroyer', **kwargs)
+
+
+class Effect8100(BaseEffect):
+    """
+    shipBonusECMJamDroneDurationCF
+
+    Used by:
+    Ship: Griffin Navy Issue
+    """
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context, projectionRange, **kwargs):
+        fit.drones.filteredItemBoost(
+            lambda drone: drone.item.requiresSkill('Drones'),
+            'ecmJamDuration', ship.getModifiedItemAttr('shipBonusCF'),
+            skill='Caldari Frigate', **kwargs)
+
+
+class Effect8101(BaseEffect):
+    """
+    roleBonusDroneDamage
+
+    Used by:
+    Ship: Griffin Navy Issue
+    """
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context, projectionRange, **kwargs):
+        for dmgType in ('em', 'kinetic', 'explosive', 'thermal'):
+            fit.drones.filteredItemBoost(
+                lambda drone: drone.item.requiresSkill('Drones'),
+                f'{dmgType}Damage', ship.getModifiedItemAttr('roleBonus'), **kwargs)
+
+
+class Effect8102(BaseEffect):
+    """
+    shipBonusRole1DroneHitpointsDroneControlRange
+
+    Used by:
+    Ship: Griffin Navy Issue
+    """
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context, projectionRange, **kwargs):
+        fit.extraAttributes.boost(
+            'droneControlRange', ship.getModifiedItemAttr('shipBonusRole1'), **kwargs)
+        for attr in ('shieldCapacity', 'armorHP', 'hp'):
+            fit.drones.filteredItemBoost(
+                lambda drone: drone.item.requiresSkill('Drones'),
+                attr, ship.getModifiedItemAttr('shipBonusRole1'), **kwargs)
+
+
+class Effect8099(BaseEffect):
+    """
+    systemHeatDamageBonus
+
+    Used by:
+    Celestials named like: Metaliminal Yoiul Festival YC 122 Storm (4 of 4)
+    Celestials named like: Volatile Ice Storm (2 of 2)
+    """
+
+    runTime = 'early'
+    type = ('projected', 'passive')
+
+    @staticmethod
+    def handler(fit, source, context, projectionRange, **kwargs):
+        fit.modules.filteredItemBoost(
+            lambda mod: 'heatDamage' in mod.itemModifiedAttributes,
+            'heatDamage', source.getModifiedItemAttr('thermodynamicsHeatDamage'), **kwargs)
+
+
+class Effect8103(BaseEffect):
+    """
+    setBonusRapture
+
+    Used by:
+    Implants named like: grade Rapture (18 of 18)
+    """
+
+    runTime = 'early'
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context, projectionRange, **kwargs):
+        fit.appliedImplants.filteredItemMultiply(
+            lambda mod: mod.item.requiresSkill('Cybernetics'),
+            'capRechargeBonus', src.getModifiedItemAttr('ImplantSetRapture'), **kwargs)
+
+
+class Effect8104(BaseEffect):
+    """
+    salvageDroneSpecBonus
+
+    Used by:
+    Skill: Salvage Drone Specialization
+    """
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context, projectionRange, **kwargs):
+        lvl = src.level
+        fit.drones.filteredItemBoost(
+            lambda mod: mod.item.requiresSkill('Salvage Drone Specialization'),
+            'accessDifficultyBonus', src.getModifiedItemAttr('accessDifficultyBonus') * lvl, **kwargs)
+        fit.drones.filteredItemBoost(
+            lambda mod: mod.item.requiresSkill('Salvage Drone Specialization'),
+            'maxVelocity', src.getModifiedItemAttr('maxVelocityBonus') * lvl, **kwargs)
+
+
+class Effect8106(BaseEffect):
+    """
+    shipPTdamageBonusMB2
+
+    Used by:
+    Ship: Vargur
+    """
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context, projectionRange, **kwargs):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Large Projectile Turret'),
+                                      'damageMultiplier', ship.getModifiedItemAttr('shipBonusMB2'),
+                                      skill='Minmatar Battleship', **kwargs)

eos/gamedata.py

@@ -19,7 +19,7 @@
 
 
 import json
-from collections import OrderedDict
+import re
 
 from logbook import Logger
 from sqlalchemy.orm import reconstructor
@@ -33,6 +33,10 @@ from .eqBase import EqBase
 pyfalog = Logger(__name__)
 
 
+def _t(x):
+    return x
+
+
 class Effect(EqBase):
     """
     The effect handling class, it is used to proxy and load effect handler code,
@@ -245,6 +249,10 @@ class Item(EqBase):
                 pass
         return shortName
 
+    @property
+    def customName(self):
+        return re.sub(_t('Caustic'), _t('Tachyon'), self.name)
+
     @property
     def attributes(self):
         return self.__attributes

eos/saveddata/damagePattern.py

@@ -146,6 +146,9 @@ BUILTINS = OrderedDict([
     (-94, (_c(_t('NPC')) + _c(_t('Invasion')) + _c(_t('Gallente EDENCOM Entities')) + _t('Dread/Subcaps'), 0, 417, 583, 0)),
     (-95, (_c(_t('NPC')) + _c(_t('Invasion')) + _c(_t('Minmatar EDENCOM Entities')) + _t('Dread'), 0, 0, 583, 417)),
     (-96, (_c(_t('NPC')) + _c(_t('Invasion')) + _c(_t('Minmatar EDENCOM Entities')) + _t('Subcaps'), 302, 136, 328, 234)),
+    (-110, (_c(_t('NPC')) + _c(_t('Invasion')) + _t('Drifter Entities'), 250, 250, 250, 250)),
+    (-112, (_c(_t('NPC')) + _c(_t('Invasion')) + _t('Sleeper Entities'), 265, 265, 235, 235)),
+    (-111, (_c(_t('NPC')) + _c(_t('Invasion')) + _t('Rogue Drone Entities'), 250, 250, 250, 250)),
     (-97, (_c(_t('NPC')) + _c(_t('Mission')) + _t('Amarr Empire'), 4464, 3546, 97, 0)),
     (-98, (_c(_t('NPC')) + _c(_t('Mission')) + _t('Caldari State'), 0, 2139, 4867, 0)),
     (-99, (_c(_t('NPC')) + _c(_t('Mission')) + _t('CONCORD'), 336, 134, 212, 412)),

eos/saveddata/fit.py

@@ -682,8 +682,8 @@ class Fit:
                                                    "duration", value, stackingPenalties=True)
 
                 if warfareBuffID == 25:  # Mining Burst: Mining Equipment Preservation: Crystal Volatility
-                    self.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Mining"),
-                                                   "crystalVolatilityChance", value, stackingPenalties=True)
+                    self.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Mining"),
+                                                     "crystalVolatilityChance", value, stackingPenalties=True)
 
                 if warfareBuffID == 26:  # Information Burst: Sensor Optimization: Targeting Range
                     self.ship.boostItemAttr("maxTargetRange", value, stackingPenalties=True)

eos/saveddata/targetProfile.py

@@ -226,7 +226,10 @@ BUILTINS = OrderedDict([
     (-183, (_c(_t('NPC')) + _c(_t('Abyssal')) + _c(_t('Gamma T3 (Some T5 Rooms)')) + _t('Angel'), 0.59, 0.528, 0.477, 0.197)),
     (-184, (_c(_t('NPC')) + _c(_t('Abyssal')) + _c(_t('Gamma T4/T5/T6')) + _t('Concord'), 0.324, 0.318, 0.369, 0.086)),
     (-185, (_c(_t('NPC')) + _c(_t('Abyssal')) + _c(_t('Gamma T4/T5/T6')) + _t('Sansha'), 0.137, 0.355, 0.352, 0)),
-    (-186, (_c(_t('NPC')) + _c(_t('Abyssal')) + _c(_t('Gamma T4/T5/T6')) + _t('Angel'), 0.59, 0.528, 0.477, 0.126))])
+    (-186, (_c(_t('NPC')) + _c(_t('Abyssal')) + _c(_t('Gamma T4/T5/T6')) + _t('Angel'), 0.59, 0.528, 0.477, 0.126)),
+    (-187, (_c(_t('NPC')) + _c(_t('Invasion')) + _t('Drifter Entities'), 0.128, 0.375, 0.383, 0.383)),
+    (-188, (_c(_t('NPC')) + _c(_t('Invasion')) + _t('Rogue Drone Entities'), 0.104, 0.147, 0.147, 0.102)),
+    (-189, (_c(_t('NPC')) + _c(_t('Invasion')) + _t('Sleeper Entities'), 0.563, 0.563, 0.563, 0.563))])
 
 
 class TargetProfile:

graphs/data/fitWarpTime/getter.py

@@ -55,7 +55,7 @@ def calculate_time_in_warp(max_warp_speed, max_subwarp_speed, warp_dist):
     k_accel = max_warp_speed
     k_decel = min(max_warp_speed / 3, 2)
 
-    warp_dropout_speed = max_subwarp_speed / 2
+    warp_dropout_speed = min(max_subwarp_speed / 2, 100)
     max_ms_warp_speed = max_warp_speed * AU_METERS
 
     accel_dist = AU_METERS

gui/builtinContextMenus/envEffectAdd.py

@@ -206,16 +206,16 @@ class AddEnvironmentEffect(ContextMenuUnconditional):
             for beacon in sMkt.getGroup("Abyssal Hazards").items:
                 if not beacon.isType('projected'):
                     continue
-                groups = (_t('Bioluminescence'), _t('Caustic'), _t('Filament'))
+                groups = (_t('Bioluminescence'), _t('Tachyon'), _t('Filament'))
                 for group in groups:
-                    if re.search(group, beacon.name):
+                    if re.search(group, beacon.customName):
                         key = group
                         break
                 else:
                     continue
 
                 subsubdata = subdata.groups.setdefault(key, Group())
-                subsubdata.items.append(Entry(beacon.ID, beacon.name, beacon.name))
+                subsubdata.items.append(Entry(beacon.ID, beacon.customName, beacon.customName))
             subdata.sort()
 
         # PVP weather

gui/builtinStatsViews/targetingMiscViewMinimal.py

@@ -215,7 +215,7 @@ class TargetingMiscViewMinimal(StatsView):
                         ecmChance = otherValues["jamChance"]
                         ecmChance = round(ecmChance, 1)
                         if ecmChance > 0:
-                            label.SetToolTip(wx.ToolTip(_t("Type: {0}\n").foramt(_t(fit.scanType)) +
+                            label.SetToolTip(wx.ToolTip(_t("Type: {0}\n").format(_t(fit.scanType)) +
                                                         # xgettext:no-python-format,python-brace-format
                                                         _t("{}% chance to be jammed").format(formatAmount(ecmChance, 3, 0, 0))))
                         else:

gui/builtinViewColumns/baseName.py

@@ -107,17 +107,17 @@ class BaseName(ViewColumn):
         elif isinstance(stuff, Module):
             if self.projectedView:
                 # check for projected abyssal name
-                name_check = stuff.item.name[0:-2]
+                name_check = stuff.item.customName[0:-2]
                 type = AddEnvironmentEffect.abyssal_mapping.get(name_check, None)
                 if type:
                     sMkt = Market.getInstance()
                     type = sMkt.getItem(type)
-                    return "{} {}".format(type.name, stuff.item.name[-1:])
+                    return "{} {}".format(type.name, stuff.item.customName[-1:])
 
             if stuff.isEmpty:
                 return "%s Slot" % FittingSlot(stuff.slot).name.capitalize()
             else:
-                return stuff.item.name
+                return stuff.item.customName
         elif isinstance(stuff, Implant):
             return stuff.item.name
         elif isinstance(stuff, TargetProfile):

gui/builtinViewColumns/misc.py

@@ -466,11 +466,11 @@ class Miscellanea(ViewColumn):
             return text, tooltip
         elif itemGroup == "Electronic Warfare Drone":
             sigRadBonus = stuff.getModifiedItemAttr("signatureRadiusBonus")
-            lockRangeMult = stuff.getModifiedItemAttr("maxTargetRangeMultiplier")
-            scanResMult = stuff.getModifiedItemAttr("scanResolutionMultiplier")
-            falloffRangeMult = stuff.getModifiedItemAttr("fallofMultiplier")
-            optimalRangeMult = stuff.getModifiedItemAttr("maxRangeMultiplier")
-            trackingSpeedMult = stuff.getModifiedItemAttr("trackingSpeedMultiplier")
+            lockRangeBonus = stuff.getModifiedItemAttr("maxTargetRangeBonus")
+            scanResBonus = stuff.getModifiedItemAttr("scanResolutionBonus")
+            falloffRangeBonus = stuff.getModifiedItemAttr("falloffBonus")
+            optimalRangeBonus = stuff.getModifiedItemAttr("maxRangeBonus")
+            trackingSpeedBonus = stuff.getModifiedItemAttr("trackingSpeedBonus")
             grav = stuff.getModifiedItemAttr("scanGravimetricStrengthBonus")
             ladar = stuff.getModifiedItemAttr("scanLadarStrengthBonus")
             radar = stuff.getModifiedItemAttr("scanRadarStrengthBonus")
@@ -479,9 +479,7 @@ class Miscellanea(ViewColumn):
                 text = "{0}%".format(formatAmount(sigRadBonus, 3, 0, 3, forceSign=True))
                 tooltip = "Signature radius increase"
                 return text, tooltip
-            if lockRangeMult is not None and scanResMult is not None:
-                lockRangeBonus = (lockRangeMult - 1) * 100
-                scanResBonus = (scanResMult - 1) * 100
+            if lockRangeBonus or scanResBonus:
                 display = 0
                 for bonus in (lockRangeBonus, scanResBonus):
                     if abs(bonus) > abs(display):
@@ -496,10 +494,7 @@ class Miscellanea(ViewColumn):
                     ttEntries.append("scan resolution")
                 tooltip = "{0} dampening".format(formatList(ttEntries)).capitalize()
                 return text, tooltip
-            if falloffRangeMult is not None and optimalRangeMult is not None and trackingSpeedMult is not None:
-                falloffRangeBonus = (falloffRangeMult - 1) * 100
-                optimalRangeBonus = (optimalRangeMult - 1) * 100
-                trackingSpeedBonus = (trackingSpeedMult - 1) * 100
+            if falloffRangeBonus or optimalRangeBonus or trackingSpeedBonus:
                 display = 0
                 for bonus in (falloffRangeBonus, optimalRangeBonus, trackingSpeedBonus):
                     if abs(bonus) > abs(display):

gui/errorDialog.py

@@ -70,7 +70,13 @@ class ErrorFrame(AuxiliaryFrame):
 
         from eos.config import gamedata_version, gamedata_date
 
-        time = datetime.datetime.fromtimestamp(int(gamedata_date)).strftime('%Y-%m-%d %H:%M:%S')
+        if gamedata_date:
+            try:
+                time = datetime.datetime.fromtimestamp(int(gamedata_date)).strftime('%Y-%m-%d %H:%M:%S')
+            except TypeError:
+                time = None
+        else:
+            time = None
         version = "pyfa " + config.getVersion() + '\nEVE Data Version: {} ({})\n\n'.format(gamedata_version, time)  # gui.aboutData.versionString
 
         desc = _t("pyfa has experienced an unexpected issue. Below is a message that contains crucial \n"

locale/fr_FR/LC_MESSAGES/lang.po

@@ -3,7 +3,7 @@ msgstr ""
 "Project-Id-Version: pyfa\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2020-07-27 15:29+0800\n"
-"PO-Revision-Date: 2020-08-02 17:09\n"
+"PO-Revision-Date: 2020-12-08 14:13\n"
 "Last-Translator: \n"
 "Language-Team: French\n"
 "Language: fr_FR\n"
@@ -19,155 +19,156 @@ msgstr ""
 
 #: gui/builtinStatsViews/firepowerViewFull.py:107
 msgid " DPS: "
-msgstr ""
+msgstr " DPS : "
 
 #: gui/builtinContextMenus/itemRemove.py:44
 msgid " Stack"
-msgstr ""
+msgstr " Empiler"
 
 #: gui/builtinStatsViews/firepowerViewFull.py:100
 msgid " Volley: "
-msgstr ""
+msgstr " Frappe \n"
+"Alpha: "
 
 #: gui/builtinItemStatsViews/itemProperties.py:98
 #, python-format
 msgid "%d attribute."
 msgid_plural "%d attributes."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%d attribut."
+msgstr[1] "%d attributs."
 
 #: gui/mainMenuBar.py:73
 msgid "&Backup All Fittings"
-msgstr ""
+msgstr "&Sauvegarder toutes les configurations"
 
 #: gui/mainMenuBar.py:104
 msgid "&Browse ESI Fittings"
-msgstr ""
+msgstr "&Parcourir les configurations ESI"
 
 #: gui/mainMenuBar.py:111
 msgid "&Character"
-msgstr ""
+msgstr "&Personnage"
 
 #: gui/mainMenuBar.py:144
 msgid "&Character Editor"
-msgstr ""
+msgstr "&Editeur de Personnage"
 
 #: gui/mainMenuBar.py:70
 msgid "&Close All Tabs"
-msgstr ""
+msgstr "Fermer tout les onglets"
 
 #: gui/mainMenuBar.py:69
 msgid "&Close Tab"
-msgstr ""
+msgstr "Fermer l'onglet"
 
 #: gui/mainMenuBar.py:150
 msgid "&Damage Pattern Editor"
-msgstr ""
+msgstr "&Éditeur de modèles de dégâts"
 
 #: gui/mainMenuBar.py:143
 msgid "&Editors"
-msgstr ""
+msgstr "Éditeurs"
 
 #: gui/mainMenuBar.py:92
 msgid "&Export Fitting"
-msgstr ""
+msgstr "&Exporter la configuration"
 
 #: gui/mainMenuBar.py:119
 msgid "&Export Skills Needed"
-msgstr ""
+msgstr "&Exporter les compétences requises"
 
 #: gui/mainMenuBar.py:66 gui/propertyEditor.py:42
 msgid "&File"
-msgstr ""
+msgstr "&Fichier"
 
 #: gui/mainMenuBar.py:161
 msgid "&Forums"
-msgstr ""
+msgstr "&Forums"
 
 #: gui/mainMenuBar.py:88
 msgid "&From Clipboard"
-msgstr ""
+msgstr "Depuis le presse-papiers"
 
 #: gui/mainMenuBar.py:135
 msgid "&Global"
-msgstr ""
+msgstr "Général"
 
 #: gui/mainMenuBar.py:96
 msgid "&Graphs"
-msgstr ""
+msgstr "&Graphiques"
 
 #: gui/mainMenuBar.py:159
 msgid "&Help"
-msgstr ""
+msgstr "&Aide"
 
 #: gui/mainMenuBar.py:147
 msgid "&Implant Set Editor"
-msgstr ""
+msgstr "&Éditeur de groupe d'implants"
 
 #: gui/mainMenuBar.py:118
 msgid "&Import Character File"
-msgstr ""
+msgstr "&Importer un fichier de personnage"
 
 #: gui/mainMenuBar.py:91
 msgid "&Import Fittings"
-msgstr ""
+msgstr "&Importer des configurations"
 
 #: gui/mainMenuBar.py:122
 msgid "&Manage ESI Characters"
-msgstr ""
+msgstr "&Gérer les personnages ESI"
 
 #: gui/mainMenuBar.py:68
 msgid "&New Tab"
-msgstr ""
+msgstr "&Nouvel onglet"
 
 #: gui/mainMenuBar.py:95
 msgid "&Optimize Fit Price"
-msgstr ""
+msgstr "&Optimiser le prix de la configuration"
 
 #: gui/mainMenuBar.py:137
 msgid "&Preferences"
-msgstr ""
+msgstr "&Préférences"
 
 #: gui/mainMenuBar.py:84
 msgid "&Redo"
-msgstr ""
+msgstr "&Répéter"
 
 #: gui/mainMenuBar.py:115
 msgid "&Revert Character"
-msgstr ""
+msgstr "&Rétablir le personnage"
 
 #: gui/mainMenuBar.py:113
 msgid "&Save Character"
-msgstr ""
+msgstr "&Enregistrer le personnage"
 
 #: gui/mainMenuBar.py:153
 msgid "&Target Profile Editor"
-msgstr ""
+msgstr "Éditeur de profil de cible"
 
 #: gui/mainMenuBar.py:87
 msgid "&To Clipboard"
-msgstr ""
+msgstr "Ajouter au presse-papier"
 
 #: gui/mainFrame.py:690
 msgid "&Turn Overrides Off"
-msgstr ""
+msgstr "&Désactiver les surchauffes"
 
 #: gui/mainFrame.py:690 gui/mainMenuBar.py:131
 msgid "&Turn Overrides On"
-msgstr ""
+msgstr "&Activer les surchauffes"
 
 #: gui/mainMenuBar.py:83
 msgid "&Undo"
-msgstr ""
+msgstr "&Annuler"
 
 #: gui/mainMenuBar.py:160
 msgid "&Wiki"
-msgstr ""
+msgstr "&Wiki"
 
 #: gui/builtinPreferenceViews/pyfaDatabasePreferences.py:25
 #: gui/builtinPreferenceViews/pyfaLoggingPreferences.py:29
 msgid "(Cannot be changed while pyfa is running. Set via command line switches.)"
-msgstr ""
+msgstr "(Ne peut pas être modifié pendant que pyfa est en cours d'exécution. Peut se modifier via les arguments de lancement)"
 
 #: gui/builtinStatsViews/capacitorViewFull.py:81
 msgid "0s"
@@ -175,7 +176,7 @@ msgstr ""
 
 #: gui/builtinContextMenus/fighterAbilities.py:33
 msgid "Abilities"
-msgstr ""
+msgstr "Capacités"
 
 #: eos/saveddata/damagePattern.py:95 eos/saveddata/damagePattern.py:96
 #: eos/saveddata/damagePattern.py:97 eos/saveddata/damagePattern.py:98
@@ -227,15 +228,15 @@ msgstr ""
 #: eos/saveddata/targetProfile.py:186 eos/saveddata/targetProfile.py:187
 #: eos/saveddata/targetProfile.py:188 eos/saveddata/targetProfile.py:189
 msgid "Abyssal"
-msgstr ""
+msgstr "Abysses"
 
 #: gui/builtinContextMenus/envEffectAdd.py:119
 msgid "Abyssal Weather"
-msgstr ""
+msgstr "Météo abyssale"
 
 #: gui/builtinItemStatsViews/itemEffects.py:31
 msgid "Active"
-msgstr ""
+msgstr "Activé(e)"
 
 #: gui/builtinViewColumns/abilities.py:37
 msgid "Active Abilities"
@@ -251,7 +252,7 @@ msgstr ""
 
 #: gui/esiFittings.py:350
 msgid "Add Character"
-msgstr ""
+msgstr "Ajouter un personnage"
 
 #: gui/esiFittings.py:183
 msgid "Add Character Error"

locale/lang.pot

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-10-27 21:25+0300\n"
+"POT-Creation-Date: 2020-10-28 15:28+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -412,7 +412,7 @@ msgstr ""
 msgid "Angel Cartel"
 msgstr ""
 
-#: gui/builtinPreferenceViews/pyfaGeneralPreferences.py:73
+#: gui/builtinPreferenceViews/pyfaGeneralPreferences.py:133
 msgid "Animate gauges"
 msgstr ""
 
@@ -509,7 +509,7 @@ msgstr ""
 msgid "Auto"
 msgstr ""
 
-#: gui/builtinPreferenceViews/pyfaGeneralPreferences.py:145
+#: gui/builtinPreferenceViews/pyfaGeneralPreferences.py:94
 msgid ""
 "Auto will use the same language pyfa uses if available, otherwise English"
 msgstr ""
@@ -745,7 +745,7 @@ msgstr ""
 msgid "Change Skills"
 msgstr ""
 
-#: gui/builtinPreferenceViews/pyfaGeneralPreferences.py:84
+#: gui/builtinPreferenceViews/pyfaGeneralPreferences.py:144
 msgid "Change charge in all modules of the same type"
 msgstr ""
 
@@ -828,7 +828,7 @@ msgstr ""
 msgid "Client Secret:"
 msgstr ""
 
-#: gui/builtinPreferenceViews/pyfaGeneralPreferences.py:54
+#: gui/builtinPreferenceViews/pyfaGeneralPreferences.py:114
 msgid "Color fitting view by slot"
 msgstr ""
 
@@ -852,7 +852,7 @@ msgstr ""
 msgid "Command center hold"
 msgstr ""
 
-#: gui/builtinPreferenceViews/pyfaGeneralPreferences.py:50
+#: gui/builtinPreferenceViews/pyfaGeneralPreferences.py:110
 msgid "Compact skills needed tooltip"
 msgstr ""
 
@@ -1280,6 +1280,10 @@ msgstr ""
 msgid "Drifter"
 msgstr ""
 
+#: eos/saveddata/damagePattern.py:159 eos/saveddata/targetProfile.py:230
+msgid "Drifter Entities"
+msgstr ""
+
 #: gui/builtinStatsViews/firepowerViewFull.py:67
 msgid "Drone"
 msgstr ""
@@ -1363,7 +1367,7 @@ msgstr ""
 msgid "EVE API XML character files"
 msgstr ""
 
-#: gui/builtinPreferenceViews/pyfaGeneralPreferences.py:127
+#: gui/builtinPreferenceViews/pyfaGeneralPreferences.py:76
 msgid "EVE Data:"
 msgstr ""
 
@@ -1695,7 +1699,7 @@ msgstr ""
 msgid "Exporting skills needed..."
 msgstr ""
 
-#: gui/builtinPreferenceViews/pyfaGeneralPreferences.py:92
+#: gui/builtinPreferenceViews/pyfaGeneralPreferences.py:152
 msgid "Extra info in Additions panel tab names"
 msgstr ""
 
@@ -2034,7 +2038,7 @@ msgstr ""
 msgid "ID"
 msgstr ""
 
-#: eos/saveddata/targetProfile.py:290
+#: eos/saveddata/targetProfile.py:293
 msgid "Ideal Target"
 msgstr ""
 
@@ -2182,7 +2186,7 @@ msgstr ""
 msgid "Interceptor"
 msgstr ""
 
-#: gui/builtinPreferenceViews/pyfaGeneralPreferences.py:122
+#: gui/builtinPreferenceViews/pyfaGeneralPreferences.py:65
 msgid "Interested in helping with translations?"
 msgstr ""
 
@@ -2199,9 +2203,12 @@ msgstr ""
 #: eos/saveddata/damagePattern.py:140 eos/saveddata/damagePattern.py:143
 #: eos/saveddata/damagePattern.py:144 eos/saveddata/damagePattern.py:145
 #: eos/saveddata/damagePattern.py:146 eos/saveddata/damagePattern.py:147
-#: eos/saveddata/damagePattern.py:148 eos/saveddata/targetProfile.py:94
-#: eos/saveddata/targetProfile.py:95 eos/saveddata/targetProfile.py:96
-#: eos/saveddata/targetProfile.py:97 eos/saveddata/targetProfile.py:98
+#: eos/saveddata/damagePattern.py:148 eos/saveddata/damagePattern.py:159
+#: eos/saveddata/damagePattern.py:160 eos/saveddata/damagePattern.py:161
+#: eos/saveddata/targetProfile.py:94 eos/saveddata/targetProfile.py:95
+#: eos/saveddata/targetProfile.py:96 eos/saveddata/targetProfile.py:97
+#: eos/saveddata/targetProfile.py:98 eos/saveddata/targetProfile.py:230
+#: eos/saveddata/targetProfile.py:231 eos/saveddata/targetProfile.py:232
 msgid "Invasion"
 msgstr ""
 
@@ -2251,7 +2258,7 @@ msgstr ""
 msgid "Ladar"
 msgstr ""
 
-#: gui/builtinPreferenceViews/pyfaGeneralPreferences.py:97
+#: gui/builtinPreferenceViews/pyfaGeneralPreferences.py:38
 msgid "Language (requires restart)"
 msgstr ""
 
@@ -2589,91 +2596,94 @@ msgstr ""
 #: eos/saveddata/damagePattern.py:152 eos/saveddata/damagePattern.py:153
 #: eos/saveddata/damagePattern.py:154 eos/saveddata/damagePattern.py:155
 #: eos/saveddata/damagePattern.py:156 eos/saveddata/damagePattern.py:157
-#: eos/saveddata/damagePattern.py:158 eos/saveddata/targetProfile.py:60
-#: eos/saveddata/targetProfile.py:61 eos/saveddata/targetProfile.py:62
-#: eos/saveddata/targetProfile.py:63 eos/saveddata/targetProfile.py:64
-#: eos/saveddata/targetProfile.py:65 eos/saveddata/targetProfile.py:66
-#: eos/saveddata/targetProfile.py:67 eos/saveddata/targetProfile.py:68
-#: eos/saveddata/targetProfile.py:69 eos/saveddata/targetProfile.py:70
-#: eos/saveddata/targetProfile.py:71 eos/saveddata/targetProfile.py:72
-#: eos/saveddata/targetProfile.py:73 eos/saveddata/targetProfile.py:74
-#: eos/saveddata/targetProfile.py:75 eos/saveddata/targetProfile.py:76
-#: eos/saveddata/targetProfile.py:77 eos/saveddata/targetProfile.py:78
-#: eos/saveddata/targetProfile.py:79 eos/saveddata/targetProfile.py:80
-#: eos/saveddata/targetProfile.py:81 eos/saveddata/targetProfile.py:82
-#: eos/saveddata/targetProfile.py:83 eos/saveddata/targetProfile.py:84
-#: eos/saveddata/targetProfile.py:85 eos/saveddata/targetProfile.py:86
-#: eos/saveddata/targetProfile.py:87 eos/saveddata/targetProfile.py:88
-#: eos/saveddata/targetProfile.py:89 eos/saveddata/targetProfile.py:90
-#: eos/saveddata/targetProfile.py:91 eos/saveddata/targetProfile.py:92
-#: eos/saveddata/targetProfile.py:94 eos/saveddata/targetProfile.py:95
-#: eos/saveddata/targetProfile.py:96 eos/saveddata/targetProfile.py:97
-#: eos/saveddata/targetProfile.py:98 eos/saveddata/targetProfile.py:99
-#: eos/saveddata/targetProfile.py:100 eos/saveddata/targetProfile.py:101
-#: eos/saveddata/targetProfile.py:102 eos/saveddata/targetProfile.py:103
-#: eos/saveddata/targetProfile.py:104 eos/saveddata/targetProfile.py:105
-#: eos/saveddata/targetProfile.py:106 eos/saveddata/targetProfile.py:107
-#: eos/saveddata/targetProfile.py:108 eos/saveddata/targetProfile.py:109
-#: eos/saveddata/targetProfile.py:110 eos/saveddata/targetProfile.py:111
-#: eos/saveddata/targetProfile.py:112 eos/saveddata/targetProfile.py:113
-#: eos/saveddata/targetProfile.py:114 eos/saveddata/targetProfile.py:115
-#: eos/saveddata/targetProfile.py:116 eos/saveddata/targetProfile.py:117
-#: eos/saveddata/targetProfile.py:118 eos/saveddata/targetProfile.py:119
-#: eos/saveddata/targetProfile.py:120 eos/saveddata/targetProfile.py:121
-#: eos/saveddata/targetProfile.py:122 eos/saveddata/targetProfile.py:123
-#: eos/saveddata/targetProfile.py:124 eos/saveddata/targetProfile.py:125
-#: eos/saveddata/targetProfile.py:126 eos/saveddata/targetProfile.py:127
-#: eos/saveddata/targetProfile.py:128 eos/saveddata/targetProfile.py:129
-#: eos/saveddata/targetProfile.py:130 eos/saveddata/targetProfile.py:131
-#: eos/saveddata/targetProfile.py:132 eos/saveddata/targetProfile.py:133
-#: eos/saveddata/targetProfile.py:134 eos/saveddata/targetProfile.py:135
-#: eos/saveddata/targetProfile.py:136 eos/saveddata/targetProfile.py:137
-#: eos/saveddata/targetProfile.py:138 eos/saveddata/targetProfile.py:139
-#: eos/saveddata/targetProfile.py:140 eos/saveddata/targetProfile.py:141
-#: eos/saveddata/targetProfile.py:142 eos/saveddata/targetProfile.py:143
-#: eos/saveddata/targetProfile.py:144 eos/saveddata/targetProfile.py:145
-#: eos/saveddata/targetProfile.py:146 eos/saveddata/targetProfile.py:147
-#: eos/saveddata/targetProfile.py:148 eos/saveddata/targetProfile.py:149
-#: eos/saveddata/targetProfile.py:150 eos/saveddata/targetProfile.py:151
-#: eos/saveddata/targetProfile.py:152 eos/saveddata/targetProfile.py:153
-#: eos/saveddata/targetProfile.py:154 eos/saveddata/targetProfile.py:155
-#: eos/saveddata/targetProfile.py:156 eos/saveddata/targetProfile.py:157
-#: eos/saveddata/targetProfile.py:158 eos/saveddata/targetProfile.py:159
-#: eos/saveddata/targetProfile.py:160 eos/saveddata/targetProfile.py:161
-#: eos/saveddata/targetProfile.py:162 eos/saveddata/targetProfile.py:163
-#: eos/saveddata/targetProfile.py:164 eos/saveddata/targetProfile.py:165
-#: eos/saveddata/targetProfile.py:166 eos/saveddata/targetProfile.py:167
-#: eos/saveddata/targetProfile.py:168 eos/saveddata/targetProfile.py:169
-#: eos/saveddata/targetProfile.py:170 eos/saveddata/targetProfile.py:171
-#: eos/saveddata/targetProfile.py:172 eos/saveddata/targetProfile.py:173
-#: eos/saveddata/targetProfile.py:174 eos/saveddata/targetProfile.py:175
-#: eos/saveddata/targetProfile.py:176 eos/saveddata/targetProfile.py:177
-#: eos/saveddata/targetProfile.py:178 eos/saveddata/targetProfile.py:179
-#: eos/saveddata/targetProfile.py:180 eos/saveddata/targetProfile.py:181
-#: eos/saveddata/targetProfile.py:182 eos/saveddata/targetProfile.py:183
-#: eos/saveddata/targetProfile.py:184 eos/saveddata/targetProfile.py:185
-#: eos/saveddata/targetProfile.py:186 eos/saveddata/targetProfile.py:187
-#: eos/saveddata/targetProfile.py:188 eos/saveddata/targetProfile.py:189
-#: eos/saveddata/targetProfile.py:191 eos/saveddata/targetProfile.py:192
-#: eos/saveddata/targetProfile.py:193 eos/saveddata/targetProfile.py:194
-#: eos/saveddata/targetProfile.py:195 eos/saveddata/targetProfile.py:196
-#: eos/saveddata/targetProfile.py:197 eos/saveddata/targetProfile.py:198
-#: eos/saveddata/targetProfile.py:199 eos/saveddata/targetProfile.py:200
-#: eos/saveddata/targetProfile.py:201 eos/saveddata/targetProfile.py:202
-#: eos/saveddata/targetProfile.py:203 eos/saveddata/targetProfile.py:204
-#: eos/saveddata/targetProfile.py:205 eos/saveddata/targetProfile.py:206
-#: eos/saveddata/targetProfile.py:207 eos/saveddata/targetProfile.py:208
-#: eos/saveddata/targetProfile.py:209 eos/saveddata/targetProfile.py:210
-#: eos/saveddata/targetProfile.py:211 eos/saveddata/targetProfile.py:212
-#: eos/saveddata/targetProfile.py:213 eos/saveddata/targetProfile.py:214
-#: eos/saveddata/targetProfile.py:215 eos/saveddata/targetProfile.py:216
-#: eos/saveddata/targetProfile.py:217 eos/saveddata/targetProfile.py:218
-#: eos/saveddata/targetProfile.py:219 eos/saveddata/targetProfile.py:220
-#: eos/saveddata/targetProfile.py:221 eos/saveddata/targetProfile.py:222
-#: eos/saveddata/targetProfile.py:223 eos/saveddata/targetProfile.py:224
-#: eos/saveddata/targetProfile.py:225 eos/saveddata/targetProfile.py:226
-#: eos/saveddata/targetProfile.py:227 eos/saveddata/targetProfile.py:228
-#: eos/saveddata/targetProfile.py:229
+#: eos/saveddata/damagePattern.py:158 eos/saveddata/damagePattern.py:159
+#: eos/saveddata/damagePattern.py:160 eos/saveddata/damagePattern.py:161
+#: eos/saveddata/targetProfile.py:60 eos/saveddata/targetProfile.py:61
+#: eos/saveddata/targetProfile.py:62 eos/saveddata/targetProfile.py:63
+#: eos/saveddata/targetProfile.py:64 eos/saveddata/targetProfile.py:65
+#: eos/saveddata/targetProfile.py:66 eos/saveddata/targetProfile.py:67
+#: eos/saveddata/targetProfile.py:68 eos/saveddata/targetProfile.py:69
+#: eos/saveddata/targetProfile.py:70 eos/saveddata/targetProfile.py:71
+#: eos/saveddata/targetProfile.py:72 eos/saveddata/targetProfile.py:73
+#: eos/saveddata/targetProfile.py:74 eos/saveddata/targetProfile.py:75
+#: eos/saveddata/targetProfile.py:76 eos/saveddata/targetProfile.py:77
+#: eos/saveddata/targetProfile.py:78 eos/saveddata/targetProfile.py:79
+#: eos/saveddata/targetProfile.py:80 eos/saveddata/targetProfile.py:81
+#: eos/saveddata/targetProfile.py:82 eos/saveddata/targetProfile.py:83
+#: eos/saveddata/targetProfile.py:84 eos/saveddata/targetProfile.py:85
+#: eos/saveddata/targetProfile.py:86 eos/saveddata/targetProfile.py:87
+#: eos/saveddata/targetProfile.py:88 eos/saveddata/targetProfile.py:89
+#: eos/saveddata/targetProfile.py:90 eos/saveddata/targetProfile.py:91
+#: eos/saveddata/targetProfile.py:92 eos/saveddata/targetProfile.py:94
+#: eos/saveddata/targetProfile.py:95 eos/saveddata/targetProfile.py:96
+#: eos/saveddata/targetProfile.py:97 eos/saveddata/targetProfile.py:98
+#: eos/saveddata/targetProfile.py:99 eos/saveddata/targetProfile.py:100
+#: eos/saveddata/targetProfile.py:101 eos/saveddata/targetProfile.py:102
+#: eos/saveddata/targetProfile.py:103 eos/saveddata/targetProfile.py:104
+#: eos/saveddata/targetProfile.py:105 eos/saveddata/targetProfile.py:106
+#: eos/saveddata/targetProfile.py:107 eos/saveddata/targetProfile.py:108
+#: eos/saveddata/targetProfile.py:109 eos/saveddata/targetProfile.py:110
+#: eos/saveddata/targetProfile.py:111 eos/saveddata/targetProfile.py:112
+#: eos/saveddata/targetProfile.py:113 eos/saveddata/targetProfile.py:114
+#: eos/saveddata/targetProfile.py:115 eos/saveddata/targetProfile.py:116
+#: eos/saveddata/targetProfile.py:117 eos/saveddata/targetProfile.py:118
+#: eos/saveddata/targetProfile.py:119 eos/saveddata/targetProfile.py:120
+#: eos/saveddata/targetProfile.py:121 eos/saveddata/targetProfile.py:122
+#: eos/saveddata/targetProfile.py:123 eos/saveddata/targetProfile.py:124
+#: eos/saveddata/targetProfile.py:125 eos/saveddata/targetProfile.py:126
+#: eos/saveddata/targetProfile.py:127 eos/saveddata/targetProfile.py:128
+#: eos/saveddata/targetProfile.py:129 eos/saveddata/targetProfile.py:130
+#: eos/saveddata/targetProfile.py:131 eos/saveddata/targetProfile.py:132
+#: eos/saveddata/targetProfile.py:133 eos/saveddata/targetProfile.py:134
+#: eos/saveddata/targetProfile.py:135 eos/saveddata/targetProfile.py:136
+#: eos/saveddata/targetProfile.py:137 eos/saveddata/targetProfile.py:138
+#: eos/saveddata/targetProfile.py:139 eos/saveddata/targetProfile.py:140
+#: eos/saveddata/targetProfile.py:141 eos/saveddata/targetProfile.py:142
+#: eos/saveddata/targetProfile.py:143 eos/saveddata/targetProfile.py:144
+#: eos/saveddata/targetProfile.py:145 eos/saveddata/targetProfile.py:146
+#: eos/saveddata/targetProfile.py:147 eos/saveddata/targetProfile.py:148
+#: eos/saveddata/targetProfile.py:149 eos/saveddata/targetProfile.py:150
+#: eos/saveddata/targetProfile.py:151 eos/saveddata/targetProfile.py:152
+#: eos/saveddata/targetProfile.py:153 eos/saveddata/targetProfile.py:154
+#: eos/saveddata/targetProfile.py:155 eos/saveddata/targetProfile.py:156
+#: eos/saveddata/targetProfile.py:157 eos/saveddata/targetProfile.py:158
+#: eos/saveddata/targetProfile.py:159 eos/saveddata/targetProfile.py:160
+#: eos/saveddata/targetProfile.py:161 eos/saveddata/targetProfile.py:162
+#: eos/saveddata/targetProfile.py:163 eos/saveddata/targetProfile.py:164
+#: eos/saveddata/targetProfile.py:165 eos/saveddata/targetProfile.py:166
+#: eos/saveddata/targetProfile.py:167 eos/saveddata/targetProfile.py:168
+#: eos/saveddata/targetProfile.py:169 eos/saveddata/targetProfile.py:170
+#: eos/saveddata/targetProfile.py:171 eos/saveddata/targetProfile.py:172
+#: eos/saveddata/targetProfile.py:173 eos/saveddata/targetProfile.py:174
+#: eos/saveddata/targetProfile.py:175 eos/saveddata/targetProfile.py:176
+#: eos/saveddata/targetProfile.py:177 eos/saveddata/targetProfile.py:178
+#: eos/saveddata/targetProfile.py:179 eos/saveddata/targetProfile.py:180
+#: eos/saveddata/targetProfile.py:181 eos/saveddata/targetProfile.py:182
+#: eos/saveddata/targetProfile.py:183 eos/saveddata/targetProfile.py:184
+#: eos/saveddata/targetProfile.py:185 eos/saveddata/targetProfile.py:186
+#: eos/saveddata/targetProfile.py:187 eos/saveddata/targetProfile.py:188
+#: eos/saveddata/targetProfile.py:189 eos/saveddata/targetProfile.py:191
+#: eos/saveddata/targetProfile.py:192 eos/saveddata/targetProfile.py:193
+#: eos/saveddata/targetProfile.py:194 eos/saveddata/targetProfile.py:195
+#: eos/saveddata/targetProfile.py:196 eos/saveddata/targetProfile.py:197
+#: eos/saveddata/targetProfile.py:198 eos/saveddata/targetProfile.py:199
+#: eos/saveddata/targetProfile.py:200 eos/saveddata/targetProfile.py:201
+#: eos/saveddata/targetProfile.py:202 eos/saveddata/targetProfile.py:203
+#: eos/saveddata/targetProfile.py:204 eos/saveddata/targetProfile.py:205
+#: eos/saveddata/targetProfile.py:206 eos/saveddata/targetProfile.py:207
+#: eos/saveddata/targetProfile.py:208 eos/saveddata/targetProfile.py:209
+#: eos/saveddata/targetProfile.py:210 eos/saveddata/targetProfile.py:211
+#: eos/saveddata/targetProfile.py:212 eos/saveddata/targetProfile.py:213
+#: eos/saveddata/targetProfile.py:214 eos/saveddata/targetProfile.py:215
+#: eos/saveddata/targetProfile.py:216 eos/saveddata/targetProfile.py:217
+#: eos/saveddata/targetProfile.py:218 eos/saveddata/targetProfile.py:219
+#: eos/saveddata/targetProfile.py:220 eos/saveddata/targetProfile.py:221
+#: eos/saveddata/targetProfile.py:222 eos/saveddata/targetProfile.py:223
+#: eos/saveddata/targetProfile.py:224 eos/saveddata/targetProfile.py:225
+#: eos/saveddata/targetProfile.py:226 eos/saveddata/targetProfile.py:227
+#: eos/saveddata/targetProfile.py:228 eos/saveddata/targetProfile.py:229
+#: eos/saveddata/targetProfile.py:230 eos/saveddata/targetProfile.py:231
+#: eos/saveddata/targetProfile.py:232
 msgid "NPC"
 msgstr ""
 
@@ -2749,7 +2759,7 @@ msgstr ""
 #: gui/builtinPreferenceViews/pyfaStatViewPreferences.py:87
 #: gui/builtinPreferenceViews/pyfaStatViewPreferences.py:99
 #: gui/builtinPreferenceViews/pyfaStatViewPreferences.py:104
-#: gui/builtinPreferenceViews/pyfaGeneralPreferences.py:93
+#: gui/builtinPreferenceViews/pyfaGeneralPreferences.py:153
 #: gui/characterEditor.py:855
 msgid "None"
 msgstr ""
@@ -2814,7 +2824,7 @@ msgstr ""
 msgid "Open Widgets Inspect tool"
 msgstr ""
 
-#: gui/builtinPreferenceViews/pyfaGeneralPreferences.py:76
+#: gui/builtinPreferenceViews/pyfaGeneralPreferences.py:136
 msgid "Open fittings in a new page by default"
 msgstr ""
 
@@ -3029,15 +3039,22 @@ msgid ""
 "notifications and view suppressed release notifications, if any."
 msgstr ""
 
+#: gui/builtinPreferenceViews/pyfaGeneralPreferences.py:69
+msgid ""
+"Pyfa language selection disabled. Please check if .mo files have been "
+"generated.\n"
+"Refer to locale/README.md for info."
+msgstr ""
+
 #: gui/builtinStatsViews/targetingMiscViewMinimal.py:129
 msgid "Quafe hold"
 msgstr ""
 
-#: gui/builtinPreferenceViews/pyfaGeneralPreferences.py:93
+#: gui/builtinPreferenceViews/pyfaGeneralPreferences.py:153
 msgid "Quantity of active items"
 msgstr ""
 
-#: gui/builtinPreferenceViews/pyfaGeneralPreferences.py:93
+#: gui/builtinPreferenceViews/pyfaGeneralPreferences.py:153
 msgid "Quantity of all items"
 msgstr ""
 
@@ -3142,7 +3159,7 @@ msgstr ""
 msgid "Rename"
 msgstr ""
 
-#: gui/builtinPreferenceViews/pyfaGeneralPreferences.py:58
+#: gui/builtinPreferenceViews/pyfaGeneralPreferences.py:118
 msgid "Reopen previous fits on startup"
 msgstr ""
 
@@ -3204,6 +3221,10 @@ msgstr ""
 msgid "Rogue Drone"
 msgstr ""
 
+#: eos/saveddata/damagePattern.py:160 eos/saveddata/targetProfile.py:231
+msgid "Rogue Drone Entities"
+msgstr ""
+
 #: eos/saveddata/targetProfile.py:63 eos/saveddata/targetProfile.py:69
 msgid "Rogue Drones"
 msgstr ""
@@ -3332,7 +3353,7 @@ msgstr ""
 msgid "Sentinel"
 msgstr ""
 
-#: gui/builtinPreferenceViews/pyfaGeneralPreferences.py:62
+#: gui/builtinPreferenceViews/pyfaGeneralPreferences.py:122
 msgid "Separate Racks"
 msgstr ""
 
@@ -3437,7 +3458,7 @@ msgstr ""
 msgid "Short Range"
 msgstr ""
 
-#: gui/builtinPreferenceViews/pyfaGeneralPreferences.py:66
+#: gui/builtinPreferenceViews/pyfaGeneralPreferences.py:126
 msgid "Show Rack Labels"
 msgstr ""
 
@@ -3445,7 +3466,7 @@ msgstr ""
 msgid "Show empty ship groups"
 msgstr ""
 
-#: gui/builtinPreferenceViews/pyfaGeneralPreferences.py:70
+#: gui/builtinPreferenceViews/pyfaGeneralPreferences.py:130
 msgid "Show fitting tab tooltips"
 msgstr ""
 
@@ -3457,7 +3478,7 @@ msgstr ""
 msgid "Show market shortcuts"
 msgstr ""
 
-#: gui/builtinPreferenceViews/pyfaGeneralPreferences.py:80
+#: gui/builtinPreferenceViews/pyfaGeneralPreferences.py:140
 msgid "Show ship browser tooltip"
 msgstr ""
 
@@ -3511,6 +3532,10 @@ msgstr ""
 msgid "Sleeper"
 msgstr ""
 
+#: eos/saveddata/damagePattern.py:161 eos/saveddata/targetProfile.py:232
+msgid "Sleeper Entities"
+msgstr ""
+
 #: eos/saveddata/damagePattern.py:158
 msgid "Sleepers"
 msgstr ""
@@ -3986,15 +4011,15 @@ msgstr ""
 msgid "Use capacitor simulator"
 msgstr ""
 
-#: gui/builtinPreferenceViews/pyfaGeneralPreferences.py:42
+#: gui/builtinPreferenceViews/pyfaGeneralPreferences.py:102
 msgid "Use character implants by default for new fits"
 msgstr ""
 
-#: gui/builtinPreferenceViews/pyfaGeneralPreferences.py:38
+#: gui/builtinPreferenceViews/pyfaGeneralPreferences.py:98
 msgid "Use global character"
 msgstr ""
 
-#: gui/builtinPreferenceViews/pyfaGeneralPreferences.py:46
+#: gui/builtinPreferenceViews/pyfaGeneralPreferences.py:106
 msgid "Use global damage pattern"
 msgstr ""
 
@@ -4065,7 +4090,7 @@ msgid ""
 "behavior)."
 msgstr ""
 
-#: gui/builtinPreferenceViews/pyfaGeneralPreferences.py:89
+#: gui/builtinPreferenceViews/pyfaGeneralPreferences.py:149
 msgid ""
 "When disabled, reloads charges just in selected modules. Action can be "
 "reversed by holding Ctrl or Alt key while changing charge."
@@ -4242,7 +4267,7 @@ msgstr ""
 msgid "pyfa.io"
 msgstr ""
 
-#: gui/builtinPreferenceViews/pyfaGeneralPreferences.py:102
+#: gui/builtinPreferenceViews/pyfaGeneralPreferences.py:47
 msgid "pyfa:"
 msgstr ""
 

requirements.txt

@@ -1,5 +1,6 @@
 wxPython == 4.0.6
 logbook >= 1.0.0
+numpy == 1.19.2
 matplotlib == 3.2.2
 python-dateutil
 requests >= 2.0.0

service/jargon/defaults.yaml

@@ -983,19 +983,19 @@ slave:
 # Ammo
 lm:
   - '(^| )lm'  # Checking only beginning of a word to remove unwanted spam
-  - 'light missile(?! (launcher|bay))'
+  - 'light missile'
 hm:
   - '(^| )hm'  # Checking only beginning of a word to remove a few unwanted results
-  - 'heavy missile(?! (launcher|bay))'
+  - 'heavy missile'
 ham:
   - '(^| )ham'  # Checking only beginning of a word to remove a few unwanted results
-  - 'heavy assault missile(?! (launcher|bay))'
+  - 'heavy assault missile'
 cm:
   - '(^| )cm'  # Checking only beginning of a word to remove unwanted spam such as "ECM"
-  - 'cruise missile(?! (launcher|bay))'
+  - 'cruise missile'
 xlcm:
   - 'xlcm'
-  - 'xl cruise missile(?! (launcher|bay))'
+  - 'xl cruise missile'
 fof:
   - 'fof'
   - 'auto-targeting (.+ )?missile'

service/market.py

@@ -768,7 +768,7 @@ class Market:
                     "updated for {1} to display correctly.").format(mg, self.ITEMS_FORCEDMARKETGROUP_R[mg.ID]))
                 return False
             return True
-        elif len(mg.items) > 0:
+        elif len(mg.items) > 0 and len(mg.children) == 0:
             return True
         else:
             return False

service/settings.py

@@ -572,6 +572,7 @@ class LocaleSettings:
     @classmethod
     def supported_langauges(cls):
         """Requires the application to be initialized, otherwise wx.Translation isn't set."""
+        pyfalog.info(f'using "{config.CATALOG}" to fetch languages, relatively base path "{os.getcwd()}"')
         return {x: wx.Locale.FindLanguageInfo(x) for x in wx.Translations.Get().GetAvailableTranslations(config.CATALOG)}
 
     def get(self, key):

staticdata/fsd_binary/dogmaunits.0.json

@@ -533,7 +533,7 @@
     "description_es": "Used for resistance.\r\n0.0 = 100% 1.0 = 0%\r\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%", 
+    "description_ja": "抵抗で使用。\n0.0 = 100% 1.0 = 0%\r\n", 
     "description_ko": "저항력 표기에 사용됩니다.<br>0.0 = 100% 1.0 = 0%\n", 
     "description_ru": "Используется для обозначения силы сопротивления.\n0.0 = 100%\n1.0 = 0%", 
     "description_zh": "用于抗性。0.0 = 100% 1.0 = 0%", 
@@ -556,7 +556,7 @@
     "description_es": "Used for multipliers displayed as %\r\n1.1 = +10%\r\n0.9 = -10%", 
     "description_fr": "Utilisé pour les multiplicateurs affichés en % 1,1 = +10 % 0,9 = -10 %", 
     "description_it": "Used for multipliers displayed as %\r\n1.1 = +10%\r\n0.9 = -10%", 
-    "description_ja": "% として表示される乗数で使用\n1.1 = +10%\n\n0.9 = -10%", 
+    "description_ja": "% として表示される乗数で使用\n1.1 = +10%\r\n0.9 = -10%", 
     "description_ko": "%로 나타낸 승수 표기에 사용됩니다.<br>1.1 = +10%<br>0.9 = -10%", 
     "description_ru": "Используется для обозначения множителей, выражаемых в процентах\n1.1 = +10%\n0.9 = -10%", 
     "description_zh": "用于乘数，显示为 %\n1.1 = +10%\n0.9 = -10%", 
@@ -579,7 +579,7 @@
     "description_es": "Used to modify damage resistance. Damage resistance bonus.\r\n0.1 = 90%\r\n0.9 = 10%", 
     "description_fr": "Utilisé pour modifier la résistance aux dégâts. Bonus de résistance aux dégâts. 0,1 = 90% 0,9 = 10%", 
     "description_it": "Used to modify damage resistance. Damage resistance bonus.\r\n0.1 = 90%\r\n0.9 = 10%", 
-    "description_ja": "ダメージレジスタンスを変更するときに使用。ダメージレジスタンスボーナス。\n\n0.1 = 90%\n0.9 = 0%", 
+    "description_ja": "ダメージレジスタンスを変更するときに使用。ダメージレジスタンスボーナス。\r\n0.1 = 90%\n0.9 = 0%", 
     "description_ko": "피해 저항력 변경에 사용됩니다. 피해 저항력 보너스.<br>0.1 = 90%<br>0.9 = 10%", 
     "description_ru": "Используется для указания изменений сопротивляемости различным видам ущерба. Бонус к сопротивляемости различным видам ущерба.\n0.1 = 90%\n0.9 = 10%", 
     "description_zh": "用来调整伤害抗性。伤害抗性加成。0.1 = 90%\n0.9 = 10%", 
@@ -687,18 +687,18 @@
     "description_es": "1=small 2=medium 3=large 4=x-large", 
     "description_fr": "1=small 2=medium 3=large 4=x-large", 
     "description_it": "1=small 2=medium 3=large 4=x-large", 
-    "description_ja": "1=small 2=medium 3=large 4=x-large", 
+    "description_ja": "1=小型 2=中型 3=大型 4=超大型", 
     "description_ko": "1=소형 2=중형 3=대형 4=초대형", 
     "description_ru": "1=малый 2=средний 3=большой 4=оч. большой", 
     "description_zh": "1=小型 2=中型 3=大型 4=超大型", 
     "descriptionID": 318074, 
     "displayName_de": "1=small 2=medium 3=l", 
-    "displayName_en-us": "", 
-    "displayName_es": "", 
+    "displayName_en-us": "1=small 2=medium 3=l", 
+    "displayName_es": "1=small 2=medium 3=l", 
     "displayName_fr": "1 = petit 2 = intermédiaire 3 = l", 
-    "displayName_it": "", 
+    "displayName_it": "1=small 2=medium 3=l", 
     "displayName_ja": "1=小 2=中 3=大", 
-    "displayName_ko": "", 
+    "displayName_ko": "1= 소형 2= 중형 3= 대형", 
     "displayName_ru": "1=малые 2=средние 3=б", 
     "displayName_zh": "1=小型  2=中型  3=大型", 
     "displayNameID": 78038, 
@@ -1004,12 +1004,12 @@
     "description_zh": "用于显示布尔标记 1=True 0=False", 
     "descriptionID": 78000, 
     "displayName_de": "1=True 0=False", 
-    "displayName_en-us": "", 
-    "displayName_es": "", 
+    "displayName_en-us": "1=True 0=False", 
+    "displayName_es": "1=True 0=False", 
     "displayName_fr": "1 = vrai 0 = faux", 
-    "displayName_it": "", 
+    "displayName_it": "1=True 0=False", 
     "displayName_ja": "1=True 0=False", 
-    "displayName_ko": "", 
+    "displayName_ko": "1= 참 0= 거짓", 
     "displayName_ru": "1=True 0=False", 
     "displayName_zh": "1=True 0=False", 
     "displayNameID": 78053, 
@@ -1139,7 +1139,7 @@
     "description_es": "AU per second", 
     "description_fr": "UA par seconde", 
     "description_it": "AU per second", 
-    "description_ja": "AU per second", 
+    "description_ja": "天文単位毎秒", 
     "description_ko": "AU/s", 
     "description_ru": "а. е. в секунду", 
     "description_zh": "AU每秒", 
@@ -1149,7 +1149,7 @@
     "displayName_es": "AU/s", 
     "displayName_fr": "UA/s", 
     "displayName_it": "AU/s", 
-    "displayName_ja": "AU/s", 
+    "displayName_ja": "AU/秒", 
     "displayName_ko": "AU/s", 
     "displayName_ru": "а. е./сек.", 
     "displayName_zh": "AU/s", 

staticdata/fsd_binary/metagroups.0.json

@@ -113,7 +113,7 @@
     "name_es": "Abyssal", 
     "name_fr": "Abîme", 
     "name_it": "Abyssal", 
-    "name_ja": "Abyssal", 
+    "name_ja": "アビサル", 
     "name_ko": "어비설", 
     "name_ru": "Бездна", 
     "name_zh": "深渊", 
@@ -125,7 +125,7 @@
     "description_es": "This item is only available through the New Eden Store or exclusive offers.", 
     "description_fr": "Cet objet n'est disponible que dans le magasin New Eden ou lors d'offres exclusives.", 
     "description_it": "This item is only available through the New Eden Store or exclusive offers.", 
-    "description_ja": "This item is only available through the New Eden Store or exclusive offers.", 
+    "description_ja": "このアイテムは、ニューエデンストアまたは限定特典でしか手に入らないアイテムです。", 
     "description_ko": "뉴에덴 스토어 및 특별한 오퍼를 통해서만 획득가능한 아이템입니다.", 
     "description_ru": "Этот предмет доступен только в игровом магазине и в составе эксклюзивного предложения.", 
     "description_zh": "此物品只能通过新伊甸商城或专享活动获得。", 
@@ -137,7 +137,7 @@
     "name_es": "Premium", 
     "name_fr": "Premium", 
     "name_it": "Premium", 
-    "name_ja": "Premium", 
+    "name_ja": "プレミアム", 
     "name_ko": "프리미엄", 
     "name_ru": "Эксклюзив", 
     "name_zh": "高级", 
@@ -149,7 +149,7 @@
     "description_es": "This item is only available for a limited time.", 
     "description_fr": "Cet objet n'est disponible que pour une durée limitée.", 
     "description_it": "This item is only available for a limited time.", 
-    "description_ja": "This item is only available for a limited time.", 
+    "description_ja": "このアイテムは期間限定です。", 
     "description_ko": "한정판 아이템입니다.", 
     "description_ru": "Этот предмет доступен только в течение ограниченного времени.", 
     "description_zh": "此物品只能在特定的有限时间内获得。", 
@@ -161,7 +161,7 @@
     "name_es": "Limited Time", 
     "name_fr": "Durée limitée", 
     "name_it": "Limited Time", 
-    "name_ja": "Limited Time", 
+    "name_ja": "期間限定", 
     "name_ko": "한정기간", 
     "name_ru": "Ограниченное время", 
     "name_zh": "限时", 
@@ -175,7 +175,7 @@
     "name_es": "Structure Faction", 
     "name_fr": "Faction de structure", 
     "name_it": "Structure Faction", 
-    "name_ja": "Structure Faction", 
+    "name_ja": "ストラクチャ勢力", 
     "name_ko": "팩션 구조물", 
     "name_ru": "Армейское сооружение", 
     "name_zh": "势力建筑", 
@@ -189,7 +189,7 @@
     "name_es": "Structure Tech II", 
     "name_fr": "Structure de Tech II", 
     "name_it": "Structure Tech II", 
-    "name_ja": "Structure Tech II", 
+    "name_ja": "ストラクチャT2", 
     "name_ko": "구조물 테크 II", 
     "name_ru": "Сооружение второй техкатегории", 
     "name_zh": "二级科技建筑", 
@@ -203,7 +203,7 @@
     "name_es": "Structure Tech I", 
     "name_fr": "Structure de Tech I", 
     "name_it": "Structure Tech I", 
-    "name_ja": "Structure Tech I", 
+    "name_ja": "ストラクチャT1", 
     "name_ko": "구조물 테크 I", 
     "name_ru": "Сооружение первой техкатегории", 
     "name_zh": "一级科技建筑", 

staticdata/fsd_binary/requiredskillsfortypes.0.json

@@ -11174,7 +11174,6 @@
     "17940": 1
   }, 
   "17478": {
-    "3410": 3, 
     "17940": 1
   }, 
   "17480": {
@@ -19415,7 +19414,7 @@
     "3323": 1
   }, 
   "32787": {
-    "3436": 4, 
+    "3436": 1, 
     "3440": 1, 
     "25863": 2
   }, 
@@ -20658,7 +20657,6 @@
     "20342": 5
   }, 
   "34328": {
-    "20342": 1, 
     "34327": 1
   }, 
   "34375": {
@@ -24870,6 +24868,9 @@
   "52267": {
     "3335": 1
   }, 
+  "52306": {
+    "3386": 1
+  }, 
   "52307": {
     "3392": 5, 
     "3402": 5
@@ -24879,6 +24880,12 @@
     "3403": 4, 
     "3409": 4
   }, 
+  "52315": {
+    "3386": 1
+  }, 
+  "52316": {
+    "3386": 1
+  }, 
   "52476": {
     "3319": 1, 
     "3321": 1
@@ -25592,6 +25599,17 @@
   "55747": {
     "3402": 1
   }, 
+  "55760": {
+    "3436": 1, 
+    "3440": 5, 
+    "25863": 4, 
+    "57164": 1
+  }, 
+  "55761": {
+    "3436": 1, 
+    "3440": 4, 
+    "25863": 4
+  }, 
   "55803": {
     "3402": 1
   }, 
@@ -25720,6 +25738,9 @@
   "56362": {
     "11584": 1
   }, 
+  "56569": {
+    "9955": 1
+  }, 
   "56619": {
     "3402": 1
   }, 
@@ -25729,6 +25750,24 @@
   "56621": {
     "3402": 1
   }, 
+  "56625": {
+    "3386": 1
+  }, 
+  "56626": {
+    "3386": 1
+  }, 
+  "56627": {
+    "3386": 1
+  }, 
+  "56628": {
+    "3386": 1
+  }, 
+  "56629": {
+    "3386": 1
+  }, 
+  "56630": {
+    "3386": 1
+  }, 
   "56631": {
     "3389": 5, 
     "3409": 4
@@ -25753,10 +25792,218 @@
   "56662": {
     "3402": 1
   }, 
+  "56733": {
+    "3402": 1
+  }, 
+  "56735": {
+    "24606": 3
+  }, 
   "56748": {
     "3412": 3
   }, 
   "56823": {
     "3402": 1
+  }, 
+  "56833": {
+    "3402": 1
+  }, 
+  "56834": {
+    "3402": 1
+  }, 
+  "56835": {
+    "3402": 1
+  }, 
+  "56871": {
+    "21718": 1
+  }, 
+  "56950": {
+    "16281": 1
+  }, 
+  "56970": {
+    "3402": 1
+  }, 
+  "56984": {
+    "3402": 1
+  }, 
+  "56985": {
+    "3402": 1
+  }, 
+  "56986": {
+    "3402": 1
+  }, 
+  "56987": {
+    "3402": 1
+  }, 
+  "56988": {
+    "3402": 1
+  }, 
+  "56989": {
+    "3402": 1
+  }, 
+  "56990": {
+    "3402": 1
+  }, 
+  "56991": {
+    "3402": 1
+  }, 
+  "56992": {
+    "3402": 1
+  }, 
+  "56993": {
+    "3402": 1
+  }, 
+  "56994": {
+    "3402": 1
+  }, 
+  "56995": {
+    "3402": 1
+  }, 
+  "57000": {
+    "3402": 1
+  }, 
+  "57001": {
+    "3402": 1
+  }, 
+  "57002": {
+    "3402": 1
+  }, 
+  "57027": {
+    "16281": 1
+  }, 
+  "57028": {
+    "16281": 1
+  }, 
+  "57029": {
+    "21718": 1
+  }, 
+  "57030": {
+    "21718": 1
+  }, 
+  "57035": {
+    "3402": 1
+  }, 
+  "57036": {
+    "3402": 1
+  }, 
+  "57037": {
+    "3402": 1
+  }, 
+  "57110": {
+    "3411": 2
+  }, 
+  "57111": {
+    "3411": 2
+  }, 
+  "57112": {
+    "3411": 3
+  }, 
+  "57113": {
+    "3411": 3
+  }, 
+  "57114": {
+    "3411": 4
+  }, 
+  "57116": {
+    "3411": 5
+  }, 
+  "57117": {
+    "3411": 2
+  }, 
+  "57118": {
+    "3411": 2
+  }, 
+  "57119": {
+    "3411": 3
+  }, 
+  "57120": {
+    "3411": 3
+  }, 
+  "57121": {
+    "3411": 4
+  }, 
+  "57122": {
+    "3411": 5
+  }, 
+  "57123": {
+    "3411": 2
+  }, 
+  "57124": {
+    "3411": 2
+  }, 
+  "57125": {
+    "3411": 3
+  }, 
+  "57126": {
+    "3411": 3
+  }, 
+  "57127": {
+    "3411": 4
+  }, 
+  "57128": {
+    "3411": 5
+  }, 
+  "57164": {
+    "3440": 5, 
+    "25863": 4
+  }, 
+  "57201": {
+    "3402": 1
+  }, 
+  "57209": {
+    "3402": 1
+  }, 
+  "57210": {
+    "3402": 1
+  }, 
+  "57211": {
+    "3402": 1
+  }, 
+  "57212": {
+    "3402": 1
+  }, 
+  "57287": {
+    "3402": 1
+  }, 
+  "57288": {
+    "3402": 1
+  }, 
+  "57289": {
+    "3402": 1
+  }, 
+  "57290": {
+    "3402": 1
+  }, 
+  "57291": {
+    "3402": 1
+  }, 
+  "57292": {
+    "3402": 1
+  }, 
+  "57293": {
+    "3402": 1
+  }, 
+  "57294": {
+    "3402": 1
+  }, 
+  "57295": {
+    "3402": 1
+  }, 
+  "57311": {
+    "3402": 1
+  }, 
+  "57312": {
+    "3402": 1
+  }, 
+  "57313": {
+    "3402": 1
+  }, 
+  "57335": {
+    "21718": 1
+  }, 
+  "57336": {
+    "21718": 1
+  }, 
+  "57428": {
+    "3402": 1
   }
 }

staticdata/fsd_binary/typedogma.0.json

@@ -7386,7 +7386,7 @@
       }, 
       {
         "attributeID": 37, 
-        "value": 1500.0
+        "value": 1800.0
       }, 
       {
         "attributeID": 70, 
@@ -7450,7 +7450,7 @@
       }, 
       {
         "attributeID": 281, 
-        "value": 6000.0
+        "value": 7200.0
       }, 
       {
         "attributeID": 422, 
@@ -7478,11 +7478,11 @@
       }, 
       {
         "attributeID": 653, 
-        "value": 71.0
+        "value": 78.0
       }, 
       {
         "attributeID": 654, 
-        "value": 450.0
+        "value": 405.0
       }, 
       {
         "attributeID": 655, 
@@ -13612,7 +13612,7 @@
       }, 
       {
         "attributeID": 30, 
-        "value": 1750.0
+        "value": 1630.0
       }, 
       {
         "attributeID": 47, 
@@ -13620,7 +13620,7 @@
       }, 
       {
         "attributeID": 50, 
-        "value": 80.0
+        "value": 74.0
       }, 
       {
         "attributeID": 51, 
@@ -73675,7 +73675,7 @@
       }, 
       {
         "attributeID": 37, 
-        "value": 1500.0
+        "value": 1800.0
       }, 
       {
         "attributeID": 70, 
@@ -73739,7 +73739,7 @@
       }, 
       {
         "attributeID": 281, 
-        "value": 6000.0
+        "value": 7200.0
       }, 
       {
         "attributeID": 422, 
@@ -73767,11 +73767,11 @@
       }, 
       {
         "attributeID": 653, 
-        "value": 71.0
+        "value": 78.0
       }, 
       {
         "attributeID": 654, 
-        "value": 450.0
+        "value": 405.0
       }, 
       {
         "attributeID": 655, 
@@ -81457,7 +81457,7 @@
       }, 
       {
         "attributeID": 30, 
-        "value": 1838.0
+        "value": 1709.0
       }, 
       {
         "attributeID": 47, 
@@ -81465,7 +81465,7 @@
       }, 
       {
         "attributeID": 50, 
-        "value": 88.0
+        "value": 82.0
       }, 
       {
         "attributeID": 51, 
@@ -86065,7 +86065,7 @@
       }, 
       {
         "attributeID": 37, 
-        "value": 1500.0
+        "value": 1800.0
       }, 
       {
         "attributeID": 70, 
@@ -86129,7 +86129,7 @@
       }, 
       {
         "attributeID": 281, 
-        "value": 6000.0
+        "value": 7200.0
       }, 
       {
         "attributeID": 422, 
@@ -86157,11 +86157,11 @@
       }, 
       {
         "attributeID": 653, 
-        "value": 71.0
+        "value": 78.0
       }, 
       {
         "attributeID": 654, 
-        "value": 450.0
+        "value": 405.0
       }, 
       {
         "attributeID": 655, 
@@ -86196,7 +86196,7 @@
       }, 
       {
         "attributeID": 37, 
-        "value": 1500.0
+        "value": 1800.0
       }, 
       {
         "attributeID": 70, 
@@ -86260,7 +86260,7 @@
       }, 
       {
         "attributeID": 281, 
-        "value": 6000.0
+        "value": 7200.0
       }, 
       {
         "attributeID": 422, 
@@ -86288,11 +86288,11 @@
       }, 
       {
         "attributeID": 653, 
-        "value": 71.0
+        "value": 78.0
       }, 
       {
         "attributeID": 654, 
-        "value": 450.0
+        "value": 405.0
       }, 
       {
         "attributeID": 655, 
@@ -86327,7 +86327,7 @@
       }, 
       {
         "attributeID": 37, 
-        "value": 1500.0
+        "value": 1800.0
       }, 
       {
         "attributeID": 70, 
@@ -86391,7 +86391,7 @@
       }, 
       {
         "attributeID": 281, 
-        "value": 6000.0
+        "value": 7200.0
       }, 
       {
         "attributeID": 422, 
@@ -86419,11 +86419,11 @@
       }, 
       {
         "attributeID": 653, 
-        "value": 71.0
+        "value": 78.0
       }, 
       {
         "attributeID": 654, 
-        "value": 450.0
+        "value": 405.0
       }, 
       {
         "attributeID": 655, 
@@ -91385,7 +91385,7 @@
       }, 
       {
         "attributeID": 37, 
-        "value": 2250.0
+        "value": 2700.0
       }, 
       {
         "attributeID": 70, 
@@ -91457,7 +91457,7 @@
       }, 
       {
         "attributeID": 281, 
-        "value": 6000.0
+        "value": 7200.0
       }, 
       {
         "attributeID": 422, 
@@ -91485,11 +91485,11 @@
       }, 
       {
         "attributeID": 653, 
-        "value": 71.0
+        "value": 78.0
       }, 
       {
         "attributeID": 654, 
-        "value": 450.0
+        "value": 405.0
       }, 
       {
         "attributeID": 655, 
@@ -91591,7 +91591,7 @@
       }, 
       {
         "attributeID": 37, 
-        "value": 1250.0
+        "value": 1500.0
       }, 
       {
         "attributeID": 70, 
@@ -91663,7 +91663,7 @@
       }, 
       {
         "attributeID": 281, 
-        "value": 6000.0
+        "value": 7200.0
       }, 
       {
         "attributeID": 422, 
@@ -91691,11 +91691,11 @@
       }, 
       {
         "attributeID": 653, 
-        "value": 61.0
+        "value": 67.0
       }, 
       {
         "attributeID": 654, 
-        "value": 774.0
+        "value": 697.0
       }, 
       {
         "attributeID": 655, 
@@ -92808,6 +92808,10 @@
         "attributeID": 293, 
         "value": -20.0
       }, 
+      {
+        "attributeID": 633, 
+        "value": 8.0
+      }, 
       {
         "attributeID": 1087, 
         "value": 4.0
@@ -126770,7 +126774,7 @@
       }, 
       {
         "attributeID": 908, 
-        "value": 2500000.0
+        "value": 5000000.0
       }, 
       {
         "attributeID": 911, 
@@ -126979,6 +126983,10 @@
       {
         "attributeID": 2754, 
         "value": 1e-05
+      }, 
+      {
+        "attributeID": 3105, 
+        "value": 4247.0
       }
     ], 
     "dogmaEffects": [
@@ -131432,7 +131440,7 @@
       }, 
       {
         "attributeID": 30, 
-        "value": 178750.0
+        "value": 168750.0
       }, 
       {
         "attributeID": 47, 
@@ -131440,7 +131448,7 @@
       }, 
       {
         "attributeID": 50, 
-        "value": 90.0
+        "value": 80.0
       }, 
       {
         "attributeID": 51, 
@@ -205027,7 +205035,7 @@
       }, 
       {
         "attributeID": 30, 
-        "value": 1750.0
+        "value": 1630.0
       }, 
       {
         "attributeID": 47, 
@@ -205035,7 +205043,7 @@
       }, 
       {
         "attributeID": 50, 
-        "value": 76.0
+        "value": 71.0
       }, 
       {
         "attributeID": 51, 
@@ -206189,7 +206197,7 @@
       }, 
       {
         "attributeID": 30, 
-        "value": 1750.0
+        "value": 1630.0
       }, 
       {
         "attributeID": 47, 
@@ -206197,7 +206205,7 @@
       }, 
       {
         "attributeID": 50, 
-        "value": 64.0
+        "value": 60.0
       }, 
       {
         "attributeID": 51, 
@@ -206291,7 +206299,7 @@
       }, 
       {
         "attributeID": 30, 
-        "value": 1750.0
+        "value": 1630.0
       }, 
       {
         "attributeID": 47, 
@@ -206299,7 +206307,7 @@
       }, 
       {
         "attributeID": 50, 
-        "value": 72.0
+        "value": 67.0
       }, 
       {
         "attributeID": 51, 
@@ -206393,7 +206401,7 @@
       }, 
       {
         "attributeID": 30, 
-        "value": 1750.0
+        "value": 1630.0
       }, 
       {
         "attributeID": 47, 
@@ -206401,7 +206409,7 @@
       }, 
       {
         "attributeID": 50, 
-        "value": 68.0
+        "value": 63.0
       }, 
       {
         "attributeID": 51, 
@@ -303495,7 +303503,7 @@
       }, 
       {
         "attributeID": 586, 
-        "value": 20.0
+        "value": 15.0
       }, 
       {
         "attributeID": 600, 
@@ -303639,10 +303647,6 @@
         "effectID": 4393, 
         "isDefault": 0
       }, 
-      {
-        "effectID": 4397, 
-        "isDefault": 0
-      }, 
       {
         "effectID": 4413, 
         "isDefault": 0
@@ -351817,7 +351821,7 @@
       }, 
       {
         "attributeID": 588, 
-        "value": 20.0
+        "value": 15.0
       }, 
       {
         "attributeID": 600, 
@@ -351961,10 +351965,6 @@
         "effectID": 4396, 
         "isDefault": 0
       }, 
-      {
-        "effectID": 4399, 
-        "isDefault": 0
-      }, 
       {
         "effectID": 4416, 
         "isDefault": 0
@@ -352211,7 +352211,7 @@
       }, 
       {
         "attributeID": 587, 
-        "value": 20.0
+        "value": 15.0
       }, 
       {
         "attributeID": 600, 
@@ -352355,10 +352355,6 @@
         "effectID": 4395, 
         "isDefault": 0
       }, 
-      {
-        "effectID": 4398, 
-        "isDefault": 0
-      }, 
       {
         "effectID": 4415, 
         "isDefault": 0
@@ -352917,7 +352913,7 @@
       }, 
       {
         "attributeID": 485, 
-        "value": 20.0
+        "value": 15.0
       }, 
       {
         "attributeID": 511, 
@@ -353085,10 +353081,6 @@
         "effectID": 4394, 
         "isDefault": 0
       }, 
-      {
-        "effectID": 4400, 
-        "isDefault": 0
-      }, 
       {
         "effectID": 4417, 
         "isDefault": 0
@@ -472132,7 +472124,7 @@
       }, 
       {
         "attributeID": 30, 
-        "value": 1750.0
+        "value": 1630.0
       }, 
       {
         "attributeID": 47, 
@@ -472140,7 +472132,7 @@
       }, 
       {
         "attributeID": 50, 
-        "value": 64.0
+        "value": 60.0
       }, 
       {
         "attributeID": 51, 
@@ -472242,7 +472234,7 @@
       }, 
       {
         "attributeID": 30, 
-        "value": 1575.0
+        "value": 1465.0
       }, 
       {
         "attributeID": 47, 
@@ -472250,7 +472242,7 @@
       }, 
       {
         "attributeID": 50, 
-        "value": 88.0
+        "value": 82.0
       }, 
       {
         "attributeID": 51, 
@@ -507482,7 +507474,7 @@
       }, 
       {
         "attributeID": 30, 
-        "value": 1750.0
+        "value": 1630.0
       }, 
       {
         "attributeID": 47, 
@@ -507490,7 +507482,7 @@
       }, 
       {
         "attributeID": 50, 
-        "value": 67.0
+        "value": 62.0
       }, 
       {
         "attributeID": 51, 
@@ -507592,7 +507584,7 @@
       }, 
       {
         "attributeID": 30, 
-        "value": 1750.0
+        "value": 1630.0
       }, 
       {
         "attributeID": 47, 
@@ -507600,7 +507592,7 @@
       }, 
       {
         "attributeID": 50, 
-        "value": 70.0
+        "value": 65.0
       }, 
       {
         "attributeID": 51, 
@@ -507702,7 +507694,7 @@
       }, 
       {
         "attributeID": 30, 
-        "value": 1750.0
+        "value": 1630.0
       }, 
       {
         "attributeID": 47, 
@@ -507710,7 +507702,7 @@
       }, 
       {
         "attributeID": 50, 
-        "value": 74.0
+        "value": 69.0
       }, 
       {
         "attributeID": 51, 
@@ -507812,7 +507804,7 @@
       }, 
       {
         "attributeID": 30, 
-        "value": 1750.0
+        "value": 1630.0
       }, 
       {
         "attributeID": 47, 
@@ -507820,7 +507812,7 @@
       }, 
       {
         "attributeID": 50, 
-        "value": 77.0
+        "value": 72.0
       }, 
       {
         "attributeID": 51, 
@@ -512710,7 +512702,7 @@
       }, 
       {
         "attributeID": 30, 
-        "value": 1575.0
+        "value": 1465.0
       }, 
       {
         "attributeID": 47, 
@@ -512718,7 +512710,7 @@
       }, 
       {
         "attributeID": 50, 
-        "value": 92.0
+        "value": 86.0
       }, 
       {
         "attributeID": 51, 
@@ -512820,7 +512812,7 @@
       }, 
       {
         "attributeID": 30, 
-        "value": 1575.0
+        "value": 1465.0
       }, 
       {
         "attributeID": 47, 
@@ -512828,7 +512820,7 @@
       }, 
       {
         "attributeID": 50, 
-        "value": 97.0
+        "value": 90.0
       }, 
       {
         "attributeID": 51, 
@@ -512930,7 +512922,7 @@
       }, 
       {
         "attributeID": 30, 
-        "value": 1575.0
+        "value": 1465.0
       }, 
       {
         "attributeID": 47, 
@@ -512938,7 +512930,7 @@
       }, 
       {
         "attributeID": 50, 
-        "value": 101.0
+        "value": 94.0
       }, 
       {
         "attributeID": 51, 
@@ -513040,7 +513032,7 @@
       }, 
       {
         "attributeID": 30, 
-        "value": 1575.0
+        "value": 1465.0
       }, 
       {
         "attributeID": 47, 
@@ -513048,7 +513040,7 @@
       }, 
       {
         "attributeID": 50, 
-        "value": 106.0
+        "value": 99.0
       }, 
       {
         "attributeID": 51, 
@@ -596570,7 +596562,7 @@
       }, 
       {
         "attributeID": 30, 
-        "value": 1575.0
+        "value": 1465.0
       }, 
       {
         "attributeID": 47, 
@@ -596578,7 +596570,7 @@
       }, 
       {
         "attributeID": 50, 
-        "value": 88.0
+        "value": 82.0
       }, 
       {
         "attributeID": 51, 
@@ -779534,10 +779526,6 @@
         "attributeID": 182, 
         "value": 17940.0
       }, 
-      {
-        "attributeID": 183, 
-        "value": 3410.0
-      }, 
       {
         "attributeID": 192, 
         "value": 5.0
@@ -779610,10 +779598,6 @@
         "attributeID": 277, 
         "value": 1.0
       }, 
-      {
-        "attributeID": 278, 
-        "value": 3.0
-      }, 
       {
         "attributeID": 283, 
         "value": 25.0
@@ -780739,7 +780723,7 @@
       }, 
       {
         "attributeID": 30, 
-        "value": 1750.0
+        "value": 1630.0
       }, 
       {
         "attributeID": 47, 
@@ -780747,7 +780731,7 @@
       }, 
       {
         "attributeID": 50, 
-        "value": 64.0
+        "value": 60.0
       }, 
       {
         "attributeID": 51, 
@@ -814261,7 +814245,7 @@
       }, 
       {
         "attributeID": 37, 
-        "value": 2900.0
+        "value": 3480.0
       }, 
       {
         "attributeID": 70, 
@@ -814273,7 +814257,7 @@
       }, 
       {
         "attributeID": 114, 
-        "value": 5350.0
+        "value": 5885.0
       }, 
       {
         "attributeID": 116, 
@@ -814337,7 +814321,7 @@
       }, 
       {
         "attributeID": 653, 
-        "value": 35.0
+        "value": 42.0
       }, 
       {
         "attributeID": 654, 
@@ -814376,7 +814360,7 @@
       }, 
       {
         "attributeID": 37, 
-        "value": 2900.0
+        "value": 3480.0
       }, 
       {
         "attributeID": 70, 
@@ -814396,7 +814380,7 @@
       }, 
       {
         "attributeID": 117, 
-        "value": 5350.0
+        "value": 5885.0
       }, 
       {
         "attributeID": 118, 
@@ -814452,7 +814436,7 @@
       }, 
       {
         "attributeID": 653, 
-        "value": 35.0
+        "value": 42.0
       }, 
       {
         "attributeID": 654, 
@@ -814491,7 +814475,7 @@
       }, 
       {
         "attributeID": 37, 
-        "value": 2900.0
+        "value": 3480.0
       }, 
       {
         "attributeID": 70, 
@@ -814515,7 +814499,7 @@
       }, 
       {
         "attributeID": 118, 
-        "value": 5350.0
+        "value": 5885.0
       }, 
       {
         "attributeID": 137, 
@@ -814567,7 +814551,7 @@
       }, 
       {
         "attributeID": 653, 
-        "value": 35.0
+        "value": 42.0
       }, 
       {
         "attributeID": 654, 
@@ -814606,7 +814590,7 @@
       }, 
       {
         "attributeID": 37, 
-        "value": 2900.0
+        "value": 3480.0
       }, 
       {
         "attributeID": 70, 
@@ -814622,7 +814606,7 @@
       }, 
       {
         "attributeID": 116, 
-        "value": 5350.0
+        "value": 5885.0
       }, 
       {
         "attributeID": 117, 
@@ -814682,7 +814666,7 @@
       }, 
       {
         "attributeID": 653, 
-        "value": 35.0
+        "value": 42.0
       }, 
       {
         "attributeID": 654, 
@@ -890863,7 +890847,7 @@
       }, 
       {
         "attributeID": 11, 
-        "value": 780000.0
+        "value": 700000.0
       }, 
       {
         "attributeID": 12, 
@@ -891841,11 +891825,11 @@
       }, 
       {
         "attributeID": 12, 
-        "value": 7.0
+        "value": 8.0
       }, 
       {
         "attributeID": 13, 
-        "value": 5.0
+        "value": 4.0
       }, 
       {
         "attributeID": 14, 
@@ -892324,7 +892308,7 @@
       }, 
       {
         "attributeID": 11, 
-        "value": 500000.0
+        "value": 550000.0
       }, 
       {
         "attributeID": 12, 
@@ -892356,7 +892340,7 @@
       }, 
       {
         "attributeID": 48, 
-        "value": 965.0
+        "value": 990.0
       }, 
       {
         "attributeID": 49, 
@@ -921209,7 +921193,7 @@
       }, 
       {
         "attributeID": 30, 
-        "value": 162500.0
+        "value": 152500.0
       }, 
       {
         "attributeID": 47, 
@@ -921217,7 +921201,7 @@
       }, 
       {
         "attributeID": 50, 
-        "value": 100.0
+        "value": 90.0
       }, 
       {
         "attributeID": 51, 
@@ -932422,7 +932406,7 @@
       }, 
       {
         "attributeID": 554, 
-        "value": -1.5
+        "value": -1.75
       }, 
       {
         "attributeID": 633, 
@@ -932750,7 +932734,7 @@
       }, 
       {
         "attributeID": 554, 
-        "value": -1.75
+        "value": -1.5
       }, 
       {
         "attributeID": 633, 
@@ -937794,7 +937778,7 @@
       }, 
       {
         "attributeID": 30, 
-        "value": 1575.0
+        "value": 1465.0
       }, 
       {
         "attributeID": 47, 
@@ -937802,7 +937786,7 @@
       }, 
       {
         "attributeID": 50, 
-        "value": 68.0
+        "value": 63.0
       }, 
       {
         "attributeID": 51, 
@@ -1062450,7 +1062434,7 @@
       }, 
       {
         "attributeID": 1888, 
-        "value": 10.0
+        "value": 15.0
       }
     ], 
     "dogmaEffects": [
@@ -1063116,7 +1063100,7 @@
       }, 
       {
         "attributeID": 738, 
-        "value": -5.0
+        "value": -7.5
       }, 
       {
         "attributeID": 739, 
@@ -1063124,7 +1063108,7 @@
       }, 
       {
         "attributeID": 1012, 
-        "value": -15.0
+        "value": -20.0
       }, 
       {
         "attributeID": 1013, 
@@ -1063507,7 +1063491,7 @@
       }, 
       {
         "attributeID": 1012, 
-        "value": 10.0
+        "value": 15.0
       }, 
       {
         "attributeID": 1013, 
@@ -1067944,7 +1067928,7 @@
       }, 
       {
         "attributeID": 30, 
-        "value": 1750.0
+        "value": 1630.0
       }, 
       {
         "attributeID": 47, 
@@ -1067952,7 +1067936,7 @@
       }, 
       {
         "attributeID": 50, 
-        "value": 64.0
+        "value": 60.0
       }, 
       {
         "attributeID": 51, 
@@ -1091157,7 +1091141,7 @@
       }, 
       {
         "attributeID": 908, 
-        "value": 2500000.0
+        "value": 5000000.0
       }, 
       {
         "attributeID": 911, 
@@ -1091354,6 +1091338,10 @@
       {
         "attributeID": 2754, 
         "value": 1e-05
+      }, 
+      {
+        "attributeID": 3105, 
+        "value": 4246.0
       }
     ], 
     "dogmaEffects": [
@@ -1104486,7 +1104474,7 @@
       }, 
       {
         "attributeID": 37, 
-        "value": 926.0
+        "value": 833.0
       }, 
       {
         "attributeID": 70, 
@@ -1104570,7 +1104558,7 @@
       }, 
       {
         "attributeID": 552, 
-        "value": 100.0
+        "value": 110.0
       }, 
       {
         "attributeID": 564, 
@@ -1104753,7 +1104741,7 @@
       }, 
       {
         "attributeID": 37, 
-        "value": 837.0
+        "value": 753.0
       }, 
       {
         "attributeID": 70, 
@@ -1104837,7 +1104825,7 @@
       }, 
       {
         "attributeID": 552, 
-        "value": 100.0
+        "value": 110.0
       }, 
       {
         "attributeID": 564, 
@@ -1105020,7 +1105008,7 @@
       }, 
       {
         "attributeID": 37, 
-        "value": 793.0
+        "value": 714.0
       }, 
       {
         "attributeID": 70, 
@@ -1105104,7 +1105092,7 @@
       }, 
       {
         "attributeID": 552, 
-        "value": 100.0
+        "value": 110.0
       }, 
       {
         "attributeID": 564, 
@@ -1105287,7 +1105275,7 @@
       }, 
       {
         "attributeID": 37, 
-        "value": 970.0
+        "value": 873.0
       }, 
       {
         "attributeID": 70, 
@@ -1105371,7 +1105359,7 @@
       }, 
       {
         "attributeID": 552, 
-        "value": 100.0
+        "value": 110.0
       }, 
       {
         "attributeID": 564, 

staticdata/fsd_lite/dbuffcollections.0.json

@@ -664,7 +664,7 @@
     "displayName_es": "Propulsion disruption module range bonus", 
     "displayName_fr": "Bonus à la portée des modules de perturbation des propulsions", 
     "displayName_it": "Propulsion disruption module range bonus", 
-    "displayName_ja": "タックルモジュール範囲ボーナス", 
+    "displayName_ja": "推進力阻害モジュール範囲ボーナス", 
     "displayName_ko": "추진 방해 모듈 사거리 보너스", 
     "displayName_ru": "Повышен радиус действия средств ограничения подвижности", 
     "displayName_zh": "推进阻扰装备范围加成", 
@@ -1529,7 +1529,7 @@
     "displayName_es": "Remote Armor Repairer Strength Penalty", 
     "displayName_fr": "Pénalité de puissance sur les réparateurs de blindage à distance", 
     "displayName_it": "Remote Armor Repairer Strength Penalty", 
-    "displayName_ja": "リモート装甲修復装置強度ペナルティ", 
+    "displayName_ja": "リモートアーマーリペアラ強度ペナルティ", 
     "displayName_ko": "원격 장갑 수리 강도 페널티", 
     "displayName_ru": "Штраф на силу модулей дистанционного ремонта брони", 
     "displayName_zh": "远程装甲维修器强度惩罚", 
@@ -1631,7 +1631,7 @@
     "displayName_es": "Tether blocked", 
     "displayName_fr": "Arrimage bloqué", 
     "displayName_it": "Tether blocked", 
-    "displayName_ja": "テザリングを禁止", 
+    "displayName_ja": "牽引ブロック中", 
     "displayName_ko": "테더링 차단", 
     "displayName_ru": "Швартовка недоступна", 
     "displayName_zh": "驻留被阻止", 
@@ -1761,7 +1761,7 @@
     "displayName_es": "Signature Radius penalty", 
     "displayName_fr": "Pénalité du rayon de signature", 
     "displayName_it": "Signature Radius penalty", 
-    "displayName_ja": "Signature Radius penalty", 
+    "displayName_ja": "シグネチャ半径ペナルティ", 
     "displayName_ko": "시그니처 반경 페널티", 
     "displayName_ru": "Штраф к радиусу сигнатуры", 
     "displayName_zh": "信号半径惩罚", 
@@ -1785,7 +1785,7 @@
     "displayName_es": "Inertia Bonus", 
     "displayName_fr": "Bonus d'inertie", 
     "displayName_it": "Inertia Bonus", 
-    "displayName_ja": "Inertia Bonus", 
+    "displayName_ja": "慣性ボーナス", 
     "displayName_ko": "관성 계수 보너스", 
     "displayName_ru": "Увеличение инертности", 
     "displayName_zh": "惯性加成", 
@@ -1809,7 +1809,7 @@
     "displayName_es": "Max Velocity Bonus", 
     "displayName_fr": "Bonus de vitesse maximale", 
     "displayName_it": "Max Velocity Bonus", 
-    "displayName_ja": "Max Velocity Bonus", 
+    "displayName_ja": "最高速度ボーナス", 
     "displayName_ko": "최대 속도 보너스", 
     "displayName_ru": "Повышение максимальной скорости", 
     "displayName_zh": "最大速度加成", 
@@ -1833,7 +1833,7 @@
     "displayName_es": "Turret Tracking Speed bonus", 
     "displayName_fr": "Bonus de vitesse de poursuite des tourelles", 
     "displayName_it": "Turret Tracking Speed bonus", 
-    "displayName_ja": "Turret Tracking Speed bonus", 
+    "displayName_ja": "タレット追跡速度ボーナス", 
     "displayName_ko": "터렛 트래킹 속도 보너스", 
     "displayName_ru": "Повышение скорости слежения турелей", 
     "displayName_zh": "炮台跟踪速度加成", 
@@ -1862,7 +1862,7 @@
     "displayName_es": "Penalty to Shield Booster shield bonus", 
     "displayName_fr": "Pénalité du bonus de bouclier de booster de bouclier", 
     "displayName_it": "Penalty to Shield Booster shield bonus", 
-    "displayName_ja": "Penalty to Shield Booster shield bonus", 
+    "displayName_ja": "シールドブースターのシールドボーナス・ペナルティ", 
     "displayName_ko": "실드 부스터의 실드 보너스에 페널티", 
     "displayName_ru": "Штраф к бонусу прочности модуля накачки щитов", 
     "displayName_zh": "护盾回充增量器护盾值惩罚", 
@@ -1891,7 +1891,7 @@
     "displayName_es": "Bonus to Shield Booster duration", 
     "displayName_fr": "Bonus à la durée de booster de bouclier", 
     "displayName_it": "Bonus to Shield Booster duration", 
-    "displayName_ja": "Bonus to Shield Booster duration", 
+    "displayName_ja": "シールドブースター有効時間ボーナス", 
     "displayName_ko": "실드 부스터 사이클 시간 보너스", 
     "displayName_ru": "Ускорение цикла модулей накачки щитов", 
     "displayName_zh": "护盾回充增量器持续时间加成", 
@@ -1920,7 +1920,7 @@
     "displayName_es": "EM Resistance penalty", 
     "displayName_fr": "Pénalité à la résistance EM", 
     "displayName_it": "EM Resistance penalty", 
-    "displayName_ja": "EM Resistance penalty", 
+    "displayName_ja": "EMレジスタンス・ペナルティ", 
     "displayName_ko": "EM 저항력 페널티", 
     "displayName_ru": "Штраф к сопротивляемости ЭМ урону", 
     "displayName_zh": "电磁抗性惩罚", 
@@ -1950,7 +1950,7 @@
     "displayName_es": "Capacitor Recharge bonus", 
     "displayName_fr": "Bonus de recharge du capaciteur", 
     "displayName_it": "Capacitor Recharge bonus", 
-    "displayName_ja": "Capacitor Recharge bonus", 
+    "displayName_ja": "キャパシタリチャージボーナス", 
     "displayName_ko": "캐패시터 충전 보너스", 
     "displayName_ru": "Влияние на перезарядку накопителя", 
     "displayName_zh": "电容回充量加成", 
@@ -1974,7 +1974,7 @@
     "displayName_es": "Explosive Resistance penalty", 
     "displayName_fr": "Pénalité de résistance aux explosifs", 
     "displayName_it": "Explosive Resistance penalty", 
-    "displayName_ja": "Explosive Resistance penalty", 
+    "displayName_ja": "エクスプローシブレジスタンス・ペナルティ", 
     "displayName_ko": "폭발 저항력 페널티", 
     "displayName_ru": "Штраф к сопротивляемости взрывному урону", 
     "displayName_zh": "爆炸抗性惩罚", 
@@ -2004,7 +2004,7 @@
     "displayName_es": "Shield HP bonus", 
     "displayName_fr": "Bonus de PV du bouclier", 
     "displayName_it": "Shield HP bonus", 
-    "displayName_ja": "Shield HP bonus", 
+    "displayName_ja": "シールドHPボーナス", 
     "displayName_ko": "실드량 보너스", 
     "displayName_ru": "Повышение прочности щитов", 
     "displayName_zh": "护盾值加成", 
@@ -2028,7 +2028,7 @@
     "displayName_es": "Thermal Resistance penalty", 
     "displayName_fr": "Pénalité de résistance thermique", 
     "displayName_it": "Thermal Resistance penalty", 
-    "displayName_ja": "Thermal Resistance penalty", 
+    "displayName_ja": "サーマルレジスタンス・ペナルティ", 
     "displayName_ko": "열 저항력 페널티", 
     "displayName_ru": "Штраф к сопротивляемости тепловому урону", 
     "displayName_zh": "热能抗性惩罚", 
@@ -2058,7 +2058,7 @@
     "displayName_es": "Armor HP bonus", 
     "displayName_fr": "Bonus de PV du blindage", 
     "displayName_it": "Armor HP bonus", 
-    "displayName_ja": "Armor HP bonus", 
+    "displayName_ja": "アーマーHPボーナス", 
     "displayName_ko": "장갑 내구도 보너스", 
     "displayName_ru": "Повышение прочности брони", 
     "displayName_zh": "装甲值加成", 
@@ -2082,7 +2082,7 @@
     "displayName_es": "Turret Optimal and Falloff Range penalty", 
     "displayName_fr": "Pénalité de portée optimale et de déperdition des tourelles", 
     "displayName_it": "Turret Optimal and Falloff Range penalty", 
-    "displayName_ja": "Turret Optimal and Falloff Range penalty", 
+    "displayName_ja": "タレットの最適・精度低下範囲ボーナス", 
     "displayName_ko": "터렛 최적사거리 및 유효사거리 페널티", 
     "displayName_ru": "Штраф к оптимальной и добавочной дальности стрельбы турелей", 
     "displayName_zh": "炮台最佳射程和失准范围惩罚", 
@@ -2118,7 +2118,7 @@
     "displayName_es": "Velocity bonus", 
     "displayName_fr": "Bonus de vitesse", 
     "displayName_it": "Velocity bonus", 
-    "displayName_ja": "Velocity bonus", 
+    "displayName_ja": "速度ボーナス", 
     "displayName_ko": "속도 보너스", 
     "displayName_ru": "Повышение скорости", 
     "displayName_zh": "速度加成", 
@@ -2142,7 +2142,7 @@
     "displayName_es": "Kinetic Resistance penalty", 
     "displayName_fr": "Pénalité de résistance cinétique", 
     "displayName_it": "Kinetic Resistance penalty", 
-    "displayName_ja": "Kinetic Resistance penalty", 
+    "displayName_ja": "キネティックレジスタンス・ペナルティ", 
     "displayName_ko": "키네틱 저항력 페널티", 
     "displayName_ru": "Штраф к сопротивляемости кинетическому урону", 
     "displayName_zh": "动能抗性惩罚", 
@@ -2172,7 +2172,7 @@
     "displayName_es": "Scan Resolution bonus", 
     "displayName_fr": "Bonus de résolution du balayage", 
     "displayName_it": "Scan Resolution bonus", 
-    "displayName_ja": "Scan Resolution bonus", 
+    "displayName_ja": "スキャン分解能ボーナス", 
     "displayName_ko": "스캔 해상도 보너스", 
     "displayName_ru": "Влияние на разрешающую способность сенсоров", 
     "displayName_zh": "扫描分辨率加成", 
@@ -2196,7 +2196,7 @@
     "displayName_es": "Reduced Industrial Core Mining Drone Bonus", 
     "displayName_fr": "Bonus réduit de drone d'extraction de cellule industrielle", 
     "displayName_it": "Reduced Industrial Core Mining Drone Bonus", 
-    "displayName_ja": "Reduced Industrial Core Mining Drone Bonus", 
+    "displayName_ja": "工業コア採掘ドローンボーナス減少", 
     "displayName_ko": "산업코어 채굴 드론 보너스 감소", 
     "displayName_ru": "Уменьшен бонус для буровых дронов у промышленного ядра", 
     "displayName_zh": "降低的工业核心采矿无人机加成", 
@@ -2225,7 +2225,7 @@
     "displayName_es": "Damage bonus", 
     "displayName_fr": "Bonus de dégâts", 
     "displayName_it": "Damage bonus", 
-    "displayName_ja": "Damage bonus", 
+    "displayName_ja": "ダメージボーナス", 
     "displayName_ko": "피해량 보너스", 
     "displayName_ru": "Бонус урона", 
     "displayName_zh": "伤害加成", 
@@ -2270,7 +2270,7 @@
     "displayName_es": "Wreck Proximity Disrupting Warp Drives", 
     "displayName_fr": "Une épave à proximité perturbe les propulseurs de warp", 
     "displayName_it": "Wreck Proximity Disrupting Warp Drives", 
-    "displayName_ja": "Wreck Proximity Disrupting Warp Drives", 
+    "displayName_ja": "周囲の残骸によりワープドライブ阻害中", 
     "displayName_ko": "잔해로 인한 워프 드라이브 교란", 
     "displayName_ru": "Близость обломков нарушает работу варп-двигателей", 
     "displayName_zh": "残骸近距干扰跃迁引擎", 
@@ -2286,6 +2286,25 @@
     "operationName": "ModAdd", 
     "showOutputValueInUI": "Hide"
   }, 
+  "2106": {
+    "aggregateMode": "Maximum", 
+    "developerDescription": "ESS: Disables MJDs + MWDs", 
+    "itemModifiers": [], 
+    "locationGroupModifiers": [], 
+    "locationModifiers": [], 
+    "locationRequiredSkillModifiers": [
+      {
+        "dogmaAttributeID": 1349, 
+        "skillID": 3454
+      }, 
+      {
+        "dogmaAttributeID": 1349, 
+        "skillID": 4385
+      }
+    ], 
+    "operationName": "ModAdd", 
+    "showOutputValueInUI": "Hide"
+  }, 
   "2108": {
     "aggregateMode": "Maximum", 
     "developerDescription": "Webifier Range Bonus", 
@@ -2294,10 +2313,10 @@
     "displayName_es": "Stasis Webifier Range Bonus", 
     "displayName_fr": "Bonus de portée du générateur de stase", 
     "displayName_it": "Stasis Webifier Range Bonus", 
-    "displayName_ja": "Stasis Webifier Range Bonus", 
+    "displayName_ja": "ステイシスウェビファイヤーの範囲ボーナス", 
     "displayName_ko": "스테이시스 웹 생성기 사거리 보너스", 
     "displayName_ru": "Увеличение дальности действия стазис-индукторов", 
-    "displayName_zh": "Stasis Webifier Range Bonus", 
+    "displayName_zh": "停滞缠绕光束范围加成", 
     "displayNameID": 571849, 
     "itemModifiers": [], 
     "locationGroupModifiers": [
@@ -2310,5 +2329,54 @@
     "locationRequiredSkillModifiers": [], 
     "operationName": "PostPercent", 
     "showOutputValueInUI": "ShowNormal"
+  }, 
+  "2109": {
+    "aggregateMode": "Maximum", 
+    "developerDescription": "Module Heat Damage Reduction", 
+    "displayName_de": "Modul-Hitzeschadenreduktion", 
+    "displayName_en-us": "Module Heat Damage Reduction", 
+    "displayName_es": "Module Heat Damage Reduction", 
+    "displayName_fr": "Réduction des dégâts thermiques des modules", 
+    "displayName_it": "Module Heat Damage Reduction", 
+    "displayName_ja": "モジュール熱ダメージ減少", 
+    "displayName_ko": "모듈 과부하 피해 감소", 
+    "displayName_ru": "Снижение теплового урона для модулей", 
+    "displayName_zh": "装备超载伤害降低", 
+    "displayNameID": 573512, 
+    "itemModifiers": [], 
+    "locationGroupModifiers": [], 
+    "locationModifiers": [
+      {
+        "dogmaAttributeID": 1211
+      }
+    ], 
+    "locationRequiredSkillModifiers": [], 
+    "operationName": "PostPercent", 
+    "showOutputValueInUI": "ShowNormal"
+  }, 
+  "2110": {
+    "aggregateMode": "Maximum", 
+    "developerDescription": "Webifier Strength Bonus", 
+    "displayName_de": "Bonus auf die Stärke von Stasisnetzen", 
+    "displayName_en-us": "Stasis Webifier Strength Bonus", 
+    "displayName_es": "Stasis Webifier Strength Bonus", 
+    "displayName_fr": "Bonus à la puissance des générateurs de stase", 
+    "displayName_it": "Stasis Webifier Strength Bonus", 
+    "displayName_ja": "ステイシスウェビファイヤーの強度にボーナス", 
+    "displayName_ko": "스테이시스 웹 강도 증가", 
+    "displayName_ru": "Бонус к эффективности стазис-индуктора", 
+    "displayName_zh": "停滞缠绕光束强度加成", 
+    "displayNameID": 574787, 
+    "itemModifiers": [], 
+    "locationGroupModifiers": [
+      {
+        "dogmaAttributeID": 20, 
+        "groupID": 65
+      }
+    ], 
+    "locationModifiers": [], 
+    "locationRequiredSkillModifiers": [], 
+    "operationName": "PostPercent", 
+    "showOutputValueInUI": "ShowNormal"
   }
 }

staticdata/fsd_lite/evecategories.0.json

@@ -420,15 +420,15 @@
   }, 
   "41": {
     "categoryID": 41, 
-    "categoryName_de": "Planetarische Interaktion", 
-    "categoryName_en-us": "Planetary Interaction", 
-    "categoryName_es": "Planetary Interaction", 
-    "categoryName_fr": "Interaction planétaire", 
-    "categoryName_it": "Planetary Interaction", 
-    "categoryName_ja": "惑星開発", 
-    "categoryName_ko": "행성 상호작용", 
-    "categoryName_ru": "Эксплуатация ресурсов планет", 
-    "categoryName_zh": "行星互动", 
+    "categoryName_de": "Planetare Industrie", 
+    "categoryName_en-us": "Planetary Industry", 
+    "categoryName_es": "Planetary Industry", 
+    "categoryName_fr": "Industrie planétaire", 
+    "categoryName_it": "Planetary Industry", 
+    "categoryName_ja": "惑星インダストリー", 
+    "categoryName_ko": "행성 개발", 
+    "categoryName_ru": "Планетарная промышленность", 
+    "categoryName_zh": "行星工业", 
     "categoryNameID": 63569, 
     "published": true
   }, 
@@ -593,7 +593,7 @@
     "categoryName_es": "SKINs", 
     "categoryName_fr": "SKINS", 
     "categoryName_it": "SKINs", 
-    "categoryName_ja": "SKINs", 
+    "categoryName_ja": "SKIN", 
     "categoryName_ko": "SKIN", 
     "categoryName_ru": "Окраски", 
     "categoryName_zh": "涂装", 

staticdata/phobos/metadata.0.json

@@ -1,10 +1,10 @@
 [
   {
     "field_name": "client_build", 
-    "field_value": 1832008
+    "field_value": 1876339
   }, 
   {
     "field_name": "dump_time", 
-    "field_value": 1603787322
+    "field_value": 1613668225
   }
 ]

version.yml

@@ -1 +1 @@
-version: v2.30.0
+version: v2.34.0dev1