Add OnDamageTaken

OpenCS2hock/OpenCS2hock.cs

@@ -53,8 +53,20 @@ public class OpenCS2hock
                     case "OnRoundWin":
                         this._cs2GSI.OnRoundWin += (cs2EventArgs) => shocker.Control(Settings.StringToAction(kv.Value));
                         break;
+                    case "OnDamageTaken":
+                        this._cs2GSI.OnDamageTaken += (cs2EventArgs) =>
+                            shocker.Control(Settings.StringToAction(kv.Value),
+                                intensity: MapInt(cs2EventArgs.ValueAsOrDefault<int>(), 0, 100,
+                                    _settings.IntensityRange.Min, _settings.IntensityRange.Max));
+                        break;
                 }
             }
         }
     }
+
+    private int MapInt(int input, int fromLow, int fromHigh, int toLow, int toHigh) 
+    {
+        int mappedValue = (input - fromLow) * (toHigh - toLow) / (fromHigh - fromLow) + toLow;
+        return mappedValue;
+    }
 }

OpenCS2hock/OpenCS2hock.csproj

@@ -9,7 +9,7 @@
     </PropertyGroup>
 
     <ItemGroup>
-      <PackageReference Include="CS2GSI" Version="1.0.2" />
+      <PackageReference Include="CS2GSI" Version="1.0.3" />
       <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
     </ItemGroup>
 

OpenCS2hock/Settings.cs

@@ -32,7 +32,8 @@ public struct Settings
         {"OnRoundStart", "Vibrate"},
         {"OnRoundEnd", "Nothing"},
         {"OnRoundWin", "Beep"},
-        {"OnRoundLoss", "Nothing"}
+        {"OnRoundLoss", "Nothing"},
+        {"OnDamageTaken", "Vibrate"}
     };
 
     public Settings()

OpenCS2hock/Shocker.cs

@@ -12,18 +12,18 @@ internal abstract class Shocker
 
     internal enum ControlAction { Beep, Vibrate, Shock, Nothing }
 
-    internal void Control(ControlAction action, string? shockerId = null)
+    internal void Control(ControlAction action, string? shockerId = null, int? intensity = null, int? duration = null)
     {
-        int intensity = _intensity.GetValue();
-        int duration = _duration.GetValue();
-        this.Logger?.Log(LogLevel.Information, $"{action} {intensity} {duration}");
+        int i = intensity ?? _intensity.GetValue();
+        int d = duration ?? _duration.GetValue();
+        this.Logger?.Log(LogLevel.Information, $"{action} {(intensity is not null ? "Overwrite " : "")}{i} {(duration is not null ? "Overwrite " : "")}{d}");
         if (action is ControlAction.Nothing)
             return;
         if(shockerId is null)
             foreach (string shocker in _shockerIds)
-                ControlInternal(action, shocker, intensity, duration);
+                ControlInternal(action, shocker, i, d);
         else
-            ControlInternal(action, shockerId, intensity, duration);
+            ControlInternal(action, shockerId, i, d);
     }
 
     protected abstract void ControlInternal(ControlAction action, string shockerId, int intensity, int duration);