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

commit

Browse Source
This commit is contained in:
FullGas1
2025-03-30 12:21:43 +02:00
parent 879272a2e8
commit ca99c58f98
1 changed files with 23 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
CTLD.lua
View File

@@ -2032,8 +2032,8 @@ function ctld.repackVehicle(_params, t) -- scan rrs table 'repackRequestsStack'
if t == nil then if t == nil then
t = timer.getTime() t = timer.getTime()
end end
ctld.logTrace("FG_ ctld.repackVehicle.ctld.repackRequestsStack = %s", ctld.p(mist.utils.tableShow(ctld.repackRequestsStack))) --ctld.logTrace("FG_ ctld.repackVehicle.ctld.repackRequestsStack = %s", ctld.p(mist.utils.tableShow(ctld.repackRequestsStack)))
ctld.logTrace("FG_ ctld.repackVehicle._params = %s", ctld.p(mist.utils.tableShow(_params))) --ctld.logTrace("FG_ ctld.repackVehicle._params = %s", ctld.p(mist.utils.tableShow(_params)))
for ii, v in ipairs(ctld.repackRequestsStack) do for ii, v in ipairs(ctld.repackRequestsStack) do
local repackableUnitName = v[1].repackableUnitName local repackableUnitName = v[1].repackableUnitName
local crateWeight = v[1].weight local crateWeight = v[1].weight
@@ -5831,7 +5831,7 @@ function ctld.addTransportF10MenuOptions(_unitName)
end end
if ctld.enableRepackingVehicles then if ctld.enableRepackingVehicles then
ctld.updateRepackMenu(_unitName) --ctld.updateRepackMenu(_unitName)
end end
if ctld.enabledFOBBuilding and ctld.staticBugWorkaround == false then if ctld.enabledFOBBuilding and ctld.staticBugWorkaround == false then
missionCommands.addCommandForGroup(_groupId, missionCommands.addCommandForGroup(_groupId,
@@ -5980,32 +5980,38 @@ end
--****************************************************************************************************** --******************************************************************************************************
function ctld.buildPaginatedMenu(_menuEntries) function ctld.buildPaginatedMenu(_menuEntries)
ctld.logTrace("FG_ ctld.buildPaginatedMenu._menuEntries = [%s]", ctld.p(_menuEntries)) ctld.logTrace("FG_ _menuEntries = [%s]", ctld.p(_menuEntries))
local nextSubMenuPath = "" local nextSubMenuPath = ""
local itemNbSubmenu = 0 local itemNbSubmenu = 0
for i, menu in ipairs(_menuEntries) do for i, menu in ipairs(_menuEntries) do
ctld.logTrace("FG ctld.buildPaginatedMenu.boucle[%s].menu = %s", i, ctld.p(menu)) ctld.logTrace("FG_ boucle[%s].menu = %s", i, ctld.p(menu))
if nextSubMenuPath ~= "" and menu.subMenuPath ~= nextSubMenuPath then if nextSubMenuPath ~= "" and menu.subMenuPath ~= nextSubMenuPath then
ctld.logTrace("FG_ boucle[%s].nextSubMenuPath = %s", i, ctld.p(nextSubMenuPath))
menu.subMenuPath = nextSubMenuPath menu.subMenuPath = nextSubMenuPath
end end
-- add the submenu item -- add the submenu item
itemNbSubmenu = itemNbSubmenu + 1 itemNbSubmenu = itemNbSubmenu + 1
if itemNbSubmenu == 11 and i < #_menuEntries then -- page limit reached if itemNbSubmenu == 10 then
ctld.logTrace("FG_ boucle[%s].menu.subMenuPath avant = %s", i, ctld.p(menu.subMenuPath))
menu.subMenuPath = missionCommands.addSubMenuForGroup(menu.groupId, ctld.i18n_translate("Next page"), menu.subMenuPath) menu.subMenuPath = missionCommands.addSubMenuForGroup(menu.groupId, ctld.i18n_translate("Next page"), menu.subMenuPath)
nextSubMenuPath = menu.subMenuPath nextSubMenuPath = menu.subMenuPath
itemNbSubmenu = 1 ctld.logTrace("FG_ boucle[%s].menu.subMenuPath apres = %s", i, ctld.p(menu.subMenuPath))
if i == #_menuEntries then -- page limit reached
itemNbSubmenu = 10
else
itemNbSubmenu = 1
end
end end
menu.menuArgsTable.subMenuPath = menu.subMenuPath menu.menuArgsTable.subMenuPath = menu.subMenuPath
menu.menuArgsTable.subMenuLineIndex = menu.itemNbSubmenu menu.menuArgsTable.subMenuLineIndex = menu.itemNbSubmenu
ctld.logTrace("FG ctld.buildPaginatedMenu.boucle[%s].menu.subMenuPath = %s", i, ctld.p(menu.subMenuPath)) ctld.logTrace("FG_ boucle[%s].menu.subMenuPath = %s", i, ctld.p(menu.subMenuPath))
missionCommands.addCommandForGroup(menu.groupId, menu.text, menu.subMenuPath, menu.menuFunction, menu.menuArgsTable)
--missionCommands.addCommandForGroup(menu.groupId, menu.text, menu.subMenuPath, menu.menuFunction, menu.menuArgsTable)
end end
end end
--****************************************************************************************************** --******************************************************************************************************
function ctld.updateRepackMenu(_playerUnitName) function ctld.updateRepackMenu(_playerUnitName)
ctld.logTrace("FG_ ctld.updateRepackMenu._playerUnitName = %s", ctld.p(_playerUnitName)) ctld.logTrace("FG_ _playerUnitName = %s", ctld.p(_playerUnitName))
local playerUnit = ctld.getTransportUnit(_playerUnitName) local playerUnit = ctld.getTransportUnit(_playerUnitName)
if playerUnit then if playerUnit then
local _unitTypename = playerUnit:getTypeName() local _unitTypename = playerUnit:getTypeName()
@@ -6013,14 +6019,14 @@ function ctld.updateRepackMenu(_playerUnitName)
if ctld.enableRepackingVehicles then if ctld.enableRepackingVehicles then
local repackableVehicles = ctld.getUnitsInRepackRadius(_playerUnitName, ctld.maximumDistanceRepackableUnitsSearch) local repackableVehicles = ctld.getUnitsInRepackRadius(_playerUnitName, ctld.maximumDistanceRepackableUnitsSearch)
if repackableVehicles then if repackableVehicles then
ctld.logTrace("FG_ ctld.updateRepackMenu.ctld.vehicleCommandsPath[_playerUnitName] = %s", ctld.p(ctld.vehicleCommandsPath[_playerUnitName])) ctld.logTrace("FG__ctld.vehicleCommandsPath[_playerUnitName] = %s", ctld.p(ctld.vehicleCommandsPath[_playerUnitName]))
local RepackCommandsPath = mist.utils.deepCopy(ctld.vehicleCommandsPath[_playerUnitName]) local RepackCommandsPath = mist.utils.deepCopy(ctld.vehicleCommandsPath[_playerUnitName])
RepackCommandsPath[#RepackCommandsPath + 1] = ctld.i18n_translate("Repack Vehicles") RepackCommandsPath[#RepackCommandsPath + 1] = ctld.i18n_translate("Repack Vehicles")
ctld.logTrace("FG_ ctld.updateRepackMenu.RepackCommandsPath = %s", ctld.p(RepackCommandsPath)) --ctld.logTrace("FG_ RepackCommandsPath = %s", ctld.p(RepackCommandsPath))
missionCommands.removeItemForGroup(1, RepackCommandsPath) -- remove the old repack menu missionCommands.removeItemForGroup(_groupId, RepackCommandsPath) -- remove the old repack menu
local RepackmenuPath = missionCommands.addSubMenuForGroup(_groupId,ctld.i18n_translate("Repack Vehicles"), ctld.vehicleCommandsPath[_playerUnitName]) local RepackmenuPath = missionCommands.addSubMenuForGroup(_groupId,ctld.i18n_translate("Repack Vehicles"), ctld.vehicleCommandsPath[_playerUnitName])
local menuEntries = {} local menuEntries = {}
ctld.logTrace("FG_ ctld.updateRepackMenu.RepackmenuPath = %s", ctld.p(RepackmenuPath)) --ctld.logTrace("FG_ RepackmenuPath = %s", ctld.p(RepackmenuPath))
for _, _vehicle in pairs(repackableVehicles) do for _, _vehicle in pairs(repackableVehicles) do
table.insert(menuEntries, { table.insert(menuEntries, {
text = ctld.i18n_translate("repack ") .. _vehicle.unit, text = ctld.i18n_translate("repack ") .. _vehicle.unit,
@@ -6053,7 +6059,7 @@ function ctld.autoUpdateRepackMenu(p, t) -- auto update repack menus for each tr
if _groupId then if _groupId then
if ctld.addedTo[tostring(_groupId)] ~= nil then if ctld.addedTo[tostring(_groupId)] ~= nil then
ctld.logTrace("FG_ ctld.autoUpdateRepackMenu call ctld.updateRepackMenu ofr = %s", ctld.p(_unitName)) ctld.logTrace("FG_ ctld.autoUpdateRepackMenu call ctld.updateRepackMenu ofr = %s", ctld.p(_unitName))
ctld.updateRepackMenu(_unitName) --ctld.updateRepackMenu(_unitName)
end end
end end
end end
@@ -8090,7 +8096,7 @@ function ctld.initialize()
timer.scheduleFunction(ctld.checkHoverStatus, nil, timer.getTime() + 1) timer.scheduleFunction(ctld.checkHoverStatus, nil, timer.getTime() + 1)
end end
if ctld.enableRepackingVehicles == true then if ctld.enableRepackingVehicles == true then
timer.scheduleFunction(ctld.autoUpdateRepackMenu, nil, timer.getTime() + 3) --timer.scheduleFunction(ctld.autoUpdateRepackMenu, nil, timer.getTime() + 3)
timer.scheduleFunction(ctld.repackVehicle, nil, timer.getTime() + 1) timer.scheduleFunction(ctld.repackVehicle, nil, timer.getTime() + 1)
end end
end, nil, timer.getTime() + 1) end, nil, timer.getTime() + 1)