diff --git a/Moose Development/Moose/Fsm/Process.lua b/Moose Development/Moose/Fsm/Process.lua index 73fbcd076..bb6c869be 100644 --- a/Moose Development/Moose/Fsm/Process.lua +++ b/Moose Development/Moose/Fsm/Process.lua @@ -67,11 +67,12 @@ function PROCESS:GetMission() return self.ProcessTask.Mission end -function PROCESS:StartEvents() +function PROCESS:ProcessStart() end -function PROCESS:StopEvents() +function PROCESS:ProcessStop() + self:E("ProcessStop Base Class") self:EventRemoveAll() end @@ -85,7 +86,7 @@ function PROCESS:Assign( ProcessTask, ProcessUnit ) self:SetControllable( ProcessUnit ) self:SetTask( ProcessTask ) - self:StartEvents() + self:ProcessStart() self.ProcessGroup = ProcessUnit:GetGroup() --self:Activate() diff --git a/Moose Development/Moose/Process/Account.lua b/Moose Development/Moose/Process/Account.lua index 7d40a916c..58b4dc5e1 100644 --- a/Moose Development/Moose/Process/Account.lua +++ b/Moose Development/Moose/Process/Account.lua @@ -186,7 +186,7 @@ do -- PROCESS_ACCOUNT_DEADS return self end - function PROCESS_ACCOUNT_DEADS:StartEvents() + function PROCESS_ACCOUNT_DEADS:ProcessStart() self:EventOnDead( self.EventDead ) end diff --git a/Moose Development/Moose/Process/Smoke.lua b/Moose Development/Moose/Process/Smoke.lua index c203e08f9..0df9b4c93 100644 --- a/Moose Development/Moose/Process/Smoke.lua +++ b/Moose Development/Moose/Process/Smoke.lua @@ -144,6 +144,13 @@ do -- PROCESS_SMOKE_TARGETS_ZONE ClassName = "PROCESS_SMOKE_TARGETS_ZONE", } + function PROCESS_SMOKE_TARGETS_ZONE:ProcessStop() + self:E("ProcessStop Detailed") + + self.Menu:Remove() + + end + --- Creates a new target smoking state machine. The process will request from the menu if it accepts the task, if not, the unit is removed from the simulator. -- @param #PROCESS_SMOKE_TARGETS_ZONE self diff --git a/Moose Development/Moose/Tasking/Task.lua b/Moose Development/Moose/Tasking/Task.lua index 5f7174736..62bc19ca8 100644 --- a/Moose Development/Moose/Tasking/Task.lua +++ b/Moose Development/Moose/Tasking/Task.lua @@ -160,10 +160,10 @@ function TASK_BASE:UnAssignFromGroups() TaskGroup:SetState( TaskGroup, "Assigned", nil ) local TaskUnits = TaskGroup:GetUnits() for UnitID, UnitData in pairs( TaskUnits ) do - local TaskUnit = UnitData -- Unit#UNIT + local TaskUnit = UnitData -- Wrapper.Unit#UNIT local PlayerName = TaskUnit:GetPlayerName() if PlayerName ~= nil or PlayerName ~= "" then - self:UnAssignFromUnit( TaskUnit ) + self:UnAssignFromUnit( TaskUnit:GetName() ) end end end @@ -204,7 +204,9 @@ function TASK_BASE:UnAssignFromUnit( TaskUnitName ) self:F( TaskUnitName ) if self:HasStateMachine( TaskUnitName ) == true then + self:E("RemoveStateMachines") self:RemoveStateMachines( TaskUnitName ) + self:E("RemoveProcesses") self:RemoveProcesses( TaskUnitName ) end @@ -461,10 +463,11 @@ end -- @param #string TaskUnitName -- @return #TASK_BASE self function TASK_BASE:RemoveProcesses( TaskUnitName ) + self:E( TaskUnitName ) for ProcessID, ProcessData in pairs( self.Processes[TaskUnitName] ) do local Process = ProcessData -- Process.Process#PROCESS - Process:StopEvents() + Process:ProcessStop() Process = nil self.Processes[TaskUnitName][ProcessID] = nil self:E( self.Processes[TaskUnitName][ProcessID] ) diff --git a/Moose Development/Moose/Wrapper/Controllable.lua b/Moose Development/Moose/Wrapper/Controllable.lua index dc91512e7..ac5866fdb 100644 --- a/Moose Development/Moose/Wrapper/Controllable.lua +++ b/Moose Development/Moose/Wrapper/Controllable.lua @@ -127,7 +127,7 @@ --- The CONTROLLABLE class -- @type CONTROLLABLE --- @extends Positionable#POSITIONABLE +-- @extends Wrapper.Positionable#POSITIONABLE -- @field DCSControllable#Controllable DCSControllable The DCS controllable class. -- @field #string ControllableName The name of the controllable. CONTROLLABLE = { diff --git a/Moose Development/Moose/Wrapper/Identifiable.lua b/Moose Development/Moose/Wrapper/Identifiable.lua index cc12bdbb4..36d41e828 100644 --- a/Moose Development/Moose/Wrapper/Identifiable.lua +++ b/Moose Development/Moose/Wrapper/Identifiable.lua @@ -33,7 +33,7 @@ --- The IDENTIFIABLE class -- @type IDENTIFIABLE --- @extends Object#OBJECT +-- @extends Wrapper.Object#OBJECT -- @field #string IdentifiableName The name of the identifiable. IDENTIFIABLE = { ClassName = "IDENTIFIABLE", @@ -81,7 +81,7 @@ end --- Returns DCS Identifiable object name. -- The function provides access to non-activated objects too. --- @param Identifiable#IDENTIFIABLE self +-- @param Wrapper.Identifiable#IDENTIFIABLE self -- @return #string The name of the DCS Identifiable. -- @return #nil The DCS Identifiable is not existing or alive. function IDENTIFIABLE:GetName() diff --git a/Moose Development/Moose/Wrapper/Object.lua b/Moose Development/Moose/Wrapper/Object.lua index a2f804e5f..311539ecc 100644 --- a/Moose Development/Moose/Wrapper/Object.lua +++ b/Moose Development/Moose/Wrapper/Object.lua @@ -27,7 +27,7 @@ --- The OBJECT class -- @type OBJECT --- @extends Base#BASE +-- @extends Core.Base#BASE -- @field #string ObjectName The name of the Object. OBJECT = { ClassName = "OBJECT", diff --git a/Moose Development/Moose/Wrapper/Positionable.lua b/Moose Development/Moose/Wrapper/Positionable.lua index 9f10a54d5..f2207cc12 100644 --- a/Moose Development/Moose/Wrapper/Positionable.lua +++ b/Moose Development/Moose/Wrapper/Positionable.lua @@ -28,7 +28,7 @@ --- The POSITIONABLE class -- @type POSITIONABLE --- @extends Identifiable#IDENTIFIABLE +-- @extends Wrapper.Identifiable#IDENTIFIABLE -- @field #string PositionableName The name of the measurable. POSITIONABLE = { ClassName = "POSITIONABLE", diff --git a/Moose Development/Moose/Wrapper/Unit.lua b/Moose Development/Moose/Wrapper/Unit.lua index 713e5197f..586b44bb4 100644 --- a/Moose Development/Moose/Wrapper/Unit.lua +++ b/Moose Development/Moose/Wrapper/Unit.lua @@ -74,7 +74,7 @@ --- The UNIT class -- @type UNIT --- @extends Controllable#CONTROLLABLE +-- @extends Wrapper.Controllable#CONTROLLABLE -- @field #UNIT.FlareColor FlareColor -- @field #UNIT.SmokeColor SmokeColor UNIT = { diff --git a/Moose Test Missions/Moose_Test_Tasking/Moose_Test_Task_SEAD/Moose_Test_Task_SEAD.miz b/Moose Test Missions/Moose_Test_Tasking/Moose_Test_Task_SEAD/Moose_Test_Task_SEAD.miz index b1c35b574..208db4352 100644 Binary files a/Moose Test Missions/Moose_Test_Tasking/Moose_Test_Task_SEAD/Moose_Test_Task_SEAD.miz and b/Moose Test Missions/Moose_Test_Tasking/Moose_Test_Task_SEAD/Moose_Test_Task_SEAD.miz differ diff --git a/Moose Training/Presentations/DCS World - MOOSE - Tasking - SEAD.pptx b/Moose Training/Presentations/DCS World - MOOSE - Tasking - SEAD.pptx index 08ab81152..05534866a 100644 Binary files a/Moose Training/Presentations/DCS World - MOOSE - Tasking - SEAD.pptx and b/Moose Training/Presentations/DCS World - MOOSE - Tasking - SEAD.pptx differ