diff --git a/Moose Development/Moose/Zone.lua b/Moose Development/Moose/Zone.lua index c1cda5fc8..6db3a3f20 100644 --- a/Moose Development/Moose/Zone.lua +++ b/Moose Development/Moose/Zone.lua @@ -477,8 +477,8 @@ ZONE_GROUP = { -- @param DCSTypes#Distance Radius The radius of the zone. -- @return #ZONE_GROUP self function ZONE_GROUP:New( ZoneName, ZoneGROUP, Radius ) - local self = BASE:Inherit( self, ZONE_RADIUS:New( ZoneName, ZoneGROUP:GetPointVec2(), Radius ) ) - self:F( { ZoneName, ZoneGROUP:GetPointVec2(), Radius } ) + local self = BASE:Inherit( self, ZONE_RADIUS:New( ZoneName, ZoneGROUP:GetVec2(), Radius ) ) + self:F( { ZoneName, ZoneGROUP:GetVec2(), Radius } ) self.ZoneGROUP = ZoneGROUP @@ -489,14 +489,14 @@ end --- Returns the current location of the @{Group}. -- @param #ZONE_GROUP self -- @return DCSTypes#Vec2 The location of the zone based on the @{Group} location. -function ZONE_GROUP:GetPointVec2() +function ZONE_GROUP:GetVec2() self:F( self.ZoneName ) - local ZonePointVec2 = self.ZoneGROUP:GetPointVec2() + local ZoneVec2 = self.ZoneGROUP:GetVec2() - self:T( { ZonePointVec2 } ) + self:T( { ZoneVec2 } ) - return ZonePointVec2 + return ZoneVec2 end --- Returns a random location within the zone of the @{Group}. @@ -506,11 +506,11 @@ function ZONE_GROUP:GetRandomVec2() self:F( self.ZoneName ) local Point = {} - local PointVec2 = self.ZoneGROUP:GetPointVec2() + local Vec2 = self.ZoneGROUP:GetVec2() local angle = math.random() * math.pi*2; - Point.x = PointVec2.x + math.cos( angle ) * math.random() * self:GetRadius(); - Point.y = PointVec2.y + math.sin( angle ) * math.random() * self:GetRadius(); + Point.x = Vec2.x + math.cos( angle ) * math.random() * self:GetRadius(); + Point.y = Vec2.y + math.sin( angle ) * math.random() * self:GetRadius(); self:T( { Point } ) diff --git a/Moose Test Missions/Moose_Test_SCHEDULER/Moose_Test_SCHEDULER.lua b/Moose Test Missions/Moose_Test_SCHEDULER/Moose_Test_SCHEDULER.lua new file mode 100644 index 000000000..9113e32c9 --- /dev/null +++ b/Moose Test Missions/Moose_Test_SCHEDULER/Moose_Test_SCHEDULER.lua @@ -0,0 +1,8 @@ +GroupTest = GROUP:FindByName("Test") + +TestScheduler = SCHEDULER:New( nil, + function() + + MESSAGE:New("Hello World", 5 ):ToAll() + + end, {}, 10, 10 ) \ No newline at end of file diff --git a/Moose Test Missions/Moose_Test_SCHEDULER/Moose_Test_SCHEDULER.miz b/Moose Test Missions/Moose_Test_SCHEDULER/Moose_Test_SCHEDULER.miz new file mode 100644 index 000000000..357a9ccf1 Binary files /dev/null and b/Moose Test Missions/Moose_Test_SCHEDULER/Moose_Test_SCHEDULER.miz differ diff --git a/Moose Test Missions/Moose_Test_ZONE_GROUP/Moose_Test_ZONE_GROUP.lua b/Moose Test Missions/Moose_Test_ZONE_GROUP/Moose_Test_ZONE_GROUP.lua new file mode 100644 index 000000000..76a2ffb51 --- /dev/null +++ b/Moose Test Missions/Moose_Test_ZONE_GROUP/Moose_Test_ZONE_GROUP.lua @@ -0,0 +1,20 @@ +local GroupInside = GROUP:FindByName( "Test Inside Polygon" ) +local GroupOutside = GROUP:FindByName( "Test Outside Polygon" ) + +local Tank = GROUP:FindByName( "Tank" ) +local ZoneA = ZONE_GROUP:New( "Zone A", Tank, 100 ) + +Messager = SCHEDULER:New( nil, + function() + GroupInside:MessageToAll( ( GroupInside:IsCompletelyInZone( ZoneA ) ) and "Inside Zone A" or "Outside Zone A", 1 ) + if GroupInside:IsCompletelyInZone( ZoneA ) then + GroupInside:GetUnit(1):SmokeRed() + end + end, + {}, 0, 1 ) + +TankZoneColoring = SCHEDULER:New( nil, + function() + ZoneA:FlareZone( POINT_VEC3.FlareColor.White, 90, 60 ) + end, + {}, 0, 5 ) \ No newline at end of file diff --git a/Moose Test Missions/Moose_Test_ZONE_GROUP/Moose_Test_ZONE_GROUP.miz b/Moose Test Missions/Moose_Test_ZONE_GROUP/Moose_Test_ZONE_GROUP.miz new file mode 100644 index 000000000..a59d99917 Binary files /dev/null and b/Moose Test Missions/Moose_Test_ZONE_GROUP/Moose_Test_ZONE_GROUP.miz differ diff --git a/Moose Test Missions/Moose_Test_ZONE_UNIT/Moose_Test_ZONE_UNIT.miz b/Moose Test Missions/Moose_Test_ZONE_UNIT/Moose_Test_ZONE_UNIT.miz index 484e2b68b..0dfbc5099 100644 Binary files a/Moose Test Missions/Moose_Test_ZONE_UNIT/Moose_Test_ZONE_UNIT.miz and b/Moose Test Missions/Moose_Test_ZONE_UNIT/Moose_Test_ZONE_UNIT.miz differ