From 0d1d04d6b86b1c335552073d913309cb7660eb6d Mon Sep 17 00:00:00 2001 From: CMDR Cometborne Date: Sat, 21 Jul 2018 17:44:17 +0200 Subject: [PATCH] Guardian Module Fixes - eliminate duplicate internal IDs to make Guardian PD Size 4 and Guardian MRP 2E available - fix Frontier ID ('edID') for all guardian modules - fix prices for all guardian modules - add missing Frontier internal names ('symbol') --- modules/hardpoints/guardian_gauss_cannon.json | 4 +- .../hardpoints/guardian_plasma_charger.json | 10 ++--- modules/hardpoints/guardian_shard_cannon.json | 6 ++- modules/internal/guardian_fsd_booster.json | 27 +++++++----- .../guardian_hull_reinforcement_package.json | 42 +++++++++--------- ...guardian_module_reinforcement_package.json | 42 +++++++++--------- ...guardian_shield_reinforcement_package.json | 44 ++++++++++++------- modules/standard/power_distributor.json | 34 +++++++------- modules/standard/power_plant.json | 16 +++---- 9 files changed, 122 insertions(+), 103 deletions(-) diff --git a/modules/hardpoints/guardian_gauss_cannon.json b/modules/hardpoints/guardian_gauss_cannon.json index c16a211..0b7ebc6 100644 --- a/modules/hardpoints/guardian_gauss_cannon.json +++ b/modules/hardpoints/guardian_gauss_cannon.json @@ -9,7 +9,7 @@ "burstrof": 0.83, "class": 2, "clip": 1, - "cost": 0, + "cost": 543801, "damage": 70, "damagedist": { "T": 1 @@ -36,4 +36,4 @@ } } ] -} \ No newline at end of file +} diff --git a/modules/hardpoints/guardian_plasma_charger.json b/modules/hardpoints/guardian_plasma_charger.json index 640f4ed..18c56ae 100644 --- a/modules/hardpoints/guardian_plasma_charger.json +++ b/modules/hardpoints/guardian_plasma_charger.json @@ -7,13 +7,13 @@ "breachmin": 0.5, "class": 2, "clip": 15, - "cost": 3051200, + "cost": 567761, "damage": 5, "damagedist": { "A": 1 }, "distdraw": 13.6, - "edID": 128049466, + "edID": 128833998, "eddbID": 874, "falloff": 1000, "grp": "gpc", @@ -38,13 +38,13 @@ "breachmin": 0.5, "class": 2, "clip": 15, - "cost": 3051200, + "cost": 1659200, "damage": 4, "damagedist": { "A": 1 }, "distdraw": 13.6, - "edID": 128049466, + "edID": 128833999, "eddbID": 874, "falloff": 1000, "grp": "gpc", @@ -63,4 +63,4 @@ "symbol": "Hpt_Guardian_PlasmaLauncher_Turret_Medium" } ] -} \ No newline at end of file +} diff --git a/modules/hardpoints/guardian_shard_cannon.json b/modules/hardpoints/guardian_shard_cannon.json index 4c93e60..540a7b8 100644 --- a/modules/hardpoints/guardian_shard_cannon.json +++ b/modules/hardpoints/guardian_shard_cannon.json @@ -8,7 +8,7 @@ "eddbID": 0, "edID": 128834000, "mount": "F", - "cost": 537628, + "cost": 507761, "mass": 4, "integrity": 42, "power": 1.21, @@ -27,6 +27,7 @@ "breachmin": 0.6, "breachmax": 0.8, "jitter": 5, + "symbol": "Hpt_Guardian_ShardCannon_Fixed_Medium", "damagedist": { "T": 1 }, @@ -40,7 +41,7 @@ "eddbID": 0, "edID": 128834778, "mount": "F", - "cost": 1547312, + "cost": 1461350, "mass": 8, "integrity": 51, "power": 1.68, @@ -59,6 +60,7 @@ "breachmin": 0.6, "breachmax": 0.8, "jitter": 5, + "symbol": "Hpt_Guardian_ShardCannon_Fixed_Large", "damagedist": { "T": 1 }, diff --git a/modules/internal/guardian_fsd_booster.json b/modules/internal/guardian_fsd_booster.json index 8bf4614..62d4b5a 100644 --- a/modules/internal/guardian_fsd_booster.json +++ b/modules/internal/guardian_fsd_booster.json @@ -2,9 +2,10 @@ "gfsb": [ { "jumpboost": 4, + "integrity": 32, "class": 1, - "cost": 10000, - "edID": 128668537, + "cost": 405022, + "edID": 128833975, "power": 0.75, "eddbID": 1373, "grp": "gfsb", @@ -15,9 +16,10 @@ }, { "jumpboost": 6, + "integrity": 32, "class": 2, - "cost": 10000, - "edID": 128668537, + "cost": 810521, + "edID": 128833976, "power": 0.98, "eddbID": 1373, "grp": "gfsb", @@ -28,9 +30,10 @@ }, { "jumpboost": 7.75, + "integrity": 32, "class": 3, - "cost": 10000, - "edID": 128668537, + "cost": 1620431, + "edID": 128833977, "power": 1.27, "eddbID": 1373, "grp": "gfsb", @@ -41,9 +44,10 @@ }, { "jumpboost": 9.25, + "integrity": 32, "class": 4, - "cost": 10000, - "edID": 128668537, + "cost": 3245013, + "edID": 128833978, "power": 1.65, "eddbID": 1373, "grp": "gfsb", @@ -54,9 +58,10 @@ }, { "jumpboost": 10.5, + "integrity": 32, "class": 5, - "cost": 10000, - "edID": 128668537, + "cost": 6483101, + "edID": 128833979, "power": 2.14, "eddbID": 1373, "grp": "gfsb", @@ -66,4 +71,4 @@ "symbol": "Int_GuardianFSDBooster_Size5" } ] -} \ No newline at end of file +} diff --git a/modules/internal/guardian_hull_reinforcement_package.json b/modules/internal/guardian_hull_reinforcement_package.json index a172f5e..7f5fd60 100644 --- a/modules/internal/guardian_hull_reinforcement_package.json +++ b/modules/internal/guardian_hull_reinforcement_package.json @@ -10,8 +10,8 @@ "power": 0.56, "hullreinforcement": 138, "thermres": 0.02, - "cost": 31765, - "symbol": "Int_GuardianHullReinforcement_class1_Class2", + "cost": 30000, + "symbol": "Int_GuardianHullReinforcement_Size1_Class2", "grp": "ghrp" }, { @@ -24,8 +24,8 @@ "power": 0.45, "hullreinforcement": 100, "thermres": 0.02, - "cost": 10588, - "symbol": "Int_GuardianHullReinforcement_class1_Class1", + "cost": 10000, + "symbol": "Int_GuardianHullReinforcement_Size1_Class1", "grp": "ghrp" }, { @@ -38,8 +38,8 @@ "power": 0.79, "hullreinforcement": 238, "thermres": 0.02, - "cost": 76235, - "symbol": "Int_GuardianHullReinforcement_class2_Class2", + "cost": 72000, + "symbol": "Int_GuardianHullReinforcement_Size2_Class2", "grp": "ghrp" }, { @@ -52,8 +52,8 @@ "power": 0.68, "hullreinforcement": 188, "thermres": 0.02, - "cost": 25412, - "symbol": "Int_GuardianHullReinforcement_class2_Class1", + "cost": 24000, + "symbol": "Int_GuardianHullReinforcement_Size2_Class1", "grp": "ghrp" }, { @@ -61,12 +61,13 @@ "class": "3", "mass": 4, "id": "1Z", - "edID": 128833948, + "edID": 128833950, "eddbID": 0, "power": 1.01, "hullreinforcement": 325, "thermres": 0.02, - "cost": 182965, + "cost": 172800, + "symbol": "Int_GuardianHullReinforcement_Size3_Class2", "grp": "ghrp" }, { @@ -79,8 +80,8 @@ "power": 0.9, "hullreinforcement": 288, "thermres": 0.02, - "cost": 60988, - "symbol": "Int_GuardianHullReinforcement_class3_Class1", + "cost": 57600, + "symbol": "Int_GuardianHullReinforcement_Size3_Class1", "grp": "ghrp" }, { @@ -92,9 +93,9 @@ "power": 1.24, "hullreinforcement": 413, "thermres": 0.02, - "cost": 439116, + "cost": 414720, "id": "2R", - "symbol": "Int_GuardianHullReinforcement_class4_Class2", + "symbol": "Int_GuardianHullReinforcement_Size4_Class2", "grp": "ghrp" }, { @@ -106,23 +107,23 @@ "power": 1.13, "hullreinforcement": 375, "thermres": 0.02, - "cost": 146372, + "cost": 138240, "id": "2B", - "symbol": "Int_GuardianHullReinforcement_class4_Class1", + "symbol": "Int_GuardianHullReinforcement_Size4_Class1", "grp": "ghrp" }, { "rating": "D", "class": "5", "mass": 16, - "edID": 128833953, + "edID": 128833954, "eddbID": 0, "power": 1.46, "hullreinforcement": 488, "thermres": 0.02, - "cost": 1053879, + "cost": 995330, "id": "2C", - "symbol": "Int_GuardianHullReinforcement_class5_Class1", + "symbol": "Int_GuardianHullReinforcement_Size5_Class2", "grp": "ghrp" }, { @@ -134,8 +135,9 @@ "power": 1.35, "hullreinforcement": 450, "thermres": 0.02, - "cost": 351294, + "cost": 331778, "id": "2D", + "symbol": "Int_GuardianHullReinforcement_Size5_Class1", "grp": "ghrp" } ] diff --git a/modules/internal/guardian_module_reinforcement_package.json b/modules/internal/guardian_module_reinforcement_package.json index b553a3a..53137e3 100644 --- a/modules/internal/guardian_module_reinforcement_package.json +++ b/modules/internal/guardian_module_reinforcement_package.json @@ -8,10 +8,10 @@ "power": 0.34, "protection": 0.6, "integrity": 77, - "cost": 3176471, + "cost": 30000, "id": "2E", "edID": 128833956, - "symbol": "Int_GuardianModuleReinforcement_class1_Class2", + "symbol": "Int_GuardianModuleReinforcement_Size1_Class2", "grp": "gmrp" }, { @@ -22,10 +22,10 @@ "power": 0.27, "protection": 0.3, "integrity": 85, - "cost": 1058824, + "cost": 10000, "id": "2F", "edID": 128833955, - "symbol": "Int_GuardianModuleReinforcement_class1_Class1", + "symbol": "Int_GuardianModuleReinforcement_Size1_Class1", "grp": "gmrp" }, { @@ -36,10 +36,10 @@ "power": 0.47, "protection": 0.6, "integrity": 116, - "cost": 7623529, + "cost": 72000, "id": "2G", "edID": 128833958, - "symbol": "Int_GuardianModuleReinforcement_class2_Class2", + "symbol": "Int_GuardianModuleReinforcement_Size2_Class2", "grp": "gmrp" }, { @@ -50,10 +50,10 @@ "power": 0.41, "protection": 0.3, "integrity": 127, - "cost": 2541176, - "id": "2G", + "cost": 24000, + "id": "2S", "edID": 128833957, - "symbol": "Int_GuardianModuleReinforcement_class2_Class1", + "symbol": "Int_GuardianModuleReinforcement_Size2_Class1", "grp": "gmrp" }, { @@ -64,10 +64,10 @@ "power": 0.61, "protection": 0.6, "integrity": 171, - "cost": 18296471, + "cost": 172800, "id": "2H", "edID": 128833960, - "symbol": "Int_GuardianModuleReinforcement_class3_Class2", + "symbol": "Int_GuardianModuleReinforcement_Size3_Class2", "grp": "gmrp" }, { @@ -78,10 +78,10 @@ "power": 0.54, "protection": 0.3, "integrity": 187, - "cost": 6098824, + "cost": 57600, "id": "2I", "edID": 128833959, - "symbol": "Int_GuardianModuleReinforcement_class3_Class1", + "symbol": "Int_GuardianModuleReinforcement_Size3_Class1", "grp": "gmrp" }, { @@ -92,10 +92,10 @@ "power": 0.74, "protection": 0.6, "integrity": 259, - "cost": 43911554, + "cost": 414720, "id": "2J", "edID": 128833962, - "symbol": "Int_GuardianModuleReinforcement_class4_Class2", + "symbol": "Int_GuardianModuleReinforcement_Size4_Class2", "grp": "gmrp" }, { @@ -106,10 +106,10 @@ "power": 0.68, "protection": 0.3, "integrity": 286, - "cost": 14637225, + "cost": 138240, "id": "2K", "edID": 128833961, - "symbol": "Int_GuardianModuleReinforcement_class4_Class1", + "symbol": "Int_GuardianModuleReinforcement_Size4_Class1", "grp": "gmrp" }, { @@ -120,10 +120,10 @@ "power": 0.88, "protection": 0.6, "integrity": 385, - "cost": 105387873, + "cost": 995330, "id": "2L", "edID": 128833964, - "symbol": "Int_GuardianModuleReinforcement_class5_Class2", + "symbol": "Int_GuardianModuleReinforcement_Size5_Class2", "grp": "gmrp" }, { @@ -134,10 +134,10 @@ "power": 0.81, "protection": 0.3, "integrity": 424, - "cost": 35129412, + "cost": 331778, "id": "2M", "edID": 128833963, - "symbol": "Int_GuardianModuleReinforcement_class5_Class1", + "symbol": "Int_GuardianModuleReinforcement_Size5_Class1", "grp": "gmrp" } ] diff --git a/modules/internal/guardian_shield_reinforcement_package.json b/modules/internal/guardian_shield_reinforcement_package.json index 20cec9a..2297765 100644 --- a/modules/internal/guardian_shield_reinforcement_package.json +++ b/modules/internal/guardian_shield_reinforcement_package.json @@ -2,9 +2,10 @@ "gsrp": [ { "shieldaddition": 44, + "integrity": 36, "class": 1, "cost": 10000, - "edID": 128668537, + "edID": 128833965, "power": 0.35, "eddbID": 1373, "grp": "gsrp", @@ -15,9 +16,10 @@ }, { "shieldaddition": 61, + "integrity": 36, "class": 1, - "cost": 24000, - "edID": 128668537, + "cost": 30000, + "edID": 128833966, "power": 0.46, "eddbID": 1373, "grp": "gsrp", @@ -28,9 +30,10 @@ }, { "shieldaddition": 83, + "integrity": 36, "class": 2, "cost": 24000, - "edID": 128668537, + "edID": 128833967, "power": 0.56, "eddbID": 1373, "grp": "gsrp", @@ -41,9 +44,10 @@ }, { "shieldaddition": 105, + "integrity": 36, "class": 2, - "cost": 72621, - "edID": 128668537, + "cost": 72000, + "edID": 128833968, "power": 0.67, "eddbID": 1373, "grp": "gsrp", @@ -54,9 +58,10 @@ }, { "shieldaddition": 143, + "integrity": 36, "class": 3, - "cost": 174290, - "edID": 128668537, + "cost": 172800, + "edID": 128833970, "power": 0.84, "eddbID": 1373, "grp": "gsrp", @@ -67,9 +72,10 @@ }, { "shieldaddition": 127, + "integrity": 36, "class": 3, "cost": 57600, - "edID": 128668537, + "edID": 128833969, "power": 0.74, "eddbID": 1373, "grp": "gsrp", @@ -80,9 +86,10 @@ }, { "shieldaddition": 165, + "integrity": 36, "class": 4, "cost": 138240, - "edID": 128668537, + "edID": 128833971, "power": 0.95, "eddbID": 1373, "grp": "gsrp", @@ -93,10 +100,11 @@ }, { "shieldaddition": 182, + "integrity": 36, "class": 4, - "cost": 418295, - "edID": 128668537, - "power": 0.95, + "cost": 414720, + "edID": 128833972, + "power": 1.05, "eddbID": 1373, "grp": "gsrp", "id": "1J", @@ -106,9 +114,10 @@ }, { "shieldaddition": 215, + "integrity": 36, "class": 5, - "cost": 1003910, - "edID": 128668537, + "cost": 995330, + "edID": 128833974, "power": 1.26, "eddbID": 1373, "grp": "gsrp", @@ -119,9 +128,10 @@ }, { "shieldaddition": 198, + "integrity": 36, "class": 5, "cost": 331778, - "edID": 128668537, + "edID": 128833973, "power": 1.16, "eddbID": 1373, "grp": "gsrp", @@ -131,4 +141,4 @@ "symbol": "Int_GuardianShieldReinforcement_Size5_Class1" } ] -} \ No newline at end of file +} diff --git a/modules/standard/power_distributor.json b/modules/standard/power_distributor.json index f8b2662..4724b01 100644 --- a/modules/standard/power_distributor.json +++ b/modules/standard/power_distributor.json @@ -762,8 +762,8 @@ }, { "class": 1, - "cost": 20200, - "edID": 128064182, + "cost": 40957, + "edID": 128833980, "eddbID": 1040, "engcap": 9, "engrate": 0.8, @@ -782,8 +782,8 @@ }, { "class": 2, - "cost": 20200, - "edID": 128064182, + "cost": 111600, + "edID": 128833981, "eddbID": 1040, "engcap": 9, "engrate": 0.8, @@ -802,8 +802,8 @@ }, { "class": 3, - "cost": 20200, - "edID": 128064182, + "cost": 311365, + "edID": 128833982, "eddbID": 1040, "engcap": 14, "engrate": 1.7, @@ -822,8 +822,8 @@ }, { "class": 4, - "cost": 20200, - "edID": 128064182, + "cost": 868708, + "edID": 128833983, "eddbID": 1040, "engcap": 17, "engrate": 2.5, @@ -842,13 +842,13 @@ }, { "class": 5, - "cost": 20200, - "edID": 128064182, + "cost": 2423690, + "edID": 128833984, "eddbID": 1040, "engcap": 22, "engrate": 3.3, "grp": "pd", - "id": "1A", + "id": "1E", "integrity": 56, "mass": 21, "power": 0.96, @@ -862,8 +862,8 @@ }, { "class": 6, - "cost": 20200, - "edID": 128064182, + "cost": 6762091, + "edID": 128833985, "eddbID": 1040, "engcap": 26, "engrate": 4.2, @@ -882,8 +882,8 @@ }, { "class": 7, - "cost": 20200, - "edID": 128064182, + "cost": 18866235, + "edID": 128833986, "eddbID": 1040, "engcap": 31, "engrate": 5.2, @@ -902,8 +902,8 @@ }, { "class": 8, - "cost": 20200, - "edID": 128064182, + "cost": 52636793, + "edID": 128833987, "eddbID": 1040, "engcap": 36, "engrate": 6.2, diff --git a/modules/standard/power_plant.json b/modules/standard/power_plant.json index 0fa2fdc..b49eec1 100644 --- a/modules/standard/power_plant.json +++ b/modules/standard/power_plant.json @@ -492,7 +492,7 @@ }, { "class": 2, - "cost": 187360, + "cost": 192165, "edID": 128833988, "eddbID": 895, "eff": 0.5, @@ -507,7 +507,7 @@ }, { "class": 3, - "cost": 468401, + "cost": 576493, "edID": 128833989, "eddbID": 895, "eff": 0.5, @@ -522,7 +522,7 @@ }, { "class": 4, - "cost": 1686243, + "cost": 1729480, "edID": 128833990, "eddbID": 895, "eff": 0.5, @@ -537,7 +537,7 @@ }, { "class": 5, - "cost": 5058729, + "cost": 5188441, "edID": 128833991, "eddbID": 895, "eff": 0.5, @@ -552,7 +552,7 @@ }, { "class": 6, - "cost": 15176184, + "cost": 15565317, "edID": 128833992, "eddbID": 895, "eff": 0.5, @@ -567,7 +567,7 @@ }, { "class": 7, - "cost": 45528551, + "cost": 46695951, "edID": 128833993, "eddbID": 895, "eff": 0.5, @@ -582,7 +582,7 @@ }, { "class": 8, - "cost": 136585652, + "cost": 140087850, "edID": 128833994, "eddbID": 895, "eff": 0.5, @@ -596,4 +596,4 @@ "symbol": "Int_GuardianPowerplant_Size8" } ] -} \ No newline at end of file +}