Fix control type not being used with random physbone trigger

Author: LucHeart

ShockOsc/Config/ShockOscConfig.cs

@@ -11,7 +11,7 @@ public sealed class ShockOscConfig
 
     public T GetGroupOrGlobal<T>(ProgramGroup group, Func<SharedBehaviourConfig, T> selector, Func<Group, bool> groupOverrideSelector)
     {
-        if(group.ConfigGroup == null) return selector(Behaviour);
+        if(group.ConfigGroup is null) return selector(Behaviour);
 
         var groupOverride = groupOverrideSelector(group.ConfigGroup);
         SharedBehaviourConfig config = groupOverride ? group.ConfigGroup : Behaviour;

ShockOsc/Services/ShockOsc.cs

@@ -411,17 +411,6 @@ 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,
@@ -436,11 +425,21 @@ private async Task PhysboneHandling(ProgramGroup programGroup, bool isGrabbed)
                     _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);
+                    // Random intensity for physbone release
+                    var pullTriggerBehavior = _moduleConfig.Config.GetGroupOrGlobal(programGroup,
+                        behaviourConfig => behaviourConfig.OnPullTriggerRandomBehavior,
+                        group => group.OnPullTriggerRandomBehavior);
+
+                    var isRandomMode = _moduleConfig.Config.GetGroupOrGlobal(programGroup,
+                        behaviourConfig => behaviourConfig.RandomIntensity,
+                        group => group.RandomIntensity);
+                    
+                    var physBoneIntensity = pullTriggerBehavior && isRandomMode
+                        ? GetIntensity(programGroup)
+                        : GetPhysbonePullIntensity(programGroup, programGroup.LastStretchValue);
                     programGroup.LastStretchValue = 0;
 
-                    SendCommand(programGroup, GetDuration(programGroup), physBoneIntensity, releaseAction.ToControlType(),
-                        true);
+                    SendCommand(programGroup, GetDuration(programGroup), physBoneIntensity, releaseAction.ToControlType(), true);
 
                     return;
                 }