RepoMirrors/osu
1
0
Fork 0
mirror of https://github.com/ppy/osu synced 2025-01-24 23:03:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add ability to also mute hitsounds

Browse Source
This commit is contained in:
Dean Herbert 2021-07-30 16:46:42 +09:00
parent 0c3f1195e9
commit bdc5eb6d3d
1 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
osu.Game/Rulesets/Mods/ModMuted.cs
View File

@ -30,7 +30,7 @@ namespace osu.Game.Rulesets.Mods
public abstract class ModMuted<TObject> : ModMuted, IApplicableToDrawableRuleset<TObject>, IApplicableToTrack, IApplicableToScoreProcessor public abstract class ModMuted<TObject> : ModMuted, IApplicableToDrawableRuleset<TObject>, IApplicableToTrack, IApplicableToScoreProcessor
where TObject : HitObject where TObject : HitObject
{ {
private readonly BindableNumber<double> trackVolumeAdjust = new BindableDouble(0.5); private readonly BindableNumber<double> mainVolumeAdjust = new BindableDouble(0.5);
private readonly BindableNumber<double> metronomeVolumeAdjust = new BindableDouble(0.5); private readonly BindableNumber<double> metronomeVolumeAdjust = new BindableDouble(0.5);
private BindableNumber<int> currentCombo; private BindableNumber<int> currentCombo;
@ -44,7 +44,7 @@ namespace osu.Game.Rulesets.Mods
Value = true Value = true
}; };
[SettingSource("Final volume at combo", "The combo count at which point the music reaches its final volume.")] [SettingSource("Final volume at combo", "The combo count at which point the track reaches its final volume.")]
public BindableInt MuteComboCount { get; } = new BindableInt public BindableInt MuteComboCount { get; } = new BindableInt
{ {
Default = 100, Default = 100,
@ -60,9 +60,16 @@ namespace osu.Game.Rulesets.Mods
Value = false Value = false
}; };
[SettingSource("Mute hit sounds", "Hit sounds are also muted alongside the track.")]
public BindableBool AffectsHitSounds { get; } = new BindableBool
{
Default = false,
Value = false
};
public void ApplyToTrack(ITrack track) public void ApplyToTrack(ITrack track)
{ {
track.AddAdjustment(AdjustableProperty.Volume, trackVolumeAdjust); track.AddAdjustment(AdjustableProperty.Volume, mainVolumeAdjust);
} }
public void ApplyToDrawableRuleset(DrawableRuleset<TObject> drawableRuleset) public void ApplyToDrawableRuleset(DrawableRuleset<TObject> drawableRuleset)
@ -75,6 +82,9 @@ namespace osu.Game.Rulesets.Mods
}); });
metronomeContainer.AddAdjustment(AdjustableProperty.Volume, metronomeVolumeAdjust); metronomeContainer.AddAdjustment(AdjustableProperty.Volume, metronomeVolumeAdjust);
if (AffectsHitSounds.Value)
drawableRuleset.AudioContainer.AddAdjustment(AdjustableProperty.Volume, mainVolumeAdjust);
} }
public void ApplyToScoreProcessor(ScoreProcessor scoreProcessor) public void ApplyToScoreProcessor(ScoreProcessor scoreProcessor)
@ -90,12 +100,12 @@ namespace osu.Game.Rulesets.Mods
if (combo.NewValue < combo.OldValue) if (combo.NewValue < combo.OldValue)
{ {
scoreProcessor.TransformBindableTo(metronomeVolumeAdjust, dimFactor, 200, Easing.OutQuint); scoreProcessor.TransformBindableTo(metronomeVolumeAdjust, dimFactor, 200, Easing.OutQuint);
scoreProcessor.TransformBindableTo(trackVolumeAdjust, 1 - dimFactor, 200, Easing.OutQuint); scoreProcessor.TransformBindableTo(mainVolumeAdjust, 1 - dimFactor, 200, Easing.OutQuint);
} }
else else
{ {
metronomeVolumeAdjust.Value = dimFactor; metronomeVolumeAdjust.Value = dimFactor;
trackVolumeAdjust.Value = 1 - dimFactor; mainVolumeAdjust.Value = 1 - dimFactor;
} }
}, true); }, true);
} }