From 93fd9e5d42ff08bec87fc2ad4e3fcec7f1e64a48 Mon Sep 17 00:00:00 2001 From: Applevangelist Date: Tue, 5 Sep 2023 10:35:12 +0200 Subject: [PATCH 1/2] #CLIENTMENU * Catch error on Menu removes --- Moose Development/Moose/Core/ClientMenu.lua | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/Moose Development/Moose/Core/ClientMenu.lua b/Moose Development/Moose/Core/ClientMenu.lua index 1f11eebaa..458143c77 100644 --- a/Moose Development/Moose/Core/ClientMenu.lua +++ b/Moose Development/Moose/Core/ClientMenu.lua @@ -35,6 +35,7 @@ -- @field #string lid Lid for log entries -- @field #string version Version string -- @field #string name Name +-- @field #string groupname Group name -- @field #table path -- @field #table parentpath -- @field #CLIENTMENU Parent @@ -57,7 +58,7 @@ CLIENTMENU = { ClassName = "CLIENTMENUE", lid = "", - version = "0.1.0", + version = "0.1.1", name = nil, path = nil, group = nil, @@ -68,6 +69,7 @@ CLIENTMENU = { Generic = false, debug = false, Controller = nil, + groupname = nil, } --- @@ -91,6 +93,7 @@ function CLIENTMENU:NewEntry(Client,Text,Parent,Function,...) self.group = Client:GetGroup() self.client = Client self.GroupID = self.group:GetID() + self.groupname = self.group:GetName() or "Unknown Groupname" else self.Generic = true end @@ -190,7 +193,10 @@ function CLIENTMENU:RemoveF10() self:T(self.lid.."RemoveF10") if self.GroupID then --self:I(self.lid.."Removing "..table.concat(self.path,";")) - missionCommands.removeItemForGroup(self.GroupID , self.path ) + local status, err = pcall(missionCommands.removeItemForGroup(self.GroupID , self.path )) + if not status then + self:I(string.format("**** Error Removing Menu Entry %s for %s!",tostring(self.name),self.groupname)) + end end return self end From 02105b1efcfaeaa5dedf819d83ede61ccd494fa7 Mon Sep 17 00:00:00 2001 From: Frank Date: Tue, 5 Sep 2023 20:53:02 +0200 Subject: [PATCH 2/2] Update Airboss.lua Fixed bug missing end in if statement --- Moose Development/Moose/Ops/Airboss.lua | 108 ++++++++++++------------ 1 file changed, 55 insertions(+), 53 deletions(-) diff --git a/Moose Development/Moose/Ops/Airboss.lua b/Moose Development/Moose/Ops/Airboss.lua index 56546d662..2e03496d8 100644 --- a/Moose Development/Moose/Ops/Airboss.lua +++ b/Moose Development/Moose/Ops/Airboss.lua @@ -14792,66 +14792,68 @@ function AIRBOSS:RadioTransmission( radio, call, loud, delay, interval, click, p end else + -- SRS transmission if call.subtitle ~= nil and string.len(call.subtitle) > 1 then - else - -- SRS transmission + else + -- SRS transmission - local frequency = self.MarshalRadio.frequency - local modulation = self.MarshalRadio.modulation - local voice = nil - local gender = nil - local culture = nil + local frequency = self.MarshalRadio.frequency + local modulation = self.MarshalRadio.modulation + local voice = nil + local gender = nil + local culture = nil - if radio.alias == "AIRBOSS" then - frequency = self.AirbossRadio.frequency - modulation = self.AirbossRadio.modulation - voice = self.AirbossRadio.voice - gender = self.AirbossRadio.gender - culture = self.AirbossRadio.culture + if radio.alias == "AIRBOSS" then + frequency = self.AirbossRadio.frequency + modulation = self.AirbossRadio.modulation + voice = self.AirbossRadio.voice + gender = self.AirbossRadio.gender + culture = self.AirbossRadio.culture + end + + if radio.alias == "MARSHAL" then + voice = self.MarshalRadio.voice + gender = self.MarshalRadio.gender + culture = self.MarshalRadio.culture + end + + if radio.alias == "LSO" then + frequency = self.LSORadio.frequency + modulation = self.LSORadio.modulation + voice = self.LSORadio.voice + gender = self.LSORadio.gender + culture = self.LSORadio.culture + end + + if pilotcall then + voice = self.PilotRadio.voice + gender = self.PilotRadio.gender + culture = self.PilotRadio.culture + radio.alias = "PILOT" + end + + if not radio.alias then + -- TODO - what freq to use here? + frequency = self.AirbossRadio.frequency + modulation = self.AirbossRadio.modulation + radio.alias = "AIRBOSS" + end + + local volume = nil + + if loud then + volume = 1.0 + end + + --local text = tostring(call.modexreceiver).."; "..radio.alias.."; "..call.subtitle + local text = call.subtitle + self:I(self.lid..text) + local srstext = self:_GetNiceSRSText(text) + self.SRSQ:NewTransmission(srstext, call.duration, self.SRS, tstart, 0.1, subgroups, call.subtitle, call.subduration, frequency, modulation, gender, culture, voice, volume, radio.alias) end - - if radio.alias == "MARSHAL" then - voice = self.MarshalRadio.voice - gender = self.MarshalRadio.gender - culture = self.MarshalRadio.culture - end - - if radio.alias == "LSO" then - frequency = self.LSORadio.frequency - modulation = self.LSORadio.modulation - voice = self.LSORadio.voice - gender = self.LSORadio.gender - culture = self.LSORadio.culture - end - - if pilotcall then - voice = self.PilotRadio.voice - gender = self.PilotRadio.gender - culture = self.PilotRadio.culture - radio.alias = "PILOT" - end - - if not radio.alias then - -- TODO - what freq to use here? - frequency = self.AirbossRadio.frequency - modulation = self.AirbossRadio.modulation - radio.alias = "AIRBOSS" - end - - local volume = nil - - if loud then - volume = 1.0 - end - - --local text = tostring(call.modexreceiver).."; "..radio.alias.."; "..call.subtitle - local text = call.subtitle - self:I(self.lid..text) - local srstext = self:_GetNiceSRSText(text) - self.SRSQ:NewTransmission(srstext, call.duration, self.SRS, tstart, 0.1, subgroups, call.subtitle, call.subduration, frequency, modulation, gender, culture, voice, volume, radio.alias) end end