Revert accidental wrong commit

This commit is contained in:
RndName 2022-01-12 20:19:29 +01:00
parent 420779fb4e
commit 0106e1c64a
No known key found for this signature in database
GPG Key ID: 5EF516FD9537F7C0
4 changed files with 331 additions and 777 deletions

View File

@ -13,7 +13,6 @@ Saves from 5.x are not compatible with 6.0.
* **[Flight Planning]** AWACS flightplan changed from orbit to a racetrack to reduce data link disconnects which were caused by blind spots as a result of the bank angle. * **[Flight Planning]** AWACS flightplan changed from orbit to a racetrack to reduce data link disconnects which were caused by blind spots as a result of the bank angle.
* **[Modding]** Add F-104 mod support * **[Modding]** Add F-104 mod support
* **[Modding]** Updated Community A-4E-C mod version support to 2.0.0 release. Version 1.4.2 is no longer compatible, unless the mod default loadouts are deleted/modified. * **[Modding]** Updated Community A-4E-C mod version support to 2.0.0 release. Version 1.4.2 is no longer compatible, unless the mod default loadouts are deleted/modified.
* **[Modding]** Updated Community JAS-39-C mod version support to 1.8.0-Beta. Older versions are not supported anymore.
* **[UI]** Added options to the loadout editor for setting properties such as HMD choice. * **[UI]** Added options to the loadout editor for setting properties such as HMD choice.
## Fixes ## Fixes

File diff suppressed because it is too large Load Diff

View File

@ -6,7 +6,7 @@ local unitPayloads = {
["name"] = "CAP", ["name"] = "CAP",
["pylons"] = { ["pylons"] = {
[1] = { [1] = {
["CLSID"] = "{JAS39_IRIS-T}", ["CLSID"] = "JAS39_IRIS-T",
["num"] = 8, ["num"] = 8,
}, },
[2] = { [2] = {
@ -18,27 +18,27 @@ local unitPayloads = {
["num"] = 11, ["num"] = 11,
}, },
[4] = { [4] = {
["CLSID"] = "{JAS39_IRIS-T}", ["CLSID"] = "JAS39_IRIS-T",
["num"] = 1, ["num"] = 1,
}, },
[5] = { [5] = {
["CLSID"] = "{JAS39_Meteor}", ["CLSID"] = "JAS39_Meteor",
["num"] = 7, ["num"] = 7,
}, },
[6] = { [6] = {
["CLSID"] = "{JAS39_Meteor}", ["CLSID"] = "JAS39_Meteor",
["num"] = 6, ["num"] = 6,
}, },
[7] = { [7] = {
["CLSID"] = "{JAS39_Meteor}", ["CLSID"] = "JAS39_Meteor",
["num"] = 2, ["num"] = 2,
}, },
[8] = { [8] = {
["CLSID"] = "{JAS39_Meteor}", ["CLSID"] = "JAS39_Meteor",
["num"] = 3, ["num"] = 3,
}, },
[9] = { [9] = {
["CLSID"] = "{JAS39_TANK1100}", ["CLSID"] = "JAS39_TANK1100",
["num"] = 4, ["num"] = 4,
}, },
}, },

View File

@ -6,15 +6,15 @@ local unitPayloads = {
["name"] = "ANTISHIP", ["name"] = "ANTISHIP",
["pylons"] = { ["pylons"] = {
[1] = { [1] = {
["CLSID"] = "{JAS39_IRIS-T}", ["CLSID"] = "JAS39_IRIS-T",
["num"] = 1, ["num"] = 1,
}, },
[2] = { [2] = {
["CLSID"] = "{JAS39_IRIS-T}", ["CLSID"] = "JAS39_IRIS-T",
["num"] = 8, ["num"] = 8,
}, },
[3] = { [3] = {
["CLSID"] = "{JAS39_TANK1100}", ["CLSID"] = "JAS39_TANK1100",
["num"] = 4, ["num"] = 4,
}, },
[4] = { [4] = {
@ -26,19 +26,19 @@ local unitPayloads = {
["num"] = 11, ["num"] = 11,
}, },
[6] = { [6] = {
["CLSID"] = "{JAS39_RBS15AI}", ["CLSID"] = "JAS39_RBS15AI",
["num"] = 6, ["num"] = 6,
}, },
[7] = { [7] = {
["CLSID"] = "{JAS39_RBS15AI}", ["CLSID"] = "JAS39_RBS15AI",
["num"] = 7, ["num"] = 7,
}, },
[8] = { [8] = {
["CLSID"] = "{JAS39_RBS15AI}", ["CLSID"] = "JAS39_RBS15AI",
["num"] = 2, ["num"] = 2,
}, },
[9] = { [9] = {
["CLSID"] = "{JAS39_RBS15AI}", ["CLSID"] = "JAS39_RBS15AI",
["num"] = 3, ["num"] = 3,
}, },
}, },
@ -51,15 +51,15 @@ local unitPayloads = {
["name"] = "SEAD", ["name"] = "SEAD",
["pylons"] = { ["pylons"] = {
[1] = { [1] = {
["CLSID"] = "{JAS39_IRIS-T}", ["CLSID"] = "JAS39_IRIS-T",
["num"] = 1, ["num"] = 1,
}, },
[2] = { [2] = {
["CLSID"] = "{JAS39_IRIS-T}", ["CLSID"] = "JAS39_IRIS-T",
["num"] = 8, ["num"] = 8,
}, },
[3] = { [3] = {
["CLSID"] = "{JAS39_TANK1100}", ["CLSID"] = "JAS39_TANK1100",
["num"] = 4, ["num"] = 4,
}, },
[4] = { [4] = {
@ -71,19 +71,19 @@ local unitPayloads = {
["num"] = 11, ["num"] = 11,
}, },
[6] = { [6] = {
["CLSID"] = "{JAS39_MAR-1}", ["CLSID"] = "JAS39_MAR-1",
["num"] = 2, ["num"] = 2,
}, },
[7] = { [7] = {
["CLSID"] = "{JAS39_MAR-1}", ["CLSID"] = "JAS39_MAR-1",
["num"] = 3, ["num"] = 3,
}, },
[8] = { [8] = {
["CLSID"] = "{JAS39_MAR-1}", ["CLSID"] = "JAS39_MAR-1",
["num"] = 6, ["num"] = 6,
}, },
[9] = { [9] = {
["CLSID"] = "{JAS39_MAR-1}", ["CLSID"] = "JAS39_MAR-1",
["num"] = 7, ["num"] = 7,
}, },
}, },
@ -96,15 +96,15 @@ local unitPayloads = {
["name"] = "DEAD", ["name"] = "DEAD",
["pylons"] = { ["pylons"] = {
[1] = { [1] = {
["CLSID"] = "{JAS39_IRIS-T}", ["CLSID"] = "JAS39_IRIS-T",
["num"] = 1, ["num"] = 1,
}, },
[2] = { [2] = {
["CLSID"] = "{JAS39_IRIS-T}", ["CLSID"] = "JAS39_IRIS-T",
["num"] = 8, ["num"] = 8,
}, },
[3] = { [3] = {
["CLSID"] = "{JAS39_TANK1100}", ["CLSID"] = "JAS39_TANK1100",
["num"] = 4, ["num"] = 4,
}, },
[4] = { [4] = {
@ -116,19 +116,19 @@ local unitPayloads = {
["num"] = 11, ["num"] = 11,
}, },
[6] = { [6] = {
["CLSID"] = "{JAS39_STORMSHADOW_ARM}", ["CLSID"] = "JAS39_STORMSHADOW",
["num"] = 3, ["num"] = 3,
}, },
[7] = { [7] = {
["CLSID"] = "{JAS39_STORMSHADOW_ARM}", ["CLSID"] = "JAS39_STORMSHADOW",
["num"] = 6, ["num"] = 6,
}, },
[8] = { [8] = {
["CLSID"] = "{JAS39_MAR-1}", ["CLSID"] = "JAS39_MAR-1",
["num"] = 2, ["num"] = 2,
}, },
[9] = { [9] = {
["CLSID"] = "{JAS39_MAR-1}", ["CLSID"] = "JAS39_MAR-1",
["num"] = 7, ["num"] = 7,
}, },
}, },
@ -141,15 +141,15 @@ local unitPayloads = {
["name"] = "CAS", ["name"] = "CAS",
["pylons"] = { ["pylons"] = {
[1] = { [1] = {
["CLSID"] = "{JAS39_IRIS-T}", ["CLSID"] = "JAS39_IRIS-T",
["num"] = 1, ["num"] = 1,
}, },
[2] = { [2] = {
["CLSID"] = "{JAS39_IRIS-T}", ["CLSID"] = "JAS39_IRIS-T",
["num"] = 8, ["num"] = 8,
}, },
[3] = { [3] = {
["CLSID"] = "{JAS39_TANK1100}", ["CLSID"] = "JAS39_TANK1100",
["num"] = 4, ["num"] = 4,
}, },
[4] = { [4] = {
@ -161,23 +161,23 @@ local unitPayloads = {
["num"] = 11, ["num"] = 11,
}, },
[6] = { [6] = {
["CLSID"] = "{JAS39_BRIMSTONE}", ["CLSID"] = "JAS39_BRIMSTONE",
["num"] = 2, ["num"] = 2,
}, },
[7] = { [7] = {
["CLSID"] = "{JAS39_BRIMSTONE}", ["CLSID"] = "JAS39_BRIMSTONE",
["num"] = 3, ["num"] = 3,
}, },
[8] = { [8] = {
["CLSID"] = "{JAS39_BRIMSTONE}", ["CLSID"] = "JAS39_BRIMSTONE",
["num"] = 6, ["num"] = 6,
}, },
[9] = { [9] = {
["CLSID"] = "{JAS39_BRIMSTONE}", ["CLSID"] = "JAS39_BRIMSTONE",
["num"] = 7, ["num"] = 7,
}, },
[10] = { [10] = {
["CLSID"] = "{JAS39_Litening}", ["CLSID"] = "JAS39_Litening",
["num"] = 5, ["num"] = 5,
}, },
[11] = { [11] = {
@ -194,15 +194,15 @@ local unitPayloads = {
["name"] = "STRIKE", ["name"] = "STRIKE",
["pylons"] = { ["pylons"] = {
[1] = { [1] = {
["CLSID"] = "{JAS39_IRIS-T}", ["CLSID"] = "JAS39_IRIS-T",
["num"] = 1, ["num"] = 1,
}, },
[2] = { [2] = {
["CLSID"] = "{JAS39_IRIS-T}", ["CLSID"] = "JAS39_IRIS-T",
["num"] = 8, ["num"] = 8,
}, },
[3] = { [3] = {
["CLSID"] = "{JAS39_TANK1100}", ["CLSID"] = "JAS39_TANK1100",
["num"] = 4, ["num"] = 4,
}, },
[4] = { [4] = {
@ -214,23 +214,23 @@ local unitPayloads = {
["num"] = 11, ["num"] = 11,
}, },
[6] = { [6] = {
["CLSID"] = "{JAS39_GBU31}", ["CLSID"] = "JAS39_GBU31",
["num"] = 2, ["num"] = 2,
}, },
[7] = { [7] = {
["CLSID"] = "{JAS39_GBU31}", ["CLSID"] = "JAS39_GBU31",
["num"] = 7, ["num"] = 7,
}, },
[8] = { [8] = {
["CLSID"] = "{JAS39_GBU49}", ["CLSID"] = "JAS39_GBU49",
["num"] = 3, ["num"] = 3,
}, },
[9] = { [9] = {
["CLSID"] = "{JAS39_GBU49}", ["CLSID"] = "JAS39_GBU49",
["num"] = 6, ["num"] = 6,
}, },
[10] = { [10] = {
["CLSID"] = "{JAS39_Litening}", ["CLSID"] = "JAS39_Litening",
["num"] = 5, ["num"] = 5,
}, },
[11] = { [11] = {
@ -247,15 +247,15 @@ local unitPayloads = {
["name"] = "OCA", ["name"] = "OCA",
["pylons"] = { ["pylons"] = {
[1] = { [1] = {
["CLSID"] = "{JAS39_IRIS-T}", ["CLSID"] = "JAS39_IRIS-T",
["num"] = 1, ["num"] = 1,
}, },
[2] = { [2] = {
["CLSID"] = "{JAS39_IRIS-T}", ["CLSID"] = "JAS39_IRIS-T",
["num"] = 8, ["num"] = 8,
}, },
[3] = { [3] = {
["CLSID"] = "{JAS39_TANK1100}", ["CLSID"] = "JAS39_TANK1100",
["num"] = 4, ["num"] = 4,
}, },
[4] = { [4] = {
@ -267,23 +267,23 @@ local unitPayloads = {
["num"] = 11, ["num"] = 11,
}, },
[6] = { [6] = {
["CLSID"] = "{JAS39_DWS39_TV}", ["CLSID"] = "JAS39_DWS39",
["num"] = 2, ["num"] = 2,
}, },
[7] = { [7] = {
["CLSID"] = "{JAS39_DWS39_TV}", ["CLSID"] = "JAS39_DWS39",
["num"] = 7, ["num"] = 7,
}, },
[8] = { [8] = {
["CLSID"] = "{JAS39_M70BHE}", ["CLSID"] = "JAS39_M70BHE",
["num"] = 3, ["num"] = 3,
}, },
[9] = { [9] = {
["CLSID"] = "{JAS39_M70BHE}", ["CLSID"] = "JAS39_M70BHE",
["num"] = 6, ["num"] = 6,
}, },
[10] = { [10] = {
["CLSID"] = "{JAS39_Litening}", ["CLSID"] = "JAS39_Litening",
["num"] = 5, ["num"] = 5,
}, },
[11] = { [11] = {