Merge branch 'release/2.4.2'

fix repair limpet controller crash

ChangeLog.md

@@ -1,3 +1,41 @@
+#2.4.2
+  * Add requirements to UI
+  * Fix for limpets
+
+#2.4.1
+  * Config Fix
+
+#2.4.0
+  * Added Repair Limpet Computers
+
+#2.3.7
+  * Fixed Orca mass-lock
+
+#2.3.5
+  * Fix list of available blueprints for Point Defence
+  * Fix integrity values for class 6 power plants
+  * Add shot speed for long range weapon
+  * Fix components for dirty drive grade 3
+  * Update values for Cytoscrambler
+  * Add shotspeed modifier to cannon/multi-cannon/fragment cannon
+
+#2.3.4
+  * Add missing Long Range blueprint to multi-cannon
+  * Fix values for thermal load of focused weapon grade 4
+  * Fix internal module information for power plant blueprints
+  * Add 'FSD Interrupt' special to dumbfire missile racks; this module now has `specials_S` and `specials_D` keys for specials to differentiate
+
+#2.3.3
+  * Add Felicity Farseer to list of engineers that supply sensor and detailed surface scanner modifications
+
+#2.3.2
+  * Update ownership of module blueprints for sensors and scanners
+  * Update railgun penetration
+
+#2.3.1
+  * Separate scan time and scan range
+  * Add Frontier IDs for new items in 2.3
+
 #2.3.0
   * Add Dolphin
   * Add turreted mining lasers

modifications/blueprints.json

@@ -1163,7 +1163,7 @@
       "3": {
         "components": {
           "Chromium": 1,
-          "Mechanical Equipment": 1,
+          "Mechanical Components": 1,
           "Specialised Legacy Firmware": 1
         },
         "features": {
@@ -3488,8 +3488,8 @@
       "3": {
         "components": {
           "Anomalous Bulk Scan Data": 1,
-          "Chromium": 1,
-          "Electrochemical Arrays": 1
+          "Hybrid Capacitors": 1,
+          "Selenium": 1
         },
         "features": {
           "engcap": [ -0.15, -0.04 ],
@@ -3627,7 +3627,7 @@
       }
     },
     "id": 62,
-    "modulename": ["Power distributor", "Distributor"],
+    "modulename": ["Power plant"],
     "name": "Armoured"
   },
   "PowerPlant_Boosted": {
@@ -3692,7 +3692,7 @@
       }
     },
     "id": 63,
-    "modulename": ["Power distributor", "Distributor"],
+    "modulename": ["Power plant"],
     "name": "Overcharged"
   },
   "PowerPlant_Stealth": {
@@ -4494,7 +4494,7 @@
         },
         "features": {
           "mass": [ 0.4, 0.2 ],
-          "scantime": [ 0.1, 0.4 ]
+          "scanrate": [ 0.1, 0.4 ]
         }
       },
       "2": {
@@ -4504,7 +4504,7 @@
         },
         "features": {
           "mass": [ 0.8, 0.4 ],
-          "scantime": [ 0.2, 0.5 ]
+          "scanrate": [ 0.2, 0.5 ]
         }
       },
       "3": {
@@ -4515,7 +4515,7 @@
         },
         "features": {
           "mass": [ 1.2, 0.6 ],
-          "scantime": [ 0.3, 0.6 ]
+          "scanrate": [ 0.3, 0.6 ]
         }
       },
       "4": {
@@ -4526,7 +4526,7 @@
         },
         "features": {
           "mass": [ 1.6, 0.8 ],
-          "scantime": [ 0.4, 0.7 ]
+          "scanrate": [ 0.4, 0.7 ]
         }
       },
       "5": {
@@ -4537,7 +4537,7 @@
         },
         "features": {
           "mass": [ 2, 1 ],
-          "scantime": [ 0.5, 0.8 ]
+          "scanrate": [ 0.5, 0.8 ]
         }
       }
     },
@@ -5815,7 +5815,7 @@
           "burst": [ 2, 2 ],
           "burstrof": [ 14, 19 ],
           "clip": [ 1, 1 ],
-          "range": [ -0.5, -0.02 ]
+          "range": [ -0.05, -0.02 ]
         }
       }
     },
@@ -5938,7 +5938,7 @@
           "piercing": [ 0.2, 0.4 ],
           "range": [ 0.4, 0.8 ],
           "rof": [ -0.08, -0.02 ],
-          "thermload": [ -0.2, -0.1 ]
+          "thermload": [ 0.2, 0.1 ]
         }
       },
       "5": {
@@ -6114,7 +6114,8 @@
         "features": {
           "fallofffromrange": [ 1, 1 ],
           "mass": [ 0.1, 0 ],
-          "range": [ 0.1, 0.2 ]
+          "range": [ 0.1, 0.2 ],
+          "shotspeed": [ 0.1, 0.2 ]
         }
       },
       "2": {
@@ -6124,9 +6125,10 @@
         },
         "features": {
           "fallofffromrange": [ 1, 1 ],
-          "mass": [ 0.2, 0.04 ],
-          "power": [ 0.04, 0 ],
-          "range": [ 0.2, 0.4 ]
+          "mass": [ 0.2, 0.05 ],
+          "power": [ 0.05, 0 ],
+          "range": [ 0.2, 0.4 ],
+          "shotspeed": [ 0.2, 0.4 ]
         }
       },
       "3": {
@@ -6138,8 +6140,9 @@
         "features": {
           "fallofffromrange": [ 1, 1 ],
           "mass": [ 0.3, 0.1 ],
-          "power": [ 0.1, 0.04 ],
-          "range": [ 0.3, 0.6 ]
+          "power": [ 0.1, 0.05 ],
+          "range": [ 0.3, 0.6 ],
+          "shotspeed": [ 0.3, 0.6 ]
         }
       },
       "4": {
@@ -6150,9 +6153,10 @@
         },
         "features": {
           "fallofffromrange": [ 1, 1 ],
-          "mass": [ 0.4, 0.14 ],
-          "power": [ 0.14, 0.1 ],
-          "range": [ 0.4, 0.8 ]
+          "mass": [ 0.4, 0.15 ],
+          "power": [ 0.15, 0.1 ],
+          "range": [ 0.4, 0.8 ],
+          "shotspeed": [ 0.4, 0.8 ]
         }
       },
       "5": {
@@ -6164,8 +6168,9 @@
         "features": {
           "fallofffromrange": [ 1, 1 ],
           "mass": [ 0.5, 0.2 ],
-          "power": [ 0.2, 0.14 ],
-          "range": [ 0.5, 1 ]
+          "power": [ 0.2, 0.15 ],
+          "range": [ 0.5, 1 ],
+          "shotspeed": [ 0.5, 1 ]
         }
       }
     },

modifications/modifications.json

@@ -35,6 +35,7 @@
     "reload": {"id": 28, "name": "reload", "type": "percentage", "method": "multiplicative", "higherbetter": false},
     "rof": {"id": 29, "name": "rof", "type": "percentage", "method": "multiplicative", "higherbetter": false},
     "angle": {"id": 46, "name": "angle", "type": "percentage", "method": "multiplicative", "higherbetter": true},
+    "scanrate": {"id": 49, "name": "scanrate", "type": "percentage", "method": "multiplicative", "higherbetter": true},
     "scantime": {"id": 48, "name": "scantime", "type": "percentage", "method": "multiplicative", "higherbetter": false},
     "shield": {"id": 30, "name": "shield", "type": "percentage", "method": "multiplicative", "higherbetter": true},
     "shieldboost": {"id": 31, "name": "shieldboost", "type": "percentage", "method": "multiplicative", "higherbetter": true},

modifications/modifierActions.json

@@ -211,6 +211,10 @@
     "jitter": 1,
     "speed": -0.1667
   },
+  "special_fsd_interrupt": {
+    "damage": -0.3,
+    "rof": 0.5
+  },
   "special_high_yield_shell": {
     "rof": 0.1111111111111111
   },

modifications/modules.json

@@ -805,6 +805,7 @@
       "range",
       "reload",
       "rof",
+      "shotspeed",
       "thermload"
     ],
     "specials": [
@@ -1052,6 +1053,12 @@
     "modifications": [
     ]
   },
+  "rpl": {
+    "blueprints": {
+    },
+    "modifications": [
+    ]
+  },
   "cs": {
     "blueprints": {
       "Sensor_CargoScanner_FastScan": {
@@ -1060,7 +1067,6 @@
             "engineers": [
               "Bill Turner",
               "Juri Ishmaak",
-              "Lei Chung",
               "Lori Jameson",
               "Tiana Fortune"
             ]
@@ -1069,7 +1075,6 @@
             "engineers": [
               "Bill Turner",
               "Juri Ishmaak",
-              "Lei Chung",
               "Lori Jameson",
               "Tiana Fortune"
             ]
@@ -1084,16 +1089,11 @@
           },
           "4": {
             "engineers": [
-              "Bill Turner",
-              "Juri Ishmaak",
-              "Lori Jameson",
               "Tiana Fortune"
             ]
           },
           "5": {
             "engineers": [
-              "Bill Turner",
-              "Lori Jameson",
               "Tiana Fortune"
             ]
           }
@@ -1140,7 +1140,6 @@
             "engineers": [
               "Bill Turner",
               "Juri Ishmaak",
-              "Lei Chung",
               "Lori Jameson",
               "Tiana Fortune"
             ]
@@ -1149,7 +1148,6 @@
             "engineers": [
               "Bill Turner",
               "Juri Ishmaak",
-              "Lei Chung",
               "Lori Jameson",
               "Tiana Fortune"
             ]
@@ -1164,16 +1162,11 @@
           },
           "4": {
             "engineers": [
-              "Bill Turner",
-              "Juri Ishmaak",
-              "Lori Jameson",
               "Tiana Fortune"
             ]
           },
           "5": {
             "engineers": [
-              "Bill Turner",
-              "Lori Jameson",
               "Tiana Fortune"
             ]
           }
@@ -1255,7 +1248,6 @@
             "engineers": [
               "Bill Turner",
               "Juri Ishmaak",
-              "Lei Chung",
               "Lori Jameson",
               "Tiana Fortune"
             ]
@@ -1264,7 +1256,6 @@
             "engineers": [
               "Bill Turner",
               "Juri Ishmaak",
-              "Lei Chung",
               "Lori Jameson",
               "Tiana Fortune"
             ]
@@ -1279,16 +1270,11 @@
           },
           "4": {
             "engineers": [
-              "Bill Turner",
-              "Juri Ishmaak",
-              "Lori Jameson",
               "Tiana Fortune"
             ]
           },
           "5": {
             "engineers": [
-              "Bill Turner",
-              "Lori Jameson",
               "Tiana Fortune"
             ]
           }
@@ -1536,38 +1522,6 @@
           }
         }
       },
-      "Weapon_LongRange": {
-        "grades": {
-          "1": {
-            "engineers": [
-              "Tod McQuinn",
-              "Zacariah Nemo"
-            ]
-          },
-          "2": {
-            "engineers": [
-              "Tod McQuinn",
-              "Zacariah Nemo"
-            ]
-          },
-          "3": {
-            "engineers": [
-              "Tod McQuinn",
-              "Zacariah Nemo"
-            ]
-          },
-          "4": {
-            "engineers": [
-              "Zacariah Nemo"
-            ]
-          },
-          "5": {
-            "engineers": [
-              "Zacariah Nemo"
-            ]
-          }
-        }
-      },
       "Weapon_Overcharged": {
         "grades": {
           "1": {
@@ -1682,6 +1636,7 @@
       "range",
       "reload",
       "rof",
+      "shotspeed",
       "thermload"
     ],
     "specials": [
@@ -2458,7 +2413,6 @@
             "engineers": [
               "Bill Turner",
               "Juri Ishmaak",
-              "Lei Chung",
               "Lori Jameson",
               "Tiana Fortune"
             ]
@@ -2467,7 +2421,6 @@
             "engineers": [
               "Bill Turner",
               "Juri Ishmaak",
-              "Lei Chung",
               "Lori Jameson",
               "Tiana Fortune"
             ]
@@ -2482,16 +2435,11 @@
           },
           "4": {
             "engineers": [
-              "Bill Turner",
-              "Juri Ishmaak",
-              "Lori Jameson",
               "Tiana Fortune"
             ]
           },
           "5": {
             "engineers": [
-              "Bill Turner",
-              "Lori Jameson",
               "Tiana Fortune"
             ]
           }
@@ -2538,7 +2486,6 @@
             "engineers": [
               "Bill Turner",
               "Juri Ishmaak",
-              "Lei Chung",
               "Lori Jameson",
               "Tiana Fortune"
             ]
@@ -2547,7 +2494,6 @@
             "engineers": [
               "Bill Turner",
               "Juri Ishmaak",
-              "Lei Chung",
               "Lori Jameson",
               "Tiana Fortune"
             ]
@@ -2562,16 +2508,11 @@
           },
           "4": {
             "engineers": [
-              "Bill Turner",
-              "Juri Ishmaak",
-              "Lori Jameson",
               "Tiana Fortune"
             ]
           },
           "5": {
             "engineers": [
-              "Bill Turner",
-              "Lori Jameson",
               "Tiana Fortune"
             ]
           }
@@ -2653,7 +2594,6 @@
             "engineers": [
               "Bill Turner",
               "Juri Ishmaak",
-              "Lei Chung",
               "Lori Jameson",
               "Tiana Fortune"
             ]
@@ -2662,7 +2602,6 @@
             "engineers": [
               "Bill Turner",
               "Juri Ishmaak",
-              "Lei Chung",
               "Lori Jameson",
               "Tiana Fortune"
             ]
@@ -2677,16 +2616,11 @@
           },
           "4": {
             "engineers": [
-              "Bill Turner",
-              "Juri Ishmaak",
-              "Lori Jameson",
               "Tiana Fortune"
             ]
           },
           "5": {
             "engineers": [
-              "Bill Turner",
-              "Lori Jameson",
               "Tiana Fortune"
             ]
           }
@@ -2891,6 +2825,38 @@
           }
         }
       },
+      "Weapon_LongRange": {
+        "grades": {
+          "1": {
+            "engineers": [
+              "Tod McQuinn",
+              "Zacariah Nemo"
+            ]
+          },
+          "2": {
+            "engineers": [
+              "Tod McQuinn",
+              "Zacariah Nemo"
+            ]
+          },
+          "3": {
+            "engineers": [
+              "Tod McQuinn",
+              "Zacariah Nemo"
+            ]
+          },
+          "4": {
+            "engineers": [
+              "Tod McQuinn"
+            ]
+          },
+          "5": {
+            "engineers": [
+              "Tod McQuinn"
+            ]
+          }
+        }
+      },
       "Weapon_Overcharged": {
         "grades": {
           "1": {
@@ -3035,6 +3001,7 @@
       "range",
       "reload",
       "rof",
+      "shotspeed",
       "thermload"
     ],
     "specials": [
@@ -3199,12 +3166,20 @@
       "rof",
       "thermload"
     ],
-    "specials": [
+    "specials_S": [
       "special_drag_munitions",
       "special_emissive_munitions",
       "special_overload_munitions",
       "special_penetrator_payload",
       "special_thermal_cascade"
+    ],
+    "specials_D": [
+      "special_drag_munitions",
+      "special_emissive_munitions",
+      "special_fsd_interrupt",
+      "special_overload_munitions",
+      "special_penetrator_payload",
+      "special_thermal_cascade"
     ]
   },
   "mrp": {
@@ -4286,8 +4261,7 @@
   },
   "po": {
     "blueprints": {
-      "PointDefence_PointDefenseCapacity": [3],
-      "HeatSinkLauncher_Shielded": {
+      "PointDefence_PointDefenseCapacity": {
         "grades": {
           "3": {
             "engineers": [
@@ -4905,6 +4879,7 @@
             "engineers": [
               "Bill Turner",
               "Juri Ishmaak",
+              "Lei Chung",
               "Lori Jameson",
               "Tiana Fortune"
             ]
@@ -4913,6 +4888,7 @@
             "engineers": [
               "Bill Turner",
               "Juri Ishmaak",
+              "Lei Chung",
               "Lori Jameson",
               "Tiana Fortune"
             ]
@@ -4920,6 +4896,8 @@
           "5": {
             "engineers": [
               "Bill Turner",
+              "Juri Ishmaak",
+              "Lei Chung",
               "Lori Jameson",
               "Tiana Fortune"
             ]
@@ -4931,6 +4909,7 @@
           "1": {
             "engineers": [
               "Bill Turner",
+              "Felicity Farseer",
               "Juri Ishmaak",
               "Lei Chung",
               "Lori Jameson",
@@ -4940,6 +4919,7 @@
           "2": {
             "engineers": [
               "Bill Turner",
+              "Felicity Farseer",
               "Juri Ishmaak",
               "Lei Chung",
               "Lori Jameson",
@@ -4949,7 +4929,9 @@
           "3": {
             "engineers": [
               "Bill Turner",
+              "Felicity Farseer",
               "Juri Ishmaak",
+              "Lei Chung",
               "Lori Jameson",
               "Tiana Fortune"
             ]
@@ -4958,6 +4940,7 @@
             "engineers": [
               "Bill Turner",
               "Juri Ishmaak",
+              "Lei Chung",
               "Lori Jameson",
               "Tiana Fortune"
             ]
@@ -4965,6 +4948,7 @@
           "5": {
             "engineers": [
               "Bill Turner",
+              "Lei Chung",
               "Lori Jameson",
               "Tiana Fortune"
             ]
@@ -4976,6 +4960,7 @@
           "1": {
             "engineers": [
               "Bill Turner",
+              "Felicity Farseer",
               "Juri Ishmaak",
               "Lei Chung",
               "Lori Jameson",
@@ -4985,6 +4970,7 @@
           "2": {
             "engineers": [
               "Bill Turner",
+              "Felicity Farseer",
               "Juri Ishmaak",
               "Lei Chung",
               "Lori Jameson",
@@ -4994,7 +4980,9 @@
           "3": {
             "engineers": [
               "Bill Turner",
+              "Felicity Farseer",
               "Juri Ishmaak",
+              "Lei Chung",
               "Lori Jameson",
               "Tiana Fortune"
             ]
@@ -5003,6 +4991,7 @@
             "engineers": [
               "Bill Turner",
               "Juri Ishmaak",
+              "Lei Chung",
               "Lori Jameson",
               "Tiana Fortune"
             ]
@@ -5010,6 +4999,7 @@
           "5": {
             "engineers": [
               "Bill Turner",
+              "Lei Chung",
               "Lori Jameson",
               "Tiana Fortune"
             ]
@@ -5430,6 +5420,7 @@
           "1": {
             "engineers": [
               "Bill Turner",
+              "Felicity Farseer",
               "Juri Ishmaak",
               "Lei Chung",
               "Lori Jameson",
@@ -5438,6 +5429,8 @@
           },
           "2": {
             "engineers": [
+              "Bill Turner",
+              "Felicity Farseer",
               "Juri Ishmaak",
               "Lei Chung",
               "Lori Jameson",
@@ -5446,20 +5439,28 @@
           },
           "3": {
             "engineers": [
+              "Bill Turner",
+              "Felicity Farseer",
+              "Juri Ishmaak",
+              "Lei Chung",
               "Lori Jameson",
               "Tiana Fortune"
             ]
           },
           "4": {
             "engineers": [
-              "Lori Jameson",
-              "Tiana Fortune"
+              "Bill Turner",
+              "Juri Ishmaak",
+              "Lei Chung",
+              "Lori Jameson"
             ]
           },
           "5": {
             "engineers": [
-              "Lori Jameson",
-              "Tiana Fortune"
+              "Bill Turner",
+              "Juri Ishmaak",
+              "Lei Chung",
+              "Lori Jameson"
             ]
           }
         }
@@ -5469,6 +5470,7 @@
           "1": {
             "engineers": [
               "Bill Turner",
+              "Felicity Farseer",
               "Juri Ishmaak",
               "Lei Chung",
               "Lori Jameson",
@@ -5477,6 +5479,8 @@
           },
           "2": {
             "engineers": [
+              "Bill Turner",
+              "Felicity Farseer",
               "Juri Ishmaak",
               "Lei Chung",
               "Lori Jameson",
@@ -5485,20 +5489,28 @@
           },
           "3": {
             "engineers": [
+              "Bill Turner",
+              "Felicity Farseer",
+              "Juri Ishmaak",
+              "Lei Chung",
               "Lori Jameson",
               "Tiana Fortune"
             ]
           },
           "4": {
             "engineers": [
-              "Lori Jameson",
-              "Tiana Fortune"
+              "Bill Turner",
+              "Juri Ishmaak",
+              "Lei Chung",
+              "Lori Jameson"
             ]
           },
           "5": {
             "engineers": [
-              "Lori Jameson",
-              "Tiana Fortune"
+              "Bill Turner",
+              "Juri Ishmaak",
+              "Lei Chung",
+              "Lori Jameson"
             ]
           }
         }
@@ -5508,6 +5520,7 @@
           "1": {
             "engineers": [
               "Bill Turner",
+              "Felicity Farseer",
               "Juri Ishmaak",
               "Lei Chung",
               "Lori Jameson",
@@ -5516,6 +5529,8 @@
           },
           "2": {
             "engineers": [
+              "Bill Turner",
+              "Felicity Farseer",
               "Juri Ishmaak",
               "Lei Chung",
               "Lori Jameson",
@@ -5524,20 +5539,28 @@
           },
           "3": {
             "engineers": [
+              "Bill Turner",
+              "Felicity Farseer",
+              "Juri Ishmaak",
+              "Lei Chung",
               "Lori Jameson",
               "Tiana Fortune"
             ]
           },
           "4": {
             "engineers": [
-              "Lori Jameson",
-              "Tiana Fortune"
+              "Bill Turner",
+              "Juri Ishmaak",
+              "Lei Chung",
+              "Lori Jameson"
             ]
           },
           "5": {
             "engineers": [
-              "Lori Jameson",
-              "Tiana Fortune"
+              "Bill Turner",
+              "Juri Ishmaak",
+              "Lei Chung",
+              "Lori Jameson"
             ]
           }
         }
@@ -5547,7 +5570,7 @@
       "mass",
       "angle",
       "range",
-      "scantime"
+      "scanrate"
     ]
   },
 
@@ -6051,7 +6074,6 @@
             "engineers": [
               "Bill Turner",
               "Juri Ishmaak",
-              "Lei Chung",
               "Lori Jameson",
               "Tiana Fortune"
             ]
@@ -6060,7 +6082,6 @@
             "engineers": [
               "Bill Turner",
               "Juri Ishmaak",
-              "Lei Chung",
               "Lori Jameson",
               "Tiana Fortune"
             ]
@@ -6075,16 +6096,11 @@
           },
           "4": {
             "engineers": [
-              "Bill Turner",
-              "Juri Ishmaak",
-              "Lori Jameson",
               "Tiana Fortune"
             ]
           },
           "5": {
             "engineers": [
-              "Bill Turner",
-              "Lori Jameson",
               "Tiana Fortune"
             ]
           }
@@ -6131,7 +6147,6 @@
             "engineers": [
               "Bill Turner",
               "Juri Ishmaak",
-              "Lei Chung",
               "Lori Jameson",
               "Tiana Fortune"
             ]
@@ -6140,7 +6155,6 @@
             "engineers": [
               "Bill Turner",
               "Juri Ishmaak",
-              "Lei Chung",
               "Lori Jameson",
               "Tiana Fortune"
             ]
@@ -6155,16 +6169,11 @@
           },
           "4": {
             "engineers": [
-              "Bill Turner",
-              "Juri Ishmaak",
-              "Lori Jameson",
               "Tiana Fortune"
             ]
           },
           "5": {
             "engineers": [
-              "Bill Turner",
-              "Lori Jameson",
               "Tiana Fortune"
             ]
           }
@@ -6246,7 +6255,6 @@
             "engineers": [
               "Bill Turner",
               "Juri Ishmaak",
-              "Lei Chung",
               "Lori Jameson",
               "Tiana Fortune"
             ]
@@ -6255,7 +6263,6 @@
             "engineers": [
               "Bill Turner",
               "Juri Ishmaak",
-              "Lei Chung",
               "Lori Jameson",
               "Tiana Fortune"
             ]
@@ -6270,16 +6277,11 @@
           },
           "4": {
             "engineers": [
-              "Bill Turner",
-              "Juri Ishmaak",
-              "Lori Jameson",
               "Tiana Fortune"
             ]
           },
           "5": {
             "engineers": [
-              "Bill Turner",
-              "Lori Jameson",
               "Tiana Fortune"
             ]
           }

modifications/specials.json

@@ -10,6 +10,7 @@
     "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"},

modules/hardpoints/burst_laser.json

@@ -85,21 +85,21 @@
       "thermload": 0.19
     },
     {
-      "breachdmg": 2,
+      "breachdmg": 3.1,
       "breachmax": 0,
       "breachmin": 0,
       "burst": 8,
       "burstrof": 20,
       "class": 1,
       "cost": 8800,
-      "damage": 2.4,
+      "damage": 3.6,
       "damagedist": {
         "T": 1
       },
       "distdraw": 0.31,
       "edID": 128671449,
       "eddbID": 1477,
-      "falloff": 500,
+      "falloff": 600,
       "grp": "ul",
       "id": "cy",
       "integrity": 40,
@@ -110,9 +110,9 @@
       "piercing": 1,
       "power": 0.8,
       "pp": "Archon Delaine",
-      "range": 600,
+      "range": 3000,
       "rating": "F",
-      "rof": 6.6,
+      "rof": 7.6,
       "thermload": 0.3
     },
     {

modules/hardpoints/mining_laser.json

@@ -36,6 +36,7 @@
         "T": 1
       },
       "distdraw": 1.5,
+      "edID": 128740819,
       "eddbID": 1587,
       "falloff": 300,
       "grp": "ml",
@@ -112,6 +113,7 @@
         "T": 1
       },
       "distdraw": 3,
+      "edID": 128740820,
       "eddbID": 1588,
       "falloff": 300,
       "grp": "ml",

modules/hardpoints/rail_gun.json

@@ -22,7 +22,7 @@
       "integrity": 40,
       "mass": 2,
       "mount": "F",
-      "piercing": 30,
+      "piercing": 100,
       "power": 1.15,
       "range": 3000,
       "rating": "D",
@@ -52,7 +52,7 @@
       "integrity": 51,
       "mass": 4,
       "mount": "F",
-      "piercing": 48,
+      "piercing": 100,
       "power": 1.63,
       "range": 3000,
       "rating": "B",
@@ -61,7 +61,7 @@
       "thermload": 20
     },
     {
-      "ammo": 90,
+      "ammo": 240,
       "breachdmg": 14.3,
       "breachmax": 0.8,
       "breachmin": 0.4,
@@ -85,14 +85,14 @@
       "mass": 4,
       "mount": "F",
       "name": "Imperial Hammer",
-      "piercing": 48,
+      "piercing": 100,
       "power": 1.63,
       "pp": "Arissa Lavigny-Duval",
       "range": 3000,
       "rating": "B",
       "reload": 1,
       "rof": 4.1,
-      "thermload": 12
+      "thermload": 11
     }
   ]
 }

modules/index.js

@@ -56,6 +56,7 @@ module.exports = {
     sc: require('./internal/scanner').sc,
     scb: require('./internal/shield_cell_bank').scb,
     sg: require('./internal/shield_generator').sg,
-    ss: require('./internal/surface_scanner').ss
+    ss: require('./internal/surface_scanner').ss,
+    rpl: require('./internal/repair_limpet_controller').rpl
   }
 };

modules/internal/repair_limpet_controller.json

@@ -0,0 +1,264 @@
+{
+  "rpl": [
+    {
+      "class": 1,
+      "cost": 600,
+      "edID": 128777327,
+      "eddbID": 1594,
+      "grp": "rpl",
+      "id": "9z",
+      "mass": 1.3,
+      "maximum": 1,
+      "power": 0.18,
+      "range": 0.6,
+      "rating": "E"
+    },
+    {
+      "class": 1,
+      "cost": 1200,
+      "edID": 128777328,
+      "eddbID": 1595,
+      "grp": "rpl",
+      "id": "9q",
+      "mass": 0.5,
+      "maximum": 1,
+      "power": 0.14,
+      "range": 0.8,
+      "rating": "D"
+    },
+    {
+      "class": 1,
+      "cost": 2400,
+      "edID": 128777329,
+      "eddbID": 1596,
+      "grp": "rpl",
+      "id": "9a",
+      "mass": 1.3,
+      "maximum": 1,
+      "power": 0.23,
+      "range": 1,
+      "rating": "C"
+    },
+    {
+      "class": 1,
+      "cost": 4800,
+      "edID": 128777330,
+      "eddbID": 1597,
+      "grp": "rpl",
+      "id": "9w",
+      "mass": 2,
+      "maximum": 1,
+      "power": 0.32,
+      "range": 1.2,
+      "rating": "B"
+    },
+    {
+      "class": 1,
+      "cost": 9600,
+      "edID": 128777331,
+      "eddbID": 1598,
+      "grp": "rpl",
+      "id": "9s",
+      "mass": 1.3,
+      "maximum": 1,
+      "power": 0.28,
+      "range": 1.4,
+      "rating": "A"
+    },
+    {
+      "class": 3,
+      "cost": 5400,
+      "edID": 128777332,
+      "eddbID": 1599,
+      "grp": "rpl",
+      "id": "9x",
+      "mass": 5,
+      "maximum": 2,
+      "power": 0.27,
+      "range": 0.66,
+      "rating": "E"
+    },
+    {
+      "class": 3,
+      "cost": 10800,
+      "edID": 128777333,
+      "eddbID": 1600,
+      "grp": "rpl",
+      "id": "9e",
+      "mass": 2,
+      "maximum": 2,
+      "power": 0.2,
+      "range": 0.88,
+      "rating": "D"
+    },
+    {
+      "class": 3,
+      "cost": 21600,
+      "edID": 128777334,
+      "eddbID": 1601,
+      "grp": "rpl",
+      "id": "9d",
+      "mass": 5,
+      "maximum": 2,
+      "power": 0.34,
+      "range": 1.1,
+      "rating": "C"
+    },
+    {
+      "class": 3,
+      "cost": 43200,
+      "edID": 128777335,
+      "eddbID": 1602,
+      "grp": "rpl",
+      "id": "9c",
+      "mass": 8,
+      "maximum": 2,
+      "power": 0.48,
+      "range": 1.32,
+      "rating": "B"
+    },
+    {
+      "class": 3,
+      "cost": 86400,
+      "edID": 128777336,
+      "eddbID": 1603,
+      "grp": "rpl",
+      "id": "9r",
+      "mass": 5,
+      "maximum": 2,
+      "power": 0.41,
+      "range": 1.54,
+      "rating": "A"
+    },
+    {
+      "class": 5,
+      "cost": 48600,
+      "edID": 128777337,
+      "eddbID": 1604,
+      "grp": "rpl",
+      "id": "9f",
+      "mass": 20,
+      "maximum": 3,
+      "power": 0.4,
+      "range": 0.78,
+      "rating": "E"
+    },
+    {
+      "class": 5,
+      "cost": 97200,
+      "edID": 128777338,
+      "eddbID": 1605,
+      "grp": "rpl",
+      "id": "9v",
+      "mass": 8,
+      "maximum": 3,
+      "power": 0.3,
+      "range": 1.04,
+      "rating": "D"
+    },
+    {
+      "class": 5,
+      "cost": 194400,
+      "edID": 128777339,
+      "eddbID": 1606,
+      "grp": "rpl",
+      "id": "9t",
+      "mass": 20,
+      "maximum": 3,
+      "power": 0.5,
+      "range": 1.3,
+      "rating": "C"
+    },
+    {
+      "class": 5,
+      "cost": 388800,
+      "edID": 128777340,
+      "eddbID": 1607,
+      "grp": "rpl",
+      "id": "9g",
+      "mass": 32,
+      "maximum": 3,
+      "power": 0.97,
+      "range": 1.56,
+      "rating": "B"
+    },
+    {
+      "class": 5,
+      "cost": 777600,
+      "edID": 128777341,
+      "eddbID": 1608,
+      "grp": "rpl",
+      "id": "9b",
+      "mass": 20,
+      "maximum": 3,
+      "power": 0.6,
+      "range": 1.82,
+      "rating": "A"
+    },
+    {
+      "class": 7,
+      "cost": 437400,
+      "edID": 128777342,
+      "eddbID": 1609,
+      "grp": "rpl",
+      "id": "9y",
+      "mass": 80,
+      "maximum": 4,
+      "power": 0.55,
+      "range": 1.02,
+      "rating": "E"
+    },
+    {
+      "class": 7,
+      "cost": 874800,
+      "edID": 128777343,
+      "eddbID": 1610,
+      "grp": "rpl",
+      "id": "9h",
+      "mass": 32,
+      "maximum": 4,
+      "power": 0.41,
+      "range": 1.36,
+      "rating": "D"
+    },
+    {
+      "class": 7,
+      "cost": 1749600,
+      "edID": 128777344,
+      "eddbID": 1611,
+      "grp": "rpl",
+      "id": "9n",
+      "mass": 80,
+      "maximum": 4,
+      "power": 0.69,
+      "range": 1.7,
+      "rating": "C"
+    },
+    {
+      "class": 7,
+      "cost": 3499200,
+      "edID": 128777345,
+      "eddbID": 1612,
+      "grp": "rpl",
+      "id": "9u",
+      "mass": 128,
+      "maximum": 4,
+      "power": 0.97,
+      "range": 2.04,
+      "rating": "B"
+    },
+    {
+      "class": 7,
+      "cost": 6998400,
+      "edID": 128777346,
+      "eddbID": 1613,
+      "grp": "rpl",
+      "id": "9j",
+      "mass": 80,
+      "maximum": 4,
+      "power": 0.83,
+      "range": 2.38,
+      "rating": "A"
+    }
+  ]
+}

modules/standard/frame_shift_drive.json

@@ -313,7 +313,7 @@
       "fuelpower": 2.45,
       "grp": "fsd",
       "id": "Ff",
-      "integrity": 106,
+      "integrity": 120,
       "mass": 20,
       "maxfuel": 5,
       "optmass": 1050,

modules/standard/power_plant.json

@@ -138,7 +138,7 @@
       "eff": 1,
       "grp": "pp",
       "id": "po",
-      "integrity": 90,
+      "integrity": 102,
       "mass": 40,
       "pgen": 16.8,
       "rating": "E"
@@ -151,7 +151,7 @@
       "eff": 0.75,
       "grp": "pp",
       "id": "pn",
-      "integrity": 113,
+      "integrity": 90,
       "mass": 16,
       "pgen": 18.9,
       "rating": "D"
@@ -164,7 +164,7 @@
       "eff": 0.5,
       "grp": "pp",
       "id": "pm",
-      "integrity": 136,
+      "integrity": 113,
       "mass": 20,
       "pgen": 21,
       "rating": "C"
@@ -177,7 +177,7 @@
       "eff": 0.45,
       "grp": "pp",
       "id": "pl",
-      "integrity": 124,
+      "integrity": 136,
       "mass": 32,
       "pgen": 23.1,
       "rating": "B"
@@ -190,7 +190,7 @@
       "eff": 0.4,
       "grp": "pp",
       "id": "pk",
-      "integrity": 118,
+      "integrity": 124,
       "mass": 20,
       "pgen": 25.2,
       "rating": "A"

package.json

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

ships/beluga.json

@@ -24,6 +24,9 @@
       "crew": 3
     },
     "retailCost": 84532770,
+    "requirements": {
+      "horizons": true
+    },
     "bulkheads": [
       { "id": "cl", "edID": 128049346, "eddbID": 1554,"grp": "bh", "cost": 0, "mass": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 0.8 },
       { "id": "cm", "edID": 128049347, "eddbID": 1555,"grp": "bh", "cost": 33813120, "mass": 83, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 1.52 },

ships/cobra_mk_iv.json

@@ -22,6 +22,9 @@
       "crew": 2 
     },
     "retailCost": 747660,
+    "requirements": {
+      "horizonsEarlyAdoption": true
+    },
     "bulkheads": [
       { "id": "cg", "edID": 128672264, "eddbID": 1518, "grp": "bh", "cost": 0, "mass": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 0.8 },
       { "id": "ch", "edID": 128672265, "eddbID": 1519, "grp": "bh", "cost": 305890, "mass": 14, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 1.52 },

ships/dolphin.json

@@ -1,5 +1,6 @@
 {
   "dolphin": {
+    "edID": 128049291,
     "eddbID": 31,
     "properties": {
       "name": "Dolphin",
@@ -22,12 +23,15 @@
       "crew": 1
     },
     "retailCost": 1337330,
+    "requirements": {
+      "horizons": true
+    },
     "bulkheads": [
-      { "id": "cq", "eddbID": 1589, "grp": "bh", "cost": 0, "mass": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 0.8 },
-      { "id": "cr", "eddbID": 1590, "grp": "bh", "cost": 534940, "mass": 32, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 1.52 },
-      { "id": "cs", "eddbID": 1591, "grp": "bh", "cost": 1203600, "mass": 63, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 2.5 },
-      { "id": "ct", "eddbID": 1592, "grp": "bh", "cost": 2808390, "mass": 63, "explres": -0.5, "kinres": -0.75, "thermres": 0.5, "hullboost": 2.5  },
-      { "id": "cu", "eddbID": 1593, "grp": "bh", "cost": 3152080, "mass": 63, "explres": 0.2, "kinres": 0.25, "thermres": -0.4, "hullboost": 2.5 }
+      { "id": "cq", "edID": 128049292, "eddbID": 1589, "grp": "bh", "cost": 0, "mass": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 0.8 },
+      { "id": "cr", "edID": 128049293, "eddbID": 1590, "grp": "bh", "cost": 534940, "mass": 32, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 1.52 },
+      { "id": "cs", "edID": 128049294, "eddbID": 1591, "grp": "bh", "cost": 1203600, "mass": 63, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 2.5 },
+      { "id": "ct", "edID": 128049295, "eddbID": 1592, "grp": "bh", "cost": 2808390, "mass": 63, "explres": -0.5, "kinres": -0.75, "thermres": 0.5, "hullboost": 2.5  },
+      { "id": "cu", "edID": 128049296, "eddbID": 1593, "grp": "bh", "cost": 3152080, "mass": 63, "explres": 0.2, "kinres": 0.25, "thermres": -0.4, "hullboost": 2.5 }
     ],
     "slots": {
       "standard": [4, 5, 4, 4, 3, 3, 4],

ships/federal_assault_ship.json

@@ -22,6 +22,9 @@
       "crew": 2
     },
     "retailCost": 19814210,
+    "requirements": {
+      "federationRank": 5
+    },
     "bulkheads": [
       { "id": "bz", "edID": 128672147, "eddbID": 1466, "grp": "bh", "cost": 0, "mass": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 0.8 },
       { "id": "bA", "edID": 128672148, "eddbID": 1467, "grp": "bh", "cost": 7925680, "mass": 44, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 1.52 },

ships/federal_corvette.json

@@ -23,6 +23,9 @@
       "crew": 3 
     },
     "retailCost": 187969450,
+    "requirements": {
+      "federationRank": 12
+    },
     "bulkheads": [
       { "id": "BW", "edID": 128049370, "eddbID": 1498, "grp": "bh", "cost": 0, "mass": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 0.8 },
       { "id": "BX", "edID": 128049371, "eddbID": 1499, "grp": "bh", "cost": 75187790, "mass": 30, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 1.52 },

ships/federal_dropship.json

@@ -22,6 +22,9 @@
       "crew": 2
     },
     "retailCost": 14314210,
+    "requirements": {
+      "federationRank": 3
+    },
     "bulkheads": [
       { "id": "bE", "edID": 128049322, "eddbID": 793, "grp": "bh", "cost": 0, "mass": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 0.8 },
       { "id": "bF", "edID": 128049323, "eddbID": 794, "grp": "bh", "cost": 5725680, "mass": 44, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 1.52 },

ships/federal_gunship.json

@@ -23,6 +23,9 @@
       "crew": 2
     },
     "retailCost": 35814210,
+    "requirements": {
+      "federationRank": 7
+    },
     "bulkheads": [
       { "id": "bJ", "edID": 128672154, "eddbID": 1471, "grp": "bh", "cost": 0, "mass": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 0.8 },
       { "id": "bK", "edID": 128672155, "eddbID": 1472, "grp": "bh", "cost": 14325690, "mass": 44, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 1.52 },

ships/imperial_clipper.json

@@ -22,7 +22,10 @@
       "crew": 2
     },
     "retailCost": 22296860,
-      "bulkheads": [
+    "requirements": {
+      "empireRank": 7
+    },
+    "bulkheads": [
       { "id": "bp", "edID": 128049316, "eddbID": 788, "grp": "bh", "cost": 0, "mass": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 0.8 },
       { "id": "bq", "edID": 128049317, "eddbID": 789, "grp": "bh", "cost": 8918340, "mass": 30, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 1.52 },
       { "id": "br", "edID": 128049318, "eddbID": 790, "grp": "bh", "cost": 20066270, "mass": 60, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 2.5 },

ships/imperial_courier.json

@@ -22,6 +22,9 @@
       "crew": 1
     },
     "retailCost": 2542930,
+    "requirements": {
+      "empireRank": 3
+    },
     "bulkheads": [
       { "id": "bf", "edID": 128671224, "eddbID": 1389, "grp": "bh", "cost": 0, "mass": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 0.8 },
       { "id": "bg", "edID": 128671225, "eddbID": 1390, "grp": "bh", "cost": 1017200, "mass": 4, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 1.52 },

ships/imperial_cutter.json

@@ -23,6 +23,9 @@
       "crew": 3 
     },
     "retailCost": 208969450,
+    "requirements": {
+      "empireRank": 12
+    },
     "bulkheads": [
       { "id": "BR", "edID": 128049376, "eddbID": 1493, "grp": "bh", "cost": 0, "mass": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 0.8 },
       { "id": "BS", "edID": 128049377, "eddbID": 1494, "grp": "bh", "cost": 83587790, "mass": 30, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 1.52 },

ships/orca.json

@@ -14,7 +14,7 @@
       "baseArmour": 220,
       "hardness": 55,
       "hullMass": 290,
-      "masslock": 13,
+      "masslock": 16,
       "pipSpeed": 0.08375,
       "luxuryCabins": true,
       "pitch": 25,

spec/data-spec.js

@@ -211,8 +211,7 @@ describe('JSON Data', function() {
       const module = Modifications.modules[m];
       for (var bp in module.blueprints) {
         expect(Modifications.blueprints[bp]).toBeDefined('Missing ' + bp + ' for ' + m);
-        for (var g in module.blueprints[bp]) {
-          const grade = module.blueprints[bp][g];
+        for (var grade in module.blueprints[bp].grades) {
           expect(Modifications.blueprints[bp].grades[grade]).toBeDefined('Missing ' + bp + ' grade ' + grade + ' for ' + m);
         }
       }