From cac792b7f4f23134aa304ee636375c6a755ca897 Mon Sep 17 00:00:00 2001 From: David Sangrey Date: Thu, 19 Dec 2024 22:56:45 -0500 Subject: [PATCH] [Minor] Add Mandalay, Update Coriolis Modules --- coriolis-update-files.py | 4 -- edmc_data.py | 3 + modules.json | 121 +++++++++++++++++++++++++++++++++++++++ ships.json | 8 +++ 4 files changed, 132 insertions(+), 4 deletions(-) diff --git a/coriolis-update-files.py b/coriolis-update-files.py index 6dfcc0c97..729d2ef6c 100755 --- a/coriolis-update-files.py +++ b/coriolis-update-files.py @@ -87,10 +87,6 @@ def add(modules, name, attributes) -> None: add(modules, 'int_stellarbodydiscoveryscanner_intermediate', {'mass': 2}) add(modules, 'int_stellarbodydiscoveryscanner_advanced', {'mass': 2}) - # Missing - add(modules, 'hpt_multicannon_fixed_small_advanced', {'mass': 2}) - add(modules, 'hpt_multicannon_fixed_medium_advanced', {'mass': 4}) - modules = {k: modules[k] for k in sorted(modules)} with open("modules.json", "w") as modules_file: json.dump(modules, modules_file, indent=4) diff --git a/edmc_data.py b/edmc_data.py index 7286305e2..c52cdd4d5 100644 --- a/edmc_data.py +++ b/edmc_data.py @@ -213,7 +213,9 @@ 'hpt_mininglaser_turret_small': 'D', 'hpt_mininglaser_turret_medium': 'D', 'hpt_multicannon_fixed_small': 'F', + 'hpt_multicannon_fixed_small_advanced': 'F', 'hpt_multicannon_fixed_medium': 'E', + 'hpt_multicannon_fixed_medium_advanced': 'E', 'hpt_multicannon_fixed_large': 'C', 'hpt_multicannon_fixed_huge': 'A', 'hpt_multicannon_gimbal_small': 'G', @@ -499,6 +501,7 @@ 'krait_mkii': 'Krait MkII', 'krait_light': 'Krait Phantom', 'mamba': 'Mamba', + 'mandalay': 'Mandalay', 'orca': 'Orca', 'python': 'Python', 'python_nx': 'Python Mk II', diff --git a/modules.json b/modules.json index e9e444d62..459ee8835 100644 --- a/modules.json +++ b/modules.json @@ -332,27 +332,63 @@ "hpt_atdumbfiremissile_fixed_large": { "mass": 8 }, + "hpt_atdumbfiremissile_fixed_large_v2": { + "mass": 8 + }, "hpt_atdumbfiremissile_fixed_medium": { "mass": 4 }, + "hpt_atdumbfiremissile_fixed_medium_v2": { + "mass": 4 + }, "hpt_atdumbfiremissile_turret_large": { "mass": 8 }, + "hpt_atdumbfiremissile_turret_large_v2": { + "mass": 8 + }, "hpt_atdumbfiremissile_turret_medium": { "mass": 4 }, + "hpt_atdumbfiremissile_turret_medium_v2": { + "mass": 4 + }, "hpt_atmulticannon_fixed_large": { "mass": 8 }, + "hpt_atmulticannon_fixed_large_v2": { + "mass": 8 + }, "hpt_atmulticannon_fixed_medium": { "mass": 4 }, + "hpt_atmulticannon_fixed_medium_v2": { + "mass": 4 + }, + "hpt_atmulticannon_gimbal_large": { + "mass": 8 + }, + "hpt_atmulticannon_gimbal_medium": { + "mass": 4 + }, "hpt_atmulticannon_turret_large": { "mass": 8 }, + "hpt_atmulticannon_turret_large_v2": { + "mass": 8 + }, "hpt_atmulticannon_turret_medium": { "mass": 4 }, + "hpt_atmulticannon_turret_medium_v2": { + "mass": 4 + }, + "hpt_atventdisruptorpylon_fixed_large": { + "mass": 5 + }, + "hpt_atventdisruptorpylon_fixed_medium": { + "mass": 3 + }, "hpt_basicmissilerack_fixed_large": { "mass": 8 }, @@ -419,6 +455,9 @@ "hpt_cannon_gimbal_medium": { "mass": 4 }, + "hpt_cannon_gimbal_medium_burst": { + "mass": 4 + }, "hpt_cannon_gimbal_small": { "mass": 2 }, @@ -614,6 +653,12 @@ "hpt_mininglaser_turret_small": { "mass": 2 }, + "hpt_missing_hardpoint": { + "mass": 0 + }, + "hpt_missing_utility": { + "mass": 0 + }, "hpt_mrascanner_size0_class1": { "mass": 1.3 }, @@ -914,6 +959,12 @@ "int_corrosionproofcargorack_size4_class1": { "mass": 0 }, + "int_corrosionproofcargorack_size5_class1": { + "mass": 0 + }, + "int_corrosionproofcargorack_size6_class1": { + "mass": 0 + }, "int_detailedsurfacescanner_tiny": { "mass": 0 }, @@ -2370,6 +2421,34 @@ "int_metaalloyhullreinforcement_size5_class2": { "mass": 16 }, + "int_missing_engine": { + "mass": 0 + }, + "int_missing_fueltank": { + "mass": 0 + }, + "int_missing_hyperdrive": { + "mass": 0, + "optmass": 0, + "maxfuel": 0, + "fuelmul": 0, + "fuelpower": 0 + }, + "int_missing_lifesupport": { + "mass": 0 + }, + "int_missing_module": { + "mass": 0 + }, + "int_missing_powerdistributor": { + "mass": 0 + }, + "int_missing_powerplant": { + "mass": 0 + }, + "int_missing_sensors": { + "mass": 0 + }, "int_modulereinforcement_size1_class1": { "mass": 2 }, @@ -2475,6 +2554,9 @@ "int_planetapproachsuite": { "mass": 0 }, + "int_planetapproachsuite_advanced": { + "mass": 0 + }, "int_powerdistributor_size1_class1": { "mass": 1.3 }, @@ -3120,6 +3202,15 @@ "int_shieldcellbank_size8_class5": { "mass": 160 }, + "int_shieldgenerator_size1_class1": { + "mass": 1.3 + }, + "int_shieldgenerator_size1_class2": { + "mass": 0.5 + }, + "int_shieldgenerator_size1_class3": { + "mass": 1.3 + }, "int_shieldgenerator_size1_class3_fast": { "mass": 1.3 }, @@ -3333,6 +3424,21 @@ "mamba_armour_reactive": { "mass": 38 }, + "mandalay_armour_grade1": { + "mass": 0 + }, + "mandalay_armour_grade2": { + "mass": 32 + }, + "mandalay_armour_grade3": { + "mass": 63 + }, + "mandalay_armour_mirrored": { + "mass": 63 + }, + "mandalay_armour_reactive": { + "mass": 63 + }, "orca_armour_grade1": { "mass": 0 }, @@ -3423,6 +3529,21 @@ "type7_armour_reactive": { "mass": 63 }, + "type8_armour_grade1": { + "mass": 0 + }, + "type8_armour_grade2": { + "mass": 32 + }, + "type8_armour_grade3": { + "mass": 63 + }, + "type8_armour_mirrored": { + "mass": 63 + }, + "type8_armour_reactive": { + "mass": 63 + }, "type9_armour_grade1": { "mass": 0 }, diff --git a/ships.json b/ships.json index ac05d5d8f..363cd5612 100644 --- a/ships.json +++ b/ships.json @@ -111,6 +111,10 @@ "hullMass": 250, "reserveFuelCapacity": 0.5 }, + "Mandalay": { + "hullMass": 230, + "reserveFuelCapacity": 0.52 + }, "Orca": { "hullMass": 290, "reserveFuelCapacity": 0.79 @@ -139,6 +143,10 @@ "hullMass": 350, "reserveFuelCapacity": 0.52 }, + "Type-8 Transporter": { + "hullMass": 400, + "reserveFuelCapacity": 0.52 + }, "Type-9 Heavy": { "hullMass": 850, "reserveFuelCapacity": 0.77