Skip to content

Commit d6f6c5d

Browse files
committed
fix: pull trigger random behavior was skipping the check for the Preconditions being met
Signed-off-by: NekoTiki <17910933+NekoTiki@users.noreply.github.com>
1 parent 4c11600 commit d6f6c5d

1 file changed

Lines changed: 14 additions & 11 deletions

File tree

ShockOsc/Services/ShockOsc.cs

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -405,24 +405,24 @@ private async Task PhysboneHandling(ProgramGroup programGroup, bool isGrabbed)
405405
{
406406
programGroup.TriggerMethod = TriggerMethod.None;
407407

408-
var pullTriggerBehavior = _moduleConfig.Config.GetGroupOrGlobal(programGroup,
409-
behaviourConfig => behaviourConfig.OnPullTriggerRandomBehavior,
410-
group => group.OverrideIntensity);
411-
412-
if (pullTriggerBehavior)
413-
{
414-
SendCommand(programGroup, GetDuration(programGroup), GetIntensity(programGroup), ControlType.Shock, false);
415-
416-
return;
417-
}
418-
419408
// When the stretch value is not 0, we send the action
420409
if (programGroup.LastStretchValue != 0)
421410
{
422411

423412
// Check all preconditions, maybe send stop command here aswell?
424413
if (!await HandlePrecondition(CheckAndSetAllPreconditions(programGroup), programGroup)) return;
425414

415+
var pullTriggerBehavior = _moduleConfig.Config.GetGroupOrGlobal(programGroup,
416+
behaviourConfig => behaviourConfig.OnPullTriggerRandomBehavior,
417+
group => group.OverrideIntensity);
418+
419+
if (pullTriggerBehavior)
420+
{
421+
SendCommand(programGroup, GetDuration(programGroup), GetIntensity(programGroup), ControlType.Shock, false);
422+
423+
return;
424+
}
425+
426426
var releaseAction = _moduleConfig.Config.GetGroupOrGlobal(programGroup,
427427
behaviourConfig => behaviourConfig.WhenBoneReleased,
428428
group => group.OverrideBoneReleasedAction);
@@ -433,6 +433,9 @@ private async Task PhysboneHandling(ProgramGroup programGroup, bool isGrabbed)
433433
return;
434434
}
435435

436+
_logger.LogInformation("Physbone released, sending {Action} to group {Group}", releaseAction, programGroup.Name);
437+
_logger.LogInformation("Physbone stretch value: {StretchValue}", programGroup.LastStretchValue);
438+
436439
var physBoneIntensity = GetPhysbonePullIntensity(programGroup, programGroup.LastStretchValue);
437440
programGroup.LastStretchValue = 0;
438441

0 commit comments

Comments
 (0)