From 2d429fcb6b58903cb8f5cb13e869087e2174cb7e Mon Sep 17 00:00:00 2001
From: glax <johanna@bernloehr.eu>
Date: Sun, 3 Nov 2024 00:22:25 +0100
Subject: [PATCH] fixes

---
 OpenCS2hock/OpenCS2hock.csproj |  2 +-
 OpenCS2hock/ShockerAction.cs   | 21 ++++++++-------------
 2 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/OpenCS2hock/OpenCS2hock.csproj b/OpenCS2hock/OpenCS2hock.csproj
index 4c46f2c..bdbbac4 100644
--- a/OpenCS2hock/OpenCS2hock.csproj
+++ b/OpenCS2hock/OpenCS2hock.csproj
@@ -11,7 +11,7 @@
 
     <ItemGroup>
       <PackageReference Include="CS2GSI" Version="1.0.7" />
-      <PackageReference Include="CShocker" Version="2.3.1" />
+      <PackageReference Include="CShocker" Version="2.4.0" />
       <PackageReference Include="GlaxLogger" Version="1.0.6" />
       <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
     </ItemGroup>
diff --git a/OpenCS2hock/ShockerAction.cs b/OpenCS2hock/ShockerAction.cs
index 2bff8a9..b2ac359 100644
--- a/OpenCS2hock/ShockerAction.cs
+++ b/OpenCS2hock/ShockerAction.cs
@@ -8,11 +8,11 @@ namespace OpenCS2hock;
 public struct ShockerAction
 {
     public CS2Event TriggerEvent;
-    // ReSharper disable thrice FieldCanBeMadeReadOnly.Global JsonDeserializer will throw a fit
-    public int ShockerId;
-    public ControlAction Action;
-    public bool ValueFromInput;
-    public IntegerRange IntensityRange, DurationRange;
+    // ReSharper disable MemberCanBePrivate.Global -> exposed
+    public readonly int ShockerId;
+    public readonly ControlAction Action;
+    public readonly bool ValueFromInput;
+    public readonly IntegerRange IntensityRange, DurationRange;
 
     public ShockerAction(CS2Event trigger, int shockerId, ControlAction action, bool valueFromInput, IntegerRange intensityRange, IntegerRange durationRange)
     {
@@ -28,23 +28,18 @@ public struct ShockerAction
     {
         if (!shockers.ContainsKey(ShockerId))
             return;
-        int intensity = ValueFromInput ? IntensityFromCS2Event(cs2EventArgs) : RandomValueFromRange(IntensityRange);
-        int duration = RandomValueFromRange(DurationRange);
+        int intensity = ValueFromInput ? IntensityFromCS2Event(cs2EventArgs) : IntensityRange.RandomValueWithinLimits();
+        int duration = DurationRange.RandomValueWithinLimits();
         shockers[ShockerId].Control(Action, intensity, duration);
     }
 
-    private static int RandomValueFromRange(IntegerRange range)
-    {
-        return Random.Shared.Next(range.Min, range.Max);
-    }
-
     private int IntensityFromCS2Event(CS2EventArgs cs2EventArgs)
     {
         return TriggerEvent switch
         {
             CS2Event.OnDamageTaken => MapInt(cs2EventArgs.ValueAsOrDefault<int>(), 0, 100, IntensityRange.Min, IntensityRange.Max),
             CS2Event.OnArmorChange => MapInt(cs2EventArgs.ValueAsOrDefault<int>(), 0, 100, IntensityRange.Min, IntensityRange.Max),
-            _ => RandomValueFromRange(IntensityRange)
+            _ => IntensityRange.RandomValueWithinLimits()
         };
     }