diff --git a/Moose Development/Moose/Functional/Warehouse.lua b/Moose Development/Moose/Functional/Warehouse.lua index 7c2643455..1c5f02e0f 100644 --- a/Moose Development/Moose/Functional/Warehouse.lua +++ b/Moose Development/Moose/Functional/Warehouse.lua @@ -6772,7 +6772,7 @@ function WAREHOUSE:_UnitDead(deadunit, deadgroup, request) -- Dont trigger a Remove event for the group sets. local NoTriggerEvent=true - if not request.transporttype==WAREHOUSE.TransportType.SELFPROPELLED then + if request.transporttype~=WAREHOUSE.TransportType.SELFPROPELLED then --- -- Complicated case: Dead unit could be: diff --git a/Moose Development/Moose/Ops/Auftrag.lua b/Moose Development/Moose/Ops/Auftrag.lua index b501813c8..c70ce6377 100644 --- a/Moose Development/Moose/Ops/Auftrag.lua +++ b/Moose Development/Moose/Ops/Auftrag.lua @@ -2230,7 +2230,13 @@ function AUFTRAG:NewRECON(ZoneSet, Speed, Altitude, Adinfinitum, Randomly, Forma mission:_TargetFromObject(ZoneSet) - mission.missionZoneSet = ZoneSet + if ZoneSet:IsInstanceOf("SET_ZONE") then + mission.missionZoneSet = ZoneSet + elseif ZoneSet:IsInstanceOf("ZONE_BASE") then + mission.missionZoneSet = SET_ZONE:New() + mission.missionZoneSet:AddZone(ZoneSet) + end + mission.missionTask=mission:GetMissionTaskforMissionType(AUFTRAG.Type.RECON) @@ -6699,8 +6705,6 @@ function AUFTRAG.CheckMissionCapabilityAll(MissionTypes, Capabilities) return res end - - ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- diff --git a/Moose Development/Moose/Sound/SRS.lua b/Moose Development/Moose/Sound/SRS.lua index 207f0177a..2dde65e80 100644 --- a/Moose Development/Moose/Sound/SRS.lua +++ b/Moose Development/Moose/Sound/SRS.lua @@ -582,6 +582,17 @@ function MSRS:SetVoice(Voice) return self end +--- Set to use a specific voice. Will override gender and culture settings. +-- @param #MSRS self +-- @param #string Voice Voice. +-- @return #MSRS self +function MSRS:SetDefaultVoice(Voice) + + self.defaultVoice=Voice + + return self +end + --- Set the coordinate from which the transmissions will be broadcasted. -- @param #MSRS self -- @param Core.Point#COORDINATE Coordinate Origin of the transmission. @@ -600,6 +611,20 @@ end function MSRS:SetGoogle(PathToCredentials) self.google=PathToCredentials + self.APIKey=PathToCredentials + self.provider = "gcloud" + + return self +end + +--- Use google text-to-speech. +-- @param #MSRS self +-- @param #string APIKey API Key, usually a string of length 40 with characters and numbers. +-- @return #MSRS self +function MSRS:SetGoogleAPIKey(APIKey) + + self.APIKey=APIKey + self.provider = "gcloud" return self end