misc

- AttackingScript and CastingScript now use PickRandomWeightedSingleOrDefault, rather than consecutive chances
FallenDev · May 1, 2024 · 5d93adc · 5d93adc
1 parent 5e68abe
commit 5d93adc
Show file tree

Hide file tree

Showing 4 changed files with 68 additions and 14 deletions.
diff --git a/Chaos.Common/Utilities/DecimalRandomizer.cs b/Chaos.Common/Utilities/DecimalRandomizer.cs
@@ -37,6 +37,30 @@ public static class DecimalRandomizer
         return weightedChoices.PickRandomWeighted();
     }
 
+    /// <summary>
+    ///     Picks a random choice based on the common weight. Chances are NOT exhaustive. Only picks at most 1 item. Each item
+    ///     has the same chance to be picked.
+    /// </summary>
+    /// <param name="choices">
+    ///     A collection of choiced
+    /// </param>
+    /// <param name="commonWeight">
+    ///     The weight of each choice
+    /// </param>
+    /// <typeparam name="T">
+    ///     The type of object to return
+    /// </typeparam>
+    /// <returns>
+    ///     A random element from the specified collection if a choice is taken, otherwise
+    ///     <c>
+    ///         default
+    ///     </c>
+    /// </returns>
+    public static T? PickRandomWeightedSingleOrDefault<T>(this IEnumerable<T> choices, decimal commonWeight)
+        => choices.Select(x => new KeyValuePair<T, decimal>(x, commonWeight))
+                  .ToList()
+                  .PickRandomWeightedSingleOrDefault();
+
     /// <summary>
     ///     Picks a random choice based on the weights. The higher the weight, the more likely it is to be picked. Chances are
     ///     NOT exhaustive. Only picks at most 1 item.

diff --git a/Chaos.Common/Utilities/IntegerRandomizer.cs b/Chaos.Common/Utilities/IntegerRandomizer.cs
@@ -37,6 +37,30 @@ public static class IntegerRandomizer
         return weightedChoices.PickRandomWeighted();
     }
 
+    /// <summary>
+    ///     Picks a random choice based on the common weight. Chances are NOT exhaustive. Only picks at most 1 item. Each item
+    ///     has the same chance to be picked.
+    /// </summary>
+    /// <param name="choices">
+    ///     A collection of choiced
+    /// </param>
+    /// <param name="commonWeight">
+    ///     The weight of each choice
+    /// </param>
+    /// <typeparam name="T">
+    ///     The type of object to return
+    /// </typeparam>
+    /// <returns>
+    ///     A random element from the specified collection if a choice is taken, otherwise
+    ///     <c>
+    ///         default
+    ///     </c>
+    /// </returns>
+    public static T? PickRandomWeightedSingleOrDefault<T>(this IEnumerable<T> choices, int commonWeight)
+        => choices.Select(x => new KeyValuePair<T, int>(x, commonWeight))
+                  .ToList()
+                  .PickRandomWeightedSingleOrDefault();
+
     /// <summary>
     ///     Picks a random choice based on the weights. The higher the weight, the more likely it is to be picked. Chances are
     ///     NOT exhaustive. Only picks at most 1 item.

diff --git a/Chaos/Scripting/MonsterScripts/AttackingScript.cs b/Chaos/Scripting/MonsterScripts/AttackingScript.cs
@@ -39,13 +39,13 @@ public override void Update(TimeSpan delta)
                 attacked |= Subject.TryUseSkill(skill);
 
         if (ShouldUseSkill)
-            foreach (var skill in Skills)
-                if (!skill.Template.IsAssail && IntegerRandomizer.RollChance(7) && Subject.TryUseSkill(skill))
-                {
-                    attacked = true;
+        {
+            var skill = Skills.Where(skill => Subject.CanUse(skill, out _))
+                              .PickRandomWeightedSingleOrDefault(7);
 
-                    break;
-                }
+            if (skill is not null)
+                attacked |= Subject.TryUseSkill(skill);
+        }
 
         if (attacked)
         {

diff --git a/Chaos/Scripting/MonsterScripts/CastingScript.cs b/Chaos/Scripting/MonsterScripts/CastingScript.cs
@@ -1,3 +1,4 @@
+using Chaos.Common.Utilities;
 using Chaos.Extensions;
 using Chaos.Extensions.Common;
 using Chaos.Models.World;
@@ -22,14 +23,19 @@ public override void Update(TimeSpan delta)
 
         Spells.ShuffleInPlace();
 
-        foreach (var spell in Spells)
-            if (Subject.TryUseSpell(spell, Target.Id))
-            {
-                Subject.WanderTimer.Reset();
-                Subject.MoveTimer.Reset();
-                Subject.SkillTimer.Reset();
+        var spell = Spells.Where(
+                              spell => Subject.CanUse(
+                                  spell,
+                                  Target,
+                                  null,
+                                  out _))
+                          .PickRandomWeightedSingleOrDefault(7);
 
-                break;
-            }
+        if (spell is not null && Subject.TryUseSpell(spell, Target.Id))
+        {
+            Subject.WanderTimer.Reset();
+            Subject.MoveTimer.Reset();
+            Subject.SkillTimer.Reset();
+        }
     }
 }