From 18321250222b27956a8db427b0014076c96cf3d5 Mon Sep 17 00:00:00 2001 From: Frank Date: Wed, 29 Sep 2021 08:58:46 +0200 Subject: [PATCH 1/3] Globals - Moved _DATABASE:_RegisterAirbases() to Globals.lua --- Moose Development/Moose/Core/Database.lua | 2 +- Moose Development/Moose/Globals.lua | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Moose Development/Moose/Core/Database.lua b/Moose Development/Moose/Core/Database.lua index b30329ecf..50031e81b 100644 --- a/Moose Development/Moose/Core/Database.lua +++ b/Moose Development/Moose/Core/Database.lua @@ -136,7 +136,7 @@ function DATABASE:New() self:_RegisterGroupsAndUnits() self:_RegisterClients() self:_RegisterStatics() - self:_RegisterAirbases() + --self:_RegisterAirbases() --self:_RegisterPlayers() self.UNITS_Position = 0 diff --git a/Moose Development/Moose/Globals.lua b/Moose Development/Moose/Globals.lua index df7fafe36..f63f57e84 100644 --- a/Moose Development/Moose/Globals.lua +++ b/Moose Development/Moose/Globals.lua @@ -18,6 +18,7 @@ _DATABASE:_RegisterCargos() --- Register zones. _DATABASE:_RegisterZones() +_DATABASE:_RegisterAirbases() --- Check if os etc is available. BASE:I("Checking de-sanitization of os, io and lfs:") From 0daac876ea3794efe83e825b774dd4eb7dcea9a4 Mon Sep 17 00:00:00 2001 From: Frank Date: Wed, 29 Sep 2021 09:00:53 +0200 Subject: [PATCH 2/3] Update Airbase.lua - Register oil rigs and gas platforms as helipads. DCS bug registers them as ship (Airbase.Category.SHIP instead of Airbase.Category.HELIPAD). --- Moose Development/Moose/Wrapper/Airbase.lua | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Moose Development/Moose/Wrapper/Airbase.lua b/Moose Development/Moose/Wrapper/Airbase.lua index 0f4eda499..bcf99074c 100644 --- a/Moose Development/Moose/Wrapper/Airbase.lua +++ b/Moose Development/Moose/Wrapper/Airbase.lua @@ -547,6 +547,12 @@ function AIRBASE:Register(AirbaseName) self.isHelipad=true elseif self.category==Airbase.Category.SHIP then self.isShip=true + -- DCS bug: Oil rigs and gas platforms have category=2 (ship). Also they cannot be retrieved by coalition.getStaticObjects() + if self.descriptors.typeName=="Oil rig" or self.descriptors.typeName=="Ga" then + self.isHelipad=true + self.isShip=false + self.category=Airbase.Category.HELIPAD + _DATABASE:AddStatic(AirbaseName) else self:E("ERROR: Unknown airbase category!") end From d8cb15a577cb82fd17d0f6e910a957637d9c7ecd Mon Sep 17 00:00:00 2001 From: Frank Date: Wed, 29 Sep 2021 09:01:47 +0200 Subject: [PATCH 3/3] Update Airbase.lua --- Moose Development/Moose/Wrapper/Airbase.lua | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Moose Development/Moose/Wrapper/Airbase.lua b/Moose Development/Moose/Wrapper/Airbase.lua index bcf99074c..0e3a157bd 100644 --- a/Moose Development/Moose/Wrapper/Airbase.lua +++ b/Moose Development/Moose/Wrapper/Airbase.lua @@ -552,7 +552,8 @@ function AIRBASE:Register(AirbaseName) self.isHelipad=true self.isShip=false self.category=Airbase.Category.HELIPAD - _DATABASE:AddStatic(AirbaseName) + _DATABASE:AddStatic(AirbaseName) + end else self:E("ERROR: Unknown airbase category!") end