Merge branch 'release/2.2.13'

ChangeLog.md

@@ -1,3 +1,18 @@
+#2.2.13
+  * Add plasma slug special effect for plasma accelerator
+  * Tweak hull costs of ships
+
+#2.2.12
+  * Add special effects for each blueprint
+  * Add IDs for most Powerplay modules
+
+#2.2.11
+  * Remove non-existant chaff launcher capacity blueprint grades
+  * Fix incorrect values for charge enhanced power distributor
+  * Remove incorrect AFMU blueprints
+  * Correct fragment cannon Double Shot blueprint information
+  * Correct Focused weapon blueprint information
+
 #2.2.10
   * Fix incorrect base shield values for Cutter and Corvette
   * Update weapons to have %-based damage distributions

modifications/blueprints.json

@@ -1,58 +1,25 @@
 {
-  "AFM_LightWeight": {
-    "id": 1,
-    "features": {
-      "1": {
-        "integrity": [ -0.2, -0.1 ],
-        "mass": [ -0.3, -0.4 ]
-      },
-      "2": {
-        "integrity": [ -0.3, -0.2 ],
-        "mass": [ -0.4, -0.5 ]
-      },
-      "3": {
-        "integrity": [ -0.4, -0.3 ],
-        "mass": [ -0.5, -0.6 ]
-      },
-      "4": {
-        "integrity": [ -0.5, -0.4 ],
-        "mass": [ -0.6, -0.7 ]
-      },
-      "5": {
-        "integrity": [ -0.6, -0.5 ],
-        "mass": [ -0.7, -0.8 ]
-      }
-    },
-    "name": "Lightweight"
-  },
-  "AFM_Reinforced": {
-    "id": 2,
-    "features": {
-      "1": {
-        "integrity": [ 0.2, 0.5 ],
-        "mass": [ 1, 0.4 ]
-      },
-      "2": {
-        "integrity": [ 0.4, 1 ],
-        "mass": [ 1.5, 0.8 ]
-      },
-      "3": {
-        "integrity": [ 0.6, 1.5 ],
-        "mass": [ 2.0, 1.2 ]
-      },
-      "4": {
-        "integrity": [ 0.8, 2 ],
-        "mass": [ 2.5, 1.6 ]
-      },
-      "5": {
-        "integrity": [ 1, 2.5 ],
-        "mass": [ 3.0, 2.0 ]
-      }
-    },
-    "name": "Reinforced"
-  },
   "AFM_Shielded": {
     "id": 3,
+    "components": {
+      "1": {
+        "Worn Shield Emitters": 1
+      },
+      "2": {
+        "Carbon": 1,
+        "Shield Emitters": 1
+      },
+      "3": {
+        "Carbon": 1,
+        "High Density Composites": 1,
+        "Shield Emitters": 1
+      },
+      "4": {
+        "Proprietary Composites": 1,
+        "Shielding Sensors": 1,
+        "Vanadium": 1
+      }
+    },
     "features": {
       "1": {
         "integrity": [ 0.2, 0.5 ],
@@ -69,16 +36,36 @@
       "4": {
         "integrity": [ 0.81, 2 ],
         "power": [ 1.2, 0.79 ]
-      },
-      "5": {
-        "integrity": [ 1, 2.5 ],
-        "power": [ 1.5, 1 ]
       }
     },
     "name": "Shielded"
   },
   "Armour_Kinetic": {
     "id": 4,
+    "components": {
+      "1": {
+        "Nickel": 1
+      },
+      "2": {
+        "Nickel": 1,
+        "Vanadium": 1
+      },
+      "3": {
+        "High Density Composites": 1,
+        "Salvaged Alloys": 1,
+        "Vanadium": 1
+      },
+      "4": {
+        "Galvanising Alloys": 1,
+        "Proprietary Composites": 1,
+        "Tungsten": 1
+      },
+      "5": {
+        "Core Dynamics Composites": 1,
+        "Molybdenum": 1,
+        "Phase Alloys": 1
+      }
+    },
     "features": {
       "1": {
         "explres": [ -0.056, -0.028 ],
@@ -110,6 +97,29 @@
   },
   "Armour_Explosive": {
     "id": 5,
+    "components": {
+      "1": {
+        "Nickel": 1
+      },
+      "2": {
+        "Carbon": 1,
+        "Zinc": 1
+      },
+      "3": {
+        "Salvaged Alloys": 1,
+        "Vanadium": 1
+      },
+      "4": {
+        "Galvanising Alloys": 1,
+        "Mercury": 1,
+        "Tungsten": 1
+      },
+      "5": {
+        "Molybdenum": 1,
+        "Phase Alloys": 1,
+        "Ruthenium": 1
+      }
+    },
     "features": {
       "1": {
         "explres": [ 0.07, 0.112 ],
@@ -141,6 +151,20 @@
   },
   "Armour_Advanced": {
     "id": 6,
+    "components": {
+      "1": {
+        "Iron": 1
+      },
+      "2": {
+        "Conductive Components": 1,
+        "Iron": 1
+      },
+      "3": {
+        "Conductive Components": 1,
+        "High Density Composites": 1,
+        "Iron": 1
+      }
+    },
     "features": {
       "1": {
         "explres": [ 0, 0.028 ],
@@ -577,76 +601,124 @@
   },
   "Engine_Dirty": {
     "id": 22,
+    "components": {
+      "1": {
+        "Specialised Legacy Firmware": 1
+      },
+      "2": {
+        "Mechanical Equipment": 1,
+        "Specialised Legacy Firmware": 1
+      },
+      "3": {
+        "Chromium": 1,
+        "Mechanical Equipment": 1,
+        "Specialised Legacy Firmware": 1
+      },
+      "4": {
+        "Configurable Components": 1,
+        "Modified Consumer Firmware": 1,
+        "Selenium": 1
+      },
+      "5": {
+        "Cadmium": 1,
+        "Cracked Industrial Firmware": 1,
+        "Pharmaceutical Isolators": 1
+      }
+    },
     "features": {
       "1": {
         "integrity": [ -0.06, 0 ],
-        "optmass": [ -0.03, 0 ],
-        "optmul": [ 0.05, 0.1 ],
+        "optmass": [ -0.04, 0 ],
+        "optmul": [ 0.04, 0.1 ],
         "power": [ -0.04, 0 ],
         "thermload": [ -0.2, 0 ]
       },
       "2": {
-        "integrity": [ -0.12, 0.02 ],
+        "integrity": [ -0.12, 0.01 ],
         "optmass": [ -0.06, -0.01 ],
-        "optmul": [ 0.1, 0.15 ],
+        "optmul": [ 0.1, 0.14 ],
         "power": [ -0.08, 0.02 ],
-        "thermload": [ -0.4, 0.1 ]
+        "thermload": [ -0.39, 0.1 ]
       },
       "3": {
         "integrity": [ -0.18, 0.04 ],
-        "optmass": [ -0.09, -0.02 ],
-        "optmul": [ 0.15, 0.2 ],
-        "power": [ -0.12, 0.04 ],
-        "thermload": [ -0.6, 0.2 ]
+        "optmass": [ -0.1, -0.02 ],
+        "optmul": [ 0.14, 0.2 ],
+        "power": [ -0.11, 0.03 ],
+        "thermload": [ -0.61, 0.2 ]
       },
       "4": {
-        "integrity": [ -0.24, 0.06 ],
-        "optmass": [ -0.12, -0.03 ],
+        "integrity": [ -0.24, 0.05 ],
+        "optmass": [ -0.12, -0.04 ],
         "optmul": [ 0.2, 0.25 ],
-        "power": [ -0.16, 0.06 ],
-        "thermload": [ -0.8, 0.3 ]
+        "power": [ -0.15, 0.05 ],
+        "thermload": [ -0.79, 0.29 ]
       },
       "5": {
-        "integrity": [ -0.3, 0.08 ],
-        "optmass": [ -0.15, -0.04 ],
-        "optmul": [ 0.25, 0.3 ],
+        "integrity": [ -0.31, 0.08 ],
+        "optmass": [ -0.16, -0.05 ],
+        "optmul": [ 0.25, 0.29 ],
         "power": [ -0.2, 0.08 ],
-        "thermload": [ -1, 0.4 ]
+        "thermload": [ -1, 0.39 ]
       }
     },
     "name": "Dirty"
   },
   "Engine_Reinforced": {
     "id": 23,
-    "features": {
+    "components": {
       "1": {
-        "integrity": [ 0.15, 0.3 ],
-        "mass": [ 0.1, 0 ],
-        "optmul": [ -0.02, 0 ],
-        "thermload": [ 0, -0.1 ]
+        "Carbon": 1
       },
       "2": {
-        "integrity": [ 0.3, 0.5 ],
+        "Heat Conduction Wiring": 1,
+        "Vanadium": 1
+      },
+      "3": {
+        "Heat Conduction Wiring": 1,
+        "Shielding Sensors": 1,
+        "Vanadium": 1
+      },
+      "4": {
+        "Compound Shielding": 1,
+        "Heat Dispersion Plate": 1,
+        "High Density Composites": 1
+      },
+      "5": {
+        "Heat Exchangers": 1,
+        "Imperial Shielding": 1,
+        "Proprietary Composites": 1
+      }
+    },
+    "features": {
+      "1": {
+        "integrity": [ 0.14, 0.31 ],
+        "mass": [ 0.1, 0 ],
+        "optmul": [ -0.03, 0 ],
+        "thermload": [ 0, -0.11 ]
+      },
+      "2": {
+        "integrity": [ 0.31, 0.5 ],
         "mass": [ 0.2, 0.05 ],
-        "optmul": [ -0.04, -0.01 ],
-        "thermload": [ -0.05, -0.2 ]
+        "optmul": [ -0.05, -0.02 ],
+        "thermload": [ -0.06, -0.2 ]
       },
       "3": {
         "integrity": [ 0.45, 0.7 ],
-        "mass": [ 0.3, 0.1 ],
-        "optmul": [ -0.06, -0.02 ],
-        "thermload": [ -0.1, -0.3 ]
+        "mass": [ 0.31, 0.1 ],
+        "optmul": [ -0.06, -0.03 ],
+        "thermload": [ -0.11, -0.31 ]
       },
       "4": {
-        "integrity": [ 0.6, 0.9 ],
-        "mass": [ 0.4, 0.15 ],
-        "optmul": [ -0.08, -0.04 ],
+        "integrity": [ 0.61, 0.9 ],
+        "mass": [ 0.39, 0.14 ],
+        "optmul": [ -0.09, -0.04 ],
         "thermload": [ -0.15, -0.4 ]
       },
       "5": {
-        "integrity": [ 0.75, 1.1 ],
+        "integrity": [ 0.75, 1.11 ],
         "mass": [ 0.5, 0.2 ],
-        "optmul": [ -0.1, -0.04 ],
+        "optmul": [ -0.11, -0.05 ],
         "thermload": [ -0.2, -0.5 ]
       }
     },
@@ -654,41 +726,65 @@
   },
   "Engine_Tuned": {
     "id": 24,
+    "components": {
+      "1": {
+        "Sulphur": 1
+      },
+      "2": {
+        "Conductive Components": 1,
+        "Specialised Legacy Firmware": 1
+      },
+      "3": {
+        "Conductive Components": 1,
+        "Specialised Legacy Firmware": 1,
+        "Unexpected Emission Data": 1
+      },
+      "4": {
+        "Conductive Ceramics": 1,
+        "Decoded Emission Data": 1,
+        "Modified Consumer Firmware": 1
+      },
+      "5": {
+        "Abnormal Compact Emissions Data": 1,
+        "Conductive Ceramics": 1,
+        "Tin": 1
+      }
+    },
     "features": {
       "1": {
         "integrity": [ -0.05, 0 ],
         "optmass": [ -0.02, 0 ],
-        "optmul": [ 0.02, 0.06 ],
-        "power": [ 0.05, 0 ],
-        "thermload": [ -0.05, -0.2 ]
+        "optmul": [ 0.01, 0.05 ],
+        "power": [ 0.04, 0 ],
+        "thermload": [ -0.06, -0.2 ]
       },
       "2": {
-        "integrity": [ -0.10, -0.04 ],
-        "optmass": [ -0.04, -0.01 ],
-        "optmul": [ 0.04, 0.09 ],
-        "power": [ 0.1, 0.04 ],
-        "thermload": [ -0.1, -0.3 ]
+        "integrity": [ -0.1, -0.04 ],
+        "optmass": [ -0.05, -0.01 ],
+        "optmul": [ 0.03, 0.09 ],
+        "power": [ 0.1, 0.03 ],
+        "thermload": [ -0.11, -0.31 ]
       },
       "3": {
         "integrity": [ -0.15, -0.08 ],
         "optmass": [ -0.06, -0.02 ],
-        "optmul": [ 0.06, 0.12 ],
-        "power": [ 0.15, 0.08 ],
+        "optmul": [ 0.05, 0.12 ],
+        "power": [ 0.14, 0.08 ],
         "thermload": [ -0.15, -0.4 ]
       },
       "4": {
         "integrity": [ -0.2, -0.12 ],
-        "optmass": [ -0.08, -0.03 ],
-        "optmul": [ 0.08, 0.15 ],
-        "power": [ 0.2, 0.12 ],
+        "optmass": [ -0.08, -0.04 ],
+        "optmul": [ 0.08, 0.14 ],
+        "power": [ 0.2, 0.11 ],
         "thermload": [ -0.2, -0.5 ]
       },
       "5": {
         "integrity": [ -0.25, -0.16 ],
-        "optmass": [ -0.12, -0.04 ],
+        "optmass": [ -0.11, -0.05 ],
         "optmul": [ 0.1, 0.18 ],
         "power": [ 0.25, 0.16 ],
-        "thermload": [ -0.25, -0.6 ]
+        "thermload": [ -0.25, -0.61 ]
       }
     },
     "name": "Clean"
@@ -1363,6 +1459,25 @@
   },
   "LifeSupport_LightWeight": {
     "id": 49,
+    "components": {
+      "1": {
+        "Phosphorus": 1
+      },
+      "2": {
+        "Manganese": 1,
+        "Salvaged Alloys": 1
+      },
+      "3": {
+        "Conductive Ceramics": 1,
+        "Manganese": 1,
+        "Salvaged Alloys": 1
+      },
+      "4": {
+        "Conductive Components": 1,
+        "Phase Alloys": 1,
+        "Proto Light Alloys": 1
+      }
+    },
     "features": {
       "1": {
         "integrity": [ -0.2, -0.1 ],
@@ -1379,16 +1494,31 @@
       "4": {
         "integrity": [ -0.5, -0.4 ],
         "mass": [ -0.6, -0.7 ]
-      },
-      "5": {
-        "integrity": [ -0.6, -0.5 ],
-        "mass": [ -0.7, -0.8 ]
       }
     },
     "name": "Lightweight"
   },
   "LifeSupport_Reinforced": {
     "id": 50,
+    "components": {
+      "1": {
+        "Nickel": 1
+      },
+      "2": {
+        "Nickel": 1,
+        "Shield Emitters": 1
+      },
+      "3": {
+        "Nickel": 1,
+        "Shield Emitters": 1,
+        "Tungsten": 1
+      },
+      "4": {
+        "Molybdenum": 1,
+        "Tungsten": 1,
+        "Zinc": 1
+      }
+    },
     "features": {
       "1": {
         "integrity": [ 0.2, 0.5 ],
@@ -1405,16 +1535,31 @@
       "4": {
         "integrity": [ 0.8, 2 ],
         "mass": [ 2.5, 1.6 ]
-      },
-      "5": {
-        "integrity": [ 1, 2.5 ],
-        "mass": [ 3.0, 2.0 ]
       }
     },
     "name": "Reinforced"
   },
   "LifeSupport_Shielded": {
     "id": 51,
+    "components": {
+      "1": {
+        "Worn Shield Emitters": 1
+      },
+      "2": {
+        "Carbon": 1,
+        "Shield Emitters": 1
+      },
+      "3": {
+        "Carbon": 1,
+        "High Density Composites": 1,
+        "Shield Emitters": 1
+      },
+      "4": {
+        "Proprietary Composites": 1,
+        "Sielding Sensors": 1,
+        "Vanadium": 1
+      }
+    },
     "features": {
       "1": {
         "integrity": [ 0.2, 0.5 ],
@@ -1431,10 +1576,6 @@
       "4": {
         "integrity": [ 0.8, 2 ],
         "power": [ 1.2, 0.8 ]
-      },
-      "5": {
-        "integrity": [ 1, 1.5 ],
-        "power": [ 1.5, 1 ]
       }
     },
     "name": "Shielded"
@@ -1579,43 +1720,43 @@
     "features": {
       "1": {
         "engcap": [ -0.03, 0 ],
-        "engrate": [ 0.25, 0.16 ],
+        "engrate": [ 0.04, 0.12 ],
         "syscap": [ -0.03, 0 ],
-        "sysrate": [ 0.25, 0.16 ],
+        "sysrate": [ 0.04, 0.12 ],
         "wepcap": [ -0.03, 0 ],
-        "weprate": [ 0.25, 0.16 ]
+        "weprate": [ 0.04, 0.12 ]
       },
       "2": {
         "engcap": [ -0.06, -0.01 ],
-        "engrate": [ 0.25, 0.16 ],
+        "engrate": [ 0.08, 0.18 ],
         "syscap": [ -0.06, -0.01 ],
-        "sysrate": [ 0.25, 0.16 ],
+        "sysrate": [ 0.08, 0.18 ],
         "wepcap": [ -0.06, -0.01 ],
-        "weprate": [ 0.25, 0.16 ]
+        "weprate": [ 0.08, 0.18 ]
       },
       "3": {
         "engcap": [ -0.09, -0.02 ],
-        "engrate": [ 0.25, 0.16 ],
+        "engrate": [ 0.12, 0.24 ],
         "syscap": [ -0.09, -0.02 ],
-        "sysrate": [ 0.25, 0.16 ],
+        "sysrate": [ 0.12, 0.24 ],
         "wepcap": [ -0.09, -0.02 ],
-        "weprate": [ 0.25, 0.16 ]
+        "weprate": [ 0.12, 0.24 ]
       },
       "4": {
         "engcap": [ -0.12, -0.03 ],
-        "engrate": [ 0.25,-0.16 ],
+        "engrate": [ 0.16, 0.3 ],
         "syscap": [ -0.12, -0.03 ],
-        "sysrate": [ 0.25, 0.16 ],
+        "sysrate": [ 0.16, 0.3 ],
         "wepcap": [ -0.12, -0.03 ],
-        "weprate": [ 0.25, 0.16 ]
+        "weprate": [ 0.16, 0.3 ]
       },
       "5": {
         "engcap": [ -0.15, -0.04 ],
-        "engrate": [ 0.25, 0.16 ],
+        "engrate": [ 0.2, 0.36 ],
         "syscap": [ -0.15, -0.04 ],
-        "sysrate": [ 0.25, 0.16 ],
+        "sysrate": [ 0.2, 0.36 ],
         "wepcap": [ -0.15, -0.04 ],
-        "weprate": [ 0.25, 0.16 ]
+        "weprate": [ 0.2, 0.36 ]
       }
     },
     "name": "Charge enhanced"
@@ -1899,6 +2040,25 @@
   },
   "Refineries_Shielded": {
     "id": 92,
+    "components": {
+      "1": {
+        "Worn Shield Emitters": 1
+      },
+      "2": {
+        "Carbon": 1,
+        "Shield Emitters": 1
+      },
+      "3": {
+        "Carbon": 1,
+        "High Density Composites": 1,
+        "Shield Emitters": 1
+      },
+      "4": {
+        "Proprietary Composites": 1,
+        "Shielding Sensors": 1,
+        "Vanadium": 1
+      }
+    },
     "features": {
       "1": {
         "integrity": [ 0.2, 0.5 ],
@@ -2300,6 +2460,20 @@
   },
   "WakeScanner_LightWeight": {
     "id": 79,
+    "components": {
+      "1": {
+        "Phosphorus": 1
+      },
+      "2": {
+        "Manganese": 1,
+        "Salvaged Alloys": 1
+      },
+      "3": {
+        "Conductive Ceramics": 1,
+        "Manganese": 1,
+        "Salvaged Alloys": 1
+      }
+    },
     "features": {
       "1": {
         "integrity": [ -0.2, -0.1 ],
@@ -2312,20 +2486,26 @@
       "3": {
         "integrity": [ -0.4, -0.3 ],
         "mass": [ -0.5, -0.6 ]
-      },
-      "4": {
-        "integrity": [ -0.5, -0.4 ],
-        "mass": [ -0.6, -0.7 ]
-      },
-      "5": {
-        "integrity": [ -0.6, -0.5 ],
-        "mass": [ -0.7, -0.8 ]
       }
     },
     "name": "Lightweight"
   },
   "WakeScanner_Shielded": {
     "id": 80,
+    "components": {
+      "1": {
+        "Worn Shield Emitters": 1
+      },
+      "2": {
+        "Carbon": 1,
+        "Shield Emitters": 1
+      },
+      "3": {
+        "Carbon": 1,
+        "High Density Composites": 1,
+        "Shield Emitters": 1
+      }
+    },
     "features": {
       "1": {
         "integrity": [ 0.2, 0.5 ],
@@ -2338,20 +2518,26 @@
       "3": {
         "integrity": [ 0.6, 1.5 ],
         "power": [ 0.9, 0.6 ]
-      },
-      "4": {
-        "integrity": [ 0.8, 2 ],
-        "power": [ 1.2, 0.8 ]
-      },
-      "5": {
-        "integrity": [ 1, 1.5 ],
-        "power": [ 1.5, 1 ]
       }
     },
     "name": "Shielded"
   },
   "WakeScanner_Reinforced": {
     "id": 81,
+    "components": {
+      "1": {
+        "Nickel": 1
+      },
+      "2": {
+        "Nickel": 1,
+        "Shield Emitters": 1
+      },
+      "3": {
+        "Nickel": 1,
+        "Shield Emitters": 1,
+        "Tungsten": 1
+      }
+    },
     "features": {
       "1": {
         "integrity": [ 0.2, 0.5 ],
@@ -2364,14 +2550,6 @@
       "3": {
         "integrity": [ 0.6, 1.5 ],
         "mass": [ 2.0, 1.2 ]
-      },
-      "4": {
-        "integrity": [ 0.8, 2 ],
-        "mass": [ 2.5, 1.6 ]
-      },
-      "5": {
-        "integrity": [ 1, 2.5 ],
-        "mass": [ 3.0, 2.0 ]
       }
     },
     "name": "Reinforced"
@@ -2397,37 +2575,40 @@
         "Vanadium": 1
       },
       "5": {
+        "Configurable Components": 1,
+        "High Density Composites": 1,
+        "Modified Embedded Firmware": 1
       }
     },
     "features": {
       "1": {
-        "ammo": [ 0.1, 0.2 ],
         "burst": [ 2, 2 ],
-        "burstrof": [ 0.1, 0.15 ],
+        "burstrof": [ 10, 15 ],
+        "clip": [ 0.34, 0.34 ],
         "range": [ -0.25, -0.1 ]
       },
       "2": {
-        "ammo": [ 0.2, 0.3 ],
         "burst": [ 2, 2 ],
-        "burstrof": [ 0.11, 0.16 ],
+        "burstrof": [ 11, 16 ],
+        "clip": [ 0.34, 0.34 ],
         "range": [ -0.2, -0.08 ]
       },
       "3": {
-        "ammo": [ 0.3, 0.4 ],
         "burst": [ 2, 2 ],
-        "burstrof": [ 0.12, 0.17 ],
+        "burstrof": [ 12, 17 ],
+        "clip": [ 0.34, 1 ],
         "range": [ -0.15, -0.06 ]
       },
       "4": {
-        "ammo": [ 0.4, 0.5 ],
         "burst": [ 2, 2 ],
-        "burstrof": [ 0.13, 0.18 ],
+        "burstrof": [ 13, 18 ],
+        "clip": [ 1, 1 ],
         "range": [ -0.1, -0.04 ]
       },
       "5": {
-        "ammo": [ 0.5, 0.6 ],
         "burst": [ 2, 2 ],
-        "burstrof": [ 0.14, 0.19 ],
+        "burstrof": [ 14, 19 ],
+        "clip": [ 1, 1 ],
         "range": [ -0.5, -0.02 ]
       }
     },
@@ -2518,32 +2699,32 @@
     },
     "features": {
       "1": {
-        "burstrof": [ 0.2, 0.08 ],
         "range": [ 0.1, 0.2 ],
-        "thermload": [ 0.5, 0.4 ]
+        "rof": [ -0.17, -0.08 ],
+        "thermload": [ 0.5, 0.39 ]
       },
       "2": {
-        "burstrof": [ 0.16, 0.06 ],
         "piercing": [ 0, 0.1 ],
-        "range": [ 0.2, 0.4 ],
-        "thermload": [ 0.4, 0.3 ]
+        "range": [ 0.2, 0.39 ],
+        "rof": [ -0.14, -0.06 ],
+        "thermload": [ 0.39, 0.31 ]
       },
       "3": {
-        "burstrof": [ 0.12, 0.04 ],
         "piercing": [ 0.1, 0.2 ],
-        "range": [ 0.3, 0.6 ],
-        "thermload": [ 0.3, 0.2 ]
+        "range": [ 0.29, 0.61 ],
+        "rof": [ -0.11, -0.04 ],
+        "thermload": [ 0.31, 0.2 ]
       },
       "4": {
-        "burstrof": [ 0.08, 0.02 ],
-        "piercing": [ 0.2, 0.4 ],
-        "range": [ 0.4, 0.8 ],
-        "thermload": [ 0.2, 0.1 ]
+        "piercing": [ 0.2, 0.39 ],
+        "range": [ 0.39, 0.79 ],
+        "rof": [ -0.08, -0.02 ],
+        "thermload": [ -0.2, -0.1 ]
       },
       "5": {
-        "burstrof": [ 0.04, 0 ],
-        "piercing": [ 0.3, 0.6 ],
+        "piercing": [ 0.29, 0.61 ],
         "range": [ 0.5, 1 ],
+        "rof": [ -0.04, 0 ],
         "thermload": [ 0.1, 0 ]
       }
     },

modifications/modifications.json

@@ -2,8 +2,8 @@
     "ammo": {"id": 0, "name": "ammo", "type": "percentage", "method": "multiplicative"},
     "boot": {"id": 1, "name": "boot", "type": "percentage", "method": "multiplicative"},
     "brokenregen": {"id": 2, "name": "brokenregen", "type": "percentage", "method": "multiplicative"},
-    "burst": {"id": 3, "name": "burst", "type": "numeric", "method": "multiplicative"},
-    "burstrof": {"id": 41, "name": "burstrof", "type": "percentage", "method": "multiplicative"},
+    "burst": {"id": 3, "name": "burst", "type": "numeric", "method": "overwrite"},
+    "burstrof": {"id": 41, "name": "burstrof", "type": "numeric", "method": "overwrite"},
     "clip": {"id": 4, "name": "clip", "type": "percentage", "method": "multiplicative"},
     "damage": {"id": 5, "name": "damage", "type": "percentage", "method": "multiplicative"},
     "damagedist": {"id": 40, "name": "damage", "type": "hidden", "method": "overwrite"},
@@ -14,6 +14,7 @@
     "engrate": {"id": 10, "name": "engrate", "type": "percentage", "method": "multiplicative"},
     "explres": {"id": 11, "name": "explres", "type": "percentage", "method": "additive"},
     "facinglimit": {"id": 12, "name": "facinglimit", "type": "percentage", "method": "multiplicative"},
+    "falloff": {"id": 45, "name": "falloff", "type": "percentage", "method": "multiplicative"},
     "fallofffromrange": {"id": 42, "name": "fallofffromrange", "type": "hidden", "method": "overwrite"},
     "hullboost": {"id": 13, "name": "hullboost", "type": "percentage", "method": "multiplicative"},
     "hullreinforcement": {"id": 14, "name": "hullreinforcement", "type": "percentage", "method": "multiplicative"},
@@ -27,6 +28,7 @@
     "pgen": {"id": 22, "name": "pgen", "type": "percentage", "method": "multiplicative"},
     "piercing": {"id": 23, "name": "piercing", "type": "percentage", "method": "multiplicative"},
     "power": {"id": 24, "name": "power", "type": "percentage", "method": "multiplicative"},
+    "protection": {"id": 44, "name": "protection", "type": "percentage", "method": "multiplicative"},
     "range": {"id": 25, "name": "range", "type": "percentage", "method": "multiplicative"},
     "ranget": {"id": 26, "name": "ranget", "type": "percentage", "method": "multiplicative"},
     "regen": {"id": 27, "name": "regen", "type": "percentage", "method": "multiplicative"},

modifications/modules.json

@@ -1,9 +1,7 @@
 {
   "am": {
     "blueprints": {
-      "AFM_LightWeight": [1, 2, 3, 4, 5],
-      "AFM_Reinforced": [1, 2, 3, 4, 5],
-      "AFM_Shielded": [1, 2, 3, 4, 5]
+      "AFM_Shielded": [1, 2, 3, 4]
     },
     "modifications": [
       "integrity",
@@ -47,6 +45,13 @@
       "power",
       "range",
       "thermload"
+    ],
+    "specials": [
+      "special_concordant_sequence",
+      "special_regeneration_sequence",
+      "special_thermal_conduit",
+      "special_thermalshock",
+      "special_thermal_vent"
     ]
   },
   "bsg": {
@@ -100,6 +105,14 @@
       "rof",
       "shotspeed",
       "thermload"
+    ],
+    "specials": [
+      "special_auto_loader",
+      "special_dispersal_field",
+      "special_smart_rounds",
+      "special_force_shell",
+      "special_high_yield_shell",
+      "special_thermal_cascade"
     ]
   },
   "cc": {
@@ -116,7 +129,7 @@
   },
   "ch": {
     "blueprints": {
-      "ChaffLauncher_ChaffCapacity": [1, 2, 3, 4, 5],
+      "ChaffLauncher_ChaffCapacity": [3],
       "ChaffLauncher_LightWeight": [1, 2, 3, 4, 5],
       "ChaffLauncher_Reinforced": [1, 2, 3, 4, 5],
       "ChaffLauncher_Shielded": [1, 2, 3, 4, 5]
@@ -196,6 +209,13 @@
       "rof",
       "shotspeed",
       "thermload"
+    ],
+    "specials": [
+      "special_corrosive_shell",
+      "special_blinding_shell",
+      "special_incendiary_rounds",
+      "special_drag_munitions",
+      "special_screening_shell"
     ]
   },
   "fh": {
@@ -359,6 +379,14 @@
       "rof",
       "shotspeed",
       "thermload"
+    ],
+    "specials": [
+      "special_auto_loader",
+      "special_corrosive_shell",
+      "special_emissive_munitions",
+      "special_incendiary_rounds",
+      "special_smart_rounds",
+      "special_thermalshock"
     ]
   },
   "ml": {
@@ -389,6 +417,13 @@
       "reload",
       "rof",
       "thermload"
+    ],
+    "specials": [
+      "special_drag_munitions",
+      "special_emissive_munitions",
+      "special_overload_munitions",
+      "special_penetrator_payload",
+      "special_thermal_cascade"
     ]
   },
   "mrp": {
@@ -419,6 +454,14 @@
       "reload",
       "rof",
       "thermload"
+    ],
+    "specials": [
+      "special_ion_disruptor",
+      "special_overload_munitions",
+      "special_radiant_canister",
+      "special_reverberating_cascade",
+      "special_shiftlock_canister",
+      "special_emissive_munitions"
     ]
   },
   "pa": {
@@ -449,6 +492,14 @@
       "rof",
       "shotspeed",
       "thermload"
+    ],
+    "specials": [
+      "special_blinding_shell",
+      "special_dispersal_field",
+      "special_phasing_sequence",
+      "special_plasma_slug",
+      "special_target_lock_breaker",
+      "special_thermal_conduit"
     ]
   },
   "pas": {
@@ -539,6 +590,13 @@
       "range",
       "rof",
       "thermload"
+    ],
+    "specials": [
+      "special_concordant_sequence",
+      "special_emissive_munitions",
+      "special_phasing_sequence",
+      "special_scramble_spectrum",
+      "special_thermalshock"
     ]
   },
   "po": {
@@ -631,6 +689,11 @@
       "reload",
       "rof",
       "thermload"
+    ],
+    "specials": [
+      "special_feedback_cascade",
+      "special_plasma_slug",
+      "special_super_penetrator"
     ]
   },
   "s": {
@@ -734,6 +797,11 @@
       "range",
       "rof",
       "thermload"
+    ],
+    "specials": [
+      "special_mass_lock_munition",
+      "special_penetrator_payload",
+      "special_reverberating_cascade"
     ]
   },
   "ul": {
@@ -762,6 +830,13 @@
       "range",
       "rof",
       "thermload"
+    ],
+    "specials": [
+      "special_concordant_sequence",
+      "special_inertial_impact",
+      "special_phasing_sequence",
+      "special_scramble_spectrum",
+      "special_thermalshock"
     ]
   },
   "ws": {

modifications/specials.json

@@ -1,35 +1,35 @@
 {
-    "special_auto_loader": {"id": 0, "name": "Auto loader"},
-    "special_choke_canister": {"id": 1, "name": "Choke canister"},
-    "special_concordant_sequence": {"id": 2, "name": "Concordant sequence"},
-    "special_corrosive_shell": {"id": 3, "name": "Corrosive shell"},
-    "special_blinding_shell": {"id": 4, "name": "Dazzle shell"},
-    "special_dispersal_field": {"id": 5, "name": "Dispersal field"},
-    "special_distortion_field": {"id": 6, "name": "Distortion field"},
-    "special_drag_munitions": {"id": 7, "name": "Drag munitions"},
-    "special_emissive_munitions": {"id": 8, "name": "Emissive munitions"},
-    "special_feedback_cascade": {"id": 9, "name": "Feedback cascade"},
-    "special_force_shell": {"id": 10, "name": "Force shell"},
-    "special_high_yield_shell": {"id": 11, "name": "High yield shell"},
-    "special_incendiary_rounds": {"id": 12, "name": "Incendiary rounds"},
-    "special_inertial_impact": {"id": 32, "name": "Inertial impact"},
-    "special_ion_disruptor": {"id": 13, "name": "Ion disruptor"},
-    "special_mass_lock_munition": {"id": 14, "name": "Mass lock munition"},
-    "special_overload_munitions": {"id": 15, "name": "Overload munitions"},
-    "special_penetrator_payload": {"id": 16, "name": "Penetrator payload"},
-    "special_phasing_sequence": {"id": 17, "name": "Phasing sequence"},
-    "special_plasma_slug": {"id": 18, "name": "Plasma slug"},
-    "special_radiant_canister": {"id": 19, "name": "Radiant Canister"},
-    "special_regeneration_sequence": {"id": 20, "name": "Regeneration sequence"},
-    "special_reverberating_cascade": {"id": 21, "name": "Reverberating cascade"},
-    "special_scramble_spectrum": {"id": 22, "name": "Scramble spectrum"},
-    "special_screening_shell": {"id": 23, "name": "Screening shell"},
-    "special_shiftlock_canister": {"id": 24, "name": "Shift-lock canister"},
-    "special_smart_rounds": {"id": 25, "name": "Smart rounds"},
-    "special_super_penetrator": {"id": 26, "name": "Super penetrator"},
-    "special_target_lock_breaker": {"id": 27, "name": "Target lock breaker"},
-    "special_thermal_cascade": {"id": 28, "name": "Thermal cascade"},
-    "special_thermal_conduit": {"id": 29, "name": "Thermal conduit"},
-    "special_thermal_vent": {"id": 30, "name": "Thermal vent"},
-    "special_thermalshock": {"id": 31, "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_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_target_lock_breaker": {"id": 27, "edname": "special_target_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"}
 }

modules/hardpoints/mining_laser.json

@@ -34,6 +34,7 @@
         "T": 1
       },
       "distdraw": 1.75,
+      "edID": 128671347,
       "eddbID": 1479,
       "falloff": 400,
       "grp": "ml",

modules/hardpoints/multi_cannon.json

@@ -103,6 +103,7 @@
         "K": 1
       },
       "distdraw": 0.12,
+      "edID": 128671345,
       "eddbID": 1481,
       "falloff": 1800,
       "grp": "mc",

modules/hardpoints/pulse_laser.json

@@ -100,7 +100,7 @@
       "piercing": 35,
       "power": 0.6,
       "range": 3000,
-      "rating": "F",
+      "rating": "E",
       "rof": 3.448,
       "thermload": 0.6
     },
@@ -167,6 +167,7 @@
         "T": 1
       },
       "distdraw": 0.9,
+      "edID": 128671342,
       "eddbID": 1483,
       "falloff": 500,
       "grp": "pl",

package.json

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

ships/keelback.json

@@ -6,7 +6,7 @@
       "name": "Keelback",
       "manufacturer": "Lakon",
       "class": 2,
-      "hullCost": 2943880,
+      "hullCost": 2943870,
       "speed": 200,
       "boost": 300,
       "boostEnergy": 10,

ships/sidewinder.json

@@ -6,7 +6,7 @@
       "name": "Sidewinder",
       "manufacturer": "Faulcon DeLacy",
       "class": 1,
-      "hullCost": 12870,
+      "hullCost": 4070,
       "speed": 220,
       "boost": 320,
       "boostEnergy": 7,
@@ -20,7 +20,7 @@
       "roll": 110,
       "yaw": 16
     },
-    "retailCost": 40800,
+    "retailCost": 32000,
     "bulkheads": [
       { "id": "b0", "edID": 128049250, "eddbID": 738, "grp": "bh", "cost": 0, "mass": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 0.8 },
       { "id": "b1", "edID": 128049251, "eddbID": 739, "grp": "bh", "cost": 25600, "mass": 2, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 1.52 },

spec/data-spec.js

@@ -40,7 +40,7 @@ describe('JSON Data', function() {
         var id = group[i].id;
         expect(ids[id]).toBeFalsy('ID already exists: ' + id);
         expect(group[i].edID > 0).toBeTruthy('Standard module ' + id + ' is missing E:D ID');
-        expect(group[i].eddbID > 0 || group[i].pp).toBeTruthy('Standard module ' + id + ' is missing EDDB ID');
+        expect(group[i].eddbID > 0).toBeTruthy('Standard module ' + id + ' is missing EDDB ID');
         if (s != 'ft' && s != 'pas' ) {
           expect(group[i].integrity).toBeDefined('Standard module ' + id + ' is missing integrity');
         }
@@ -70,7 +70,7 @@ describe('JSON Data', function() {
         expect(group[i].mass).toBeDefined(`Hardpoint ${group[i].grp}:${id} ${group[i].name ? group[i].name : ''} is missing mass`);
         expect(group[i].integrity).toBeDefined(`Hardpoint ${group[i].grp}:${id} ${group[i].name ? group[i].name : ''} is missing integrity`);
         expect(group[i].eddbID > 0).toBeTruthy(`Hardpoint ${group[i].grp}:${id} ${group[i].name ? group[i].name : ''} is missing EDDB ID`);
-        expect(group[i].edID > 0 || group[i].pp).toBeTruthy(`Hardpoint ${group[i].grp}:${id} ${group[i].name ? group[i].name : ''} is missing E:D ID`);
+        expect(group[i].edID > 0).toBeTruthy(`Hardpoint ${group[i].grp}:${id} ${group[i].name ? group[i].name : ''} is missing E:D ID`);
         expect(eddbIDs[group[i].eddbID]).toBeFalsy(`EDDB ID [${group[i].eddbID}] already exists: ${group[i].grp}:${id} ${group[i].name ? group[i].name : ''}`);
         expect(edIDs[group[i].edID]).toBeFalsy(`E:D ID [${group[i].edID}] already exists: ${group[i].grp}:${id} ${group[i].name ? group[i].name : ''}`);
         if (group[i].eddbID) {
@@ -110,7 +110,7 @@ describe('JSON Data', function() {
         var id = group[i].id;
         expect(group[i].grp).toBeDefined(`No group defined, ID: ${id}`);
         expect(ids[id]).toBeFalsy('ID already exists: ' + id);
-        expect(group[i].eddbID > 0 || group[i].pp).toBeTruthy(`${group[i].grp}:${id} ${group[i].name ? group[i].name : ''} is missing EDDB ID`);
+        expect(group[i].eddbID > 0).toBeTruthy(`${group[i].grp}:${id} ${group[i].name ? group[i].name : ''} is missing EDDB ID`);
         expect(group[i].edID > 0).toBeTruthy(`${group[i].grp}:${id} ${group[i].name ? group[i].name : ''} is missing E:D ID`);
         if (group[i].grp != 'ft') { // Standard and Internal Fuel tanks have the same IDs
           expect(eddbIDs[group[i].eddbID]).toBeFalsy(`EDDB ID [${group[i].eddbID}] already exists:  ${id}`);