From 0ebff60e8d22f30bec9686be9e933eb8318db8b8 Mon Sep 17 00:00:00 2001 From: FlightControl Date: Sun, 5 Mar 2017 09:50:31 +0100 Subject: [PATCH] Updated Set --- Moose Development/Moose/Core/Set.lua | 18 ++++++++++------- .../l10n/DEFAULT/Moose.lua | 20 +++++++++++-------- Moose Mission Setup/Moose.lua | 20 +++++++++++-------- 3 files changed, 35 insertions(+), 23 deletions(-) diff --git a/Moose Development/Moose/Core/Set.lua b/Moose Development/Moose/Core/Set.lua index a069e6138..f0638d088 100644 --- a/Moose Development/Moose/Core/Set.lua +++ b/Moose Development/Moose/Core/Set.lua @@ -538,7 +538,7 @@ function SET_BASE:_EventOnBirth( Event ) if Event.IniDCSUnit then local ObjectName, Object = self:AddInDatabase( Event ) self:T3( ObjectName, Object ) - if self:IsIncludeObject( Object ) then + if Object and self:IsIncludeObject( Object ) then self:Add( ObjectName, Object ) --self:_EventOnPlayerEnterUnit( Event ) end @@ -908,9 +908,11 @@ end function SET_GROUP:AddInDatabase( Event ) self:F3( { Event } ) - if not self.Database[Event.IniDCSGroupName] then - self.Database[Event.IniDCSGroupName] = GROUP:Register( Event.IniDCSGroupName ) - self:T3( self.Database[Event.IniDCSGroupName] ) + if Event.IniObjectCategory == 1 then + if not self.Database[Event.IniDCSGroupName] then + self.Database[Event.IniDCSGroupName] = GROUP:Register( Event.IniDCSGroupName ) + self:T3( self.Database[Event.IniDCSGroupName] ) + end end return Event.IniDCSGroupName, self.Database[Event.IniDCSGroupName] @@ -1333,9 +1335,11 @@ end function SET_UNIT:AddInDatabase( Event ) self:F3( { Event } ) - if not self.Database[Event.IniDCSUnitName] then - self.Database[Event.IniDCSUnitName] = UNIT:Register( Event.IniDCSUnitName ) - self:T3( self.Database[Event.IniDCSUnitName] ) + if Event.IniObjectCategory == 1 then + if not self.Database[Event.IniDCSUnitName] then + self.Database[Event.IniDCSUnitName] = UNIT:Register( Event.IniDCSUnitName ) + self:T3( self.Database[Event.IniDCSUnitName] ) + end end return Event.IniDCSUnitName, self.Database[Event.IniDCSUnitName] 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 c52ffc3e3..5f32a1f25 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: 20170305_0931' ) +env.info( 'Moose Generation Timestamp: 20170305_0950' ) local base = _G Include = {} @@ -8535,7 +8535,7 @@ function SET_BASE:_EventOnBirth( Event ) if Event.IniDCSUnit then local ObjectName, Object = self:AddInDatabase( Event ) self:T3( ObjectName, Object ) - if self:IsIncludeObject( Object ) then + if Object and self:IsIncludeObject( Object ) then self:Add( ObjectName, Object ) --self:_EventOnPlayerEnterUnit( Event ) end @@ -8905,9 +8905,11 @@ end function SET_GROUP:AddInDatabase( Event ) self:F3( { Event } ) - if not self.Database[Event.IniDCSGroupName] then - self.Database[Event.IniDCSGroupName] = GROUP:Register( Event.IniDCSGroupName ) - self:T3( self.Database[Event.IniDCSGroupName] ) + if Event.IniObjectCategory == 1 then + if not self.Database[Event.IniDCSGroupName] then + self.Database[Event.IniDCSGroupName] = GROUP:Register( Event.IniDCSGroupName ) + self:T3( self.Database[Event.IniDCSGroupName] ) + end end return Event.IniDCSGroupName, self.Database[Event.IniDCSGroupName] @@ -9330,9 +9332,11 @@ end function SET_UNIT:AddInDatabase( Event ) self:F3( { Event } ) - if not self.Database[Event.IniDCSUnitName] then - self.Database[Event.IniDCSUnitName] = UNIT:Register( Event.IniDCSUnitName ) - self:T3( self.Database[Event.IniDCSUnitName] ) + if Event.IniObjectCategory == 1 then + if not self.Database[Event.IniDCSUnitName] then + self.Database[Event.IniDCSUnitName] = UNIT:Register( Event.IniDCSUnitName ) + self:T3( self.Database[Event.IniDCSUnitName] ) + end end return Event.IniDCSUnitName, self.Database[Event.IniDCSUnitName] diff --git a/Moose Mission Setup/Moose.lua b/Moose Mission Setup/Moose.lua index c52ffc3e3..5f32a1f25 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: 20170305_0931' ) +env.info( 'Moose Generation Timestamp: 20170305_0950' ) local base = _G Include = {} @@ -8535,7 +8535,7 @@ function SET_BASE:_EventOnBirth( Event ) if Event.IniDCSUnit then local ObjectName, Object = self:AddInDatabase( Event ) self:T3( ObjectName, Object ) - if self:IsIncludeObject( Object ) then + if Object and self:IsIncludeObject( Object ) then self:Add( ObjectName, Object ) --self:_EventOnPlayerEnterUnit( Event ) end @@ -8905,9 +8905,11 @@ end function SET_GROUP:AddInDatabase( Event ) self:F3( { Event } ) - if not self.Database[Event.IniDCSGroupName] then - self.Database[Event.IniDCSGroupName] = GROUP:Register( Event.IniDCSGroupName ) - self:T3( self.Database[Event.IniDCSGroupName] ) + if Event.IniObjectCategory == 1 then + if not self.Database[Event.IniDCSGroupName] then + self.Database[Event.IniDCSGroupName] = GROUP:Register( Event.IniDCSGroupName ) + self:T3( self.Database[Event.IniDCSGroupName] ) + end end return Event.IniDCSGroupName, self.Database[Event.IniDCSGroupName] @@ -9330,9 +9332,11 @@ end function SET_UNIT:AddInDatabase( Event ) self:F3( { Event } ) - if not self.Database[Event.IniDCSUnitName] then - self.Database[Event.IniDCSUnitName] = UNIT:Register( Event.IniDCSUnitName ) - self:T3( self.Database[Event.IniDCSUnitName] ) + if Event.IniObjectCategory == 1 then + if not self.Database[Event.IniDCSUnitName] then + self.Database[Event.IniDCSUnitName] = UNIT:Register( Event.IniDCSUnitName ) + self:T3( self.Database[Event.IniDCSUnitName] ) + end end return Event.IniDCSUnitName, self.Database[Event.IniDCSUnitName]