Getting ready for V1.6.0

Author: PiwnicaUwU

UncomplicatedCustomTeams/API/Enums/WaveType.cs

@@ -9,6 +9,8 @@ public enum WaveType
         AfterDecontamination,
         UsedItem,
         RoundStarted,
-        ScpDeath
+        ScpDeath,
+        TeamDependent,
+        AfterGeneratorActivated
     }
 }

UncomplicatedCustomTeams/API/Features/LogEntry.cs

@@ -0,0 +1,52 @@
+using Discord;
+using System;
+using System.Text.Json.Serialization;
+
+namespace UncomplicatedCustomTeams.API.Features
+{
+    internal class LogEntry
+    {
+        /// <summary>
+        /// Gets the time in unix milliseconds of the message
+        /// </summary>
+        public long Time { get; }
+
+        /// <summary>
+        /// Gets the <see cref="Discord.LogLevel"/> or a custom LogLevel of the message
+        /// </summary>
+        public string Level { get; }
+
+        /// <summary>
+        /// Gets the message of the log
+        /// </summary>
+        public string Content { get; }
+
+#nullable enable
+        /// <summary>
+        /// Gets the custom error code of the message - can be null!
+        /// </summary>
+        public string? Error { get; }
+#nullable disable
+
+        /// <summary>
+        /// Gets the instance of the Error as string
+        /// </summary>
+        public string PublicError => Error is null ? string.Empty : $"{Error} ";
+
+        [JsonIgnore]
+        public DateTimeOffset DateTimeOffset => DateTimeOffset.FromUnixTimeMilliseconds(Time);
+
+        [JsonConstructor]
+        public LogEntry(long time, string level, string content, string error = null)
+        {
+            Time = time;
+            Level = level;
+            Content = content;
+            Error = error;
+        }
+
+        public LogEntry(long time, LogLevel level, string content, string error = null) : this(time, level.ToString(), content, error) { }
+
+        public override string ToString() => $"[{DateTimeOffset.Year}-{DateTimeOffset.Month}-{DateTimeOffset.Day} {DateTimeOffset.Hour}:{DateTimeOffset.Minute}:{DateTimeOffset.Second} {DateTimeOffset.Offset}]  [{Level}]  [UncomplicatedCustomRoles] {PublicError}{Content}";
+    }
+}

UncomplicatedCustomTeams/API/Features/SummonedTeam.cs

@@ -5,9 +5,11 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Reflection;
 using UncomplicatedCustomTeams.API.Enums;
 using UncomplicatedCustomTeams.API.Storage;
 using UncomplicatedCustomTeams.Utilities;
+using UnityEngine;
 using Utils.NonAllocLINQ;
 
 namespace UncomplicatedCustomTeams.API.Features
@@ -17,11 +19,12 @@ public class SummonedTeam
         /// <summary>
         /// Gets a list of every spawned <see cref="Team"/> as <see cref="SummonedTeam"/>
         /// </summary>
-        public static List<SummonedTeam> List { get; } = new();
+        public static List<SummonedTeam> List { get; } = [];
+        public static event Action<SummonedTeam> OnTeamSummoned;
 
         public string Id { get; }
 
-        public List<SummonedCustomRole> Players { get; } = new();
+        public List<SummonedCustomRole> Players { get; } = [];
 
         public Team Team { get; }
 
@@ -77,36 +80,14 @@ public bool IsTeamEliminated()
         }
 
         /// <summary>
-        /// Checks if the given team is a custom team.
+        /// Checks if a player is part of any spawned custom team.
         /// </summary>
-        public static bool IsCustomTeam(PlayerRoles.Team team)
+        public static bool IsPlayerInCustomTeam(Player player)
         {
-            return Team.List.Any(t => t.Name == team.ToString());
-        }
-
-        /// <summary>
-        /// Checks if the round should end based on the alive teams and winning conditions.
-        /// </summary>
-        public static void CheckRoundEndCondition()
-        {
-            var aliveTeams = Player.List.Where(p => p.IsAlive)
-                .Select(p => p.Role.Team)
-                .Where(t => !IsCustomTeam(t))
-                .Distinct()
-                .ToList();
+            if (player == null)
+                return false;
 
-            var winningTeams = Team.GetWinningTeams();
-            bool hasWinningTeamAlive = aliveTeams.Any(team => winningTeams.Contains(team));
-            bool onlyWinningTeamsRemain = aliveTeams.All(team => winningTeams.Contains(team));
-            bool hasAliveCustomTeam = SummonedTeam.List.Any(team => team.HasAlivePlayers());
-
-            if (hasWinningTeamAlive && onlyWinningTeamsRemain && hasAliveCustomTeam)
-            {
-                if (!Round.IsLocked)
-                {
-                    Round.EndRound();
-                }
-            }
+            return List.Any(summonedTeam => summonedTeam.Players.Any(summonedRole => summonedRole.Player.Id == player.Id));
         }
 
         /// <summary>
@@ -186,7 +167,7 @@ public static SummonedTeam Summon(Team team, IEnumerable<Player> players)
             int totalAllowed = team.TeamRoles.Sum(r => r.MaxPlayers);
             int assigned = 0;
 
-            var random = new Random();
+            var random = new System.Random();
             var roleQueue = team.TeamRoles
                 .Where(r => r.Priority != RolePriority.None)
                 .GroupBy(r => r.Priority)
@@ -229,6 +210,9 @@ public static SummonedTeam Summon(Team team, IEnumerable<Player> players)
             }
 
             team.SpawnCount++;
+
+            OnTeamSummoned?.Invoke(SummonedTeam);
+
             return SummonedTeam;
         }
 
@@ -238,26 +222,109 @@ public static SummonedTeam Summon(Team team, IEnumerable<Player> players)
         /// </summary>
         private static IEnumerator<float> PlaySoundSequence(Team team)
         {
-            AudioPlayer audioPlayer = AudioPlayer.CreateOrGet($"Global_Audio_{team.Id}", onIntialCreation: (p) =>
+            Assembly audioAssembly = AppDomain.CurrentDomain.GetAssemblies()
+                .FirstOrDefault(a => a.GetName().Name.Contains("AudioPlayer"));
+
+            if (audioAssembly == null)
+            {
+                LogManager.Warn("AudioPlayerApi assembly not found.");
+                yield break;
+            }
+
+            Type audioPlayerType = audioAssembly.GetTypes().FirstOrDefault(t => t.Name == "AudioPlayer" && t.IsClass);
+            if (audioPlayerType == null)
             {
-                p.AddSpeaker("Main", isSpatial: false, maxDistance: 5000f);
-            });
-            float volume = Clamp(team.SoundVolume, 1f, 100f);
+                yield break;
+            }
+
+            var createOrGetMethod = audioPlayerType.GetMethod("CreateOrGet", BindingFlags.Public | BindingFlags.Static);
+            var addSpeakerMethod = audioPlayerType.GetMethods(BindingFlags.Public | BindingFlags.Instance)
+                .FirstOrDefault(m => m.Name == "AddSpeaker" && m.GetParameters().Length == 5);
+            var addClipMethod = audioPlayerType.GetMethod("AddClip", BindingFlags.Public | BindingFlags.Instance);
+
+            if (createOrGetMethod == null || addSpeakerMethod == null || addClipMethod == null)
+            {
+                yield break;
+            }
+
+            string startClipId = null;
+            int startIndex = -1;
+            float startDelay = 0f;
 
             for (int i = 0; i < team.SoundPaths.Count; i++)
             {
-                var sound = team.SoundPaths[i];
+                var s = team.SoundPaths[i];
+                if (!string.IsNullOrEmpty(s.Path) && s.Path != "/path/to/your/ogg/file")
+                {
+                    startClipId = $"sound_{team.Id}_{i}";
+                    startIndex = i;
+                    startDelay = s.Delay;
+                    break;
+                }
+            }
 
-                if (string.IsNullOrEmpty(sound.Path) || sound.Path == "/path/to/your/ogg/file")
-                    continue;
+            if (startDelay > 0f)
+            {
+                yield return Timing.WaitForSeconds(startDelay);
+            }
+
+            object audioPlayerInstance = null;
+            try
+            {
+                LogManager.Debug($"Creating AudioPlayer with AutoPlay Clip: {startClipId ?? "NULL"}");
+
+                object[] parameters =
+                [
+                    $"Global_Audio_{team.Id}",
+                    startClipId,
+                    null,
+                    true,
+                    true,
+                    null,
+                    (byte)0,
+                    null,
+                    null
+                ];
+
+                audioPlayerInstance = createOrGetMethod.Invoke(null, parameters);
+            }
+            catch (Exception ex)
+            {
+                LogManager.Error($"Failed to create Audio Player: {ex}");
+                yield break;
+            }
 
-                if (sound.Delay > 0f)
+            float volume = team.SoundVolume;
+            if (volume > 1.5f) volume /= 100f;
+            volume = Mathf.Clamp(volume, 0.1f, 1.5f);
+
+            if (audioPlayerInstance != null)
+            {
+                try
                 {
-                    yield return Timing.WaitForSeconds(sound.Delay);
+                    addSpeakerMethod.Invoke(audioPlayerInstance, ["Main", 1.0f, false, 0f, 5000f]);
                 }
+                catch (Exception) { }
+
+                for (int i = 0; i < team.SoundPaths.Count; i++)
+                {
+                    if (i == startIndex) continue;
+
+                    var sound = team.SoundPaths[i];
+                    if (string.IsNullOrEmpty(sound.Path) || sound.Path.Contains("/path/to/")) continue;
+
+                    if (sound.Delay > 0f) yield return Timing.WaitForSeconds(sound.Delay);
 
-                string clipId = $"sound_{team.Id}_{i}";
-                audioPlayer.AddClip(clipId, volume);
+                    try
+                    {
+                        string clipId = $"sound_{team.Id}_{i}";
+                        addClipMethod.Invoke(audioPlayerInstance, [clipId, volume, false, true]);
+                    }
+                    catch (Exception ex)
+                    {
+                        LogManager.Error($"Error queuing next clip: {ex.Message}");
+                    }
+                }
             }
         }
 

UncomplicatedCustomTeams/API/Features/UncomplicatedCustomRole.cs

@@ -33,9 +33,9 @@ public class UncomplicatedCustomRole : UncomplicatedCustomRoles.API.Features.Cus
         public bool IsGodmodeEnabled { get; set; }
 
         /// <summary>
-        /// Whether bypassing obstacles is enabled for this role.
+        /// Whether bypass is enabled for this role.
         /// </summary>
-        [Description("Whether bypassing obstacles is enabled for this role.")]
+        [Description("Whether bypass is enabled for this role.")]
         public bool IsBypassEnabled { get; set; }
 
         /// <summary>

UncomplicatedCustomTeams/API/Storage/Bucket.cs

@@ -5,7 +5,7 @@ namespace UncomplicatedCustomTeams.API.Storage
 {
     internal class Bucket
     {
-        public static List<int> SpawnBucket { get; set; } = new();
+        public static List<int> SpawnBucket { get; set; } = [];
 
         public static SummonedTeam Team { get; set; }
     }

UncomplicatedCustomTeams/Commands/LogShare.cs

@@ -1,9 +1,9 @@
 using CommandSystem;
-using Newtonsoft.Json;
 using System;
 using System.Collections.Generic;
 using System.Net;
-using System.Net.Http;
+using System.Text.Json;
+using System.Threading.Tasks;
 using UncomplicatedCustomTeams.Utilities;
 
 namespace UncomplicatedCustomTeams.Commands
@@ -15,9 +15,9 @@ internal class LogShare : ParentCommand
 
         public override string Command { get; } = "uctlogs";
 
-        public override string[] Aliases { get; } = new string[] { };
+        public override string[] Aliases { get; } = [];
 
-        public override string Description { get; } = "Share the UCT Debug logs with the developers.";
+        public override string Description { get; } = "Share the UCR Debug logs with the developers";
 
         public override void LoadGeneratedCommands() { }
 
@@ -30,18 +30,26 @@ protected override bool ExecuteParent(ArraySegment<string> arguments, ICommandSe
             }
 
             long Start = DateTimeOffset.Now.ToUnixTimeMilliseconds();
+            response = $"Loading the JSON content to share with the developers...";
 
-            HttpStatusCode Response = LogManager.SendReport(out HttpContent Content);
-            Dictionary<string, string> Data = JsonConvert.DeserializeObject<Dictionary<string, string>>(Plugin.HttpManager.RetriveString(Content));
-
-            if (Response is HttpStatusCode.OK && Data.ContainsKey("id"))
-            {
-                response = $"Successfully shared the UCT logs with the developers!\nSend this Id to the developers: {Data["id"]}\n\nTook {DateTimeOffset.Now.ToUnixTimeMilliseconds() - Start}ms";
-            }
-            else
+            Task.Run(() =>
             {
-                response = $"Failed to share the UCT logs with the developers: Server says: {Response}";
-            }
+                HttpStatusCode Response = LogManager.SendReport(out string content, arguments.Count > 0);
+                try
+                {
+                    if (Response is HttpStatusCode.OK)
+                    {
+                        Dictionary<string, string> Data = JsonSerializer.Deserialize<Dictionary<string, string>>(content);
+                        LogManager.Info($"[ShareTheLog] Successfully shared the UCT logs with the developers!\nSend this Id to the developers: {Data["id"]}\n\nTook {DateTimeOffset.Now.ToUnixTimeMilliseconds() - Start}ms");
+                    }
+                    else
+                        LogManager.Info($"Failed to share the UCT logs with the developers: Server says: {Response}");
+                }
+                catch (Exception e)
+                {
+                    LogManager.Error(e.ToString());
+                }
+            });
 
 
             return true;

UncomplicatedCustomTeams/Commands/Owner.cs

@@ -1,6 +1,7 @@
 using CommandSystem;
 using System.Collections.Generic;
 using System.Net;
+using UncomplicatedCustomRoles.Extensions;
 using UncomplicatedCustomTeams.Interfaces;
 
 namespace UncomplicatedCustomTeams.Commands
@@ -21,16 +22,9 @@ public bool Executor(List<string> arguments, ICommandSender _, out string respon
                 return false;
             }
 
-            HttpStatusCode Response = Plugin.HttpManager.AddServerOwner(arguments[0]);
+            HttpStatusCode code = Plugin.HttpManager.AddServerOwner(arguments[0]).GetStatusCode(out response);
 
-            response = Response switch
-            {
-                HttpStatusCode.OK => $"The request has been accepted!\nNow {arguments[0]} will be flagged as Server Owner!",
-                HttpStatusCode.Forbidden => "Sorry but your server seems to not be on the public list!\nRetry in three minutes if you think that this is an error!",
-                HttpStatusCode.BadRequest => "It seems that the Discord user ID is invalid!",
-                HttpStatusCode.InternalServerError => "The central server is having some issues, please report this message to the Discord as a bug!",
-                _ => $"The response seems to be invalid.\nRaw format: {Response}",
-            };
+            response = $"{code} - {response}";
             return true;
         }
     }