From e5aea23265baa40eb26b22147fd479f79e88f362 Mon Sep 17 00:00:00 2001 From: felixlinker Date: Mon, 19 Aug 2019 18:56:05 +0200 Subject: [PATCH 01/32] Shock Cannons and Flechette Launchers are not limited to 4 experimental weapons per ship Closes https://github.com/EDCD/coriolis/issues/533 --- .../hardpoints/remote_release_flechette_launcher.json | 2 -- modules/hardpoints/shock_cannon.json | 9 --------- 2 files changed, 11 deletions(-) diff --git a/modules/hardpoints/remote_release_flechette_launcher.json b/modules/hardpoints/remote_release_flechette_launcher.json index 1146f00..6d5bc4b 100644 --- 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", diff --git a/modules/hardpoints/shock_cannon.json b/modules/hardpoints/shock_cannon.json index 068e1f9..5d7d9ea 100644 --- 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", @@ -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", From f48bbadd2a018a170bda1473158347934c6cdb0f Mon Sep 17 00:00:00 2001 From: Felix Linker Date: Sat, 24 Aug 2019 12:01:34 +0200 Subject: [PATCH 02/32] Fix OutfittingFieldTypes for falloff and shotspeed References https://github.com/EDCD/coriolis/issues/535 --- modifications/modifierActions.json | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/modifications/modifierActions.json b/modifications/modifierActions.json index 1cf4f7e..a9a4093 100644 --- 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 From b6fc2ba5c3e987cf6d4ef3bc6987e00734a0e56c Mon Sep 17 00:00:00 2001 From: Felix Linker Date: Sat, 24 Aug 2019 12:08:34 +0200 Subject: [PATCH 03/32] Fix Medium Guardian Gauss Cannon damage Closes https://github.com/EDCD/coriolis/issues/518 --- modules/hardpoints/guardian_gauss_cannon.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/hardpoints/guardian_gauss_cannon.json b/modules/hardpoints/guardian_gauss_cannon.json index 68ff469..9c965ab 100644 --- 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 }, From 624f17efd1b949e5ee2b1d64d0b0738783734812 Mon Sep 17 00:00:00 2001 From: Felix Linker Date: Sat, 24 Aug 2019 14:30:40 +0200 Subject: [PATCH 04/32] Fix FSD integrity values Closes https://github.com/EDCD/coriolis/issues/509 --- modules/standard/frame_shift_drive.json | 32 ++++++++++++------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/modules/standard/frame_shift_drive.json b/modules/standard/frame_shift_drive.json index 87768fc..a781a72 100644 --- 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, From 612ce64d344356459f672bf1b74d3df16dae534d Mon Sep 17 00:00:00 2001 From: Felix Linker Date: Sat, 24 Aug 2019 15:09:02 +0200 Subject: [PATCH 05/32] Feedback cascade reduces damage by 20% References https://github.com/EDCD/coriolis/issues/450 --- modifications/modifierActions.json | 1 + 1 file changed, 1 insertion(+) diff --git a/modifications/modifierActions.json b/modifications/modifierActions.json index a9a4093..31aa8b7 100644 --- a/modifications/modifierActions.json +++ b/modifications/modifierActions.json @@ -170,6 +170,7 @@ "special_auto_loader": {}, "special_choke_canister": {}, "special_feedback_cascade_cooled": { + "damage": -0.2, "thermload": -0.4 }, "special_super_penetrator_cooled": { From fcdae89552b05f3a3f5e1d09fada99555e491b44 Mon Sep 17 00:00:00 2001 From: Felix Linker Date: Sat, 1 Jun 2019 10:51:56 +0200 Subject: [PATCH 06/32] Dweller does not have access to G4 burst lasers Closes https://github.com/EDCD/coriolis/issues/521 --- modifications/modules.json | 24 ++++++++---------------- 1 file changed, 8 insertions(+), 16 deletions(-) diff --git a/modifications/modules.json b/modifications/modules.json index 84c734c..b639fab 100644 --- a/modifications/modules.json +++ b/modifications/modules.json @@ -6035,8 +6035,7 @@ }, "4": { "engineers": [ - "Broo Tarquin", - "The Dweller" + "Broo Tarquin" ] }, "5": { @@ -6068,8 +6067,7 @@ }, "4": { "engineers": [ - "Broo Tarquin", - "The Dweller" + "Broo Tarquin" ] }, "5": { @@ -6101,8 +6099,7 @@ }, "4": { "engineers": [ - "Broo Tarquin", - "The Dweller" + "Broo Tarquin" ] }, "5": { @@ -6134,8 +6131,7 @@ }, "4": { "engineers": [ - "Broo Tarquin", - "The Dweller" + "Broo Tarquin" ] }, "5": { @@ -6167,8 +6163,7 @@ }, "4": { "engineers": [ - "Broo Tarquin", - "The Dweller" + "Broo Tarquin" ] }, "5": { @@ -6200,8 +6195,7 @@ }, "4": { "engineers": [ - "Broo Tarquin", - "The Dweller" + "Broo Tarquin" ] }, "5": { @@ -6233,8 +6227,7 @@ }, "4": { "engineers": [ - "Broo Tarquin", - "The Dweller" + "Broo Tarquin" ] }, "5": { @@ -6266,8 +6259,7 @@ }, "4": { "engineers": [ - "Broo Tarquin", - "The Dweller" + "Broo Tarquin" ] }, "5": { From 00ac0a354a8e6fc84975e16bd3ab1f148265703e Mon Sep 17 00:00:00 2001 From: Felix Linker Date: Sat, 1 Jun 2019 13:51:08 +0200 Subject: [PATCH 07/32] Remove unused rapid fire blueprint for cannons only --- modifications/blueprints.json | 153 ---------------------------------- 1 file changed, 153 deletions(-) diff --git a/modifications/blueprints.json b/modifications/blueprints.json index 40149bb..d9d8f95 100644 --- a/modifications/blueprints.json +++ b/modifications/blueprints.json @@ -11869,159 +11869,6 @@ ], "name": "Rapid fire" }, - "C_RapidFire": { - "fdname": "Weapon_RapidFire", - "grades": { - "1": { - "components": { - "Mechanical Scrap": 1 - }, - "features": { - "damage": [ - -0.01, - -0.01 - ], - "jitter": [ - 0.5, - 0.5 - ], - "reload": [ - 0, - -0.25 - ], - "rof": [ - 0, - -0.08 - ] - }, - "uuid": "a7ca2bf6-14be-41ed-8bfb-c7348fda7713" - }, - "2": { - "components": { - "Heat Dispersion Plate": 1, - "Mechanical Scrap": 1 - }, - "features": { - "damage": [ - -0.02, - -0.02 - ], - "distdraw": [ - 0, - -0.05 - ], - "jitter": [ - 0.5, - 0.5 - ], - "reload": [ - -0.25, - -0.35 - ], - "rof": [ - -0.08, - -0.17 - ] - }, - "uuid": "0008257b-ea33-48ea-a18e-56cc6cf98a77" - }, - "3": { - "components": { - "Mechanical Equipment": 1, - "Precipitated Alloys": 1, - "Specialised Legacy Firmware": 1 - }, - "features": { - "damage": [ - -0.03, - -0.03 - ], - "distdraw": [ - -0.05, - -0.15 - ], - "jitter": [ - 0.5, - 0.5 - ], - "reload": [ - -0.35, - -0.45 - ], - "rof": [ - -0.17, - -0.26 - ] - }, - "uuid": "f3338d38-f944-4841-b350-09755e1b615d" - }, - "4": { - "components": { - "Mechanical Components": 1, - "Modified Consumer Firmware": 1, - "Thermic Alloys": 1 - }, - "features": { - "damage": [ - -0.04, - -0.04 - ], - "distdraw": [ - -0.15, - -0.25 - ], - "jitter": [ - 0.5, - 0.5 - ], - "reload": [ - -0.45, - -0.55 - ], - "rof": [ - -0.26, - -0.35 - ] - }, - "uuid": "d2bdb568-725a-44bf-9328-ba72d2988acd" - }, - "5": { - "components": { - "Configurable Components": 1, - "Precipitated Alloys": 1, - "Technetium": 1 - }, - "features": { - "damage": [ - -0.05, - -0.05 - ], - "distdraw": [ - -0.25, - -0.35 - ], - "jitter": [ - 0.5, - 0.5 - ], - "reload": [ - -0.55, - -0.65 - ], - "rof": [ - -0.35, - -0.44 - ] - }, - "uuid": "b1792824-0e96-42a3-9d3a-0b41d5ef83e0" - } - }, - "id": 105, - "modulename": [ - "Weapon" - ], - "name": "Rapid fire" - }, "Weapon_ShortRange": { "fdname": "Weapon_ShortRange", "grades": { From a67ca0d4e7d7182687eeac83b864b585b0086905 Mon Sep 17 00:00:00 2001 From: Felix Linker Date: Sat, 1 Jun 2019 13:53:15 +0200 Subject: [PATCH 08/32] Add default probe radius to detailed surface scanner --- modules/internal/surface_scanner.json | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/internal/surface_scanner.json b/modules/internal/surface_scanner.json index a99d161..799916c 100644 --- 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", From 85fb010ee81ee6b543a44e68798669cc1c307005 Mon Sep 17 00:00:00 2001 From: Felix Linker Date: Sat, 1 Jun 2019 13:54:54 +0200 Subject: [PATCH 09/32] proberadius of detailed surface scanner is modified multiplicatively --- modifications/modifications.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modifications/modifications.json b/modifications/modifications.json index c816317..4787050 100644 --- 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} } From 598d0ac108235821191e5647016dad16a4054a80 Mon Sep 17 00:00:00 2001 From: Felix Linker Date: Sat, 1 Jun 2019 14:19:29 +0200 Subject: [PATCH 10/32] Remove class 2 corrosive resistant cargo racks Closes https://github.com/EDCD/coriolis/issues/515 --- modules/internal/cargo_rack.json | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/modules/internal/cargo_rack.json b/modules/internal/cargo_rack.json index 5e109c4..d2f088f 100644 --- 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, From 406cf3dfe2f7411685b406daa5a21d1425b5fb2b Mon Sep 17 00:00:00 2001 From: Felix Linker Date: Thu, 8 Aug 2019 13:40:10 +0200 Subject: [PATCH 11/32] Fix broken regen rates of standard shield generators --- modules/internal/shield_generator.json | 50 +++++++++++++------------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/modules/internal/shield_generator.json b/modules/internal/shield_generator.json index 0bd7525..99b1d42 100644 --- 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, From 7c598f2af8e7a8454505fb3cd5d11e8d9d584e15 Mon Sep 17 00:00:00 2001 From: Felix Linker Date: Fri, 9 Aug 2019 15:31:58 +0200 Subject: [PATCH 12/32] Fix range of research limpet to km --- modules/internal/research_limpet_controller.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/internal/research_limpet_controller.json b/modules/internal/research_limpet_controller.json index 35d8231..dea3eaf 100644 --- 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 From 3cecbd50033e1a3f483f92c4179399b782f0ad73 Mon Sep 17 00:00:00 2001 From: Felix Linker Date: Wed, 14 Aug 2019 02:08:44 +0200 Subject: [PATCH 13/32] Fix shot speeds for medium/large fixed cannons --- modules/hardpoints/cannon.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/hardpoints/cannon.json b/modules/hardpoints/cannon.json index 0bd40e5..8447c1f 100644 --- 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" }, From 8dc63ed98e4e29f3b1d682759ac1ddeb9090d00b Mon Sep 17 00:00:00 2001 From: Felix Linker Date: Wed, 14 Aug 2019 02:15:15 +0200 Subject: [PATCH 14/32] Improve precision of force shell modifier --- modifications/modifierActions.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modifications/modifierActions.json b/modifications/modifierActions.json index 31aa8b7..a5dff20 100644 --- a/modifications/modifierActions.json +++ b/modifications/modifierActions.json @@ -198,7 +198,7 @@ "damage": -0.2 }, "special_force_shell": { - "shotspeed": -0.1667 + "shotspeed": -0.1666666666666667 }, "special_fsd_interrupt": { "damage": -0.3, From dbca60a998404cb3bea6b772744e7aedc6eed57a Mon Sep 17 00:00:00 2001 From: Felix Linker Date: Wed, 14 Aug 2019 02:21:40 +0200 Subject: [PATCH 15/32] Thermal spread on engines only increases mass by 5% --- modifications/modifierActions.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modifications/modifierActions.json b/modifications/modifierActions.json index a5dff20..5be39e5 100644 --- a/modifications/modifierActions.json +++ b/modifications/modifierActions.json @@ -312,7 +312,7 @@ "mass": -0.1 }, "special_engine_cooled": { - "mass": 0.1, + "mass": 0.05, "thermload": -0.1 }, "special_engine_haulage": { From 9bef5e965bd02b3eb170da04ecd12255b2857ed9 Mon Sep 17 00:00:00 2001 From: Felix Linker Date: Wed, 14 Aug 2019 02:29:46 +0200 Subject: [PATCH 16/32] Add missing key in modifierActions for target lock breaker --- modifications/modifierActions.json | 1 + 1 file changed, 1 insertion(+) diff --git a/modifications/modifierActions.json b/modifications/modifierActions.json index 5be39e5..6e890b5 100644 --- a/modifications/modifierActions.json +++ b/modifications/modifierActions.json @@ -345,6 +345,7 @@ "special_fsd_cooled": { "thermload": -0.1 }, + "special_lock_breaker": {}, "special_powerplant_highcharge": { "mass": 0.1, "pgen": 0.05 From 396b3ec0d5cd32a2e078b524e45bea0cb1616738 Mon Sep 17 00:00:00 2001 From: Felix Linker Date: Wed, 14 Aug 2019 02:48:51 +0200 Subject: [PATCH 17/32] Fix thermal load for large plasma accelerator --- modules/hardpoints/plasma_accelerator.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/hardpoints/plasma_accelerator.json b/modules/hardpoints/plasma_accelerator.json index c275d91..70f1155 100644 --- 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" }, { From 048b7f4fd7d054292bf6d4719d3612410521c747 Mon Sep 17 00:00:00 2001 From: Felix Linker Date: Wed, 14 Aug 2019 02:56:29 +0200 Subject: [PATCH 18/32] Fix damage of large fixed multicannon --- modules/hardpoints/multi_cannon.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/hardpoints/multi_cannon.json b/modules/hardpoints/multi_cannon.json index 56cbf30..bf191ce 100644 --- 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 }, From ab3f3750582569216d3796a91d10b6a108dbf659 Mon Sep 17 00:00:00 2001 From: Felix Linker Date: Sat, 1 Jun 2019 14:49:54 +0200 Subject: [PATCH 19/32] Only multi-cannons reduce ammunition when overcharged --- modifications/blueprints.json | 6 +++--- modifications/modules.json | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/modifications/blueprints.json b/modifications/blueprints.json index d9d8f95..47c5df7 100644 --- a/modifications/blueprints.json +++ b/modifications/blueprints.json @@ -11462,7 +11462,7 @@ ], "name": "Long range" }, - "Weapon_Overcharged": { + "MC_Overcharged": { "fdname": "Weapon_Overcharged", "grades": { "1": { @@ -11599,8 +11599,8 @@ ], "name": "Overcharged" }, - "PA_Overcharged": { - "fdname": "PA_Overcharged", + "Weapon_Overcharged": { + "fdname": "Weapon_Overcharged", "grades": { "1": { "components": { diff --git a/modifications/modules.json b/modifications/modules.json index b639fab..de68a0d 100644 --- a/modifications/modules.json +++ b/modifications/modules.json @@ -2959,7 +2959,7 @@ } } }, - "Weapon_Overcharged": { + "MC_Overcharged": { "grades": { "1": { "engineers": [ @@ -3665,7 +3665,7 @@ } } }, - "PA_Overcharged": { + "Weapon_Overcharged": { "grades": { "1": { "engineers": [ From b261dc52981d377e6cee02d976eff79f9ef6ede1 Mon Sep 17 00:00:00 2001 From: Felix Linker Date: Wed, 14 Aug 2019 02:45:49 +0200 Subject: [PATCH 20/32] Add falloff modification to focused weapon blueprint --- modifications/blueprints.json | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/modifications/blueprints.json b/modifications/blueprints.json index 47c5df7..6167e06 100644 --- a/modifications/blueprints.json +++ b/modifications/blueprints.json @@ -10890,6 +10890,10 @@ "Iron": 1 }, "features": { + "falloff": [ + 0, + 0.36 + ], "piercing": [ 0, 0.4 @@ -10915,6 +10919,10 @@ "Iron": 1 }, "features": { + "falloff": [ + 0.36, + 0.52 + ], "piercing": [ 0.4, 0.6 @@ -10941,6 +10949,10 @@ "Iron": 1 }, "features": { + "falloff": [ + 0.52, + 0.68 + ], "piercing": [ 0.6, 0.8 @@ -10967,6 +10979,10 @@ "Polymer Capacitors": 1 }, "features": { + "falloff": [ + 0.68, + 0.84 + ], "piercing": [ 0.8, 1 @@ -10993,6 +11009,10 @@ "Refined Focus Crystals": 1 }, "features": { + "falloff": [ + 0.84, + 1 + ], "piercing": [ 1, 1.2 From 462416ab8283c3aa74f864ebba199c09cc8c0143 Mon Sep 17 00:00:00 2001 From: Felix Linker Date: Sat, 1 Jun 2019 14:00:47 +0200 Subject: [PATCH 21/32] Fix blueprint names Closes https://github.com/EDCD/coriolis/issues/519 --- modifications/blueprints.json | 88 +++++++++++++++++------------------ modifications/modules.json | 14 +++--- 2 files changed, 51 insertions(+), 51 deletions(-) diff --git a/modifications/blueprints.json b/modifications/blueprints.json index 6167e06..b2a3f2c 100644 --- a/modifications/blueprints.json +++ b/modifications/blueprints.json @@ -749,7 +749,7 @@ "name": "Thermal resistant" }, "CargoScanner_LightWeight": { - "fdname": "CargoScanner_LightWeight", + "fdname": "Sensor_LightWeight", "grades": { "1": { "components": { @@ -847,7 +847,7 @@ "name": "Lightweight" }, "CargoScanner_Reinforced": { - "fdname": "CargoScanner_Reinforced", + "fdname": "Sensor_Reinforced", "grades": { "1": { "components": { @@ -945,7 +945,7 @@ "name": "Reinforced" }, "CargoScanner_Shielded": { - "fdname": "CargoScanner_Shielded", + "fdname": "Sensor_Shielded", "grades": { "1": { "components": { @@ -1042,8 +1042,8 @@ ], "name": "Shielded" }, - "ChaffLauncher_ChaffCapacity": { - "fdname": "ChaffLauncher_ChaffCapacity", + "Misc_ChaffCapacity": { + "fdname": "Misc_ChaffCapacity", "grades": { "3": { "components": { @@ -1075,7 +1075,7 @@ "name": "Ammo capacity" }, "ChaffLauncher_LightWeight": { - "fdname": "ChaffLauncher_LightWeight", + "fdname": "Misc_LightWeight", "grades": { "1": { "components": { @@ -1172,7 +1172,7 @@ "name": "Lightweight" }, "ChaffLauncher_Reinforced": { - "fdname": "ChaffLauncher_Reinforced", + "fdname": "Misc_Reinforced", "grades": { "1": { "components": { @@ -1269,7 +1269,7 @@ "name": "Reinforced" }, "ChaffLauncher_Shielded": { - "fdname": "ChaffLauncher_Shielded", + "fdname": "Misc_Shielded", "grades": { "1": { "components": { @@ -1657,7 +1657,7 @@ "name": "Shielded" }, "ECM_LightWeight": { - "fdname": "ECM_LightWeight", + "fdname": "Misc_LightWeight", "grades": { "1": { "components": { @@ -1755,7 +1755,7 @@ "name": "Lightweight" }, "ECM_Reinforced": { - "fdname": "ECM_Reinforced", + "fdname": "Misc_Reinforced", "grades": { "1": { "components": { @@ -1853,7 +1853,7 @@ "name": "Reinforced" }, "ECM_Shielded": { - "fdname": "ECM_Shielded", + "fdname": "Misc_Shielded", "grades": { "1": { "components": { @@ -3659,8 +3659,8 @@ ], "name": "Shielded" }, - "HeatSinkLauncher_HeatSinkCapacity": { - "fdname": "HeatSinkLauncher_HeatSinkCapacity", + "Misc_HeatSinkCapacity": { + "fdname": "Misc_HeatSinkCapacity", "grades": { "3": { "components": { @@ -3692,7 +3692,7 @@ "name": "Ammo capacity" }, "HeatSinkLauncher_LightWeight": { - "fdname": "HeatSinkLauncher_LightWeight", + "fdname": "Misc_LightWeight", "grades": { "1": { "components": { @@ -3789,7 +3789,7 @@ "name": "Lightweight" }, "HeatSinkLauncher_Reinforced": { - "fdname": "HeatSinkLauncher_Reinforced", + "fdname": "Misc_Reinforced", "grades": { "1": { "components": { @@ -3886,7 +3886,7 @@ "name": "Reinforced" }, "HeatSinkLauncher_Shielded": { - "fdname": "HeatSinkLauncher_Shielded", + "fdname": "Misc_Shielded", "grades": { "1": { "components": { @@ -4678,7 +4678,7 @@ "name": "Thermal resistant" }, "KillWarrantScanner_LightWeight": { - "fdname": "KillWarrantScanner_LightWeight", + "fdname": "Sensor_LightWeight", "grades": { "1": { "components": { @@ -4776,7 +4776,7 @@ "name": "Lightweight" }, "KillWarrantScanner_LongRange": { - "fdname": "KillWarrantScanner_LongRange", + "fdname": "Sensor_LongRange", "grades": { "1": { "components": { @@ -4894,7 +4894,7 @@ "name": "Long range" }, "KillWarrantScanner_Reinforced": { - "fdname": "KillWarrantScanner_Reinforced", + "fdname": "Sensor_Reinforced", "grades": { "1": { "components": { @@ -4992,7 +4992,7 @@ "name": "Reinforced" }, "KillWarrantScanner_Shielded": { - "fdname": "KillWarrantScanner_Shielded", + "fdname": "Sensor_Shielded", "grades": { "1": { "components": { @@ -5381,7 +5381,7 @@ "name": "Shielded" }, "PointDefence_LightWeight": { - "fdname": "PointDefence_LightWeight", + "fdname": "Misc_LightWeight", "grades": { "1": { "components": { @@ -5477,8 +5477,8 @@ ], "name": "Lightweight" }, - "PointDefence_PointDefenseCapacity": { - "fdname": "PointDefence_PointDefenseCapacity", + "Misc_PointDefenseCapacity": { + "fdname": "Misc_PointDefenseCapacity", "grades": { "3": { "components": { @@ -5510,7 +5510,7 @@ "name": "Ammo capacity" }, "PointDefence_Reinforced": { - "fdname": "PointDefence_Reinforced", + "fdname": "Misc_Reinforced", "grades": { "1": { "components": { @@ -5607,7 +5607,7 @@ "name": "Reinforced" }, "PointDefence_Shielded": { - "fdname": "PointDefence_Shielded", + "fdname": "Misc_Shielded", "grades": { "1": { "components": { @@ -7473,7 +7473,7 @@ "name": "Shielded" }, "Sensor_CargoScanner_FastScan": { - "fdname": "Sensor_CargoScanner_FastScan", + "fdname": "Sensor_FastScan", "grades": { "1": { "components": { @@ -7591,7 +7591,7 @@ "name": "Fast scan" }, "Sensor_CargoScanner_LongRange": { - "fdname": "Sensor_CargoScanner_LongRange", + "fdname": "Sensor_LongRange", "grades": { "1": { "components": { @@ -7709,7 +7709,7 @@ "name": "Long range" }, "Sensor_CargoScanner_WideAngle": { - "fdname": "Sensor_CargoScanner_WideAngle", + "fdname": "Sensor_WideAngle", "grades": { "1": { "components": { @@ -7827,7 +7827,7 @@ "name": "Wide angle" }, "Sensor_KillWarrantScanner_FastScan": { - "fdname": "Sensor_KillWarrantScanner_FastScan", + "fdname": "Sensor_FastScan", "grades": { "1": { "components": { @@ -7945,7 +7945,7 @@ "name": "Fast scan" }, "Sensor_KillWarrantScanner_WideAngle": { - "fdname": "Sensor_KillWarrantScanner_WideAngle", + "fdname": "Sensor_WideAngle", "grades": { "1": { "components": { @@ -8062,8 +8062,8 @@ ], "name": "Wide angle" }, - "Sensor_Sensor_LightWeight": { - "fdname": "Sensor_Sensor_LightWeight", + "Sensor_LightWeight": { + "fdname": "Sensor_LightWeight", "grades": { "1": { "components": { @@ -8179,8 +8179,8 @@ ], "name": "Lightweight" }, - "Sensor_Sensor_LongRange": { - "fdname": "Sensor_Sensor_LongRange", + "Sensor_LongRange": { + "fdname": "Sensor_LongRange", "grades": { "1": { "components": { @@ -8296,8 +8296,8 @@ ], "name": "Long range" }, - "Sensor_Sensor_WideAngle": { - "fdname": "Sensor_Sensor_WideAngle", + "Sensor_WideAngle": { + "fdname": "Sensor_WideAngle", "grades": { "1": { "components": { @@ -8413,8 +8413,8 @@ ], "name": "Wide angle" }, - "SurfaceScanner_Expanded": { - "fdname": "SurfaceScanner_Expanded", + "Sensor_Expanded": { + "fdname": "Sensor_Expanded", "grades": { "1": { "components": { @@ -8512,7 +8512,7 @@ "name": "Expanded Probe Scanning Radius" }, "Sensor_WakeScanner_FastScan": { - "fdname": "Sensor_WakeScanner_FastScan", + "fdname": "Sensor_FastScan", "grades": { "1": { "components": { @@ -8630,7 +8630,7 @@ "name": "Fast scan" }, "Sensor_WakeScanner_LongRange": { - "fdname": "Sensor_WakeScanner_LongRange", + "fdname": "Sensor_LongRange", "grades": { "1": { "components": { @@ -8748,7 +8748,7 @@ "name": "Long range" }, "Sensor_WakeScanner_WideAngle": { - "fdname": "Sensor_WakeScanner_WideAngle", + "fdname": "Sensor_WideAngle", "grades": { "1": { "components": { @@ -10323,7 +10323,7 @@ "name": "Thermal resistant" }, "WakeScanner_LightWeight": { - "fdname": "WakeScanner_LightWeight", + "fdname": "Sensor_LightWeight", "grades": { "1": { "components": { @@ -10421,7 +10421,7 @@ "name": "Lightweight" }, "WakeScanner_Reinforced": { - "fdname": "WakeScanner_Reinforced", + "fdname": "Sensor_Reinforced", "grades": { "1": { "components": { @@ -10519,7 +10519,7 @@ "name": "Reinforced" }, "WakeScanner_Shielded": { - "fdname": "WakeScanner_Shielded", + "fdname": "Sensor_Shielded", "grades": { "1": { "components": { diff --git a/modifications/modules.json b/modifications/modules.json index de68a0d..82615ac 100644 --- a/modifications/modules.json +++ b/modifications/modules.json @@ -1000,7 +1000,7 @@ }, "ch": { "blueprints": { - "ChaffLauncher_ChaffCapacity": { + "Misc_ChaffCapacity": { "grades": { "3": { "engineers": [ @@ -2387,7 +2387,7 @@ }, "hs": { "blueprints": { - "HeatSinkLauncher_HeatSinkCapacity": { + "Misc_HeatSinkCapacity": { "grades": { "3": { "engineers": [ @@ -4505,7 +4505,7 @@ }, "po": { "blueprints": { - "PointDefence_PointDefenseCapacity": { + "Misc_PointDefenseCapacity": { "grades": { "3": { "engineers": [ @@ -5132,7 +5132,7 @@ }, "s": { "blueprints": { - "Sensor_Sensor_LightWeight": { + "Sensor_LightWeight": { "grades": { "1": { "engineers": [ @@ -5181,7 +5181,7 @@ } } }, - "Sensor_Sensor_LongRange": { + "Sensor_LongRange": { "grades": { "1": { "engineers": [ @@ -5232,7 +5232,7 @@ } } }, - "Sensor_Sensor_WideAngle": { + "Sensor_WideAngle": { "grades": { "1": { "engineers": [ @@ -5731,7 +5731,7 @@ }, "ss": { "blueprints": { - "SurfaceScanner_Expanded": { + "Sensor_Expanded": { "grades": { "1": { "engineers": [ From 77e02eff2dd892b92e5415927f142840355ff098 Mon Sep 17 00:00:00 2001 From: Felix Linker Date: Sat, 10 Aug 2019 20:32:08 +0200 Subject: [PATCH 22/32] Remove redundant blueprints for utilities, scanners and sensors --- modifications/blueprints.json | 2724 +-------------------------------- modifications/modules.json | 338 ++-- 2 files changed, 263 insertions(+), 2799 deletions(-) diff --git a/modifications/blueprints.json b/modifications/blueprints.json index b2a3f2c..33859ae 100644 --- a/modifications/blueprints.json +++ b/modifications/blueprints.json @@ -748,8 +748,8 @@ ], "name": "Thermal resistant" }, - "CargoScanner_LightWeight": { - "fdname": "Sensor_LightWeight", + "Misc_LightWeight": { + "fdname": "Misc_LightWeight", "grades": { "1": { "components": { @@ -841,13 +841,22 @@ }, "id": 9, "modulename": [ + "Chaff launcher", + "Electronic counter measures", + "ECM", + "Wake scanner", + "Frame shift wake scanner", + "Heat sink launcher", + "Kill warrant scanner", + "KWS", "Cargo scanner", - "Manifest scanner" + "Manifest scanner", + "Point defence" ], "name": "Lightweight" }, - "CargoScanner_Reinforced": { - "fdname": "Sensor_Reinforced", + "Misc_Reinforced": { + "fdname": "Misc_Reinforced", "grades": { "1": { "components": { @@ -939,13 +948,22 @@ }, "id": 10, "modulename": [ + "Chaff launcher", + "Electronic counter measures", + "ECM", + "Wake scanner", + "Frame shift wake scanner", + "Heat sink launcher", + "Kill warrant scanner", + "KWS", "Cargo scanner", - "Manifest scanner" + "Manifest scanner", + "Point defence" ], "name": "Reinforced" }, - "CargoScanner_Shielded": { - "fdname": "Sensor_Shielded", + "Misc_Shielded": { + "fdname": "Misc_Shielded", "grades": { "1": { "components": { @@ -1037,8 +1055,17 @@ }, "id": 11, "modulename": [ + "Chaff launcher", + "Electronic counter measures", + "ECM", + "Wake scanner", + "Frame shift wake scanner", + "Heat sink launcher", + "Kill warrant scanner", + "KWS", "Cargo scanner", - "Manifest scanner" + "Manifest scanner", + "Point defence" ], "name": "Shielded" }, @@ -1074,297 +1101,6 @@ ], "name": "Ammo capacity" }, - "ChaffLauncher_LightWeight": { - "fdname": "Misc_LightWeight", - "grades": { - "1": { - "components": { - "Phosphorus": 1 - }, - "features": { - "integrity": [ - -0.1, - -0.1 - ], - "mass": [ - 0, - -0.45 - ] - }, - "uuid": "99afdcd4-c7cf-4855-aea8-e35d968d448e" - }, - "2": { - "components": { - "Manganese": 1, - "Salvaged Alloys": 1 - }, - "features": { - "integrity": [ - -0.2, - -0.2 - ], - "mass": [ - -0.45, - -0.55 - ] - }, - "uuid": "4c0aa103-e0d8-4dce-bb38-067549af7c27" - }, - "3": { - "components": { - "Conductive Ceramics": 1, - "Manganese": 1, - "Salvaged Alloys": 1 - }, - "features": { - "integrity": [ - -0.3, - -0.3 - ], - "mass": [ - -0.55, - -0.65 - ] - }, - "uuid": "90ddb40a-8520-4e0a-8e42-5f3f9ecf4c28" - }, - "4": { - "components": { - "Conductive Components": 1, - "Phase Alloys": 1, - "Proto Light Alloys": 1 - }, - "features": { - "integrity": [ - -0.4, - -0.4 - ], - "mass": [ - -0.65, - -0.75 - ] - }, - "uuid": "45047669-536a-4455-8563-b8be46d482e0" - }, - "5": { - "components": { - "Conductive Ceramics": 1, - "Proto Light Alloys": 1, - "Proto Radiolic Alloys": 1 - }, - "features": { - "integrity": [ - -0.5, - -0.5 - ], - "mass": [ - -0.75, - -0.85 - ] - }, - "uuid": "ab6cc0b2-73eb-4aa5-a2a3-2b662e38b7d8" - } - }, - "id": 13, - "modulename": [ - "Chaff launcher" - ], - "name": "Lightweight" - }, - "ChaffLauncher_Reinforced": { - "fdname": "Misc_Reinforced", - "grades": { - "1": { - "components": { - "Nickel": 1 - }, - "features": { - "integrity": [ - 0, - 0.6 - ], - "mass": [ - 0.3, - 0.3 - ] - }, - "uuid": "c952091e-30de-4b13-8e7e-c59aee4c1466" - }, - "2": { - "components": { - "Nickel": 1, - "Shield Emitters": 1 - }, - "features": { - "integrity": [ - 0.6, - 1.2 - ], - "mass": [ - 0.6, - 0.6 - ] - }, - "uuid": "5f868185-7351-49ec-95b4-87dab4d08e02" - }, - "3": { - "components": { - "Nickel": 1, - "Shield Emitters": 1, - "Tungsten": 1 - }, - "features": { - "integrity": [ - 1.2, - 1.8 - ], - "mass": [ - 0.9, - 0.9 - ] - }, - "uuid": "33e63006-29ae-4466-b240-7708ddd9804b" - }, - "4": { - "components": { - "Molybdenum": 1, - "Tungsten": 1, - "Zinc": 1 - }, - "features": { - "integrity": [ - 1.8, - 2.4 - ], - "mass": [ - 1.2, - 1.2 - ] - }, - "uuid": "5d0cb508-a654-4dc8-8e04-6cafac0ea86d" - }, - "5": { - "components": { - "High Density Composites": 1, - "Molybdenum": 1, - "Technetium": 1 - }, - "features": { - "integrity": [ - 2.4, - 3 - ], - "mass": [ - 1.5, - 1.5 - ] - }, - "uuid": "06a5631b-036b-47ac-9d41-4c1728a5d34e" - } - }, - "id": 14, - "modulename": [ - "Chaff launcher" - ], - "name": "Reinforced" - }, - "ChaffLauncher_Shielded": { - "fdname": "Misc_Shielded", - "grades": { - "1": { - "components": { - "Worn Shield Emitters": 1 - }, - "features": { - "integrity": [ - 0, - 0.6 - ], - "power": [ - 0.2, - 0.2 - ] - }, - "uuid": "ac3908c2-c5aa-44a1-a847-a9d27c34a326" - }, - "2": { - "components": { - "Carbon": 1, - "Shield Emitters": 1 - }, - "features": { - "integrity": [ - 0.6, - 1.2 - ], - "power": [ - 0.4, - 0.4 - ] - }, - "uuid": "ee1ad091-7a25-44ac-b3e4-9ee5e4228483" - }, - "3": { - "components": { - "Carbon": 1, - "High Density Composites": 1, - "Shield Emitters": 1 - }, - "features": { - "integrity": [ - 1.2, - 1.8 - ], - "power": [ - 0.6, - 0.6 - ] - }, - "uuid": "eddd7f16-035d-4e9e-96fc-bf82e9ce7397" - }, - "4": { - "components": { - "Proprietary Composites": 1, - "Shielding Sensors": 1, - "Vanadium": 1 - }, - "features": { - "integrity": [ - 1.8, - 2.4 - ], - "power": [ - 0.8, - 0.8 - ] - }, - "uuid": "1fef7b64-bf77-4024-a9b4-24146d5cefe3" - }, - "5": { - "components": { - "Compound Shielding": 1, - "Core Dynamics Composites": 1, - "Tungsten": 1 - }, - "features": { - "integrity": [ - 2.4, - 3 - ], - "power": [ - 1, - 1 - ] - }, - "uuid": "f6df4a5b-58f4-4854-843c-a99b2f106154" - } - }, - "id": 15, - "modulename": [ - "Chaff launcher" - ], - "name": "Shielded" - }, "CollectionLimpet_LightWeight": { "fdname": "CollectionLimpet_LightWeight", "grades": { @@ -1656,300 +1392,6 @@ ], "name": "Shielded" }, - "ECM_LightWeight": { - "fdname": "Misc_LightWeight", - "grades": { - "1": { - "components": { - "Phosphorus": 1 - }, - "features": { - "integrity": [ - -0.1, - -0.1 - ], - "mass": [ - 0, - -0.45 - ] - }, - "uuid": "123ef1f4-cb7e-4b8e-8dfc-48c3407d0c94" - }, - "2": { - "components": { - "Manganese": 1, - "Salvaged Alloys": 1 - }, - "features": { - "integrity": [ - -0.2, - -0.2 - ], - "mass": [ - -0.45, - -0.55 - ] - }, - "uuid": "abf6487e-1fac-46e7-9ae3-a46bea977412" - }, - "3": { - "components": { - "Conductive Ceramics": 1, - "Manganese": 1, - "Salvaged Alloys": 1 - }, - "features": { - "integrity": [ - -0.3, - -0.3 - ], - "mass": [ - -0.55, - -0.65 - ] - }, - "uuid": "e1bc6bec-da7b-4b5c-aedd-637b753d2e1f" - }, - "4": { - "components": { - "Conductive Components": 1, - "Phase Alloys": 1, - "Proto Light Alloys": 1 - }, - "features": { - "integrity": [ - -0.4, - -0.4 - ], - "mass": [ - -0.65, - -0.75 - ] - }, - "uuid": "ac3a70dc-8759-4f69-8c97-c31be11d9b49" - }, - "5": { - "components": { - "Conductive Ceramics": 1, - "Proto Light Alloys": 1, - "Proto Radiolic Alloys": 1 - }, - "features": { - "integrity": [ - -0.5, - -0.5 - ], - "mass": [ - -0.75, - -0.85 - ] - }, - "uuid": "1ca34b8b-ce91-44a5-b210-ab7ce9333657" - } - }, - "id": 19, - "modulename": [ - "Electronic counter measures", - "ECM" - ], - "name": "Lightweight" - }, - "ECM_Reinforced": { - "fdname": "Misc_Reinforced", - "grades": { - "1": { - "components": { - "Nickel": 1 - }, - "features": { - "integrity": [ - 0, - 0.6 - ], - "mass": [ - 0.3, - 0.3 - ] - }, - "uuid": "6bcb5b84-5e90-4d3d-be7c-6ed6c1f048c4" - }, - "2": { - "components": { - "Nickel": 1, - "Shield Emitters": 1 - }, - "features": { - "integrity": [ - 0.6, - 1.2 - ], - "mass": [ - 0.6, - 0.6 - ] - }, - "uuid": "8497a12f-becf-499b-8df8-6814cfa93e39" - }, - "3": { - "components": { - "Nickel": 1, - "Shield Emitters": 1, - "Tungsten": 1 - }, - "features": { - "integrity": [ - 1.2, - 1.8 - ], - "mass": [ - 0.9, - 0.9 - ] - }, - "uuid": "2fbadb73-1c89-4d25-9061-43735d4970b3" - }, - "4": { - "components": { - "Molybdenum": 1, - "Tungsten": 1, - "Zinc": 1 - }, - "features": { - "integrity": [ - 1.8, - 2.4 - ], - "mass": [ - 1.2, - 1.2 - ] - }, - "uuid": "a89859a9-1278-40d0-ac77-e3e6bf10de95" - }, - "5": { - "components": { - "High Density Composites": 1, - "Molybdenum": 1, - "Technetium": 1 - }, - "features": { - "integrity": [ - 2.4, - 3 - ], - "mass": [ - 1.5, - 1.5 - ] - }, - "uuid": "7ab56e9d-f02d-4562-b1e1-82168f482a3e" - } - }, - "id": 20, - "modulename": [ - "Electronic counter measures", - "ECM" - ], - "name": "Reinforced" - }, - "ECM_Shielded": { - "fdname": "Misc_Shielded", - "grades": { - "1": { - "components": { - "Worn Shield Emitters": 1 - }, - "features": { - "integrity": [ - 0, - 0.6 - ], - "power": [ - 0.2, - 0.2 - ] - }, - "uuid": "0dd69a33-0309-4ab6-bf88-e500db42448c" - }, - "2": { - "components": { - "Carbon": 1, - "Shield Emitters": 1 - }, - "features": { - "integrity": [ - 0.6, - 1.2 - ], - "power": [ - 0.4, - 0.4 - ] - }, - "uuid": "297bc1b2-7e2c-4556-b971-b2ff38cbff53" - }, - "3": { - "components": { - "Carbon": 1, - "High Density Composites": 1, - "Shield Emitters": 1 - }, - "features": { - "integrity": [ - 1.2, - 1.8 - ], - "power": [ - 0.6, - 0.6 - ] - }, - "uuid": "385a3392-8580-4fa6-a52c-1205f1041b99" - }, - "4": { - "components": { - "Proprietary Composites": 1, - "Shielding Sensors": 1, - "Vanadium": 1 - }, - "features": { - "integrity": [ - 1.8, - 2.4 - ], - "power": [ - 0.8, - 0.8 - ] - }, - "uuid": "eb3e8641-031c-4318-9e97-43f27529fd86" - }, - "5": { - "components": { - "Compound Shielding": 1, - "Core Dynamics Composites": 1, - "Tungsten": 1 - }, - "features": { - "integrity": [ - 2.4, - 3 - ], - "power": [ - 1, - 1 - ] - }, - "uuid": "7d291eef-55fa-4ffd-8d5c-1b4e46669333" - } - }, - "id": 21, - "modulename": [ - "Electronic counter measures", - "ECM" - ], - "name": "Shielded" - }, "Engine_Dirty": { "fdname": "Engine_Dirty", "grades": { @@ -3691,297 +3133,6 @@ ], "name": "Ammo capacity" }, - "HeatSinkLauncher_LightWeight": { - "fdname": "Misc_LightWeight", - "grades": { - "1": { - "components": { - "Phosphorus": 1 - }, - "features": { - "integrity": [ - -0.1, - -0.1 - ], - "mass": [ - 0, - -0.45 - ] - }, - "uuid": "0a20c246-fe84-43d1-835b-ae74474cdec9" - }, - "2": { - "components": { - "Manganese": 1, - "Salvaged Alloys": 1 - }, - "features": { - "integrity": [ - -0.2, - -0.2 - ], - "mass": [ - -0.45, - -0.55 - ] - }, - "uuid": "83dc9090-28c5-45b7-a4f5-8e2a76923e90" - }, - "3": { - "components": { - "Conductive Ceramics": 1, - "Manganese": 1, - "Salvaged Alloys": 1 - }, - "features": { - "integrity": [ - -0.3, - -0.3 - ], - "mass": [ - -0.55, - -0.65 - ] - }, - "uuid": "777b5a47-9d29-4787-b097-8c4a22c11d20" - }, - "4": { - "components": { - "Conductive Components": 1, - "Phase Alloys": 1, - "Proto Light Alloys": 1 - }, - "features": { - "integrity": [ - -0.4, - -0.4 - ], - "mass": [ - -0.65, - -0.75 - ] - }, - "uuid": "558a1180-e1a0-4c4a-8992-fac17d58860b" - }, - "5": { - "components": { - "Conductive Ceramics": 1, - "Proto Light Alloys": 1, - "Proto Radiolic Alloys": 1 - }, - "features": { - "integrity": [ - -0.5, - -0.5 - ], - "mass": [ - -0.75, - -0.85 - ] - }, - "uuid": "732d7fd3-4ba6-4402-8260-75a2d26c8dc9" - } - }, - "id": 38, - "modulename": [ - "Heat sink launcher" - ], - "name": "Lightweight" - }, - "HeatSinkLauncher_Reinforced": { - "fdname": "Misc_Reinforced", - "grades": { - "1": { - "components": { - "Nickel": 1 - }, - "features": { - "integrity": [ - 0, - 0.6 - ], - "mass": [ - 0.3, - 0.3 - ] - }, - "uuid": "4b8ad4b4-4d42-4014-98ac-2175392ad0c8" - }, - "2": { - "components": { - "Nickel": 1, - "Shield Emitters": 1 - }, - "features": { - "integrity": [ - 0.6, - 1.2 - ], - "mass": [ - 0.6, - 0.6 - ] - }, - "uuid": "7a7166cf-d789-4cb8-9768-f31cc3159dc5" - }, - "3": { - "components": { - "Nickel": 1, - "Shield Emitters": 1, - "Tungsten": 1 - }, - "features": { - "integrity": [ - 1.2, - 1.8 - ], - "mass": [ - 0.9, - 0.9 - ] - }, - "uuid": "93d33903-1dc8-453a-8bd6-df3198c1eac5" - }, - "4": { - "components": { - "Molybdenum": 1, - "Tungsten": 1, - "Zinc": 1 - }, - "features": { - "integrity": [ - 1.8, - 2.4 - ], - "mass": [ - 1.2, - 1.2 - ] - }, - "uuid": "9a174428-ac75-4bc8-80e0-c1327d0317b8" - }, - "5": { - "components": { - "High Density Composites": 1, - "Molybdenum": 1, - "Technetium": 1 - }, - "features": { - "integrity": [ - 2.4, - 3 - ], - "mass": [ - 1.5, - 1.5 - ] - }, - "uuid": "2b450008-60f9-4473-8e2d-563e1f0ded00" - } - }, - "id": 39, - "modulename": [ - "Heat sink launcher" - ], - "name": "Reinforced" - }, - "HeatSinkLauncher_Shielded": { - "fdname": "Misc_Shielded", - "grades": { - "1": { - "components": { - "Worn Shield Emitters": 1 - }, - "features": { - "integrity": [ - 0, - 0.6 - ], - "power": [ - 0.2, - 0.2 - ] - }, - "uuid": "b7bb4a4a-61ee-44b6-b477-e6abf7540240" - }, - "2": { - "components": { - "Carbon": 1, - "Shield Emitters": 1 - }, - "features": { - "integrity": [ - 0.6, - 1.2 - ], - "power": [ - 0.4, - 0.4 - ] - }, - "uuid": "69ec3d60-591c-4c65-a6d4-2b2fe83e1819" - }, - "3": { - "components": { - "Carbon": 1, - "High Density Composites": 1, - "Shield Emitters": 1 - }, - "features": { - "integrity": [ - 1.2, - 1.8 - ], - "power": [ - 0.6, - 0.6 - ] - }, - "uuid": "beb3c5c1-689c-497d-a1b0-92d7fda93878" - }, - "4": { - "components": { - "Proprietary Composites": 1, - "Shielding Sensors": 1, - "Vanadium": 1 - }, - "features": { - "integrity": [ - 1.8, - 2.4 - ], - "power": [ - 0.8, - 0.8 - ] - }, - "uuid": "52f4a6d1-c291-4ac6-84f2-6d39bc54e675" - }, - "5": { - "components": { - "Compound Shielding": 1, - "Core Dynamics Composites": 1, - "Tungsten": 1 - }, - "features": { - "integrity": [ - 2.4, - 3 - ], - "power": [ - 1, - 1 - ] - }, - "uuid": "aa1707cb-c9e3-425f-91cf-98ab482317ca" - } - }, - "id": 40, - "modulename": [ - "Heat sink launcher" - ], - "name": "Shielded" - }, "HullReinforcement_Advanced": { "fdname": "HullReinforcement_Advanced", "grades": { @@ -4677,418 +3828,6 @@ ], "name": "Thermal resistant" }, - "KillWarrantScanner_LightWeight": { - "fdname": "Sensor_LightWeight", - "grades": { - "1": { - "components": { - "Phosphorus": 1 - }, - "features": { - "integrity": [ - -0.1, - -0.1 - ], - "mass": [ - 0, - -0.45 - ] - }, - "uuid": "b56007ba-9351-417e-9da8-def090b31e50" - }, - "2": { - "components": { - "Manganese": 1, - "Salvaged Alloys": 1 - }, - "features": { - "integrity": [ - -0.2, - -0.2 - ], - "mass": [ - -0.45, - -0.55 - ] - }, - "uuid": "14b2d6f0-5f93-48c9-a04a-b9b1064b4bd1" - }, - "3": { - "components": { - "Conductive Ceramics": 1, - "Manganese": 1, - "Salvaged Alloys": 1 - }, - "features": { - "integrity": [ - -0.3, - -0.3 - ], - "mass": [ - -0.55, - -0.65 - ] - }, - "uuid": "d6dc2106-b95e-49fe-bd56-0ab0729045ad" - }, - "4": { - "components": { - "Conductive Components": 1, - "Phase Alloys": 1, - "Proto Light Alloys": 1 - }, - "features": { - "integrity": [ - -0.4, - -0.4 - ], - "mass": [ - -0.65, - -0.75 - ] - }, - "uuid": "fa568ca9-fe6f-4036-89ae-c6659fdc4e33" - }, - "5": { - "components": { - "Conductive Ceramics": 1, - "Proto Light Alloys": 1, - "Proto Radiolic Alloys": 1 - }, - "features": { - "integrity": [ - -0.5, - -0.5 - ], - "mass": [ - -0.75, - -0.85 - ] - }, - "uuid": "caadbd5f-2b31-42bb-b3ee-754d44d34938" - } - }, - "id": 46, - "modulename": [ - "Kill warrant scanner", - "KWS" - ], - "name": "Lightweight" - }, - "KillWarrantScanner_LongRange": { - "fdname": "Sensor_LongRange", - "grades": { - "1": { - "components": { - "Iron": 1 - }, - "features": { - "power": [ - 0.1, - 0.1 - ], - "angle": [ - -0.1, - -0.1 - ], - "range": [ - 0, - 0.24 - ] - }, - "uuid": "2689c846-02d7-4694-97f1-85cd5437b42f" - }, - "2": { - "components": { - "Hybrid Capacitors": 1, - "Iron": 1 - }, - "features": { - "power": [ - 0.2, - 0.2 - ], - "angle": [ - -0.15, - -0.15 - ], - "range": [ - 0.24, - 0.48 - ] - }, - "uuid": "c2160767-b03f-491e-9a45-31976fb78899" - }, - "3": { - "components": { - "Hybrid Capacitors": 1, - "Iron": 1, - "Unexpected Emission Data": 1 - }, - "features": { - "power": [ - 0.3, - 0.3 - ], - "angle": [ - -0.2, - -0.2 - ], - "range": [ - 0.48, - 0.72 - ] - }, - "uuid": "4d9ccdb6-89cc-4f27-a8c8-584de68dae4b" - }, - "4": { - "components": { - "Decoded Emission Data": 1, - "Electrochemical Arrays": 1, - "Germanium": 1 - }, - "features": { - "power": [ - 0.4, - 0.4 - ], - "angle": [ - -0.25, - -0.25 - ], - "range": [ - 0.72, - 0.96 - ] - }, - "uuid": "0ecb3bee-4033-4937-a5ed-161f50cb6024" - }, - "5": { - "components": { - "Abnormal Compact Emissions Data": 1, - "Niobium": 1, - "Polymer Capacitors": 1 - }, - "features": { - "power": [ - 0.5, - 0.5 - ], - "angle": [ - -0.3, - -0.3 - ], - "range": [ - 0.96, - 1.2 - ] - }, - "uuid": "8ec2cbd4-b944-448b-b230-d9de87aea5b8" - } - }, - "id": 99, - "modulename": [ - "Kill warrant scanner", - "KWS" - ], - "name": "Long range" - }, - "KillWarrantScanner_Reinforced": { - "fdname": "Sensor_Reinforced", - "grades": { - "1": { - "components": { - "Nickel": 1 - }, - "features": { - "integrity": [ - 0, - 0.6 - ], - "mass": [ - 0.3, - 0.3 - ] - }, - "uuid": "54cf058d-795d-423c-8923-fdd6971dec29" - }, - "2": { - "components": { - "Nickel": 1, - "Shield Emitters": 1 - }, - "features": { - "integrity": [ - 0.6, - 1.2 - ], - "mass": [ - 0.6, - 0.6 - ] - }, - "uuid": "3d7eb835-8a30-458d-bbf3-cfd8de5f8cb4" - }, - "3": { - "components": { - "Nickel": 1, - "Shield Emitters": 1, - "Tungsten": 1 - }, - "features": { - "integrity": [ - 1.2, - 1.8 - ], - "mass": [ - 0.9, - 0.9 - ] - }, - "uuid": "200dfa7b-085d-43d8-ae61-f7080feed350" - }, - "4": { - "components": { - "Molybdenum": 1, - "Tungsten": 1, - "Zinc": 1 - }, - "features": { - "integrity": [ - 1.8, - 2.4 - ], - "mass": [ - 1.2, - 1.2 - ] - }, - "uuid": "4fdb0643-c9e0-43f6-8b6b-4613fec1de03" - }, - "5": { - "components": { - "High Density Composites": 1, - "Molybdenum": 1, - "Technetium": 1 - }, - "features": { - "integrity": [ - 2.4, - 3 - ], - "mass": [ - 1.5, - 1.5 - ] - }, - "uuid": "b5787172-ca08-43bd-8d57-b00a26c3d6c8" - } - }, - "id": 47, - "modulename": [ - "Kill warrant scanner", - "KWS" - ], - "name": "Reinforced" - }, - "KillWarrantScanner_Shielded": { - "fdname": "Sensor_Shielded", - "grades": { - "1": { - "components": { - "Worn Shield Emitters": 1 - }, - "features": { - "integrity": [ - 0, - 0.6 - ], - "power": [ - 0.2, - 0.2 - ] - }, - "uuid": "f4426054-f766-4be3-8b26-e9236ff61dd9" - }, - "2": { - "components": { - "Carbon": 1, - "Shield Emitters": 1 - }, - "features": { - "integrity": [ - 0.6, - 1.2 - ], - "power": [ - 0.4, - 0.4 - ] - }, - "uuid": "fa7b4b7f-ed0a-401f-a372-1d03c09f9c55" - }, - "3": { - "components": { - "Carbon": 1, - "High Density Composites": 1, - "Shield Emitters": 1 - }, - "features": { - "integrity": [ - 1.2, - 1.8 - ], - "power": [ - 0.6, - 0.6 - ] - }, - "uuid": "443fe7e9-e313-457b-8c0f-6eb22e6e91ef" - }, - "4": { - "components": { - "Proprietary Composites": 1, - "Shielding Sensors": 1, - "Vanadium": 1 - }, - "features": { - "integrity": [ - 1.8, - 2.4 - ], - "power": [ - 0.8, - 0.8 - ] - }, - "uuid": "b1a0e15d-7164-44f9-85e5-9acc64e56b8b" - }, - "5": { - "components": { - "Compound Shielding": 1, - "Core Dynamics Composites": 1, - "Tungsten": 1 - }, - "features": { - "integrity": [ - 2.4, - 3 - ], - "power": [ - 1, - 1 - ] - }, - "uuid": "499f1881-9448-4df5-a734-cc3876f23790" - } - }, - "id": 48, - "modulename": [ - "Kill warrant scanner", - "KWS" - ], - "name": "Shielded" - }, "LifeSupport_LightWeight": { "fdname": "LifeSupport_LightWeight", "grades": { @@ -5380,103 +4119,6 @@ ], "name": "Shielded" }, - "PointDefence_LightWeight": { - "fdname": "Misc_LightWeight", - "grades": { - "1": { - "components": { - "Phosphorus": 1 - }, - "features": { - "integrity": [ - -0.1, - -0.1 - ], - "mass": [ - 0, - -0.45 - ] - }, - "uuid": "b212ba23-880a-46f7-94ef-f276acb068da" - }, - "2": { - "components": { - "Manganese": 1, - "Salvaged Alloys": 1 - }, - "features": { - "integrity": [ - -0.2, - -0.2 - ], - "mass": [ - -0.45, - -0.55 - ] - }, - "uuid": "17733fc5-6153-406c-b7f6-fbc6904b7223" - }, - "3": { - "components": { - "Conductive Ceramics": 1, - "Manganese": 1, - "Salvaged Alloys": 1 - }, - "features": { - "integrity": [ - -0.3, - -0.3 - ], - "mass": [ - -0.55, - -0.65 - ] - }, - "uuid": "428b7f9f-9ab2-4f1f-9e8e-9a54ede9af65" - }, - "4": { - "components": { - "Conductive Components": 1, - "Phase Alloys": 1, - "Proto Light Alloys": 1 - }, - "features": { - "integrity": [ - -0.4, - -0.4 - ], - "mass": [ - -0.65, - -0.75 - ] - }, - "uuid": "6285a7cd-bb8f-427d-b2aa-3c20953c9c9c" - }, - "5": { - "components": { - "Conductive Ceramics": 1, - "Proto Light Alloys": 1, - "Proto Radiolic Alloys": 1 - }, - "features": { - "integrity": [ - -0.5, - -0.5 - ], - "mass": [ - -0.75, - -0.85 - ] - }, - "uuid": "1e819178-49c2-4aad-bf17-723061cb3f95" - } - }, - "id": 52, - "modulename": [ - "Point defence" - ], - "name": "Lightweight" - }, "Misc_PointDefenseCapacity": { "fdname": "Misc_PointDefenseCapacity", "grades": { @@ -5509,398 +4151,6 @@ ], "name": "Ammo capacity" }, - "PointDefence_Reinforced": { - "fdname": "Misc_Reinforced", - "grades": { - "1": { - "components": { - "Nickel": 1 - }, - "features": { - "integrity": [ - 0, - 0.6 - ], - "mass": [ - 0.3, - 0.3 - ] - }, - "uuid": "be6995c8-ffe3-41db-82c7-8a1d876254bd" - }, - "2": { - "components": { - "Nickel": 1, - "Shield Emitters": 1 - }, - "features": { - "integrity": [ - 0.6, - 1.2 - ], - "mass": [ - 0.6, - 0.6 - ] - }, - "uuid": "b485f4a5-194e-44cd-8a68-d78d87b78749" - }, - "3": { - "components": { - "Nickel": 1, - "Shield Emitters": 1, - "Tungsten": 1 - }, - "features": { - "integrity": [ - 1.2, - 1.8 - ], - "mass": [ - 0.9, - 0.9 - ] - }, - "uuid": "007beb33-2cb2-48fc-b3d3-b5b82fc7c795" - }, - "4": { - "components": { - "Molybdenum": 1, - "Tungsten": 1, - "Zinc": 1 - }, - "features": { - "integrity": [ - 1.8, - 2.4 - ], - "mass": [ - 1.2, - 1.2 - ] - }, - "uuid": "3fbaecf6-2bdf-4c53-b455-d37d0d78571c" - }, - "5": { - "components": { - "High Density Composites": 1, - "Molybdenum": 1, - "Technetium": 1 - }, - "features": { - "integrity": [ - 2.4, - 3 - ], - "mass": [ - 1.5, - 1.5 - ] - }, - "uuid": "e6c7a828-4c26-44e6-80ed-e39978850532" - } - }, - "id": 53, - "modulename": [ - "Point defence" - ], - "name": "Reinforced" - }, - "PointDefence_Shielded": { - "fdname": "Misc_Shielded", - "grades": { - "1": { - "components": { - "Worn Shield Emitters": 1 - }, - "features": { - "integrity": [ - 0, - 0.6 - ], - "power": [ - 0.2, - 0.2 - ] - }, - "uuid": "84de52cc-9d50-48b9-94bc-262735f61a27" - }, - "2": { - "components": { - "Carbon": 1, - "Shield Emitters": 1 - }, - "features": { - "integrity": [ - 0.6, - 1.2 - ], - "power": [ - 0.4, - 0.4 - ] - }, - "uuid": "94b0ceb5-3f07-4206-aa02-1e69f1059476" - }, - "3": { - "components": { - "Carbon": 1, - "High Density Composites": 1, - "Shield Emitters": 1 - }, - "features": { - "integrity": [ - 1.2, - 1.8 - ], - "power": [ - 0.6, - 0.6 - ] - }, - "uuid": "ad2d6c5e-f69d-44cd-94e5-0437a1b77e39" - }, - "4": { - "components": { - "Proprietary Composites": 1, - "Shielding Sensors": 1, - "Vanadium": 1 - }, - "features": { - "integrity": [ - 1.8, - 2.4 - ], - "power": [ - 0.8, - 0.8 - ] - }, - "uuid": "718b1c81-ffc9-4097-8969-3805dfab4ce2" - }, - "5": { - "components": { - "Compound Shielding": 1, - "Core Dynamics Composites": 1, - "Tungsten": 1 - }, - "features": { - "integrity": [ - 2.4, - 3 - ], - "power": [ - 1, - 1 - ] - }, - "uuid": "4a89d7e7-fb6d-4d65-aca6-641b634d2cbb" - } - }, - "id": 54, - "modulename": [ - "Point defence" - ], - "name": "Shielded" - }, - "PowerDistributor_HighCapacity": { - "fdname": "PowerDistributor_HighCapacity", - "grades": { - "1": { - "components": { - "Sulphur": 1 - }, - "features": { - "engcap": [ - 0, - 0.1 - ], - "engrate": [ - -0.02, - -0.02 - ], - "integrity": [ - 0, - 0.1 - ], - "syscap": [ - 0, - 0.1 - ], - "sysrate": [ - -0.02, - -0.02 - ], - "wepcap": [ - 0, - 0.1 - ], - "weprate": [ - -0.02, - -0.02 - ] - }, - "uuid": "e1ae5651-f688-46e2-a94a-9c3bc6e8665b" - }, - "2": { - "components": { - "Chromium": 1, - "Specialised Legacy Firmware": 1 - }, - "features": { - "engcap": [ - 0.1, - 0.18 - ], - "engrate": [ - -0.06, - -0.06 - ], - "integrity": [ - 0.1, - 0.18 - ], - "syscap": [ - 0.08, - 0.1 - ], - "sysrate": [ - -0.06, - -0.06 - ], - "wepcap": [ - 0.1, - 0.18 - ], - "weprate": [ - -0.06, - -0.06 - ] - }, - "uuid": "d5ea6b7b-31eb-44f4-b1f3-8126dd6ea7b5" - }, - "3": { - "components": { - "Chromium": 1, - "High Density Composites": 1, - "Specialised Legacy Firmware": 1 - }, - "features": { - "engcap": [ - 0.18, - 0.26 - ], - "engrate": [ - -0.1, - -0.1 - ], - "integrity": [ - 0.15, - 0.2 - ], - "syscap": [ - 0.18, - 0.26 - ], - "sysrate": [ - -0.1, - -0.1 - ], - "wepcap": [ - 0.18, - 0.26 - ], - "weprate": [ - -0.1, - -0.1 - ] - }, - "uuid": "b959a87e-a231-46e7-a6a7-65fe6c0464bc" - }, - "4": { - "components": { - "Modified Consumer Firmware": 1, - "Proprietary Composites": 1, - "Selenium": 1 - }, - "features": { - "engcap": [ - 0.26, - 0.34 - ], - "engrate": [ - -0.14, - -0.14 - ], - "integrity": [ - 0.2, - 0.25 - ], - "syscap": [ - 0.26, - 0.34 - ], - "sysrate": [ - -0.14, - -0.14 - ], - "wepcap": [ - 0.26, - 0.34 - ], - "weprate": [ - -0.14, - -0.14 - ] - }, - "uuid": "5f468c03-ed6d-474f-9e82-601b11d728c8" - }, - "5": { - "components": { - "Cracked Industrial Firmware": 1, - "Military Supercapacitors": 1, - "Proprietary Composites": 1 - }, - "features": { - "engcap": [ - 0.34, - 0.42 - ], - "engrate": [ - -0.18, - -0.18 - ], - "integrity": [ - 0.25, - 0.3 - ], - "syscap": [ - 0.34, - 0.42 - ], - "sysrate": [ - -0.18, - -0.18 - ], - "wepcap": [ - 0.34, - 0.42 - ], - "weprate": [ - -0.18, - -0.18 - ] - }, - "uuid": "50b4cbc5-9445-43e3-a9a8-b1320fc0b27e" - } - }, - "id": 56, - "modulename": [ - "Power distributor", - "Distributor" - ], - "name": "High charge capacity" - }, "PowerDistributor_HighFrequency": { "fdname": "PowerDistributor_HighFrequency", "grades": { @@ -7472,7 +5722,7 @@ ], "name": "Shielded" }, - "Sensor_CargoScanner_FastScan": { + "Sensor_FastScan": { "fdname": "Sensor_FastScan", "grades": { "1": { @@ -7585,12 +5835,16 @@ }, "id": 102, "modulename": [ + "Wake scanner", + "Frame shift wake scanner", + "Kill warrant scanner", + "KWS", "Cargo scanner", "Manifest scanner" ], "name": "Fast scan" }, - "Sensor_CargoScanner_LongRange": { + "Sensor_LongRange_Scanner": { "fdname": "Sensor_LongRange", "grades": { "1": { @@ -7703,12 +5957,16 @@ }, "id": 104, "modulename": [ + "Wake scanner", + "Frame shift wake scanner", + "Kill warrant scanner", + "KWS", "Cargo scanner", "Manifest scanner" ], "name": "Long range" }, - "Sensor_CargoScanner_WideAngle": { + "Sensor_WideAngle_Scanner": { "fdname": "Sensor_WideAngle", "grades": { "1": { @@ -7821,247 +6079,15 @@ }, "id": 105, "modulename": [ + "Wake scanner", + "Frame shift wake scanner", + "Kill warrant scanner", + "KWS", "Cargo scanner", "Manifest scanner" ], "name": "Wide angle" }, - "Sensor_KillWarrantScanner_FastScan": { - "fdname": "Sensor_FastScan", - "grades": { - "1": { - "components": { - "Phosphorus": 1 - }, - "features": { - "integrity": [ - -0.1, - -0.1 - ], - "range": [ - -0.05, - -0.05 - ], - "scantime": [ - 0, - -0.2 - ] - }, - "uuid": "37c2d07b-fa12-4ad2-a1cb-a1c9c5cdb348" - }, - "2": { - "components": { - "Flawed Focus Crystals": 1, - "Phosphorus": 1 - }, - "features": { - "integrity": [ - -0.2, - -0.2 - ], - "range": [ - -0.1, - -0.1 - ], - "scantime": [ - -0.2, - -0.35 - ] - }, - "uuid": "a375ac53-e245-4364-8d8a-389e247bc74d" - }, - "3": { - "components": { - "Flawed Focus Crystals": 1, - "Open Symmetric Keys": 1, - "Phosphorus": 1 - }, - "features": { - "integrity": [ - -0.3, - -0.3 - ], - "range": [ - -0.15, - -0.15 - ], - "scantime": [ - -0.35, - -0.5 - ] - }, - "uuid": "472ebde0-72d0-4ec1-beda-11cbcbad13f9" - }, - "4": { - "components": { - "Atypical Encryption Archives": 1, - "Focus Crystals": 1, - "Manganese": 1 - }, - "features": { - "integrity": [ - -0.4, - -0.4 - ], - "range": [ - -0.2, - -0.2 - ], - "scantime": [ - -0.5, - -0.65 - ] - }, - "uuid": "6d8d3ba8-46b3-4482-a65d-b1c6663c543b" - }, - "5": { - "components": { - "Adaptive Encryptors Capture": 1, - "Arsenic": 1, - "Refined Focus Crystals": 1 - }, - "features": { - "integrity": [ - -0.5, - -0.5 - ], - "range": [ - -0.25, - -0.25 - ], - "scantime": [ - -0.8, - -0.8 - ] - }, - "uuid": "fb2433bb-5493-43d8-a1ec-e57e43951751" - } - }, - "id": 101, - "modulename": [ - "Kill warrant scanner", - "KWS" - ], - "name": "Fast scan" - }, - "Sensor_KillWarrantScanner_WideAngle": { - "fdname": "Sensor_WideAngle", - "grades": { - "1": { - "components": { - "Mechanical Scrap": 1 - }, - "features": { - "mass": [ - 0.2, - 0.2 - ], - "angle": [ - 0, - 0.4 - ], - "scantime": [ - 0.1, - 0.1 - ] - }, - "uuid": "69ee982f-f925-4e0a-a7a8-cc52ff9bc295" - }, - "2": { - "components": { - "Germanium": 1, - "Mechanical Scrap": 1 - }, - "features": { - "mass": [ - 0.4, - 0.4 - ], - "angle": [ - 0.4, - 0.8 - ], - "scantime": [ - 0.2, - 0.2 - ] - }, - "uuid": "3f0b3cbd-3acf-4a49-a176-6ceb02b958f9" - }, - "3": { - "components": { - "Classified Scan Databanks": 1, - "Germanium": 1, - "Mechanical Scrap": 1 - }, - "features": { - "mass": [ - 0.6, - 0.6 - ], - "angle": [ - 0.8, - 1.2 - ], - "scantime": [ - 0.3, - 0.3 - ] - }, - "uuid": "5c378d56-97f7-4a75-b113-7e6bc846d53f" - }, - "4": { - "components": { - "Divergent Scan Data": 1, - "Mechanical Equipment": 1, - "Niobium": 1 - }, - "features": { - "mass": [ - 0.8, - 0.8 - ], - "angle": [ - 1.2, - 1.6 - ], - "scantime": [ - 0.4, - 0.4 - ] - }, - "uuid": "887d9bb6-422f-42ce-8a21-22d1f43a7f64" - }, - "5": { - "components": { - "Classified Scan Fragment": 1, - "Mechanical Components": 1, - "Tin": 1 - }, - "features": { - "mass": [ - 1, - 1 - ], - "angle": [ - 1.6, - 2 - ], - "scantime": [ - 0.5, - 0.5 - ] - }, - "uuid": "0f0f8c7e-e9d4-4264-88a6-668372ad9d47" - } - }, - "id": 107, - "modulename": [ - "Kill warrant scanner", - "KWS" - ], - "name": "Wide angle" - }, "Sensor_LightWeight": { "fdname": "Sensor_LightWeight", "grades": { @@ -8511,360 +6537,6 @@ ], "name": "Expanded Probe Scanning Radius" }, - "Sensor_WakeScanner_FastScan": { - "fdname": "Sensor_FastScan", - "grades": { - "1": { - "components": { - "Phosphorus": 1 - }, - "features": { - "integrity": [ - -0.1, - -0.1 - ], - "range": [ - -0.05, - -0.05 - ], - "scantime": [ - 0, - -0.2 - ] - }, - "uuid": "c7abe4af-26f0-460c-8df7-71412f12d5f8" - }, - "2": { - "components": { - "Flawed Focus Crystals": 1, - "Phosphorus": 1 - }, - "features": { - "integrity": [ - -0.2, - -0.2 - ], - "range": [ - -0.1, - -0.1 - ], - "scantime": [ - -0.2, - -0.35 - ] - }, - "uuid": "940b832d-2dac-4671-9ada-4bede831342e" - }, - "3": { - "components": { - "Flawed Focus Crystals": 1, - "Open Symmetric Keys": 1, - "Phosphorus": 1 - }, - "features": { - "integrity": [ - -0.3, - -0.3 - ], - "range": [ - -0.15, - -0.15 - ], - "scantime": [ - -0.35, - -0.5 - ] - }, - "uuid": "223a0854-036f-495d-afa1-69253f2b87c3" - }, - "4": { - "components": { - "Atypical Encryption Archives": 1, - "Focus Crystals": 1, - "Manganese": 1 - }, - "features": { - "integrity": [ - -0.4, - -0.4 - ], - "range": [ - -0.2, - -0.2 - ], - "scantime": [ - -0.5, - -0.65 - ] - }, - "uuid": "992ffcbe-26c5-4f41-bc2d-81bb6565ac27" - }, - "5": { - "components": { - "Adaptive Encryptors Capture": 1, - "Arsenic": 1, - "Refined Focus Crystals": 1 - }, - "features": { - "integrity": [ - -0.5, - -0.5 - ], - "range": [ - -0.25, - -0.25 - ], - "scantime": [ - -0.8, - -0.8 - ] - }, - "uuid": "d2af32a6-ffdb-4c28-89ee-88f331e678d3" - } - }, - "id": 109, - "modulename": [ - "Wake scanner", - "Frame shift wake scanner" - ], - "name": "Fast scan" - }, - "Sensor_WakeScanner_LongRange": { - "fdname": "Sensor_LongRange", - "grades": { - "1": { - "components": { - "Iron": 1 - }, - "features": { - "power": [ - 0.1, - 0.1 - ], - "angle": [ - -0.1, - -0.1 - ], - "range": [ - 0, - 0.24 - ] - }, - "uuid": "11521a5e-0b00-4efe-9433-b0d4b5168c11" - }, - "2": { - "components": { - "Hybrid Capacitors": 1, - "Iron": 1 - }, - "features": { - "power": [ - 0.2, - 0.2 - ], - "angle": [ - -0.15, - -0.15 - ], - "range": [ - 0.24, - 0.48 - ] - }, - "uuid": "16235231-561b-4efb-a9bc-dcacb18b5651" - }, - "3": { - "components": { - "Hybrid Capacitors": 1, - "Iron": 1, - "Unexpected Emission Data": 1 - }, - "features": { - "power": [ - 0.3, - 0.3 - ], - "angle": [ - -0.2, - -0.2 - ], - "range": [ - 0.48, - 0.72 - ] - }, - "uuid": "8dcbfbd5-748e-46ee-b179-4e2d213e518c" - }, - "4": { - "components": { - "Decoded Emission Data": 1, - "Electrochemical Arrays": 1, - "Germanium": 1 - }, - "features": { - "power": [ - 0.4, - 0.4 - ], - "angle": [ - -0.25, - -0.25 - ], - "range": [ - 0.72, - 0.96 - ] - }, - "uuid": "44a348b1-979f-498e-bf61-22b38cb6f53b" - }, - "5": { - "components": { - "Abnormal Compact Emissions Data": 1, - "Niobium": 1, - "Polymer Capacitors": 1 - }, - "features": { - "power": [ - 0.5, - 0.5 - ], - "angle": [ - -0.3, - -0.3 - ], - "range": [ - 0.96, - 1.2 - ] - }, - "uuid": "ee756b0e-c36f-4ea5-a46b-13291522feea" - } - }, - "id": 108, - "modulename": [ - "Wake scanner", - "Frame shift wake scanner" - ], - "name": "Long range" - }, - "Sensor_WakeScanner_WideAngle": { - "fdname": "Sensor_WideAngle", - "grades": { - "1": { - "components": { - "Mechanical Scrap": 1 - }, - "features": { - "mass": [ - 0.2, - 0.2 - ], - "angle": [ - 0, - 0.4 - ], - "scantime": [ - 0.1, - 0.1 - ] - }, - "uuid": "1b76dc7a-d52c-4cdd-93c6-6857f509519b" - }, - "2": { - "components": { - "Germanium": 1, - "Mechanical Scrap": 1 - }, - "features": { - "mass": [ - 0.4, - 0.4 - ], - "angle": [ - 0.4, - 0.8 - ], - "scantime": [ - 0.2, - 0.2 - ] - }, - "uuid": "9e143db0-83e9-49ff-ba53-04927287190b" - }, - "3": { - "components": { - "Classified Scan Databanks": 1, - "Germanium": 1, - "Mechanical Scrap": 1 - }, - "features": { - "mass": [ - 0.6, - 0.6 - ], - "angle": [ - 0.8, - 1.2 - ], - "scantime": [ - 0.3, - 0.3 - ] - }, - "uuid": "d2b0776c-9e74-4fe9-be1c-e49e104dcad6" - }, - "4": { - "components": { - "Divergent Scan Data": 1, - "Mechanical Equipment": 1, - "Niobium": 1 - }, - "features": { - "mass": [ - 0.8, - 0.8 - ], - "angle": [ - 1.2, - 1.6 - ], - "scantime": [ - 0.4, - 0.4 - ] - }, - "uuid": "a00e7425-0828-41ea-9e11-e44bc391dd6f" - }, - "5": { - "components": { - "Classified Scan Fragment": 1, - "Mechanical Components": 1, - "Tin": 1 - }, - "features": { - "mass": [ - 1, - 1 - ], - "angle": [ - 1.6, - 2 - ], - "scantime": [ - 0.5, - 0.5 - ] - }, - "uuid": "7835c40b-1612-49ac-9a41-230cfff63daa" - } - }, - "id": 106, - "modulename": [ - "Wake scanner", - "Frame shift wake scanner" - ], - "name": "Wide angle" - }, "ShieldBooster_Explosive": { "fdname": "ShieldBooster_Explosive", "grades": { @@ -10322,300 +7994,6 @@ ], "name": "Thermal resistant" }, - "WakeScanner_LightWeight": { - "fdname": "Sensor_LightWeight", - "grades": { - "1": { - "components": { - "Phosphorus": 1 - }, - "features": { - "integrity": [ - -0.1, - -0.1 - ], - "mass": [ - 0, - -0.45 - ] - }, - "uuid": "bb40e7d4-d0f1-46aa-bedd-d946db82012d" - }, - "2": { - "components": { - "Manganese": 1, - "Salvaged Alloys": 1 - }, - "features": { - "integrity": [ - -0.2, - -0.2 - ], - "mass": [ - -0.45, - -0.55 - ] - }, - "uuid": "3d38ce20-64c8-4416-bf8c-a0de02225624" - }, - "3": { - "components": { - "Conductive Ceramics": 1, - "Manganese": 1, - "Salvaged Alloys": 1 - }, - "features": { - "integrity": [ - -0.3, - -0.3 - ], - "mass": [ - -0.55, - -0.65 - ] - }, - "uuid": "86c3114f-e2d5-46a1-963b-a8dcdc4254c3" - }, - "4": { - "components": { - "Conductive Components": 1, - "Phase Alloys": 1, - "Proto Light Alloys": 1 - }, - "features": { - "integrity": [ - -0.4, - -0.4 - ], - "mass": [ - -0.65, - -0.75 - ] - }, - "uuid": "cd80437d-740d-4391-810d-607f7e35202c" - }, - "5": { - "components": { - "Conductive Ceramics": 1, - "Proto Light Alloys": 1, - "Proto Radiolic Alloys": 1 - }, - "features": { - "integrity": [ - -0.5, - -0.5 - ], - "mass": [ - -0.75, - -0.85 - ] - }, - "uuid": "e6f931fb-2d19-40b0-bfb2-4a0520f0c478" - } - }, - "id": 79, - "modulename": [ - "Frame shift wake scanner", - "Wake scanner" - ], - "name": "Lightweight" - }, - "WakeScanner_Reinforced": { - "fdname": "Sensor_Reinforced", - "grades": { - "1": { - "components": { - "Nickel": 1 - }, - "features": { - "integrity": [ - 0, - 0.6 - ], - "mass": [ - 0.3, - 0.3 - ] - }, - "uuid": "8a71178f-3d2a-4c53-94dc-606d9d43d43a" - }, - "2": { - "components": { - "Nickel": 1, - "Shield Emitters": 1 - }, - "features": { - "integrity": [ - 0.6, - 1.2 - ], - "mass": [ - 0.6, - 0.6 - ] - }, - "uuid": "72595b30-3bbf-47e3-82f7-db29654bef66" - }, - "3": { - "components": { - "Nickel": 1, - "Shield Emitters": 1, - "Tungsten": 1 - }, - "features": { - "integrity": [ - 1.2, - 1.8 - ], - "mass": [ - 0.9, - 0.9 - ] - }, - "uuid": "8cca72b3-f01a-49aa-a979-a72f3412bf6e" - }, - "4": { - "components": { - "Molybdenum": 1, - "Tungsten": 1, - "Zinc": 1 - }, - "features": { - "integrity": [ - 1.8, - 2.4 - ], - "mass": [ - 1.2, - 1.2 - ] - }, - "uuid": "89f9e00f-e621-4d34-bb15-4732f29a7f15" - }, - "5": { - "components": { - "High Density Composites": 1, - "Molybdenum": 1, - "Technetium": 1 - }, - "features": { - "integrity": [ - 2.4, - 3 - ], - "mass": [ - 1.5, - 1.5 - ] - }, - "uuid": "8f0e13ab-c621-4c21-b7a1-f8acd4057007" - } - }, - "id": 81, - "modulename": [ - "Frame shift wake scanner", - "Wake scanner" - ], - "name": "Reinforced" - }, - "WakeScanner_Shielded": { - "fdname": "Sensor_Shielded", - "grades": { - "1": { - "components": { - "Worn Shield Emitters": 1 - }, - "features": { - "integrity": [ - 0, - 0.6 - ], - "power": [ - 0.2, - 0.2 - ] - }, - "uuid": "c500da24-7fe5-48f6-8661-593f4caee91a" - }, - "2": { - "components": { - "Carbon": 1, - "Shield Emitters": 1 - }, - "features": { - "integrity": [ - 0.6, - 1.2 - ], - "power": [ - 0.4, - 0.4 - ] - }, - "uuid": "eed60442-f13e-4662-8132-e50a23e2534a" - }, - "3": { - "components": { - "Carbon": 1, - "High Density Composites": 1, - "Shield Emitters": 1 - }, - "features": { - "integrity": [ - 1.2, - 1.8 - ], - "power": [ - 0.6, - 0.6 - ] - }, - "uuid": "df8baf0f-01a1-4fea-94e6-e169f71af1c6" - }, - "4": { - "components": { - "Proprietary Composites": 1, - "Shielding Sensors": 1, - "Vanadium": 1 - }, - "features": { - "integrity": [ - 1.8, - 2.4 - ], - "power": [ - 0.8, - 0.8 - ] - }, - "uuid": "107cbead-888f-4b4c-a57e-324ccfe37006" - }, - "5": { - "components": { - "Compound Shielding": 1, - "Core Dynamics Composites": 1, - "Tungsten": 1 - }, - "features": { - "integrity": [ - 2.4, - 3 - ], - "power": [ - 1, - 1 - ] - }, - "uuid": "1c08bdca-000b-4e79-89cb-2cab3d5e3ce7" - } - }, - "id": 80, - "modulename": [ - "Frame shift wake scanner", - "Wake scanner" - ], - "name": "Shielded" - }, "Weapon_DoubleShot": { "fdname": "Weapon_DoubleShot", "grades": { diff --git a/modifications/modules.json b/modifications/modules.json index 82615ac..634559b 100644 --- a/modifications/modules.json +++ b/modifications/modules.json @@ -1009,7 +1009,7 @@ } } }, - "ChaffLauncher_LightWeight": { + "Misc_LightWeight": { "grades": { "1": { "engineers": [ @@ -1038,7 +1038,7 @@ } } }, - "ChaffLauncher_Reinforced": { + "Misc_Reinforced": { "grades": { "1": { "engineers": [ @@ -1067,7 +1067,7 @@ } } }, - "ChaffLauncher_Shielded": { + "Misc_Shielded": { "grades": { "1": { "engineers": [ @@ -1119,30 +1119,32 @@ }, "cs": { "blueprints": { - "Sensor_CargoScanner_FastScan": { + "Sensor_FastScan": { "grades": { "1": { "engineers": [ "Bill Turner", - "Juri Ishmaak", "Lori Jameson", - "Tiana Fortune" + "Tiana Fortune", + "Juri Ishmaak", + "Etienne Dorn" ] }, "2": { "engineers": [ "Bill Turner", - "Juri Ishmaak", "Lori Jameson", - "Tiana Fortune" + "Tiana Fortune", + "Juri Ishmaak", + "Etienne Dorn" ] }, "3": { "engineers": [ "Bill Turner", - "Juri Ishmaak", "Lori Jameson", - "Tiana Fortune" + "Tiana Fortune", + "Juri Ishmaak" ] }, "4": { @@ -1157,27 +1159,32 @@ } } }, - "CargoScanner_LightWeight": { + "Misc_LightWeight": { "grades": { "1": { "engineers": [ "Bill Turner", "Lori Jameson", - "Tiana Fortune" + "Tiana Fortune", + "Juri Ishmaak", + "Etienne Dorn" ] }, "2": { "engineers": [ "Bill Turner", "Lori Jameson", - "Tiana Fortune" + "Tiana Fortune", + "Juri Ishmaak", + "Etienne Dorn" ] }, "3": { "engineers": [ "Bill Turner", "Lori Jameson", - "Tiana Fortune" + "Tiana Fortune", + "Juri Ishmaak" ] }, "4": { @@ -1192,30 +1199,32 @@ } } }, - "Sensor_CargoScanner_LongRange": { + "Sensor_LongRange_Scanner": { "grades": { "1": { "engineers": [ "Bill Turner", - "Juri Ishmaak", "Lori Jameson", - "Tiana Fortune" + "Tiana Fortune", + "Juri Ishmaak", + "Etienne Dorn" ] }, "2": { "engineers": [ "Bill Turner", - "Juri Ishmaak", "Lori Jameson", - "Tiana Fortune" + "Tiana Fortune", + "Juri Ishmaak", + "Etienne Dorn" ] }, "3": { "engineers": [ "Bill Turner", - "Juri Ishmaak", "Lori Jameson", - "Tiana Fortune" + "Tiana Fortune", + "Juri Ishmaak" ] }, "4": { @@ -1230,27 +1239,32 @@ } } }, - "CargoScanner_Reinforced": { + "Misc_Reinforced": { "grades": { "1": { "engineers": [ "Bill Turner", "Lori Jameson", - "Tiana Fortune" + "Tiana Fortune", + "Juri Ishmaak", + "Etienne Dorn" ] }, "2": { "engineers": [ "Bill Turner", "Lori Jameson", - "Tiana Fortune" + "Tiana Fortune", + "Juri Ishmaak", + "Etienne Dorn" ] }, "3": { "engineers": [ "Bill Turner", "Lori Jameson", - "Tiana Fortune" + "Tiana Fortune", + "Juri Ishmaak" ] }, "4": { @@ -1265,27 +1279,32 @@ } } }, - "CargoScanner_Shielded": { + "Misc_Shielded": { "grades": { "1": { "engineers": [ "Bill Turner", "Lori Jameson", - "Tiana Fortune" + "Tiana Fortune", + "Juri Ishmaak", + "Etienne Dorn" ] }, "2": { "engineers": [ "Bill Turner", "Lori Jameson", - "Tiana Fortune" + "Tiana Fortune", + "Juri Ishmaak", + "Etienne Dorn" ] }, "3": { "engineers": [ "Bill Turner", "Lori Jameson", - "Tiana Fortune" + "Tiana Fortune", + "Juri Ishmaak" ] }, "4": { @@ -1300,30 +1319,32 @@ } } }, - "Sensor_CargoScanner_WideAngle": { + "Sensor_WideAngle_Scanner": { "grades": { "1": { "engineers": [ "Bill Turner", - "Juri Ishmaak", "Lori Jameson", - "Tiana Fortune" + "Tiana Fortune", + "Juri Ishmaak", + "Etienne Dorn" ] }, "2": { "engineers": [ "Bill Turner", - "Juri Ishmaak", "Lori Jameson", - "Tiana Fortune" + "Tiana Fortune", + "Juri Ishmaak", + "Etienne Dorn" ] }, "3": { "engineers": [ "Bill Turner", - "Juri Ishmaak", "Lori Jameson", - "Tiana Fortune" + "Tiana Fortune", + "Juri Ishmaak" ] }, "4": { @@ -1356,7 +1377,7 @@ }, "ec": { "blueprints": { - "ECM_LightWeight": { + "Misc_LightWeight": { "grades": { "1": { "engineers": [ @@ -1385,7 +1406,7 @@ } } }, - "ECM_Reinforced": { + "Misc_Reinforced": { "grades": { "1": { "engineers": [ @@ -1414,7 +1435,7 @@ } } }, - "ECM_Shielded": { + "Misc_Shielded": { "grades": { "1": { "engineers": [ @@ -2396,7 +2417,7 @@ } } }, - "HeatSinkLauncher_LightWeight": { + "Misc_LightWeight": { "grades": { "1": { "engineers": [ @@ -2425,7 +2446,7 @@ } } }, - "HeatSinkLauncher_Reinforced": { + "Misc_Reinforced": { "grades": { "1": { "engineers": [ @@ -2454,7 +2475,7 @@ } } }, - "HeatSinkLauncher_Shielded": { + "Misc_Shielded": { "grades": { "1": { "engineers": [ @@ -2494,30 +2515,32 @@ }, "kw": { "blueprints": { - "Sensor_KillWarrantScanner_FastScan": { + "Sensor_FastScan": { "grades": { "1": { "engineers": [ "Bill Turner", - "Juri Ishmaak", "Lori Jameson", - "Tiana Fortune" + "Tiana Fortune", + "Juri Ishmaak", + "Etienne Dorn" ] }, "2": { "engineers": [ "Bill Turner", - "Juri Ishmaak", "Lori Jameson", - "Tiana Fortune" + "Tiana Fortune", + "Juri Ishmaak", + "Etienne Dorn" ] }, "3": { "engineers": [ "Bill Turner", - "Juri Ishmaak", "Lori Jameson", - "Tiana Fortune" + "Tiana Fortune", + "Juri Ishmaak" ] }, "4": { @@ -2532,27 +2555,32 @@ } } }, - "KillWarrantScanner_LightWeight": { + "Misc_LightWeight": { "grades": { "1": { "engineers": [ "Bill Turner", "Lori Jameson", - "Tiana Fortune" + "Tiana Fortune", + "Juri Ishmaak", + "Etienne Dorn" ] }, "2": { "engineers": [ "Bill Turner", "Lori Jameson", - "Tiana Fortune" + "Tiana Fortune", + "Juri Ishmaak", + "Etienne Dorn" ] }, "3": { "engineers": [ "Bill Turner", "Lori Jameson", - "Tiana Fortune" + "Tiana Fortune", + "Juri Ishmaak" ] }, "4": { @@ -2567,30 +2595,32 @@ } } }, - "KillWarrantScanner_LongRange": { + "Sensor_LongRange_Scanner": { "grades": { "1": { "engineers": [ "Bill Turner", - "Juri Ishmaak", "Lori Jameson", - "Tiana Fortune" + "Tiana Fortune", + "Juri Ishmaak", + "Etienne Dorn" ] }, "2": { "engineers": [ "Bill Turner", - "Juri Ishmaak", "Lori Jameson", - "Tiana Fortune" + "Tiana Fortune", + "Juri Ishmaak", + "Etienne Dorn" ] }, "3": { "engineers": [ "Bill Turner", - "Juri Ishmaak", "Lori Jameson", - "Tiana Fortune" + "Tiana Fortune", + "Juri Ishmaak" ] }, "4": { @@ -2605,27 +2635,32 @@ } } }, - "KillWarrantScanner_Reinforced": { + "Misc_Reinforced": { "grades": { "1": { "engineers": [ "Bill Turner", "Lori Jameson", - "Tiana Fortune" + "Tiana Fortune", + "Juri Ishmaak", + "Etienne Dorn" ] }, "2": { "engineers": [ "Bill Turner", "Lori Jameson", - "Tiana Fortune" + "Tiana Fortune", + "Juri Ishmaak", + "Etienne Dorn" ] }, "3": { "engineers": [ "Bill Turner", "Lori Jameson", - "Tiana Fortune" + "Tiana Fortune", + "Juri Ishmaak" ] }, "4": { @@ -2640,27 +2675,32 @@ } } }, - "KillWarrantScanner_Shielded": { + "Misc_Shielded": { "grades": { "1": { "engineers": [ "Bill Turner", "Lori Jameson", - "Tiana Fortune" + "Tiana Fortune", + "Juri Ishmaak", + "Etienne Dorn" ] }, "2": { "engineers": [ "Bill Turner", "Lori Jameson", - "Tiana Fortune" + "Tiana Fortune", + "Juri Ishmaak", + "Etienne Dorn" ] }, "3": { "engineers": [ "Bill Turner", "Lori Jameson", - "Tiana Fortune" + "Tiana Fortune", + "Juri Ishmaak" ] }, "4": { @@ -2675,30 +2715,32 @@ } } }, - "Sensor_KillWarrantScanner_WideAngle": { + "Sensor_WideAngle_Scanner": { "grades": { "1": { "engineers": [ "Bill Turner", - "Juri Ishmaak", "Lori Jameson", - "Tiana Fortune" + "Tiana Fortune", + "Juri Ishmaak", + "Etienne Dorn" ] }, "2": { "engineers": [ "Bill Turner", - "Juri Ishmaak", "Lori Jameson", - "Tiana Fortune" + "Tiana Fortune", + "Juri Ishmaak", + "Etienne Dorn" ] }, "3": { "engineers": [ "Bill Turner", - "Juri Ishmaak", "Lori Jameson", - "Tiana Fortune" + "Tiana Fortune", + "Juri Ishmaak" ] }, "4": { @@ -4514,7 +4556,7 @@ } } }, - "PointDefence_LightWeight": { + "Misc_LightWeight": { "grades": { "1": { "engineers": [ @@ -4543,7 +4585,7 @@ } } }, - "PointDefence_Reinforced": { + "Misc_Reinforced": { "grades": { "1": { "engineers": [ @@ -4572,7 +4614,7 @@ } } }, - "PointDefence_Shielded": { + "Misc_Shielded": { "grades": { "1": { "engineers": [ @@ -5140,7 +5182,10 @@ "Juri Ishmaak", "Lei Cheung", "Lori Jameson", - "Tiana Fortune" + "Tiana Fortune", + "Felicity Farseer", + "Hera Tani", + "Etienne Dorn" ] }, "2": { @@ -5149,7 +5194,10 @@ "Juri Ishmaak", "Lei Cheung", "Lori Jameson", - "Tiana Fortune" + "Tiana Fortune", + "Felicity Farseer", + "Hera Tani", + "Etienne Dorn" ] }, "3": { @@ -5158,7 +5206,10 @@ "Juri Ishmaak", "Lei Cheung", "Lori Jameson", - "Tiana Fortune" + "Tiana Fortune", + "Felicity Farseer", + "Hera Tani", + "Etienne Dorn" ] }, "4": { @@ -5186,31 +5237,37 @@ "1": { "engineers": [ "Bill Turner", - "Felicity Farseer", "Juri Ishmaak", "Lei Cheung", "Lori Jameson", - "Tiana Fortune" + "Tiana Fortune", + "Felicity Farseer", + "Hera Tani", + "Etienne Dorn" ] }, "2": { "engineers": [ "Bill Turner", - "Felicity Farseer", "Juri Ishmaak", "Lei Cheung", "Lori Jameson", - "Tiana Fortune" + "Tiana Fortune", + "Felicity Farseer", + "Hera Tani", + "Etienne Dorn" ] }, "3": { "engineers": [ "Bill Turner", - "Felicity Farseer", "Juri Ishmaak", "Lei Cheung", "Lori Jameson", - "Tiana Fortune" + "Tiana Fortune", + "Felicity Farseer", + "Hera Tani", + "Etienne Dorn" ] }, "4": { @@ -5225,6 +5282,7 @@ "5": { "engineers": [ "Bill Turner", + "Juri Ishmaak", "Lei Cheung", "Lori Jameson", "Tiana Fortune" @@ -5237,31 +5295,37 @@ "1": { "engineers": [ "Bill Turner", - "Felicity Farseer", "Juri Ishmaak", "Lei Cheung", "Lori Jameson", - "Tiana Fortune" + "Tiana Fortune", + "Felicity Farseer", + "Hera Tani", + "Etienne Dorn" ] }, "2": { "engineers": [ "Bill Turner", - "Felicity Farseer", "Juri Ishmaak", "Lei Cheung", "Lori Jameson", - "Tiana Fortune" + "Tiana Fortune", + "Felicity Farseer", + "Hera Tani", + "Etienne Dorn" ] }, "3": { "engineers": [ "Bill Turner", - "Felicity Farseer", "Juri Ishmaak", "Lei Cheung", "Lori Jameson", - "Tiana Fortune" + "Tiana Fortune", + "Felicity Farseer", + "Hera Tani", + "Etienne Dorn" ] }, "4": { @@ -5276,6 +5340,7 @@ "5": { "engineers": [ "Bill Turner", + "Juri Ishmaak", "Lei Cheung", "Lori Jameson", "Tiana Fortune" @@ -6301,30 +6366,32 @@ }, "ws": { "blueprints": { - "Sensor_WakeScanner_FastScan": { + "Sensor_FastScan": { "grades": { "1": { "engineers": [ "Bill Turner", - "Juri Ishmaak", "Lori Jameson", - "Tiana Fortune" + "Tiana Fortune", + "Juri Ishmaak", + "Etienne Dorn" ] }, "2": { "engineers": [ "Bill Turner", - "Juri Ishmaak", "Lori Jameson", - "Tiana Fortune" + "Tiana Fortune", + "Juri Ishmaak", + "Etienne Dorn" ] }, "3": { "engineers": [ "Bill Turner", - "Juri Ishmaak", "Lori Jameson", - "Tiana Fortune" + "Tiana Fortune", + "Juri Ishmaak" ] }, "4": { @@ -6339,27 +6406,32 @@ } } }, - "WakeScanner_LightWeight": { + "Misc_LightWeight": { "grades": { "1": { "engineers": [ "Bill Turner", "Lori Jameson", - "Tiana Fortune" + "Tiana Fortune", + "Juri Ishmaak", + "Etienne Dorn" ] }, "2": { "engineers": [ "Bill Turner", "Lori Jameson", - "Tiana Fortune" + "Tiana Fortune", + "Juri Ishmaak", + "Etienne Dorn" ] }, "3": { "engineers": [ "Bill Turner", "Lori Jameson", - "Tiana Fortune" + "Tiana Fortune", + "Juri Ishmaak" ] }, "4": { @@ -6374,30 +6446,32 @@ } } }, - "Sensor_WakeScanner_LongRange": { + "Sensor_LongRange_Scanner": { "grades": { "1": { "engineers": [ "Bill Turner", - "Juri Ishmaak", "Lori Jameson", - "Tiana Fortune" + "Tiana Fortune", + "Juri Ishmaak", + "Etienne Dorn" ] }, "2": { "engineers": [ "Bill Turner", - "Juri Ishmaak", "Lori Jameson", - "Tiana Fortune" + "Tiana Fortune", + "Juri Ishmaak", + "Etienne Dorn" ] }, "3": { "engineers": [ "Bill Turner", - "Juri Ishmaak", "Lori Jameson", - "Tiana Fortune" + "Tiana Fortune", + "Juri Ishmaak" ] }, "4": { @@ -6412,27 +6486,32 @@ } } }, - "WakeScanner_Reinforced": { + "Misc_Reinforced": { "grades": { "1": { "engineers": [ "Bill Turner", "Lori Jameson", - "Tiana Fortune" + "Tiana Fortune", + "Juri Ishmaak", + "Etienne Dorn" ] }, "2": { "engineers": [ "Bill Turner", "Lori Jameson", - "Tiana Fortune" + "Tiana Fortune", + "Juri Ishmaak", + "Etienne Dorn" ] }, "3": { "engineers": [ "Bill Turner", "Lori Jameson", - "Tiana Fortune" + "Tiana Fortune", + "Juri Ishmaak" ] }, "4": { @@ -6447,27 +6526,32 @@ } } }, - "WakeScanner_Shielded": { + "Misc_Shielded": { "grades": { "1": { "engineers": [ "Bill Turner", "Lori Jameson", - "Tiana Fortune" + "Tiana Fortune", + "Juri Ishmaak", + "Etienne Dorn" ] }, "2": { "engineers": [ "Bill Turner", "Lori Jameson", - "Tiana Fortune" + "Tiana Fortune", + "Juri Ishmaak", + "Etienne Dorn" ] }, "3": { "engineers": [ "Bill Turner", "Lori Jameson", - "Tiana Fortune" + "Tiana Fortune", + "Juri Ishmaak" ] }, "4": { @@ -6482,30 +6566,32 @@ } } }, - "Sensor_WakeScanner_WideAngle": { + "Sensor_WideAngle_Scanner": { "grades": { "1": { "engineers": [ "Bill Turner", - "Juri Ishmaak", "Lori Jameson", - "Tiana Fortune" + "Tiana Fortune", + "Juri Ishmaak", + "Etienne Dorn" ] }, "2": { "engineers": [ "Bill Turner", - "Juri Ishmaak", "Lori Jameson", - "Tiana Fortune" + "Tiana Fortune", + "Juri Ishmaak", + "Etienne Dorn" ] }, "3": { "engineers": [ "Bill Turner", - "Juri Ishmaak", "Lori Jameson", - "Tiana Fortune" + "Tiana Fortune", + "Juri Ishmaak" ] }, "4": { From 9c721f2dac6d53e2fb4a9de7a9eccaca7c2ad57e Mon Sep 17 00:00:00 2001 From: Felix Linker Date: Wed, 14 Aug 2019 00:55:02 +0200 Subject: [PATCH 23/32] Fix optmass for dirty drives --- modifications/blueprints.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/modifications/blueprints.json b/modifications/blueprints.json index 33859ae..12e2ad6 100644 --- a/modifications/blueprints.json +++ b/modifications/blueprints.json @@ -1405,8 +1405,8 @@ -0.03 ], "optmass": [ - -0.03, - -0.03 + -0.025, + -0.025 ], "optmul": [ 0, @@ -1464,7 +1464,7 @@ -0.09 ], "optmass": [ - -0.08, + -0.075, -0.075 ], "optmul": [ @@ -1524,8 +1524,8 @@ -0.15 ], "optmass": [ - -0.13, - -0.13 + -0.125, + -0.125 ], "optmul": [ 0.33, From d5b10d51060ab90b32ee5476f48a938b8fdf3abf Mon Sep 17 00:00:00 2001 From: Felix Linker Date: Wed, 14 Aug 2019 01:31:06 +0200 Subject: [PATCH 24/32] Fix negative effects of resistance mods for shield boosters --- modifications/blueprints.json | 96 +++++++++++++++++------------------ 1 file changed, 48 insertions(+), 48 deletions(-) diff --git a/modifications/blueprints.json b/modifications/blueprints.json index 12e2ad6..309354b 100644 --- a/modifications/blueprints.json +++ b/modifications/blueprints.json @@ -6571,12 +6571,12 @@ 0.12 ], "kinres": [ - -0.02, - -0.02 + -0.0175, + -0.0175 ], "thermres": [ - -0.02, - -0.02 + -0.0175, + -0.0175 ] }, "uuid": "3dd5f8fb-8399-4c4c-96d7-87c3840cfdeb" @@ -6593,12 +6593,12 @@ 0.17 ], "kinres": [ - -0.03, - -0.03 + -0.025, + -0.025 ], "thermres": [ - -0.03, - -0.03 + -0.025, + -0.025 ] }, "uuid": "640409d8-6cb5-4624-b2b6-f435c9d8453b" @@ -6615,12 +6615,12 @@ 0.22 ], "kinres": [ - -0.04, - -0.04 + -0.0325, + -0.0325 ], "thermres": [ - -0.04, - -0.04 + -0.0325, + -0.0325 ] }, "uuid": "8a311709-54f6-4a5f-a1cc-94c109d947df" @@ -6637,12 +6637,12 @@ 0.27 ], "kinres": [ - -0.05, - -0.05 + -0.04, + -0.04 ], "thermres": [ - -0.05, - -0.05 + -0.04, + -0.04 ] }, "uuid": "4f120562-e421-4ed8-b0ed-0be8e27548bb" @@ -6821,16 +6821,16 @@ }, "features": { "explres": [ - -0.02, - -0.02 + -0.0175, + -0.0175 ], "kinres": [ 0.07, 0.12 ], "thermres": [ - -0.02, - -0.02 + -0.0175, + -0.0175 ] }, "uuid": "5f099a0e-0c37-447b-b552-f2e3d8dc1d19" @@ -6843,16 +6843,16 @@ }, "features": { "explres": [ - -0.03, - -0.03 + -0.025, + -0.025 ], "kinres": [ 0.12, 0.17 ], "thermres": [ - -0.03, - -0.03 + -0.025, + -0.025 ] }, "uuid": "ab7f39b5-0b0e-45b2-a016-0916026e9633" @@ -6865,16 +6865,16 @@ }, "features": { "explres": [ - -0.04, - -0.04 + -0.0325, + -0.0325 ], "kinres": [ 0.17, 0.22 ], "thermres": [ - -0.04, - -0.04 + -0.0325, + -0.0325 ] }, "uuid": "59ddbb49-f4fc-466d-84b6-06f0529915a9" @@ -6887,16 +6887,16 @@ }, "features": { "explres": [ - -0.05, - -0.05 + -0.04, + -0.04 ], "kinres": [ 0.22, 0.27 ], "thermres": [ - -0.05, - -0.05 + -0.04, + -0.04 ] }, "uuid": "a224e524-7308-46a1-9a6b-a37a82bdc50b" @@ -7095,12 +7095,12 @@ }, "features": { "explres": [ - -0.02, - -0.02 + -0.0175, + -0.0175 ], "kinres": [ - -0.02, - -0.02 + -0.0175, + -0.0175 ], "thermres": [ 0.07, @@ -7117,12 +7117,12 @@ }, "features": { "explres": [ - -0.03, - -0.03 + -0.025, + -0.025 ], "kinres": [ - -0.03, - -0.03 + -0.025, + -0.025 ], "thermres": [ 0.12, @@ -7139,12 +7139,12 @@ }, "features": { "explres": [ - -0.04, - -0.04 + -0.0325, + -0.0325 ], "kinres": [ - -0.04, - -0.04 + -0.0325, + -0.0325 ], "thermres": [ 0.17, @@ -7161,12 +7161,12 @@ }, "features": { "explres": [ - -0.05, - -0.05 + -0.04, + -0.04 ], "kinres": [ - -0.05, - -0.05 + -0.04, + -0.04 ], "thermres": [ 0.22, From 3f630c0b0190129e4884ace2d8717522866746ab Mon Sep 17 00:00:00 2001 From: Felix Linker Date: Sun, 25 Aug 2019 14:05:08 +0200 Subject: [PATCH 25/32] Mention where to post issues --- README.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/README.md b/README.md index 7c3803f..1974f49 100755 --- 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/. From 98246a6aff2593858bc840cdfc8fb31be1ac4300 Mon Sep 17 00:00:00 2001 From: Felix Linker Date: Sun, 25 Aug 2019 14:56:33 +0200 Subject: [PATCH 26/32] Fix seekers/dumbfires being able to be modded with penetrator payload/drag munitios Closes https://github.com/EDCD/coriolis/issues/526 --- modifications/modules.json | 2 -- 1 file changed, 2 deletions(-) diff --git a/modifications/modules.json b/modifications/modules.json index 634559b..f113140 100644 --- a/modifications/modules.json +++ b/modifications/modules.json @@ -3325,7 +3325,6 @@ "special_drag_munitions", "special_emissive_munitions", "special_overload_munitions", - "special_penetrator_payload", "special_thermal_cascade", "special_weapon_damage", "special_weapon_efficient", @@ -3334,7 +3333,6 @@ "special_weapon_lightweight" ], "specials_D": [ - "special_drag_munitions", "special_emissive_munitions", "special_fsd_interrupt", "special_overload_munitions", From 00777b8a7d6543372f4d6ea2b0d097ddb629f623 Mon Sep 17 00:00:00 2001 From: felixlinker Date: Fri, 13 Sep 2019 18:10:57 +0200 Subject: [PATCH 27/32] Move uglify-js from dev-deps into deps --- package.json | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index d1d1c94..1030d31 100644 --- 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" } } From 4ade6e35fbdbb171db35707031db5f951ee6a5cd Mon Sep 17 00:00:00 2001 From: felixlinker Date: Fri, 13 Sep 2019 18:18:25 +0200 Subject: [PATCH 28/32] Fix medium gimballed shock cannon power draw Closes https://github.com/EDCD/coriolis/issues/544 --- modules/hardpoints/shock_cannon.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/hardpoints/shock_cannon.json b/modules/hardpoints/shock_cannon.json index 5d7d9ea..b03288a 100644 --- a/modules/hardpoints/shock_cannon.json +++ b/modules/hardpoints/shock_cannon.json @@ -116,7 +116,7 @@ "integrity": 51, "mount": "G", "piercing": 40, - "power": 0.89, + "power": 0.61, "range": 3000, "reload": 6, "shotspeed": 1200, From 705f9a39e79020aa58e2471e9b5979cae7dd4700 Mon Sep 17 00:00:00 2001 From: felixlinker Date: Fri, 13 Sep 2019 18:25:16 +0200 Subject: [PATCH 29/32] Fix Krait Phantom Bulkead Masses Closes https://github.com/EDCD/coriolis/issues/530 --- ships/krait_phantom.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ships/krait_phantom.json b/ships/krait_phantom.json index 1dca44f..ce77b20 100644 --- 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, From dfd143aef0418f0d7511b1c4e013186deb0f8085 Mon Sep 17 00:00:00 2001 From: felixlinker Date: Fri, 13 Sep 2019 18:30:27 +0200 Subject: [PATCH 30/32] Fix krait MkII stock shield generator Closes https://github.com/EDCD/coriolis/issues/527 --- ships/krait_mkii.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ships/krait_mkii.json b/ships/krait_mkii.json index dd1ab9d..68a2d81 100644 --- a/ships/krait_mkii.json +++ b/ships/krait_mkii.json @@ -146,7 +146,7 @@ 0 ], "internal": [ - "4h", + "4j", "04", "04", "03", From 3f539d9c7b94631b374308d2758b1f47fe920e06 Mon Sep 17 00:00:00 2001 From: Felix Linker Date: Sun, 8 Sep 2019 15:15:58 +0200 Subject: [PATCH 31/32] Super penetrators increase reload time by 50% Closes https://github.com/EDCD/coriolis/issues/450 --- modifications/modifierActions.json | 1 + 1 file changed, 1 insertion(+) diff --git a/modifications/modifierActions.json b/modifications/modifierActions.json index 6e890b5..a4551fd 100644 --- a/modifications/modifierActions.json +++ b/modifications/modifierActions.json @@ -174,6 +174,7 @@ "thermload": -0.4 }, "special_super_penetrator_cooled": { + "reload": 0.5, "thermload": -0.4 }, "special_concordant_sequence": { From a496825548807b5f41ed1ecd6d4fde6770b81aa1 Mon Sep 17 00:00:00 2001 From: Felix Linker Date: Fri, 13 Sep 2019 22:31:36 +0200 Subject: [PATCH 32/32] Fix damage reduction for plasma acc with plasma slug Closes https://github.com/EDCD/coriolis/issues/450 --- modifications/modifierActions.json | 3 +++ modifications/modules.json | 2 +- modifications/specials.json | 5 +++++ 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/modifications/modifierActions.json b/modifications/modifierActions.json index a4551fd..a03a83a 100644 --- a/modifications/modifierActions.json +++ b/modifications/modifierActions.json @@ -187,6 +187,9 @@ "damage": -0.1, "thermload": -0.4 }, + "special_plasma_slug_pa": { + "damage": -0.1 + }, "special_dispersal_field": { }, "special_distortion_field": {}, diff --git a/modifications/modules.json b/modifications/modules.json index f113140..8744de6 100644 --- a/modifications/modules.json +++ b/modifications/modules.json @@ -3853,7 +3853,7 @@ "special_dispersal_field", "special_phasing_sequence", "special_plasma_slug", - "special_plasma_slug_cooled", + "special_plasma_slug_pa", "special_lock_breaker", "special_thermal_conduit", "special_weapon_damage", diff --git a/modifications/specials.json b/modifications/specials.json index bd824b1..827ae39 100644 --- 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,