weyne/dcs_liberation
1
0
Fork 0
mirror of https://github.com/dcs-liberation/dcs_liberation.git synced 2025-11-10 14:22:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Support for the updated F-4B/C mod (#2769)

Browse Source 
Updated the F4.py pydcs extension to match the updated F-4B/C mod and
reworked the standard payloads to add "clean" to new F-4B pylons 11 and
12.

This includes a workaround to allow Liberation to use the new VSN F-4B
weapons with combined 2x Aim-9js on pylons 3 and 9 underslung with bombs
on ters on new pylons 11 and 12. In mission editor the combined weapons
are selected in pylons 3 and 9 and their under-slung counterparts are
forced onto 11 and 12 using "required" arguments in the mod's lua. All
other pylon 3 and 9 weapons use "required clean" arguments. Liberation
doesn't have a way to force these linkages onto pylons 11 and 12 and
without them, even without clean, no weapons will load on 3 and 9 or 11
and 12.

The workaround for normal weapons on the F-4B is to set the standard
load-outs to "clean" on pylons 11 and 12. This allows all normal weapons
to work on pylons 3 and 9 so long as pylons 11 and 12 are left as Clean.
It also allows Clean into the Liberation dropdown so it can be selected
later if necessary.

The workaround for the 4 new weapons that combines pylons 3 with 11 and
9 with 12 is that the user has to use the matching pair on each set of
pylons. For example - if F4B_LAU105_AIM9J_2_BRU42A_MK82_3 is selected
for pylon 3, BRU 42A MK823 LAU105 AIM9J2 must be selected for pylon 11.
Failure to do this correctly doesn't crash liberation or DCS, the result
will just be either no weapons at all on either pylon or the underslung
weapons on 11 and 12 floating without a pylon attaching it to the plane.

When updating f4.py in the future, note that running the pydcs database
export doesn't pull any data for Pylons 11 and 12. Those matching
weapons / classes have to be manually defined in those pylons for the
F-4B. This is noted in f4.py.
This commit is contained in:
Nosajthedevil 2023-03-24 20:41:03 -05:00 committed by GitHub
parent b860d72c2d
commit 8523c11357
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 168 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
game/ato/ai_flight_planner_db.py
View File

@ -303,6 +303,7 @@ SEAD_CAPABLE = [
F_14A_135_GR,
JAS39Gripen_AG,
AV8BNA,
VSN_F4C,
Su_24M,
Su_17M4,
Su_34,

124
pydcs_extensions/f4/f4.py
View File

@ -50,6 +50,36 @@ class WeaponsF4:
"name": "Fuel tank Wing R 370 Gal",
"weight": 1240,
}
F4B_LAU105_AIM9J_2_BRU42A_M117_3 = {
"clsid": "{F4B_LAU105_AIM9J_2_BRU42A_M117_3}",
"name": "F4B_LAU105_AIM9J_2_BRU42A_M117_3",
"weight": 332,
}
F4B_LAU105_AIM9J_2_BRU42A_MK82_3 = {
"clsid": "{F4B_LAU105_AIM9J_2_BRU42A_MK82_3}",
"name": "F4B_LAU105_AIM9J_2_BRU42A_MK82_3",
"weight": 332,
}
F4B_LAU105_AIM9J_2_MER_MK20_3 = {
"clsid": "{F4B_LAU105_AIM9J_2_MER_MK20_3}",
"name": "F4B_LAU105_AIM9J_2_MER_MK20_3",
"weight": 332,
}
F4B_LAU105_AIM9J_2_TER9A_MK82SE_3 = {
"clsid": "{F4B_LAU105_AIM9J_2_TER9A_MK82SE_3}",
"name": "F4B_LAU105_AIM9J_2_TER9A_MK82SE_3",
"weight": 332,
}
BRU_42A_M117_3_LAU105_AIM9J_2 = {
"clsid": "{F4B_BRU42A_M117_3_LAU105_AIM9J_2}",
"name": "BRU 42A M117*3 LAU105 AIM9J*2",
"weight": 1500,
}
BRU_42A_MK82_3_LAU105_AIM9J_2 = {
"clsid": "{F4B_BRU42A_MK82_3_LAU105_AIM9J_2}",
"name": "BRU 42A MK82*3 LAU105 AIM9J*2",
"weight": 1500,
}
inject_weapons(WeaponsF4)
@ -178,6 +208,10 @@ class VSN_F4B(PlaneType):
LAU_105_2_AIM_9J = (3, Weapons.LAU_105_2_AIM_9J)
LAU_105_2_AIM_9JULI = (3, Weapons.LAU_105_2_AIM_9JULI)
AIM_7F_Sparrow_Semi_Active_Radar = (3, Weapons.AIM_7F_Sparrow_Semi_Active_Radar)
AIM_7E_2_Sparrow_Semi_Active_Radar = (
3,
Weapons.AIM_7E_2_Sparrow_Semi_Active_Radar,
)
Mk_20_Rockeye___490lbs_CBU__247_x_HEAT_Bomblets = (
3,
Weapons.Mk_20_Rockeye___490lbs_CBU__247_x_HEAT_Bomblets,
@ -192,12 +226,27 @@ class VSN_F4B(PlaneType):
Weapons.BRU_33_with_2_x_Mk_83___1000lb_GP_Bomb_LD,
)
BIN_200 = (3, Weapons.BIN_200)
F4B_LAU105_AIM9J_2_BRU42A_M117_3 = (3, Weapons.F4B_LAU105_AIM9J_2_BRU42A_M117_3)
F4B_LAU105_AIM9J_2_BRU42A_MK82_3 = (3, Weapons.F4B_LAU105_AIM9J_2_BRU42A_MK82_3)
F4B_LAU105_AIM9J_2_TER9A_MK82SE_3 = (
3,
Weapons.F4B_LAU105_AIM9J_2_TER9A_MK82SE_3,
)
F4B_LAU105_AIM9J_2_MER_MK20_3 = (3, Weapons.F4B_LAU105_AIM9J_2_MER_MK20_3)
class Pylon4:
AIM_7F_Sparrow_Semi_Active_Radar = (4, Weapons.AIM_7F_Sparrow_Semi_Active_Radar)
AIM_7E_2_Sparrow_Semi_Active_Radar = (
4,
Weapons.AIM_7E_2_Sparrow_Semi_Active_Radar,
)
class Pylon5:
AIM_7F_Sparrow_Semi_Active_Radar = (5, Weapons.AIM_7F_Sparrow_Semi_Active_Radar)
AIM_7E_2_Sparrow_Semi_Active_Radar = (
5,
Weapons.AIM_7E_2_Sparrow_Semi_Active_Radar,
)
class Pylon6:
Smokewinder___red = (6, Weapons.Smokewinder___red)
@ -220,13 +269,21 @@ class VSN_F4B(PlaneType):
ALQ_131___ECM_Pod = (6, Weapons.ALQ_131___ECM_Pod)
F4B_Gunpod_w_SAPHEI_T = (6, Weapons.F4B_Gunpod_w_SAPHEI_T)
VSN_F4EC_PTB = (6, Weapons.VSN_F4EC_PTB)
VSN_F4ER_PTB = (6, Weapons.VSN_F4ER_PTB)
VSN_F4B_C2_PTB = (6, Weapons.VSN_F4B_C2_PTB)
class Pylon7:
AIM_7F_Sparrow_Semi_Active_Radar = (7, Weapons.AIM_7F_Sparrow_Semi_Active_Radar)
AIM_7E_2_Sparrow_Semi_Active_Radar = (
7,
Weapons.AIM_7E_2_Sparrow_Semi_Active_Radar,
)
class Pylon8:
AIM_7F_Sparrow_Semi_Active_Radar = (8, Weapons.AIM_7F_Sparrow_Semi_Active_Radar)
AIM_7E_2_Sparrow_Semi_Active_Radar = (
8,
Weapons.AIM_7E_2_Sparrow_Semi_Active_Radar,
)
class Pylon9:
GBU_10___2000lb_Laser_Guided_Bomb = (
@ -272,6 +329,10 @@ class VSN_F4B(PlaneType):
LAU_105_2_AIM_9J = (9, Weapons.LAU_105_2_AIM_9J)
LAU_105_2_AIM_9JULI = (9, Weapons.LAU_105_2_AIM_9JULI)
AIM_7F_Sparrow_Semi_Active_Radar = (9, Weapons.AIM_7F_Sparrow_Semi_Active_Radar)
AIM_7E_2_Sparrow_Semi_Active_Radar = (
9,
Weapons.AIM_7E_2_Sparrow_Semi_Active_Radar,
)
Mk_20_Rockeye___490lbs_CBU__247_x_HEAT_Bomblets = (
9,
Weapons.Mk_20_Rockeye___490lbs_CBU__247_x_HEAT_Bomblets,
@ -286,6 +347,13 @@ class VSN_F4B(PlaneType):
Weapons.BRU_33_with_2_x_Mk_83___1000lb_GP_Bomb_LD,
)
BIN_200 = (9, Weapons.BIN_200)
F4B_LAU105_AIM9J_2_BRU42A_M117_3 = (9, Weapons.F4B_LAU105_AIM9J_2_BRU42A_M117_3)
F4B_LAU105_AIM9J_2_BRU42A_MK82_3 = (9, Weapons.F4B_LAU105_AIM9J_2_BRU42A_MK82_3)
F4B_LAU105_AIM9J_2_TER9A_MK82SE_3 = (
9,
Weapons.F4B_LAU105_AIM9J_2_TER9A_MK82SE_3,
)
F4B_LAU105_AIM9J_2_MER_MK20_3 = (9, Weapons.F4B_LAU105_AIM9J_2_MER_MK20_3)
class Pylon10:
GBU_10___2000lb_Laser_Guided_Bomb = (
@ -341,7 +409,33 @@ class VSN_F4B(PlaneType):
BIN_200 = (10, Weapons.BIN_200)
VSN_F4ER_PTB = (10, Weapons.VSN_F4ER_PTB)
pylons: Set[int] = {1, 2, 3, 4, 5, 6, 7, 8, 9, 10}
class Pylon11:
# all added manually - did not pull using database export
BRU42A_M117_3_LAU105_AIM9J_2 = (11, Weapons.BRU_42A_M117_3_LAU105_AIM9J_2)
BRU42A_MK82_3_LAU105_AIM9J_2 = (11, Weapons.BRU_42A_MK82_3_LAU105_AIM9J_2)
TER_9A_with_3_x_Mk_82_Snakeye___500lb_GP_Bomb_HD = (
11,
Weapons.TER_9A_with_3_x_Mk_82_Snakeye___500lb_GP_Bomb_HD,
)
BRU_42_with_3_x_Mk_20_Rockeye___490lbs_CBUs__247_x_HEAT_Bomblets = (
11,
Weapons.BRU_42_with_3_x_Mk_20_Rockeye___490lbs_CBUs__247_x_HEAT_Bomblets,
)
class Pylon12:
# all added manually - did not pull using database export
BRU42A_M117_3_LAU105_AIM9J_2 = (12, Weapons.BRU_42A_M117_3_LAU105_AIM9J_2)
BRU42A_MK82_3_LAU105_AIM9J_2 = (12, Weapons.BRU_42A_MK82_3_LAU105_AIM9J_2)
TER_9A_with_3_x_Mk_82_Snakeye___500lb_GP_Bomb_HD = (
12,
Weapons.TER_9A_with_3_x_Mk_82_Snakeye___500lb_GP_Bomb_HD,
)
BRU_42_with_3_x_Mk_20_Rockeye___490lbs_CBUs__247_x_HEAT_Bomblets = (
12,
Weapons.BRU_42_with_3_x_Mk_20_Rockeye___490lbs_CBUs__247_x_HEAT_Bomblets,
)
pylons: Set[int] = {1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12}
tasks = [
task.CAP,
@ -451,6 +545,8 @@ class VSN_F4C(PlaneType):
Weapons.BRU_42_with_3_x_Mk_82___500lb_GP_Bombs_LD,
)
Mk_84___2000lb_GP_Bomb_LD = (3, Weapons.Mk_84___2000lb_GP_Bomb_LD)
AGM_45B_Shrike_ARM__Imp_ = (3, Weapons.AGM_45B_Shrike_ARM__Imp_)
AGM_45A_Shrike_ARM = (3, Weapons.AGM_45A_Shrike_ARM)
LAU_10_pod___4_x_127mm_ZUNI__UnGd_Rkts_Mk71__HE_FRAG = (
3,
Weapons.LAU_10_pod___4_x_127mm_ZUNI__UnGd_Rkts_Mk71__HE_FRAG,
@ -479,7 +575,6 @@ class VSN_F4C(PlaneType):
)
LAU_105_2_AIM_9J = (3, Weapons.LAU_105_2_AIM_9J)
LAU_105_2_AIM_9JULI = (3, Weapons.LAU_105_2_AIM_9JULI)
AIM_7F_Sparrow_Semi_Active_Radar = (3, Weapons.AIM_7F_Sparrow_Semi_Active_Radar)
Mk_20_Rockeye___490lbs_CBU__247_x_HEAT_Bomblets = (
3,
Weapons.Mk_20_Rockeye___490lbs_CBU__247_x_HEAT_Bomblets,
@ -497,9 +592,17 @@ class VSN_F4C(PlaneType):
class Pylon4:
AIM_7F_Sparrow_Semi_Active_Radar = (4, Weapons.AIM_7F_Sparrow_Semi_Active_Radar)
AIM_7E_2_Sparrow_Semi_Active_Radar = (
4,
Weapons.AIM_7E_2_Sparrow_Semi_Active_Radar,
)
class Pylon5:
AIM_7F_Sparrow_Semi_Active_Radar = (5, Weapons.AIM_7F_Sparrow_Semi_Active_Radar)
AIM_7E_2_Sparrow_Semi_Active_Radar = (
5,
Weapons.AIM_7E_2_Sparrow_Semi_Active_Radar,
)
class Pylon6:
Smokewinder___red = (6, Weapons.Smokewinder___red)
@ -522,13 +625,21 @@ class VSN_F4C(PlaneType):
ALQ_131___ECM_Pod = (6, Weapons.ALQ_131___ECM_Pod)
F4B_Gunpod_w_SAPHEI_T = (6, Weapons.F4B_Gunpod_w_SAPHEI_T)
VSN_F4EC_PTB = (6, Weapons.VSN_F4EC_PTB)
VSN_F4ER_PTB = (6, Weapons.VSN_F4ER_PTB)
VSN_F4B_C2_PTB = (6, Weapons.VSN_F4B_C2_PTB)
class Pylon7:
AIM_7F_Sparrow_Semi_Active_Radar = (7, Weapons.AIM_7F_Sparrow_Semi_Active_Radar)
AIM_7E_2_Sparrow_Semi_Active_Radar = (
7,
Weapons.AIM_7E_2_Sparrow_Semi_Active_Radar,
)
class Pylon8:
AIM_7F_Sparrow_Semi_Active_Radar = (8, Weapons.AIM_7F_Sparrow_Semi_Active_Radar)
AIM_7E_2_Sparrow_Semi_Active_Radar = (
8,
Weapons.AIM_7E_2_Sparrow_Semi_Active_Radar,
)
class Pylon9:
GBU_10___2000lb_Laser_Guided_Bomb = (
@ -545,6 +656,8 @@ class VSN_F4C(PlaneType):
Weapons.BRU_42_with_3_x_Mk_82___500lb_GP_Bombs_LD,
)
Mk_84___2000lb_GP_Bomb_LD = (9, Weapons.Mk_84___2000lb_GP_Bomb_LD)
AGM_45B_Shrike_ARM__Imp_ = (9, Weapons.AGM_45B_Shrike_ARM__Imp_)
AGM_45A_Shrike_ARM = (9, Weapons.AGM_45A_Shrike_ARM)
LAU_10_pod___4_x_127mm_ZUNI__UnGd_Rkts_Mk71__HE_FRAG = (
9,
Weapons.LAU_10_pod___4_x_127mm_ZUNI__UnGd_Rkts_Mk71__HE_FRAG,
@ -573,7 +686,6 @@ class VSN_F4C(PlaneType):
)
LAU_105_2_AIM_9J = (9, Weapons.LAU_105_2_AIM_9J)
LAU_105_2_AIM_9JULI = (9, Weapons.LAU_105_2_AIM_9JULI)
AIM_7F_Sparrow_Semi_Active_Radar = (9, Weapons.AIM_7F_Sparrow_Semi_Active_Radar)
Mk_20_Rockeye___490lbs_CBU__247_x_HEAT_Bomblets = (
9,
Weapons.Mk_20_Rockeye___490lbs_CBU__247_x_HEAT_Bomblets,
@ -643,7 +755,7 @@ class VSN_F4C(PlaneType):
BIN_200 = (10, Weapons.BIN_200)
VSN_F4ER_PTB = (10, Weapons.VSN_F4ER_PTB)
pylons: Set[int] = {1, 2, 3, 4, 5, 6, 7, 8, 9, 10}
pylons: Set[int] = {1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12}
tasks = [
task.CAP,

44
resources/customized_payloads/VSN_F4B.lua
View File

@ -1,5 +1,5 @@
local unitPayloads = {
["name"] = "VSN_F4C",
["name"] = "VSN_F4B",
["payloads"] = {
[1] = {
["name"] = "CAP",
@ -36,6 +36,14 @@ local unitPayloads = {
["CLSID"] = "VSN_F4ER_PTB",
["num"] = 10,
},
[9] ={
["CLSID"] = "<CLEAN>",
["num"] = 11,
},
[10] ={
["CLSID"] = "<CLEAN>",
["num"] = 12,
},
},
["tasks"] = {
[1] = 18,
@ -82,6 +90,14 @@ local unitPayloads = {
["CLSID"] = "VSN_F4EC_PTB",
["num"] = 6,
},
[10] ={
["CLSID"] = "<CLEAN>",
["num"] = 11,
},
[11] ={
["CLSID"] = "<CLEAN>",
["num"] = 12,
},
},
["tasks"] = {
[1] = 11,
@ -126,6 +142,14 @@ local unitPayloads = {
["CLSID"] = "VSN_F4EC_PTB",
["num"] = 6,
},
[10] ={
["CLSID"] = "<CLEAN>",
["num"] = 11,
},
[11] ={
["CLSID"] = "<CLEAN>",
["num"] = 12,
},
},
["tasks"] = {
[1] = 11,
@ -170,6 +194,14 @@ local unitPayloads = {
["CLSID"] = "VSN_F4EC_PTB",
["num"] = 6,
},
[10] ={
["CLSID"] = "<CLEAN>",
["num"] = 11,
},
[11] ={
["CLSID"] = "<CLEAN>",
["num"] = 12,
},
},
["tasks"] = {
[1] = 11,
@ -214,11 +246,19 @@ local unitPayloads = {
["CLSID"] = "VSN_F4EC_PTB",
["num"] = 6,
},
[10] ={
["CLSID"] = "<CLEAN>",
["num"] = 11,
},
[11] ={
["CLSID"] = "<CLEAN>",
["num"] = 12,
},
}, ["tasks"] = {
[1] = 11,
},
},
},
["unitType"] = "VSN_F4C",
["unitType"] = "VSN_F4B",
}
return unitPayloads

14
resources/customized_payloads/VSN_F4C.lua
View File

@ -1,5 +1,5 @@
local unitPayloads = {
["name"] = "VSN_F4B",
["name"] = "VSN_F4C",
["payloads"] = {
[1] = {
["name"] = "CAP",
@ -91,11 +91,11 @@ local unitPayloads = {
["name"] = "SEAD",
["pylons"] = {
[1] = {
["CLSID"] = "{60CC734F-0AFA-4E2E-82B8-93B941AB11CF}",
["CLSID"] = "{3E6B632D-65EB-44D2-9501-1C2D04515404}",
["num"] = 9,
},
[2] = {
["CLSID"] = "{60CC734F-0AFA-4E2E-82B8-93B941AB11CF}",
["CLSID"] = "{3E6B632D-65EB-44D2-9501-1C2D04515404}",
["num"] = 3,
},
[3] = {
@ -107,11 +107,11 @@ local unitPayloads = {
["num"] = 7,
},
[5] = {
["CLSID"] = "{F3EFE0AB-E91A-42D8-9CA2-B63C91ED570A}",
["CLSID"] = "VSN_F4EL_PTB",
["num"] = 2,
},
[6] = {
["CLSID"] = "{F3EFE0AB-E91A-42D8-9CA2-B63C91ED570A}",
["CLSID"] = "VSN_F4ER_PTB",
["num"] = 10,
},
[7] = {
@ -123,7 +123,7 @@ local unitPayloads = {
["num"] = 8,
},
[9] = {
["CLSID"] = "VSN_F4EC_PTB",
["CLSID"] = "{6D21ECEA-F85B-4E8D-9D51-31DC9B8AA4EF}",
["num"] = 6,
},
},
@ -219,6 +219,6 @@ local unitPayloads = {
},
},
},
["unitType"] = "VSN_F4B",
["unitType"] = "VSN_F4C",
}
return unitPayloads