From 4ac962a87a528a292f770cb7d7eb0a6728997005 Mon Sep 17 00:00:00 2001 From: FlightControl Date: Sat, 2 Jul 2016 09:26:00 +0200 Subject: [PATCH] OK. got workiing prototype now, works! --- Moose Development/Moose/StateMachine.lua | 1 + Moose Development/Moose/TaskClientSead.lua | 3 ++- .../Moose_Test_TASK_SEAD.lua | 4 ++-- .../Moose_Test_TASK_SEAD.miz | Bin 20061 -> 20066 bytes 4 files changed, 5 insertions(+), 3 deletions(-) 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 ceb51bf0cfb30f1310ea33cb5bc899b58e7a75ce..2bf357a6f49bf68ed35924e8168d06c77d70dd5b 100644 GIT binary patch delta 5585 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 delta 5600 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