Merge pull request #14 from Tosoks67/main

4 fixes, 1 new thing, 1 rewrite of method

Author: Elektryk-Andrzej

Helpers/Extensions/CollectionExtensions.cs

@@ -1,4 +1,5 @@
-using Random = UnityEngine.Random;
+using SER.Helpers.ResultSystem;
+using Random = UnityEngine.Random;
 
 namespace SER.Helpers.Extensions;
 
@@ -35,6 +36,20 @@ public static string JoinStrings(this IEnumerable<string> source, string separat
     {
         return string.Join(separator, source);
     }
+    public static TryGet<int> GetEnumerableHashCode<T>(this IEnumerable<T> enumerable)
+    {
+        if (enumerable is null) return $"{nameof(enumerable)} is null.";
+
+        unchecked
+        {
+            var hashCode = 17;
+            foreach (var item in enumerable)
+            {
+                hashCode = hashCode * 31 + (item?.GetHashCode() ?? 0);
+            }
+            return hashCode;
+        }
+    }
 
     extension<T>(List<T> list)
     {

MethodSystem/Methods/AudioMethods/CreateGlobalSpeakerMethod.cs

@@ -1,5 +1,6 @@
 using SER.ArgumentSystem.Arguments;
 using SER.ArgumentSystem.BaseArguments;
+using SER.Helpers.Extensions;
 using SER.MethodSystem.BaseMethods;
 
 namespace SER.MethodSystem.Methods.AudioMethods;
@@ -25,16 +26,11 @@ public class CreateGlobalSpeakerMethod : SynchronousMethod
 
     public override void Execute()
     {
-        var targetPlayers = Args.GetPlayers("target players");
+        var targetPlayers = Args.GetPlayers("target players").MaybeNull();
 
         AudioPlayer.Create(
             Args.GetText("speaker name"), 
-            condition: hub =>
-            {
-                if (targetPlayers is null) return true;
-                
-                return targetPlayers.Any(p => p.ReferenceHub == hub);
-            },
+            condition: hub => targetPlayers is null || targetPlayers.Any(p => p.ReferenceHub == hub),
             onIntialCreation: p =>
             {
                 p.AddSpeaker("Main", Args.GetFloat("volume"), isSpatial: false, maxDistance: 5000f);

MethodSystem/Methods/AudioMethods/CreatePlayerAttachedSpeakerMethod.cs

@@ -1,6 +1,7 @@
 using SER.ArgumentSystem.Arguments;
 using SER.ArgumentSystem.BaseArguments;
 using SER.Helpers.Exceptions;
+using SER.Helpers.Extensions;
 using SER.MethodSystem.BaseMethods;
 using SER.MethodSystem.MethodDescriptors;
 using UnityEngine;
@@ -37,7 +38,7 @@ public class CreatePlayerAttachedSpeakerMethod : SynchronousMethod, ICanError
         },
         new BoolArgument("is stereo")
         {
-            DefaultValue = new(null, "true"),
+            DefaultValue = new(true, null),
             Description = "Whether the audio will be 3D."
         },
         new PlayersArgument("target players")
@@ -55,23 +56,18 @@ public override void Execute()
         var minDistance = Args.GetFloat("min distance");
         var maxDistance = Args.GetFloat("max distance");
         var isStereo = Args.GetBool("is stereo");
-        var targetPlayers = Args.GetPlayers("target players");
+        var targetPlayers = Args.GetPlayers("target players").MaybeNull();
 
         AudioPlayer.Create(
             speakerName, 
-            condition: hub =>
-            {
-                if (targetPlayers is null) return true;
-                
-                return targetPlayers.Any(p => p.ReferenceHub == hub);
-            },
+            condition: hub => targetPlayers is null || targetPlayers.Any(p => p.ReferenceHub == hub),
             onIntialCreation: p =>
             {        
                 p.transform.parent = player.GameObject?.transform 
                                      ?? throw new ScriptRuntimeError(
                                          $"Player '{player.Nickname}' does not have a model to attach a speaker to.");
 
-                Speaker speaker = p.AddSpeaker("Main", volume, isStereo, minDistance, maxDistance);
+                var speaker = p.AddSpeaker("Main", volume, isStereo, minDistance, maxDistance);
 
                 speaker.transform.parent = player.GameObject.transform;
                 speaker.transform.localPosition = Vector3.zero;

MethodSystem/Methods/CASSIEMethods/CassieMethod.cs

@@ -1,7 +1,6 @@
 using Respawning;
 using SER.ArgumentSystem.Arguments;
 using SER.ArgumentSystem.BaseArguments;
-using SER.Helpers.Extensions;
 using SER.MethodSystem.BaseMethods;
 
 namespace SER.MethodSystem.Methods.CASSIEMethods;
@@ -37,15 +36,33 @@ public override void Execute()
 
         if (glitch)
         {
-            message = "jam_100_9 " + message
-                .Split([' '], StringSplitOptions.RemoveEmptyEntries)
-                .Select(part =>
+            // taken from Respawning.Announcements.WaveAnnouncementBase.PlayAnnouncement()
+            var chanceMultiplier = AlphaWarheadController.Detonated ? 2.5f : 1;
+            var glitchChance = UnityEngine.Random.Range(0.08f, 0.1f) * chanceMultiplier;
+            var jamChance = UnityEngine.Random.Range(0.07f, 0.09f) * chanceMultiplier;
+            
+            var strArray = message.Split([' '], StringSplitOptions.None);
+            message = "";
+            // taken from NineTailedFoxAnnouncer.ServerOnlyAddGlitchyPhrase()
+            for (var index = 0; index < strArray.Length; index++)
+            {
+                message += $"{strArray[index]} ";
+                
+                if (index >= strArray.Length - 1)
                 {
-                    if (UnityEngine.Random.Range(1, 3) == 1) return part;
-                    return $"pitch_{UnityEngine.Random.Range(0.7f, 1.2f)} {part}";
-
-                })
-                .JoinStrings(" ");
+                    continue;
+                }
+                
+                if (UnityEngine.Random.value < glitchChance)
+                {
+                    message += $".G{UnityEngine.Random.Range(1, 7)} ";
+                }
+                
+                if (UnityEngine.Random.value < jamChance)
+                {
+                    message += $"jam_{UnityEngine.Random.Range(0, 70):000}_{UnityEngine.Random.Range(2, 6)} ";
+                }
+            }
         }
 
         if (string.IsNullOrEmpty(translation))

ValueSystem/CollectionValue.cs

@@ -2,6 +2,7 @@
 using SER.Helpers.Extensions;
 using SER.Helpers.ResultSystem;
 using System.Collections;
+using System.Diagnostics;
 
 namespace SER.ValueSystem;
 
@@ -62,7 +63,10 @@ public override bool EqualCondition(Value other)
         return !CastedValues.Where((val, i) => !val.EqualCondition(otherP.CastedValues[i])).Any();
     }
 
-    public override int HashCode => CastedValues.GetHashCode();
+    public override int HashCode =>
+        CastedValues.GetEnumerableHashCode().HasErrored(out var error, out var val)
+        ? throw new TosoksFuckedUpException(error)
+        : val;
 
     public TryGet<Value> GetAt(int index)
     {

ValueSystem/PlayerValue.cs

@@ -1,4 +1,6 @@
 using LabApi.Features.Wrappers;
+using SER.Helpers.Exceptions;
+using SER.Helpers.Extensions;
 
 namespace SER.ValueSystem;
 
@@ -18,5 +20,8 @@ public PlayerValue(IEnumerable<Player> players)
 
     public override bool EqualCondition(Value other) => other is PlayerValue otherP && Players.SequenceEqual(otherP.Players);
 
-    public override int HashCode => Players.GetHashCode();
+    public override int HashCode =>
+        Players.Select(plr => plr.UserId).GetEnumerableHashCode().HasErrored(out var error, out var val)
+        ? throw new TosoksFuckedUpException(error)
+        : val;
 }