CHANGES:

- Added carriers and farps to airbase commands

Author: karel26

core/utils/discord.py

@@ -1073,9 +1073,11 @@ async def airbase_autocomplete(interaction: discord.Interaction, current: str) -
         if not server or not server.current_mission:
             return []
         choices: list[app_commands.Choice[int]] = [
-            app_commands.Choice(name=x['name'], value=idx)
+            app_commands.Choice(name="{}".format(x['name'] if x.get('type', '') != 'FARP' else f"FARP {x['name']}"),
+                                value=idx)
             for idx, x in enumerate(server.current_mission.airbases)
-            if not current or current.casefold() in x['name'].casefold() or current.casefold() in x['code'].casefold()
+            if not current or current.casefold() in x['name'].casefold() or
+               current.casefold() in x.get('code', x.get('type')).casefold()
         ]
         return choices[:25]
     except Exception as ex:

plugins/mission/airbase.py

@@ -221,7 +221,10 @@ def count_types_in_line(s: str) -> int:
         )
 
     async def render(self, airbase: dict, data: dict):
-        self.add_field(name=_('Code'), value=airbase['code'])
+        if 'code' in airbase:
+            self.add_field(name=_('Code'), value=airbase['code'])
+        else:
+            self.add_field(name=_('Type'), value=airbase['type'])
         self.add_field(name=_('Coalition'), value=Side(data['coalition']).name.title())
         self.add_field(name='_ _', value='_ _')
         self.add_field(name=_('Dynamic Spawns'),

plugins/mission/commands.py

@@ -2539,7 +2539,7 @@ async def handle_warehouse_uploads(self, message: discord.Message):
             airports = data.get('coalitions', {}).get(coalition, {}).get('airbases')
         else:
             icao = match.group(1).upper()
-            airport = next((x for x in server.current_mission.airbases if x['code'] == icao), None)
+            airport = next((x for x in server.current_mission.airbases if x.get('code', x.get('type')) == icao), None)
             if not airport:
                 await message.channel.send(_("Airport with ICAO {} not found.").format(icao))
                 return

plugins/mission/listener.py

@@ -1002,7 +1002,7 @@ async def unpause(self, server: Server, player: Player, params: list[str]):
     async def send_atis(self, server: Server, player: Player, name: str) -> bool:
         airbase = next((
             x for x in server.current_mission.airbases
-            if (name.casefold() in x['name'].casefold()) or (name.upper() == x['code'])), None)
+            if (name.casefold() in x['name'].casefold()) or (name.upper() == x.get('code', x.get('type')))), None)
 
         if not airbase:
             airbase = await server.send_to_dcs_sync({

plugins/mission/lua/commands.lua

@@ -164,6 +164,7 @@ function dcsbot.getAirbases(json)
     local airdromes = Terrain.GetTerrainConfig("Airdromes")
     if (airdromes == nil) then
     	utils.sendBotTable(msg, json.channel)
+    	return
     end
     for airdromeID, airdrome in pairs(airdromes) do
         if (airdrome.reference_point) and (airdrome.abandoned ~= true)  then
@@ -211,6 +212,41 @@ function dcsbot.getAirbases(json)
             airbase.dynamic = DCS.getDynamicSpawnSettings(airdromeID, true)
             table.insert(msg.airbases, airbase)
         end
+    end
+    local farpsAndCarriers = DCS.getFarpsAndCarriersMissionData()
+    for carrierID, carrier in pairs(farpsAndCarriers.carriers) do
+        local airbase = {}
+        airbase.name = carrier.name
+        airbase.type = carrier.type
+        airbase.coalition = carrier.coalition
+        airbase.lat, airbase.lng = Terrain.convertMetersToLatLon(carrier.x, carrier.y)
+        airbase.alt = Terrain.GetHeight(carrier.x, carrier.y)
+        airbase.position = {}
+        airbase.position.x = carrier.x
+        airbase.position.y = airbase.alt
+        airbase.position.z = carrier.y
+        airbase.dynamic = DCS.getDynamicSpawnSettings(carrierID, true) or {
+            dynamicSpawnAvailable = false,
+            allowHotSpawn = false
+        }
+        table.insert(msg.airbases, airbase)
+    end
+    for farpID, farp in pairs(farpsAndCarriers.farps) do
+        local airbase = {}
+        airbase.name = farp.name
+        airbase.type = farp.type
+        airbase.coalition = farp.coalition
+        airbase.lat, airbase.lng = Terrain.convertMetersToLatLon(farp.x, farp.y)
+        airbase.alt = Terrain.GetHeight(farp.x, farp.y)
+        airbase.position = {}
+        airbase.position.x = farp.x
+        airbase.position.y = airbase.alt
+        airbase.position.z = farp.y
+        airbase.dynamic = DCS.getDynamicSpawnSettings(farpID, true) or {
+            dynamicSpawnAvailable = false,
+            allowHotSpawn = false
+        }
+        table.insert(msg.airbases, airbase)
     end
 	utils.sendBotTable(msg, json.channel)
 end