diff --git a/Moose Development/Moose/Tasking/Task.lua b/Moose Development/Moose/Tasking/Task.lua index 1fbd2fa5b..2590db037 100644 --- a/Moose Development/Moose/Tasking/Task.lua +++ b/Moose Development/Moose/Tasking/Task.lua @@ -426,11 +426,11 @@ do -- Group Assignment local TaskGroupName = TaskGroup:GetName() if self.AssignedGroups[TaskGroupName] then - self:T( { "Task is assigned to:", TaskGroup:GetName() } ) + --self:T( { "Task is assigned to:", TaskGroup:GetName() } ) return true end - self:T( { "Task is not assigned to:", TaskGroup:GetName() } ) + --self:T( { "Task is not assigned to:", TaskGroup:GetName() } ) return false end @@ -751,7 +751,7 @@ function TASK:SetPlannedMenuForGroup( TaskGroup, MenuTime ) local ReportTaskMenu = MENU_GROUP_COMMAND:New( TaskGroup, string.format( "Report Task Status" ), TaskTypeMenu, self.MenuTaskStatus, self, TaskGroup ):SetTime( MenuTime ):SetTag( "Tasking" ) if not Mission:IsGroupAssigned( TaskGroup ) then - self:F( { "Replacing Join Task menu" } ) + --self:F( { "Replacing Join Task menu" } ) local JoinTaskMenu = MENU_GROUP_COMMAND:New( TaskGroup, string.format( "Join Task" ), TaskTypeMenu, self.MenuAssignToGroup, self, TaskGroup ):SetTime( MenuTime ):SetTag( "Tasking" ) local MarkTaskMenu = MENU_GROUP_COMMAND:New( TaskGroup, string.format( "Mark Task on Map" ), TaskTypeMenu, self.MenuMarkToGroup, self, TaskGroup ):SetTime( MenuTime ):SetTag( "Tasking" ) end @@ -1239,7 +1239,6 @@ end -- @param #string To function TASK:onenterAssigned( From, Event, To, PlayerUnit, PlayerName ) - --- This test is required, because the state transition will be fired also when the state does not change in case of an event. if From ~= "Assigned" then self:E( { From, Event, To, PlayerUnit:GetName(), PlayerName } ) @@ -1261,6 +1260,10 @@ function TASK:onenterAssigned( From, Event, To, PlayerUnit, PlayerName ) self:__Goal( -10, PlayerUnit, PlayerName ) -- Polymorphic self:SetMenu() + + self:E( { "--> Task Assigned", TaskName = self:GetName(), Mission = self:GetMission():GetName() } ) + self:E( { "--> Task Player Names", PlayerNames = self:GetPlayerNames() } ) + end end @@ -1272,7 +1275,8 @@ end -- @param #string To function TASK:onenterSuccess( From, Event, To ) - self:E( "Task Success" ) + self:E( { "<-> Task Replanned", TaskName = self:GetName(), Mission = self:GetMission():GetName() } ) + self:E( { "<-> Task Player Names", PlayerNames = self:GetPlayerNames() } ) self:GetMission():GetCommandCenter():MessageToCoalition( "Task " .. self:GetName() .. " is successful! Good job!" ) self:UnAssignFromGroups() @@ -1289,7 +1293,8 @@ end -- @param #string To function TASK:onenterAborted( From, Event, To ) - self:E( "Task Aborted" ) + self:E( { "<-- Task Aborted", TaskName = self:GetName(), Mission = self:GetMission():GetName() } ) + self:E( { "<-- Task Player Names", PlayerNames = self:GetPlayerNames() } ) if From ~= "Aborted" then self:GetMission():GetCommandCenter():MessageToCoalition( "Task " .. self:GetName() .. " has been aborted! Task may be replanned." ) @@ -1306,7 +1311,8 @@ end -- @param #string To function TASK:onenterCancelled( From, Event, To ) - self:E( "Task Cancelled" ) + self:E( { "<-- Task Cancelled", TaskName = self:GetName(), Mission = self:GetMission():GetName() } ) + self:E( { "<-- Player Names", PlayerNames = self:GetPlayerNames() } ) if From ~= "Cancelled" then self:GetMission():GetCommandCenter():MessageToCoalition( "Task " .. self:GetName() .. " has been cancelled! The tactical situation has changed." ) @@ -1323,7 +1329,8 @@ end -- @param #string To function TASK:onafterReplan( From, Event, To ) - self:E( "Task Replanned" ) + self:E( { "Task Replanned", TaskName = self:GetName(), Mission = self:GetMission():GetName() } ) + self:E( { "Task Player Names", PlayerNames = self:GetPlayerNames() } ) self:GetMission():GetCommandCenter():MessageToCoalition( "Replanning Task " .. self:GetName() .. "." ) @@ -1338,7 +1345,8 @@ end -- @param #string To function TASK:onenterFailed( From, Event, To ) - self:E( "Task Failed" ) + self:E( { "Task Failed", TaskName = self:GetName(), Mission = self:GetMission():GetName() } ) + self:E( { "Task Player Names", PlayerNames = self:GetPlayerNames() } ) self:GetMission():GetCommandCenter():MessageToCoalition( "Task " .. self:GetName() .. " has failed!" ) diff --git a/Moose Development/Moose/Wrapper/Object.lua b/Moose Development/Moose/Wrapper/Object.lua index 68ae6f775..a8fcdfe0c 100644 --- a/Moose Development/Moose/Wrapper/Object.lua +++ b/Moose Development/Moose/Wrapper/Object.lua @@ -58,7 +58,6 @@ end -- @return Dcs.DCSWrapper.Object#Object.ID ObjectID -- @return #nil The DCS Object is not existing or alive. function OBJECT:GetID() - self:F2( self.ObjectName ) local DCSObject = self:GetDCSObject() @@ -67,6 +66,8 @@ function OBJECT:GetID() return ObjectID end + BASE:E( { "Cannot GetID", Name = self.ObjectName, Class = self:GetClassName() } ) + return nil end @@ -74,7 +75,6 @@ end -- @param #OBJECT self -- @return #nil The DCS Unit is not existing or alive. function OBJECT:Destroy() - self:F2( self.ObjectName ) local DCSObject = self:GetDCSObject() @@ -83,6 +83,8 @@ function OBJECT:Destroy() DCSObject:destroy() end + BASE:E( { "Cannot Destroy", Name = self.ObjectName, Class = self:GetClassName() } ) + return nil end diff --git a/Moose Development/Moose/Wrapper/Positionable.lua b/Moose Development/Moose/Wrapper/Positionable.lua index d349211b0..0832f0cf2 100644 --- a/Moose Development/Moose/Wrapper/Positionable.lua +++ b/Moose Development/Moose/Wrapper/Positionable.lua @@ -600,9 +600,16 @@ function POSITIONABLE:MessageToGroup( Message, Duration, MessageGroup, Name ) local DCSObject = self:GetDCSObject() if DCSObject then if DCSObject:isExist() then - self:GetMessage( Message, Duration, Name ):ToGroup( MessageGroup ) + if MessageGroup:IsAlive() then + self:GetMessage( Message, Duration, Name ):ToGroup( MessageGroup ) + else + BASE:E( { "Message not sent to Group; Group is not alive...", Message = Message, MessageGroup = MessageGroup } ) + end + else + BASE:E( { "Message not sent to Group; Positionable is not alive ...", Message = Message, Positionable = self, MessageGroup = MessageGroup } ) end end + return nil end diff --git a/Moose Development/Moose/Wrapper/Unit.lua b/Moose Development/Moose/Wrapper/Unit.lua index 31eaf98ef..2d74b5b99 100644 --- a/Moose Development/Moose/Wrapper/Unit.lua +++ b/Moose Development/Moose/Wrapper/Unit.lua @@ -761,7 +761,6 @@ function UNIT:IsInZone( Zone ) if self:IsAlive() then local IsInZone = Zone:IsVec3InZone( self:GetVec3() ) - self:E( { Unit = self.UnitName, IsInZone = IsInZone } ) return IsInZone end return false