From 388103afea9aaf8be0b2c9031e7d6d215bd64013 Mon Sep 17 00:00:00 2001 From: FlightControl Date: Sat, 8 Jul 2017 12:40:56 +0200 Subject: [PATCH] Fixes -- when carrier containing cargo goes to spectators, it was not handled correctly. now it is -- removed "unassigned" message when task is cancelled from group. It is useless. --- Moose Development/Moose/Core/Cargo.lua | 6 ++++-- Moose Development/Moose/Tasking/Task.lua | 4 ++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/Moose Development/Moose/Core/Cargo.lua b/Moose Development/Moose/Core/Cargo.lua index a0fa950a5..89a641b93 100644 --- a/Moose Development/Moose/Core/Cargo.lua +++ b/Moose Development/Moose/Core/Cargo.lua @@ -1092,7 +1092,7 @@ function CARGO_GROUP:New( CargoGroup, Type, Name, ReportRadius ) return self end ---- @param #CARGO Cargo +--- @param #CARGO_GROUP self -- @param Core.Event#EVENTDATA EventData function CARGO_GROUP:OnEventCargoDead( EventData ) @@ -1109,7 +1109,9 @@ function CARGO_GROUP:OnEventCargoDead( EventData ) end end else - if self.CargoCarrier:GetName() == EventData.IniUnitName then + local CarrierName = self.CargoCarrier:GetName() + if CarrierName == EventData.IniDCSUnitName then + MESSAGE:New( "Cargo is lost from carrier " .. CarrierName, 15 ):ToAll() Destroyed = true self.CargoCarrier:ClearCargo() end diff --git a/Moose Development/Moose/Tasking/Task.lua b/Moose Development/Moose/Tasking/Task.lua index 26c5125c6..fcb78e62d 100644 --- a/Moose Development/Moose/Tasking/Task.lua +++ b/Moose Development/Moose/Tasking/Task.lua @@ -479,9 +479,9 @@ do -- Group Assignment SetAssignedGroups:ForEachGroup( function( AssignedGroup ) if self:IsGroupAssigned(AssignedGroup) then - self:GetMission():GetCommandCenter():MessageToGroup( string.format( "Task %s is unassigned from group %s.", TaskName, TaskGroupName ), AssignedGroup ) + --self:GetMission():GetCommandCenter():MessageToGroup( string.format( "Task %s is unassigned from group %s.", TaskName, TaskGroupName ), AssignedGroup ) else - self:GetMission():GetCommandCenter():MessageToGroup( string.format( "Task %s is unassigned from your group.", TaskName ), AssignedGroup ) + --self:GetMission():GetCommandCenter():MessageToGroup( string.format( "Task %s is unassigned from your group.", TaskName ), AssignedGroup ) end end )