From 038c10c4d4c7f553567354159409cca0857de1c6 Mon Sep 17 00:00:00 2001
From: Sven Van de Velde <sven.van.de.velde@telenet.be>
Date: Sat, 10 Dec 2016 08:40:49 +0100
Subject: [PATCH] Progress

---
 Moose Development/Moose/Core/Event.lua        |   4 ++++
 Moose Development/Moose/Tasking/Task.lua      |  17 +++++------------
 .../TSK-010 - Task Modelling - SEAD.miz       | Bin 28552 -> 28124 bytes
 3 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/Moose Development/Moose/Core/Event.lua b/Moose Development/Moose/Core/Event.lua
index 7d080fcf2..623005ae2 100644
--- a/Moose Development/Moose/Core/Event.lua	
+++ b/Moose Development/Moose/Core/Event.lua	
@@ -714,6 +714,10 @@ function EVENT:onEvent( Event )
       Event.IniDCSUnitName = Event.IniDCSUnit:getName()
       Event.IniUnitName = Event.IniDCSUnitName
       Event.IniUnit = UNIT:FindByName( Event.IniDCSUnitName )
+      if not Event.IniUnit then
+        -- Unit can be a CLIENT. Most likely this will be the case ...
+        Event.IniUnit = CLIENT:FindByName( Event.IniDCSUnitName )
+      end
       Event.IniDCSGroupName = ""
       if Event.IniDCSGroup and Event.IniDCSGroup:isExist() then
         Event.IniDCSGroupName = Event.IniDCSGroup:getName()
diff --git a/Moose Development/Moose/Tasking/Task.lua b/Moose Development/Moose/Tasking/Task.lua
index 9c003fa8c..716d051ff 100644
--- a/Moose Development/Moose/Tasking/Task.lua	
+++ b/Moose Development/Moose/Tasking/Task.lua	
@@ -112,12 +112,13 @@ function TASK_BASE:New( Mission, SetGroupAssign, TaskName, TaskType )
     function( self, EventData )
       self:E( EventData )
       self:E( { "State", self:GetState() } )
-      local TaskUnit = EventData.IniDCSUnit
+      local TaskUnit = EventData.IniUnit
       local TaskGroup = EventData.IniUnit:GetGroup()
-      self:__AssignUnit( 1, TaskUnit )
+      self:SetMenuForGroup(TaskGroup)
       if self:IsStateAssigned() then
-        self:E( self.SetGroup:IsIncludeObject( TaskGroup ) )
-        if self.SetGroup:IsIncludeObject( TaskGroup ) then
+        self:E( self:IsAssignedToGroup( TaskGroup ) )
+        if self:IsAssignedToGroup( TaskGroup ) then
+          self:AssignToUnit( TaskUnit )
         end
       end
       self:MessageToGroups( TaskUnit:GetPlayerName() .. " joined Task " .. self:GetName() )
@@ -254,14 +255,6 @@ function TASK_BASE:AssignToUnit( TaskUnit )
   local FsmUnit = self:SetStateMachine( TaskUnit, FsmTemplate:Copy( TaskUnit, self ) ) -- Fsm.Fsm#FSM_PROCESS
   self:E({"Address FsmUnit", tostring( FsmUnit ) } )
   
-  -- Set the events
-  FsmUnit:EventOnPilotDead( 
-    --- @param Core.Event#EVENTDATA EventData
-    function( self, EventData )
-      self:__Fail( 1 )
-    end
-    )
-
   FsmUnit:SetStartState( "Planned" )
   FsmUnit:Accept() -- Each Task needs to start with an Accept event to start the flow.
 
diff --git a/Moose Test Missions/TSK - Task Modelling/TSK-010 - Task Modelling - SEAD/TSK-010 - Task Modelling - SEAD.miz b/Moose Test Missions/TSK - Task Modelling/TSK-010 - Task Modelling - SEAD/TSK-010 - Task Modelling - SEAD.miz
index ccf0cdd03c9b29dbb7a23dced66820e0d5890d98..71460895eccfdfaa2836016ba2f41a2dbabc1576 100644
GIT binary patch
delta 1372
zcmV-i1*7_i-vQj)0kGj>f6A3LB=`gX067r=00#g70B>+~X>V?GomWk7<3<d<=T{g$
zCq<lX(p-9QzSafe-G%M=QWOF$Q5Kugj4&T@(qjL6DbLuJ<WUmTM-PX5^GH5Ys<Nb{
z8T>vt`S)bNzdwhSfH&0Npv2){{QvM9ZU!j`VQ4Lfr@^QslcEqHe^EKJwc8$eAKs)u
z$V&C%z2qPao;FSw8q()KW(mGp)DlGULb&mstadHa{4$XU8jVdLja!UHNv;u-lu>Jl
z+B{rrLnN5zm|7oc)OK>7zy{Jdh+Cy}MiMM0cVudgJUfqI2aigwhfQNhQ_4_UepU`7
z9Al5OkSm>Hk|Sm-f2Jcr2`hnF6o7e?X`z**fB2b7TCGHnQ&Xr-Qjt(LS*h%;YxMJU
zaCSC8nGIBaoXL>ijPjgPC+u51xfNtWrO#2M0#+#EEFze<8Dya2$m`=<RhCXt3Uy&d
zos=YL@^sh3s6!DyS&_~>s`KXG%6Gt$Yr|)h|JW7^mwYR!e--MI?5ze<L}5``D$Oa6
zM^BlpitOBib>;^2SO~QVsqQmgl5rqr)3}kPDo(P-ih;z>3a-n!rI5KJpBge!{keG%
zv@UGVd1&NiZy$431FB((R#V!d*BR7P(9iL^rsAdrtMvWHVc5}JLbcCm*8pBP;gp(3
zkZT9)AamT>f5c+d&S<3!#|)s`XWWBkQDAwvu382qRMF@ggo>~Bv@Y7OLajm(b+4|y
zcKLuBL6EU~7CUX-Y~aw-%UQganXshf=I>EzFG^8BEA{GcCaKd#>8MdfuP73hLqkDL
zMp48yynuAAp(-ft87y1?8b~g<;`Yi~i$a@zemYG#f6tu1Ia=qFF&u>n(KLNzX!nh&
z@TJu-2=+$k<8c9!jA9k8{F{Dl<(S8WzjD#mCL!i2&nX#adU7{A)~Ae2&Hos6Ph-B2
zq1B9QIaJ~lGje6?g?HZ{jvc2$xhygVZIjp5i76mcn+QqM`FMOBz?(1ly*(;NFT4fR
zWx5lEe<R@Exq_XUQQjjuxd6NH<uGr6Yr(+2)K(gWf{f=8g&pS0Xms^kiwg$Nqk#z~
zv8&#z^YivIc`(P(Z78#TR*bH$&)ZeC7t+!BW$S1wvF5mVQsJzvCGwT`4+}E&tacp3
zRw%vWU#_Bkc4)5s!spf`dz$TbeE7e8=Fgv1e_4SsNf@KuqVYy+t(?pf3wn(<A(^X)
zQnXBg%A`P1VN6q6mb{8tUZcu{%k4Q@X>G^OsuC>47Re4#_0yXh>%-aQ=<a<sn2Ba`
zM$JkIeExV;yiGr{nXmc`b6~9+b`5KwGnZu;-IY2}ci5UeNoUv7#q#0<z`{=HdZBrF
ze<8V^qAgT(C)xSD9y6@%ZaL2WcE*;x<-TkG@O|m2xcL86gmrhatq1nmAFv*-3#CN8
z8|@5ZwZmtg+wIFgMe%{p2FXv8v(e;zhMy)MMmi+?N6l<6YEIVE<g>Z@G`mgCdPCQ7
zw;ya{s)K*rJb{@8S95oEak+S(tWSXMf5h2&jVaw;*n-g2G6A+JQLNszD)fH9Y8I<n
zhj?F&OMLy2TNO&~#$|gnggriX^!0`pI9uEwHoBv2&r$5+ixRGk$V*t>=M`ca|3E37
z39{F@Xxz$@6&T;AH%g1FeXYZD;4m<H_>ezhw8=+r4V0wyZs(3xw#HmAY1Fet8GEDM
zlHc72I?(rsV($tsIr-W6H_W+{{{XX`X?X<-%9S-F_yhm|IT4c|Z$%{VX8-_qVRB_?
eZ*_BJb5KhK1^@s601N;O05Agp0G4V10002u&ZkWP

delta 1780
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
W8k2KvMFN~@le%pj210BA0000<zkJgG