diff --git a/Moose Development/Moose/StateMachine.lua b/Moose Development/Moose/StateMachine.lua index 3f070308d..6e6fcdef5 100644 --- a/Moose Development/Moose/StateMachine.lua +++ b/Moose Development/Moose/StateMachine.lua @@ -108,6 +108,7 @@ function STATEMACHINE:_create_transition(name) local fsmparent, event = self:_isendstate( to ) if fsmparent and event then + self:_call_handler(self["onstatechange"], params) fsmparent[event]( fsmparent ) else self:_call_handler(self["onenter" .. to] or self["on" .. to], params) diff --git a/Moose Development/Moose/TaskClientSead.lua b/Moose Development/Moose/TaskClientSead.lua index aeaf30ec9..5835f09be 100644 --- a/Moose Development/Moose/TaskClientSead.lua +++ b/Moose Development/Moose/TaskClientSead.lua @@ -43,7 +43,8 @@ function TASK2_SEAD:New( Client, Mission, TargetSet ) onMoreTargets = self.OnMoreTargets, onDestroyed = self.OnDestroyed, onKilled = self.OnKilled, - } + }, + endstates = { 'Success', 'Failed' } } ) diff --git a/Moose Test Missions/Moose_Test_TASK_SEAD/Moose_Test_TASK_SEAD.lua b/Moose Test Missions/Moose_Test_TASK_SEAD/Moose_Test_TASK_SEAD.lua index 4c3d407e6..1e7fb9e92 100644 --- a/Moose Test Missions/Moose_Test_TASK_SEAD/Moose_Test_TASK_SEAD.lua +++ b/Moose Test Missions/Moose_Test_TASK_SEAD/Moose_Test_TASK_SEAD.lua @@ -20,8 +20,8 @@ local Task_Sead = STATEMACHINE:New( { { name = 'Start', from = 'None', to = 'Unassigned' }, { name = 'Next', from = 'Unassigned', to = 'Assigned' }, -- { name = 'Route', from = 'Assigned', to = 'Arrived' }, - { name = 'Next', from = 'Assigned', to = 'Seading' }, - { name = 'Destroyed', from = 'Destroy', to = 'Success' }, + { name = 'Next', from = 'Assigned', to = 'Success' }, + { name = 'Failed', from = 'Assigned', to = 'Failed' }, }, subs = { Menu = { onstateparent = 'Unassigned', oneventparent = 'Start', fsm = Task_Menu.Fsm, event = 'Menu', returnevents = { 'Next' } }, diff --git a/Moose Test Missions/Moose_Test_TASK_SEAD/Moose_Test_TASK_SEAD.miz b/Moose Test Missions/Moose_Test_TASK_SEAD/Moose_Test_TASK_SEAD.miz index ceb51bf0c..2bf357a6f 100644 Binary files a/Moose Test Missions/Moose_Test_TASK_SEAD/Moose_Test_TASK_SEAD.miz and b/Moose Test Missions/Moose_Test_TASK_SEAD/Moose_Test_TASK_SEAD.miz differ