diff --git a/ShockOsc/Backend/BackendHubManager.cs b/ShockOsc/Backend/BackendHubManager.cs index 596db85..6db5a74 100644 --- a/ShockOsc/Backend/BackendHubManager.cs +++ b/ShockOsc/Backend/BackendHubManager.cs @@ -161,7 +161,7 @@ await _chatboxService.SendRemoteControlMessage(log.Shocker.Name, sender.Name, se break; } case ControlType.Vibrate: - pain.LastVibration = log.ExecutedAt; + pain.LastHeldAction = log.ExecutedAt; break; case ControlType.Stop: pain.LastDuration = 0; diff --git a/ShockOsc/Models/ProgramGroup.cs b/ShockOsc/Models/ProgramGroup.cs index 168d5d2..adcfa2d 100644 --- a/ShockOsc/Models/ProgramGroup.cs +++ b/ShockOsc/Models/ProgramGroup.cs @@ -9,7 +9,7 @@ public sealed class ProgramGroup { public DateTime LastActive { get; set; } public DateTime LastExecuted { get; set; } - public DateTime LastVibration { get; set; } + public DateTime LastHeldAction { get; set; } public DateTime PhysBoneGrabLimitTime { get; set; } public ushort LastDuration { get; set; } public byte LastIntensity { get; set; } diff --git a/ShockOsc/Services/ShockOsc.cs b/ShockOsc/Services/ShockOsc.cs index c95a45a..8f2b422 100644 --- a/ShockOsc/Services/ShockOsc.cs +++ b/ShockOsc/Services/ShockOsc.cs @@ -552,10 +552,10 @@ private async Task CheckProgramGroup(ProgramGroup programGroup, Guid pos, Behavi group => group.OverrideBoneHeldAction); if (heldAction != BoneAction.None && programGroup.PhysBoneGrabLimitTime > DateTime.UtcNow && - programGroup.LastVibration < DateTime.UtcNow.Subtract(TimeSpan.FromMilliseconds(100))) + programGroup.LastHeldAction < DateTime.UtcNow.Subtract(TimeSpan.FromMilliseconds(100))) { var pullIntensityTranslated = GetPhysbonePullIntensity(programGroup, programGroup.LastStretchValue); - programGroup.LastVibration = DateTime.UtcNow; + programGroup.LastHeldAction = DateTime.UtcNow; _logger.LogDebug("Vibrating/Shocking {Shocker} at {Intensity}", pos, pullIntensityTranslated);