ENHANCEMENTS:

- Mission: new commands /airbase info, /airbase atis, /airbase warehouse and /airbase capture
- server.yaml: new parameter show_atis. If true, an ATIS display will be sent to people that jump in slots.

CHANGES:
- Removed Side.SPECTATOR in favor of Side.NEUTRAL
- Renamed /mission atis to /airbase atis
- Profiler: disables max_hung_minutes now when enabled

Author: karel26

README.md

@@ -459,6 +459,13 @@ DEFAULT:
     4) ...
   accept_rules_on_join: true    # True, if rules have to be acknowledged (players will be moved to spectators otherwise, default: false)
 My Fancy Server:                # Your server name, as displayed in the server list and listed in serverSettings.lua
+  channels:
+    status: 1122334455667788    # The Discord channel to display the server status embed and players embed into. Right-click on your channel and select "Copy Channel ID". You can disable it with -1
+    chat: 8877665544332211      # The Discord channel for the in-game chat replication. You can disable it by setting it to -1.
+    events: 1928374619283746    # Optional: if you want to split game events from chat messages, you can enable an optional events channel.
+    admin: 1188227733664455     # Optional: The channel where you can fire admin commands to this server. You can decide if you want to have a central admin channel or server-specific ones. See bot.yaml for more.
+    voice: 1827364518273645     # Optional: The voice channel, where people need to connect to (mandatory if force_voice is true). 
+    audit: 9182736459182736     # Optional: a server-specific audit channel (for those of you who like channels, all others can use the global one)
   server_user: Admin            # Name of the server user #1 (technical user), default is "Admin".
   show_passwords: true          # Do you want the password to be displayed in the server status embed? (default: true)
   smooth_pause: 5               # Servers that are configured to PAUSE on startup will run for this number of seconds until they are paused again (default 0 = off)
@@ -468,19 +475,13 @@ My Fancy Server:                # Your server name, as displayed in the server l
   validate_missions: true       # Check if your missions can be loaded or not (missing maps, etc.). Default: true.
   ignore_dirs:                  # Optional: ignore directories from mission upload / mission add (already ignored are .dcssb, Scripts and Saves)
     - archive
-  autorole: Fancy Players       # Optional: give people this role if they are online on this server (overwrites autorole[online] in bot.yaml!).
+  autorole: Fancy Players       # Optional: give people this role if they are online on this server (overwrites autorole/online in bot.yaml!).
+  show_atis: true               # Optional: show ATIS information on BIRTH
   force_voice: false            # Optional: enforce the usage of a voice channel (users need to be linked!) - default: false
   discord:                      # Optional: specify discord roles that are allowed to use this server
     - '@everyone'               # Attention: people cannot self-link on these servers and have to be liked properly already!
   managed_by:
     - Special Admin             # Optional: a list of Discord roles that can manage this server (default: DCS Admin)
-  channels:
-    status: 1122334455667788    # The Discord channel to display the server status embed and players embed into. Right-click on your channel and select "Copy Channel ID". You can disable it with -1
-    chat: 8877665544332211      # The Discord channel for the in-game chat replication. You can disable it by setting it to -1.
-    events: 1928374619283746    # Optional: if you want to split game events from chat messages, you can enable an optional events channel.
-    admin: 1188227733664455     # Optional: The channel where you can fire admin commands to this server. You can decide if you want to have a central admin channel or server-specific ones. See bot.yaml for more.
-    voice: 1827364518273645     # Optional: The voice channel, where people need to connect to (mandatory if force_voice is true). 
-    audit: 9182736459182736     # Optional: a server-specific audit channel (for those of you who like channels, all others can use the global one)
   chat_log:
     count: 10                   # A log file that holds the in-game chat to check for abuse. Tells how many files will be kept, default is 10.
     size: 1048576               # Max logfile size, default is 1 MB. 

core/data/const.py

@@ -12,10 +12,9 @@
 
 class Side(Enum):
     UNKNOWN = -1
-    SPECTATOR = 0
+    NEUTRAL = 0
     RED = 1
     BLUE = 2
-    NEUTRAL = 3
 
 
 class Status(Enum):

core/data/server.py

@@ -58,6 +58,7 @@ class Server(DataObject, ABC):
     last_seen: datetime = field(compare=False, default=datetime.now(timezone.utc))
     restart_time: datetime = field(compare=False, default=None)
     idle_since: datetime | None = field(compare=False, default=None)
+    resources: dict = field(repr=False, default_factory=dict)
 
     def __post_init__(self):
         super().__post_init__()

core/report/base.py

@@ -80,7 +80,8 @@ async def render(self, *args, **kwargs) -> ReportEnv:
         env.params['bot'] = self.bot
 
         # Create an embed with optional color
-        embed_color = getattr(discord.Color, report_def.get('color', 'blue'), discord.Color.blue)()
+        embed_color = getattr(discord.Color, utils.format_string(report_def.get('color', 'blue'), **env.params),
+                              discord.Color.blue)()
         env.embed = discord.Embed(color=embed_color)
 
         # Predefine keys that need formatting and apply transformations

core/utils/dcs.py

@@ -28,6 +28,7 @@
     "dms_to_dd",
     "dd_to_mgrs",
     "mgrs_to_dd",
+    "rad_to_heading",
     "get_active_runways",
     "create_writable_mission",
     "get_orig_file",
@@ -310,7 +311,12 @@ def mgrs_to_dd(value: str) -> tuple[float, float]:
         return ll_coords['lat'], ll_coords['lon']
 
 
-def get_active_runways(runways, wind):
+def rad_to_heading(rad: float) -> float:
+    """Return a heading in [0, 360) degrees for a radian value."""
+    return (360.0 - (rad * 180.0 / math.pi)) % 360.0
+
+
+def get_active_runways(runways: list, wind: dict):
     retval = []
     for runway in runways:
         heading = int(runway[:2]) * 10

plugins/cloud/listener.py

@@ -55,7 +55,7 @@ async def onPlayerChangeSlot(self, server: Server, data: dict) -> None:
         player: Player = server.get_player(ucid=data['ucid'])
         if not player:
             return
-        if player.side == Side.SPECTATOR:
+        if player.side == Side.NEUTRAL:
             return
         asyncio.create_task(self.update_cloud_data(server, player))
 

plugins/competitive/db/tables.sql

@@ -16,8 +16,12 @@ CREATE OR REPLACE FUNCTION trueskill_hist_change()
 RETURNS trigger
 AS $$
 BEGIN
-    INSERT INTO trueskill_hist(player_ucid, skill_mu, skill_sigma, time)
-    SELECT OLD.player_ucid, OLD.skill_mu, OLD.skill_sigma, old.time;
+    INSERT INTO trueskill_hist (player_ucid, skill_mu, skill_sigma, time)
+    VALUES (OLD.player_ucid, OLD.skill_mu, OLD.skill_sigma, OLD.time)
+    ON CONFLICT (player_ucid, time) DO UPDATE
+    SET skill_mu    = EXCLUDED.skill_mu,
+        skill_sigma = EXCLUDED.skill_sigma;
+
     RETURN NEW;
 END;
 $$ LANGUAGE 'plpgsql';

plugins/competitive/db/update_v3.1.sql

@@ -4,8 +4,12 @@ CREATE OR REPLACE FUNCTION trueskill_hist_change()
 RETURNS trigger
 AS $$
 BEGIN
-    INSERT INTO trueskill_hist(player_ucid, skill_mu, skill_sigma, time)
-    SELECT OLD.player_ucid, OLD.skill_mu, OLD.skill_sigma, old.time;
+    INSERT INTO trueskill_hist (player_ucid, skill_mu, skill_sigma, time)
+    VALUES (OLD.player_ucid, OLD.skill_mu, OLD.skill_sigma, OLD.time)
+    ON CONFLICT (player_ucid, time) DO UPDATE
+    SET skill_mu    = EXCLUDED.skill_mu,
+        skill_sigma = EXCLUDED.skill_sigma;
+
     RETURN NEW;
 END;
 $$ LANGUAGE 'plpgsql';

plugins/creditsystem/squadron.py

@@ -47,12 +47,14 @@ def points(self) -> int:
                 return row[0]
             else:
                 with conn.transaction():
-                    cursor = conn.execute("""
+                    conn.execute("""
                         INSERT INTO squadron_credits (campaign_id, squadron_id, points) 
                         VALUES (%s, %s, %s) 
                         ON CONFLICT DO NOTHING
-                        RETURNING points;
                     """, (self.campaign_id, self.squadron_id, self.config.get('initial_points', 0)))
+                    cursor = conn.execute("""
+                        SELECT points FROM squadron_credits WHERE campaign_id = %s AND squadron_id = %s
+                    """, (self.campaign_id, self.squadron_id))
                     row = cursor.fetchone()
                 return row[0]
 

plugins/gamemaster/listener.py

@@ -77,13 +77,12 @@ async def onChatMessage(self, server: Server, data: dict) -> None:
                 Side.RED: 31,
                 Side.BLUE: 34,
                 Side.NEUTRAL: 37,
-                Side.SPECTATOR: 37,
                 Side.UNKNOWN: 37
             }
             if data['to'] == -2:
                 color = colors[player.side]
             else:
-                color = colors[Side.SPECTATOR]
+                color = colors[Side.NEUTRAL]
             asyncio.create_task(chat_channel.send(
                 f"```ansi\n\u001b[1;{color}mPlayer {player.name} said: {data['message']}```"
             ))