weyne/DCSOlympus
1
0
Fork 0
mirror of https://github.com/Pax1601/DCSOlympus.git synced 2025-10-29 16:56:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed loadout generator adding exceptions for Tomcats

Browse Source
This commit is contained in:
Pax1601 2023-11-12 17:42:54 +01:00
parent 49bff88c4e
commit a15b7620eb
3 changed files with 912 additions and 909 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
scripts/python/generatePayloadTables.py
View File

@ -62,10 +62,30 @@ for filename in filenames:
for payload in src:
names[tmp['unitType']].append(payload['name'])
roles[tmp['unitType']][payload['name']] = payload['tasks']
if type(payload['pylons']) == dict:
payloads[tmp['unitType']][payload['name']] = {payload['pylons'][key]['num']: {"CLSID" : payload['pylons'][key]['CLSID']} for key in payload['pylons']}
# The Tomcats are a bit special
if (tmp['unitType'] in ["F-14A-95-GR", "F-14A-135-GR", "F-14B"]):
pylonConversion = {
"pylon_1A": 1,
"pylon_1B": 2,
"pylon_2": 3,
"pylon_3": 4,
"pylon_4": 5,
"pylon_5": 6,
"pylon_6": 7,
"pylon_7": 8,
"pylon_8B": 9,
"pylon_8A": 10
}
if type(payload['pylons']) == dict:
payloads[tmp['unitType']][payload['name']] = {pylonConversion[payload['pylons'][key]['num']]: {"CLSID" : payload['pylons'][key]['CLSID']} for key in payload['pylons']}
else:
payloads[tmp['unitType']][payload['name']] = {pylonConversion[payload['pylons'][key]['num']]: {"CLSID" : payload['pylons'][key]['CLSID']} for key in range(len(payload['pylons']))}
else:
payloads[tmp['unitType']][payload['name']] = {payload['pylons'][key]['num']: {"CLSID" : payload['pylons'][key]['CLSID']} for key in range(len(payload['pylons']))}
if type(payload['pylons']) == dict:
payloads[tmp['unitType']][payload['name']] = {payload['pylons'][key]['num']: {"CLSID" : payload['pylons'][key]['CLSID']} for key in payload['pylons']}
else:
payloads[tmp['unitType']][payload['name']] = {payload['pylons'][key]['num']: {"CLSID" : payload['pylons'][key]['CLSID']} for key in range(len(payload['pylons']))}
except:
pass

213
scripts/python/payloadRoles.json
View File

@ -47,6 +47,9 @@
},
"AGM-65H*6,Mk82*10,AIM-9M*2,ECM": {
"1": 30
},
"AGM-65H*6,LAU-131*2,AIM-9M*2,ECM": {
"1": 31
}
},
"A-10C": {
@ -432,16 +435,16 @@
"AGM-65D*6,GBU-12*4,AIM-9M*2,ECM,TGP": {
"1": 30
},
"AGM-65E*2,Mk-82AIR*2,CBU-97*2,AIM-9M*2,ECM,TGP": {
"AGM-65L*2,Mk-82AIR*2,CBU-97*2,AIM-9M*2,ECM,TGP": {
"1": 31
},
"AGM-65E*2,CBU-97*4,AIM-9M*2,ECM,TGP": {
"AGM-65L*2,CBU-97*4,AIM-9M*2,ECM,TGP": {
"1": 31
},
"AGM-65E*2,CBU-97*4,AIM-9M*2,ECM,M151 APKWS*7,TGP": {
"AGM-65L*2,CBU-97*4,AIM-9M*2,ECM,M151 APKWS*7,TGP": {
"1": 31
},
"AGM-65E*2,CBU-105*4,AIM-9M*2,ECM,M151 APKWS*7,TGP": {
"AGM-65L*2,CBU-105*4,AIM-9M*2,ECM,M151 APKWS*7,TGP": {
"1": 31
},
"Mk-82*4,Mk-8AIR*4,AIM-9*2,ECM": {
@ -462,22 +465,22 @@
"GBU-38*4,M151 APKWS*7,AGM-65D*1,AGM-65H*1,TGP,AIM-9*2,ECM": {
"1": 32
},
"GBU-38*4,M151 APKWS*7,AGM-65E*2,TGP,AIM-9*2,ECM": {
"GBU-38*4,M151 APKWS*7,AGM-65L*2,TGP,AIM-9*2,ECM": {
"1": 32
},
"GBU-12*4,M151 APKWS*7,AGM-65E*2,TGP,AIM-9*2,ECM": {
"GBU-12*4,M151 APKWS*7,AGM-65L*2,TGP,AIM-9*2,ECM": {
"1": 32
},
"GBU-12*2,GBU-38*2,M151 APKWS*7,AGM-65E*2,TGP,AIM-9*2,ECM": {
"GBU-12*2,GBU-38*2,M151 APKWS*7,AGM-65L*2,TGP,AIM-9*2,ECM": {
"1": 32
},
"GBU-10*2,M151 APKWS*7,AGM-65E*2,TGP,AIM-9*2,ECM": {
"GBU-10*2,M151 APKWS*7,AGM-65L*2,TGP,AIM-9*2,ECM": {
"1": 32
},
"GBU-31*2,M151 APKWS*7,AGM-65E*2,TGP,AIM-9*2,ECM": {
"GBU-31*2,M151 APKWS*7,AGM-65L*2,TGP,AIM-9*2,ECM": {
"1": 32
},
"GBU-54*4,M151 APKWS*7,AGM-65E*2,TGP,AIM-9*2,ECM": {
"GBU-54*4,M151 APKWS*7,AGM-65L*2,TGP,AIM-9*2,ECM": {
"1": 32
},
"GBU-54*4,M151 APKWS*7,AGM-65D*4,TGP,AIM-9*2,ECM": {
@ -2669,9 +2672,8 @@
"1": 16
},
"2xFuel tank, 40xS-8": {
"1": 31,
"2": 32,
"3": 18
"1": 32,
"2": 18
},
"80xS-8": {
"1": 31,
@ -2685,14 +2687,12 @@
"1": 32
},
"2xFuel tank, 12x9A4172": {
"1": 31,
"2": 32,
"3": 18
"1": 32,
"2": 18
},
"2xFuel tank, 2xUPK-23": {
"1": 31,
"2": 32,
"3": 18
"1": 32,
"2": 18
},
"12x9A4172, 40xS-8": {
"1": 31,
@ -2732,9 +2732,8 @@
"1": 32
},
"6x9A4172": {
"1": 31,
"2": 32,
"3": 18
"1": 32,
"2": 18
},
"2xFuel tank, 2xKMGU AT": {
"1": 32
@ -2777,11 +2776,10 @@
"40xS-8 TsM": {
"1": 16
},
"12x9A4172, 10xS-13": {
"2xUPK-23": {
"1": 31,
"2": 32,
"3": 18,
"4": 30
"3": 18
},
"2xFuel tank, 2xFAB-500": {
"1": 32
@ -2800,18 +2798,20 @@
"2xFAB-250, 12x9A4172": {
"1": 32
},
"2xUPK-23": {
"12x9A4172, 10xS-13": {
"1": 31,
"2": 32,
"3": 18
"3": 18,
"4": 30
}
},
"Ka-50_3": {
"4xIgla": {
"1": 31
"1": 32
},
"2xKh-25ML, 10xS-13, 4xIgla": {
"1": 30
"1": 30,
"2": 31
},
"12x9A4172, 40xS-8KOM, 4xIgla": {
"1": 31,
@ -3165,7 +3165,7 @@
"1": 31
},
"4xPTB-450 Fuel tank": {
"1": 31
"1": 32
}
},
"MiG-19P": {
@ -4667,6 +4667,65 @@
"1": 18
}
},
"B-1B": {
"Mk-82*84": {
"1": 34,
"2": 32
},
"AGM-154*12": {
"1": 33
},
"GBU-38*48": {
"1": 31,
"2": 32,
"3": 33
},
"CBU-87*30": {
"1": 31
},
"CBU-97*30": {
"1": 31
},
"GBU-38*16, CBU-97*20": {
"1": 31
},
"Mk-84*24": {
"1": 34,
"2": 32
},
"GBU-31*24": {
"1": 32,
"2": 33
},
"GBU-31(V)3/B*24": {
"1": 32,
"2": 33
},
"GBU-31*8, GBU-38*32": {
"1": 32,
"2": 33
}
},
"B-52H": {
"Mk-84*18": {
"1": 32,
"2": 34
},
"Mk 82*51": {
"1": 32,
"2": 34
},
"Mk20*18": {
"1": 32,
"2": 34
},
"AGM-86C*20": {
"1": 33
},
"AGM-84A*8": {
"1": 30
}
},
"A-20G": {
"500 lb GP bomb LD*4": {
"1": 31,
@ -4943,7 +5002,7 @@
"2": 31,
"3": 32
},
"8xBGM-71, 38xHYDRA-70": {
"8xAGM-114, 14xHYDRA-70": {
"1": 18,
"2": 31,
"3": 32
@ -4970,7 +5029,7 @@
"3": 32,
"4": 30
},
"8xAGM-114, 14xHYDRA-70": {
"8xBGM-71, 38xHYDRA-70": {
"1": 18,
"2": 31,
"3": 32
@ -5032,79 +5091,20 @@
"8xAGM-114, 38xHYDRA-70 WP": {
"1": 16
},
"8xAGM-114, 38xHYDRA-70": {
"1": 18,
"2": 31,
"3": 32
},
"AGM-114K*16": {
"1": 18,
"2": 31,
"3": 32,
"4": 30
},
"8xAGM-114, 38xHYDRA-70": {
"1": 18,
"2": 31,
"3": 32
}
},
"An-26B": {},
"An-30M": {},
"B-1B": {
"Mk-82*84": {
"1": 34,
"2": 32
},
"AGM-154*12": {
"1": 33
},
"GBU-38*48": {
"1": 31,
"2": 32,
"3": 33
},
"CBU-87*30": {
"1": 31
},
"CBU-97*30": {
"1": 31
},
"GBU-38*16, CBU-97*20": {
"1": 31
},
"Mk-84*24": {
"1": 34,
"2": 32
},
"GBU-31*24": {
"1": 32,
"2": 33
},
"GBU-31(V)3/B*24": {
"1": 32,
"2": 33
},
"GBU-31*8, GBU-38*32": {
"1": 32,
"2": 33
}
},
"B-52H": {
"Mk-84*18": {
"1": 32,
"2": 34
},
"Mk 82*51": {
"1": 32,
"2": 34
},
"Mk20*18": {
"1": 32,
"2": 34
},
"AGM-86C*20": {
"1": 33
},
"AGM-84A*8": {
"1": 30
}
},
"C-130": {},
"C-17A": {},
"CH-47D": {},
@ -5875,11 +5875,10 @@
"2": 32,
"3": 18
},
"16x9M114, 10xS-13": {
"16x9M114, 2xKMGU AT": {
"1": 31,
"2": 32,
"3": 18,
"4": 30
"3": 18
},
"4xFAB-500": {
"1": 32
@ -5963,10 +5962,11 @@
"2xFAB-250, 16x9M114": {
"1": 32
},
"16x9M114, 2xKMGU AT": {
"16x9M114, 10xS-13": {
"1": 31,
"2": 32,
"3": 18
"3": 18,
"4": 30
}
},
"Mi-8MT": {
@ -6713,7 +6713,7 @@
"1": 16
},
"Kh-29L*2,Kh-25ML*4,S-25L*2,R-60M*2": {
"1": 33
"1": 31
},
"FAB-500*6,R-60M*2,Fuel*2": {
"1": 32
@ -7368,16 +7368,19 @@
"1": 16
},
"AGM-88*4,AIM-9*2,ECM": {
"1": 29
"1": 29,
"2": 31
},
"AGM-88*2,AIM-9*2,Fuel*2,ECM": {
"1": 29
"1": 29,
"2": 31
},
"Kormoran*4,AIM-9*2": {
"1": 30
},
"Kormoran*2,AIM-9*2,AGM-88*2": {
"1": 30
"1": 30,
"2": 31
},
"Mk-82*4,AIM-9*2,Fuel*2": {
"1": 32

1582
scripts/unitPayloads.lua
View File

File diff suppressed because it is too large Load Diff