From b2077bfc740e86d510a0c4d10cd7abd55f4460b3 Mon Sep 17 00:00:00 2001 From: shaji Date: Wed, 16 Apr 2025 19:59:13 +0200 Subject: [PATCH 1/8] [FIXED] Returns nil for late activated templates we use to mark waypoint paths to use in the scripts. --- Moose Development/Moose/Wrapper/Group.lua | 1 - 1 file changed, 1 deletion(-) diff --git a/Moose Development/Moose/Wrapper/Group.lua b/Moose Development/Moose/Wrapper/Group.lua index fc210b886..fa597e461 100644 --- a/Moose Development/Moose/Wrapper/Group.lua +++ b/Moose Development/Moose/Wrapper/Group.lua @@ -1842,7 +1842,6 @@ end -- @param #GROUP self -- @return #table function GROUP:GetTemplateRoutePoints() - if not self or not self:IsAlive() then return end local GroupName = self:GetName() local template = _DATABASE:GetGroupTemplate(GroupName) if template and template.route and template.route.points then From 1ec1e00bde37e24cb78f1da5d637a9d26d905260 Mon Sep 17 00:00:00 2001 From: Frank Date: Thu, 17 Apr 2025 21:19:01 +0200 Subject: [PATCH 2/8] Germany CW map - ATIS Germany map - UTILS magnetic declination --- Moose Development/Moose/Ops/ATIS.lua | 6 +++++- Moose Development/Moose/Utilities/Utils.lua | 14 ++++++++++++-- 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/Moose Development/Moose/Ops/ATIS.lua b/Moose Development/Moose/Ops/ATIS.lua index 70f4f0848..f53f953d0 100644 --- a/Moose Development/Moose/Ops/ATIS.lua +++ b/Moose Development/Moose/Ops/ATIS.lua @@ -501,6 +501,7 @@ ATIS.Alphabet = { -- @field #number Kola +15° (East). -- @field #number Afghanistan +3° (East). -- @field #number Iraq +4.4° (East). +-- @field #number GermanyCW +0.1° (East). ATIS.RunwayM2T = { Caucasus = 0, Nevada = 12, @@ -513,7 +514,8 @@ ATIS.RunwayM2T = { SinaiMap = 5, Kola = 15, Afghanistan = 3, - Iraq=4.4 + Iraq=4.4, + GermanyCW=0.1, } --- Whether ICAO phraseology is used for ATIS broadcasts. @@ -530,6 +532,7 @@ ATIS.RunwayM2T = { -- @field #boolean Kola true. -- @field #boolean Afghanistan true. -- @field #boolean Iraq true. +-- @field #boolean GermanyCW true. ATIS.ICAOPhraseology = { Caucasus = true, Nevada = false, @@ -543,6 +546,7 @@ ATIS.ICAOPhraseology = { Kola = true, Afghanistan = true, Iraq = true, + GermanyCW = true, } --- Nav point data. diff --git a/Moose Development/Moose/Utilities/Utils.lua b/Moose Development/Moose/Utilities/Utils.lua index 9e0e60514..361e786d5 100644 --- a/Moose Development/Moose/Utilities/Utils.lua +++ b/Moose Development/Moose/Utilities/Utils.lua @@ -58,6 +58,7 @@ BIGSMOKEPRESET = { -- @field #string Kola Kola map. -- @field #string Afghanistan Afghanistan map -- @field #string Iraq Iraq map +-- @field #string GermanyCW Germany Cold War map DCSMAP = { Caucasus="Caucasus", NTTR="Nevada", @@ -70,7 +71,8 @@ DCSMAP = { Sinai="SinaiMap", Kola="Kola", Afghanistan="Afghanistan", - Iraq="Iraq" + Iraq="Iraq", + GermanyCW="GermanyCW", } @@ -1759,7 +1761,9 @@ end -- * Sinai +4.8 (East) -- * Kola +15 (East) - note there is a lot of deviation across the map (-1° to +24°), as we are close to the North pole -- * Afghanistan +3 (East) - actually +3.6 (NW) to +2.3 (SE) --- @param #string map (Optional) Map for which the declination is returned. Default is from env.mission.theatre +-- * Iraq +4.4 (East) +-- * Germany Cold War +0.1 (East) - near Fulda +-- @param #string map (Optional) Map for which the declination is returned. Default is from `env.mission.theatre`. -- @return #number Declination in degrees. function UTILS.GetMagneticDeclination(map) @@ -1791,6 +1795,8 @@ function UTILS.GetMagneticDeclination(map) declination=3 elseif map==DCSMAP.Iraq then declination=4.4 + elseif map==DCSMAP.GermanyCW then + declination=0.1 else declination=0 end @@ -2024,6 +2030,10 @@ function UTILS.GMTToLocalTimeDifference() return 3 -- Currently map is +2 but should be +3 (DCS bug?) elseif theatre==DCSMAP.Afghanistan then return 4.5 -- UTC +4:30 + elseif theatre==DCSMAP.Iraq then + return 3.0 -- UTC +3 + elseif theatre==DCSMAP.GermanyCW then + return 1.0 -- UTC +1 Central European Time (not summer time) else BASE:E(string.format("ERROR: Unknown Map %s in UTILS.GMTToLocal function. Returning 0", tostring(theatre))) return 0 From be4beea9d0b23ba01686495dc54be26e257dc8c6 Mon Sep 17 00:00:00 2001 From: Frank Date: Thu, 17 Apr 2025 21:34:01 +0200 Subject: [PATCH 3/8] Update Airbase.lua MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Removed umlauts and ß in airbase names --- Moose Development/Moose/Wrapper/Airbase.lua | 38 ++++++++++----------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/Moose Development/Moose/Wrapper/Airbase.lua b/Moose Development/Moose/Wrapper/Airbase.lua index 301c79a4f..206b4a5b6 100644 --- a/Moose Development/Moose/Wrapper/Airbase.lua +++ b/Moose Development/Moose/Wrapper/Airbase.lua @@ -1115,11 +1115,11 @@ AIRBASE.Iraq = { AIRBASE.GermanyCW = { ["Airracing_Frankfurt"] = "Airracing Frankfurt", ["Airracing_Koblenz"] = "Airracing Koblenz", - ["Airracing_Luebeck"] = "Airracing Lübeck", + ["Airracing_Luebeck"] = "Airracing Lubeck", ["Allstedt"] = "Allstedt", ["Alt_Daber"] = "Alt Daber", ["Altes_Lager"] = "Altes Lager", - ["Bad_Duerkheim"] = "Bad Dürkheim", + ["Bad_Duerkheim"] = "Bad Durkheim", ["Barth"] = "Barth", ["Bienenfarm"] = "Bienenfarm", ["Bindersleben"] = "Bindersleben", @@ -1127,8 +1127,8 @@ AIRBASE.GermanyCW = { ["Braunschweig"] = "Braunschweig", ["Bremen"] = "Bremen", ["Briest"] = "Briest", - ["Buechel"] = "Büchel", - ["Bueckeburg"] = "Bückeburg", + ["Buechel"] = "Buchel", + ["Bueckeburg"] = "Buckeburg", ["Celle"] = "Celle", ["Cochstedt"] = "Cochstedt", ["Damgarten"] = "Damgarten", @@ -1144,11 +1144,11 @@ AIRBASE.GermanyCW = { ["Gelnhausen"] = "Gelnhausen", ["Giebelstadt"] = "Giebelstadt", ["Glindbruchkippe_"] = "Glindbruchkippe ", - ["Gross_Doelln"] = "Groß Dölln", - ["Gross_Mohrdorf"] = "Groß Mohrdorf", - ["Grosse_Wiese"] = "Große Wiese", - ["Gaerz"] = "Gärz", - ["Guetersloh"] = "Gütersloh", + ["Gross_Doelln"] = "Gross Dolln", + ["Gross_Mohrdorf"] = "Gross Mohrdorf", + ["Grosse_Wiese"] = "Grosse Wiese", + ["Gaerz"] = "Garz", + ["Guetersloh"] = "Gutersloh", ["H_FRG_01"] = "H FRG 01", ["H_FRG_02"] = "H FRG 02", ["H_FRG_03"] = "H FRG 03", @@ -1267,31 +1267,31 @@ AIRBASE.GermanyCW = { ["Hockenheim"] = "Hockenheim", ["Holzdorf"] = "Holzdorf", ["Kammermark"] = "Kammermark", - ["Koethen"] = "Köthen", + ["Koethen"] = "Kothen", ["Laage"] = "Laage", ["Langenselbold"] = "Langenselbold", ["Leipzig_Halle"] = "Leipzig Halle", ["Leipzig_Mockau"] = "Leipzig Mockau", - ["Laerz"] = "Lärz", - ["Luebeck"] = "Lübeck", - ["Lueneburg"] = "Lüneburg", + ["Laerz"] = "Larz", + ["Luebeck"] = "Lubeck", + ["Lueneburg"] = "Luneburg", ["Mahlwinkel"] = "Mahlwinkel", ["Mendig"] = "Mendig", ["Merseburg"] = "Merseburg", ["Neubrandenburg"] = "Neubrandenburg", ["Neuruppin"] = "Neuruppin", ["Northeim"] = "Northeim", - ["Ober_Moerlen"] = "Ober-Mörlen", + ["Ober_Moerlen"] = "Ober-Morlen", ["Obermehler_Schlotheim"] = "Obermehler Schlotheim", ["Parchim"] = "Parchim", - ["Peenemuende"] = "Peenemünde", + ["Peenemuende"] = "Peenemunde", ["Pferdsfeld"] = "Pferdsfeld", ["Pinnow"] = "Pinnow", - ["Pottschutthoehe"] = "Pottschutthöhe", + ["Pottschutthoehe"] = "Pottschutthohe", ["Ramstein"] = "Ramstein", ["Rinteln"] = "Rinteln", ["Schweinfurt"] = "Schweinfurt", - ["Schoenefeld"] = "Schönefeld", + ["Schoenefeld"] = "Schonefeld", ["Sembach"] = "Sembach", ["Spangdahlem"] = "Spangdahlem", ["Sperenberg"] = "Sperenberg", @@ -1306,13 +1306,13 @@ AIRBASE.GermanyCW = { ["Walldorf"] = "Walldorf", ["Waren_Vielist"] = "Waren Vielist", ["Werneuchen"] = "Werneuchen", - ["Weser_Wuemme"] = "Weser Wümme", + ["Weser_Wuemme"] = "Weser Wumme", ["Wiesbaden"] = "Wiesbaden", ["Wismar"] = "Wismar", ["Worms"] = "Worms", ["Wunstorf"] = "Wunstorf", ["Zerbst"] = "Zerbst", - ["Zweibruecken"] = "Zweibrücken", + ["Zweibruecken"] = "Zweibrucken", } From 0392417189bdbafd13d92a8505771433466d329b Mon Sep 17 00:00:00 2001 From: Applevangelist Date: Fri, 18 Apr 2025 14:43:03 +0200 Subject: [PATCH 4/8] Germany CW Bases --- Moose Development/Moose/Wrapper/Airbase.lua | 82 +++++++++++---------- 1 file changed, 43 insertions(+), 39 deletions(-) diff --git a/Moose Development/Moose/Wrapper/Airbase.lua b/Moose Development/Moose/Wrapper/Airbase.lua index 206b4a5b6..7785fafcb 100644 --- a/Moose Development/Moose/Wrapper/Airbase.lua +++ b/Moose Development/Moose/Wrapper/Airbase.lua @@ -911,12 +911,12 @@ AIRBASE.Iraq = { --- Airbases of the Germany Cold War map -- * AIRBASE.GermanyCW.Airracing_Frankfurt +-- * AIRBASE.GermanyCW.Airracing_Frankfurt -- * AIRBASE.GermanyCW.Airracing_Koblenz --- * AIRBASE.GermanyCW.Airracing_Luebeck +-- * AIRBASE.GermanyCW.Airracing_Lubeck -- * AIRBASE.GermanyCW.Allstedt --- * AIRBASE.GermanyCW.Alt_Daber -- * AIRBASE.GermanyCW.Altes_Lager --- * AIRBASE.GermanyCW.Bad_Duerkheim +-- * AIRBASE.GermanyCW.Bad_Durkheim -- * AIRBASE.GermanyCW.Barth -- * AIRBASE.GermanyCW.Bienenfarm -- * AIRBASE.GermanyCW.Bindersleben @@ -924,8 +924,8 @@ AIRBASE.Iraq = { -- * AIRBASE.GermanyCW.Braunschweig -- * AIRBASE.GermanyCW.Bremen -- * AIRBASE.GermanyCW.Briest --- * AIRBASE.GermanyCW.Buechel --- * AIRBASE.GermanyCW.Bueckeburg +-- * AIRBASE.GermanyCW.Buchel +-- * AIRBASE.GermanyCW.Buckeburg -- * AIRBASE.GermanyCW.Celle -- * AIRBASE.GermanyCW.Cochstedt -- * AIRBASE.GermanyCW.Damgarten @@ -937,15 +937,14 @@ AIRBASE.Iraq = { -- * AIRBASE.GermanyCW.Fritzlar -- * AIRBASE.GermanyCW.Fulda -- * AIRBASE.GermanyCW.Gardelegen +-- * AIRBASE.GermanyCW.Garz -- * AIRBASE.GermanyCW.Gatow -- * AIRBASE.GermanyCW.Gelnhausen -- * AIRBASE.GermanyCW.Giebelstadt --- * AIRBASE.GermanyCW.Glindbruchkippe --- * AIRBASE.GermanyCW.Gross_Doelln +-- * AIRBASE.GermanyCW.Glindbruchkippe_ -- * AIRBASE.GermanyCW.Gross_Mohrdorf -- * AIRBASE.GermanyCW.Grosse_Wiese --- * AIRBASE.GermanyCW.Gaerz --- * AIRBASE.GermanyCW.Guetersloh +-- * AIRBASE.GermanyCW.Gutersloh -- * AIRBASE.GermanyCW.H_FRG_01 -- * AIRBASE.GermanyCW.H_FRG_02 -- * AIRBASE.GermanyCW.H_FRG_03 @@ -994,7 +993,7 @@ AIRBASE.Iraq = { -- * AIRBASE.GermanyCW.H_GDR_04 -- * AIRBASE.GermanyCW.H_GDR_05 -- * AIRBASE.GermanyCW.H_GDR_06 --- * AIRBASE.GermanyCW.H_GDR_07 +-- * AIRBASE.GermanyCW.H_GDR_07 -- * AIRBASE.GermanyCW.H_GDR_08 -- * AIRBASE.GermanyCW.H_GDR_09 -- * AIRBASE.GermanyCW.H_GDR_10 @@ -1016,10 +1015,11 @@ AIRBASE.Iraq = { -- * AIRBASE.GermanyCW.H_GDR_31 -- * AIRBASE.GermanyCW.H_GDR_32 -- * AIRBASE.GermanyCW.H_GDR_33 +-- * AIRBASE.GermanyCW.H_GDR_34 +-- * AIRBASE.GermanyCW.H_Med_FRG_01 -- * AIRBASE.GermanyCW.H_Med_FRG_02 -- * AIRBASE.GermanyCW.H_Med_FRG_04 -- * AIRBASE.GermanyCW.H_Med_FRG_06 --- * AIRBASE.GermanyCW.H_Med_FRG_09 -- * AIRBASE.GermanyCW.H_Med_FRG_11 -- * AIRBASE.GermanyCW.H_Med_FRG_12 -- * AIRBASE.GermanyCW.H_Med_FRG_13 @@ -1064,37 +1064,38 @@ AIRBASE.Iraq = { -- * AIRBASE.GermanyCW.Hockenheim -- * AIRBASE.GermanyCW.Holzdorf -- * AIRBASE.GermanyCW.Kammermark --- * AIRBASE.GermanyCW.Koethen +-- * AIRBASE.GermanyCW.Kothen -- * AIRBASE.GermanyCW.Laage -- * AIRBASE.GermanyCW.Langenselbold +-- * AIRBASE.GermanyCW.Larz -- * AIRBASE.GermanyCW.Leipzig_Halle -- * AIRBASE.GermanyCW.Leipzig_Mockau --- * AIRBASE.GermanyCW.Laerz --- * AIRBASE.GermanyCW.Luebeck --- * AIRBASE.GermanyCW.Lueneburg +-- * AIRBASE.GermanyCW.Lubeck +-- * AIRBASE.GermanyCW.Luneburg -- * AIRBASE.GermanyCW.Mahlwinkel -- * AIRBASE.GermanyCW.Mendig -- * AIRBASE.GermanyCW.Merseburg -- * AIRBASE.GermanyCW.Neubrandenburg -- * AIRBASE.GermanyCW.Neuruppin -- * AIRBASE.GermanyCW.Northeim --- * AIRBASE.GermanyCW.Ober_Moerlen +-- * AIRBASE.GermanyCW.Ober_Morlen -- * AIRBASE.GermanyCW.Obermehler_Schlotheim -- * AIRBASE.GermanyCW.Parchim --- * AIRBASE.GermanyCW.Peenemuende +-- * AIRBASE.GermanyCW.Peenemunde -- * AIRBASE.GermanyCW.Pferdsfeld -- * AIRBASE.GermanyCW.Pinnow --- * AIRBASE.GermanyCW.Pottschutthoehe +-- * AIRBASE.GermanyCW.Pottschutthohe -- * AIRBASE.GermanyCW.Ramstein -- * AIRBASE.GermanyCW.Rinteln +-- * AIRBASE.GermanyCW.Schonefeld -- * AIRBASE.GermanyCW.Schweinfurt --- * AIRBASE.GermanyCW.Schoenefeld -- * AIRBASE.GermanyCW.Sembach -- * AIRBASE.GermanyCW.Spangdahlem -- * AIRBASE.GermanyCW.Sperenberg -- * AIRBASE.GermanyCW.Stendal -- * AIRBASE.GermanyCW.Tegel -- * AIRBASE.GermanyCW.Tempelhof +-- * AIRBASE.GermanyCW.Templin -- * AIRBASE.GermanyCW.Tutow -- * AIRBASE.GermanyCW.Uelzen -- * AIRBASE.GermanyCW.Uetersen @@ -1103,23 +1104,23 @@ AIRBASE.Iraq = { -- * AIRBASE.GermanyCW.Walldorf -- * AIRBASE.GermanyCW.Waren_Vielist -- * AIRBASE.GermanyCW.Werneuchen --- * AIRBASE.GermanyCW.Weser_Wuemme +-- * AIRBASE.GermanyCW.Weser_Wumme -- * AIRBASE.GermanyCW.Wiesbaden -- * AIRBASE.GermanyCW.Wismar +-- * AIRBASE.GermanyCW.Wittstock -- * AIRBASE.GermanyCW.Worms -- * AIRBASE.GermanyCW.Wunstorf -- * AIRBASE.GermanyCW.Zerbst --- * AIRBASE.GermanyCW.Zweibruecken +-- * AIRBASE.GermanyCW.Zweibrucken -- -- @field GermanyCW AIRBASE.GermanyCW = { ["Airracing_Frankfurt"] = "Airracing Frankfurt", ["Airracing_Koblenz"] = "Airracing Koblenz", - ["Airracing_Luebeck"] = "Airracing Lubeck", + ["Airracing_Lubeck"] = "Airracing Lubeck", ["Allstedt"] = "Allstedt", - ["Alt_Daber"] = "Alt Daber", ["Altes_Lager"] = "Altes Lager", - ["Bad_Duerkheim"] = "Bad Durkheim", + ["Bad_Durkheim"] = "Bad Durkheim", ["Barth"] = "Barth", ["Bienenfarm"] = "Bienenfarm", ["Bindersleben"] = "Bindersleben", @@ -1127,8 +1128,8 @@ AIRBASE.GermanyCW = { ["Braunschweig"] = "Braunschweig", ["Bremen"] = "Bremen", ["Briest"] = "Briest", - ["Buechel"] = "Buchel", - ["Bueckeburg"] = "Buckeburg", + ["Buchel"] = "Buchel", + ["Buckeburg"] = "Buckeburg", ["Celle"] = "Celle", ["Cochstedt"] = "Cochstedt", ["Damgarten"] = "Damgarten", @@ -1140,15 +1141,14 @@ AIRBASE.GermanyCW = { ["Fritzlar"] = "Fritzlar", ["Fulda"] = "Fulda", ["Gardelegen"] = "Gardelegen", + ["Garz"] = "Garz", ["Gatow"] = "Gatow", ["Gelnhausen"] = "Gelnhausen", ["Giebelstadt"] = "Giebelstadt", ["Glindbruchkippe_"] = "Glindbruchkippe ", - ["Gross_Doelln"] = "Gross Dolln", ["Gross_Mohrdorf"] = "Gross Mohrdorf", ["Grosse_Wiese"] = "Grosse Wiese", - ["Gaerz"] = "Garz", - ["Guetersloh"] = "Gutersloh", + ["Gutersloh"] = "Gutersloh", ["H_FRG_01"] = "H FRG 01", ["H_FRG_02"] = "H FRG 02", ["H_FRG_03"] = "H FRG 03", @@ -1219,10 +1219,11 @@ AIRBASE.GermanyCW = { ["H_GDR_31"] = "H GDR 31", ["H_GDR_32"] = "H GDR 32", ["H_GDR_33"] = "H GDR 33", + ["H_GDR_34"] = "H GDR 34", + ["H_Med_FRG_01"] = "H Med FRG 01", ["H_Med_FRG_02"] = "H Med FRG 02", ["H_Med_FRG_04"] = "H Med FRG 04", ["H_Med_FRG_06"] = "H Med FRG 06", - ["H_Med_FRG_09"] = "H Med FRG 09", ["H_Med_FRG_11"] = "H Med FRG 11", ["H_Med_FRG_12"] = "H Med FRG 12", ["H_Med_FRG_13"] = "H Med FRG 13", @@ -1267,29 +1268,30 @@ AIRBASE.GermanyCW = { ["Hockenheim"] = "Hockenheim", ["Holzdorf"] = "Holzdorf", ["Kammermark"] = "Kammermark", - ["Koethen"] = "Kothen", + ["Kothen"] = "Kothen", ["Laage"] = "Laage", ["Langenselbold"] = "Langenselbold", + ["Larz"] = "Larz", ["Leipzig_Halle"] = "Leipzig Halle", ["Leipzig_Mockau"] = "Leipzig Mockau", - ["Laerz"] = "Larz", - ["Luebeck"] = "Lubeck", - ["Lueneburg"] = "Luneburg", + ["Lubeck"] = "Lubeck", + ["Luneburg"] = "Luneburg", ["Mahlwinkel"] = "Mahlwinkel", ["Mendig"] = "Mendig", ["Merseburg"] = "Merseburg", ["Neubrandenburg"] = "Neubrandenburg", ["Neuruppin"] = "Neuruppin", ["Northeim"] = "Northeim", - ["Ober_Moerlen"] = "Ober-Morlen", + ["Ober_Morlen"] = "Ober-Morlen", ["Obermehler_Schlotheim"] = "Obermehler Schlotheim", ["Parchim"] = "Parchim", - ["Peenemuende"] = "Peenemunde", + ["Peenemunde"] = "Peenemunde", ["Pferdsfeld"] = "Pferdsfeld", ["Pinnow"] = "Pinnow", - ["Pottschutthoehe"] = "Pottschutthohe", + ["Pottschutthohe"] = "Pottschutthohe", ["Ramstein"] = "Ramstein", ["Rinteln"] = "Rinteln", + ["Schonefeld"] = "Schonefeld", ["Schweinfurt"] = "Schweinfurt", ["Schoenefeld"] = "Schonefeld", ["Sembach"] = "Sembach", @@ -1298,6 +1300,7 @@ AIRBASE.GermanyCW = { ["Stendal"] = "Stendal", ["Tegel"] = "Tegel", ["Tempelhof"] = "Tempelhof", + ["Templin"] = "Templin", ["Tutow"] = "Tutow", ["Uelzen"] = "Uelzen", ["Uetersen"] = "Uetersen", @@ -1306,13 +1309,14 @@ AIRBASE.GermanyCW = { ["Walldorf"] = "Walldorf", ["Waren_Vielist"] = "Waren Vielist", ["Werneuchen"] = "Werneuchen", - ["Weser_Wuemme"] = "Weser Wumme", + ["Weser_Wumme"] = "Weser Wumme", ["Wiesbaden"] = "Wiesbaden", ["Wismar"] = "Wismar", + ["Wittstock"] = "Wittstock", ["Worms"] = "Worms", ["Wunstorf"] = "Wunstorf", ["Zerbst"] = "Zerbst", - ["Zweibruecken"] = "Zweibrucken", + ["Zweibrucken"] = "Zweibrucken", } From d1ae2c0f5e35aff86f398f67f1dffc29533fc6ea Mon Sep 17 00:00:00 2001 From: Applevangelist Date: Fri, 18 Apr 2025 16:01:55 +0200 Subject: [PATCH 5/8] xx --- Moose Development/Moose/Wrapper/Airbase.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Moose Development/Moose/Wrapper/Airbase.lua b/Moose Development/Moose/Wrapper/Airbase.lua index 7785fafcb..d36cff246 100644 --- a/Moose Development/Moose/Wrapper/Airbase.lua +++ b/Moose Development/Moose/Wrapper/Airbase.lua @@ -2585,7 +2585,7 @@ function AIRBASE:_InitRunways(IncludeInverse) runway.name=string.format("%02d", tonumber(namefromheading)) else runway.name=string.format("%02d", tonumber(name)) - self:I("RunwayName: "..runway.name) + --self:I("RunwayName: "..runway.name) end --runway.name=string.format("%02d", tonumber(name)) From 207698a2dd50f6590be39f1beec25d8185d3d980 Mon Sep 17 00:00:00 2001 From: Frank Date: Fri, 18 Apr 2025 17:40:55 +0200 Subject: [PATCH 6/8] Update Airbase.lua - Germany map readded Umlaute in keys --- Moose Development/Moose/Wrapper/Airbase.lua | 55 ++++++++++----------- 1 file changed, 27 insertions(+), 28 deletions(-) diff --git a/Moose Development/Moose/Wrapper/Airbase.lua b/Moose Development/Moose/Wrapper/Airbase.lua index d36cff246..8afbc8d45 100644 --- a/Moose Development/Moose/Wrapper/Airbase.lua +++ b/Moose Development/Moose/Wrapper/Airbase.lua @@ -913,10 +913,10 @@ AIRBASE.Iraq = { -- * AIRBASE.GermanyCW.Airracing_Frankfurt -- * AIRBASE.GermanyCW.Airracing_Frankfurt -- * AIRBASE.GermanyCW.Airracing_Koblenz --- * AIRBASE.GermanyCW.Airracing_Lubeck +-- * AIRBASE.GermanyCW.Airracing_Luebeck -- * AIRBASE.GermanyCW.Allstedt -- * AIRBASE.GermanyCW.Altes_Lager --- * AIRBASE.GermanyCW.Bad_Durkheim +-- * AIRBASE.GermanyCW.Bad_Duerkheim -- * AIRBASE.GermanyCW.Barth -- * AIRBASE.GermanyCW.Bienenfarm -- * AIRBASE.GermanyCW.Bindersleben @@ -924,8 +924,8 @@ AIRBASE.Iraq = { -- * AIRBASE.GermanyCW.Braunschweig -- * AIRBASE.GermanyCW.Bremen -- * AIRBASE.GermanyCW.Briest --- * AIRBASE.GermanyCW.Buchel --- * AIRBASE.GermanyCW.Buckeburg +-- * AIRBASE.GermanyCW.Buechel +-- * AIRBASE.GermanyCW.Bueckeburg -- * AIRBASE.GermanyCW.Celle -- * AIRBASE.GermanyCW.Cochstedt -- * AIRBASE.GermanyCW.Damgarten @@ -941,10 +941,10 @@ AIRBASE.Iraq = { -- * AIRBASE.GermanyCW.Gatow -- * AIRBASE.GermanyCW.Gelnhausen -- * AIRBASE.GermanyCW.Giebelstadt --- * AIRBASE.GermanyCW.Glindbruchkippe_ +-- * AIRBASE.GermanyCW.Glindbruchkippe_ -- * AIRBASE.GermanyCW.Gross_Mohrdorf -- * AIRBASE.GermanyCW.Grosse_Wiese --- * AIRBASE.GermanyCW.Gutersloh +-- * AIRBASE.GermanyCW.Guetersloh -- * AIRBASE.GermanyCW.H_FRG_01 -- * AIRBASE.GermanyCW.H_FRG_02 -- * AIRBASE.GermanyCW.H_FRG_03 @@ -1064,14 +1064,14 @@ AIRBASE.Iraq = { -- * AIRBASE.GermanyCW.Hockenheim -- * AIRBASE.GermanyCW.Holzdorf -- * AIRBASE.GermanyCW.Kammermark --- * AIRBASE.GermanyCW.Kothen +-- * AIRBASE.GermanyCW.Koethen -- * AIRBASE.GermanyCW.Laage -- * AIRBASE.GermanyCW.Langenselbold --- * AIRBASE.GermanyCW.Larz +-- * AIRBASE.GermanyCW.Laerz -- * AIRBASE.GermanyCW.Leipzig_Halle -- * AIRBASE.GermanyCW.Leipzig_Mockau --- * AIRBASE.GermanyCW.Lubeck --- * AIRBASE.GermanyCW.Luneburg +-- * AIRBASE.GermanyCW.Luebeck +-- * AIRBASE.GermanyCW.Lueneburg -- * AIRBASE.GermanyCW.Mahlwinkel -- * AIRBASE.GermanyCW.Mendig -- * AIRBASE.GermanyCW.Merseburg @@ -1081,13 +1081,13 @@ AIRBASE.Iraq = { -- * AIRBASE.GermanyCW.Ober_Morlen -- * AIRBASE.GermanyCW.Obermehler_Schlotheim -- * AIRBASE.GermanyCW.Parchim --- * AIRBASE.GermanyCW.Peenemunde +-- * AIRBASE.GermanyCW.Peenemuende -- * AIRBASE.GermanyCW.Pferdsfeld -- * AIRBASE.GermanyCW.Pinnow -- * AIRBASE.GermanyCW.Pottschutthohe -- * AIRBASE.GermanyCW.Ramstein -- * AIRBASE.GermanyCW.Rinteln --- * AIRBASE.GermanyCW.Schonefeld +-- * AIRBASE.GermanyCW.Schoenefeld -- * AIRBASE.GermanyCW.Schweinfurt -- * AIRBASE.GermanyCW.Sembach -- * AIRBASE.GermanyCW.Spangdahlem @@ -1111,16 +1111,16 @@ AIRBASE.Iraq = { -- * AIRBASE.GermanyCW.Worms -- * AIRBASE.GermanyCW.Wunstorf -- * AIRBASE.GermanyCW.Zerbst --- * AIRBASE.GermanyCW.Zweibrucken +-- * AIRBASE.GermanyCW.Zweibruecken -- -- @field GermanyCW AIRBASE.GermanyCW = { ["Airracing_Frankfurt"] = "Airracing Frankfurt", ["Airracing_Koblenz"] = "Airracing Koblenz", - ["Airracing_Lubeck"] = "Airracing Lubeck", + ["Airracing_Luebeck"] = "Airracing Lubeck", ["Allstedt"] = "Allstedt", ["Altes_Lager"] = "Altes Lager", - ["Bad_Durkheim"] = "Bad Durkheim", + ["Bad_Duerkheim"] = "Bad Durkheim", ["Barth"] = "Barth", ["Bienenfarm"] = "Bienenfarm", ["Bindersleben"] = "Bindersleben", @@ -1128,8 +1128,8 @@ AIRBASE.GermanyCW = { ["Braunschweig"] = "Braunschweig", ["Bremen"] = "Bremen", ["Briest"] = "Briest", - ["Buchel"] = "Buchel", - ["Buckeburg"] = "Buckeburg", + ["Buechel"] = "Buchel", + ["Bueckeburg"] = "Buckeburg", ["Celle"] = "Celle", ["Cochstedt"] = "Cochstedt", ["Damgarten"] = "Damgarten", @@ -1145,10 +1145,10 @@ AIRBASE.GermanyCW = { ["Gatow"] = "Gatow", ["Gelnhausen"] = "Gelnhausen", ["Giebelstadt"] = "Giebelstadt", - ["Glindbruchkippe_"] = "Glindbruchkippe ", + ["Glindbruchkippe"] = "Glindbruchkippe ", ["Gross_Mohrdorf"] = "Gross Mohrdorf", ["Grosse_Wiese"] = "Grosse Wiese", - ["Gutersloh"] = "Gutersloh", + ["Guetersloh"] = "Gutersloh", ["H_FRG_01"] = "H FRG 01", ["H_FRG_02"] = "H FRG 02", ["H_FRG_03"] = "H FRG 03", @@ -1268,14 +1268,14 @@ AIRBASE.GermanyCW = { ["Hockenheim"] = "Hockenheim", ["Holzdorf"] = "Holzdorf", ["Kammermark"] = "Kammermark", - ["Kothen"] = "Kothen", + ["Koethen"] = "Kothen", ["Laage"] = "Laage", ["Langenselbold"] = "Langenselbold", - ["Larz"] = "Larz", + ["Laerz"] = "Larz", ["Leipzig_Halle"] = "Leipzig Halle", ["Leipzig_Mockau"] = "Leipzig Mockau", - ["Lubeck"] = "Lubeck", - ["Luneburg"] = "Luneburg", + ["Luebeck"] = "Lubeck", + ["Lueneburg"] = "Luneburg", ["Mahlwinkel"] = "Mahlwinkel", ["Mendig"] = "Mendig", ["Merseburg"] = "Merseburg", @@ -1285,15 +1285,14 @@ AIRBASE.GermanyCW = { ["Ober_Morlen"] = "Ober-Morlen", ["Obermehler_Schlotheim"] = "Obermehler Schlotheim", ["Parchim"] = "Parchim", - ["Peenemunde"] = "Peenemunde", + ["Peenemuende"] = "Peenemunde", ["Pferdsfeld"] = "Pferdsfeld", ["Pinnow"] = "Pinnow", - ["Pottschutthohe"] = "Pottschutthohe", + ["Pottschutthoehe"] = "Pottschutthohe", ["Ramstein"] = "Ramstein", ["Rinteln"] = "Rinteln", - ["Schonefeld"] = "Schonefeld", - ["Schweinfurt"] = "Schweinfurt", ["Schoenefeld"] = "Schonefeld", + ["Schweinfurt"] = "Schweinfurt", ["Sembach"] = "Sembach", ["Spangdahlem"] = "Spangdahlem", ["Sperenberg"] = "Sperenberg", @@ -1316,7 +1315,7 @@ AIRBASE.GermanyCW = { ["Worms"] = "Worms", ["Wunstorf"] = "Wunstorf", ["Zerbst"] = "Zerbst", - ["Zweibrucken"] = "Zweibrucken", + ["Zweibruecken"] = "Zweibrucken", } From 544db963eaa0a40c7ea0be1108905c7c77bfd5e0 Mon Sep 17 00:00:00 2001 From: Frank Date: Fri, 18 Apr 2025 17:45:43 +0200 Subject: [PATCH 7/8] Update Airbase.lua --- Moose Development/Moose/Wrapper/Airbase.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Moose Development/Moose/Wrapper/Airbase.lua b/Moose Development/Moose/Wrapper/Airbase.lua index 8afbc8d45..bbeff6a43 100644 --- a/Moose Development/Moose/Wrapper/Airbase.lua +++ b/Moose Development/Moose/Wrapper/Airbase.lua @@ -941,7 +941,7 @@ AIRBASE.Iraq = { -- * AIRBASE.GermanyCW.Gatow -- * AIRBASE.GermanyCW.Gelnhausen -- * AIRBASE.GermanyCW.Giebelstadt --- * AIRBASE.GermanyCW.Glindbruchkippe_ +-- * AIRBASE.GermanyCW.Glindbruchkippe -- * AIRBASE.GermanyCW.Gross_Mohrdorf -- * AIRBASE.GermanyCW.Grosse_Wiese -- * AIRBASE.GermanyCW.Guetersloh @@ -1084,7 +1084,7 @@ AIRBASE.Iraq = { -- * AIRBASE.GermanyCW.Peenemuende -- * AIRBASE.GermanyCW.Pferdsfeld -- * AIRBASE.GermanyCW.Pinnow --- * AIRBASE.GermanyCW.Pottschutthohe +-- * AIRBASE.GermanyCW.Pottschutthoehe -- * AIRBASE.GermanyCW.Ramstein -- * AIRBASE.GermanyCW.Rinteln -- * AIRBASE.GermanyCW.Schoenefeld From 2c10943cb18c2c48d231f476adb25bb0201274a0 Mon Sep 17 00:00:00 2001 From: Frank Date: Fri, 18 Apr 2025 17:50:01 +0200 Subject: [PATCH 8/8] Update Airbase.lua Germany map Umlaute --- Moose Development/Moose/Wrapper/Airbase.lua | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Moose Development/Moose/Wrapper/Airbase.lua b/Moose Development/Moose/Wrapper/Airbase.lua index bbeff6a43..21d69a296 100644 --- a/Moose Development/Moose/Wrapper/Airbase.lua +++ b/Moose Development/Moose/Wrapper/Airbase.lua @@ -1078,7 +1078,7 @@ AIRBASE.Iraq = { -- * AIRBASE.GermanyCW.Neubrandenburg -- * AIRBASE.GermanyCW.Neuruppin -- * AIRBASE.GermanyCW.Northeim --- * AIRBASE.GermanyCW.Ober_Morlen +-- * AIRBASE.GermanyCW.Ober_Moerlen -- * AIRBASE.GermanyCW.Obermehler_Schlotheim -- * AIRBASE.GermanyCW.Parchim -- * AIRBASE.GermanyCW.Peenemuende @@ -1104,7 +1104,7 @@ AIRBASE.Iraq = { -- * AIRBASE.GermanyCW.Walldorf -- * AIRBASE.GermanyCW.Waren_Vielist -- * AIRBASE.GermanyCW.Werneuchen --- * AIRBASE.GermanyCW.Weser_Wumme +-- * AIRBASE.GermanyCW.Weser_Wuemme -- * AIRBASE.GermanyCW.Wiesbaden -- * AIRBASE.GermanyCW.Wismar -- * AIRBASE.GermanyCW.Wittstock @@ -1282,7 +1282,7 @@ AIRBASE.GermanyCW = { ["Neubrandenburg"] = "Neubrandenburg", ["Neuruppin"] = "Neuruppin", ["Northeim"] = "Northeim", - ["Ober_Morlen"] = "Ober-Morlen", + ["Ober_Moerlen"] = "Ober-Morlen", ["Obermehler_Schlotheim"] = "Obermehler Schlotheim", ["Parchim"] = "Parchim", ["Peenemuende"] = "Peenemunde", @@ -1308,7 +1308,7 @@ AIRBASE.GermanyCW = { ["Walldorf"] = "Walldorf", ["Waren_Vielist"] = "Waren Vielist", ["Werneuchen"] = "Werneuchen", - ["Weser_Wumme"] = "Weser Wumme", + ["Weser_Wuemme"] = "Weser Wumme", ["Wiesbaden"] = "Wiesbaden", ["Wismar"] = "Wismar", ["Wittstock"] = "Wittstock",