FlightControl-Master/MOOSE
1
0
Fork 0
mirror of https://github.com/FlightControl-Master/MOOSE.git synced 2025-10-29 16:58:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

#Chmages

Browse Source
This commit is contained in:
Applevangelist 2023-07-29 15:56:28 +02:00
parent 9c95b91086
commit 5c2b77cf76
2 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Moose Development/Moose/.vscode/settings.json vendored
View File

@ -1,5 +1,5 @@
{ {
"Lua.workspace.preloadFileSize": 1000, "Lua.workspace.preloadFileSize": 10000,
"Lua.diagnostics.disable": [ "Lua.diagnostics.disable": [
"undefined-doc-name", "undefined-doc-name",
"duplicate-set-field", "duplicate-set-field",
@ -8,7 +8,10 @@
"ambiguity-1", "ambiguity-1",
"undefined-doc-param", "undefined-doc-param",
"redundant-parameter", "redundant-parameter",
"param-type-mismatch" "param-type-mismatch",
"deprecated",
"undefined-global",
"lowercase-global"
], ],
"Lua.diagnostics.globals": [ "Lua.diagnostics.globals": [
"BASE", "BASE",

19
Moose Development/Moose/Ops/PlayerTask.lua
View File

@ -98,7 +98,7 @@ PLAYERTASK = {
--- PLAYERTASK class version. --- PLAYERTASK class version.
-- @field #string version -- @field #string version
PLAYERTASK.version="0.1.18" PLAYERTASK.version="0.1.19"
--- Generic task condition. --- Generic task condition.
-- @type PLAYERTASK.Condition -- @type PLAYERTASK.Condition
@ -3594,28 +3594,28 @@ function PLAYERTASKCONTROLLER:_RemoveMenuEntriesForTask(Task,Client)
if Task then if Task then
if Task.UUIDS and self.JoinTaskMenuTemplate then if Task.UUIDS and self.JoinTaskMenuTemplate then
--self:I("***** JoinTaskMenuTemplate") --self:I("***** JoinTaskMenuTemplate")
UTILS.PrintTableToLog(Task.UUIDS) --UTILS.PrintTableToLog(Task.UUIDS)
local controller = self.JoinTaskMenuTemplate local controller = self.JoinTaskMenuTemplate
for _,_uuid in pairs(Task.UUIDS) do for _,_uuid in pairs(Task.UUIDS) do
local Entry = controller:FindEntryByUUID(_uuid) local Entry = controller:FindEntryByUUID(_uuid)
if Entry then if Entry then
controller:DeleteF10Entry(Entry,Client) controller:DeleteF10Entry(Entry,Client)
controller:DeleteGenericEntry(Entry) controller:DeleteGenericEntry(Entry)
UTILS.PrintTableToLog(controller.menutree) --UTILS.PrintTableToLog(controller.menutree)
end end
end end
end end
if Task.AUUIDS and self.ActiveTaskMenuTemplate then if Task.AUUIDS and self.ActiveTaskMenuTemplate then
--self:I("***** ActiveTaskMenuTemplate") --self:I("***** ActiveTaskMenuTemplate")
UTILS.PrintTableToLog(Task.AUUIDS) --UTILS.PrintTableToLog(Task.AUUIDS)
for _,_uuid in pairs(Task.AUUIDS) do for _,_uuid in pairs(Task.AUUIDS) do
local controller = self.ActiveTaskMenuTemplate local controller = self.ActiveTaskMenuTemplate
local Entry = controller:FindEntryByUUID(_uuid) local Entry = controller:FindEntryByUUID(_uuid)
if Entry then if Entry then
controller:DeleteF10Entry(Entry,Client) controller:DeleteF10Entry(Entry,Client)
controller:DeleteGenericEntry(Entry) controller:DeleteGenericEntry(Entry)
UTILS.PrintTableToLog(controller.menutree) --UTILS.PrintTableToLog(controller.menutree)
end end
end end
end end
@ -4210,6 +4210,15 @@ function PLAYERTASKCONTROLLER:onafterTaskFailed(From, Event, To, Task)
taskname = string.format(failtxttts, self.MenuName or self.Name, Task.PlayerTaskNr, tostring(Task.TTSType)) taskname = string.format(failtxttts, self.MenuName or self.Name, Task.PlayerTaskNr, tostring(Task.TTSType))
self.SRSQueue:NewTransmission(taskname,nil,self.SRS,nil,2) self.SRSQueue:NewTransmission(taskname,nil,self.SRS,nil,2)
end end
local clients=Task:GetClientObjects()
for _,client in pairs(clients) do
self:_RemoveMenuEntriesForTask(Task,client)
--self:_SwitchMenuForClient(client,"Info")
end
for _,client in pairs(clients) do
-- self:_RemoveMenuEntriesForTask(Task,client)
self:_SwitchMenuForClient(client,"Info",5)
end
return self return self
end end