weyne/MOOSE
1
0
Fork 0
mirror of https://github.com/FlightControl-Master/MOOSE.git synced 2026-08-23 11:40:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into FF/Fox2

Browse Source
This commit is contained in:
Frank
2020-05-16 13:17:14 +02:00
parent 9b72254ccc be1f8cde34
commit 66c6b8c2e4
9 changed files with 1660 additions and 1667 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Moose Development/Moose/AI/AI_A2A_Cap.lua
-1
View File
@@ -210,4 +210,3 @@ function AI_A2A_CAP:CreateAttackUnitTasks( AttackSetUnit, DefenderGroup, EngageA
return AttackUnitTasks return AttackUnitTasks
end end
Moose Development/Moose/AI/AI_A2A_Dispatcher.lua
+1 -2
View File
@@ -75,7 +75,7 @@
-- --
-- ## 4. Is a border required? -- ## 4. Is a border required?
-- --
-- Is this a cold car or a hot war situation? In case of a cold war situation, a border can be set that will only trigger defenses -- Is this a cold war or a hot war situation? In case of a cold war situation, a border can be set that will only trigger defenses
-- if the border is crossed by enemy units. -- if the border is crossed by enemy units.
-- --
-- ## 5. What maximum range needs to be checked to allow defenses to engage any attacker? -- ## 5. What maximum range needs to be checked to allow defenses to engage any attacker?
@@ -4525,4 +4525,3 @@ do
end end
end end
Moose Development/Moose/AI/AI_A2A_Gci.lua
-4
View File
@@ -172,7 +172,3 @@ function AI_A2A_GCI:CreateAttackUnitTasks( AttackSetUnit, DefenderGroup, EngageA
return AttackUnitTasks return AttackUnitTasks
end end
Moose Development/Moose/Functional/CleanUp.lua
+2 -3
View File
@@ -66,7 +66,7 @@
-- Creates the main object which is preventing the airbase to get polluted with debris on the runway, which halts the airbase. -- Creates the main object which is preventing the airbase to get polluted with debris on the runway, which halts the airbase.
-- --
-- -- Clean these Zones. -- -- Clean these Zones.
-- CleanUpAirports = CLEANUP_AIRBASE:New( { AIRBASE.Caucasus.Tbilisi, AIRBASE.Caucasus.Kutaisi ) -- CleanUpAirports = CLEANUP_AIRBASE:New( { AIRBASE.Caucasus.Tbilisi, AIRBASE.Caucasus.Kutaisi } )
-- --
-- -- or -- -- or
-- CleanUpTbilisi = CLEANUP_AIRBASE:New( AIRBASE.Caucasus.Tbilisi ) -- CleanUpTbilisi = CLEANUP_AIRBASE:New( AIRBASE.Caucasus.Tbilisi )
@@ -245,7 +245,7 @@ end
function CLEANUP_AIRBASE.__:OnEventBirth( EventData ) function CLEANUP_AIRBASE.__:OnEventBirth( EventData )
self:F( { EventData } ) self:F( { EventData } )
if EventData.IniUnit:IsAlive() ~= nil then if EventData and EventData.IniUnit and EventData.IniUnit:IsAlive() ~= nil then
if self:IsInAirbase( EventData.IniUnit:GetVec2() ) then if self:IsInAirbase( EventData.IniUnit:GetVec2() ) then
self.CleanUpList[EventData.IniDCSUnitName] = {} self.CleanUpList[EventData.IniDCSUnitName] = {}
self.CleanUpList[EventData.IniDCSUnitName].CleanUpUnit = EventData.IniUnit self.CleanUpList[EventData.IniDCSUnitName].CleanUpUnit = EventData.IniUnit
@@ -442,4 +442,3 @@ function CLEANUP_AIRBASE.__:CleanUpSchedule()
return true return true
end end
Moose Development/Moose/Functional/Warehouse.lua
+1 -1
View File
@@ -1766,7 +1766,7 @@ _WAREHOUSEDB = {
--- Warehouse class version. --- Warehouse class version.
-- @field #string version -- @field #string version
WAREHOUSE.version="1.0.1" WAREHOUSE.version="1.0.2"
------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-- TODO: Warehouse todo list. -- TODO: Warehouse todo list.