From 6208c79d1f47ee6e3e9ca67e1a63f7a5c38e8ca7 Mon Sep 17 00:00:00 2001
From: Frank <frank@inter-zone.de>
Date: Thu, 2 Jan 2020 16:17:25 +0100
Subject: [PATCH] ARTY v1.1.7 & AIRBASE

- Improved ARTY._PassingWaypoint function.
- Corrected AIRBASE.Ras_Al_Khaimah
---
 .../Moose/Functional/Artillery.lua            | 35 +++++++++----------
 Moose Development/Moose/Wrapper/Airbase.lua   |  2 +-
 2 files changed, 17 insertions(+), 20 deletions(-)

diff --git a/Moose Development/Moose/Functional/Artillery.lua b/Moose Development/Moose/Functional/Artillery.lua
index d1742c271..f5233e3b0 100644
--- a/Moose Development/Moose/Functional/Artillery.lua	
+++ b/Moose Development/Moose/Functional/Artillery.lua	
@@ -693,7 +693,7 @@ ARTY.db={
 
 --- Arty script version.
 -- @field #string version
-ARTY.version="1.1.6"
+ARTY.version="1.1.7"
 
 -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 
@@ -3848,26 +3848,23 @@ end
 -- @param #boolean final True if it is the final waypoint.
 function ARTY._PassingWaypoint(group, arty, i, final)
 
-  -- Debug message.
-  local text=string.format("%s, passing waypoint %d.", group:GetName(), i)
-  if final then
-    text=string.format("%s, arrived at destination.", group:GetName())
-  end
-  arty:T(self.lid..text)
+  if group and group:IsAlive() then
+  
+    local groupname=tostring(group:GetName())
 
-  --[[
-  if final then
-    MESSAGE:New(text, 10):ToCoalitionIf(group:GetCoalition(), arty.Debug or arty.report)
-  else
-    MESSAGE:New(text, 10):ToAllIf(arty.Debug)
+    -- Debug message.
+    local text=string.format("%s, passing waypoint %d.", groupname, i)
+    if final then
+      text=string.format("%s, arrived at destination.", groupname)
+    end
+    arty:T(arty.lid..text)
+  
+    -- Arrived event.
+    if final and arty.groupname==groupname then
+      arty:Arrived()
+    end
+    
   end
-  ]]
-
-  -- Arrived event.
-  if final and arty.groupname==group:GetName() then
-    arty:Arrived()
-  end
-
 end
 
 --- Relocate to another position, e.g. after an engagement to avoid couter strikes.
diff --git a/Moose Development/Moose/Wrapper/Airbase.lua b/Moose Development/Moose/Wrapper/Airbase.lua
index e3effd07c..37530551f 100644
--- a/Moose Development/Moose/Wrapper/Airbase.lua	
+++ b/Moose Development/Moose/Wrapper/Airbase.lua	
@@ -275,7 +275,7 @@ AIRBASE.PersianGulf = {
   ["Lavan_Island_Airport"] = "Lavan Island Airport",
   ["Liwa_Airbase"] = "Liwa Airbase",
   ["Qeshm_Island"] = "Qeshm Island",
-  ["Ras_Al_Khaimah_International_Airport"] = "Ras Al Khaimah International Airport",
+  ["Ras_Al_Khaimah"] = "Ras Al Khaimah",
   ["Sas_Al_Nakheel_Airport"] = "Sas Al Nakheel Airport",
   ["Sharjah_Intl"] = "Sharjah Intl",
   ["Shiraz_International_Airport"] = "Shiraz International Airport",