diff --git a/osu.Desktop/Program.cs b/osu.Desktop/Program.cs index 0de0140183a3..4df7a8c7b90e 100644 --- a/osu.Desktop/Program.cs +++ b/osu.Desktop/Program.cs @@ -20,7 +20,7 @@ namespace osu.Desktop public static class Program { #if DEBUG - private const string base_game_name = @"osu-development"; + private const string base_game_name = @"osu"; #else private const string base_game_name = @"osu"; #endif diff --git a/osu.Game.Tournament/Components/DrawableTeamFlag.cs b/osu.Game.Tournament/Components/DrawableTeamFlag.cs index aef854bb8dfb..a1adc2415ba9 100644 --- a/osu.Game.Tournament/Components/DrawableTeamFlag.cs +++ b/osu.Game.Tournament/Components/DrawableTeamFlag.cs @@ -16,15 +16,17 @@ namespace osu.Game.Tournament.Components public partial class DrawableTeamFlag : Container { private readonly TournamentTeam? team; + private readonly Vector2? size; [UsedImplicitly] private Bindable? flag; private Sprite? flagSprite; - public DrawableTeamFlag(TournamentTeam? team) + public DrawableTeamFlag(TournamentTeam? team, Vector2? size = null) { this.team = team; + this.size = size; } [BackgroundDependencyLoader] @@ -32,7 +34,7 @@ private void load(TextureStore textures) { if (team == null) return; - Size = new Vector2(75, 54); + Size = size ?? new Vector2(75, 54); Masking = true; CornerRadius = 5; Child = flagSprite = new Sprite diff --git a/osu.Game.Tournament/Components/DrawableTeamHeader.cs b/osu.Game.Tournament/Components/DrawableTeamHeader.cs index e9ce9f3759ca..5d13900d1851 100644 --- a/osu.Game.Tournament/Components/DrawableTeamHeader.cs +++ b/osu.Game.Tournament/Components/DrawableTeamHeader.cs @@ -8,12 +8,12 @@ namespace osu.Game.Tournament.Components { public partial class DrawableTeamHeader : TournamentSpriteTextWithBackground { - public DrawableTeamHeader(TeamColour colour) + public DrawableTeamHeader(TeamColour colour, string? name = null) { Background.Colour = TournamentGame.GetTeamColour(colour); Text.Colour = TournamentGame.TEXT_COLOUR; - Text.Text = $"Team {colour}".ToUpperInvariant(); + Text.Text = $"{name ?? colour.ToString()}".ToUpperInvariant(); Text.Scale = new Vector2(0.6f); } } diff --git a/osu.Game.Tournament/Components/DrawableTeamTitleWithHeader.cs b/osu.Game.Tournament/Components/DrawableTeamTitleWithHeader.cs index 7d8fc847d430..5c9afd1f64dc 100644 --- a/osu.Game.Tournament/Components/DrawableTeamTitleWithHeader.cs +++ b/osu.Game.Tournament/Components/DrawableTeamTitleWithHeader.cs @@ -21,8 +21,7 @@ public DrawableTeamTitleWithHeader(TournamentTeam? team, TeamColour colour) Spacing = new Vector2(0, 5), Children = new Drawable[] { - new DrawableTeamHeader(colour), - new DrawableTeamTitle(team), + new DrawableTeamHeader(colour, team?.FullName.Value), new DrawableTeamSeed(team), } }; diff --git a/osu.Game.Tournament/Components/DrawableTeamWithPlayers.cs b/osu.Game.Tournament/Components/DrawableTeamWithPlayers.cs index fd7a51140b1a..705e6162be2a 100644 --- a/osu.Game.Tournament/Components/DrawableTeamWithPlayers.cs +++ b/osu.Game.Tournament/Components/DrawableTeamWithPlayers.cs @@ -60,7 +60,7 @@ public DrawableTeamWithPlayers(TournamentTeam? team, TeamColour colour) }, }; - TournamentSpriteText createPlayerText(TournamentUser p) => + static TournamentSpriteText createPlayerText(TournamentUser p) => new TournamentSpriteText { Text = p.Username, diff --git a/osu.Game.Tournament/Components/SongBar.cs b/osu.Game.Tournament/Components/SongBar.cs index cc1d00f62fd3..d27e36404b06 100644 --- a/osu.Game.Tournament/Components/SongBar.cs +++ b/osu.Game.Tournament/Components/SongBar.cs @@ -109,17 +109,9 @@ private void refreshContent() double bpm = beatmap.BPM; double length = beatmap.Length; - string hardRockExtra = ""; - string srExtra = ""; float ar = beatmap.Difficulty.ApproachRate; - if ((mods & LegacyMods.HardRock) > 0) - { - hardRockExtra = "*"; - srExtra = "*"; - } - if ((mods & LegacyMods.DoubleTime) > 0) { // temporary local calculation (taken from OsuDifficultyCalculator) @@ -128,7 +120,6 @@ private void refreshContent() bpm *= 1.5f; length /= 1.5f; - srExtra = "*"; } (string heading, string content)[] stats; @@ -138,9 +129,9 @@ private void refreshContent() default: stats = new (string heading, string content)[] { - ("CS", $"{beatmap.Difficulty.CircleSize:0.#}{hardRockExtra}"), - ("AR", $"{ar:0.#}{hardRockExtra}"), - ("OD", $"{beatmap.Difficulty.OverallDifficulty:0.#}{hardRockExtra}"), + ("CS", $"{beatmap.Difficulty.CircleSize:0.#}"), + ("AR", $"{ar:0.#}"), + ("OD", $"{beatmap.Difficulty.OverallDifficulty:0.#}"), }; break; @@ -148,15 +139,15 @@ private void refreshContent() case 3: stats = new (string heading, string content)[] { - ("OD", $"{beatmap.Difficulty.OverallDifficulty:0.#}{hardRockExtra}"), - ("HP", $"{beatmap.Difficulty.DrainRate:0.#}{hardRockExtra}") + ("OD", $"{beatmap.Difficulty.OverallDifficulty:0.#}"), + ("HP", $"{beatmap.Difficulty.DrainRate:0.#}") }; break; case 2: stats = new (string heading, string content)[] { - ("CS", $"{beatmap.Difficulty.CircleSize:0.#}{hardRockExtra}"), + ("CS", $"{beatmap.Difficulty.CircleSize:0.#}"), ("AR", $"{ar:0.#}"), }; break; @@ -192,7 +183,7 @@ private void refreshContent() Children = new Drawable[] { new DiffPiece(stats), - new DiffPiece(("Star Rating", $"{beatmap.StarRating:0.00}{srExtra}")) + new DiffPiece(("SR", $"{beatmap.StarRating:0.00}")) } }, new FillFlowContainer diff --git a/osu.Game.Tournament/Models/TournamentMatch.cs b/osu.Game.Tournament/Models/TournamentMatch.cs index 0a700eb4d64a..4d0a552d2b1c 100644 --- a/osu.Game.Tournament/Models/TournamentMatch.cs +++ b/osu.Game.Tournament/Models/TournamentMatch.cs @@ -5,8 +5,10 @@ using System.Collections.Generic; using System.Collections.ObjectModel; using System.Drawing; +using System.Net.Http; using Newtonsoft.Json; using osu.Framework.Bindables; +using osu.Framework.Extensions; using osu.Game.Tournament.Screens.Ladder.Components; namespace osu.Game.Tournament.Models @@ -17,7 +19,16 @@ namespace osu.Game.Tournament.Models [Serializable] public class TournamentMatch { + public class MatchPickems + { + public float Player1 { get; set; } + public float Player2 { get; set; } + } + + private static readonly HttpClient client = new HttpClient(); + public int ID; + public int DatabaseId; public List Acronyms { @@ -126,5 +137,31 @@ public void Reset() Completed.Value = false; PicksBans.Clear(); } + + public async void RetrievePickemsResults() + { + if (DatabaseId == 0) return; + string url = @"https://tourney-api.huismetbenen.nl/pickems/get-by-match/" + DatabaseId; + + var requestMessage = new HttpRequestMessage(HttpMethod.Get, url); + requestMessage.Headers.Add("ContentType", "application/json"); + requestMessage.Headers.Add("x-tourney-id", "9"); + var response = await client.SendAsync(requestMessage).ConfigureAwait(false); + var result = response.Content.ReadAsStringAsync(); + + if (result != null && Team1.Value != null && Team2.Value != null) + { + string safeResult = result.GetResultSafely(); + if (safeResult != null) + { + MatchPickems? pickems = JsonConvert.DeserializeObject(safeResult); + Team1.Value.PickemsRate.Value = pickems?.Player1 ?? 0; + Team2.Value.PickemsRate.Value = pickems?.Player2 ?? 0; + + Team1.Value.PickemsRate.TriggerChange(); + Team2.Value.PickemsRate.TriggerChange(); + } + } + } } } diff --git a/osu.Game.Tournament/Models/TournamentTeam.cs b/osu.Game.Tournament/Models/TournamentTeam.cs index de1c53b30cce..d4f661ff1b52 100644 --- a/osu.Game.Tournament/Models/TournamentTeam.cs +++ b/osu.Game.Tournament/Models/TournamentTeam.cs @@ -54,6 +54,8 @@ public class TournamentTeam public Bindable QualifiersCarryFactor = new Bindable(0); + public Bindable PickemsRate = new Bindable(-1); + [JsonProperty] public BindableList Players { get; } = new BindableList(); diff --git a/osu.Game.Tournament/Screens/Gameplay/Components/TeamDisplay.cs b/osu.Game.Tournament/Screens/Gameplay/Components/TeamDisplay.cs index 3eec67c639a5..2c5e98065a49 100644 --- a/osu.Game.Tournament/Screens/Gameplay/Components/TeamDisplay.cs +++ b/osu.Game.Tournament/Screens/Gameplay/Components/TeamDisplay.cs @@ -7,12 +7,14 @@ using osu.Game.Tournament.Components; using osu.Game.Tournament.Models; using osuTK; +using System; namespace osu.Game.Tournament.Screens.Gameplay.Components { public partial class TeamDisplay : DrawableTournamentTeam { private readonly TeamScore score; + private TournamentSpriteTextWithBackground? pickemsSprite; private readonly TournamentSpriteTextWithBackground teamNameText; @@ -35,7 +37,7 @@ public bool ShowScore } } - public TeamDisplay(TournamentTeam? team, TeamColour colour, Bindable currentTeamScore, int pointsToWin) + public TeamDisplay(TournamentTeam? team, TournamentMatch? match, TeamColour colour, Bindable currentTeamScore, int pointsToWin) : base(team) { AutoSizeAxes = Axes.Both; @@ -50,6 +52,22 @@ public TeamDisplay(TournamentTeam? team, TeamColour colour, Bindable curre Flag.Anchor = anchor; Margin = new MarginPadding(20); + teamNameText = new TournamentSpriteTextWithBackground(""); + + pickemsSprite = new TournamentSpriteTextWithBackground("") + { + Scale = new Vector2(0.3f), + Origin = anchor, + Anchor = anchor + }; + + if (team != null) + { + team.PickemsRate.ValueChanged += val => + { + pickemsSprite.Text.Text = val.NewValue >= 0 ? $"Pickem rate: {Math.Round(val.NewValue, 2)}%" : ""; + }; + } InternalChild = new Container { @@ -82,7 +100,7 @@ public TeamDisplay(TournamentTeam? team, TeamColour colour, Bindable curre Anchor = anchor, Children = new Drawable[] { - new DrawableTeamHeader(colour) + new DrawableTeamHeader(colour, team?.FullName?.Value) { Scale = new Vector2(0.75f), Origin = anchor, @@ -95,18 +113,7 @@ public TeamDisplay(TournamentTeam? team, TeamColour colour, Bindable curre } } }, - teamNameText = new TournamentSpriteTextWithBackground - { - Scale = new Vector2(0.5f), - Origin = anchor, - Anchor = anchor, - }, - new DrawableTeamSeed(Team) - { - Scale = new Vector2(0.5f), - Origin = anchor, - Anchor = anchor, - }, + pickemsSprite } }, } diff --git a/osu.Game.Tournament/Screens/Gameplay/Components/TeamScoreDisplay.cs b/osu.Game.Tournament/Screens/Gameplay/Components/TeamScoreDisplay.cs index c7fcfae602bc..3c382d439768 100644 --- a/osu.Game.Tournament/Screens/Gameplay/Components/TeamScoreDisplay.cs +++ b/osu.Game.Tournament/Screens/Gameplay/Components/TeamScoreDisplay.cs @@ -101,7 +101,7 @@ private void teamChanged(ValueChangedEvent team) InternalChildren = new Drawable[] { - teamDisplay = new TeamDisplay(team.NewValue, teamColour, currentTeamScore, currentMatch.Value?.PointsToWin ?? 0), + teamDisplay = new TeamDisplay(team.NewValue, currentMatch.Value, teamColour, currentTeamScore, currentMatch.Value?.PointsToWin ?? 0), }; teamDisplay.ShowScore = wasShowingScores; diff --git a/osu.Game.Tournament/Screens/Gameplay/GameplayScreen.cs b/osu.Game.Tournament/Screens/Gameplay/GameplayScreen.cs index b2152eaf3d58..24926bacf772 100644 --- a/osu.Game.Tournament/Screens/Gameplay/GameplayScreen.cs +++ b/osu.Game.Tournament/Screens/Gameplay/GameplayScreen.cs @@ -107,6 +107,12 @@ private void load(MatchIPCInfo ipc) Text = "Toggle chat", Action = () => { State.Value = State.Value == TourneyState.Idle ? TourneyState.Playing : TourneyState.Idle; } }, + new TourneyButton + { + RelativeSizeAxes = Axes.X, + Text = "Refresh pickems", + Action = () => { CurrentMatch.Value?.RetrievePickemsResults(); } + }, new SettingsSlider { LabelText = "Chroma width", @@ -148,6 +154,7 @@ protected override void CurrentMatchChanged(ValueChangedEvent return; warmup.Value = match.NewValue.Team1Score.Value + match.NewValue.Team2Score.Value == 0; + match.NewValue.RetrievePickemsResults(); scheduledScreenChange?.Cancel(); } diff --git a/osu.Game.Tournament/Screens/MapPool/MapPoolScreen.cs b/osu.Game.Tournament/Screens/MapPool/MapPoolScreen.cs index f80f43bb770e..435be7eb37bd 100644 --- a/osu.Game.Tournament/Screens/MapPool/MapPoolScreen.cs +++ b/osu.Game.Tournament/Screens/MapPool/MapPoolScreen.cs @@ -268,7 +268,7 @@ private void updateDisplay() flowCount = 0; } - if (++flowCount > 2) + if (++flowCount > 3) { totalRows++; flowCount = 1; diff --git a/osu.Game.Tournament/Screens/Schedule/ScheduleScreen.cs b/osu.Game.Tournament/Screens/Schedule/ScheduleScreen.cs index d02559d6b7e2..7a5718db6129 100644 --- a/osu.Game.Tournament/Screens/Schedule/ScheduleScreen.cs +++ b/osu.Game.Tournament/Screens/Schedule/ScheduleScreen.cs @@ -251,7 +251,7 @@ public ScheduleMatch(TournamentMatch match, bool showTimestamp = true) Colour = OsuColour.Gray(0.7f), Alpha = conditional ? 0.6f : 1, Margin = new MarginPadding { Horizontal = 10, Vertical = 5 }, - Text = match.Date.Value.ToUniversalTime().ToString("HH:mm UTC") + (conditional ? " (conditional)" : "") + Text = match.Date.Value.ToLocalTime().ToString("HH:mm UTC") + (conditional ? " (conditional)" : "") }); } } diff --git a/osu.Game.Tournament/Screens/TeamIntro/TeamIntroScreen.cs b/osu.Game.Tournament/Screens/TeamIntro/TeamIntroScreen.cs index 2280f21d4717..5621d094db94 100644 --- a/osu.Game.Tournament/Screens/TeamIntro/TeamIntroScreen.cs +++ b/osu.Game.Tournament/Screens/TeamIntro/TeamIntroScreen.cs @@ -53,7 +53,7 @@ protected override void CurrentMatchChanged(ValueChangedEvent { Position = new Vector2(100, 100) }, - new DrawableTeamFlag(match.NewValue.Team1.Value) + new DrawableTeamFlag(match.NewValue.Team1.Value, new Vector2(150, 108)) { Position = new Vector2(165, y_flag_offset), }, @@ -61,7 +61,7 @@ protected override void CurrentMatchChanged(ValueChangedEvent { Position = new Vector2(165, y_offset), }, - new DrawableTeamFlag(match.NewValue.Team2.Value) + new DrawableTeamFlag(match.NewValue.Team2.Value, new Vector2(150, 108)) { Position = new Vector2(740, y_flag_offset), }, diff --git a/osu.Game/Graphics/Cursor/MenuCursorContainer.cs b/osu.Game/Graphics/Cursor/MenuCursorContainer.cs index 7c2d6c51864b..299e1746c57d 100644 --- a/osu.Game/Graphics/Cursor/MenuCursorContainer.cs +++ b/osu.Game/Graphics/Cursor/MenuCursorContainer.cs @@ -47,7 +47,6 @@ public bool HideCursorOnNonMouseInput private Vector2 lastMovePosition; private Bindable cursorRotate = null!; - private Sample tapSample = null!; private MouseInputDetector mouseInputDetector = null!; @@ -61,8 +60,6 @@ private void load(OsuConfigManager config, ScreenshotManager? screenshotManager, if (screenshotManager != null) screenshotCursorVisibility.BindTo(screenshotManager.CursorVisibility); - tapSample = audio.Samples.Get(@"UI/cursor-tap"); - Add(mouseInputDetector = new MouseInputDetector()); } @@ -230,13 +227,6 @@ protected override void PopOut() private void playTapSample(double baseFrequency = 1f) { - const float random_range = 0.02f; - SampleChannel channel = tapSample.GetChannel(); - - // Scale to [-0.75, 0.75] so that the sample isn't fully panned left or right (sounds weird) - channel.Balance.Value = ((activeCursor.X / DrawWidth) * 2 - 1) * OsuGameBase.SFX_STEREO_STRENGTH; - channel.Frequency.Value = baseFrequency - (random_range / 2f) + RNG.NextDouble(random_range); - channel.Volume.Value = baseFrequency; } public partial class Cursor : Container diff --git a/osu.Game/Graphics/UserInterface/HoverClickSounds.cs b/osu.Game/Graphics/UserInterface/HoverClickSounds.cs index 884834ebe8ae..21c3d535ac1d 100644 --- a/osu.Game/Graphics/UserInterface/HoverClickSounds.cs +++ b/osu.Game/Graphics/UserInterface/HoverClickSounds.cs @@ -3,14 +3,12 @@ #nullable disable -using System.Linq; using osu.Framework.Allocation; using osu.Framework.Audio; using osu.Framework.Audio.Sample; using osu.Framework.Bindables; using osu.Framework.Extensions; using osu.Framework.Input.Events; -using osu.Framework.Utils; using osuTK.Input; namespace osu.Game.Graphics.UserInterface @@ -23,7 +21,6 @@ public partial class HoverClickSounds : HoverSounds { public Bindable Enabled = new Bindable(true); - private Sample sampleClick; private Sample sampleClickDisabled; private readonly MouseButton[] buttons; @@ -44,17 +41,6 @@ public HoverClickSounds(HoverSampleSet sampleSet = HoverSampleSet.Default, Mouse protected override bool OnClick(ClickEvent e) { - if (buttons.Contains(e.Button)) - { - var channel = Enabled.Value ? sampleClick?.GetChannel() : sampleClickDisabled?.GetChannel(); - - if (channel != null) - { - channel.Frequency.Value = 0.99 + RNG.NextDouble(0.02); - channel.Play(); - } - } - return base.OnClick(e); } @@ -69,9 +55,6 @@ public override void PlayHoverSample() [BackgroundDependencyLoader] private void load(AudioManager audio) { - sampleClick = audio.Samples.Get($@"UI/{SampleSet.GetDescription()}-select") - ?? audio.Samples.Get($@"UI/{HoverSampleSet.Default.GetDescription()}-select"); - sampleClickDisabled = audio.Samples.Get($@"UI/{SampleSet.GetDescription()}-select-disabled") ?? audio.Samples.Get($@"UI/{HoverSampleSet.Default.GetDescription()}-select-disabled"); } diff --git a/osu.Game/Graphics/UserInterface/HoverSounds.cs b/osu.Game/Graphics/UserInterface/HoverSounds.cs index 012594b40434..f9788b16d589 100644 --- a/osu.Game/Graphics/UserInterface/HoverSounds.cs +++ b/osu.Game/Graphics/UserInterface/HoverSounds.cs @@ -6,9 +6,7 @@ using osu.Framework.Allocation; using osu.Framework.Audio; using osu.Framework.Audio.Sample; -using osu.Framework.Extensions; using osu.Framework.Graphics; -using osu.Framework.Utils; namespace osu.Game.Graphics.UserInterface { @@ -18,8 +16,6 @@ namespace osu.Game.Graphics.UserInterface /// public partial class HoverSounds : HoverSampleDebounceComponent { - private Sample sampleHover; - protected readonly HoverSampleSet SampleSet; public HoverSounds(HoverSampleSet sampleSet = HoverSampleSet.Default) @@ -31,14 +27,10 @@ public HoverSounds(HoverSampleSet sampleSet = HoverSampleSet.Default) [BackgroundDependencyLoader] private void load(AudioManager audio) { - sampleHover = audio.Samples.Get($@"UI/{SampleSet.GetDescription()}-hover") - ?? audio.Samples.Get($@"UI/{HoverSampleSet.Default.GetDescription()}-hover"); } public override void PlayHoverSample() { - sampleHover.Frequency.Value = 0.98 + RNG.NextDouble(0.04); - sampleHover.Play(); } } } diff --git a/osu.Game/Graphics/UserInterface/OsuButton.cs b/osu.Game/Graphics/UserInterface/OsuButton.cs index 6467ae578392..333a16b39771 100644 --- a/osu.Game/Graphics/UserInterface/OsuButton.cs +++ b/osu.Game/Graphics/UserInterface/OsuButton.cs @@ -73,7 +73,7 @@ public override bool ReceivePositionalInputAt(Vector2 screenSpacePos) => private readonly Box flashLayer; - protected OsuButton(HoverSampleSet? hoverSounds = HoverSampleSet.Button) + protected OsuButton(HoverSampleSet? hoverSounds = null) { Height = 40; @@ -114,9 +114,6 @@ protected OsuButton(HoverSampleSet? hoverSounds = HoverSampleSet.Button) }, } }); - - if (hoverSounds.HasValue) - AddInternal(new HoverClickSounds(hoverSounds.Value) { Enabled = { BindTarget = Enabled } }); } [BackgroundDependencyLoader] diff --git a/osu.Game/Graphics/UserInterface/OsuDropdown.cs b/osu.Game/Graphics/UserInterface/OsuDropdown.cs index b530172f3ee1..4a4ec2e67d25 100644 --- a/osu.Game/Graphics/UserInterface/OsuDropdown.cs +++ b/osu.Game/Graphics/UserInterface/OsuDropdown.cs @@ -4,7 +4,6 @@ using System.Linq; using osu.Framework.Allocation; using osu.Framework.Audio; -using osu.Framework.Audio.Sample; using osu.Framework.Extensions.Color4Extensions; using osu.Framework.Graphics; using osu.Framework.Graphics.Containers; @@ -36,9 +35,6 @@ protected partial class OsuDropdownMenu : DropdownMenu, IKeyBindingHandler State == MenuState.Open; - private Sample? sampleOpen; - private Sample? sampleClose; - // todo: this uses the same styling as OsuMenu. hopefully we can just use OsuMenu in the future with some refactoring public OsuDropdownMenu() { @@ -57,9 +53,6 @@ private void load(OverlayColourProvider? colourProvider, OsuColour colours, Audi BackgroundColour = colourProvider?.Background5 ?? Color4.Black.Opacity(0.5f); HoverColour = colourProvider?.Light4 ?? colours.PinkDarker; SelectionColour = colourProvider?.Background3 ?? colours.PinkDarker.Opacity(0.5f); - - sampleOpen = audio.Samples.Get(@"UI/dropdown-open"); - sampleClose = audio.Samples.Get(@"UI/dropdown-close"); } // todo: this shouldn't be required after https://github.com/ppy/osu-framework/issues/4519 is fixed. @@ -70,7 +63,6 @@ protected override void AnimateOpen() { wasOpened = true; this.FadeIn(300, Easing.OutQuint); - sampleOpen?.Play(); } protected override void AnimateClose() @@ -78,7 +70,6 @@ protected override void AnimateClose() if (wasOpened) { this.FadeOut(300, Easing.OutQuint); - sampleClose?.Play(); } } diff --git a/osu.Game/Graphics/UserInterface/OsuTextBox.cs b/osu.Game/Graphics/UserInterface/OsuTextBox.cs index 04ecfa7e9aed..9e28d14c79fa 100644 --- a/osu.Game/Graphics/UserInterface/OsuTextBox.cs +++ b/osu.Game/Graphics/UserInterface/OsuTextBox.cs @@ -93,16 +93,6 @@ private void load(OverlayColourProvider? colourProvider, OsuColour colour, Audio sampleMap = new Dictionary { - { FeedbackSampleType.TextAdd, textAddedSamples }, - { FeedbackSampleType.TextAddCaps, new[] { audio.Samples.Get(@"Keyboard/key-caps") } }, - { FeedbackSampleType.TextRemove, new[] { audio.Samples.Get(@"Keyboard/key-delete") } }, - { FeedbackSampleType.TextConfirm, new[] { audio.Samples.Get(@"Keyboard/key-confirm") } }, - { FeedbackSampleType.TextInvalid, new[] { audio.Samples.Get(@"Keyboard/key-invalid") } }, - { FeedbackSampleType.CaretMove, new[] { audio.Samples.Get(@"Keyboard/key-movement") } }, - { FeedbackSampleType.SelectCharacter, new[] { audio.Samples.Get(@"Keyboard/select-char") } }, - { FeedbackSampleType.SelectWord, new[] { audio.Samples.Get(@"Keyboard/select-word") } }, - { FeedbackSampleType.SelectAll, new[] { audio.Samples.Get(@"Keyboard/select-all") } }, - { FeedbackSampleType.Deselect, new[] { audio.Samples.Get(@"Keyboard/deselect") } } }; }