Various bug fixes (#76)

Various bug fixes
2025-12-10 15:55:35 +00:00 · 2019-09-18 05:58:47 +10:00
parent 142db12252 a496825548
commit 2134f2807a
20 changed files with 455 additions and 3138 deletions
--- a/README.md
+++ b/README.md
@@ -5,6 +5,10 @@ JSON Data modelling Elite Dangerous ships and components.

 See [the wiki](https://github.com/edcd/coriolis-data/wiki) for more details

+## Issues
+
+If you want to report an issue for this repository, please do this in the main repository of the coriolis project: https://github.com/EDCD/coriolis/issues
+
 ## Hosted Versions

 You can find hosted and compiled versions of the data-json under https://coriolis.io/data/ and https://beta.coriolis.io/data/.
--- a/modifications/blueprints.json
+++ b/modifications/blueprints.json
--- a/modifications/modifications.json
+++ b/modifications/modifications.json
@@ -52,7 +52,7 @@
    "jumpboost": {"id": 47, "name": "jumpboost", "type": "numeric", "method": "additive", "higherbetter": true},
    "shieldaddition": {"id": 50, "name": "shieldaddition", "type": "numeric", "method": "additive", "higherbetter": true},
    "chargetime": {"id": 52, "name": "chargetime", "type": "percentage", "method": "multiplicative", "higherbetter": false},
-    "proberadius": {"id": 53, "name": "proberadius", "type": "percentage", "method": "additive", "higherbetter": true},
+    "proberadius": {"id": 53, "name": "proberadius", "type": "percentage", "method": "multiplicative", "higherbetter": true},
    "scanrange": {"id": 54, "name": "scanrange", "type": "numeric", "method": "additive", "higherbetter": true},
    "maxangle": {"id": 55, "name": "maxangle", "type": "numeric", "method": "additive", "higherbetter": true}
 }
--- a/modifications/modifierActions.json
+++ b/modifications/modifierActions.json
@@ -122,6 +122,9 @@
  "OutfittingFieldType_ShieldBankSpinUp": {
    "spinup": 1
  },
+  "OutfittingFieldType_ShotSpeed": {
+    "shotspeed": 1
+  },
  "OutfittingFieldType_ThermalLoad": {
    "thermload": 1
  },
@@ -149,7 +152,8 @@
  "OutfittingFieldType_Damage": {
    "damage": 1
  },
-  "OutfittingFieldType_weapon_falloffrange_from_range": {
+  "OutfittingFieldType_DamageFalloffRange": {
+    "fallofffromrange": 1
  },
  "OutfittingFieldType_ArmourPenetration": {
    "piercing": 1
@@ -166,9 +170,11 @@
  "special_auto_loader": {},
  "special_choke_canister": {},
  "special_feedback_cascade_cooled": {
+    "damage": -0.2,
    "thermload": -0.4
  },
  "special_super_penetrator_cooled": {
+    "reload": 0.5,
    "thermload": -0.4
  },
  "special_concordant_sequence": {
@@ -181,6 +187,9 @@
    "damage": -0.1,
    "thermload": -0.4
  },
+  "special_plasma_slug_pa": {
+    "damage": -0.1
+  },
  "special_dispersal_field": {
  },
  "special_distortion_field": {},
@@ -193,7 +202,7 @@
    "damage": -0.2
  },
  "special_force_shell": {
-    "shotspeed": -0.1667
+    "shotspeed": -0.1666666666666667
  },
  "special_fsd_interrupt": {
    "damage": -0.3,
@@ -307,7 +316,7 @@
    "mass": -0.1
  },
  "special_engine_cooled": {
-    "mass": 0.1,
+    "mass": 0.05,
    "thermload": -0.1
  },
  "special_engine_haulage": {
@@ -340,6 +349,7 @@
  "special_fsd_cooled": {
    "thermload": -0.1
  },
+  "special_lock_breaker": {},
  "special_powerplant_highcharge": {
    "mass": 0.1,
    "pgen": 0.05
--- a/modifications/modules.json
+++ b/modifications/modules.json
--- a/modifications/specials.json
+++ b/modifications/specials.json
@@ -221,6 +221,11 @@
        "edname": "special_plasma_slug_cooled",
        "uuid": "58a7b1b6-57b9-40f2-9a5a-712a5388a5eb"
    },
+    "special_plasma_slug_pa": {
+        "name": "Plasma Slug",
+        "id": 157,
+        "edname": "special_plasma_slug_pa"
+    },
    "special_penetrator_munitions": {
        "name": "Penetrator Munitions",
        "id": 103,
--- a/modules/hardpoints/cannon.json
+++ b/modules/hardpoints/cannon.json
@@ -120,7 +120,7 @@
      "range": 3500,
      "rating": "D",
      "reload": 3,
-      "shotspeed": 1051,
+      "shotspeed": 1051.051025,
      "thermload": 2.1,
      "symbol": "Hpt_Cannon_Fixed_Medium"
    },
@@ -213,7 +213,7 @@
      "range": 4000,
      "rating": "C",
      "reload": 3,
-      "shotspeed": 959,
+      "shotspeed": 959.232605,
      "thermload": 3.2,
      "symbol": "Hpt_Cannon_Fixed_Large"
    },
--- a/modules/hardpoints/guardian_gauss_cannon.json
+++ b/modules/hardpoints/guardian_gauss_cannon.json
@@ -44,7 +44,7 @@
      "class": 2,
      "clip": 1,
      "cost": 543801,
-      "damage": 70,
+      "damage": 38.5,
      "damagedist": {
        "T": 1
      },
--- a/modules/hardpoints/multi_cannon.json
+++ b/modules/hardpoints/multi_cannon.json
@@ -227,7 +227,7 @@
      "class": 3,
      "clip": 100,
      "cost": 140400,
-      "damage": 3.92,
+      "damage": 3.925,
      "damagedist": {
        "K": 1
      },
--- a/modules/hardpoints/plasma_accelerator.json
+++ b/modules/hardpoints/plasma_accelerator.json
@@ -63,7 +63,7 @@
      "rating": "B",
      "reload": 6,
      "shotspeed": 875,
-      "thermload": 21.8,
+      "thermload": 21.75,
      "symbol": "Hpt_PlasmaAccelerator_Fixed_Large"
    },
    {
--- a/modules/hardpoints/remote_release_flechette_launcher.json
+++ b/modules/hardpoints/remote_release_flechette_launcher.json
@@ -1,7 +1,6 @@
 {
  "tbrfl": [
    {
-      "experimental": true,
      "rating": "B",
      "class": 2,
      "grp": "tbrfl",
@@ -31,7 +30,6 @@
      }
    },
    {
-      "experimental": true,
      "rating": "B",
      "class": 2,
      "grp": "tbrfl",
--- a/modules/hardpoints/shock_cannon.json
+++ b/modules/hardpoints/shock_cannon.json
@@ -1,7 +1,6 @@
 {
  "tbsc": [
    {
-      "experimental": true,
      "rating": "C",
      "class": 3,
      "grp": "tbsc",
@@ -35,7 +34,6 @@
      "falloff": 2500
    },
    {
-      "experimental": true,
      "rating": "C",
      "class": 3,
      "grp": "tbsc",
@@ -67,7 +65,6 @@
      "symbol": "Hpt_PlasmaShockCannon_Gimbal_Large"
    },
    {
-      "experimental": true,
      "rating": "D",
      "class": 3,
      "grp": "tbsc",
@@ -99,7 +96,6 @@
      "falloff": 2500
    },
    {
-      "experimental": true,
      "rating": "D",
      "class": 2,
      "grp": "tbsc",
@@ -120,7 +116,7 @@
      "integrity": 51,
      "mount": "G",
      "piercing": 40,
-      "power": 0.89,
+      "power": 0.61,
      "range": 3000,
      "reload": 6,
      "shotspeed": 1200,
@@ -131,7 +127,6 @@
      "symbol": "Hpt_PlasmaShockCannon_Gimbal_Medium"
    },
    {
-      "experimental": true,
      "grp": "tbsc",
      "symbol": "Hpt_PlasmaShockCannon_Fixed_Medium",
      "id": "y0",
@@ -163,7 +158,6 @@
      "falloff": 2500
    },
    {
-      "experimental": true,
      "rating": "E",
      "class": 2,
      "grp": "tbsc",
@@ -197,7 +191,6 @@
      "falloff": 2500
    },
    {
-      "experimental": true,
      "rating": "D",
      "class": 1,
      "grp": "tbsc",
@@ -229,7 +222,6 @@
      "falloff": 2500
    },
    {
-      "experimental": true,
      "rating": "E",
      "class": 1,
      "grp": "tbsc",
@@ -261,7 +253,6 @@
      "symbol": "Hpt_PlasmaShockCannon_Gimbal_Small"
    },
    {
-      "experimental": true,
      "rating": "F",
      "class": 1,
      "grp": "tbsc",
--- a/modules/internal/cargo_rack.json
+++ b/modules/internal/cargo_rack.json
@@ -142,21 +142,6 @@
      "ukName": "Corrosion Resistant Cargo Rack",
      "ukDiscript": "Specialised storage rack for use in automated cargo transfer system that can resist the effects of corrosive cargo."
    },
-    {
-      "cargo": 4,
-      "class": 2,
-      "cost": 12563,
-      "edID": 128681992,
-      "eddbID": 1552,
-      "grp": "cr",
-      "id": "0V",
-      "name": "Corrosion Resistant",
-      "rating": "F",
-      "mass": 0,
-      "symbol": "Int_CorrosionProofCargoRack_Size2_Class1",
-      "ukName": "Corrosion Resistant Cargo Rack",
-      "ukDiscript": "Specialised storage rack for use in automated cargo transfer system that can resist the effects of corrosive cargo."
-    },
    {
      "cargo": 16,
      "class": 4,
--- a/modules/internal/research_limpet_controller.json
+++ b/modules/internal/research_limpet_controller.json
@@ -11,7 +11,7 @@
      "mass": 1.3,
      "maximum": 1,
      "power": 0.4,
-      "range": 2000,
+      "range": 2,
      "symbol": "Int_DroneControl_UnkVesselResearch",
      "time": 300,
      "integrity": 20
--- a/modules/internal/shield_generator.json
+++ b/modules/internal/shield_generator.json
@@ -163,7 +163,7 @@
      "ukDiscript": "Forms a continually regenerating protective energy shield around the vessel."
    },
    {
-      "brokenregen": 1.9,
+      "brokenregen": 1.87,
      "class": 3,
      "cost": 6270,
      "distdraw": 0.6,
@@ -190,7 +190,7 @@
      "ukDiscript": "Forms a continually regenerating protective energy shield around the vessel."
    },
    {
-      "brokenregen": 1.9,
+      "brokenregen": 1.87,
      "class": 3,
      "cost": 18810,
      "distdraw": 0.6,
@@ -217,7 +217,7 @@
      "ukDiscript": "Forms a continually regenerating protective energy shield around the vessel."
    },
    {
-      "brokenregen": 1.9,
+      "brokenregen": 1.87,
      "class": 3,
      "cost": 56440,
      "distdraw": 0.6,
@@ -244,7 +244,7 @@
      "ukDiscript": "Forms a continually regenerating protective energy shield around the vessel."
    },
    {
-      "brokenregen": 1.9,
+      "brokenregen": 1.87,
      "class": 3,
      "cost": 169300,
      "distdraw": 0.6,
@@ -271,7 +271,7 @@
      "ukDiscript": "Forms a continually regenerating protective energy shield around the vessel."
    },
    {
-      "brokenregen": 1.9,
+      "brokenregen": 1.87,
      "class": 3,
      "cost": 507910,
      "distdraw": 0.6,
@@ -298,7 +298,7 @@
      "ukDiscript": "Forms a continually regenerating protective energy shield around the vessel."
    },
    {
-      "brokenregen": 2.5,
+      "brokenregen": 2.53,
      "class": 4,
      "cost": 19880,
      "distdraw": 0.6,
@@ -325,7 +325,7 @@
      "ukDiscript": "Forms a continually regenerating protective energy shield around the vessel."
    },
    {
-      "brokenregen": 2.5,
+      "brokenregen": 2.53,
      "class": 4,
      "cost": 59630,
      "distdraw": 0.6,
@@ -352,7 +352,7 @@
      "ukDiscript": "Forms a continually regenerating protective energy shield around the vessel."
    },
    {
-      "brokenregen": 2.5,
+      "brokenregen": 2.53,
      "class": 4,
      "cost": 178900,
      "distdraw": 0.6,
@@ -379,7 +379,7 @@
      "ukDiscript": "Forms a continually regenerating protective energy shield around the vessel."
    },
    {
-      "brokenregen": 2.5,
+      "brokenregen": 2.53,
      "class": 4,
      "cost": 536690,
      "distdraw": 0.6,
@@ -406,7 +406,7 @@
      "ukDiscript": "Forms a continually regenerating protective energy shield around the vessel."
    },
    {
-      "brokenregen": 2.5,
+      "brokenregen": 2.53,
      "class": 4,
      "cost": 1610080,
      "distdraw": 0.6,
@@ -433,7 +433,7 @@
      "ukDiscript": "Forms a continually regenerating protective energy shield around the vessel."
    },
    {
-      "brokenregen": 3.7,
+      "brokenregen": 3.75,
      "class": 5,
      "cost": 63010,
      "distdraw": 0.6,
@@ -460,7 +460,7 @@
      "ukDiscript": "Forms a continually regenerating protective energy shield around the vessel."
    },
    {
-      "brokenregen": 3.7,
+      "brokenregen": 3.75,
      "class": 5,
      "cost": 189040,
      "distdraw": 0.6,
@@ -487,7 +487,7 @@
      "ukDiscript": "Forms a continually regenerating protective energy shield around the vessel."
    },
    {
-      "brokenregen": 3.7,
+      "brokenregen": 3.75,
      "class": 5,
      "cost": 567110,
      "distdraw": 0.6,
@@ -514,7 +514,7 @@
      "ukDiscript": "Forms a continually regenerating protective energy shield around the vessel."
    },
    {
-      "brokenregen": 3.7,
+      "brokenregen": 3.75,
      "class": 5,
      "cost": 1701320,
      "distdraw": 0.6,
@@ -541,7 +541,7 @@
      "ukDiscript": "Forms a continually regenerating protective energy shield around the vessel."
    },
    {
-      "brokenregen": 3.7,
+      "brokenregen": 3.75,
      "class": 5,
      "cost": 5103950,
      "distdraw": 0.6,
@@ -568,7 +568,7 @@
      "ukDiscript": "Forms a continually regenerating protective energy shield around the vessel."
    },
    {
-      "brokenregen": 5.3,
+      "brokenregen": 5.33,
      "class": 6,
      "cost": 199750,
      "distdraw": 0.6,
@@ -595,7 +595,7 @@
      "ukDiscript": "Forms a continually regenerating protective energy shield around the vessel."
    },
    {
-      "brokenregen": 5.3,
+      "brokenregen": 5.33,
      "class": 6,
      "cost": 599240,
      "distdraw": 0.6,
@@ -622,7 +622,7 @@
      "ukDiscript": "Forms a continually regenerating protective energy shield around the vessel."
    },
    {
-      "brokenregen": 5.3,
+      "brokenregen": 5.33,
      "class": 6,
      "cost": 1797730,
      "distdraw": 0.6,
@@ -649,7 +649,7 @@
      "ukDiscript": "Forms a continually regenerating protective energy shield around the vessel."
    },
    {
-      "brokenregen": 5.3,
+      "brokenregen": 5.33,
      "class": 6,
      "cost": 5393180,
      "distdraw": 0.6,
@@ -676,7 +676,7 @@
      "ukDiscript": "Forms a continually regenerating protective energy shield around the vessel."
    },
    {
-      "brokenregen": 5.3,
+      "brokenregen": 5.33,
      "class": 6,
      "cost": 16179530,
      "distdraw": 0.6,
@@ -703,7 +703,7 @@
      "ukDiscript": "Forms a continually regenerating protective energy shield around the vessel."
    },
    {
-      "brokenregen": 7.3,
+      "brokenregen": 7.33,
      "class": 7,
      "cost": 633200,
      "distdraw": 0.6,
@@ -730,7 +730,7 @@
      "ukDiscript": "Forms a continually regenerating protective energy shield around the vessel."
    },
    {
-      "brokenregen": 7.3,
+      "brokenregen": 7.33,
      "class": 7,
      "cost": 1899600,
      "distdraw": 0.6,
@@ -757,7 +757,7 @@
      "ukDiscript": "Forms a continually regenerating protective energy shield around the vessel."
    },
    {
-      "brokenregen": 7.3,
+      "brokenregen": 7.33,
      "class": 7,
      "cost": 5698790,
      "distdraw": 0.6,
@@ -784,7 +784,7 @@
      "ukDiscript": "Forms a continually regenerating protective energy shield around the vessel."
    },
    {
-      "brokenregen": 7.3,
+      "brokenregen": 7.33,
      "class": 7,
      "cost": 17096370,
      "distdraw": 0.6,
@@ -811,7 +811,7 @@
      "ukDiscript": "Forms a continually regenerating protective energy shield around the vessel."
    },
    {
-      "brokenregen": 7.3,
+      "brokenregen": 7.33,
      "class": 7,
      "cost": 51289110,
      "distdraw": 0.6,
--- a/modules/internal/surface_scanner.json
+++ b/modules/internal/surface_scanner.json
@@ -10,6 +10,7 @@
      "mass": 0,
      "name": "Detailed Surface Scanner",
      "power": 0,
+      "proberadius": 0.2,
      "rating": "I",
      "symbol": "Int_DetailedSurfaceScanner_Tiny",
      "ukName": "Surface Scanner",
--- a/modules/standard/frame_shift_drive.json
+++ b/modules/standard/frame_shift_drive.json
@@ -9,7 +9,7 @@
      "fuelpower": 2.9,
      "grp": "fsd",
      "id": "Fy",
-      "integrity": 93,
+      "integrity": 135,
      "mass": 160,
      "maxfuel": 0,
      "optmass": 0,
@@ -28,7 +28,7 @@
      "fuelpower": 2.9,
      "grp": "fsd",
      "id": "Fx",
-      "integrity": 37,
+      "integrity": 120,
      "mass": 64,
      "maxfuel": 0,
      "optmass": 0,
@@ -47,7 +47,7 @@
      "fuelpower": 2.9,
      "grp": "fsd",
      "id": "Fw",
-      "integrity": 46,
+      "integrity": 150,
      "mass": 160,
      "maxfuel": 0,
      "optmass": 0,
@@ -66,7 +66,7 @@
      "fuelpower": 2.9,
      "grp": "fsd",
      "id": "Fv",
-      "integrity": 74,
+      "integrity": 225,
      "mass": 256,
      "maxfuel": 0,
      "optmass": 0,
@@ -85,7 +85,7 @@
      "fuelpower": 2.9,
      "grp": "fsd",
      "id": "Fu",
-      "integrity": 46,
+      "integrity": 188,
      "mass": 160,
      "maxfuel": 0,
      "optmass": 0,
@@ -161,7 +161,7 @@
      "fuelpower": 2.75,
      "grp": "fsd",
      "id": "Fq",
-      "integrity": 157,
+      "integrity": 197,
      "mass": 128,
      "maxfuel": 10.6,
      "optmass": 2250,
@@ -180,7 +180,7 @@
      "fuelpower": 2.75,
      "grp": "fsd",
      "id": "Fp",
-      "integrity": 144,
+      "integrity": 164,
      "mass": 80,
      "maxfuel": 12.8,
      "optmass": 2700,
@@ -256,7 +256,7 @@
      "fuelpower": 2.6,
      "grp": "fsd",
      "id": "Fl",
-      "integrity": 136,
+      "integrity": 170,
      "mass": 64,
      "maxfuel": 6.6,
      "optmass": 1500,
@@ -275,7 +275,7 @@
      "fuelpower": 2.6,
      "grp": "fsd",
      "id": "Fk",
-      "integrity": 124,
+      "integrity": 141,
      "mass": 40,
      "maxfuel": 8,
      "optmass": 1800,
@@ -351,7 +351,7 @@
      "fuelpower": 2.45,
      "grp": "fsd",
      "id": "Fg",
-      "integrity": 115,
+      "integrity": 144,
      "mass": 32,
      "maxfuel": 4.1,
      "optmass": 875,
@@ -446,7 +446,7 @@
      "fuelpower": 2.3,
      "grp": "fsd",
      "id": "Fb",
-      "integrity": 96,
+      "integrity": 120,
      "mass": 16,
      "maxfuel": 2.5,
      "optmass": 437.5,
@@ -465,7 +465,7 @@
      "fuelpower": 2.3,
      "grp": "fsd",
      "id": "Fa",
-      "integrity": 88,
+      "integrity": 100,
      "mass": 10,
      "maxfuel": 3,
      "optmass": 525,
@@ -541,7 +541,7 @@
      "fuelpower": 2.15,
      "grp": "fsd",
      "id": "F6",
-      "integrity": 77,
+      "integrity": 96,
      "mass": 8,
      "maxfuel": 1.5,
      "optmass": 125,
@@ -560,7 +560,7 @@
      "fuelpower": 2.15,
      "grp": "fsd",
      "id": "F5",
-      "integrity": 70,
+      "integrity": 80,
      "mass": 5,
      "maxfuel": 1.8,
      "optmass": 150,
@@ -636,7 +636,7 @@
      "fuelpower": 2,
      "grp": "fsd",
      "id": "F1",
-      "integrity": 61,
+      "integrity": 77,
      "mass": 4,
      "maxfuel": 0.8,
      "optmass": 75,
@@ -655,7 +655,7 @@
      "fuelpower": 2,
      "grp": "fsd",
      "id": "F0",
-      "integrity": 56,
+      "integrity": 64,
      "mass": 2.5,
      "maxfuel": 0.9,
      "optmass": 90,
--- a/package.json
+++ b/package.json
@@ -20,10 +20,12 @@
    "build": "node generate_distribution.js",
    "install": "node generate_distribution.js"
  },
+  "dependencies": {
+    "uglify-js": "^2.7.5"
+  },
  "devDependencies": {
    "eslint": "^2.2.0",
    "eslint-plugin-json": "^1.1.0",
-    "jasmine-node": "^1.14.5",
-    "uglify-js": "^2.7.5"
+    "jasmine-node": "^1.14.5"
  }
 }
--- a/ships/krait_mkii.json
+++ b/ships/krait_mkii.json
@@ -146,7 +146,7 @@
        0
      ],
      "internal": [
-        "4h",
+        "4j",
        "04",
        "04",
        "03",
--- a/ships/krait_phantom.json
+++ b/ships/krait_phantom.json
@@ -43,7 +43,7 @@
        "eddbID": 1769,
        "grp": "bh",
        "cost": 22791270,
-        "mass": 36,
+        "mass": 26,
        "causres": 0,
        "explres": -0.4,
        "kinres": -0.2,
@@ -56,7 +56,7 @@
        "eddbID": 1770,
        "grp": "bh",
        "cost": 51280360,
-        "mass": 67,
+        "mass": 53,
        "causres": 0,
        "explres": -0.4,
        "kinres": -0.2,
@@ -69,7 +69,7 @@
        "eddbID": 1771,
        "grp": "bh",
        "cost": 121192590,
-        "mass": 67,
+        "mass": 53,
        "causres": 0,
        "explres": -0.5,
        "kinres": -0.75,
@@ -82,7 +82,7 @@
        "eddbID": 1772,
        "grp": "bh",
        "cost": 134297570,
-        "mass": 67,
+        "mass": 53,
        "causres": 0,
        "explres": 0.2,
        "kinres": 0.25,