diff --git a/Moose Development/Moose/Wrapper/Group.lua b/Moose Development/Moose/Wrapper/Group.lua index 5fcd0cdb2..4a2a4d3f6 100644 --- a/Moose Development/Moose/Wrapper/Group.lua +++ b/Moose Development/Moose/Wrapper/Group.lua @@ -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 diff --git a/Moose Development/Moose/XXX - Header Template.lua b/Moose Development/Moose/XXX - Header Template.lua new file mode 100644 index 000000000..c25e774fa --- /dev/null +++ b/Moose Development/Moose/XXX - Header Template.lua @@ -0,0 +1,14 @@ +--- +-- Name: XXX-999 - Title +-- Author: YYY +-- Date Created: DD Mmm YYYY +-- +-- # Situation: +-- +-- +-- +-- # Test cases: +-- +-- 1. + + diff --git a/Moose Mission Setup/Moose Mission Update/l10n/DEFAULT/Moose.lua b/Moose Mission Setup/Moose Mission Update/l10n/DEFAULT/Moose.lua index ba1037c31..cb197888b 100644 --- a/Moose Mission Setup/Moose Mission Update/l10n/DEFAULT/Moose.lua +++ b/Moose Mission Setup/Moose Mission Update/l10n/DEFAULT/Moose.lua @@ -1,5 +1,5 @@ env.info( '*** MOOSE STATIC INCLUDE START *** ' ) -env.info( 'Moose Generation Timestamp: 20170221_1153' ) +env.info( 'Moose Generation Timestamp: 20170223_1723' ) local base = _G Include = {} @@ -15359,7 +15359,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 diff --git a/Moose Mission Setup/Moose.lua b/Moose Mission Setup/Moose.lua index ba1037c31..cb197888b 100644 --- a/Moose Mission Setup/Moose.lua +++ b/Moose Mission Setup/Moose.lua @@ -1,5 +1,5 @@ env.info( '*** MOOSE STATIC INCLUDE START *** ' ) -env.info( 'Moose Generation Timestamp: 20170221_1153' ) +env.info( 'Moose Generation Timestamp: 20170223_1723' ) local base = _G Include = {} @@ -15359,7 +15359,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 diff --git a/Moose Test Missions/GRP - Group Commands/GRP-100 - IsAlive/GRP-100 - IsAlive.lua b/Moose Test Missions/GRP - Group Commands/GRP-100 - IsAlive/GRP-100 - IsAlive.lua new file mode 100644 index 000000000..7f33d42f2 --- /dev/null +++ b/Moose Test Missions/GRP - Group Commands/GRP-100 - IsAlive/GRP-100 - IsAlive.lua @@ -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 +) + diff --git a/Moose Test Missions/GRP - Group Commands/GRP-100 - IsAlive/GRP-100 - IsAlive.miz b/Moose Test Missions/GRP - Group Commands/GRP-100 - IsAlive/GRP-100 - IsAlive.miz new file mode 100644 index 000000000..162e39f32 Binary files /dev/null and b/Moose Test Missions/GRP - Group Commands/GRP-100 - IsAlive/GRP-100 - IsAlive.miz differ