From d5adf0a2826dbb46707523d691ecc980dc301171 Mon Sep 17 00:00:00 2001 From: Grey-Echo Date: Wed, 5 Apr 2017 09:35:06 +0200 Subject: [PATCH] Resolve problems with Zone.lua also generate Dynamic Loader (forgot to generate it after generating static for tests) --- Moose Development/Moose/Core/Zone.lua | 27 +++++++++++++++++---------- Moose Mission Setup/Moose.lua | 2 +- 2 files changed, 18 insertions(+), 11 deletions(-) diff --git a/Moose Development/Moose/Core/Zone.lua b/Moose Development/Moose/Core/Zone.lua index f174464bf..432a360a7 100644 --- a/Moose Development/Moose/Core/Zone.lua +++ b/Moose Development/Moose/Core/Zone.lua @@ -66,6 +66,13 @@ -- @module Zone +--- The ZONE_BASE class +-- @type ZONE_BASE +-- @field #string ZoneName Name of the zone. +-- @field #number ZoneProbability A value between 0 and 1. 0 = 0% and 1 = 100% probability. +-- @extends Core.Base#BASE + + --- # 1) ZONE_BASE class, extends @{Base#BASE} -- -- This class is an abstract BASE class for derived classes, and is not meant to be instantiated. @@ -100,11 +107,7 @@ -- * @{#ZONE_BASE.FlareZone}(): Flares the zone boundaries in a color. -- -- === --- --- @type ZONE_BASE --- @field #string ZoneName Name of the zone. --- @field #number ZoneProbability A value between 0 and 1. 0 = 0% and 1 = 100% probability. --- @extends Core.Base#BASE +-- @field #ZONE_BASE ZONE_BASE ZONE_BASE = { ClassName = "ZONE_BASE", ZoneName = "", @@ -303,6 +306,12 @@ function ZONE_BASE:GetZoneMaybe() end +--- The ZONE_RADIUS class, defined by a zone name, a location and a radius. +-- @type ZONE_RADIUS +-- @field Dcs.DCSTypes#Vec2 Vec2 The current location of the zone. +-- @field Dcs.DCSTypes#Distance Radius The radius of the zone. +-- @extends Core.Zone#ZONE_BASE + --- # 2) @{Zone#ZONE_RADIUS} class, extends @{Zone#ZONE_BASE} -- -- The ZONE_RADIUS class defined by a zone name, a location and a radius. @@ -333,11 +342,8 @@ end -- -- === -- --- The ZONE_RADIUS class, defined by a zone name, a location and a radius. --- @type ZONE_RADIUS --- @field Dcs.DCSTypes#Vec2 Vec2 The current location of the zone. --- @field Dcs.DCSTypes#Distance Radius The radius of the zone. --- @extends Core.Zone#ZONE_BASE +-- @field #ZONE_RADIUS ZONE_RADIUS +-- ZONE_RADIUS = { ClassName="ZONE_RADIUS", } @@ -373,6 +379,7 @@ function ZONE_RADIUS:BoundZone( Points, CountryID, UnBound ) local Angle local RadialBase = math.pi*2 + -- for Angle = 0, 360, (360 / Points ) do local Radial = Angle * RadialBase / 360 Point.x = Vec2.x + math.cos( Radial ) * self:GetRadius() diff --git a/Moose Mission Setup/Moose.lua b/Moose Mission Setup/Moose.lua index d8b4f16ce..7fc7af669 100644 --- a/Moose Mission Setup/Moose.lua +++ b/Moose Mission Setup/Moose.lua @@ -1,5 +1,5 @@ env.info( '*** MOOSE DYNAMIC INCLUDE START *** ' ) -env.info( 'Moose Generation Timestamp: 20170405_0123' ) +env.info( 'Moose Generation Timestamp: 20170405_0934' ) local base = _G