Bump appimage version

Fix bestla rof bonus and bump version
Bump version
2022-12-11 14:04:12 +04:00 · 2022-12-11 13:49:36 +04:00 · 2022-12-11 06:09:25 +04:00 · 2022-12-11 06:08:51 +04:00 · 2022-12-11 04:57:59 +04:00 · 2022-12-11 04:56:29 +04:00
89 changed files with 45868 additions and 6137 deletions
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -11,7 +11,7 @@ for:
    environment:
      APPVEYOR_SSH_KEY: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDJDW/+oYNGOiPvwuwAL9tc/LQgg58aosIVpMYfepQZ20V+VZnHpZh8IRDA8Jo5xht19p2PksA+hFgqA0kpKtrSkuiWdE8rATQItfk4gf7yB0yGasJGGQZYazy9k/9XtmYkq2HHOOeEqdxvrICddJQ88MLCLT9lJENSUP/YS/yGcjZFXVxE11pTeIcqlCRU+3eYa1v7BeNvXIKNhZoK5orXWrtuH3cy8jrSns/u70aYfJ6B2jA8CnWnDbuvpeQtEY61SQqlKUsSArNa8NAsXj41wr3Ar9gAG9330w7EMTqlutk8HZO35uHI0q5qinUhaQYufPPrVkb2L/N+ZCfu0fnh appveyor"
      APPIMAGE_TOOL: appimagetool-x86_64.AppImage
-      PYTHON_APPIMAGE: python3.7.15-cp37-cp37m-manylinux2014_x86_64.AppImage
+      PYTHON_APPIMAGE: python3.7.16-cp37-cp37m-manylinux2014_x86_64.AppImage
      DEPLOY_DIR: AppDir/opt/pyfa
 #      APPVEYOR_SSH_BLOCK: true
    cache:
--- a/db_update.py
+++ b/db_update.py
@@ -117,8 +117,7 @@ def update_db():
        for k, v in compiled_data.items():
            row = {}
            row.update(v)
-            if keyIdName not in row:
-                row[keyIdName] = int(k)
+            row[keyIdName] = int(k)
            data.append(row)
        return data

@@ -642,6 +641,140 @@ def update_db():
            effect.effectName = effectName
            item.effects[effectName] = effect

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

--- a/eos/effects.py
+++ b/eos/effects.py
--- a/gui/builtinContextMenus/commandFitAdd.py
+++ b/gui/builtinContextMenus/commandFitAdd.py
@@ -44,7 +44,6 @@ class AddCommandFit(ContextMenuUnconditional):
    def display(self, callingWindow, srcContext):
        if self.mainFrame.getActiveFit() is None or len(self.__class__.commandFits) == 0 or srcContext != "commandView":
            return False
-
        return True

    def getText(self, callingWindow, itmContext):
@@ -52,6 +51,8 @@ class AddCommandFit(ContextMenuUnconditional):

    def addFit(self, menu, fit, includeShip=False):
        label = fit.name if not includeShip else "({}) {}".format(fit.ship.item.name, fit.name)
+        if not label:
+            label = ' '
        id = ContextMenuUnconditional.nextID()
        self.fitMenuItemIds[id] = fit
        menuItem = wx.MenuItem(menu, id, label)
--- a/gui/builtinContextMenus/envEffectAdd.py
+++ b/gui/builtinContextMenus/envEffectAdd.py
@@ -123,7 +123,7 @@ class AddEnvironmentEffect(ContextMenuUnconditional):
        data.groups[_t('Abyssal Weather')] = self.getAbyssalWeather()
        data.groups[_t('Sansha Incursion')] = self.getEffectBeacons(
            _t('ContextMenu|ProjectedEffectManipulation|Sansha Incursion'))
-        data.groups[_t('Triglavian Invasion')] = self.getDestructibleBeacons()
+        data.groups[_t('Triglavian Invasion')] = self.getInvasionBeacons()
        return data

    def getEffectBeacons(self, *groups, extra_garbage=()):
@@ -231,5 +231,12 @@ class AddEnvironmentEffect(ContextMenuUnconditional):
        data.sort()
        return data

+    def getInvasionBeacons(self):
+        data = self.getDestructibleBeacons()
+        # Turnur weather
+        item = Market.getInstance().getItem(74002)
+        data.items.append(Entry(item.ID, item.name, item.name))
+        return data
+

 AddEnvironmentEffect.register()
--- a/imgs/icons/24411@1x.png
+++ b/imgs/icons/24411@1x.png
--- a/imgs/icons/24411@2x.png
+++ b/imgs/icons/24411@2x.png
--- a/imgs/icons/24497@1x.png
+++ b/imgs/icons/24497@1x.png
--- a/imgs/icons/24497@2x.png
+++ b/imgs/icons/24497@2x.png
--- a/imgs/icons/25240@1x.png
+++ b/imgs/icons/25240@1x.png
--- a/imgs/icons/25240@2x.png
+++ b/imgs/icons/25240@2x.png
--- a/imgs/icons/25241@1x.png
+++ b/imgs/icons/25241@1x.png
--- a/imgs/icons/25241@2x.png
+++ b/imgs/icons/25241@2x.png
--- a/imgs/icons/25242@1x.png
+++ b/imgs/icons/25242@1x.png
--- a/imgs/icons/25242@2x.png
+++ b/imgs/icons/25242@2x.png
--- a/imgs/icons/25243@1x.png
+++ b/imgs/icons/25243@1x.png
--- a/imgs/icons/25243@2x.png
+++ b/imgs/icons/25243@2x.png
--- a/imgs/icons/25467@1x.png
+++ b/imgs/icons/25467@1x.png
--- a/imgs/icons/25467@2x.png
+++ b/imgs/icons/25467@2x.png
--- a/imgs/icons/25468@1x.png
+++ b/imgs/icons/25468@1x.png
--- a/imgs/icons/25468@2x.png
+++ b/imgs/icons/25468@2x.png
--- a/imgs/renders/1067@1x.png
+++ b/imgs/renders/1067@1x.png
--- a/imgs/renders/1067@2x.png
+++ b/imgs/renders/1067@2x.png
--- a/imgs/renders/1730@1x.png
+++ b/imgs/renders/1730@1x.png
--- a/imgs/renders/1730@2x.png
+++ b/imgs/renders/1730@2x.png
--- a/imgs/renders/1731@1x.png
+++ b/imgs/renders/1731@1x.png
--- a/imgs/renders/1731@2x.png
+++ b/imgs/renders/1731@2x.png
--- a/imgs/renders/1733@1x.png
+++ b/imgs/renders/1733@1x.png
--- a/imgs/renders/1733@2x.png
+++ b/imgs/renders/1733@2x.png
--- a/imgs/renders/20227@1x.png
+++ b/imgs/renders/20227@1x.png
--- a/imgs/renders/20227@2x.png
+++ b/imgs/renders/20227@2x.png
--- a/imgs/renders/21279@1x.png
+++ b/imgs/renders/21279@1x.png
--- a/imgs/renders/21279@2x.png
+++ b/imgs/renders/21279@2x.png
--- a/imgs/renders/2239@1x.png
+++ b/imgs/renders/2239@1x.png
--- a/imgs/renders/2239@2x.png
+++ b/imgs/renders/2239@2x.png
--- a/imgs/renders/25573@1x.png
+++ b/imgs/renders/25573@1x.png
--- a/imgs/renders/25573@2x.png
+++ b/imgs/renders/25573@2x.png
--- a/imgs/renders/25574@1x.png
+++ b/imgs/renders/25574@1x.png
--- a/imgs/renders/25574@2x.png
+++ b/imgs/renders/25574@2x.png
--- a/imgs/renders/25575@1x.png
+++ b/imgs/renders/25575@1x.png
--- a/imgs/renders/25575@2x.png
+++ b/imgs/renders/25575@2x.png
--- a/imgs/renders/25576@1x.png
+++ b/imgs/renders/25576@1x.png
--- a/imgs/renders/25576@2x.png
+++ b/imgs/renders/25576@2x.png
--- a/imgs/renders/25578@1x.png
+++ b/imgs/renders/25578@1x.png
--- a/imgs/renders/25578@2x.png
+++ b/imgs/renders/25578@2x.png
--- a/imgs/renders/25601@1x.png
+++ b/imgs/renders/25601@1x.png
--- a/imgs/renders/25601@2x.png
+++ b/imgs/renders/25601@2x.png
--- a/imgs/renders/25602@1x.png
+++ b/imgs/renders/25602@1x.png
--- a/imgs/renders/25602@2x.png
+++ b/imgs/renders/25602@2x.png
--- a/imgs/renders/25603@1x.png
+++ b/imgs/renders/25603@1x.png
--- a/imgs/renders/25603@2x.png
+++ b/imgs/renders/25603@2x.png
--- a/imgs/renders/25604@1x.png
+++ b/imgs/renders/25604@1x.png
--- a/imgs/renders/25604@2x.png
+++ b/imgs/renders/25604@2x.png
--- a/imgs/renders/25606@1x.png
+++ b/imgs/renders/25606@1x.png
--- a/imgs/renders/25606@2x.png
+++ b/imgs/renders/25606@2x.png
--- a/imgs/renders/25607@1x.png
+++ b/imgs/renders/25607@1x.png
--- a/imgs/renders/25607@2x.png
+++ b/imgs/renders/25607@2x.png
--- a/imgs/renders/25608@1x.png
+++ b/imgs/renders/25608@1x.png
--- a/imgs/renders/25608@2x.png
+++ b/imgs/renders/25608@2x.png
--- a/imgs/renders/25609@1x.png
+++ b/imgs/renders/25609@1x.png
--- a/imgs/renders/25609@2x.png
+++ b/imgs/renders/25609@2x.png
--- a/imgs/renders/2786@1x.png
+++ b/imgs/renders/2786@1x.png
--- a/imgs/renders/2786@2x.png
+++ b/imgs/renders/2786@2x.png
--- a/imgs/renders/2905@1x.png
+++ b/imgs/renders/2905@1x.png
--- a/imgs/renders/2905@2x.png
+++ b/imgs/renders/2905@2x.png
--- a/imgs/renders/3814@1x.png
+++ b/imgs/renders/3814@1x.png
--- a/imgs/renders/3814@2x.png
+++ b/imgs/renders/3814@2x.png
--- a/scripts/icons_update.py
+++ b/scripts/icons_update.py
@@ -59,8 +59,6 @@ copyfile(graphics_file, os.path.join(os.path.dirname(os.path.abspath(__file__)),

 import graphicIDsLoader

-print(dir(graphicIDsLoader))
-
 graphics = graphicIDsLoader.load(os.path.join(to_path, 'graphicIDs.fsdbinary'))

 graphics_py_ob = {}
@@ -216,8 +214,6 @@ if toadd:
        for fname in sorted(missing):
            print(('    {}'.format(fname)))

-print(missing)
-
 print("Doing renders")

 needed.clear()
@@ -232,7 +228,7 @@ toupdate = existing.intersection(needed)
 toadd = needed.difference(existing)

 if toadd:
-    print(('Adding {} icons...'.format(len(toadd))))
+    print(('Adding {} renders...'.format(len(toadd))))
    missing = set()
    for fname in sorted(toadd):
        try:
@@ -252,6 +248,6 @@ if toadd:
            fullpath = os.path.join(render_dir, fullname)
            icon.save(fullpath, 'png')
    if missing:
-        print(('  {} icons are missing in export:'.format(len(missing))))
+        print(('  {} renders are missing in export:'.format(len(missing))))
        for fname in sorted(missing):
            print(('    {}'.format(fname)))
--- a/service/market.py
+++ b/service/market.py
@@ -319,6 +319,8 @@ class Market:
            "Raiju"                       : self.les_grp,  # AT17 prize
            "Laelaps"                     : self.les_grp,  # AT17 prize
            "Boobook"                     : self.les_grp,  # 19th EVE anniversary gift
+            "Geri"                        : self.les_grp,  # AT18 prize
+            "Bestla"                      : self.les_grp,  # AT18 prize
        }

        self.ITEMS_FORCEGROUP_R = self.__makeRevDict(self.ITEMS_FORCEGROUP)
--- a/staticdata/fsd_binary/categories.0.json
+++ b/staticdata/fsd_binary/categories.0.json
@@ -310,7 +310,7 @@
    "categoryID": 26, 
    "categoryName_de": "WeltRaum", 
    "categoryName_en-us": "WorldSpace", 
-    "categoryName_es": "Lugares del mundo", 
+    "categoryName_es": "WorldSpace", 
    "categoryName_fr": "Espace planétaire", 
    "categoryName_it": "WorldSpace", 
    "categoryName_ja": "ワールドスペース", 
@@ -628,6 +628,20 @@
    "categoryNameID": 587126, 
    "published": 0
  }, 
+  "2118": {
+    "categoryID": 2118, 
+    "categoryName_de": "Anpassung", 
+    "categoryName_en-us": "Personalization", 
+    "categoryName_es": "Personalización", 
+    "categoryName_fr": "Personnalisation", 
+    "categoryName_it": "Personalization", 
+    "categoryName_ja": "カスタマイズ", 
+    "categoryName_ko": "개인화", 
+    "categoryName_ru": "Персонализация", 
+    "categoryName_zh": "Personalization", 
+    "categoryNameID": 631766, 
+    "published": 1
+  }, 
  "350001": {
    "categoryID": 350001, 
    "categoryName_de": "Infanterie", 
--- a/staticdata/fsd_binary/dogmaattributes.0.json
+++ b/staticdata/fsd_binary/dogmaattributes.0.json
@@ -3097,7 +3097,7 @@
    "description": "Chance of being able to resist a cargo scan.", 
    "displayName_de": "Widerstand gegen Fracht-Scans", 
    "displayName_en-us": "Cargo Scan Resistance", 
-    "displayName_es": "Cargo Scan Resistance", 
+    "displayName_es": "Resistencia al escaneo de carga", 
    "displayName_fr": "Résistance au scan de la cargaison", 
    "displayName_it": "Cargo Scan Resistance", 
    "displayName_ja": "カーゴスキャンレジスタンス", 
@@ -9280,7 +9280,6 @@
    "description": "skill bonus attribute2 for gallente battleship", 
    "displayWhenZero": 0, 
    "highIsGood": 1, 
-    "iconID": 0, 
    "name": "shipBonusGB2", 
    "published": 0, 
    "stackable": 1
@@ -13628,7 +13627,7 @@
    "description": "Skill attribute for increasing effectiveness on Target Painters", 
    "displayName_de": "Zielmarkierungsbonus", 
    "displayName_en-us": "Target Painting Bonus", 
-    "displayName_es": "Bonificación de revelación de objetivo", 
+    "displayName_es": "Bonificación de revelación de objetivos", 
    "displayName_fr": "Bonus de marquage de cible", 
    "displayName_it": "Target Painting Bonus", 
    "displayName_ja": "ターゲットペインティングボーナス", 
@@ -21265,7 +21264,7 @@
    "description": "Target Painting Command Bonus", 
    "displayName_de": "Target Painting Command-Bonus", 
    "displayName_en-us": "Target Painting Command Bonus", 
-    "displayName_es": "Bonificación de mando de revelación de objetivo", 
+    "displayName_es": "Bonificación de mando de revelación de objetivos", 
    "displayName_fr": "Bonus de commandement de marquage de cible", 
    "displayName_it": "Target Painting Command Bonus", 
    "displayName_ja": "ターゲットペインティング用コマンドボーナス", 
@@ -44382,7 +44381,7 @@
    "description": "Warp Scramble Strength Bonus", 
    "displayName_de": "Bonus auf Warp-Störungsstärke", 
    "displayName_en-us": "Warp Scramble Strength Bonus", 
-    "displayName_es": "Warp Scramble Strength Bonus", 
+    "displayName_es": "Bonificación de fuerza de distorsión de warp", 
    "displayName_fr": "Bonus de puissance d'inhibition de warp", 
    "displayName_it": "Warp Scramble Strength Bonus", 
    "displayName_ja": "ワープスクランブル強度ボーナス", 
@@ -46127,9 +46126,10 @@
  }, 
  "3236": {
    "attributeID": 3236, 
-    "categoryID": 9, 
+    "categoryID": 51, 
    "dataType": 3, 
    "defaultValue": 0.0, 
+    "description": "If set to true, this results in no mining waste.", 
    "displayWhenZero": 0, 
    "highIsGood": 0, 
    "name": "ignoreMiningWaste", 
@@ -46611,7 +46611,7 @@
    "defaultValue": 0.0, 
    "displayName_de": "Widerstandsbonus gegen Stasisnetze", 
    "displayName_en-us": "Stasis Webifier Resistance Bonus", 
-    "displayName_es": "Stasis Webifier Resistance Bonus", 
+    "displayName_es": "Bonificación de resistencia a redes ralentizadoras", 
    "displayName_fr": "Bonus de résistance du générateur de stase", 
    "displayName_it": "Stasis Webifier Resistance Bonus", 
    "displayName_ja": "ステイシスウェビファイヤーレジスタンスボーナス", 
@@ -46634,7 +46634,7 @@
    "defaultValue": 0.0, 
    "displayName_de": "Bonus auf Schadensresistenz von Panzerungen", 
    "displayName_en-us": "Armor Damage Resistance Bonus", 
-    "displayName_es": "Armor Damage Resistance Bonus", 
+    "displayName_es": "Bonificación de resistencia a daños en el blindaje", 
    "displayName_fr": "Bonus de résistance aux dégâts du blindage", 
    "displayName_it": "Armor Damage Resistance Bonus", 
    "displayName_ja": "アーマーダメージレジスタンスボーナス", 
@@ -46725,6 +46725,29 @@
    "published": 0, 
    "stackable": 1
  }, 
+  "5206": {
+    "attributeID": 5206, 
+    "categoryID": 7, 
+    "dataType": 3, 
+    "defaultValue": 0.0, 
+    "description": "It is a Boolean Value that defaults to false. If true, it will only allow players to Hack if they belong to the Faction that is an enemy of the Occupier of the Star System.", 
+    "displayName_de": "Nur Angreifer aus dem Fraktionskrieg zulassen", 
+    "displayName_en-us": "Allow Only Factional Warfare Attackers", 
+    "displayName_es": "Permitir solo atacantes de la guerra de facciones", 
+    "displayName_fr": "N'autoriser que les assaillants de la guerre de faction", 
+    "displayName_it": "Allow Only Factional Warfare Attackers", 
+    "displayName_ja": "国家間戦争の攻撃側のみが利用可能", 
+    "displayName_ko": "팩션 전쟁 공격 측 입장 가능", 
+    "displayName_ru": "Допускать только нападающую сторону МВ", 
+    "displayName_zh": "Allow Only Factional Warfare Attackers", 
+    "displayNameID": 635862, 
+    "displayWhenZero": 0, 
+    "highIsGood": 0, 
+    "name": "allowOnlyFwAttackers", 
+    "published": 0, 
+    "stackable": 0, 
+    "unitID": 137
+  }, 
  "5207": {
    "attributeID": 5207, 
    "categoryID": 37, 
@@ -46735,5 +46758,328 @@
    "name": "shipBonusMBC3", 
    "published": 0, 
    "stackable": 1
+  }, 
+  "5214": {
+    "attributeID": 2285, 
+    "categoryID": 37, 
+    "dataType": 5, 
+    "defaultValue": 0.0, 
+    "description": "Multiplied by Amarr Dreadnought skill level", 
+    "displayWhenZero": 0, 
+    "highIsGood": 1, 
+    "name": "shipBonusDreadnoughtA4", 
+    "published": 0, 
+    "stackable": 1
+  }, 
+  "5215": {
+    "attributeID": 2291, 
+    "categoryID": 37, 
+    "dataType": 5, 
+    "defaultValue": 0.0, 
+    "description": "Multiplied by Gallente Dreadnought skill level", 
+    "displayWhenZero": 0, 
+    "highIsGood": 1, 
+    "name": "shipBonusDreadnoughtG4", 
+    "published": 0, 
+    "stackable": 1
+  }, 
+  "5216": {
+    "attributeID": 2291, 
+    "categoryID": 37, 
+    "dataType": 5, 
+    "defaultValue": 0.0, 
+    "description": "Multiplied by Gallente Dreadnought skill level", 
+    "displayWhenZero": 0, 
+    "highIsGood": 1, 
+    "name": "shipBonusDreadnoughtG5", 
+    "published": 0, 
+    "stackable": 1
+  }, 
+  "5218": {
+    "attributeID": 1986, 
+    "categoryID": 37, 
+    "dataType": 5, 
+    "defaultValue": 0.0, 
+    "description": "", 
+    "displayWhenZero": 0, 
+    "highIsGood": 1, 
+    "name": "shipBonusNavyDestroyerAmarr1", 
+    "published": 0, 
+    "stackable": 1
+  }, 
+  "5219": {
+    "attributeID": 1986, 
+    "categoryID": 37, 
+    "dataType": 5, 
+    "defaultValue": 0.0, 
+    "description": "", 
+    "displayWhenZero": 0, 
+    "highIsGood": 1, 
+    "name": "shipBonusNavyDestroyerAmarr2", 
+    "published": 0, 
+    "stackable": 1
+  }, 
+  "5220": {
+    "attributeID": 1986, 
+    "categoryID": 37, 
+    "dataType": 5, 
+    "defaultValue": 0.0, 
+    "description": "", 
+    "displayWhenZero": 0, 
+    "highIsGood": 1, 
+    "name": "shipBonusNavyDestroyerAmarr3", 
+    "published": 0, 
+    "stackable": 1
+  }, 
+  "5221": {
+    "attributeID": 1986, 
+    "categoryID": 37, 
+    "dataType": 5, 
+    "defaultValue": 0.0, 
+    "description": "", 
+    "displayWhenZero": 0, 
+    "highIsGood": 1, 
+    "name": "shipBonusNavyDestroyerAmarr4", 
+    "published": 0, 
+    "stackable": 1
+  }, 
+  "5222": {
+    "attributeID": 1986, 
+    "categoryID": 37, 
+    "dataType": 5, 
+    "defaultValue": 0.0, 
+    "description": "", 
+    "displayWhenZero": 0, 
+    "highIsGood": 1, 
+    "name": "shipBonusNavyDestroyerAmarr5", 
+    "published": 0, 
+    "stackable": 1
+  }, 
+  "5223": {
+    "attributeID": 1986, 
+    "categoryID": 37, 
+    "dataType": 5, 
+    "defaultValue": 0.0, 
+    "description": "", 
+    "displayWhenZero": 0, 
+    "highIsGood": 1, 
+    "name": "shipBonusNavyDestroyerAmarr6", 
+    "published": 0, 
+    "stackable": 1
+  }, 
+  "5224": {
+    "attributeID": 1986, 
+    "categoryID": 37, 
+    "dataType": 5, 
+    "defaultValue": 0.0, 
+    "description": "", 
+    "displayWhenZero": 0, 
+    "highIsGood": 1, 
+    "name": "shipBonusNavyDestroyerAmarr7", 
+    "published": 0, 
+    "stackable": 1
+  }, 
+  "5225": {
+    "attributeID": 2015, 
+    "categoryID": 37, 
+    "dataType": 5, 
+    "defaultValue": 0.0, 
+    "description": "", 
+    "displayWhenZero": 0, 
+    "highIsGood": 1, 
+    "name": "shipBonusNavyDestroyerCaldari1", 
+    "published": 0, 
+    "stackable": 1
+  }, 
+  "5226": {
+    "attributeID": 2015, 
+    "categoryID": 37, 
+    "dataType": 5, 
+    "defaultValue": 0.0, 
+    "description": "", 
+    "displayWhenZero": 0, 
+    "highIsGood": 1, 
+    "name": "shipBonusNavyDestroyerCaldari5", 
+    "published": 0, 
+    "stackable": 1
+  }, 
+  "5227": {
+    "attributeID": 2015, 
+    "categoryID": 37, 
+    "dataType": 5, 
+    "defaultValue": 0.0, 
+    "description": "", 
+    "displayWhenZero": 0, 
+    "highIsGood": 1, 
+    "name": "shipBonusNavyDestroyerCaldari4", 
+    "published": 0, 
+    "stackable": 1
+  }, 
+  "5228": {
+    "attributeID": 2015, 
+    "categoryID": 37, 
+    "dataType": 5, 
+    "defaultValue": 0.0, 
+    "description": "", 
+    "displayWhenZero": 0, 
+    "highIsGood": 1, 
+    "name": "shipBonusNavyDestroyerCaldari2", 
+    "published": 0, 
+    "stackable": 1
+  }, 
+  "5229": {
+    "attributeID": 2015, 
+    "categoryID": 37, 
+    "dataType": 5, 
+    "defaultValue": 0.0, 
+    "description": "", 
+    "displayWhenZero": 0, 
+    "highIsGood": 1, 
+    "name": "shipBonusNavyDestroyerCaldari3", 
+    "published": 0, 
+    "stackable": 1
+  }, 
+  "5230": {
+    "attributeID": 2027, 
+    "categoryID": 37, 
+    "dataType": 5, 
+    "defaultValue": 0.0, 
+    "description": "", 
+    "displayWhenZero": 0, 
+    "highIsGood": 1, 
+    "name": "shipBonusNavyDestroyerGallente1", 
+    "published": 0, 
+    "stackable": 1
+  }, 
+  "5231": {
+    "attributeID": 2027, 
+    "categoryID": 37, 
+    "dataType": 5, 
+    "defaultValue": 0.0, 
+    "description": "", 
+    "displayWhenZero": 0, 
+    "highIsGood": 1, 
+    "name": "shipBonusNavyDestroyerGallente5", 
+    "published": 0, 
+    "stackable": 1
+  }, 
+  "5232": {
+    "attributeID": 2027, 
+    "categoryID": 37, 
+    "dataType": 5, 
+    "defaultValue": 0.0, 
+    "description": "", 
+    "displayWhenZero": 0, 
+    "highIsGood": 1, 
+    "name": "shipBonusNavyDestroyerGallente2", 
+    "published": 0, 
+    "stackable": 1
+  }, 
+  "5233": {
+    "attributeID": 2027, 
+    "categoryID": 37, 
+    "dataType": 5, 
+    "defaultValue": 0.0, 
+    "description": "", 
+    "displayWhenZero": 0, 
+    "highIsGood": 1, 
+    "name": "shipBonusNavyDestroyerGallente3", 
+    "published": 0, 
+    "stackable": 1
+  }, 
+  "5234": {
+    "attributeID": 2027, 
+    "categoryID": 37, 
+    "dataType": 5, 
+    "defaultValue": 0.0, 
+    "description": "", 
+    "displayWhenZero": 0, 
+    "highIsGood": 1, 
+    "name": "shipBonusNavyDestroyerGallente4", 
+    "published": 0, 
+    "stackable": 1
+  }, 
+  "5235": {
+    "attributeID": 2004, 
+    "categoryID": 37, 
+    "dataType": 5, 
+    "defaultValue": 0.0, 
+    "description": "", 
+    "displayWhenZero": 0, 
+    "highIsGood": 1, 
+    "name": "shipBonusNavyDestroyerMinmatar1", 
+    "published": 0, 
+    "stackable": 1
+  }, 
+  "5236": {
+    "attributeID": 2004, 
+    "categoryID": 37, 
+    "dataType": 5, 
+    "defaultValue": 0.0, 
+    "description": "", 
+    "displayWhenZero": 0, 
+    "highIsGood": 1, 
+    "name": "shipBonusNavyDestroyerMinmatar2", 
+    "published": 0, 
+    "stackable": 1
+  }, 
+  "5237": {
+    "attributeID": 2004, 
+    "categoryID": 37, 
+    "dataType": 5, 
+    "defaultValue": 0.0, 
+    "description": "", 
+    "displayWhenZero": 0, 
+    "highIsGood": 1, 
+    "name": "shipBonusNavyDestroyerMinmatar3", 
+    "published": 0, 
+    "stackable": 1
+  }, 
+  "5238": {
+    "attributeID": 2004, 
+    "categoryID": 37, 
+    "dataType": 5, 
+    "defaultValue": 0.0, 
+    "description": "", 
+    "displayWhenZero": 0, 
+    "highIsGood": 1, 
+    "name": "shipBonusNavyDestroyerMinmatar4", 
+    "published": 0, 
+    "stackable": 1
+  }, 
+  "5239": {
+    "attributeID": 2004, 
+    "categoryID": 37, 
+    "dataType": 5, 
+    "defaultValue": 0.0, 
+    "description": "", 
+    "displayWhenZero": 0, 
+    "highIsGood": 1, 
+    "name": "shipBonusNavyDestroyerMinmatar5", 
+    "published": 0, 
+    "stackable": 1
+  }, 
+  "5240": {
+    "attributeID": 5240, 
+    "categoryID": 9, 
+    "dataType": 5, 
+    "defaultValue": 0.0, 
+    "description": "skill bonus attribute3 for gallente battleship", 
+    "displayWhenZero": 0, 
+    "highIsGood": 1, 
+    "name": "shipBonusGB3", 
+    "published": 0, 
+    "stackable": 1
+  }, 
+  "5248": {
+    "attributeID": 5248, 
+    "categoryID": 37, 
+    "dataType": 5, 
+    "defaultValue": 0.0, 
+    "displayWhenZero": 0, 
+    "highIsGood": 1, 
+    "name": "shipBonusDreadnoughtM4", 
+    "published": 0, 
+    "stackable": 1
  }
 }
--- a/staticdata/fsd_binary/dogmaeffects.0.json
+++ b/staticdata/fsd_binary/dogmaeffects.0.json
--- a/staticdata/fsd_binary/dogmaunits.0.json
+++ b/staticdata/fsd_binary/dogmaunits.0.json
@@ -895,7 +895,7 @@
    "description_it": "Hours", 
    "description_ja": "時間", 
    "description_ko": "h", 
-    "description_ru": "часы\n", 
+    "description_ru": "часы", 
    "description_zh": "小时", 
    "descriptionID": 77995, 
    "name": "Hours"
--- a/staticdata/fsd_binary/groups.0.json
+++ b/staticdata/fsd_binary/groups.0.json
@@ -977,7 +977,7 @@
    "groupNameID": 63623, 
    "iconID": 0, 
    "published": 1, 
-    "useBasePrice": 0
+    "useBasePrice": 1
  }, 
  "63": {
    "anchorable": 0, 
@@ -1367,7 +1367,7 @@
    "groupID": 92, 
    "groupName_de": "Mine", 
    "groupName_en-us": "Mine", 
-    "groupName_es": "Extraer", 
+    "groupName_es": "Minería", 
    "groupName_fr": "Mine", 
    "groupName_it": "Mine", 
    "groupName_ja": "機雷", 
@@ -4157,7 +4157,7 @@
    "groupID": 314, 
    "groupName_de": "Diverse", 
    "groupName_en-us": "Miscellaneous", 
-    "groupName_es": "Otro", 
+    "groupName_es": "Varios", 
    "groupName_fr": "Divers", 
    "groupName_it": "Miscellaneous", 
    "groupName_ja": "その他", 
@@ -6715,7 +6715,7 @@
    "groupID": 471, 
    "groupName_de": "Corporation-Hangar-Struktur", 
    "groupName_en-us": "Corporate Hangar Array", 
-    "groupName_es": "Dársena de hangares corporativos", 
+    "groupName_es": "Dársenas de hangares corporativos", 
    "groupName_fr": "Module du hangar corporatif", 
    "groupName_it": "Corporate Hangar Array", 
    "groupName_ja": "コーポハンガー施設", 
@@ -6895,7 +6895,7 @@
    "groupID": 480, 
    "groupName_de": "Tarnkappensendeanlage", 
    "groupName_en-us": "Stealth Emitter Array", 
-    "groupName_es": "Sistema emisor de sigilo", 
+    "groupName_es": "Sistema emisor sigiloso", 
    "groupName_fr": "Module d'émission furtif", 
    "groupName_it": "Stealth Emitter Array", 
    "groupName_ja": "ステルスエミッター施設", 
@@ -13113,7 +13113,7 @@
    "groupID": 832, 
    "groupName_de": "Logistik", 
    "groupName_en-us": "Logistics", 
-    "groupName_es": "Naves logísticas", 
+    "groupName_es": "Logística", 
    "groupName_fr": "Logistique", 
    "groupName_it": "Logistics", 
    "groupName_ja": "支援型巡洋艦", 
@@ -13233,7 +13233,7 @@
    "groupID": 838, 
    "groupName_de": "Anziehungsgeneratoranlage", 
    "groupName_en-us": "Cynosural Generator Array", 
-    "groupName_es": "Sistema generador cinosural", 
+    "groupName_es": "Sistemas generadores cinosurales", 
    "groupName_fr": "Module de génération cynosurale", 
    "groupName_it": "Cynosural Generator Array", 
    "groupName_ja": "サイノシュアル生成施設", 
@@ -13993,7 +13993,7 @@
    "groupID": 877, 
    "groupName_de": "Zielmarkierungsbatterie", 
    "groupName_en-us": "Target Painting Battery", 
-    "groupName_es": "Batería de revelación de objetivos", 
+    "groupName_es": "Batería de revelador de objetivo", 
    "groupName_fr": "Batterie de marquage de cible", 
    "groupName_it": "Target Painting Battery", 
    "groupName_ja": "ターゲットペインティングバッテリー", 
@@ -14901,7 +14901,7 @@
    "groupID": 935, 
    "groupName_de": "WeltRaum", 
    "groupName_en-us": "WorldSpace", 
-    "groupName_es": "Lugares del mundo", 
+    "groupName_es": "WorldSpace", 
    "groupName_fr": "Espace planétaire", 
    "groupName_it": "WorldSpace", 
    "groupName_ja": "ワールドスペース", 
@@ -19466,7 +19466,7 @@
    "groupID": 1319, 
    "groupName_de": "Verschiedenes", 
    "groupName_en-us": "Miscellaneous", 
-    "groupName_es": "Otro", 
+    "groupName_es": "Varios", 
    "groupName_fr": "Divers", 
    "groupName_it": "Miscellaneous", 
    "groupName_ja": "その他", 
@@ -28183,25 +28183,200 @@
    "published": 1, 
    "useBasePrice": 0
  }, 
+  "4471": {
+    "anchorable": 0, 
+    "anchored": 0, 
+    "categoryID": 2118, 
+    "fittableNonSingleton": 0, 
+    "groupID": 4471, 
+    "groupName_de": "Schiffsanpassung", 
+    "groupName_en-us": "Ship Personalization", 
+    "groupName_es": "Personalización de naves", 
+    "groupName_fr": "Personnalisation de vaisseau", 
+    "groupName_it": "Ship Personalization", 
+    "groupName_ja": "艦船カスタマイズ", 
+    "groupName_ko": "함선 개인화", 
+    "groupName_ru": "Персонализация корабля", 
+    "groupName_zh": "Ship Personalization", 
+    "groupNameID": 631767, 
+    "published": 1, 
+    "useBasePrice": 0
+  }, 
  "4477": {
    "anchorable": 0, 
    "anchored": 0, 
    "categoryID": 22, 
    "fittableNonSingleton": 0, 
    "groupID": 4477, 
-    "groupName_de": "Mobiles Ziel", 
-    "groupName_en-us": "Mobile Objective", 
-    "groupName_es": "Mobile Objective", 
-    "groupName_fr": "Objectif mobile", 
-    "groupName_it": "Mobile Objective", 
-    "groupName_ja": "移動目標", 
-    "groupName_ko": "이동형 목표물", 
-    "groupName_ru": "Подвижная цель", 
-    "groupName_zh": "Mobile Objective", 
+    "groupName_de": "FK-Propaganda-Sendeanlage", 
+    "groupName_en-us": "FW Propaganda Broadcast Structure", 
+    "groupName_es": "Estructura de transmisión de propaganda de la GF", 
+    "groupName_fr": "Structure de diffusion de propagande de GF", 
+    "groupName_it": "FW Propaganda Broadcast Structure", 
+    "groupName_ja": "国家間戦争プロパガンダ放送ストラクチャ", 
+    "groupName_ko": "팩션 전쟁 선전용 방송시설", 
+    "groupName_ru": "Сооружение для передачи пропаганды МВ", 
+    "groupName_zh": "FW Propaganda Broadcast Structure", 
    "groupNameID": 635229, 
    "published": 1, 
    "useBasePrice": 1
  }, 
+  "4493": {
+    "anchorable": 0, 
+    "anchored": 0, 
+    "categoryID": 9, 
+    "fittableNonSingleton": 0, 
+    "groupID": 4493, 
+    "groupName_de": "Blaupause für mobile Ziele", 
+    "groupName_en-us": "Mobile Objective Blueprint", 
+    "groupName_es": "Plano de objetivo móvil", 
+    "groupName_fr": "Plan de construction Objectif mobile", 
+    "groupName_it": "Mobile Objective Blueprint", 
+    "groupName_ja": "移動式施設設計図", 
+    "groupName_ko": "이동형 목표물 블루프린트", 
+    "groupName_ru": "Чертёж подвижной цели", 
+    "groupName_zh": "Mobile Objective Blueprint", 
+    "groupNameID": 636346, 
+    "published": 1, 
+    "useBasePrice": 1
+  }, 
+  "4494": {
+    "anchorable": 0, 
+    "anchored": 1, 
+    "categoryID": 11, 
+    "fittableNonSingleton": 0, 
+    "groupID": 4494, 
+    "groupName_de": "Kontrollpunkt", 
+    "groupName_en-us": "Control Point", 
+    "groupName_es": "Punto de control", 
+    "groupName_fr": "Point de contrôle", 
+    "groupName_it": "Control Point", 
+    "groupName_ja": "コントロールポイント", 
+    "groupName_ko": "컨트롤 포인트", 
+    "groupName_ru": "Контрольная точка", 
+    "groupName_zh": "Control Point", 
+    "groupNameID": 637132, 
+    "published": 0, 
+    "useBasePrice": 0
+  }, 
+  "4499": {
+    "anchorable": 0, 
+    "anchored": 0, 
+    "categoryID": 22, 
+    "fittableNonSingleton": 0, 
+    "groupID": 4499, 
+    "groupName_de": "FK-Horchaußenposten", 
+    "groupName_en-us": "FW Listening Outpost", 
+    "groupName_es": "Puesto avanzado de escucha de la GF", 
+    "groupName_fr": "Avant-poste d'écoute de la GF", 
+    "groupName_it": "FW Listening Outpost", 
+    "groupName_ja": "国家間戦争のリスニングアウトポスト", 
+    "groupName_ko": "팩션 전쟁 감청기지", 
+    "groupName_ru": "Прослушивающий форпост МВ", 
+    "groupName_zh": "FW Listening Outpost", 
+    "groupNameID": 638199, 
+    "published": 1, 
+    "useBasePrice": 1
+  }, 
+  "4501": {
+    "anchorable": 0, 
+    "anchored": 0, 
+    "categoryID": 11, 
+    "fittableNonSingleton": 0, 
+    "groupID": 4501, 
+    "groupName_de": "Missionen: Standard-Kapseln", 
+    "groupName_en-us": "Mission Generic Capsules", 
+    "groupName_es": "Capsulas de misión genéricas", 
+    "groupName_fr": "Capsules standard de mission", 
+    "groupName_it": "Mission Generic Capsules", 
+    "groupName_ja": "ミッション一般カプセル", 
+    "groupName_ko": "미션 일반 캡슐", 
+    "groupName_ru": "Mission Generic Capsules", 
+    "groupName_zh": "Mission Generic Capsules", 
+    "groupNameID": 639247, 
+    "published": 0, 
+    "useBasePrice": 0
+  }, 
+  "4513": {
+    "anchorable": 0, 
+    "anchored": 1, 
+    "categoryID": 25, 
+    "fittableNonSingleton": 0, 
+    "groupID": 4513, 
+    "groupName_de": "Mordunium", 
+    "groupName_en-us": "Mordunium", 
+    "groupName_es": "Mordunium", 
+    "groupName_fr": "Mordunium", 
+    "groupName_it": "Mordunium", 
+    "groupName_ja": "Mordunium", 
+    "groupName_ko": "Mordunium", 
+    "groupName_ru": "Mordunium", 
+    "groupName_zh": "Mordunium", 
+    "groupNameID": 640735, 
+    "iconID": 15, 
+    "published": 1, 
+    "useBasePrice": 0
+  }, 
+  "4514": {
+    "anchorable": 0, 
+    "anchored": 1, 
+    "categoryID": 25, 
+    "fittableNonSingleton": 0, 
+    "groupID": 4514, 
+    "groupName_de": "Ytirium", 
+    "groupName_en-us": "Ytirium", 
+    "groupName_es": "Ytirium", 
+    "groupName_fr": "Ytirium", 
+    "groupName_it": "Ytirium", 
+    "groupName_ja": "Ytirium", 
+    "groupName_ko": "Ytirium", 
+    "groupName_ru": "Ytirium", 
+    "groupName_zh": "Ytirium", 
+    "groupNameID": 640736, 
+    "iconID": 15, 
+    "published": 1, 
+    "useBasePrice": 0
+  }, 
+  "4515": {
+    "anchorable": 0, 
+    "anchored": 1, 
+    "categoryID": 25, 
+    "fittableNonSingleton": 0, 
+    "groupID": 4515, 
+    "groupName_de": "Eifyrium", 
+    "groupName_en-us": "Eifyrium", 
+    "groupName_es": "Eifyrium", 
+    "groupName_fr": "Eifyrium", 
+    "groupName_it": "Eifyrium", 
+    "groupName_ja": "Eifyrium", 
+    "groupName_ko": "Eifyrium", 
+    "groupName_ru": "Eifyrium", 
+    "groupName_zh": "Eifyrium", 
+    "groupNameID": 640737, 
+    "iconID": 15, 
+    "published": 1, 
+    "useBasePrice": 0
+  }, 
+  "4516": {
+    "anchorable": 0, 
+    "anchored": 1, 
+    "categoryID": 25, 
+    "fittableNonSingleton": 0, 
+    "groupID": 4516, 
+    "groupName_de": "Ducinium", 
+    "groupName_en-us": "Ducinium", 
+    "groupName_es": "Ducinium", 
+    "groupName_fr": "Ducinium", 
+    "groupName_it": "Ducinium", 
+    "groupName_ja": "Ducinium", 
+    "groupName_ko": "Ducinium", 
+    "groupName_ru": "Ducinium", 
+    "groupName_zh": "Ducinium", 
+    "groupNameID": 640738, 
+    "iconID": 15, 
+    "published": 1, 
+    "useBasePrice": 0
+  }, 
  "350858": {
    "anchorable": 0, 
    "anchored": 0, 
--- a/staticdata/fsd_binary/iconids.0.json
+++ b/staticdata/fsd_binary/iconids.0.json
@@ -11928,8 +11928,51 @@
    "iconFile": "res:/UI/Asset/mannequin/outer/73396_Male_outer_JacketCorpBusinessM01_Types_JacketCorpBusinessM01_DarkTurquoise.png", 
    "iconType": "png"
  }, 
+  "25451": {
+    "iconFile": "res:/UI/Asset/mannequin/outer/73407_Female_Outer_JacketMilF02_Types_JacketMilF02_WhiteTurquoise.png", 
+    "iconType": "png"
+  }, 
+  "25452": {
+    "iconFile": "res:/UI/Asset/mannequin/accessories_masks/73423_Female_Accessories_Masks_Mask_Cyberpunk_F01_Types_Mask_Cyberpunk_F01_Tan_Worn.png", 
+    "iconType": "png"
+  }, 
+  "25453": {
+    "iconFile": "res:/UI/Asset/mannequin/accessories_glasses/73424_Female_Accessories_Glasses_Goggles_01_Types_goggles_01_tan_worn.png", 
+    "iconType": "png"
+  }, 
+  "25454": {
+    "iconFile": "res:/UI/Asset/mannequin/accessories_masks/73425_Male_Accessories_Masks_Mask_Cyberpunk_M01_Types_Mask_Cyberpunk_M01_Tan_Worn.png", 
+    "iconType": "png"
+  }, 
+  "25455": {
+    "iconFile": "res:/UI/Asset/mannequin/accessories_glasses/73426_Male_Accessories_Glasses_Goggles_01_Types_goggles_01_tan_worn.png", 
+    "iconType": "png"
+  }, 
+  "25456": {
+    "iconFile": "res:/UI/Asset/mannequin/makeup_augmentations/73436_Male_Makeup_Augmentations_Face_Paint_M01_Types_Face_Paint_M01_V7_Red.png", 
+    "iconType": "png"
+  }, 
+  "25457": {
+    "iconFile": "res:/UI/Asset/mannequin/makeup_augmentations/73437_Female_Makeup_Augmentations_Face_Paint_F01_Types_Face_Paint_F01_V3_Red.png", 
+    "iconType": "png"
+  }, 
  "25463": {
    "iconFile": "res:/ui/texture/corps/EverMore.png", 
    "iconType": "png"
+  }, 
+  "25465": {
+    "iconFile": "res:/ui/texture/corps/paragon.png", 
+    "iconType": "png"
+  }, 
+  "25467": {
+    "iconFile": "res:/ui/texture/classes/fitting/cosmetics/alliance_logo_128px.png", 
+    "iconType": "png"
+  }, 
+  "25468": {
+    "iconFile": "res:/ui/texture/classes/fitting/cosmetics/corp_logo_128px.png", 
+    "iconType": "png"
+  }, 
+  "25475": {
+    "iconFile": "res:/ui/texture/icons/evermarks.png"
  }
 }
--- a/staticdata/fsd_binary/marketgroups.0.json
+++ b/staticdata/fsd_binary/marketgroups.0.json
@@ -6595,7 +6595,7 @@
    "description_es": "Subtipos de la mena veldspar.\n\n ", 
    "description_fr": "Sous-catégories du minerai veldspar.\n\t\t\t\t", 
    "description_it": "Sub-types of veldspar ore.\r\n ", 
-    "description_ja": "ベルドスパー鉱石の亜種。\r\n", 
+    "description_ja": "ベルドスパー鉱石の亜種。", 
    "description_ko": "다양한 부류의 벨드스파 광석입니다.\n\n ", 
    "description_ru": " Подвиды руды Veldspar.", 
    "description_zh": "凡晶石的分支。", 
@@ -30707,7 +30707,7 @@
  "1828": {
    "description_de": "Blueprints für mobile Depots", 
    "description_en-us": "Blueprints for Mobile Depots", 
-    "description_es": "Planos para almacenes móviles.", 
+    "description_es": "Planos para depósitos móviles", 
    "description_fr": "Plans de construction de dépôts mobiles", 
    "description_it": "Blueprints for Mobile Depots", 
    "description_ja": "移動式貯蔵所のブループリント", 
@@ -30719,7 +30719,7 @@
    "iconID": 2703, 
    "name_de": "Mobile Depots", 
    "name_en-us": "Mobile Depots", 
-    "name_es": "Almacenes móviles", 
+    "name_es": "Depósitos móviles", 
    "name_fr": "Dépôts mobiles", 
    "name_it": "Mobile Depots", 
    "name_ja": "移動式貯蔵所", 
@@ -30784,7 +30784,7 @@
    "iconID": 16, 
    "name_de": "Mobile Depots", 
    "name_en-us": "Mobile Depots", 
-    "name_es": "Almacenes móviles", 
+    "name_es": "Depósitos móviles", 
    "name_fr": "Dépôts mobiles", 
    "name_it": "Mobile Depots", 
    "name_ja": "移動式貯蔵所", 
@@ -32217,7 +32217,7 @@
  "1922": {
    "description_de": "Für Kapselpiloten verfügbare Dienste beinhalten PLEX, Multiples Pilotentraining, Zertifikate zur Neuanpassung des Piloten und Skilltauschgegenstände", 
    "description_en-us": "Services available to capsuleers include PLEX, Multiple Pilot Training, Pilot's Body Resculpt Certificates, and Skill Trading items", 
-    "description_es": "Entre los servicios disponibles para capsulistas, se incluyen PLEX, adiestramiento simultáneo de pilotos, certificados de remodelado corporal y artículos de mejora y modificación de habilidades.", 
+    "description_es": "Entre los servicios disponibles para capsulistas, se incluyen PLEX, entrenamiento simultáneo de pilotos, certificados de remodelado corporal y artículos de mejora y modificación de habilidades.", 
    "description_fr": "Les services à disposition des capsuliers incluent les PLEX, les certificats d'entraînements de plusieurs personnages, les certificats de remodelage physique du pilote et les objets liés au commerce de compétences.", 
    "description_it": "Services available to capsuleers include PLEX, Multiple Pilot Training, Pilot's Body Resculpt Certificates, and Skill Trading items", 
    "description_ja": "カプセラが利用できるサービスには、パイロットライセンスの拡張（PLEX）、複数のパイロットトレーニング、パイロットの身体骨格再調整証明書、スキルのトレードなどが含まれます", 
@@ -37936,7 +37936,7 @@
    "description_ru": "Модификации дредноутов, используемые различными организациями галактики.", 
    "description_zh": "势力无畏舰设计。", 
    "descriptionID": 312558, 
-    "hasTypes": 1, 
+    "hasTypes": 0, 
    "iconID": 1443, 
    "name_de": "Fraktions-Dreadnoughts", 
    "name_en-us": "Faction Dreadnoughts", 
@@ -42764,12 +42764,12 @@
    "iconID": 24135, 
    "name_de": "Triglavia", 
    "name_en-us": "Triglavian", 
-    "name_es": "Superacorazados precursores", 
+    "name_es": "Triglaviano", 
    "name_fr": "Triglavian", 
    "name_it": "Triglavian", 
    "name_ja": "トリグラビアン", 
    "name_ko": "트리글라비안", 
-    "name_ru": "Триглавские", 
+    "name_ru": "Триглав", 
    "name_zh": "先驱者无畏舰", 
    "nameID": 553050, 
    "parentGroupID": 761
@@ -44023,5 +44023,320 @@
    "name_zh": "Structure Area Denial Ammunition", 
    "nameID": 597629, 
    "parentGroupID": 211
+  }, 
+  "3450": {
+    "hasTypes": 1, 
+    "iconID": 16, 
+    "name_de": "Mobile strategische Ziele", 
+    "name_en-us": "Mobile Strategic Objectives", 
+    "name_es": "Objetivos estratégicos móviles", 
+    "name_fr": "Mobile Strategic Objectives", 
+    "name_it": "Mobile Strategic Objectives", 
+    "name_ja": "移動式戦略施設", 
+    "name_ko": "이동형 전략 목표물", 
+    "name_ru": "Подвижные стратегические цели", 
+    "name_zh": "Mobile Strategic Objectives", 
+    "nameID": 636347, 
+    "parentGroupID": 404
+  }, 
+  "3451": {
+    "description_de": "Blaupausen für mobile Ziele", 
+    "description_en-us": "Blueprints for Mobile Objectives", 
+    "description_es": "Planos de objetivos móviles", 
+    "description_fr": "Plans de construction Objectifs mobiles", 
+    "description_it": "Blueprints for Mobile Objectives", 
+    "description_ja": "移動式施設の設計図", 
+    "description_ko": "이동형 목표물 블루프린트", 
+    "description_ru": "Чертежи для подвижных целей", 
+    "description_zh": "Blueprints for Mobile Objectives", 
+    "descriptionID": 636354, 
+    "hasTypes": 0, 
+    "iconID": 2703, 
+    "name_de": "Mobile strategische Ziele", 
+    "name_en-us": "Mobile Strategic Objectives", 
+    "name_es": "Objetivos estratégicos móviles", 
+    "name_fr": "Mobile Strategic Objectives", 
+    "name_it": "Mobile Strategic Objectives", 
+    "name_ja": "移動式戦略施設", 
+    "name_ko": "이동형 전략 목표물", 
+    "name_ru": "Подвижные стратегические цели", 
+    "name_zh": "Mobile Strategic Objectives", 
+    "nameID": 636353, 
+    "parentGroupID": 406
+  }, 
+  "3453": {
+    "description_de": "Materialien zur Konstruktion bestimmter Fraktionsausrüstung.", 
+    "description_en-us": "Materials used in the construction of specific factional equipment.", 
+    "description_es": "Materiales usados para la construcción de aparatos específicos para las facciones.", 
+    "description_fr": "Matériaux utilisés dans la fabrication d'équipements spécifiques aux factions.", 
+    "description_it": "Materials used in the construction of specific factional equipment.", 
+    "description_ja": "特定勢力独自の装備の製作に使用される資源。", 
+    "description_ko": "팩션 장비 제작에 사용되는 재료입니다.", 
+    "description_ru": "Материалы, используемые для создания особого оборудования держав.", 
+    "description_zh": "Materials used in the construction of specific factional equipment.", 
+    "descriptionID": 636416, 
+    "hasTypes": 1, 
+    "iconID": 1436, 
+    "name_de": "Imperium der Amarr", 
+    "name_en-us": "Amarr Empire", 
+    "name_es": "Imperio Amarr", 
+    "name_fr": "Empire amarr", 
+    "name_it": "Amarr Empire", 
+    "name_ja": "アマー帝国", 
+    "name_ko": "아마르 제국", 
+    "name_ru": "Амаррская Империя", 
+    "name_zh": "Amarr Empire", 
+    "nameID": 636415, 
+    "parentGroupID": 1897
+  }, 
+  "3454": {
+    "description_de": "Materialien zur Konstruktion bestimmter Fraktionsausrüstung.", 
+    "description_en-us": "Materials used in the construction of specific factional equipment.", 
+    "description_es": "Materiales usados para la construcción de aparatos específicos para las facciones.", 
+    "description_fr": "Matériaux utilisés dans la fabrication d'équipements spécifiques aux factions.", 
+    "description_it": "Materials used in the construction of specific factional equipment.", 
+    "description_ja": "特定勢力独自の装備の製作に使用される資源。", 
+    "description_ko": "팩션 장비 제작에 사용되는 재료입니다.", 
+    "description_ru": "Материалы, используемые для создания особого оборудования держав.", 
+    "description_zh": "Materials used in the construction of specific factional equipment.", 
+    "descriptionID": 636418, 
+    "hasTypes": 1, 
+    "iconID": 1436, 
+    "name_de": "Republik Minmatar", 
+    "name_en-us": "Minmatar Republic", 
+    "name_es": "República Minmatar", 
+    "name_fr": "République minmatar", 
+    "name_it": "Minmatar Republic", 
+    "name_ja": "ミンマター共和国", 
+    "name_ko": "민마타 공화국", 
+    "name_ru": "Республика Минматар", 
+    "name_zh": "Minmatar Republic", 
+    "nameID": 636417, 
+    "parentGroupID": 1897
+  }, 
+  "3455": {
+    "description_de": "Materialien zur Konstruktion bestimmter Fraktionsausrüstung.", 
+    "description_en-us": "Materials used in the construction of specific factional equipment.", 
+    "description_es": "Materiales usados para la construcción de aparatos específicos para las facciones.", 
+    "description_fr": "Matériaux utilisés dans la fabrication d'équipements spécifiques aux factions.", 
+    "description_it": "Materials used in the construction of specific factional equipment.", 
+    "description_ja": "特定勢力独自の装備の製作に使用される資源。", 
+    "description_ko": "팩션 장비 제작에 사용되는 재료입니다.", 
+    "description_ru": "Материалы, используемые для создания особого оборудования держав.", 
+    "description_zh": "Materials used in the construction of specific factional equipment.", 
+    "descriptionID": 636420, 
+    "hasTypes": 1, 
+    "iconID": 1436, 
+    "name_de": "Staat der Caldari", 
+    "name_en-us": "Caldari State", 
+    "name_es": "Estado Caldari", 
+    "name_fr": "État caldari", 
+    "name_it": "Caldari State", 
+    "name_ja": "カルダリ連合", 
+    "name_ko": "칼다리 연합", 
+    "name_ru": "Государство Калдари", 
+    "name_zh": "Caldari State", 
+    "nameID": 636419, 
+    "parentGroupID": 1897
+  }, 
+  "3456": {
+    "description_de": "Materialien zur Konstruktion bestimmter Fraktionsausrüstung.", 
+    "description_en-us": "Materials used in the construction of specific factional equipment.", 
+    "description_es": "Materiales usados para la construcción de aparatos específicos para las facciones.", 
+    "description_fr": "Matériaux utilisés dans la fabrication d'équipements spécifiques aux factions.", 
+    "description_it": "Materials used in the construction of specific factional equipment.", 
+    "description_ja": "特定勢力独自の装備の製作に使用される資源。", 
+    "description_ko": "팩션 장비 제작에 사용되는 재료입니다.", 
+    "description_ru": "Материалы, используемые для создания особого оборудования держав.", 
+    "description_zh": "Materials used in the construction of specific factional equipment.", 
+    "descriptionID": 636422, 
+    "hasTypes": 1, 
+    "iconID": 1436, 
+    "name_de": "Föderation der Gallente", 
+    "name_en-us": "Gallente Federation", 
+    "name_es": "Federación Gallente", 
+    "name_fr": "Fédération gallente", 
+    "name_it": "Gallente Federation", 
+    "name_ja": "ガレンテ連邦", 
+    "name_ko": "갈란테 연방", 
+    "name_ru": "Галлентская Федерация", 
+    "name_zh": "Gallente Federation", 
+    "nameID": 636421, 
+    "parentGroupID": 1897
+  }, 
+  "3478": {
+    "hasTypes": 1, 
+    "iconID": 24411, 
+    "name_de": "Masken", 
+    "name_en-us": "Masks", 
+    "name_es": "Máscaras", 
+    "name_fr": "Masques", 
+    "name_it": "Masks", 
+    "name_ja": "マスク", 
+    "name_ko": "마스크", 
+    "name_ru": "Маски", 
+    "name_zh": "Masks", 
+    "nameID": 638794, 
+    "parentGroupID": 1407
+  }, 
+  "3480": {
+    "description_de": "Von bestimmten Fraktionen entworfene Zerstörer.", 
+    "description_en-us": "Destroyers designed by specific factions.", 
+    "description_es": "Destructores diseñados por facciones específicas.", 
+    "description_fr": "Destroyers designed by specific factions.", 
+    "description_it": "Destroyers designed by specific factions.", 
+    "description_ja": "特定勢力が設計した駆逐艦。", 
+    "description_ko": "특정 팩션 전용 디스트로이어입니다.", 
+    "description_ru": "Эсминцы производства той или иной державы.", 
+    "description_zh": "Destroyers designed by specific factions.", 
+    "descriptionID": 639179, 
+    "hasTypes": 0, 
+    "iconID": 1443, 
+    "name_de": "Fraktionszerstörer", 
+    "name_en-us": "Faction Destroyers", 
+    "name_es": "Destructores de facción", 
+    "name_fr": "Faction Destroyers", 
+    "name_it": "Faction Destroyers", 
+    "name_ja": "勢力別駆逐艦", 
+    "name_ko": "팩션 디스트로이어", 
+    "name_ru": "Эсминцы держав", 
+    "name_zh": "Faction Destroyers", 
+    "nameID": 639178, 
+    "parentGroupID": 1372
+  }, 
+  "3481": {
+    "description_de": "Navyfraktion-Zerstörer-Designs.", 
+    "description_en-us": "Navy faction destroyer designs.", 
+    "description_es": "Diseños de destructor faccionarios de la Armada.", 
+    "description_fr": "Navy faction destroyer designs.", 
+    "description_it": "Navy faction destroyer designs.", 
+    "description_ja": "海軍勢力の駆逐艦。", 
+    "description_ko": "해군 팩션의 디스트로이어입니다.", 
+    "description_ru": "Эсминцы флотов ведущих держав.", 
+    "description_zh": "Navy faction destroyer designs.", 
+    "descriptionID": 639181, 
+    "hasTypes": 1, 
+    "iconID": 1443, 
+    "name_de": "Navyfraktion", 
+    "name_en-us": "Navy Faction", 
+    "name_es": "Facción de la Armada", 
+    "name_fr": "Navy Faction", 
+    "name_it": "Navy Faction", 
+    "name_ja": "海軍勢力", 
+    "name_ko": "해군 팩션", 
+    "name_ru": "Государственный флот", 
+    "name_zh": "Navy Faction", 
+    "nameID": 639180, 
+    "parentGroupID": 3480
+  }, 
+  "3483": {
+    "description_de": "Dreadnought-Designs anderer Fraktionen.", 
+    "description_en-us": "Non-Empire faction dreadnought designs.", 
+    "description_es": "Diseños de superacorazado de facciones que no pertenecen a ningún imperio.", 
+    "description_fr": "Non-Empire faction dreadnought designs.", 
+    "description_it": "Non-Empire faction dreadnought designs.", 
+    "description_ja": "非国家勢力の攻城艦。", 
+    "description_ko": "비국가 소속 팩션의 드레드노트입니다.", 
+    "description_ru": "Дредноуты производства иных сообществ и организаций.", 
+    "description_zh": "Non-Empire faction dreadnought designs.", 
+    "descriptionID": 639186, 
+    "hasTypes": 1, 
+    "iconID": 1443, 
+    "name_de": "Piratenfraktion", 
+    "name_en-us": "Pirate Faction", 
+    "name_es": "Facción pirata", 
+    "name_fr": "Pirate Faction", 
+    "name_it": "Pirate Faction", 
+    "name_ja": "海賊勢力", 
+    "name_ko": "해적 팩션", 
+    "name_ru": "Пиратская организация", 
+    "name_zh": "Pirate Faction", 
+    "nameID": 639185, 
+    "parentGroupID": 2288
+  }, 
+  "3484": {
+    "description_de": "Navyfraktion-Dreadnought-Designs.", 
+    "description_en-us": "Navy faction dreadnought designs.", 
+    "description_es": "Diseños de superacorazado faccionario de la Armada.", 
+    "description_fr": "Navy faction dreadnought designs.", 
+    "description_it": "Navy faction dreadnought designs.", 
+    "description_ja": "海軍勢力の攻城艦。", 
+    "description_ko": "해군 팩션 드레드노트입니다.", 
+    "description_ru": "Дредноуты флотов ведущих держав.", 
+    "description_zh": "Navy faction dreadnought designs.", 
+    "descriptionID": 639192, 
+    "hasTypes": 1, 
+    "iconID": 1443, 
+    "name_de": "Navyfraktion", 
+    "name_en-us": "Navy Faction", 
+    "name_es": "Facción de la Armada", 
+    "name_fr": "Navy Faction", 
+    "name_it": "Navy Faction", 
+    "name_ja": "海軍勢力", 
+    "name_ko": "해군 팩션", 
+    "name_ru": "Государственный флот", 
+    "name_zh": "Navy Faction", 
+    "nameID": 639191, 
+    "parentGroupID": 2288
+  }, 
+  "3487": {
+    "hasTypes": 1, 
+    "iconID": 15, 
+    "name_de": "Mordunium", 
+    "name_en-us": "Mordunium", 
+    "name_es": "Mordunium", 
+    "name_fr": "Mordunium", 
+    "name_it": "Mordunium", 
+    "name_ja": "Mordunium", 
+    "name_ko": "Mordunium", 
+    "name_ru": "Mordunium", 
+    "name_zh": "Mordunium", 
+    "nameID": 640808, 
+    "parentGroupID": 54
+  }, 
+  "3488": {
+    "hasTypes": 1, 
+    "iconID": 15, 
+    "name_de": "Ytirium", 
+    "name_en-us": "Ytirium", 
+    "name_es": "Ytirium", 
+    "name_fr": "Ytirium", 
+    "name_it": "Ytirium", 
+    "name_ja": "Ytirium", 
+    "name_ko": "Ytirium", 
+    "name_ru": "Ytirium", 
+    "name_zh": "Ytirium", 
+    "nameID": 640809, 
+    "parentGroupID": 54
+  }, 
+  "3489": {
+    "hasTypes": 1, 
+    "iconID": 15, 
+    "name_de": "Eifyrium", 
+    "name_en-us": "Eifyrium", 
+    "name_es": "Eifyrium", 
+    "name_fr": "Eifyrium", 
+    "name_it": "Eifyrium", 
+    "name_ja": "Eifyrium", 
+    "name_ko": "Eifyrium", 
+    "name_ru": "Eifyrium", 
+    "name_zh": "Eifyrium", 
+    "nameID": 640810, 
+    "parentGroupID": 54
+  }, 
+  "3490": {
+    "hasTypes": 1, 
+    "iconID": 15, 
+    "name_de": "Ducinium", 
+    "name_en-us": "Ducinium", 
+    "name_es": "Ducinium", 
+    "name_fr": "Ducinium", 
+    "name_it": "Ducinium", 
+    "name_ja": "Ducinium", 
+    "name_ko": "Ducinium", 
+    "name_ru": "Ducinium", 
+    "name_zh": "Ducinium", 
+    "nameID": 640811, 
+    "parentGroupID": 54
  }
 }
--- a/staticdata/fsd_binary/requiredskillsfortypes.0.json
+++ b/staticdata/fsd_binary/requiredskillsfortypes.0.json
@@ -27588,10 +27588,10 @@
    "21718": 1
  }, 
  "72811": {
-    "33098": 1
+    "33098": 2
  }, 
  "72812": {
-    "33096": 1
+    "33096": 2
  }, 
  "72818": {
    "3405": 1
@@ -27699,10 +27699,10 @@
    "3402": 1
  }, 
  "72869": {
-    "33097": 1
+    "33097": 2
  }, 
  "72872": {
-    "33095": 1
+    "33095": 2
  }, 
  "72879": {
    "9955": 5, 
@@ -27710,16 +27710,16 @@
    "21718": 5
  }, 
  "72903": {
-    "3329": 1
+    "3329": 2
  }, 
  "72904": {
-    "3330": 1
+    "3330": 2
  }, 
  "72907": {
-    "3331": 1
+    "3331": 2
  }, 
  "72913": {
-    "3328": 1
+    "3328": 2
  }, 
  "73036": {
    "21718": 2
@@ -27747,5 +27747,260 @@
  }, 
  "73253": {
    "21718": 1
+  }, 
+  "73270": {
+    "11584": 3
+  }, 
+  "73271": {
+    "11584": 3
+  }, 
+  "73272": {
+    "11584": 3
+  }, 
+  "73273": {
+    "11584": 3
+  }, 
+  "73427": {
+    "21718": 1
+  }, 
+  "73428": {
+    "21718": 1
+  }, 
+  "73429": {
+    "21718": 1
+  }, 
+  "73430": {
+    "21718": 1
+  }, 
+  "73787": {
+    "3456": 1, 
+    "20532": 2, 
+    "20533": 1
+  }, 
+  "73789": {
+    "33091": 2
+  }, 
+  "73790": {
+    "3456": 1, 
+    "20525": 2, 
+    "20533": 1
+  }, 
+  "73792": {
+    "3456": 1, 
+    "20531": 2, 
+    "20533": 1
+  }, 
+  "73793": {
+    "3456": 1, 
+    "20530": 2, 
+    "20533": 1
+  }, 
+  "73794": {
+    "33094": 2
+  }, 
+  "73795": {
+    "33092": 2
+  }, 
+  "73796": {
+    "33093": 2
+  }, 
+  "73910": {
+    "33407": 5
+  }, 
+  "73912": {
+    "25235": 5
+  }, 
+  "74141": {
+    "3329": 5, 
+    "12095": 1
+  }, 
+  "74161": {
+    "3402": 1
+  }, 
+  "74162": {
+    "3402": 1
+  }, 
+  "74163": {
+    "3402": 1
+  }, 
+  "74199": {
+    "3405": 1
+  }, 
+  "74200": {
+    "3405": 1
+  }, 
+  "74201": {
+    "3405": 1
+  }, 
+  "74202": {
+    "3405": 1
+  }, 
+  "74203": {
+    "3405": 1
+  }, 
+  "74204": {
+    "3405": 1
+  }, 
+  "74205": {
+    "3405": 1
+  }, 
+  "74206": {
+    "3405": 1
+  }, 
+  "74207": {
+    "3405": 1
+  }, 
+  "74208": {
+    "3405": 1
+  }, 
+  "74209": {
+    "3405": 1
+  }, 
+  "74210": {
+    "3405": 1
+  }, 
+  "74211": {
+    "3405": 1
+  }, 
+  "74212": {
+    "3405": 1
+  }, 
+  "74213": {
+    "3405": 1
+  }, 
+  "74214": {
+    "3405": 1
+  }, 
+  "74215": {
+    "3405": 1
+  }, 
+  "74216": {
+    "3405": 1
+  }, 
+  "74255": {
+    "3426": 1, 
+    "9955": 5
+  }, 
+  "74256": {
+    "3386": 1, 
+    "9955": 5
+  }, 
+  "74257": {
+    "3405": 1
+  }, 
+  "74258": {
+    "3405": 1
+  }, 
+  "74259": {
+    "3405": 1
+  }, 
+  "74260": {
+    "3405": 1
+  }, 
+  "74261": {
+    "3405": 1
+  }, 
+  "74262": {
+    "3405": 1
+  }, 
+  "74316": {
+    "3333": 5, 
+    "16591": 1
+  }, 
+  "74521": {
+    "3386": 1
+  }, 
+  "74522": {
+    "3386": 1
+  }, 
+  "74523": {
+    "3386": 1
+  }, 
+  "74524": {
+    "3386": 1
+  }, 
+  "74525": {
+    "3386": 1
+  }, 
+  "74526": {
+    "3386": 1
+  }, 
+  "74527": {
+    "3386": 1
+  }, 
+  "74528": {
+    "3386": 1
+  }, 
+  "74529": {
+    "3386": 1
+  }, 
+  "74530": {
+    "3386": 1
+  }, 
+  "74531": {
+    "3386": 1
+  }, 
+  "74532": {
+    "3386": 1
+  }, 
+  "74533": {
+    "3386": 1
+  }, 
+  "74534": {
+    "3386": 1
+  }, 
+  "74535": {
+    "3386": 1
+  }, 
+  "74536": {
+    "3386": 1
+  }, 
+  "75275": {
+    "3386": 1
+  }, 
+  "75276": {
+    "3386": 1
+  }, 
+  "75277": {
+    "3386": 1
+  }, 
+  "75278": {
+    "3386": 1
+  }, 
+  "75279": {
+    "3386": 1
+  }, 
+  "75280": {
+    "3386": 1
+  }, 
+  "75281": {
+    "3386": 1
+  }, 
+  "75282": {
+    "3386": 1
+  }, 
+  "75283": {
+    "3386": 1
+  }, 
+  "75284": {
+    "3386": 1
+  }, 
+  "75285": {
+    "3386": 1
+  }, 
+  "75286": {
+    "3386": 1
+  }, 
+  "75287": {
+    "3386": 1
+  }, 
+  "75288": {
+    "3386": 1
+  }, 
+  "75289": {
+    "3386": 1
+  }, 
+  "75290": {
+    "3386": 1
  }
 }
--- a/staticdata/fsd_binary/typedogma.0.json
+++ b/staticdata/fsd_binary/typedogma.0.json
@@ -19304,7 +19304,7 @@
      }, 
      {
        "attributeID": 460, 
-        "value": -5.0
+        "value": -7.5
      }, 
      {
        "attributeID": 479, 
@@ -32731,7 +32731,7 @@
      }, 
      {
        "attributeID": 11, 
-        "value": 650.0
+        "value": 700.0
      }, 
      {
        "attributeID": 12, 
@@ -32907,7 +32907,7 @@
      }, 
      {
        "attributeID": 283, 
-        "value": 40.0
+        "value": 50.0
      }, 
      {
        "attributeID": 422, 
@@ -33035,7 +33035,7 @@
      }, 
      {
        "attributeID": 1271, 
-        "value": 40.0
+        "value": 50.0
      }, 
      {
        "attributeID": 1281, 
@@ -118944,6 +118944,10 @@
      {
        "attributeID": 280, 
        "value": 0.0
+      }, 
+      {
+        "attributeID": 1047, 
+        "value": 0.0
      }
    ], 
    "dogmaEffects": [
@@ -118958,6 +118962,10 @@
      {
        "effectID": 682, 
        "isDefault": 0
+      }, 
+      {
+        "effectID": 11418, 
+        "isDefault": 0
      }
    ]
  }, 
@@ -294706,7 +294714,7 @@
      }, 
      {
        "attributeID": 588, 
-        "value": -5.0
+        "value": 10.0
      }, 
      {
        "attributeID": 600, 
@@ -294854,10 +294862,6 @@
        "effectID": 5080, 
        "isDefault": 0
      }, 
-      {
-        "effectID": 5938, 
-        "isDefault": 0
-      }, 
      {
        "effectID": 6170, 
        "isDefault": 0
@@ -294865,6 +294869,10 @@
      {
        "effectID": 8120, 
        "isDefault": 0
+      }, 
+      {
+        "effectID": 11431, 
+        "isDefault": 0
      }
    ]
  }, 
@@ -349721,7 +349729,7 @@
      }, 
      {
        "attributeID": 11, 
-        "value": 800.0
+        "value": 820.0
      }, 
      {
        "attributeID": 12, 
@@ -349753,7 +349761,7 @@
      }, 
      {
        "attributeID": 48, 
-        "value": 520.0
+        "value": 535.0
      }, 
      {
        "attributeID": 49, 
@@ -349769,7 +349777,7 @@
      }, 
      {
        "attributeID": 76, 
-        "value": 95000.0
+        "value": 60000.0
      }, 
      {
        "attributeID": 79, 
@@ -349953,11 +349961,11 @@
      }, 
      {
        "attributeID": 657, 
-        "value": 10.0
+        "value": 20.0
      }, 
      {
        "attributeID": 692, 
-        "value": 10.0
+        "value": 7.5
      }, 
      {
        "attributeID": 693, 
@@ -350053,14 +350061,6 @@
        "effectID": 899, 
        "isDefault": 0
      }, 
-      {
-        "effectID": 1081, 
-        "isDefault": 0
-      }, 
-      {
-        "effectID": 1082, 
-        "isDefault": 0
-      }, 
      {
        "effectID": 2647, 
        "isDefault": 0
@@ -350074,11 +350074,11 @@
        "isDefault": 0
      }, 
      {
-        "effectID": 2810, 
+        "effectID": 5644, 
        "isDefault": 0
      }, 
      {
-        "effectID": 5644, 
+        "effectID": 11414, 
        "isDefault": 0
      }
    ]
@@ -350511,7 +350511,7 @@
      }, 
      {
        "attributeID": 11, 
-        "value": 900.0
+        "value": 925.0
      }, 
      {
        "attributeID": 12, 
@@ -350559,7 +350559,7 @@
      }, 
      {
        "attributeID": 76, 
-        "value": 70000.0
+        "value": 55000.0
      }, 
      {
        "attributeID": 79, 
@@ -350747,7 +350747,7 @@
      }, 
      {
        "attributeID": 692, 
-        "value": 10.0
+        "value": 12.5
      }, 
      {
        "attributeID": 693, 
@@ -350930,7 +350930,7 @@
      }, 
      {
        "attributeID": 76, 
-        "value": 75000.0
+        "value": 60000.0
      }, 
      {
        "attributeID": 79, 
@@ -351301,7 +351301,7 @@
      }, 
      {
        "attributeID": 76, 
-        "value": 80000.0
+        "value": 60000.0
      }, 
      {
        "attributeID": 79, 
@@ -351724,7 +351724,7 @@
      }, 
      {
        "attributeID": 37, 
-        "value": 190.0
+        "value": 160.0
      }, 
      {
        "attributeID": 48, 
@@ -351744,7 +351744,7 @@
      }, 
      {
        "attributeID": 76, 
-        "value": 90000.0
+        "value": 65000.0
      }, 
      {
        "attributeID": 79, 
@@ -351900,7 +351900,7 @@
      }, 
      {
        "attributeID": 487, 
-        "value": 10.0
+        "value": 7.5
      }, 
      {
        "attributeID": 524, 
@@ -351932,7 +351932,7 @@
      }, 
      {
        "attributeID": 692, 
-        "value": 10.0
+        "value": 5.0
      }, 
      {
        "attributeID": 693, 
@@ -352028,10 +352028,6 @@
        "effectID": 521, 
        "isDefault": 0
      }, 
-      {
-        "effectID": 1056, 
-        "isDefault": 0
-      }, 
      {
        "effectID": 1061, 
        "isDefault": 0
@@ -352051,6 +352047,10 @@
      {
        "effectID": 1815, 
        "isDefault": 0
+      }, 
+      {
+        "effectID": 11415, 
+        "isDefault": 0
      }
    ]
  }, 
@@ -352474,7 +352474,7 @@
      }, 
      {
        "attributeID": 11, 
-        "value": 1160.0
+        "value": 1000.0
      }, 
      {
        "attributeID": 12, 
@@ -352506,7 +352506,7 @@
      }, 
      {
        "attributeID": 48, 
-        "value": 355.0
+        "value": 405.0
      }, 
      {
        "attributeID": 49, 
@@ -352522,7 +352522,7 @@
      }, 
      {
        "attributeID": 76, 
-        "value": 80000.0
+        "value": 55000.0
      }, 
      {
        "attributeID": 79, 
@@ -352530,11 +352530,11 @@
      }, 
      {
        "attributeID": 101, 
-        "value": 1.0
+        "value": 5.0
      }, 
      {
        "attributeID": 102, 
-        "value": 5.0
+        "value": 1.0
      }, 
      {
        "attributeID": 109, 
@@ -352614,7 +352614,7 @@
      }, 
      {
        "attributeID": 265, 
-        "value": 2150.0
+        "value": 2300.0
      }, 
      {
        "attributeID": 267, 
@@ -352678,7 +352678,7 @@
      }, 
      {
        "attributeID": 489, 
-        "value": -5.0
+        "value": -3.0
      }, 
      {
        "attributeID": 524, 
@@ -352714,7 +352714,7 @@
      }, 
      {
        "attributeID": 693, 
-        "value": 7.5
+        "value": -5.0
      }, 
      {
        "attributeID": 1132, 
@@ -352803,19 +352803,27 @@
    ], 
    "dogmaEffects": [
      {
-        "effectID": 602, 
+        "effectID": 2647, 
        "isDefault": 0
      }, 
      {
-        "effectID": 968, 
+        "effectID": 2648, 
        "isDefault": 0
      }, 
      {
-        "effectID": 1057, 
+        "effectID": 2649, 
        "isDefault": 0
      }, 
      {
-        "effectID": 1063, 
+        "effectID": 11411, 
+        "isDefault": 0
+      }, 
+      {
+        "effectID": 11412, 
+        "isDefault": 0
+      }, 
+      {
+        "effectID": 11413, 
        "isDefault": 0
      }
    ]
@@ -353288,7 +353296,7 @@
      }, 
      {
        "attributeID": 76, 
-        "value": 70000.0
+        "value": 65000.0
      }, 
      {
        "attributeID": 79, 
@@ -353472,11 +353480,11 @@
      }, 
      {
        "attributeID": 656, 
-        "value": -4.0
+        "value": -5.0
      }, 
      {
        "attributeID": 692, 
-        "value": 10.0
+        "value": 7.5
      }, 
      {
        "attributeID": 693, 
@@ -354074,7 +354082,7 @@
      }, 
      {
        "attributeID": 76, 
-        "value": 85000.0
+        "value": 60000.0
      }, 
      {
        "attributeID": 79, 
@@ -356312,15 +356320,15 @@
      }, 
      {
        "attributeID": 11, 
-        "value": 42.0
+        "value": 50.0
      }, 
      {
        "attributeID": 12, 
-        "value": 4.0
+        "value": 3.0
      }, 
      {
        "attributeID": 13, 
-        "value": 3.0
+        "value": 4.0
      }, 
      {
        "attributeID": 14, 
@@ -356344,7 +356352,7 @@
      }, 
      {
        "attributeID": 48, 
-        "value": 155.0
+        "value": 170.0
      }, 
      {
        "attributeID": 49, 
@@ -356685,7 +356693,7 @@
        "isDefault": 0
      }, 
      {
-        "effectID": 7024, 
+        "effectID": 11432, 
        "isDefault": 0
      }
    ]
@@ -359173,6 +359181,10 @@
      {
        "attributeID": 280, 
        "value": 0.0
+      }, 
+      {
+        "attributeID": 2450, 
+        "value": 1.0
      }
    ], 
    "dogmaEffects": [
@@ -801390,15 +801402,15 @@
      }, 
      {
        "attributeID": 11, 
-        "value": 715.0
+        "value": 900.0
      }, 
      {
        "attributeID": 12, 
-        "value": 4.0
+        "value": 3.0
      }, 
      {
        "attributeID": 13, 
-        "value": 5.0
+        "value": 6.0
      }, 
      {
        "attributeID": 14, 
@@ -801586,7 +801598,7 @@
      }, 
      {
        "attributeID": 487, 
-        "value": -5.0
+        "value": -6.0
      }, 
      {
        "attributeID": 524, 
--- a/staticdata/fsd_binary/typedogma.1.json
+++ b/staticdata/fsd_binary/typedogma.1.json
@@ -419241,18 +419241,6 @@
        "attributeID": 9, 
        "value": 1000000.0
      }, 
-      {
-        "attributeID": 54, 
-        "value": 0.0
-      }, 
-      {
-        "attributeID": 158, 
-        "value": 0.0
-      }, 
-      {
-        "attributeID": 160, 
-        "value": 0.0
-      }, 
      {
        "attributeID": 247, 
        "value": 0.0
@@ -419273,10 +419261,6 @@
        "attributeID": 470, 
        "value": 1200000000.0
      }, 
-      {
-        "attributeID": 482, 
-        "value": 2700.0
-      }, 
      {
        "attributeID": 525, 
        "value": 1.0
@@ -419285,17 +419269,13 @@
        "attributeID": 552, 
        "value": 500.0
      }, 
-      {
-        "attributeID": 665, 
-        "value": 0.0
-      }, 
      {
        "attributeID": 854, 
        "value": 1.0
      }, 
      {
        "attributeID": 901, 
-        "value": 20.0
+        "value": 25.0
      }, 
      {
        "attributeID": 903, 
@@ -420900,36 +420880,12 @@
    "dogmaAttributes": [
      {
        "attributeID": 9, 
-        "value": 100.0
+        "value": 150.0
      }, 
      {
-        "attributeID": 54, 
+        "attributeID": 55, 
        "value": 0.0
      }, 
-      {
-        "attributeID": 114, 
-        "value": 0.0
-      }, 
-      {
-        "attributeID": 116, 
-        "value": 0.0
-      }, 
-      {
-        "attributeID": 117, 
-        "value": 0.0
-      }, 
-      {
-        "attributeID": 118, 
-        "value": 0.0
-      }, 
-      {
-        "attributeID": 158, 
-        "value": 0.0
-      }, 
-      {
-        "attributeID": 160, 
-        "value": 1.0
-      }, 
      {
        "attributeID": 208, 
        "value": 6.0
@@ -420956,36 +420912,40 @@
      }, 
      {
        "attributeID": 263, 
-        "value": 100.0
+        "value": 63.0
      }, 
      {
        "attributeID": 265, 
-        "value": 100.0
+        "value": 156.0
      }, 
      {
        "attributeID": 416, 
        "value": 0.0
      }, 
+      {
+        "attributeID": 479, 
+        "value": 625000.0
+      }, 
+      {
+        "attributeID": 481, 
+        "value": 0.0
+      }, 
+      {
+        "attributeID": 482, 
+        "value": 0.0
+      }, 
      {
        "attributeID": 552, 
-        "value": 45.0
+        "value": 25.0
+      }, 
+      {
+        "attributeID": 562, 
+        "value": 0.0
      }, 
      {
        "attributeID": 563, 
        "value": 5.0
      }, 
-      {
-        "attributeID": 620, 
-        "value": 45.0
-      }, 
-      {
-        "attributeID": 645, 
-        "value": 1.5
-      }, 
-      {
-        "attributeID": 646, 
-        "value": 1.5
-      }, 
      {
        "attributeID": 665, 
        "value": 0.0
@@ -546500,7 +546460,7 @@
      }, 
      {
        "attributeID": 111, 
-        "value": 0.0
+        "value": 0.001
      }, 
      {
        "attributeID": 113, 
@@ -553299,7 +553259,7 @@
      }, 
      {
        "attributeID": 111, 
-        "value": 0.0
+        "value": 0.001
      }, 
      {
        "attributeID": 113, 
@@ -553326,6 +553286,10 @@
        "attributeID": 9, 
        "value": 1000000000.0
      }, 
+      {
+        "attributeID": 55, 
+        "value": 0.0
+      }, 
      {
        "attributeID": 109, 
        "value": 0.001
@@ -553336,16 +553300,28 @@
      }, 
      {
        "attributeID": 111, 
-        "value": 0.0
+        "value": 0.001
      }, 
      {
        "attributeID": 113, 
        "value": 0.001
      }, 
+      {
+        "attributeID": 481, 
+        "value": 0.0
+      }, 
+      {
+        "attributeID": 482, 
+        "value": 0.0
+      }, 
      {
        "attributeID": 525, 
        "value": 1.0
      }, 
+      {
+        "attributeID": 562, 
+        "value": 0.0
+      }, 
      {
        "attributeID": 854, 
        "value": 1.0
@@ -553373,7 +553349,7 @@
      }, 
      {
        "attributeID": 111, 
-        "value": 0.0
+        "value": 0.001
      }, 
      {
        "attributeID": 113, 
@@ -553410,7 +553386,7 @@
      }, 
      {
        "attributeID": 111, 
-        "value": 0.0
+        "value": 0.001
      }, 
      {
        "attributeID": 113, 
@@ -553447,7 +553423,7 @@
      }, 
      {
        "attributeID": 111, 
-        "value": 0.0
+        "value": 0.001
      }, 
      {
        "attributeID": 113, 
@@ -553484,7 +553460,7 @@
      }, 
      {
        "attributeID": 111, 
-        "value": 0.0
+        "value": 0.001
      }, 
      {
        "attributeID": 113, 
@@ -553521,7 +553497,7 @@
      }, 
      {
        "attributeID": 111, 
-        "value": 0.0
+        "value": 0.001
      }, 
      {
        "attributeID": 113, 
@@ -553558,7 +553534,7 @@
      }, 
      {
        "attributeID": 111, 
-        "value": 0.0
+        "value": 0.001
      }, 
      {
        "attributeID": 113, 
@@ -553595,7 +553571,7 @@
      }, 
      {
        "attributeID": 111, 
-        "value": 0.0
+        "value": 0.001
      }, 
      {
        "attributeID": 113, 
@@ -556052,7 +556028,7 @@
      }, 
      {
        "attributeID": 11, 
-        "value": 830.0
+        "value": 1030.0
      }, 
      {
        "attributeID": 12, 
@@ -556080,7 +556056,7 @@
      }, 
      {
        "attributeID": 37, 
-        "value": 255.0
+        "value": 280.0
      }, 
      {
        "attributeID": 48, 
@@ -556112,7 +556088,7 @@
      }, 
      {
        "attributeID": 102, 
-        "value": 5.0
+        "value": 4.0
      }, 
      {
        "attributeID": 109, 
@@ -556248,7 +556224,7 @@
      }, 
      {
        "attributeID": 486, 
-        "value": 5.0
+        "value": 25.0
      }, 
      {
        "attributeID": 524, 
@@ -556276,7 +556252,7 @@
      }, 
      {
        "attributeID": 658, 
-        "value": -5.0
+        "value": 10.0
      }, 
      {
        "attributeID": 661, 
@@ -556362,6 +556338,10 @@
        "attributeID": 1768, 
        "value": 11328.0
      }, 
+      {
+        "attributeID": 2014, 
+        "value": -15.0
+      }, 
      {
        "attributeID": 2045, 
        "value": 1.0
@@ -556381,7 +556361,11 @@
        "isDefault": 0
      }, 
      {
-        "effectID": 3705, 
+        "effectID": 11416, 
+        "isDefault": 0
+      }, 
+      {
+        "effectID": 11417, 
        "isDefault": 0
      }
    ]
@@ -556854,7 +556838,7 @@
      }, 
      {
        "attributeID": 111, 
-        "value": 0.0
+        "value": 0.001
      }, 
      {
        "attributeID": 113, 
@@ -556891,7 +556875,7 @@
      }, 
      {
        "attributeID": 111, 
-        "value": 0.0
+        "value": 0.001
      }, 
      {
        "attributeID": 113, 
@@ -556928,7 +556912,7 @@
      }, 
      {
        "attributeID": 111, 
-        "value": 0.0
+        "value": 0.001
      }, 
      {
        "attributeID": 113, 
@@ -556965,7 +556949,7 @@
      }, 
      {
        "attributeID": 111, 
-        "value": 0.0
+        "value": 0.001
      }, 
      {
        "attributeID": 113, 
@@ -557002,7 +556986,7 @@
      }, 
      {
        "attributeID": 111, 
-        "value": 0.0
+        "value": 0.001
      }, 
      {
        "attributeID": 113, 
@@ -557039,7 +557023,7 @@
      }, 
      {
        "attributeID": 111, 
-        "value": 0.0
+        "value": 0.001
      }, 
      {
        "attributeID": 113, 
@@ -557066,6 +557050,10 @@
        "attributeID": 9, 
        "value": 1000000000.0
      }, 
+      {
+        "attributeID": 55, 
+        "value": 0.0
+      }, 
      {
        "attributeID": 109, 
        "value": 0.001
@@ -557076,16 +557064,28 @@
      }, 
      {
        "attributeID": 111, 
-        "value": 0.0
+        "value": 0.001
      }, 
      {
        "attributeID": 113, 
        "value": 0.001
      }, 
+      {
+        "attributeID": 481, 
+        "value": 0.0
+      }, 
+      {
+        "attributeID": 482, 
+        "value": 0.0
+      }, 
      {
        "attributeID": 525, 
        "value": 1.0
      }, 
+      {
+        "attributeID": 562, 
+        "value": 0.0
+      }, 
      {
        "attributeID": 854, 
        "value": 1.0
@@ -557103,6 +557103,10 @@
        "attributeID": 9, 
        "value": 1000000000.0
      }, 
+      {
+        "attributeID": 55, 
+        "value": 0.0
+      }, 
      {
        "attributeID": 109, 
        "value": 0.001
@@ -557113,16 +557117,28 @@
      }, 
      {
        "attributeID": 111, 
-        "value": 0.0
+        "value": 0.001
      }, 
      {
        "attributeID": 113, 
        "value": 0.001
      }, 
+      {
+        "attributeID": 481, 
+        "value": 0.0
+      }, 
+      {
+        "attributeID": 482, 
+        "value": 0.0
+      }, 
      {
        "attributeID": 525, 
        "value": 1.0
      }, 
+      {
+        "attributeID": 562, 
+        "value": 0.0
+      }, 
      {
        "attributeID": 854, 
        "value": 1.0
@@ -557140,6 +557156,10 @@
        "attributeID": 9, 
        "value": 10000000000.0
      }, 
+      {
+        "attributeID": 55, 
+        "value": 0.0
+      }, 
      {
        "attributeID": 109, 
        "value": 0.001
@@ -557150,16 +557170,28 @@
      }, 
      {
        "attributeID": 111, 
-        "value": 0.0
+        "value": 0.001
      }, 
      {
        "attributeID": 113, 
        "value": 0.001
      }, 
+      {
+        "attributeID": 481, 
+        "value": 0.0
+      }, 
+      {
+        "attributeID": 482, 
+        "value": 0.0
+      }, 
      {
        "attributeID": 525, 
        "value": 1.0
      }, 
+      {
+        "attributeID": 562, 
+        "value": 0.0
+      }, 
      {
        "attributeID": 854, 
        "value": 1.0
@@ -620841,7 +620873,7 @@
      }, 
      {
        "attributeID": 37, 
-        "value": 180.0
+        "value": 230.0
      }, 
      {
        "attributeID": 48, 
@@ -715516,19 +715548,19 @@
      }, 
      {
        "attributeID": 11, 
-        "value": 17500.0
+        "value": 16000.0
      }, 
      {
        "attributeID": 12, 
-        "value": 8.0
+        "value": 7.0
      }, 
      {
        "attributeID": 13, 
-        "value": 4.0
+        "value": 5.0
      }, 
      {
        "attributeID": 14, 
-        "value": 8.0
+        "value": 7.0
      }, 
      {
        "attributeID": 15, 
@@ -715572,11 +715604,11 @@
      }, 
      {
        "attributeID": 101, 
-        "value": 0.0
+        "value": 5.0
      }, 
      {
        "attributeID": 102, 
-        "value": 7.0
+        "value": 5.0
      }, 
      {
        "attributeID": 109, 
@@ -715692,7 +715724,7 @@
      }, 
      {
        "attributeID": 283, 
-        "value": 200.0
+        "value": 275.0
      }, 
      {
        "attributeID": 422, 
@@ -715712,7 +715744,7 @@
      }, 
      {
        "attributeID": 492, 
-        "value": -10.0
+        "value": 10.0
      }, 
      {
        "attributeID": 524, 
@@ -715730,10 +715762,6 @@
        "attributeID": 564, 
        "value": 143.0
      }, 
-      {
-        "attributeID": 585, 
-        "value": -5.0
-      }, 
      {
        "attributeID": 600, 
        "value": 3.0
@@ -715857,16 +715885,40 @@
    ], 
    "dogmaEffects": [
      {
-        "effectID": 542, 
+        "effectID": 6253, 
        "isDefault": 0
      }, 
      {
-        "effectID": 887, 
+        "effectID": 6257, 
        "isDefault": 0
      }, 
      {
        "effectID": 8377, 
        "isDefault": 0
+      }, 
+      {
+        "effectID": 11421, 
+        "isDefault": 0
+      }, 
+      {
+        "effectID": 11422, 
+        "isDefault": 0
+      }, 
+      {
+        "effectID": 11423, 
+        "isDefault": 0
+      }, 
+      {
+        "effectID": 11424, 
+        "isDefault": 0
+      }, 
+      {
+        "effectID": 11425, 
+        "isDefault": 0
+      }, 
+      {
+        "effectID": 11426, 
+        "isDefault": 0
      }
    ]
  }, 
@@ -715891,7 +715943,7 @@
      }, 
      {
        "attributeID": 11, 
-        "value": 11000.0
+        "value": 14500.0
      }, 
      {
        "attributeID": 12, 
@@ -716087,7 +716139,7 @@
      }, 
      {
        "attributeID": 500, 
-        "value": 5.0
+        "value": 7.5
      }, 
      {
        "attributeID": 524, 
@@ -716228,6 +716280,10 @@
      {
        "attributeID": 3268, 
        "value": 0.05
+      }, 
+      {
+        "attributeID": 5240, 
+        "value": 7.5
      }
    ], 
    "dogmaEffects": [
@@ -716246,6 +716302,14 @@
      {
        "effectID": 8377, 
        "isDefault": 0
+      }, 
+      {
+        "effectID": 11419, 
+        "isDefault": 0
+      }, 
+      {
+        "effectID": 11420, 
+        "isDefault": 0
      }
    ]
  }, 
@@ -717060,6 +717124,18 @@
      {
        "effectID": 8377, 
        "isDefault": 0
+      }, 
+      {
+        "effectID": 11428, 
+        "isDefault": 0
+      }, 
+      {
+        "effectID": 11429, 
+        "isDefault": 0
+      }, 
+      {
+        "effectID": 11430, 
+        "isDefault": 0
      }
    ]
  }, 
@@ -747591,6 +747667,10 @@
      {
        "attributeID": 280, 
        "value": 0.0
+      }, 
+      {
+        "attributeID": 1047, 
+        "value": 0.0
      }
    ], 
    "dogmaEffects": [
@@ -747605,6 +747685,10 @@
      {
        "effectID": 5277, 
        "isDefault": 0
+      }, 
+      {
+        "effectID": 11449, 
+        "isDefault": 0
      }
    ]
  }, 
@@ -747633,6 +747717,10 @@
      {
        "attributeID": 280, 
        "value": 0.0
+      }, 
+      {
+        "attributeID": 1047, 
+        "value": 0.0
      }
    ], 
    "dogmaEffects": [
@@ -747647,6 +747735,10 @@
      {
        "effectID": 5279, 
        "isDefault": 0
+      }, 
+      {
+        "effectID": 11447, 
+        "isDefault": 0
      }
    ]
  }, 
@@ -747675,6 +747767,10 @@
      {
        "attributeID": 280, 
        "value": 0.0
+      }, 
+      {
+        "attributeID": 1047, 
+        "value": 0.0
      }
    ], 
    "dogmaEffects": [
@@ -747689,6 +747785,10 @@
      {
        "effectID": 5281, 
        "isDefault": 0
+      }, 
+      {
+        "effectID": 11451, 
+        "isDefault": 0
      }
    ]
  }, 
@@ -747717,6 +747817,10 @@
      {
        "attributeID": 280, 
        "value": 0.0
+      }, 
+      {
+        "attributeID": 1047, 
+        "value": 0.0
      }
    ], 
    "dogmaEffects": [
@@ -747731,6 +747835,10 @@
      {
        "effectID": 5283, 
        "isDefault": 0
+      }, 
+      {
+        "effectID": 11448, 
+        "isDefault": 0
      }
    ]
  }, 
@@ -809819,7 +809927,7 @@
      }, 
      {
        "attributeID": 1382, 
-        "value": 960.0
+        "value": 270.0
      }, 
      {
        "attributeID": 1383, 
@@ -809848,7 +809956,7 @@
      }, 
      {
        "attributeID": 1382, 
-        "value": 960.0
+        "value": 270.0
      }, 
      {
        "attributeID": 1383, 
@@ -809877,7 +809985,7 @@
      }, 
      {
        "attributeID": 1382, 
-        "value": 960.0
+        "value": 270.0
      }, 
      {
        "attributeID": 1383, 
@@ -809906,7 +810014,7 @@
      }, 
      {
        "attributeID": 1382, 
-        "value": 960.0
+        "value": 270.0
      }, 
      {
        "attributeID": 1383, 
@@ -809935,7 +810043,7 @@
      }, 
      {
        "attributeID": 1382, 
-        "value": 960.0
+        "value": 270.0
      }, 
      {
        "attributeID": 1383, 
@@ -809964,7 +810072,7 @@
      }, 
      {
        "attributeID": 1382, 
-        "value": 960.0
+        "value": 270.0
      }, 
      {
        "attributeID": 1383, 
@@ -809993,7 +810101,7 @@
      }, 
      {
        "attributeID": 1382, 
-        "value": 960.0
+        "value": 270.0
      }, 
      {
        "attributeID": 1383, 
@@ -956882,11 +956990,11 @@
      }, 
      {
        "attributeID": 2489, 
-        "value": 51.0
+        "value": 16.0
      }, 
      {
        "attributeID": 2490, 
-        "value": 60000.0
+        "value": 1920000.0
      }, 
      {
        "attributeID": 2673, 
@@ -956903,7 +957011,7 @@
        "isDefault": 0
      }, 
      {
-        "effectID": 6901, 
+        "effectID": 11453, 
        "isDefault": 0
      }
    ]
@@ -957044,11 +957152,11 @@
      }, 
      {
        "attributeID": 2489, 
-        "value": 307.0
+        "value": 16.0
      }, 
      {
        "attributeID": 2490, 
-        "value": 162000.0
+        "value": 840000.0
      }, 
      {
        "attributeID": 2673, 
@@ -957065,7 +957173,7 @@
        "isDefault": 0
      }, 
      {
-        "effectID": 6901, 
+        "effectID": 11453, 
        "isDefault": 0
      }
    ]
@@ -957202,11 +957310,11 @@
      }, 
      {
        "attributeID": 2489, 
-        "value": 307.0
+        "value": 16.0
      }, 
      {
        "attributeID": 2490, 
-        "value": 146000.0
+        "value": 760000.0
      }, 
      {
        "attributeID": 2673, 
@@ -957223,7 +957331,7 @@
        "isDefault": 0
      }, 
      {
-        "effectID": 6901, 
+        "effectID": 11453, 
        "isDefault": 0
      }
    ]
--- a/staticdata/fsd_binary/typedogma.2.json
+++ b/staticdata/fsd_binary/typedogma.2.json
--- a/staticdata/fsd_binary/types.0.json
+++ b/staticdata/fsd_binary/types.0.json
--- a/staticdata/fsd_binary/types.1.json
+++ b/staticdata/fsd_binary/types.1.json
--- a/staticdata/fsd_binary/types.2.json
+++ b/staticdata/fsd_binary/types.2.json
--- a/staticdata/fsd_binary/types.3.json
+++ b/staticdata/fsd_binary/types.3.json
--- a/staticdata/fsd_binary/types.4.json
+++ b/staticdata/fsd_binary/types.4.json
--- a/staticdata/fsd_lite/dbuffcollections.0.json
+++ b/staticdata/fsd_lite/dbuffcollections.0.json
@@ -2384,7 +2384,7 @@
    "developerDescription": "Proving Thermal and Kinetic Missile Damage Bonuus", 
    "displayName_de": "Bonus auf den Thermal-/Kinetikschaden von Lenkwaffen", 
    "displayName_en-us": "Thermal/Kinetic Missile Damage Bonus", 
-    "displayName_es": "Bonificación de daño térmico/cinético de los misiles", 
+    "displayName_es": "Bonificación de daño de los misiles térmicos/cinéticos", 
    "displayName_fr": "Bonus de dégâts des missiles thermiques/cinétiques", 
    "displayName_it": "Thermal/Kinetic Missile Damage Bonus", 
    "displayName_ja": "サーマル/キネティックミサイルダメージボーナス", 
@@ -3240,7 +3240,7 @@
    "developerDescription": "Proving Sensor Strength Bonus", 
    "displayName_de": "Sensorstärke-Bonus", 
    "displayName_en-us": "Sensor Strength bonus", 
-    "displayName_es": "Sensor Strength bonus", 
+    "displayName_es": "Bonificación de intensidad del sensor", 
    "displayName_fr": "Bonus de puissance des détecteurs", 
    "displayName_it": "Sensor Strength bonus", 
    "displayName_ja": "センサー強度ボーナス", 
@@ -3273,7 +3273,7 @@
    "developerDescription": "Proving Signature Radius Bonus", 
    "displayName_de": "Signaturradius-Bonus", 
    "displayName_en-us": "Signature Radius bonus", 
-    "displayName_es": "Signature Radius bonus", 
+    "displayName_es": "Bonificación de radio de la señal", 
    "displayName_fr": "Bonus de rayon de signature", 
    "displayName_it": "Signature Radius bonus", 
    "displayName_ja": "シグネチャ半径ボーナス", 
@@ -3321,7 +3321,7 @@
    "developerDescription": "Proving Armor HP Addition", 
    "displayName_de": "Zusätzliche Basis-HP der Panzerung", 
    "displayName_en-us": "Additional Base Armor Hitpoints", 
-    "displayName_es": "Additional Base Armor Hitpoints", 
+    "displayName_es": "Puntos de vida de blindaje básicos adicionales", 
    "displayName_fr": "Points de vie du blindage de base supplémentaires", 
    "displayName_it": "Additional Base Armor Hitpoints", 
    "displayName_ja": "追加基本アーマーヒットポイント", 
@@ -3345,7 +3345,7 @@
    "developerDescription": "Proving Shield HP Addition", 
    "displayName_de": "Zusätzliche Basis-HP der Schilde", 
    "displayName_en-us": "Additional Base Shield Hitpoints", 
-    "displayName_es": "Additional Base Shield Hitpoints", 
+    "displayName_es": "Puntos de vida del escudo básicos adicionales", 
    "displayName_fr": "Points de vie du bouclier de base supplémentaires", 
    "displayName_it": "Additional Base Shield Hitpoints", 
    "displayName_ja": "追加基本シールドヒットポイント", 
@@ -3369,7 +3369,7 @@
    "developerDescription": "Proving Kinetic Missile Damage Bonuus", 
    "displayName_de": "Bonus auf den Kinetikschaden von Lenkwaffen", 
    "displayName_en-us": "Kinetic Missile Damage Bonus", 
-    "displayName_es": "Kinetic Missile Damage Bonus", 
+    "displayName_es": "Bonificación de daño de misiles cinéticos", 
    "displayName_fr": "Bonus de dégâts des missiles cinétiques", 
    "displayName_it": "Kinetic Missile Damage Bonus", 
    "displayName_ja": "キネティックミサイルダメージボーナス", 
@@ -3394,7 +3394,7 @@
    "developerDescription": "Proving Small Hybrid Turret Damage Bonus", 
    "displayName_de": "Schadensbonus auf kleine Hybridgeschütztürme", 
    "displayName_en-us": "Small Hybrid Turret Damage Bonus", 
-    "displayName_es": "Small Hybrid Turret Damage Bonus", 
+    "displayName_es": "Bonificación de daño de torreta híbrida pequeña", 
    "displayName_fr": "Bonus de dégâts des petites tourelles hybrides", 
    "displayName_it": "Small Hybrid Turret Damage Bonus", 
    "displayName_ja": "小型ハイブリッドタレットダメージボーナス", 
@@ -3419,7 +3419,7 @@
    "developerDescription": "Proving Small Hybrid Turret Optimal Bonus", 
    "displayName_de": "Bonus auf optimale Reichweite von kleinen Hybridgeschütztürmen", 
    "displayName_en-us": "Small Hybrid Turret Optimal Range Bonus", 
-    "displayName_es": "Small Hybrid Turret Optimal Range Bonus", 
+    "displayName_es": "Bonificación de alcance óptimo de torreta híbrida pequeña", 
    "displayName_fr": "Bonus de portée optimale des petites tourelles hybrides", 
    "displayName_it": "Small Hybrid Turret Optimal Range Bonus", 
    "displayName_ja": "小型ハイブリッドタレット最適射程距離ボーナス", 
@@ -3452,5 +3452,87 @@
    "locationRequiredSkillModifiers": [], 
    "operationName": "PostAssignment", 
    "showOutputValueInUI": "ShowNormal"
+  }, 
+  "2185": {
+    "aggregateMode": "Maximum", 
+    "developerDescription": "Tethering Restricted By Security", 
+    "displayName_de": "Anbindung ist blockiert", 
+    "displayName_en-us": "Tether blocked", 
+    "displayName_es": "Amarre bloqueado", 
+    "displayName_fr": "Accostage verrouillé", 
+    "displayName_it": "Tether blocked", 
+    "displayName_ja": "テザリングブロック中", 
+    "displayName_ko": "테더링 차단", 
+    "displayName_ru": "Швартовка недоступна", 
+    "displayName_zh": "Tether blocked", 
+    "displayNameID": 639276, 
+    "itemModifiers": [
+      {
+        "dogmaAttributeID": 2343
+      }
+    ], 
+    "locationGroupModifiers": [], 
+    "locationModifiers": [], 
+    "locationRequiredSkillModifiers": [], 
+    "operationName": "ModAdd", 
+    "showOutputValueInUI": "Hide"
+  }, 
+  "2186": {
+    "aggregateMode": "Maximum", 
+    "developerDescription": "Proving AB/MWD Speed Increase", 
+    "displayName_de": "Bonus auf die Geschwindigkeitserhöhung von Nachbrenner-/Mikrowarpantrieb-Modulen", 
+    "displayName_en-us": "AB/MWD module speed increase bonus", 
+    "displayName_es": "Bonificación de aumento de velocidad de módulo de PQ/MMW", 
+    "displayName_fr": "Bonus à la vitesse des SPC/PMW", 
+    "displayName_it": "AB/MWD module speed increase bonus", 
+    "displayName_ja": "AB/MWDモジュールのスピード増加量ボーナス", 
+    "displayName_ko": "애프터버너/마이크로 워프 드라이브 최대 속도 증가", 
+    "displayName_ru": "Увеличение скорости форсажных и микроварп-ускорителей", 
+    "displayName_zh": "AB/MWD module speed increase bonus", 
+    "displayNameID": 639612, 
+    "itemModifiers": [], 
+    "locationGroupModifiers": [], 
+    "locationModifiers": [], 
+    "locationRequiredSkillModifiers": [
+      {
+        "dogmaAttributeID": 20, 
+        "skillID": 3450
+      }, 
+      {
+        "dogmaAttributeID": 20, 
+        "skillID": 3454
+      }
+    ], 
+    "operationName": "PostPercent", 
+    "showOutputValueInUI": "ShowNormal"
+  }, 
+  "2187": {
+    "aggregateMode": "Minimum", 
+    "developerDescription": "Proving AB/MWD Cap Need Reduction", 
+    "displayName_de": "Bonus auf den Energiespeicherbedarf von Nachbrennern/Mikrowarpantrieben", 
+    "displayName_en-us": "AB/MWD capacitor consumption bonus", 
+    "displayName_es": "Bonificación de consumo del condensador de PQ/MMW", 
+    "displayName_fr": "Bonus à la consommation de capaciteur des SPC/PMW", 
+    "displayName_it": "AB/MWD capacitor consumption bonus", 
+    "displayName_ja": "AB/MWDのキャパシタ消費量ボーナス", 
+    "displayName_ko": "애프터버너/마이크로 워프 드라이브 캐패시터 사용량 감소", 
+    "displayName_ru": "Снижение расхода энергии форсажных и микроварп-ускорителей", 
+    "displayName_zh": "AB/MWD capacitor consumption bonus", 
+    "displayNameID": 639613, 
+    "itemModifiers": [], 
+    "locationGroupModifiers": [], 
+    "locationModifiers": [], 
+    "locationRequiredSkillModifiers": [
+      {
+        "dogmaAttributeID": 6, 
+        "skillID": 3450
+      }, 
+      {
+        "dogmaAttributeID": 6, 
+        "skillID": 3454
+      }
+    ], 
+    "operationName": "PostPercent", 
+    "showOutputValueInUI": "ShowNormal"
  }
 }
--- a/staticdata/phobos/metadata.0.json
+++ b/staticdata/phobos/metadata.0.json
@@ -1,10 +1,10 @@
 [
  {
    "field_name": "client_build", 
-    "field_value": 2138646
+    "field_value": 2178459
  }, 
  {
    "field_name": "dump_time", 
-    "field_value": 1666313208
+    "field_value": 1670718451
  }
 ]
--- a/staticdata/phobos/traits.0.json
+++ b/staticdata/phobos/traits.0.json
--- a/version.yml
+++ b/version.yml
@@ -1 +1 @@
-version: v2.47.0
+version: v2.49.0dev2
Author	SHA1	Message	Date
Anton Vorobyov	afcddeea70	Bump appimage version	2022-12-11 14:04:12 +04:00
Anton Vorobyov	e5eb001cf3	Fix bestla rof bonus and bump version	2022-12-11 13:49:36 +04:00
Anton Vorobyov	0d186ba56b	Bump version	2022-12-11 06:09:25 +04:00
Anton Vorobyov	e2273f90b4	Add overrides for new AT ships	2022-12-11 06:08:51 +04:00
Anton Vorobyov	d6501df509	Assign geri and bestla to limited edition ships group	2022-12-11 04:57:59 +04:00
Anton Vorobyov	96d639996a	Update effect docstrings & add missing drug effect	2022-12-11 04:56:29 +04:00
Anton Vorobyov	625c52720d	Update static data to 2178459	2022-12-11 04:45:11 +04:00
Anton Vorobyov	69221eac24	Ensure that there is always some text in command fit name, even if fit itself has empty name	2022-11-29 20:57:15 +04:00
Anton Vorobyov	74daf99aed	Update icons/renders	2022-11-10 04:38:54 +04:00
Anton Vorobyov	eaf637d1d9	Bump version	2022-11-10 04:33:26 +04:00
Anton Vorobyov	c262ea6e35	Update static data to 2154998	2022-11-10 04:33:09 +04:00
DarkPhoenix	1c541c82bf	Bump version	2022-11-04 22:29:43 +04:00
DarkPhoenix	1824d1b866	Update static data & other stuff to 2151933	2022-11-04 22:28:34 +04:00
DarkPhoenix	90025f22e5	Bump version	2022-11-02 17:17:11 +04:00
DarkPhoenix	9e71ed88e9	Update using latest sisi data	2022-11-02 17:16:35 +04:00
DarkPhoenix	be07d8e338	Bump version	2022-10-26 21:57:32 +04:00
DarkPhoenix	242fbba6d6	Update staticdata to 2143320	2022-10-26 21:57:00 +04:00
DarkPhoenix	7f1e0fcc58	Bump version	2022-10-25 01:53:07 +04:00
DarkPhoenix	072a53eabc	Fix a couple of effects	2022-10-25 01:51:18 +04:00
DarkPhoenix	3115268fb8	Implement effect changes	2022-10-25 01:32:52 +04:00
DarkPhoenix	0631bd65e1	Update static data to 2141324 and update effect doctrings	2022-10-24 22:19:23 +04:00