- Inherit ZONE_BASE from FSM instead of BASE. Opens a range of possibilities.

- Remove from ZONE_GOAL the Zone field, and make it inherit from ZONE_BASE instead of FSM!
- Rework the new inheritance tree in the code. (Remove .Zone fields).
- Implement the determination of attack and defense zones.
- Reworked the TaskInfo to include Type and ShowKey.
- Flash A2G Tasking Details. Added menu option.

Moose Development/Moose/Functional/ZoneCaptureCoalition.lua

@@ -549,6 +549,9 @@ do -- ZONE_CAPTURE_COALITION
     -- If it is, then we must move the zone to attack state.
     self:HandleEvent( EVENTS.Hit, self.OnEventHit )
 
+    -- ZoneGoal objects are added to the _DATABASE.ZONES_GOAL and SET_ZONE_GOAL sets.
+    _EVENTDISPATCHER:CreateEventNewZoneGoal( self )
+
     return self
   end
   
@@ -566,7 +569,7 @@ do -- ZONE_CAPTURE_COALITION
 
   function ZONE_CAPTURE_COALITION:IsGuarded()
   
-    local IsGuarded = self.Zone:IsAllInZoneOfCoalition( self.Coalition )
+    local IsGuarded = self:IsAllInZoneOfCoalition( self.Coalition )
     self:F( { IsGuarded = IsGuarded } )
     return IsGuarded
   end
@@ -574,7 +577,7 @@ do -- ZONE_CAPTURE_COALITION
 
   function ZONE_CAPTURE_COALITION:IsEmpty()
   
-    local IsEmpty = self.Zone:IsNoneInZone()
+    local IsEmpty = self:IsNoneInZone()
     self:F( { IsEmpty = IsEmpty } )
     return IsEmpty
   end
@@ -582,7 +585,7 @@ do -- ZONE_CAPTURE_COALITION
 
   function ZONE_CAPTURE_COALITION:IsCaptured()
   
-    local IsCaptured = self.Zone:IsAllInZoneOfOtherCoalition( self.Coalition )
+    local IsCaptured = self:IsAllInZoneOfOtherCoalition( self.Coalition )
     self:F( { IsCaptured = IsCaptured } )
     return IsCaptured
   end
@@ -590,7 +593,7 @@ do -- ZONE_CAPTURE_COALITION
   
   function ZONE_CAPTURE_COALITION:IsAttacked()
   
-    local IsAttacked = self.Zone:IsSomeInZoneOfCoalition( self.Coalition )
+    local IsAttacked = self:IsSomeInZoneOfCoalition( self.Coalition )
     self:F( { IsAttacked = IsAttacked } )
     return IsAttacked
   end
@@ -601,7 +604,7 @@ do -- ZONE_CAPTURE_COALITION
   -- @param #ZONE_CAPTURE_COALITION self
   function ZONE_CAPTURE_COALITION:Mark()
   
-    local Coord = self.Zone:GetCoordinate()
+    local Coord = self:GetCoordinate()
     local ZoneName = self:GetZoneName()
     local State = self:GetState()
     
@@ -640,7 +643,7 @@ do -- ZONE_CAPTURE_COALITION
   
     --self:GetParent( self ):onenterCaptured()
 
-    local NewCoalition = self.Zone:GetScannedCoalition()
+    local NewCoalition = self:GetScannedCoalition()
     self:F( { NewCoalition = NewCoalition } )
     self:SetCoalition( NewCoalition )
   
@@ -680,7 +683,7 @@ do -- ZONE_CAPTURE_COALITION
 
   function ZONE_CAPTURE_COALITION:IsCaptured()
   
-    local IsCaptured = self.Zone:IsAllInZoneOfOtherCoalition( self.Coalition )
+    local IsCaptured = self:IsAllInZoneOfOtherCoalition( self.Coalition )
     self:F( { IsCaptured = IsCaptured } )
     return IsCaptured
   end
@@ -688,7 +691,7 @@ do -- ZONE_CAPTURE_COALITION
   
   function ZONE_CAPTURE_COALITION:IsAttacked()
   
-    local IsAttacked = self.Zone:IsSomeInZoneOfCoalition( self.Coalition )
+    local IsAttacked = self:IsSomeInZoneOfCoalition( self.Coalition )
     self:F( { IsAttacked = IsAttacked } )
     return IsAttacked
   end
@@ -803,7 +806,7 @@ do -- ZONE_CAPTURE_COALITION
     local UnitHit = EventData.TgtUnit
     
     if UnitHit then
-      if UnitHit:IsInZone( self.Zone ) then
+      if UnitHit:IsInZone( self ) then
         self:Attack()
       end
     end

Moose Development/Moose/Functional/ZoneGoal.lua

@@ -44,14 +44,13 @@ do -- Zone
   
   --- ZONE_GOAL Constructor.
   -- @param #ZONE_GOAL self
-  -- @param Core.Zone#ZONE_BASE Zone A @{Zone} object with the goal to be achieved.
+  -- @param Core.Zone#ZONE_RADIUS Zone A @{Zone} object with the goal to be achieved.
   -- @return #ZONE_GOAL
   function ZONE_GOAL:New( Zone )
   
-    local self = BASE:Inherit( self, FSM:New() ) -- #ZONE_GOAL
+    local self = BASE:Inherit( self, ZONE_RADIUS:New( Zone:GetName(), Zone:GetVec2(), Zone:GetRadius() ) ) -- #ZONE_GOAL
     self:F( { Zone = Zone } )
 
-    self.Zone = Zone -- Core.Zone#ZONE_BASE
     self.Goal = GOAL:New()
 
     self.SmokeTime = nil
@@ -67,6 +66,7 @@ do -- Zone
     -- @param Wrapper.Unit#UNIT DestroyedUnit The destroyed unit.
     -- @param #string PlayerName The name of the player.
 
+
     return self
   end
   
@@ -74,7 +74,7 @@ do -- Zone
   -- @param #ZONE_GOAL self
   -- @return Core.Zone#ZONE_BASE
   function ZONE_GOAL:GetZone()
-    return self.Zone
+    return self
   end
   
   
@@ -82,7 +82,7 @@ do -- Zone
   -- @param #ZONE_GOAL self
   -- @return #string
   function ZONE_GOAL:GetZoneName()
-    return self.Zone:GetName()
+    return self:GetName()
   end
 
 
@@ -101,7 +101,7 @@ do -- Zone
   -- @param #ZONE_GOAL self
   -- @param #SMOKECOLOR.Color FlareColor
   function ZONE_GOAL:Flare( FlareColor )
-    self.Zone:FlareZone( FlareColor, math.random( 1, 360 ) )
+    self:FlareZone( FlareColor, math.random( 1, 360 ) )
   end
 
 
@@ -130,7 +130,7 @@ do -- Zone
   
     if self.SmokeTime == nil or self.SmokeTime + 300 <= CurrentTime then
       if self.SmokeColor then
-        self.Zone:GetCoordinate():Smoke( self.SmokeColor )
+        self:GetCoordinate():Smoke( self.SmokeColor )
         --self.SmokeColor = nil
         self.SmokeTime = CurrentTime
       end
@@ -147,11 +147,9 @@ do -- Zone
     
     local Vec3 = EventData.IniDCSUnit:getPosition().p
     self:F( { Vec3 = Vec3 } )
-    local ZoneGoal = self:GetZone()
-    self:F({ZoneGoal})
 
     if EventData.IniDCSUnit then
-      if ZoneGoal:IsVec3InZone(Vec3)  then
+      if self:IsVec3InZone(Vec3)  then
         local PlayerHits = _DATABASE.HITS[EventData.IniUnitName]
         if PlayerHits then
           for PlayerName, PlayerHit in pairs( PlayerHits.Players or {} ) do

Moose Development/Moose/Functional/ZoneGoalCoalition.lua

@@ -104,7 +104,7 @@ do -- ZoneGoal
     local State = self:GetState()
     self:F( { State = self:GetState() } )
   
-    self.Zone:Scan( { Object.Category.UNIT, Object.Category.STATIC } )
+    self:Scan( { Object.Category.UNIT, Object.Category.STATIC } )
   
   end