diff --git a/Qwilight/Compute/DefaultCompute.cs b/Qwilight/Compute/DefaultCompute.cs index e4d5346..d49677e 100644 --- a/Qwilight/Compute/DefaultCompute.cs +++ b/Qwilight/Compute/DefaultCompute.cs @@ -2791,7 +2791,6 @@ { _lastStatus = Comment.LowestJudgment > 0 ? LastStatus.Last : LastStatus.Band1; } - WwwLevelDataValue?.SetSatisify(this); void HandleJudged(BaseNote judgedNote, JudgedNoteData? judgedNoteData, double loopingCounter) { @@ -3892,7 +3891,47 @@ _hitPointsGAS[(int)ModeComponent.HitPointsMode.Higher] = Math.Clamp(_hitPointsGAS[(int)ModeComponent.HitPointsMode.Higher], 0.0, 1.0); _hitPointsGAS[(int)ModeComponent.HitPointsMode.Highest] = Math.Clamp(_hitPointsGAS[(int)ModeComponent.HitPointsMode.Highest], 0.0, 1.0); - NewPaintEvent(); + Comment.Paints.Add(new PaintEvent + { + HitPoints = HitPoints.TargetValue, + Stand = Stand.TargetValue, + Band = Band.TargetValue, + Point = Point.TargetValue, + Wait = LoopingCounter + }); + switch (ModeComponentValue.HandlingHitPointsModeValue) + { + case ModeComponent.HitPointsMode.Highest: + _paintEventsGAS[(int)ModeComponent.HitPointsMode.Higher].Add(new() + { + HitPoints = _hitPointsGAS[(int)ModeComponent.HitPointsMode.Higher], + Stand = Stand.TargetValue, + Band = Band.TargetValue, + Point = Point.TargetValue, + Wait = LoopingCounter + }); + + _paintEventsGAS[(int)ModeComponent.HitPointsMode.Default].Add(new() + { + HitPoints = _hitPointsGAS[(int)ModeComponent.HitPointsMode.Default], + Stand = Stand.TargetValue, + Band = Band.TargetValue, + Point = Point.TargetValue, + Wait = LoopingCounter + }); + break; + case ModeComponent.HitPointsMode.Higher: + _paintEventsGAS[(int)ModeComponent.HitPointsMode.Default].Add(new() + { + HitPoints = _hitPointsGAS[(int)ModeComponent.HitPointsMode.Default], + Stand = Stand.TargetValue, + Band = Band.TargetValue, + Point = Point.TargetValue, + Wait = LoopingCounter + }); + break; + } + WwwLevelDataValue?.SetSatisify(this); } if (!IsInEvents) { @@ -4133,50 +4172,6 @@ IsNewStand = Stand.TargetValue > _netItems.Where(netItem => !netItem.IsMyNetItem && netItem.AvatarID == AvatarID).DefaultIfEmpty().Max(netItem => netItem?.StandValue ?? 0); } - void NewPaintEvent() - { - Comment.Paints.Add(new PaintEvent - { - HitPoints = HitPoints.TargetValue, - Stand = Stand.TargetValue, - Band = Band.TargetValue, - Point = Point.TargetValue, - Wait = LoopingCounter - }); - switch (ModeComponentValue.HandlingHitPointsModeValue) - { - case ModeComponent.HitPointsMode.Highest: - _paintEventsGAS[(int)ModeComponent.HitPointsMode.Higher].Add(new() - { - HitPoints = _hitPointsGAS[(int)ModeComponent.HitPointsMode.Higher], - Stand = Stand.TargetValue, - Band = Band.TargetValue, - Point = Point.TargetValue, - Wait = LoopingCounter - }); - - _paintEventsGAS[(int)ModeComponent.HitPointsMode.Default].Add(new() - { - HitPoints = _hitPointsGAS[(int)ModeComponent.HitPointsMode.Default], - Stand = Stand.TargetValue, - Band = Band.TargetValue, - Point = Point.TargetValue, - Wait = LoopingCounter - }); - break; - case ModeComponent.HitPointsMode.Higher: - _paintEventsGAS[(int)ModeComponent.HitPointsMode.Default].Add(new() - { - HitPoints = _hitPointsGAS[(int)ModeComponent.HitPointsMode.Default], - Stand = Stand.TargetValue, - Band = Band.TargetValue, - Point = Point.TargetValue, - Wait = LoopingCounter - }); - break; - } - } - public void HandleCompiler() { try diff --git a/Qwilight/Compute/WwwLevelData.cs b/Qwilight/Compute/WwwLevelData.cs index 0e0a4bd..ee096bc 100644 --- a/Qwilight/Compute/WwwLevelData.cs +++ b/Qwilight/Compute/WwwLevelData.cs @@ -14,7 +14,7 @@ { IsStandSatisify = IsSatisify(defaultComputer.Stand.TargetValue, Stand); IsPointSatisify = IsSatisify(defaultComputer.Point.TargetValue, Point); - IsBandSatisify = IsSatisify(defaultComputer.Band.TargetValue, Band); + IsBandSatisify = IsSatisify(defaultComputer.HighestBand, Band); IsJudgmentsSatisify[(int)Component.Judged.Highest] = IsSatisify(defaultComputer.InheritedHighestJudgment + defaultComputer.Comment.HighestJudgment, Judgments?[(int)Component.Judged.Highest]); IsJudgmentsSatisify[(int)Component.Judged.Higher] = IsSatisify(defaultComputer.InheritedHigherJudgment + defaultComputer.Comment.HigherJudgment, Judgments?[(int)Component.Judged.Higher]); IsJudgmentsSatisify[(int)Component.Judged.High] = IsSatisify(defaultComputer.InheritedHighJudgment + defaultComputer.Comment.HighJudgment, Judgments?[(int)Component.Judged.High]);