feat: Add option for random behavior on pull trigger (#45)

* feat: Add option for random behavior on pull trigger

Signed-off-by: NekoTiki <17910933+nekotiki@users.noreply.github.com>

* fix: pull trigger random behavior was skipping the check for the Preconditions being met

Signed-off-by: NekoTiki <17910933+NekoTiki@users.noreply.github.com>

* Update ShockOsc/Services/ShockOsc.cs

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

* Update ShockOsc/Services/ShockOsc.cs

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

* Update ShockOsc/Services/ShockOsc.cs

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

* Update ShockOsc/Ui/Pages/Dash/Tabs/ConfigTab.razor

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

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

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

---------

Signed-off-by: NekoTiki <17910933+nekotiki@users.noreply.github.com>
Signed-off-by: NekoTiki <17910933+NekoTiki@users.noreply.github.com>
Co-authored-by: Luc ♥ <luc@luc.cat>
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

Author: 3 people

ShockOsc/Config/SharedBehaviourConfig.cs

@@ -16,4 +16,5 @@ public class SharedBehaviourConfig
     public BoneAction WhenBoneReleased { get; set; } = BoneAction.Shock;
 
     public uint? BoneHeldDurationLimit { get; set; } = null;
+    public bool OnPullTriggerRandomBehavior { get; set; }
 }

ShockOsc/Services/ShockOsc.cs

@@ -14,6 +14,7 @@
 using OpenShock.ShockOSC.Utils;
 using OscQueryLibrary;
 using OscQueryLibrary.Utils;
+using Serilog;
 
 #pragma warning disable CS4014
 
@@ -411,6 +412,17 @@ private async Task PhysboneHandling(ProgramGroup programGroup, bool isGrabbed)
                     // Check all preconditions, maybe send stop command here aswell?
                     if (!await HandlePrecondition(CheckAndSetAllPreconditions(programGroup), programGroup)) return;
 
+                    var pullTriggerBehavior = _moduleConfig.Config.GetGroupOrGlobal(programGroup,
+                        behaviourConfig => behaviourConfig.OnPullTriggerRandomBehavior,
+                        group => group.OnPullTriggerRandomBehavior);
+
+                    if (pullTriggerBehavior)
+                    {
+                        SendCommand(programGroup, GetDuration(programGroup), GetIntensity(programGroup), ControlType.Shock, false);
+                    
+                        return;
+                    }
+                    
                     var releaseAction = _moduleConfig.Config.GetGroupOrGlobal(programGroup,
                         behaviourConfig => behaviourConfig.WhenBoneReleased,
                         group => group.OverrideBoneReleasedAction);
@@ -421,6 +433,9 @@ private async Task PhysboneHandling(ProgramGroup programGroup, bool isGrabbed)
                         return;
                     }
 
+                    _logger.LogDebug("Physbone released, sending {Action} to group {Group}", releaseAction, programGroup.Name);
+                    _logger.LogDebug("Physbone stretch value: {StretchValue}", programGroup.LastStretchValue);
+                    
                     var physBoneIntensity = GetPhysbonePullIntensity(programGroup, programGroup.LastStretchValue);
                     programGroup.LastStretchValue = 0;
 

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

@@ -68,6 +68,16 @@
                          OnSaveAction="_ => OnSettingsValueChange()">
             Max Intensity: @ModuleConfig.Config.Behaviour.IntensityRange.Max%
         </DebouncedSlider>
+        
+        <br />
+
+        <div style="display: flex; align-items: center;">
+            <MudCheckBox Class="option-width option-checkbox-height" @bind-Value="ModuleConfig.Config.Behaviour.OnPullTriggerRandomBehavior" Label="Pull Trigger Random" @bind-Value:after="OnSettingsValueChangeAsync"/>
+        
+            <MudTooltip Text="When enabled, the shock will randomly choose between the two intensity values set above, instead of using the intensity based on distance.">
+                <MudIcon Icon="@Icons.Material.Filled.Info" Size="Size.Small" Title="Information" />
+            </MudTooltip>
+        </div>
     }
 
 

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

@@ -228,6 +228,16 @@
                                  OnSaveAction="_ => ModuleConfig.SaveDeferred()">
                     Max Intensity: @CurrentGroup.IntensityRange.Max%
                 </DebouncedSlider>
+
+                <br />
+
+                <div style="display: flex; align-items: center;">
+                    <MudCheckBox Class="option-width option-checkbox-height" @bind-Value="@CurrentGroup.OnPullTriggerRandomBehavior" Label="Pull Trigger Random" @bind-Value:after="OnGroupSettingsValueChange"/>
+        
+                    <MudTooltip Text="When enabled, the shock will randomly choose between the two intensity values set above, instead of using the intensity based on distance.">
+                        <MudIcon Icon="@Icons.Material.Filled.Info" Size="Size.Small" Title="Information" />
+                    </MudTooltip>
+                </div>
             }
 
         </MudCollapse>