mirror of
https://github.com/FlightControl-Master/MOOSE.git
synced 2025-10-29 16:58:06 +00:00
Merge remote-tracking branch 'refs/remotes/origin/master' into FlightControl
# Conflicts: # Moose Mission Setup/Moose Mission Update/l10n/DEFAULT/Moose.lua # Moose Mission Setup/Moose.lua # Moose Test Missions/ZON - Zones/ZON-100 - Normal Zone/ZON-100 - Normal Zone.miz # Moose Test Missions/ZON - Zones/ZON-200 - Group Zone/ZON-200 - Group Zone.miz # Moose Test Missions/ZON - Zones/ZON-300 - Unit Zone/ZON-300 - Unit Zone.miz # Moose Test Missions/ZON - Zones/ZON-400 - Radius Zone/ZON-400 - Radius Zone.miz # Moose Test Missions/ZON - Zones/ZON-500 - Polygon Zone/ZON-500 - Polygon Zone.miz # Moose Test Missions/ZON - Zones/ZON-510 - Send message if Clients fly the first time in the Polygon Zones/ZON-510 - Send message if Clients fly the first time in the Polygon Zones.miz
This commit is contained in:
commit
a3aee1e154
@ -184,7 +184,7 @@ function GROUP:IsAlive()
|
||||
local DCSGroup = self:GetDCSObject()
|
||||
|
||||
if DCSGroup then
|
||||
local GroupIsAlive = DCSGroup:isExist()
|
||||
local GroupIsAlive = DCSGroup:isExist() and DCSGroup:getUnit(1) ~= nil
|
||||
self:T3( GroupIsAlive )
|
||||
return GroupIsAlive
|
||||
end
|
||||
|
||||
14
Moose Development/Moose/XXX - Header Template.lua
Normal file
14
Moose Development/Moose/XXX - Header Template.lua
Normal file
@ -0,0 +1,14 @@
|
||||
---
|
||||
-- Name: XXX-999 - Title
|
||||
-- Author: YYY
|
||||
-- Date Created: DD Mmm YYYY
|
||||
--
|
||||
-- # Situation:
|
||||
--
|
||||
--
|
||||
--
|
||||
-- # Test cases:
|
||||
--
|
||||
-- 1.
|
||||
|
||||
|
||||
@ -0,0 +1,32 @@
|
||||
---
|
||||
-- Name: GRP-100 - IsAlive
|
||||
-- Author: FlightControl
|
||||
-- Date Created: 23 Feb 2017
|
||||
--
|
||||
-- # Situation:
|
||||
--
|
||||
-- This test is about checking if IsAlive on GROUP level is working correctly.
|
||||
-- Two ground forces GROUPS are shooting each other.
|
||||
-- Check the IsAlive status in the logging of the survivor and the defeat.
|
||||
--
|
||||
-- # Test cases:
|
||||
--
|
||||
-- 1. Observe the IsAlive statuses in the dcs.log file.
|
||||
|
||||
|
||||
|
||||
--Create Spawn Groups
|
||||
local GroupBlue = GROUP:FindByName( "Blue" )
|
||||
local GroupRed = GROUP:FindByName( "Red" )
|
||||
|
||||
local Schedule, ScheduleID = SCHEDULER:New( nil,
|
||||
--- Variable Declarations
|
||||
-- @param Wrapper.Group#GROUP GroupBlue
|
||||
-- @param Wrapper.Group#GROUP GroupRed
|
||||
function( GroupBlue, GroupRed )
|
||||
local IsAliveBlue = GroupBlue:IsAlive()
|
||||
local IsAliveRed = GroupRed:IsAlive()
|
||||
BASE:E( { IsAliveBlue = IsAliveBlue, IsAliveRed = IsAliveRed } )
|
||||
end, { GroupBlue, GroupRed }, 1, 1
|
||||
)
|
||||
|
||||
Binary file not shown.
@ -1,6 +1,18 @@
|
||||
|
||||
|
||||
|
||||
---
|
||||
-- Name: ZON-100 - Normal Zone
|
||||
-- Author: FlightControl
|
||||
-- Date Created: 21 Feb 2017
|
||||
--
|
||||
-- # Situation:
|
||||
--
|
||||
-- A ZONE has been defined, which boundaries are smoking.
|
||||
-- A vehicle is driving through the zone perimeters.
|
||||
-- When the vehicle is driving in the zone, a red smoke is fired from the vehicle location.
|
||||
--
|
||||
-- # Test cases:
|
||||
--
|
||||
-- 1. Observe the zone perimeter smoke.
|
||||
-- 2. Observe the vehicle smoking a red smoke when driving through the zone.
|
||||
|
||||
|
||||
local GroupInside = GROUP:FindByName( "Test Inside Polygon" )
|
||||
|
||||
Binary file not shown.
@ -1,3 +1,19 @@
|
||||
---
|
||||
-- Name: ZON-200 - Group Zone
|
||||
-- Author: FlightControl
|
||||
-- Date Created: 21 Feb 2017
|
||||
--
|
||||
-- # Situation:
|
||||
--
|
||||
-- A ZONE_GROUP has been defined, which boundaries are smoking.
|
||||
-- A vehicle is driving through the zone perimeters.
|
||||
-- When the vehicle is driving in the zone, a red smoke is fired from the vehicle location.
|
||||
--
|
||||
-- # Test cases:
|
||||
--
|
||||
-- 1. Observe the zone perimeter smoke.
|
||||
-- 2. Observe the vehicle smoking a red smoke when driving through the zone.
|
||||
|
||||
local GroupInside = GROUP:FindByName( "Test Inside Polygon" )
|
||||
local GroupOutside = GROUP:FindByName( "Test Outside Polygon" )
|
||||
|
||||
|
||||
Binary file not shown.
@ -1,3 +1,18 @@
|
||||
---
|
||||
-- Name: ZON-300 - Unit Zone
|
||||
-- Author: FlightControl
|
||||
-- Date Created: 21 Feb 2017
|
||||
--
|
||||
-- # Situation:
|
||||
--
|
||||
-- A ZONE_UNIT has been defined, which boundaries are smoking.
|
||||
-- A vehicle is driving through the zone perimeters.
|
||||
-- When the vehicle is driving in the zone, a red smoke is fired from the vehicle location.
|
||||
--
|
||||
-- # Test cases:
|
||||
--
|
||||
-- 1. Observe the zone perimeter smoke.
|
||||
-- 2. Observe the vehicle smoking a red smoke when driving through the zone.
|
||||
|
||||
local GroupInside = GROUP:FindByName( "Test Inside Polygon" )
|
||||
local GroupOutside = GROUP:FindByName( "Test Outside Polygon" )
|
||||
|
||||
Binary file not shown.
@ -1,7 +1,18 @@
|
||||
|
||||
|
||||
|
||||
|
||||
---
|
||||
-- Name: ZON-400 - Radius Zone
|
||||
-- Author: FlightControl
|
||||
-- Date Created: 21 Feb 2017
|
||||
--
|
||||
-- # Situation:
|
||||
--
|
||||
-- A ZONE_RADIUS has been defined, which boundaries are smoking.
|
||||
-- A vehicle is driving through the zone perimeters.
|
||||
-- When the vehicle is driving in the zone, a red smoke is fired from the vehicle location.
|
||||
--
|
||||
-- # Test cases:
|
||||
--
|
||||
-- 1. Observe the polygon perimeter smoke.
|
||||
-- 2. Observe the vehicle smoking a red smoke when driving through the zone.
|
||||
|
||||
local GroupInside = GROUP:FindByName( "Test Inside Polygon" )
|
||||
local GroupOutside = GROUP:FindByName( "Test Outside Polygon" )
|
||||
|
||||
Binary file not shown.
@ -1,8 +1,19 @@
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
---
|
||||
-- Name: ZON-500 - Polygon Zone
|
||||
-- Author: FlightControl
|
||||
-- Date Created: 18 Feb 2017
|
||||
--
|
||||
-- # Situation:
|
||||
--
|
||||
-- A ZONE_POLYGON has been defined, which boundaries are smoking.
|
||||
-- A vehicle is driving through the zone perimeters.
|
||||
-- When the vehicle is driving in the zone, a red smoke is fired from the vehicle location.
|
||||
--
|
||||
-- # Test cases:
|
||||
--
|
||||
-- 1. Observe the polygon perimeter smoke.
|
||||
-- 2. Observe the vehicle smoking a red smoke when driving through the zone.
|
||||
|
||||
local GroupInside = GROUP:FindByName( "Test Inside Polygon" )
|
||||
local GroupOutside = GROUP:FindByName( "Test Outside Polygon" )
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user