Changes for PhysBones handling.

ShockOsc/Config/Group.cs

@@ -18,4 +18,6 @@ public sealed class Group
 
     public bool OverrideCooldownTime { get; set; }
     public uint CooldownTime { get; set; } = 5000;
+
+    public bool SuppressPhysBoneReleaseAction { get; set; }
 }

ShockOsc/Models/ProgramGroup.cs

@@ -10,6 +10,7 @@ public sealed class ProgramGroup
     public DateTime LastActive { get; set; }
     public DateTime LastExecuted { get; set; }
     public DateTime LastVibration { get; set; }
+    public DateTime PhysBoneGrabLimitTime { get; set; }
     public ushort LastDuration { get; set; }
     public byte LastIntensity { get; set; }
     public float LastStretchValue { get; set; }

ShockOsc/Services/ShockOsc.cs

@@ -90,7 +90,7 @@
 
         if (!_configManager.Config.Osc.OscQuery)
         {
             FoundVrcClient(null, null);
         }
 
         _logger.LogInformation("Started ShockOsc.cs");
@@ -415,6 +415,13 @@
                     }
                 }
 
+                if (!programGroup.IsGrabbed && isGrabbed)
+                {
+                    // on physbone grab
+                    ushort TheDuration = GetDuration(programGroup);
+                    programGroup.PhysBoneGrabLimitTime = DateTime.UtcNow.AddMilliseconds(TheDuration);
+                    _logger.LogDebug("Limiting hold duration of Group {Group} to {Duration}ms", programGroup.Name, TheDuration);
+                }
                 programGroup.IsGrabbed = isGrabbed;
                 return;
             // Normal shocker actions
@@ -540,10 +547,12 @@
             _configManager.Config.Behaviour.WhileBoneHeld !=
             BehaviourConf.BoneHeldAction.None &&
             !isActiveOrOnCooldown &&
+            !_underscoreConfig.KillSwitch &&
             programGroup.IsGrabbed &&
+            programGroup.PhysBoneGrabLimitTime > DateTime.UtcNow &&
             programGroup.LastVibration < DateTime.UtcNow.Subtract(TimeSpan.FromMilliseconds(100)))
         {
-            var pullIntensityTranslated = Math.Max(Convert.ToByte(programGroup.LastStretchValue * 100f), (byte)1);
+            var pullIntensityTranslated = GetPhysbonePullIntensity(programGroup, programGroup.LastStretchValue);
             programGroup.LastVibration = DateTime.UtcNow;
 
             _logger.LogDebug("Vibrating/Shocking {Shocker} at {Intensity}", pos, pullIntensityTranslated);
@@ -586,6 +595,7 @@
 
         if (programGroup.TriggerMethod == TriggerMethod.PhysBoneRelease)
         {
+            if (programGroup.ConfigGroup is { SuppressPhysBoneReleaseAction: true }) { return; }
             intensity = GetPhysbonePullIntensity(programGroup, programGroup.LastStretchValue);
             programGroup.LastStretchValue = 0;
 

ShockOsc/Ui/Pages/Dash/Tabs/GroupsTab.razor

@@ -1,4 +1,4 @@
 @using System.Globalization
 @using System.Text.RegularExpressions
 @using OpenShock.ShockOsc.Backend
 @using OpenShock.ShockOsc.Config
@@ -244,6 +244,10 @@
         </MudCollapse>
     </MudPaper>
 
+    <MudPaper Outlined="true" Class="rounded-lg mud-paper-padding-margin">
+        <MudCheckBox Class="checkbox-title" @bind-Value="@CurrentGroup.SuppressPhysBoneReleaseAction" Label="Suppress PhysBone Release Action" @bind-Value:after="OnGroupSettingsValueChange" />
+    </MudPaper>
+
     <MudPaper Outlined="true" Class="rounded-lg mud-paper-padding-margin">
         <MudText>Shockers in Group</MudText>
         <MudDivider/>