From 65f4a2cf86a9d00b5d5b278fcd9150c1a774cb11 Mon Sep 17 00:00:00 2001 From: szcz13 Date: Sat, 24 May 2025 17:38:16 +0200 Subject: [PATCH] Added new and updated weapons CLSIDs and payloads for MiG-31BM mod (#514) --- pydcs_extensions/mig31bm/mig31bm.py | 17 ++++++++-- .../newgame/WizardPages/QGeneratorSettings.py | 2 +- resources/customized_payloads/MiG-31BM.lua | 32 +++++++++---------- 3 files changed, 31 insertions(+), 20 deletions(-) diff --git a/pydcs_extensions/mig31bm/mig31bm.py b/pydcs_extensions/mig31bm/mig31bm.py index 379f01ca..599da292 100644 --- a/pydcs_extensions/mig31bm/mig31bm.py +++ b/pydcs_extensions/mig31bm/mig31bm.py @@ -11,17 +11,22 @@ from pydcs_extensions.weapon_injector import inject_weapons class WeaponsMiG31BM: Vympel_R_33__AA_9_Amos_ = { - "clsid": "{R-33}", + "clsid": "{R-33_mig31bm}", "name": "Vympel R-33 (AA-9 Amos)", "weight": 490, } + Vympel_R_33S__AA_9_Amos_ = { + "clsid": "{R-33S_mig31bm}", + "name": "Vympel R-33S (AA-9 Amos)", + "weight": 490, + } Vympel_R_37M__AA_13_Axehead_ = { - "clsid": "{R-37M}", + "clsid": "{R-37M_mig31bm}", "name": "Vympel R-37M (AA-13 Axehead)", "weight": 600, } Vympel_R_37__AA_13_Axehead_ = { - "clsid": "{R-37}", + "clsid": "{R-37_mig31bm}", "name": "Vympel R-37 (AA-13 Axehead)", "weight": 600, } @@ -62,6 +67,7 @@ class MiG_31BM(PlaneType): R_77__AA_12_Adder____Active_Rdr = (2, Weapons.R_77__AA_12_Adder____Active_Rdr) Vympel_R_37M__AA_13_Axehead_ = (2, WeaponsMiG31BM.Vympel_R_37M__AA_13_Axehead_) Vympel_R_37__AA_13_Axehead_ = (2, WeaponsMiG31BM.Vympel_R_37__AA_13_Axehead_) + Vympel_R_33S__AA_9_Amos_ = (2, WeaponsMiG31BM.Vympel_R_33S__AA_9_Amos_) Vympel_R_33__AA_9_Amos_ = (2, WeaponsMiG31BM.Vympel_R_33__AA_9_Amos_) R_40RD__AA_6_Acrid____Semi_Act_Rdr = ( 2, @@ -87,21 +93,25 @@ class MiG_31BM(PlaneType): class Pylon3: Vympel_R_37M__AA_13_Axehead_ = (3, WeaponsMiG31BM.Vympel_R_37M__AA_13_Axehead_) Vympel_R_37__AA_13_Axehead_ = (3, WeaponsMiG31BM.Vympel_R_37__AA_13_Axehead_) + Vympel_R_33S__AA_9_Amos_ = (3, WeaponsMiG31BM.Vympel_R_33S__AA_9_Amos_) Vympel_R_33__AA_9_Amos_ = (3, WeaponsMiG31BM.Vympel_R_33__AA_9_Amos_) class Pylon4: Vympel_R_37M__AA_13_Axehead_ = (4, WeaponsMiG31BM.Vympel_R_37M__AA_13_Axehead_) Vympel_R_37__AA_13_Axehead_ = (4, WeaponsMiG31BM.Vympel_R_37__AA_13_Axehead_) + Vympel_R_33S__AA_9_Amos_ = (4, WeaponsMiG31BM.Vympel_R_33S__AA_9_Amos_) Vympel_R_33__AA_9_Amos_ = (4, WeaponsMiG31BM.Vympel_R_33__AA_9_Amos_) class Pylon5: Vympel_R_37M__AA_13_Axehead_ = (5, WeaponsMiG31BM.Vympel_R_37M__AA_13_Axehead_) Vympel_R_37__AA_13_Axehead_ = (5, WeaponsMiG31BM.Vympel_R_37__AA_13_Axehead_) + Vympel_R_33S__AA_9_Amos_ = (5, WeaponsMiG31BM.Vympel_R_33S__AA_9_Amos_) Vympel_R_33__AA_9_Amos_ = (5, WeaponsMiG31BM.Vympel_R_33__AA_9_Amos_) class Pylon6: Vympel_R_37M__AA_13_Axehead_ = (6, WeaponsMiG31BM.Vympel_R_37M__AA_13_Axehead_) Vympel_R_37__AA_13_Axehead_ = (6, WeaponsMiG31BM.Vympel_R_37__AA_13_Axehead_) + Vympel_R_33S__AA_9_Amos_ = (6, WeaponsMiG31BM.Vympel_R_33S__AA_9_Amos_) Vympel_R_33__AA_9_Amos_ = (6, WeaponsMiG31BM.Vympel_R_33__AA_9_Amos_) class Pylon7: @@ -109,6 +119,7 @@ class MiG_31BM(PlaneType): R_77__AA_12_Adder____Active_Rdr = (7, Weapons.R_77__AA_12_Adder____Active_Rdr) Vympel_R_37M__AA_13_Axehead_ = (7, WeaponsMiG31BM.Vympel_R_37M__AA_13_Axehead_) Vympel_R_37__AA_13_Axehead_ = (7, WeaponsMiG31BM.Vympel_R_37__AA_13_Axehead_) + Vympel_R_33S__AA_9_Amos_ = (7, WeaponsMiG31BM.Vympel_R_33S__AA_9_Amos_) Vympel_R_33__AA_9_Amos_ = (7, WeaponsMiG31BM.Vympel_R_33__AA_9_Amos_) R_40RD__AA_6_Acrid____Semi_Act_Rdr = ( 7, diff --git a/qt_ui/windows/newgame/WizardPages/QGeneratorSettings.py b/qt_ui/windows/newgame/WizardPages/QGeneratorSettings.py index 880889a2..296e0d3d 100644 --- a/qt_ui/windows/newgame/WizardPages/QGeneratorSettings.py +++ b/qt_ui/windows/newgame/WizardPages/QGeneratorSettings.py @@ -228,7 +228,7 @@ class GeneratorOptions(QtWidgets.QWizardPage): ("High Digit SAMs", self.high_digit_sams), ("IDF Assets Pack (v1.1 by IDF Mods Project)", self.irondome), ("JAS 39 Gripen (v1.8.5-beta)", self.jas39_gripen), - ("MiG-31BM (v2.6)", self.mig31bm_foxhound), + ("MiG-31BM (v2.62)", self.mig31bm_foxhound), ("Mirage III (v2.5.7.01)", self.mirage_3), ("OH-6 Cayuse (v1.2)", self.oh_6), ("OH-6 Vietnam Asset Pack (v1.0)", self.oh_6_vietnamassetpack), diff --git a/resources/customized_payloads/MiG-31BM.lua b/resources/customized_payloads/MiG-31BM.lua index 82cf5970..eb7b6f56 100644 --- a/resources/customized_payloads/MiG-31BM.lua +++ b/resources/customized_payloads/MiG-31BM.lua @@ -14,19 +14,19 @@ local unitPayloads = { ["num"] = 2, }, [3] = { - ["CLSID"] = "{R-37}", + ["CLSID"] = "{R-37M_mig31bm}", ["num"] = 3, }, [4] = { - ["CLSID"] = "{R-37}", + ["CLSID"] = "{R-37M_mig31bm}", ["num"] = 4, }, [5] = { - ["CLSID"] = "{R-37}", + ["CLSID"] = "{R-37M_mig31bm}", ["num"] = 5, }, [6] = { - ["CLSID"] = "{R-37}", + ["CLSID"] = "{R-37M_mig31bm}", ["num"] = 6, }, [7] = { @@ -51,19 +51,19 @@ local unitPayloads = { ["num"] = 1, }, [2] = { - ["CLSID"] = "{R-33}", + ["CLSID"] = "{R-33_mig31bm}", ["num"] = 3, }, [3] = { - ["CLSID"] = "{R-33}", + ["CLSID"] = "{R-33_mig31bm}", ["num"] = 4, }, [4] = { - ["CLSID"] = "{R-33}", + ["CLSID"] = "{R-33_mig31bm}", ["num"] = 5, }, [5] = { - ["CLSID"] = "{R-33}", + ["CLSID"] = "{R-33_mig31bm}", ["num"] = 6, }, [6] = { @@ -96,19 +96,19 @@ local unitPayloads = { ["num"] = 2, }, [3] = { - ["CLSID"] = "{R-37M}", + ["CLSID"] = "{R-37M_mig31bm}", ["num"] = 3, }, [4] = { - ["CLSID"] = "{R-37M}", + ["CLSID"] = "{R-37M_mig31bm}", ["num"] = 4, }, [5] = { - ["CLSID"] = "{R-37M}", + ["CLSID"] = "{R-37M_mig31bm}", ["num"] = 5, }, [6] = { - ["CLSID"] = "{R-37M}", + ["CLSID"] = "{R-37M_mig31bm}", ["num"] = 6, }, [7] = { @@ -162,19 +162,19 @@ local unitPayloads = { ["num"] = 2, }, [3] = { - ["CLSID"] = "{R-37M}", + ["CLSID"] = "{R-37M_mig31bm}", ["num"] = 3, }, [4] = { - ["CLSID"] = "{R-37M}", + ["CLSID"] = "{R-37M_mig31bm}", ["num"] = 4, }, [5] = { - ["CLSID"] = "{R-37M}", + ["CLSID"] = "{R-37M_mig31bm}", ["num"] = 5, }, [6] = { - ["CLSID"] = "{R-37M}", + ["CLSID"] = "{R-37M_mig31bm}", ["num"] = 6, }, },