diff --git a/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModMuted.cs b/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModMuted.cs
new file mode 100644
index 0000000000..c14dc78f38
--- /dev/null
+++ b/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModMuted.cs
@@ -0,0 +1,52 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using System.Linq;
+using NUnit.Framework;
+using osu.Framework.Testing;
+using osu.Game.Rulesets.Mods;
+using osu.Game.Rulesets.Osu.Mods;
+
+namespace osu.Game.Rulesets.Osu.Tests.Mods
+{
+ public class TestSceneOsuModMuted : OsuModTestScene
+ {
+ /// <summary>
+ /// Ensures that a final volume combo of 0 (i.e. "always muted" mode) constantly plays metronome and completely mutes track.
+ /// </summary>
+ [Test]
+ public void TestZeroFinalCombo() => CreateModTest(new ModTestData
+ {
+ Mod = new OsuModMuted
+ {
+ MuteComboCount = { Value = 0 },
+ },
+ PassCondition = () => Beatmap.Value.Track.AggregateVolume.Value == 0.0 &&
+ Player.ChildrenOfType<Metronome>().SingleOrDefault()?.AggregateVolume.Value == 1.0,
+ });
+
+ /// <summary>
+ /// Ensures that copying from a normal mod with 0 final combo while originally inversed does not yield incorrect results.
+ /// </summary>
+ [Test]
+ public void TestModCopy()
+ {
+ OsuModMuted muted = null;
+
+ AddStep("create inversed mod", () => muted = new OsuModMuted
+ {
+ MuteComboCount = { Value = 100 },
+ InverseMuting = { Value = true },
+ });
+
+ AddStep("copy from normal", () => muted.CopyFrom(new OsuModMuted
+ {
+ MuteComboCount = { Value = 0 },
+ InverseMuting = { Value = false },
+ }));
+
+ AddAssert("mute combo count = 0", () => muted.MuteComboCount.Value == 0);
+ AddAssert("inverse muting = false", () => muted.InverseMuting.Value == false);
+ }
+ }
+}
diff --git a/osu.Game/Graphics/Containers/Markdown/OsuMarkdownContainer.cs b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownContainer.cs
index 81f30bd406..296c600771 100644
--- a/osu.Game/Graphics/Containers/Markdown/OsuMarkdownContainer.cs
+++ b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownContainer.cs
@@ -48,7 +48,7 @@ namespace osu.Game.Graphics.Containers.Markdown
public override SpriteText CreateSpriteText() => new OsuSpriteText
{
- Font = OsuFont.GetFont(size: 14),
+ Font = OsuFont.GetFont(Typeface.Inter, size: 14, weight: FontWeight.Regular),
};
public override MarkdownTextFlowContainer CreateTextFlow() => new OsuMarkdownTextFlowContainer();
diff --git a/osu.Game/Graphics/Containers/Markdown/OsuMarkdownHeading.cs b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownHeading.cs
index a3a86df678..e4685a2935 100644
--- a/osu.Game/Graphics/Containers/Markdown/OsuMarkdownHeading.cs
+++ b/osu.Game/Graphics/Containers/Markdown/OsuMarkdownHeading.cs
@@ -70,7 +70,7 @@ namespace osu.Game.Graphics.Containers.Markdown
public FontWeight FontWeight;
protected override SpriteText CreateSpriteText()
- => base.CreateSpriteText().With(t => t.Font = t.Font.With(size: FontSize, weight: FontWeight));
+ => base.CreateSpriteText().With(t => t.Font = t.Font.With(Typeface.Torus, size: FontSize, weight: FontWeight));
}
}
}
diff --git a/osu.Game/Graphics/OsuFont.cs b/osu.Game/Graphics/OsuFont.cs
index 7c78141b4d..b6090d0e1a 100644
--- a/osu.Game/Graphics/OsuFont.cs
+++ b/osu.Game/Graphics/OsuFont.cs
@@ -21,6 +21,8 @@ namespace osu.Game.Graphics
public static FontUsage Torus => GetFont(Typeface.Torus, weight: FontWeight.Regular);
+ public static FontUsage Inter => GetFont(Typeface.Inter, weight: FontWeight.Regular);
+
/// <summary>
/// Retrieves a <see cref="FontUsage"/>.
/// </summary>
@@ -54,6 +56,9 @@ namespace osu.Game.Graphics
case Typeface.Torus:
return "Torus";
+
+ case Typeface.Inter:
+ return "Inter";
}
return null;
@@ -107,7 +112,8 @@ namespace osu.Game.Graphics
public enum Typeface
{
Venera,
- Torus
+ Torus,
+ Inter,
}
public enum FontWeight
diff --git a/osu.Game/Online/Multiplayer/OnlineMultiplayerClient.cs b/osu.Game/Online/Multiplayer/OnlineMultiplayerClient.cs
index 00f30463a5..8b8d10ce4f 100644
--- a/osu.Game/Online/Multiplayer/OnlineMultiplayerClient.cs
+++ b/osu.Game/Online/Multiplayer/OnlineMultiplayerClient.cs
@@ -60,6 +60,7 @@ namespace osu.Game.Online.Multiplayer
connection.On<int, BeatmapAvailability>(nameof(IMultiplayerClient.UserBeatmapAvailabilityChanged), ((IMultiplayerClient)this).UserBeatmapAvailabilityChanged);
connection.On<MatchRoomState>(nameof(IMultiplayerClient.MatchRoomStateChanged), ((IMultiplayerClient)this).MatchRoomStateChanged);
connection.On<int, MatchUserState>(nameof(IMultiplayerClient.MatchUserStateChanged), ((IMultiplayerClient)this).MatchUserStateChanged);
+ connection.On<MatchServerEvent>(nameof(IMultiplayerClient.MatchEvent), ((IMultiplayerClient)this).MatchEvent);
};
IsConnected.BindTo(connector.IsConnected);
diff --git a/osu.Game/Overlays/Wiki/WikiMainPage.cs b/osu.Game/Overlays/Wiki/WikiMainPage.cs
index c4c0b83ef4..3fb0aa450e 100644
--- a/osu.Game/Overlays/Wiki/WikiMainPage.cs
+++ b/osu.Game/Overlays/Wiki/WikiMainPage.cs
@@ -59,7 +59,7 @@ namespace osu.Game.Overlays.Wiki
Child = new OsuSpriteText
{
Text = blurbNode.InnerText,
- Font = OsuFont.GetFont(size: 12),
+ Font = OsuFont.GetFont(Typeface.Inter, size: 12, weight: FontWeight.Light),
Anchor = Anchor.TopCentre,
Origin = Anchor.TopCentre,
}
diff --git a/osu.Game/Overlays/Wiki/WikiPanelContainer.cs b/osu.Game/Overlays/Wiki/WikiPanelContainer.cs
index e1c00a955b..7e7e005586 100644
--- a/osu.Game/Overlays/Wiki/WikiPanelContainer.cs
+++ b/osu.Game/Overlays/Wiki/WikiPanelContainer.cs
@@ -89,7 +89,7 @@ namespace osu.Game.Overlays.Wiki
DocumentMargin = new MarginPadding(0);
}
- public override SpriteText CreateSpriteText() => base.CreateSpriteText().With(t => t.Font = t.Font.With(weight: FontWeight.Bold));
+ public override SpriteText CreateSpriteText() => base.CreateSpriteText().With(t => t.Font = t.Font.With(Typeface.Torus, weight: FontWeight.Bold));
public override MarkdownTextFlowContainer CreateTextFlow() => base.CreateTextFlow().With(f => f.TextAnchor = Anchor.TopCentre);
diff --git a/osu.Game/Rulesets/Mods/ModMuted.cs b/osu.Game/Rulesets/Mods/ModMuted.cs
index 7fde14d6ca..1d33b44812 100644
--- a/osu.Game/Rulesets/Mods/ModMuted.cs
+++ b/osu.Game/Rulesets/Mods/ModMuted.cs
@@ -1,14 +1,16 @@
// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
// See the LICENCE file in the repository root for full licence text.
-using System;
using System.Linq;
using osu.Framework.Audio;
using osu.Framework.Audio.Track;
using osu.Framework.Bindables;
using osu.Framework.Graphics;
using osu.Framework.Graphics.Sprites;
+using osu.Framework.Localisation;
using osu.Game.Configuration;
+using osu.Game.Graphics.UserInterface;
+using osu.Game.Overlays.Settings;
using osu.Game.Rulesets.Objects;
using osu.Game.Rulesets.Scoring;
using osu.Game.Rulesets.UI;
@@ -41,7 +43,7 @@ namespace osu.Game.Rulesets.Mods
Value = true
};
- [SettingSource("Final volume at combo", "The combo count at which point the track reaches its final volume.")]
+ [SettingSource("Final volume at combo", "The combo count at which point the track reaches its final volume.", SettingControlType = typeof(SettingsSlider<int, MuteComboSlider>))]
public BindableInt MuteComboCount { get; } = new BindableInt
{
Default = 100,
@@ -64,6 +66,11 @@ namespace osu.Game.Rulesets.Mods
Value = true
};
+ protected ModMuted()
+ {
+ InverseMuting.BindValueChanged(i => MuteComboCount.MinValue = i.NewValue ? 1 : 0, true);
+ }
+
public void ApplyToTrack(ITrack track)
{
track.AddAdjustment(AdjustableProperty.Volume, mainVolumeAdjust);
@@ -89,7 +96,7 @@ namespace osu.Game.Rulesets.Mods
currentCombo = scoreProcessor.Combo.GetBoundCopy();
currentCombo.BindValueChanged(combo =>
{
- double dimFactor = Math.Min(1, (double)combo.NewValue / MuteComboCount.Value);
+ double dimFactor = MuteComboCount.Value == 0 ? 1 : (double)combo.NewValue / MuteComboCount.Value;
if (InverseMuting.Value)
dimFactor = 1 - dimFactor;
@@ -101,4 +108,9 @@ namespace osu.Game.Rulesets.Mods
public ScoreRank AdjustRank(ScoreRank rank, double accuracy) => rank;
}
+
+ public class MuteComboSlider : OsuSliderBar<int>
+ {
+ public override LocalisableString TooltipText => Current.Value == 0 ? "always muted" : base.TooltipText;
+ }
}