weyne/DCS-CTLD
1
0
Fork 0
mirror of https://github.com/ciribob/DCS-CTLD.git synced 2025-08-15 06:17:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixes

Browse Source
This commit is contained in:
FullGas1
2025-03-23 16:49:29 +01:00
parent 38e86bead3
commit f152f58a97
1 changed files with 20 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
CTLD.lua
View File

@@ -2044,15 +2044,6 @@ function ctld.getCrateDesc(_crateWeight)
end end
-- *************************************************************** -- ***************************************************************
function ctld.repackVehicleRequest(_params) -- update rrs table 'repackRequestsStack' with the request function ctld.repackVehicleRequest(_params) -- update rrs table 'repackRequestsStack' with the request
--[[
local repackableUnit = _params[1]
local PlayerTransportUnitName = _params[2]
local PlayerTransportUnit = Unit.getByName(PlayerTransportUnitName)
local TransportUnit = ctld.getTransportUnit(PlayerTransportUnitName)
local spawnRefPoint = PlayerTransportUnit:getPoint()
local refCountry = PlayerTransportUnit:getCountry()
]]--
ctld.repackRequestsStack[#ctld.repackRequestsStack+1] = _params ctld.repackRequestsStack[#ctld.repackRequestsStack+1] = _params
ctld.logTrace("FG_ ctld.repackVehicleRequest = %s", ctld.p(mist.utils.tableShow(ctld.repackRequestsStack))) ctld.logTrace("FG_ ctld.repackVehicleRequest = %s", ctld.p(mist.utils.tableShow(ctld.repackRequestsStack)))
end end
@@ -2063,32 +2054,34 @@ function ctld.repackVehicle(_params,t) -- scan rrs table 'repackRequestsStack'
end end
ctld.logTrace("FG_ ctld.repackVehicle = %s", ctld.p(mist.utils.tableShow(ctld.repackRequestsStack))) ctld.logTrace("FG_ ctld.repackVehicle = %s", ctld.p(mist.utils.tableShow(ctld.repackRequestsStack)))
for ii, v in ipairs(ctld.repackRequestsStack) do for ii, v in ipairs(ctld.repackRequestsStack) do
local repackableUnit = v[1] local repackableUnitName = v[1].repackableUnitName
local PlayerTransportUnitName = v[2] local crateWeight = v[1].weight
local PlayerTransportUnit = Unit.getByName(PlayerTransportUnitName) local repackableUnit = Unit.getByName(repackableUnitName)
ctld.logTrace(" ctld.repackVehicle.repackableUnit = %s", ctld.p(mist.utils.tableShow(repackableUnit))) local PlayerTransportUnit = Unit.getByName(v[2][1])
local TransportUnit = ctld.getTransportUnit(PlayerTransportUnitName) local TransportUnit = ctld.getTransportUnit(PlayerTransportUnitName)
local spawnRefPoint = PlayerTransportUnit:getPoint() local spawnRefPoint = PlayerTransportUnit:getPoint()
local refCountry = PlayerTransportUnit:getCountry() local refCountry = PlayerTransportUnit:getCountry()
if repackableUnit then
if repackableUnit then
if repackableUnit:isExist() then if repackableUnit:isExist() then
--ici calculer le heading des spwans à effectuer --ici calculer le heading des spwans à effectuer
for i=1, repackableUnit.cratesRequired do for i=1, v[1].cratesRequired do
local _point = {x = spawnRefPoint.x+(i*5), z = spawnRefPoint.z} local _point = {x = spawnRefPoint.x+(i*5), z = spawnRefPoint.z}
-- see to spawn the crate at random position heading the transport unit with ctld.getPointAtDirection(_unit, _offset, _directionInRadian) -- see to spawn the crate at random position heading the transport unit with ctld.getPointAtDirection(_unit, _offset, _directionInRadian)
local _unitId = ctld.getNextUnitId() local _unitId = ctld.getNextUnitId()
local _name = string.format("%s #%i", repackableUnit.desc, _unitId) local _name = string.format("%s_%i", v[1].desc, _unitId)
ctld.spawnCrateStatic(PlayerTransportUnit:getCountry(), _unitId, _point, _name, repackableUnit.weight, PlayerTransportUnit:getCoalition(), mist.getHeading(PlayerTransportUnit, true)) ctld.spawnCrateStatic(PlayerTransportUnit:getCountry(), _unitId, _point, _name, crateWeight, PlayerTransportUnit:getCoalition(), mist.getHeading(PlayerTransportUnit, true))
end end
if ctld.isUnitInALogisticZone(repackableUnit) == nil then if ctld.isUnitInALogisticZone(repackableUnitName) == nil then
ctld.addStaticLogisticUnit({x = spawnRefPoint.x+5, z = spawnRefPoint.z+10}, refCountry) -- create a temporary logistic unit to be able to repack the vehicle ctld.addStaticLogisticUnit({x = spawnRefPoint.x+5, z = spawnRefPoint.z+10}, refCountry) -- create a temporary logistic unit to be able to repack the vehicle
end end
repackableUnit.vehicleId:destroy() -- destroy repacked unit repackableUnit:destroy() -- destroy repacked unit
end end
ctld.repackRequestsStack[ii] = nil ctld.repackRequestsStack[ii] = nil
end end
end
end
return 3 -- reschedule the function in 3 seconds return 3 -- reschedule the function in 3 seconds
end end
--[[ *************************************************************** --[[ ***************************************************************
@@ -2169,11 +2162,12 @@ function ctld.isUnitInNamedLogisticZone(_unitName, _logisticUnitName) -- check i
return false return false
end end
local unitPoint = _unit:getPoint() local unitPoint = _unit:getPoint()
local logisticUnitPoint = StaticObject.getByName(_logisticUnitName):getPoint() if StaticObject.getByName(_logisticUnitName) then
local logisticUnitPoint = StaticObject.getByName(_logisticUnitName):getPoint()
local _dist = ctld.getDistance(unitPoint, logisticUnitPoint) local _dist = ctld.getDistance(unitPoint, logisticUnitPoint)
if _dist <= ctld.maximumDistanceLogistic then if _dist <= ctld.maximumDistanceLogistic then
return true return true
end
end end
return false return false
end end
@@ -6026,7 +6020,6 @@ function ctld.addTransportF10MenuOptions(_unitName)
menuArgsTable = {_vehicle, _unitName} }) menuArgsTable = {_vehicle, _unitName} })
end end
local RepackmenuPath = missionCommands.addSubMenuForGroup(_groupId, ctld.i18n_translate("Repack Vehicles"), _vehicleCommandsPath) local RepackmenuPath = missionCommands.addSubMenuForGroup(_groupId, ctld.i18n_translate("Repack Vehicles"), _vehicleCommandsPath)
ctld.logTrace("FG_ menuEntries = %s", ctld.p(mist.utils.tableShow(menuEntries)))
ctld.buildPaginatedMenu(menuEntries) ctld.buildPaginatedMenu(menuEntries)
end end
end end