From ff8c45475237318dd1c779164623e72d873123a2 Mon Sep 17 00:00:00 2001 From: Thor Vik Date: Mon, 16 Mar 2020 17:52:14 +0100 Subject: [PATCH 1/2] Applied @Warlords fix on swapped Airbases in ATC_Ground.lua PG map Solves Issue #1291 --- Moose Development/Moose/Functional/ATC_Ground.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Moose Development/Moose/Functional/ATC_Ground.lua b/Moose Development/Moose/Functional/ATC_Ground.lua index 9ded69874..5fcb27e25 100644 --- a/Moose Development/Moose/Functional/ATC_Ground.lua +++ b/Moose Development/Moose/Functional/ATC_Ground.lua @@ -2456,7 +2456,7 @@ end ATC_GROUND_PERSIANGULF = { ClassName = "ATC_GROUND_PERSIANGULF", Airbases = { - [AIRBASE.PersianGulf.Al_Dhafra_AB] = { ---FIX by Wingthor Changed from Abu_Musa_Island_Airport + [AIRBASE.PersianGulf.Abu_Musa_Island_Airport] = { PointsRunways = { [1] = { [1]={["y"]=-122813.71002344,["x"]=-31689.936027827,}, @@ -2475,7 +2475,7 @@ ATC_GROUND_PERSIANGULF = { }, }, }, - [AIRBASE.PersianGulf.Abu_Musa_Island_Airport] = { + [AIRBASE.PersianGulf.Al_Dhafra_AB] = { PointsRunways = { [1] = { [1]={["y"]=-174672.06004916,["x"]=-209880.97145616,}, From 850951bcb434eb2e6b6ef0ab3274f5c606636bfc Mon Sep 17 00:00:00 2001 From: Frank Date: Fri, 20 Mar 2020 16:35:28 +0100 Subject: [PATCH 2/2] Update Airbase.lua --- Moose Development/Moose/Wrapper/Airbase.lua | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Moose Development/Moose/Wrapper/Airbase.lua b/Moose Development/Moose/Wrapper/Airbase.lua index 0c538cd4f..9f3517a60 100644 --- a/Moose Development/Moose/Wrapper/Airbase.lua +++ b/Moose Development/Moose/Wrapper/Airbase.lua @@ -469,6 +469,7 @@ function AIRBASE:GetID(unique) --env.info(string.format("FF airbase=%s id=%s category=%s", tostring(AirbaseName), tostring(airbaseID), tostring(airbaseCategory))) -- No way AFIK to get the DCS version. So we check if the event exists. That should tell us if we are on DCS 2.5.6 or prior to that. + --[[ if world.event.S_EVENT_KILL and world.event.S_EVENT_KILL>0 and airbaseCategory==Airbase.Category.AIRDROME then -- We have to take the key value of this loop! @@ -479,6 +480,7 @@ function AIRBASE:GetID(unique) airbaseID=airbaseID+11 end end + ]] if AirbaseName==self.AirbaseName then if airbaseCategory==Airbase.Category.SHIP then