Merge branch 'master' into develop

2025-10-29 16:58:06 +00:00 · 2024-02-28 19:43:26 +01:00 · 2024-02-28 19:43:26 +01:00 · 34937c2cf6
commit 34937c2cf6
parent 42ca05af57 74c19f1058
1 changed files with 231 additions and 227 deletions
--- a/Development/Moose/Wrapper/Airbase.lua
+++ b/Development/Moose/Wrapper/Airbase.lua
@ -169,163 +169,167 @@ AIRBASE.Nevada = {

 --- Airbases of the Normandy map:
 --
--   * AIRBASE.Normandy.Saint_Pierre_du_Mont
--   * AIRBASE.Normandy.Lignerolles
--   * AIRBASE.Normandy.Cretteville
--   * AIRBASE.Normandy.Maupertus
--   * AIRBASE.Normandy.Brucheville
--   * AIRBASE.Normandy.Meautis
--   * AIRBASE.Normandy.Cricqueville_en_Bessin
--   * AIRBASE.Normandy.Lessay
--   * AIRBASE.Normandy.Sainte_Laurent_sur_Mer
--   * AIRBASE.Normandy.Biniville
--   * AIRBASE.Normandy.Cardonville
--   * AIRBASE.Normandy.Deux_Jumeaux
--   * AIRBASE.Normandy.Chippelle
--   * AIRBASE.Normandy.Beuzeville
--   * AIRBASE.Normandy.Azeville
--   * AIRBASE.Normandy.Picauville
--   * AIRBASE.Normandy.Le_Molay
--   * AIRBASE.Normandy.Longues_sur_Mer
--   * AIRBASE.Normandy.Carpiquet
--   * AIRBASE.Normandy.Bazenville
--   * AIRBASE.Normandy.Sainte_Croix_sur_Mer
--   * AIRBASE.Normandy.Beny_sur_Mer
--   * AIRBASE.Normandy.Rucqueville
--   * AIRBASE.Normandy.Sommervieu
--   * AIRBASE.Normandy.Lantheuil
--   * AIRBASE.Normandy.Evreux
--   * AIRBASE.Normandy.Chailey
--   * AIRBASE.Normandy.Needs_Oar_Point
--   * AIRBASE.Normandy.Funtington
--   * AIRBASE.Normandy.Tangmere
--   * AIRBASE.Normandy.Ford
+-- * AIRBASE.Normandy.Abbeville_Drucat
+-- * AIRBASE.Normandy.Amiens_Glisy
 -- * AIRBASE.Normandy.Argentan
--   * AIRBASE.Normandy.Goulet
+-- * AIRBASE.Normandy.Avranches_Le_Val_Saint_Pere
+-- * AIRBASE.Normandy.Azeville
 -- * AIRBASE.Normandy.Barville
--   * AIRBASE.Normandy.Essay
--   * AIRBASE.Normandy.Hauterive
--   * AIRBASE.Normandy.Lymington
--   * AIRBASE.Normandy.Vrigny
--   * AIRBASE.Normandy.Odiham
--   * AIRBASE.Normandy.Conches
--   * AIRBASE.Normandy.West_Malling
--   * AIRBASE.Normandy.Villacoublay
--   * AIRBASE.Normandy.Kenley
+-- * AIRBASE.Normandy.Bazenville
+-- * AIRBASE.Normandy.Beaumont_le_Roger
 -- * AIRBASE.Normandy.Beauvais_Tille
+-- * AIRBASE.Normandy.Beny_sur_Mer
+-- * AIRBASE.Normandy.Bernay_Saint_Martin
+-- * AIRBASE.Normandy.Beuzeville
+-- * AIRBASE.Normandy.Biggin_Hill
+-- * AIRBASE.Normandy.Biniville
+-- * AIRBASE.Normandy.Broglie
+-- * AIRBASE.Normandy.Brucheville
+-- * AIRBASE.Normandy.Cardonville
+-- * AIRBASE.Normandy.Carpiquet
+-- * AIRBASE.Normandy.Chailey
+-- * AIRBASE.Normandy.Chippelle
+-- * AIRBASE.Normandy.Conches
 -- * AIRBASE.Normandy.Cormeilles_en_Vexin
 -- * AIRBASE.Normandy.Creil
--   * AIRBASE.Normandy.Guyancourt
--   * AIRBASE.Normandy.Lonrai
--   * AIRBASE.Normandy.Dinan_Trelivan
--   * AIRBASE.Normandy.Heathrow
--   * AIRBASE.Normandy.Fecamp_Benouville
--   * AIRBASE.Normandy.Farnborough
--   * AIRBASE.Normandy.Friston
+-- * AIRBASE.Normandy.Cretteville
+-- * AIRBASE.Normandy.Cricqueville_en_Bessin
 -- * AIRBASE.Normandy.Deanland
--   * AIRBASE.Normandy.Triqueville
--   * AIRBASE.Normandy.Poix
+-- * AIRBASE.Normandy.Deauville
+-- * AIRBASE.Normandy.Detling
+-- * AIRBASE.Normandy.Deux_Jumeaux
+-- * AIRBASE.Normandy.Dinan_Trelivan
+-- * AIRBASE.Normandy.Dunkirk_Mardyck
+-- * AIRBASE.Normandy.Essay
+-- * AIRBASE.Normandy.Evreux
+-- * AIRBASE.Normandy.Farnborough
+-- * AIRBASE.Normandy.Fecamp_Benouville
+-- * AIRBASE.Normandy.Flers
+-- * AIRBASE.Normandy.Ford
+-- * AIRBASE.Normandy.Friston
+-- * AIRBASE.Normandy.Funtington
+-- * AIRBASE.Normandy.Goulet
+-- * AIRBASE.Normandy.Gravesend
+-- * AIRBASE.Normandy.Guyancourt
+-- * AIRBASE.Normandy.Hauterive
+-- * AIRBASE.Normandy.Heathrow
+-- * AIRBASE.Normandy.High_Halden
+-- * AIRBASE.Normandy.Kenley
+-- * AIRBASE.Normandy.Lantheuil
+-- * AIRBASE.Normandy.Le_Molay
+-- * AIRBASE.Normandy.Lessay
+-- * AIRBASE.Normandy.Lignerolles
+-- * AIRBASE.Normandy.Longues_sur_Mer
+-- * AIRBASE.Normandy.Lonrai
+-- * AIRBASE.Normandy.Lymington
+-- * AIRBASE.Normandy.Lympne
+-- * AIRBASE.Normandy.Manston
+-- * AIRBASE.Normandy.Maupertus
+-- * AIRBASE.Normandy.Meautis
+-- * AIRBASE.Normandy.Merville_Calonne
+-- * AIRBASE.Normandy.Needs_Oar_Point
+-- * AIRBASE.Normandy.Odiham
 -- * AIRBASE.Normandy.Orly
--   * AIRBASE.Normandy.Stoney_Cross
--   * AIRBASE.Normandy.Amiens_Glisy
+-- * AIRBASE.Normandy.Picauville
+-- * AIRBASE.Normandy.Poix
 -- * AIRBASE.Normandy.Ronai
 -- * AIRBASE.Normandy.Rouen_Boos
--   * AIRBASE.Normandy.Deauville
--   * AIRBASE.Normandy.Saint_Aubin
--   * AIRBASE.Normandy.Flers
--   * AIRBASE.Normandy.Avranches_Le_Val_Saint_Pere
--   * AIRBASE.Normandy.Gravesend
--   * AIRBASE.Normandy.Beaumont_le_Roger
--   * AIRBASE.Normandy.Broglie
--   * AIRBASE.Normandy.Bernay_Saint_Martin
+-- * AIRBASE.Normandy.Rucqueville
 -- * AIRBASE.Normandy.Saint_Andre_de_lEure
--   * AIRBASE.Normandy.Biggin_Hill
--   * AIRBASE.Normandy.Manston
--   * AIRBASE.Normandy.Detling
--   * AIRBASE.Normandy.Lympne
--   * AIRBASE.Normandy.Abbeville_Drucat
--   * AIRBASE.Normandy.Merville_Calonne
+-- * AIRBASE.Normandy.Saint_Aubin
 -- * AIRBASE.Normandy.Saint_Omer_Wizernes
+-- * AIRBASE.Normandy.Saint_Pierre_du_Mont
+-- * AIRBASE.Normandy.Sainte_Croix_sur_Mer
+-- * AIRBASE.Normandy.Sainte_Laurent_sur_Mer
+-- * AIRBASE.Normandy.Sommervieu
+-- * AIRBASE.Normandy.Stoney_Cross
+-- * AIRBASE.Normandy.Tangmere
+-- * AIRBASE.Normandy.Triqueville
+-- * AIRBASE.Normandy.Villacoublay
+-- * AIRBASE.Normandy.Vrigny
+-- * AIRBASE.Normandy.West_Malling
 --
 -- @field Normandy
 AIRBASE.Normandy = {
-  ["Saint_Pierre_du_Mont"] = "Saint Pierre du Mont",
-  ["Lignerolles"] = "Lignerolles",
-  ["Cretteville"] = "Cretteville",
-  ["Maupertus"] = "Maupertus",
-  ["Brucheville"] = "Brucheville",
-  ["Meautis"] = "Meautis",
-  ["Cricqueville_en_Bessin"] = "Cricqueville-en-Bessin",
-  ["Lessay"] = "Lessay",
-  ["Sainte_Laurent_sur_Mer"] = "Sainte-Laurent-sur-Mer",
-  ["Biniville"] = "Biniville",
-  ["Cardonville"] = "Cardonville",
-  ["Deux_Jumeaux"] = "Deux Jumeaux",
-  ["Chippelle"] = "Chippelle",
-  ["Beuzeville"] = "Beuzeville",
-  ["Azeville"] = "Azeville",
-  ["Picauville"] = "Picauville",
-  ["Le_Molay"] = "Le Molay",
-  ["Longues_sur_Mer"] = "Longues-sur-Mer",
-  ["Carpiquet"] = "Carpiquet",
-  ["Bazenville"] = "Bazenville",
-  ["Sainte_Croix_sur_Mer"] = "Sainte-Croix-sur-Mer",
-  ["Beny_sur_Mer"] = "Beny-sur-Mer",
-  ["Rucqueville"] = "Rucqueville",
-  ["Sommervieu"] = "Sommervieu",
-  ["Lantheuil"] = "Lantheuil",
-  ["Evreux"] = "Evreux",
-  ["Chailey"] = "Chailey",
-  ["Needs_Oar_Point"] = "Needs Oar Point",
-  ["Funtington"] = "Funtington",
-  ["Tangmere"] = "Tangmere",
-  ["Ford"] = "Ford", 
+  ["Abbeville_Drucat"] = "Abbeville Drucat",
+  ["Amiens_Glisy"] = "Amiens-Glisy",
  ["Argentan"] = "Argentan",
-  ["Goulet"] = "Goulet",
+  ["Avranches_Le_Val_Saint_Pere"] = "Avranches Le Val-Saint-Pere",
+  ["Azeville"] = "Azeville",
  ["Barville"] = "Barville",
-  ["Essay"] = "Essay",
-  ["Hauterive"] = "Hauterive",
-  ["Lymington"] = "Lymington",
-  ["Vrigny"] = "Vrigny",
-  ["Odiham"] = "Odiham",
-  ["Conches"] = "Conches",
-  ["West_Malling"] = "West Malling",
-  ["Villacoublay"] = "Villacoublay",
-  ["Kenley"] = "Kenley",
+  ["Bazenville"] = "Bazenville",
+  ["Beaumont_le_Roger"] = "Beaumont-le-Roger",
  ["Beauvais_Tille"] = "Beauvais-Tille",
+  ["Beny_sur_Mer"] = "Beny-sur-Mer",
+  ["Bernay_Saint_Martin"] = "Bernay Saint Martin",
+  ["Beuzeville"] = "Beuzeville",
+  ["Biggin_Hill"] = "Biggin Hill",
+  ["Biniville"] = "Biniville",
+  ["Broglie"] = "Broglie",
+  ["Brucheville"] = "Brucheville",
+  ["Cardonville"] = "Cardonville",
+  ["Carpiquet"] = "Carpiquet",
+  ["Chailey"] = "Chailey",
+  ["Chippelle"] = "Chippelle",
+  ["Conches"] = "Conches",
  ["Cormeilles_en_Vexin"] = "Cormeilles-en-Vexin",
  ["Creil"] = "Creil",
-  ["Guyancourt"] = "Guyancourt",
-  ["Lonrai"] = "Lonrai",
-  ["Dinan_Trelivan"] = "Dinan-Trelivan",
-  ["Heathrow"] = "Heathrow",
-  ["Fecamp_Benouville"] = "Fecamp-Benouville",
-  ["Farnborough"] = "Farnborough",
-  ["Friston"] = "Friston",
+  ["Cretteville"] = "Cretteville",
+  ["Cricqueville_en_Bessin"] = "Cricqueville-en-Bessin",
  ["Deanland"] = "Deanland",
-  ["Triqueville"] = "Triqueville",
-  ["Poix"] = "Poix",
+  ["Deauville"] = "Deauville",
+  ["Detling"] = "Detling",
+  ["Deux_Jumeaux"] = "Deux Jumeaux",
+  ["Dinan_Trelivan"] = "Dinan-Trelivan",
+  ["Dunkirk_Mardyck"] = "Dunkirk-Mardyck",
+  ["Essay"] = "Essay",
+  ["Evreux"] = "Evreux",
+  ["Farnborough"] = "Farnborough",
+  ["Fecamp_Benouville"] = "Fecamp-Benouville",
+  ["Flers"] = "Flers",
+  ["Ford"] = "Ford",
+  ["Friston"] = "Friston",
+  ["Funtington"] = "Funtington",
+  ["Goulet"] = "Goulet",
+  ["Gravesend"] = "Gravesend",
+  ["Guyancourt"] = "Guyancourt",
+  ["Hauterive"] = "Hauterive",
+  ["Heathrow"] = "Heathrow",
+  ["High_Halden"] = "High Halden",
+  ["Kenley"] = "Kenley",
+  ["Lantheuil"] = "Lantheuil",
+  ["Le_Molay"] = "Le Molay",
+  ["Lessay"] = "Lessay",
+  ["Lignerolles"] = "Lignerolles",
+  ["Longues_sur_Mer"] = "Longues-sur-Mer",
+  ["Lonrai"] = "Lonrai",
+  ["Lymington"] = "Lymington",
+  ["Lympne"] = "Lympne",
+  ["Manston"] = "Manston",
+  ["Maupertus"] = "Maupertus",
+  ["Meautis"] = "Meautis",
+  ["Merville_Calonne"] = "Merville Calonne",
+  ["Needs_Oar_Point"] = "Needs Oar Point",
+  ["Odiham"] = "Odiham",
  ["Orly"] = "Orly",
-  ["Stoney_Cross"] = "Stoney Cross",
-  ["Amiens_Glisy"] = "Amiens-Glisy",
+  ["Picauville"] = "Picauville",
+  ["Poix"] = "Poix",
  ["Ronai"] = "Ronai",
  ["Rouen_Boos"] = "Rouen-Boos",
-  ["Deauville"] = "Deauville",
-  ["Saint_Aubin"] = "Saint-Aubin",
-  ["Flers"] = "Flers",
-  ["Avranches_Le_Val_Saint_Pere"] = "Avranches Le Val-Saint-Pere",
-  ["Gravesend"] = "Gravesend",
-  ["Beaumont_le_Roger"] = "Beaumont-le-Roger",
-  ["Broglie"] = "Broglie",
-  ["Bernay_Saint_Martin"] = "Bernay Saint Martin",
+  ["Rucqueville"] = "Rucqueville",
  ["Saint_Andre_de_lEure"] = "Saint-Andre-de-lEure",
-  ["Biggin_Hill"] = "Biggin Hill",
-  ["Manston"] = "Manston",
-  ["Detling"] = "Detling",
-  ["Lympne"] = "Lympne",
-  ["Abbeville_Drucat"] = "Abbeville Drucat",
-  ["Merville_Calonne"] = "Merville Calonne",
+  ["Saint_Aubin"] = "Saint-Aubin",
  ["Saint_Omer_Wizernes"] = "Saint-Omer Wizernes",
+  ["Saint_Pierre_du_Mont"] = "Saint Pierre du Mont",
+  ["Sainte_Croix_sur_Mer"] = "Sainte-Croix-sur-Mer",
+  ["Sainte_Laurent_sur_Mer"] = "Sainte-Laurent-sur-Mer",
+  ["Sommervieu"] = "Sommervieu",
+  ["Stoney_Cross"] = "Stoney Cross",
+  ["Tangmere"] = "Tangmere",
+  ["Triqueville"] = "Triqueville",
+  ["Villacoublay"] = "Villacoublay",
+  ["Vrigny"] = "Vrigny",
+  ["West_Malling"] = "West Malling",
 }

 --- Airbases of the Persion Gulf Map: