Merge branch 'release-candidate' into features/redgreen-unit

This commit is contained in:
Pax1601
2025-03-24 23:02:04 +01:00
21 changed files with 778 additions and 335 deletions

View File

@@ -659,7 +659,7 @@ end
-- lat: (number)
-- lng: (number)
-- alt: (number, optional) only for air units
-- loadout: (string, optional) only for air units, must be one of the loadouts defined in unitPayloads.lua
-- loadout: (string, optional) only for air units, must be one of the loadouts defined in unitPayloads.lua or mods.lua
-- payload: (table, optional) overrides loadout, specifies directly the loadout of the unit
-- liveryID: (string, optional)
function Olympus.spawnUnits(spawnTable)
@@ -731,6 +731,8 @@ function Olympus.generateAirUnitsTable(units)
if payload == nil then
if loadout ~= nil and loadout ~= "" and Olympus.unitPayloads[unit.unitType] and Olympus.unitPayloads[unit.unitType][loadout] then
payload = { ["pylons"] = Olympus.unitPayloads[unit.unitType][loadout], ["fuel"] = 999999, ["flare"] = 60, ["ammo_type"] = 1, ["chaff"] = 60, ["gun"] = 100 }
elseif loadout ~= nil and loadout ~= "" and Olympus.modsUnitPayloads ~= nil and Olympus.modsUnitPayloads[unit.unitType] and Olympus.modsUnitPayloads[unit.unitType][loadout] then
payload = { ["pylons"] = Olympus.modsUnitPayloads[unit.unitType][loadout], ["fuel"] = 999999, ["flare"] = 60, ["ammo_type"] = 1, ["chaff"] = 60, ["gun"] = 100 }
else
payload = { ["pylons"] = {}, ["fuel"] = 999999, ["flare"] = 60, ["ammo_type"] = 1, ["chaff"] = 60, ["gun"] = 100 }
end

View File

@@ -9,3 +9,19 @@ Olympus.modsList = {
["A-4E-C"] = "Aircraft",
["Bronco-OV-10A"] = "Aircraft"
}
-- Enter here any unitPayloads you want to use for your mods. Remember to add the payload to the database in mods.json!
-- DO NOT ADD PAYLOADS TO "ORIGINAL" DCS UNITS HERE! To add payloads to original DCS units, use the "unitPayload.lua" table instead and add them under the correct unit section.
-- Provided example is for the A-4E-C mod, with a payload of 76 FFAR Mk1 HE rockets and a 300 gallon fuel tank.
Olympus.modsUnitPayloads = {
["A-4E-C"] = {
["FFAR Mk1 HE *76, Fuel 300G"] = {
[1] = {["CLSID"] = "{LAU3_FFAR_MK1HE}"},
[2] = {["CLSID"] = "{LAU3_FFAR_MK1HE}"},
[3] = {["CLSID"] = "{LAU3_FFAR_MK1HE}"},
[4] = {["CLSID"] = "{LAU3_FFAR_MK1HE}"},
[5] = {["CLSID"] = "{DFT-300gal}"}
}
}
}