Merge branch 'release/2.9.5'

updated Weapon_ShortRange with v3 values

modifications/blueprints.json

@@ -5297,8 +5297,8 @@
         },
         "features": {
           "integrity": [ 0, 0.2 ],
-          "kinres": [ 0.05, 0.1 ],
-          "thermres": [ -0.05, 0 ]
+          "kinres": [ 0, 0.06 ],
+          "thermres": [ -0.04, -0.04 ]
         }
       },
       "2": {
@@ -5307,9 +5307,9 @@
           "Modified Consumer Firmware": 1
         },
         "features": {
-          "integrity": [ 0.05, 0.25 ],
-          "kinres": [ 0.07, 0.2 ],
-          "thermres": [ -0.1, -0.02 ]
+          "integrity": [ 0.2, 0.25 ],
+          "kinres": [ 0.06, 0.12 ],
+          "thermres": [ -0.07, -0.07 ]
         }
       },
       "3": {
@@ -5319,9 +5319,9 @@
           "Selenium": 1
         },
         "features": {
-          "integrity": [ 0.1, 0.2 ],
-          "kinres": [ 0.09, 0.3 ],
-          "thermres": [ -0.15, -0.04 ]
+          "integrity": [ 0.25, 0.3 ],
+          "kinres": [ 0.12, 0.18 ],
+          "thermres": [ -0.11, -0.11 ]
         }
       },
       "4": {
@@ -5331,9 +5331,9 @@
           "Mercury": 1
         },
         "features": {
-          "integrity": [ 0.15, 0.35 ],
-          "kinres": [ 0.11, 0.4 ],
-          "thermres": [ -0.2, -0.06 ]
+          "integrity": [ 0.3, 0.35 ],
+          "kinres": [ 0.18, 0.24 ],
+          "thermres": [ -0.14, -0.14 ]
         }
       },
       "5": {
@@ -5343,9 +5343,9 @@
           "Untypical Shield Scans": 1
         },
         "features": {
-          "integrity": [ 0.2, 0.4 ],
-          "kinres": [ 0.13, 0.5 ],
-          "thermres": [ -0.25, -0.08 ]
+          "integrity": [ 0.35, 0.4 ],
+          "kinres": [ 0.18, 0.30 ],
+          "thermres": [ -0.18, -0.18 ]
         }
       }
     },
@@ -5361,10 +5361,11 @@
           "Distorted Shield Cycle Recordings": 1
         },
         "features": {
-          "integrity": [ -0.1, -0.05 ],
-          "mass": [ 0, -0.08 ],
-          "optmass": [ -0.03, 0 ],
-          "power": [ -0.12, -0.2 ]
+          "integrity": [ -0.05, -0.05 ],
+          "mass": [ 0, -0.18 ],
+          "optmass": [ -0.02, -0.02 ],
+          "optmul": [ 0, 0.045 ],
+          "power": [ 0 , -0.2 ]
         }
       },
       "2": {
@@ -5373,10 +5374,11 @@
           "Germanium": 1
         },
         "features": {
-          "integrity": [ -0.2, -0.1 ],
-          "mass": [ -0.04, -0.16 ],
-          "optmass": [ -0.06, -0.01 ],
-          "power": [ -0.14, -0.25 ]
+          "integrity": [ -0.1, -0.1 ],
+          "mass": [ -0.18, -0.26 ],
+          "optmass": [ -0.03, -0.03 ],
+          "optmul": [ 0.02, 0.09 ],
+          "power": [ -0.2, -0.25 ]
         }
       },
       "3": {
@@ -5386,11 +5388,11 @@
           "Precipitated Alloys": 1
         },
         "features": {
-          "integrity": [ -0.3, -0.15 ],
-          "mass": [ -0.08, -0.24 ],
-          "optmass": [ -0.09, -0.02 ],
-          "optmul": [ 0, 0.02 ],
-          "power": [ -0.16, -0.3 ]
+          "integrity": [ -0.15, -0.15 ],
+          "mass": [ -0.26, -0.34 ],
+          "optmass": [ -0.04, -0.04 ],
+          "optmul": [ 0.09, 0.135 ],
+          "power": [ -0.25, -0.3 ]
         }
       },
       "4": {
@@ -5400,11 +5402,11 @@
           "Thermic Alloys": 1
         },
         "features": {
-          "integrity": [ -0.4, -0.2 ],
-          "mass": [ -0.12, -0.32 ],
-          "optmass": [ -0.12, -0.03 ],
-          "optmul": [ 0, 0.04 ],
-          "power": [ -0.18, -0.35 ]
+          "integrity": [ -0.2, -0.2 ],
+          "mass": [ -0.34, -0.42 ],
+          "optmass": [ -0.05, -0.05 ],
+          "optmul": [ 0.135, 0.18 ],
+          "power": [ -0.3, -0.35 ]
         }
       },
       "5": {
@@ -5414,11 +5416,11 @@
           "Untypical Shield Scans": 1
         },
         "features": {
-          "integrity": [ -0.5, -0.25 ],
-          "mass": [ -0.16, -0.4 ],
-          "optmass": [ -0.15, -0.04 ],
-          "optmul": [ 0, 0.06 ],
-          "power": [ -0.2, -0.4 ]
+          "integrity": [ -0.25, -0.25 ],
+          "mass": [ -0.42, -0.5 ],
+          "optmass": [ -0.06, -0.06 ],
+          "optmul": [ 0.18, 0.225 ],
+          "power": [ -0.35, -0.4 ]
         }
       }
     },
@@ -5434,11 +5436,12 @@
           "Phosphorus": 1
         },
         "features": {
-          "brokenregen": [ -0.2, -0.15 ],
-          "explres": [ 0, 0.03 ],
-          "kinres": [ 0, 0.03 ],
-          "optmul": [ 0.05, 0.1 ],
-          "thermres": [ 0, 0.03 ]
+          "brokenregen": [ -0.1, -0.1 ],
+          "distdraw": [ 0.04, 0.04 ],
+          "explres": [ 0, 0.0225 ],
+          "kinres": [ 0, 0.027 ],
+          "optmul": [ 0, 0.14 ],
+          "thermres": [ 0, 0.054 ]
         }
       },
       "2": {
@@ -5447,12 +5450,12 @@
           "Phosphorus": 1
         },
         "features": {
-          "brokenregen": [ -0.24, -0.12 ],
-          "explres": [ 0.02, 0.06 ],
-          "kinres": [ 0.02, 0.06 ],
-          "optmul": [ 0.07, 0.15 ],
-          "regen": [ -0.06, -0.04 ],
-          "thermres": [ 0.02, 0.06 ]
+          "brokenregen": [ -0.1, -0.1 ],
+          "distdraw": [ 0.06, 0.06 ],
+          "explres": [ 0.0225, 0.0375 ],
+          "kinres": [ 0.027, 0.045 ],
+          "optmul": [ 0.14, 0.20 ],
+          "thermres": [ 0.054, 0.09 ]
         }
       },
       "3": {
@@ -5462,13 +5465,12 @@
           "Phosphorus": 1
         },
         "features": {
-          "brokenregen": [ -0.27, -0.09 ],
-          "distdraw": [ 0.05, 0 ],
-          "explres": [ 0.04, 0.09 ],
-          "kinres": [ 0.04, 0.06 ],
-          "optmul": [ 0.09, 0.2 ],
-          "regen": [ -0.09, -0.03 ],
-          "thermres": [ 0.04, 0.09 ]
+          "brokenregen": [ -0.1, -0.1 ],
+          "distdraw": [ 0.08, 0.08 ],
+          "explres": [ 0.0375, 0.0525 ],
+          "kinres": [ 0.045, 0.063 ],
+          "optmul": [ 0.20, 0.26 ],
+          "thermres": [ 0.09, 0.126 ]
         }
       },
       "4": {
@@ -5478,13 +5480,12 @@
           "Manganese": 1
         },
         "features": {
-          "brokenregen": [ -0.3, -0.06 ],
-          "distdraw": [ 0.1, 0.05 ],
-          "explres": [ 0.06, 0.12 ],
-          "kinres": [ 0.06, 0.12 ],
-          "optmul": [ 0.1, 0.25 ],
-          "regen": [ -0.12, -0.02 ],
-          "thermres": [ 0.06, 0.12 ]
+          "brokenregen": [ -0.1, -0.1 ],
+          "distdraw": [ 0.1, 0.1 ],
+          "explres": [ 0.0525, 0.0675 ],
+          "kinres": [ 0.063, 0.081 ],
+          "optmul": [ 0.26, 0.32 ],
+          "thermres": [ 0.126, 0.162 ]
         }
       },
       "5": {
@@ -5494,13 +5495,12 @@
           "Improvised Components": 1
         },
         "features": {
-          "brokenregen": [ -0.33, -0.03 ],
-          "distdraw": [ 0.15, 0.1 ],
-          "explres": [ 0.08, 0.15 ],
-          "kinres": [ 0.08, 0.15 ],
-          "optmul": [ 0.13, 0.3 ],
-          "regen": [ -0.15, -0.01 ],
-          "thermres": [ 0.08, 0.15 ]
+          "brokenregen": [ -0.1, -0.1 ],
+          "distdraw": [ 0.12, 0.12 ],
+          "explres": [ 0.0675, 0.0825 ],
+          "kinres": [ 0.081, 0.099 ],
+          "optmul": [ 0.32, 0.38 ],
+          "thermres": [ 0.162, 0.198 ]
         }
       }
     },
@@ -5517,8 +5517,8 @@
         },
         "features": {
           "integrity": [ 0, 0.2 ],
-          "kinres": [ -0.05, 0 ],
-          "thermres": [ 0.05, 0.1 ]
+          "kinres": [ -0.02, -0.02 ],
+          "thermres": [ 0, 0.12 ]
         }
       },
       "2": {
@@ -5527,9 +5527,9 @@
           "Germanium": 1
         },
         "features": {
-          "integrity": [ 0.05, 0.25 ],
-          "kinres": [ -0.1, -0.02 ],
-          "thermres": [ 0.07, 0.2 ]
+          "integrity": [ 0.2, 0.25 ],
+          "kinres": [ -0.05, -0.05 ],
+          "thermres": [ 0.12, 0.24 ]
         }
       },
       "3": {
@@ -5539,9 +5539,9 @@
           "Selenium": 1
         },
         "features": {
-          "integrity": [ 0.1, 0.3 ],
-          "kinres": [ -0.15, -0.04 ],
-          "thermres": [ 0.09, 0.3 ]
+          "integrity": [ 0.25, 0.3 ],
+          "kinres": [ -0.07, -0.07 ],
+          "thermres": [ 0.24, 0.36 ]
         }
       },
       "4": {
@@ -5551,9 +5551,9 @@
           "Mercury": 1
         },
         "features": {
-          "integrity": [ 0.15, 0.35 ],
-          "kinres": [ -0.2, -0.06 ],
-          "thermres": [ 0.11, 0.4 ]
+          "integrity": [ 0.3, 0.35 ],
+          "kinres": [ -0.1, -0.1 ],
+          "thermres": [ 0.36, 0.48 ]
         }
       },
       "5": {
@@ -5563,9 +5563,9 @@
           "Untypical Shield Scans": 1
         },
         "features": {
-          "integrity": [ 0.2, 0.4 ],
-          "kinres": [ -0.25, -0.08 ],
-          "thermres": [ 0.13, 0.5 ]
+          "integrity": [ 0.35, 0.4 ],
+          "kinres": [ -0.12, -0.12 ],
+          "thermres": [ 0.48, 0.6 ]
         }
       }
     },
@@ -6332,8 +6332,8 @@
           "Nickel": 1
         },
         "features": {
-          "damage": [ 0.03, 0.09 ],
-          "range": [ -0.35, -0.1 ]
+          "damage": [ 0.15, 0.27 ],
+          "range": [ -0.1, -0.1 ]
         }
       },
       "2": {
@@ -6342,9 +6342,9 @@
           "Nickel": 1
         },
         "features": {
-          "damage": [ 0.08, 0.18 ],
-          "range": [ -0.45, -0.2 ],
-          "thermload": [ 0.2, 0.1 ]
+          "damage": [ 0.27, 0.39 ],
+          "range": [ -0.2, -0.2 ],
+          "thermload": [ 0.1, 0.1 ]
         }
       },
       "3": {
@@ -6354,10 +6354,9 @@
           "Nickel": 1
         },
         "features": {
-          "damage": [ 0.1, 0.26 ],
-          "integrity": [ -0.2, -0.1 ],
-          "range": [ -0.55, -0.3 ],
-          "thermload": [ 0.3, 0.2 ]
+          "damage": [ 0.39, 0.51 ],
+          "range": [ -0.3, -0.3 ],
+          "thermload": [ 0.2, 0.2 ]
         }
       },
       "4": {
@@ -6367,10 +6366,9 @@
           "Modified Consumer Firmware": 1
         },
         "features": {
-          "damage": [ 0.15, 0.35 ],
-          "integrity": [ -0.3, -0.2 ],
-          "range": [ -0.65, -0.4 ],
-          "thermload": [ 0.4, 0.3 ]
+          "damage": [ 0.51, 0.63 ],
+          "range": [ -0.4, -0.4 ],
+          "thermload": [ 0.3, 0.3 ]
         }
       },
       "5": {
@@ -6380,10 +6378,9 @@
           "Cracked Industrial Firmware": 1
         },
         "features": {
-          "damage": [ 0.2, 0.45 ],
-          "integrity": [ -0.4, -0.3 ],
-          "range": [ -0.75, -0.5 ],
-          "thermload": [ 0.5, 0.4 ]
+          "damage": [ 0.63, 0.75 ],
+          "range": [ -0.5, -0.5 ],
+          "thermload": [ 0.4, 0.4 ]
         }
       }
     },

modifications/modifierActions.json

@@ -165,12 +165,21 @@
   },
   "special_auto_loader": {},
   "special_choke_canister": {},
+  "special_feedback_cascade_cooled": {
+    "thermload": -0.4
+  },
+  "special_super_penetrator_cooled": {
+    "thermload": -0.4
+  },
   "special_concordant_sequence": {
     "thermload": 0.5
   },
   "special_corrosive_shell": {
     "ammo": -0.2
   },
+  "special_plasma_slug_cooled": {
+    "thermload": -0.4
+  },
   "special_dispersal_field": {
   },
   "special_distortion_field": {},
@@ -249,6 +258,219 @@
   "special_thermalshock": {
     "damage": -0.2
   },
+  "special_penetrator_munitions": {
+  },
+  "special_deep_cut_payload": {
+  },
+  "special_mass_lock": {
+  },
+  "special_shield_regenerative": {
+    "brokenregen": 0.15,
+    "regen": 0.15,
+    "thermres": -1,
+    "kinres": -1,
+    "explres": -1
+  },
+  "special_shield_resistive": {
+    "thermres": 3,
+    "kinres": 3,
+    "explres": 3,
+    "power": 0.1,
+    "distdraw": 0.25
+  },
+  "special_shield_health": {
+    "power": 0.1,
+    "optmul": 0.06,
+    "distdraw": 0.25
+  },
+  "special_shield_efficient": {
+    "power": -0.2,
+    "distdraw": -0.2,
+    "thermres": -1,
+    "optmul": -0.02,
+    "kinres": -1,
+    "explres": -1
+  },
+  "special_shield_thermic": {
+    "optmul": -0.03,
+    "thermres": 8
+  },
+  "special_shield_kinetic": {
+    "optmul": -0.03,
+    "kinres": 8
+  },
+  "special_shield_toughened": {
+    "integrity": 0.15
+  },
+  "special_shield_lightweight": {
+    "mass": -0.1
+  },
+  "special_engine_cooled": {
+    "mass": 0.1,
+    "thermload": -0.1
+  },
+  "special_engine_haulage": {
+    "optmass": 0.1
+  },
+  "special_engine_overloaded": {
+    "optmul": 0.04,
+    "thermload": 0.1
+  },
+  "special_engine_toughened": {
+    "integrity": 0.15
+  },
+  "special_engine_lightweight": {
+    "mass": -0.1
+  },
+  "special_fsd_fuelcapacity": {
+    "power": 0.05,
+    "maxfuel": 0.1
+  },
+  "special_fsd_heavy": {
+    "integrity": -0.08,
+    "optmass": 0.04
+  },
+  "special_fsd_toughened": {
+    "integrity": 0.15
+  },
+  "special_fsd_lightweight": {
+    "mass": -0.1
+  },
+  "special_fsd_cooled": {
+    "thermload": -0.1
+  },
+  "special_powerplant_highcharge": {
+    "mass": 0.1,
+    "power": 0.05
+  },
+  "special_powerplant_cooled": {
+    "eff": -0.1
+  },
+  "special_powerplant_toughened": {
+    "integrity": 0.15
+  },
+  "special_powerplant_lightweight": {
+    "mass": -0.1
+  },
+  "special_powerdistributor_capacity": {
+    "wepcap": 0.08,
+    "syscap": 0.08,
+    "engcap": 0.08,
+    "weprate": -0.02,
+    "sysrate": -0.02,
+    "engrate": -0.02
+  },
+  "special_powerdistributor_fast": {
+    "wepcap": -0.04,
+    "syscap": -0.04,
+    "engcap": -0.04,
+    "weprate": 0.04,
+    "sysrate": 0.04,
+    "engrate": 0.04
+  },
+  "special_powerdistributor_efficient": {
+    "power": -0.1
+  },
+  "special_powerdistributor_toughened": {
+    "integrity": 0.15
+  },
+  "special_powerdistributor_lightweight": {
+    "mass": -0.1
+  },
+  "special_shieldcell_gradual": {
+    "duration": 0.1,
+    "shieldreinforcement": -0.05
+  },
+  "special_shieldcell_oversized": {
+    "spinup": 0.2,
+    "shieldreinforcement": 0.05
+  },
+  "special_shieldcell_efficient": {
+    "power": -0.1
+  },
+  "special_shieldcell_toughened": {
+    "integrity": 0.15
+  },
+  "special_shieldcell_lightweight": {
+    "mass": -0.1
+  },
+  "special_weapon_damage": {
+    "power": 0.05,
+    "damage": 0.03
+  },
+  "special_weapon_rateoffire": {
+    "power": 0.05,
+    "rof": 0.03
+  },
+  "special_weapon_efficient": {
+    "power": -0.1
+  },
+  "special_weapon_toughened": {
+    "integrity": 0.15
+  },
+  "special_weapon_lightweight": {
+    "mass": -0.1
+  },
+  "special_armour_thermic": {
+    "hullboost": -0.03,
+    "thermres": 8
+  },
+  "special_armour_kinetic": {
+    "hullboost": -0.03,
+    "kinres": 8
+  },
+  "special_armour_explosive": {
+    "hullboost": -0.03,
+    "explres": 8
+  },
+  "special_armour_chunky": {
+    "hullboost": 0.08,
+    "thermres": -3,
+    "explres": -3,
+    "kinres": -3
+  },
+  "special_hullreinforcement_thermic": {
+    "hullreinforcement": -0.05,
+    "thermres": 2
+  },
+  "special_hullreinforcement_kinetic": {
+    "hullreinforcement": -0.05,
+    "kinres": 2
+  },
+  "special_hullreinforcement_explosive": {
+    "hullreinforcement": -0.05,
+    "explres": 2
+  },
+  "special_hullreinforcement_chunky": {
+    "hullreinforcement": 0.1,
+    "explres": 2,
+    "thermres": 2,
+    "kinres": 2
+  },
+  "special_shieldbooster_thermic": {
+    "optmul": -0.01,
+    "thermres": 2
+  },
+  "special_shieldbooster_kinetic": {
+    "optmul": -0.01,
+    "kinres": 2
+  },
+  "special_shieldbooster_explosive": {
+    "optmul": -0.01,
+    "explres": 2
+  },
+  "special_shieldbooster_efficient": {
+    "power": -0.1
+  },
+  "special_shieldbooster_toughened": {
+    "integrity": 0.15
+  },
+  "special_shieldbooster_chunky": {
+    "optmul": 0.05,
+    "thermres": -2,
+    "kinres": -2,
+    "explres": -2
+  },
   "trade_cell_heat_cell_units": {
     "shieldreinforcement": -1,
     "thermload": -1

modifications/modules.json

@@ -193,6 +193,12 @@
       "kinres",
       "mass",
       "thermres"
+    ],
+    "specials": [
+      "special_armour_kinetic",
+      "special_armour_explosive",
+      "special_armour_chunky",
+      "special_armour_thermic"
     ]
   },
   "bl": {
@@ -408,7 +414,12 @@
       "special_regeneration_sequence",
       "special_thermal_conduit",
       "special_thermalshock",
-      "special_thermal_vent"
+      "special_thermal_vent",
+      "special_weapon_damage",
+      "special_weapon_efficient",
+      "special_weapon_rateoffire",
+      "special_weapon_toughened",
+      "special_weapon_lightweight"
     ]
   },
   "bsg": {
@@ -568,6 +579,16 @@
       "regen",
       "thermload",
       "thermres"
+    ],
+    "specials": [
+      "special_shield_regenerative",
+      "special_shield_resistive",
+      "special_shield_health",
+      "special_shield_efficient",
+      "special_shield_thermic",
+      "special_shield_kinetic",
+      "special_shield_toughened",
+      "special_shield_lightweight"
     ]
   },
   "c": {
@@ -814,7 +835,12 @@
       "special_smart_rounds",
       "special_force_shell",
       "special_high_yield_shell",
-      "special_thermal_cascade"
+      "special_thermal_cascade",
+      "special_weapon_damage",
+      "special_weapon_efficient",
+      "special_weapon_rateoffire",
+      "special_weapon_toughened",
+      "special_weapon_lightweight"
     ]
   },
   "cc": {
@@ -1644,7 +1670,12 @@
       "special_blinding_shell",
       "special_incendiary_rounds",
       "special_drag_munitions",
-      "special_screening_shell"
+      "special_screening_shell",
+      "special_weapon_damage",
+      "special_weapon_efficient",
+      "special_weapon_rateoffire",
+      "special_weapon_toughened",
+      "special_weapon_lightweight"
     ]
   },
   "rfl": {
@@ -1888,6 +1919,13 @@
       "optmass",
       "power",
       "thermload"
+    ],
+    "specials": [
+      "special_fsd_fuelcapacity",
+      "special_fsd_heavy",
+      "special_fsd_toughened",
+      "special_fsd_lightweight",
+      "special_fsd_cooled"
     ]
   },
   "ft": {
@@ -2302,6 +2340,12 @@
       "kinres",
       "mass",
       "thermres"
+    ],
+    "specials": [
+      "special_hullreinforcement_thermic",
+      "special_hullreinforcement_kinetic",
+      "special_hullreinforcement_explosive",
+      "special_hullreinforcement_chunky"
     ]
   },
   "hs": {
@@ -3016,7 +3060,12 @@
       "special_emissive_munitions",
       "special_incendiary_rounds",
       "special_smart_rounds",
-      "special_thermalshock"
+      "special_thermalshock",
+      "special_weapon_damage",
+      "special_weapon_efficient",
+      "special_weapon_rateoffire",
+      "special_weapon_toughened",
+      "special_weapon_lightweight"
     ]
   },
   "axmc": {
@@ -3183,7 +3232,12 @@
       "special_emissive_munitions",
       "special_overload_munitions",
       "special_penetrator_payload",
-      "special_thermal_cascade"
+      "special_thermal_cascade",
+      "special_weapon_damage",
+      "special_weapon_efficient",
+      "special_weapon_rateoffire",
+      "special_weapon_toughened",
+      "special_weapon_lightweight"
     ],
     "specials_D": [
       "special_drag_munitions",
@@ -3191,7 +3245,13 @@
       "special_fsd_interrupt",
       "special_overload_munitions",
       "special_penetrator_payload",
-      "special_thermal_cascade"
+      "special_thermal_cascade",
+      "special_weapon_damage",
+      "special_weapon_efficient",
+      "special_weapon_rateoffire",
+      "special_weapon_toughened",
+      "special_weapon_lightweight",
+      "special_penetrator_munitions"
     ]
   },
   "axmr": {
@@ -3359,7 +3419,24 @@
       "special_radiant_canister",
       "special_reverberating_cascade",
       "special_shiftlock_canister",
-      "special_emissive_munitions"
+      "special_emissive_munitions",
+      "special_weapon_damage",
+      "special_weapon_efficient",
+      "special_weapon_rateoffire",
+      "special_weapon_toughened",
+      "special_weapon_lightweight"
+    ]
+  },
+  "gpl": {
+    "blueprints": {
+    },
+    "modifications": [
+    ]
+  },
+  "ggc": {
+    "blueprints": {
+    },
+    "modifications": [
     ]
   },
   "pa": {
@@ -3636,7 +3713,12 @@
       "special_phasing_sequence",
       "special_plasma_slug",
       "special_lock_breaker",
-      "special_thermal_conduit"
+      "special_thermal_conduit",
+      "special_weapon_damage",
+      "special_weapon_efficient",
+      "special_weapon_rateoffire",
+      "special_weapon_toughened",
+      "special_weapon_lightweight"
     ]
   },
   "pas": {
@@ -3986,6 +4068,13 @@
       "sysrate",
       "wepcap",
       "weprate"
+    ],
+    "specials": [
+      "special_powerdistributor_capacity",
+      "special_powerdistributor_fast",
+      "special_powerdistributor_efficient",
+      "special_powerdistributor_toughened",
+      "special_powerdistributor_lightweight"
     ]
   },
   "pl": {
@@ -4274,7 +4363,12 @@
       "special_emissive_munitions",
       "special_phasing_sequence",
       "special_scramble_spectrum",
-      "special_thermalshock"
+      "special_thermalshock",
+      "special_weapon_damage",
+      "special_weapon_efficient",
+      "special_weapon_rateoffire",
+      "special_weapon_toughened",
+      "special_weapon_lightweight"
     ]
   },
   "po": {
@@ -4483,6 +4577,12 @@
       "integrity",
       "mass",
       "pgen"
+    ],
+    "specials": [
+      "special_powerplant_highcharge",
+      "special_powerplant_cooled",
+      "special_powerplant_toughened",
+      "special_powerplant_lightweight"
     ]
   },
   "psg": {
@@ -4642,6 +4742,16 @@
       "regen",
       "thermload",
       "thermres"
+    ],
+    "specials": [
+      "special_shield_regenerative",
+      "special_shield_resistive",
+      "special_shield_health",
+      "special_shield_efficient",
+      "special_shield_thermic",
+      "special_shield_kinetic",
+      "special_shield_toughened",
+      "special_shield_lightweight"
     ]
   },
   "pv": {
@@ -4867,8 +4977,16 @@
     ],
     "specials": [
       "special_feedback_cascade",
+      "special_feedback_cascade_cooled",
       "special_plasma_slug",
-      "special_super_penetrator"
+      "special_plasma_slug_cooled",
+      "special_super_penetrator",
+      "special_super_penetrator_cooled",
+      "special_weapon_damage",
+      "special_weapon_efficient",
+      "special_weapon_rateoffire",
+      "special_weapon_toughened",
+      "special_weapon_lightweight"
     ]
   },
   "s": {
@@ -5209,6 +5327,14 @@
       "power",
       "shieldboost",
       "thermres"
+    ],
+    "specials": [
+      "special_shieldbooster_thermic",
+      "special_shieldbooster_kinetic",
+      "special_shieldbooster_explosive",
+      "special_shieldbooster_efficient",
+      "special_shieldbooster_toughened",
+      "special_shieldbooster_chunky"
     ]
   },
   "sfn": {
@@ -5276,6 +5402,13 @@
       "shieldreinforcement",
       "spinup",
       "thermload"
+    ],
+    "specials": [
+      "special_shieldcell_gradual",
+      "special_shieldcell_oversized",
+      "special_shieldcell_efficient",
+      "special_shieldcell_toughened",
+      "special_shieldcell_lightweight"
     ]
   },
   "sg": {
@@ -5435,6 +5568,16 @@
       "regen",
       "thermload",
       "thermres"
+    ],
+    "specials": [
+      "special_shield_regenerative",
+      "special_shield_resistive",
+      "special_shield_health",
+      "special_shield_efficient",
+      "special_shield_thermic",
+      "special_shield_kinetic",
+      "special_shield_toughened",
+      "special_shield_lightweight"
     ]
   },
   "ss": {
@@ -5715,6 +5858,13 @@
       "optmul",
       "power",
       "thermload"
+    ],
+    "specials": [
+      "special_engine_cooled",
+      "special_engine_haulage",
+      "special_engine_overloaded",
+      "special_engine_toughened",
+      "special_engine_lightweight"
     ]
   },
   "tp": {
@@ -5801,7 +5951,14 @@
     "specials": [
       "special_mass_lock_munition",
       "special_penetrator_payload",
-      "special_reverberating_cascade"
+      "special_reverberating_cascade",
+      "special_weapon_damage",
+      "special_weapon_efficient",
+      "special_weapon_rateoffire",
+      "special_weapon_toughened",
+      "special_weapon_lightweight",
+      "special_deep_cut_payload",
+      "special_mass_lock"
     ]
   },
   "ul": {
@@ -6092,7 +6249,12 @@
       "special_inertial_impact",
       "special_phasing_sequence",
       "special_scramble_spectrum",
-      "special_thermalshock"
+      "special_thermalshock",
+      "special_weapon_damage",
+      "special_weapon_efficient",
+      "special_weapon_rateoffire",
+      "special_weapon_toughened",
+      "special_weapon_lightweight"
     ]
   },
   "ws": {

modifications/specials.json

@@ -1,36 +1,457 @@
 {
-    "special_auto_loader": {"id": 0, "edname": "special_auto_loader", "name": "Auto loader"},
-    "special_choke_canister": {"id": 1, "edname": "special_choke_canister", "name": "Choke canister"},
-    "special_concordant_sequence": {"id": 2, "edname": "special_concordant_sequence", "name": "Concordant sequence"},
-    "special_corrosive_shell": {"id": 3, "edname": "special_corrosive_shell", "name": "Corrosive shell"},
-    "special_blinding_shell": {"id": 4, "edname": "special_blinding_shell", "name": "Dazzle shell"},
-    "special_dispersal_field": {"id": 5, "edname": "special_dispersal_field", "name": "Dispersal field"},
-    "special_distortion_field": {"id": 6, "edname": "special_distortion_field", "name": "Distortion field"},
-    "special_drag_munitions": {"id": 7, "edname": "special_drag_munitions", "name": "Drag munitions"},
-    "special_emissive_munitions": {"id": 8, "edname": "special_emissive_munitions", "name": "Emissive munitions"},
-    "special_feedback_cascade": {"id": 9, "edname": "special_feedback_cascade", "name": "Feedback cascade"},
-    "special_force_shell": {"id": 10, "edname": "special_force_shell", "name": "Force shell"},
-    "special_fsd_interrupt": {"id": 33, "edname": "special_fsd_interrupt", "name": "FSD interrupt"},
-    "special_high_yield_shell": {"id": 11, "edname": "special_high_yield_shell", "name": "High yield shell"},
-    "special_incendiary_rounds": {"id": 12, "edname": "special_incendiary_rounds", "name": "Incendiary rounds"},
-    "special_inertial_impact": {"id": 32, "edname": "special_inertial_impact", "name": "Inertial impact"},
-    "special_ion_disruptor": {"id": 13, "edname": "special_ion_disruptor", "name": "Ion disruptor"},
-    "special_mass_lock_munition": {"id": 14, "edname": "special_mass_lock_munition", "name": "Mass lock munition"},
-    "special_overload_munitions": {"id": 15, "edname": "special_overload_munitions", "name": "Overload munitions"},
-    "special_penetrator_payload": {"id": 16, "edname": "special_penetrator_payload", "name": "Penetrator payload"},
-    "special_phasing_sequence": {"id": 17, "edname": "special_phasing_sequence", "name": "Phasing sequence"},
-    "special_plasma_slug": {"id": 18, "edname": "special_plasma_slug", "name": "Plasma slug"},
-    "special_radiant_canister": {"id": 19, "edname": "special_radiant_canister", "name": "Radiant Canister"},
-    "special_regeneration_sequence": {"id": 20, "edname": "special_regeneration_sequence", "name": "Regeneration sequence"},
-    "special_reverberating_cascade": {"id": 21, "edname": "special_reverberating_cascade", "name": "Reverberating cascade"},
-    "special_scramble_spectrum": {"id": 22, "edname": "special_scramble_spectrum", "name": "Scramble spectrum"},
-    "special_screening_shell": {"id": 23, "edname": "special_screening_shell", "name": "Screening shell"},
-    "special_shiftlock_canister": {"id": 24, "edname": "special_shiftlock_canister", "name": "Shift-lock canister"},
-    "special_smart_rounds": {"id": 25, "edname": "special_smart_rounds", "name": "Smart rounds"},
-    "special_super_penetrator": {"id": 26, "edname": "special_super_penetrator", "name": "Super penetrator"},
-    "special_lock_breaker": {"id": 27, "edname": "special_lock_breaker", "name": "Target lock breaker"},
-    "special_thermal_cascade": {"id": 28, "edname": "special_thermal_cascade", "name": "Thermal cascade"},
-    "special_thermal_conduit": {"id": 29, "edname": "special_thermal_conduit", "name": "Thermal conduit"},
-    "special_thermal_vent": {"id": 30, "edname": "special_thermal_vent", "name": "Thermal vent"},
-    "special_thermalshock": {"id": 31, "edname": "special_thermalshock", "name": "Thermal shock"}
-}
+    "special_auto_loader": {
+        "id": 0,
+        "edname": "special_auto_loader",
+        "name": "Auto loader"
+    },
+    "special_choke_canister": {
+        "id": 1,
+        "edname": "special_choke_canister",
+        "name": "Choke canister"
+    },
+    "special_concordant_sequence": {
+        "id": 2,
+        "edname": "special_concordant_sequence",
+        "name": "Concordant sequence"
+    },
+    "special_corrosive_shell": {
+        "id": 3,
+        "edname": "special_corrosive_shell",
+        "name": "Corrosive shell"
+    },
+    "special_blinding_shell": {
+        "id": 4,
+        "edname": "special_blinding_shell",
+        "name": "Dazzle shell"
+    },
+    "special_dispersal_field": {
+        "id": 5,
+        "edname": "special_dispersal_field",
+        "name": "Dispersal field"
+    },
+    "special_distortion_field": {
+        "id": 6,
+        "edname": "special_distortion_field",
+        "name": "Distortion field"
+    },
+    "special_drag_munitions": {
+        "id": 7,
+        "edname": "special_drag_munitions",
+        "name": "Drag munitions"
+    },
+    "special_emissive_munitions": {
+        "id": 8,
+        "edname": "special_emissive_munitions",
+        "name": "Emissive munitions"
+    },
+    "special_feedback_cascade": {
+        "id": 9,
+        "edname": "special_feedback_cascade",
+        "name": "Feedback cascade"
+    },
+    "special_force_shell": {
+        "id": 10,
+        "edname": "special_force_shell",
+        "name": "Force shell"
+    },
+    "special_fsd_interrupt": {
+        "id": 33,
+        "edname": "special_fsd_interrupt",
+        "name": "FSD interrupt"
+    },
+    "special_high_yield_shell": {
+        "id": 11,
+        "edname": "special_high_yield_shell",
+        "name": "High yield shell"
+    },
+    "special_incendiary_rounds": {
+        "id": 12,
+        "edname": "special_incendiary_rounds",
+        "name": "Incendiary rounds"
+    },
+    "special_inertial_impact": {
+        "id": 32,
+        "edname": "special_inertial_impact",
+        "name": "Inertial impact"
+    },
+    "special_ion_disruptor": {
+        "id": 13,
+        "edname": "special_ion_disruptor",
+        "name": "Ion disruptor"
+    },
+    "special_mass_lock_munition": {
+        "id": 14,
+        "edname": "special_mass_lock_munition",
+        "name": "Mass lock munition"
+    },
+    "special_overload_munitions": {
+        "id": 15,
+        "edname": "special_overload_munitions",
+        "name": "Overload munitions"
+    },
+    "special_penetrator_payload": {
+        "id": 16,
+        "edname": "special_penetrator_payload",
+        "name": "Penetrator payload"
+    },
+    "special_phasing_sequence": {
+        "id": 17,
+        "edname": "special_phasing_sequence",
+        "name": "Phasing sequence"
+    },
+    "special_plasma_slug": {
+        "id": 18,
+        "edname": "special_plasma_slug",
+        "name": "Plasma slug"
+    },
+    "special_radiant_canister": {
+        "id": 19,
+        "edname": "special_radiant_canister",
+        "name": "Radiant Canister"
+    },
+    "special_regeneration_sequence": {
+        "id": 20,
+        "edname": "special_regeneration_sequence",
+        "name": "Regeneration sequence"
+    },
+    "special_reverberating_cascade": {
+        "id": 21,
+        "edname": "special_reverberating_cascade",
+        "name": "Reverberating cascade"
+    },
+    "special_scramble_spectrum": {
+        "id": 22,
+        "edname": "special_scramble_spectrum",
+        "name": "Scramble spectrum"
+    },
+    "special_screening_shell": {
+        "id": 23,
+        "edname": "special_screening_shell",
+        "name": "Screening shell"
+    },
+    "special_shiftlock_canister": {
+        "id": 24,
+        "edname": "special_shiftlock_canister",
+        "name": "Shift-lock canister"
+    },
+    "special_smart_rounds": {
+        "id": 25,
+        "edname": "special_smart_rounds",
+        "name": "Smart rounds"
+    },
+    "special_super_penetrator": {
+        "id": 26,
+        "edname": "special_super_penetrator",
+        "name": "Super penetrator"
+    },
+    "special_lock_breaker": {
+        "id": 27,
+        "edname": "special_lock_breaker",
+        "name": "Target lock breaker"
+    },
+    "special_thermal_cascade": {
+        "id": 28,
+        "edname": "special_thermal_cascade",
+        "name": "Thermal cascade"
+    },
+    "special_thermal_conduit": {
+        "id": 29,
+        "edname": "special_thermal_conduit",
+        "name": "Thermal conduit"
+    },
+    "special_thermal_vent": {
+        "id": 30,
+        "edname": "special_thermal_vent",
+        "name": "Thermal vent"
+    },
+    "special_thermalshock": {
+        "id": 31,
+        "edname": "special_thermalshock",
+        "name": "Thermal shock"
+    },
+    "special_feedback_cascade_cooled": {
+        "name": "Feedback Cascade",
+        "id": 100,
+        "edname": "special_feedback_cascade_cooled"
+    },
+    "special_super_penetrator_cooled": {
+        "name": "Super Penetrator",
+        "id": 101,
+        "edname": "special_super_penetrator_cooled"
+    },
+    "special_plasma_slug_cooled": {
+        "name": "Plasma Slug",
+        "id": 102,
+        "edname": "special_plasma_slug_cooled"
+    },
+    "special_penetrator_munitions": {
+        "name": "Penetrator Munitions",
+        "id": 103,
+        "edname": "special_penetrator_munitions"
+    },
+    "special_deep_cut_payload": {
+        "name": "Penetrator Payload",
+        "id": 104,
+        "edname": "special_deep_cut_payload"
+    },
+    "special_mass_lock": {
+        "name": "Mass Lock Munition",
+        "id": 105,
+        "edname": "special_mass_lock"
+    },
+    "special_shield_regenerative": {
+        "name": "Fast Charge",
+        "id": 106,
+        "edname": "special_shield_regenerative"
+    },
+    "special_shield_resistive": {
+        "name": "Multi-weave",
+        "id": 107,
+        "edname": "special_shield_resistive"
+    },
+    "special_shield_health": {
+        "name": "Hi-Cap",
+        "id": 108,
+        "edname": "special_shield_health"
+    },
+    "special_shield_efficient": {
+        "name": "Lo-draw",
+        "id": 109,
+        "edname": "special_shield_efficient"
+    },
+    "special_shield_thermic": {
+        "name": "Thermo Block",
+        "id": 110,
+        "edname": "special_shield_thermic"
+    },
+    "special_shield_kinetic": {
+        "name": "Force Block",
+        "id": 111,
+        "edname": "special_shield_kinetic"
+    },
+    "special_shield_toughened": {
+        "name": "Double Braced",
+        "id": 112,
+        "edname": "special_shield_toughened"
+    },
+    "special_shield_lightweight": {
+        "name": "Stripped Down",
+        "id": 113,
+        "edname": "special_shield_lightweight"
+    },
+    "special_engine_cooled": {
+        "name": "Thermal Spread",
+        "id": 114,
+        "edname": "special_engine_cooled"
+    },
+    "special_engine_haulage": {
+        "name": "Drive Distributors",
+        "id": 115,
+        "edname": "special_engine_haulage"
+    },
+    "special_engine_overloaded": {
+        "name": "Drag Drives",
+        "id": 116,
+        "edname": "special_engine_overloaded"
+    },
+    "special_engine_toughened": {
+        "name": "Double Braced",
+        "id": 117,
+        "edname": "special_engine_toughened"
+    },
+    "special_engine_lightweight": {
+        "name": "Stripped Down",
+        "id": 118,
+        "edname": "special_engine_lightweight"
+    },
+    "special_fsd_fuelcapacity": {
+        "name": "Deep Charge",
+        "id": 119,
+        "edname": "special_fsd_fuelcapacity"
+    },
+    "special_fsd_heavy": {
+        "name": "Mass Manager",
+        "id": 120,
+        "edname": "special_fsd_heavy"
+    },
+    "special_fsd_toughened": {
+        "name": "Double Braced",
+        "id": 121,
+        "edname": "special_fsd_toughened"
+    },
+    "special_fsd_lightweight": {
+        "name": "Stripped Down",
+        "id": 122,
+        "edname": "special_fsd_lightweight"
+    },
+    "special_fsd_cooled": {
+        "name": "Thermal Spread",
+        "id": 123,
+        "edname": "special_fsd_cooled"
+    },
+    "special_powerplant_highcharge": {
+        "name": "Monstered",
+        "id": 124,
+        "edname": "special_powerplant_highcharge"
+    },
+    "special_powerplant_cooled": {
+        "name": "Thermal Spread",
+        "id": 125,
+        "edname": "special_powerplant_cooled"
+    },
+    "special_powerplant_toughened": {
+        "name": "Double Braced",
+        "id": 126,
+        "edname": "special_powerplant_toughened"
+    },
+    "special_powerplant_lightweight": {
+        "name": "Stripped Down",
+        "id": 127,
+        "edname": "special_powerplant_lightweight"
+    },
+    "special_powerdistributor_capacity": {
+        "name": "Cluster Capacitors",
+        "id": 128,
+        "edname": "special_powerdistributor_capacity"
+    },
+    "special_powerdistributor_fast": {
+        "name": "Super Conduits",
+        "id": 129,
+        "edname": "special_powerdistributor_fast"
+    },
+    "special_powerdistributor_efficient": {
+        "name": "Flow Control",
+        "id": 130,
+        "edname": "special_powerdistributor_efficient"
+    },
+    "special_powerdistributor_toughened": {
+        "name": "Double Braced",
+        "id": 131,
+        "edname": "special_powerdistributor_toughened"
+    },
+    "special_powerdistributor_lightweight": {
+        "name": "Stripped Down",
+        "id": 132,
+        "edname": "special_powerdistributor_lightweight"
+    },
+    "special_shieldcell_gradual": {
+        "name": "Recycling Cell",
+        "id": 133,
+        "edname": "special_shieldcell_gradual"
+    },
+    "special_shieldcell_oversized": {
+        "name": "Boss Cells",
+        "id": 134,
+        "edname": "special_shieldcell_oversized"
+    },
+    "special_shieldcell_efficient": {
+        "name": "Flow Control",
+        "id": 135,
+        "edname": "special_shieldcell_efficient"
+    },
+    "special_shieldcell_toughened": {
+        "name": "Double Braced",
+        "id": 136,
+        "edname": "special_shieldcell_toughened"
+    },
+    "special_shieldcell_lightweight": {
+        "name": "Stripped Down",
+        "id": 137,
+        "edname": "special_shieldcell_lightweight"
+    },
+    "special_weapon_damage": {
+        "name": "Oversized",
+        "id": 138,
+        "edname": "special_weapon_damage"
+    },
+    "special_weapon_rateoffire": {
+        "name": "Multi-servos",
+        "id": 139,
+        "edname": "special_weapon_rateoffire"
+    },
+    "special_weapon_efficient": {
+        "name": "Flow Control",
+        "id": 140,
+        "edname": "special_weapon_efficient"
+    },
+    "special_weapon_toughened": {
+        "name": "Double Braced",
+        "id": 141,
+        "edname": "special_weapon_toughened"
+    },
+    "special_weapon_lightweight": {
+        "name": "Stripped Down",
+        "id": 142,
+        "edname": "special_weapon_lightweight"
+    },
+    "special_armour_thermic": {
+        "name": "Reflective Plating",
+        "id": 143,
+        "edname": "special_armour_thermic"
+    },
+    "special_armour_kinetic": {
+        "name": "Angled Plating",
+        "id": 144,
+        "edname": "special_armour_kinetic"
+    },
+    "special_armour_explosive": {
+        "name": "Layered Plating",
+        "id": 145,
+        "edname": "special_armour_explosive"
+    },
+    "special_armour_chunky": {
+        "name": "Deep Plating",
+        "id": 146,
+        "edname": "special_armour_chunky"
+    },
+    "special_hullreinforcement_thermic": {
+        "name": "Reflective Plating",
+        "id": 147,
+        "edname": "special_hullreinforcement_thermic"
+    },
+    "special_hullreinforcement_kinetic": {
+        "name": "Angled Plating",
+        "id": 148,
+        "edname": "special_hullreinforcement_kinetic"
+    },
+    "special_hullreinforcement_explosive": {
+        "name": "Layered Plating",
+        "id": 149,
+        "edname": "special_hullreinforcement_explosive"
+    },
+    "special_hullreinforcement_chunky": {
+        "name": "Deep Plating",
+        "id": 150,
+        "edname": "special_hullreinforcement_chunky"
+    },
+    "special_shieldbooster_thermic": {
+        "name": "Thermo Block",
+        "id": 151,
+        "edname": "special_shieldbooster_thermic"
+    },
+    "special_shieldbooster_kinetic": {
+        "name": "Force Block",
+        "id": 152,
+        "edname": "special_shieldbooster_kinetic"
+    },
+    "special_shieldbooster_explosive": {
+        "name": "Blast Block",
+        "id": 153,
+        "edname": "special_shieldbooster_explosive"
+    },
+    "special_shieldbooster_efficient": {
+        "name": "Flow Control",
+        "id": 154,
+        "edname": "special_shieldbooster_efficient"
+    },
+    "special_shieldbooster_toughened": {
+        "name": "Double Braced",
+        "id": 155,
+        "edname": "special_shieldbooster_toughened"
+    },
+    "special_shieldbooster_chunky": {
+        "name": "Super Capacitors",
+        "id": 156,
+        "edname": "special_shieldbooster_chunky"
+    }
+}

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "coriolis-data",
-  "version": "2.9.1",
+  "version": "2.9.4",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "coriolis-data",
-  "version": "2.9.1",
+  "version": "2.9.5",
   "repository": {
     "type": "git",
     "url": "https://github.com/EDCD/coriolis-data"

ships/alliance_chieftain.json

@@ -1,7 +1,7 @@
 {
   "alliance_chieftain": {
     "edID": 128816574,
-    "eddbID": 12,
+    "eddbID": 33,
     "properties": {
       "name": "Alliance Chieftain",
       "manufacturer": "Lakon",