h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-02-21 23:59:16 +08:00
Code Issues Releases Wiki Activity

Account for rate changing mods when disabling the "Ready" button

Browse Source
This commit is contained in:
Tim Schumacher 2024-11-30 15:19:35 +01:00
parent e92aa36f47
commit f4e155bfa6
1 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
osu.Game/Screens/OnlinePlay/Playlists/PlaylistsReadyButton.cs
View File

@ -2,6 +2,7 @@
// See the LICENCE file in the repository root for full licence text. // See the LICENCE file in the repository root for full licence text.
using System; using System;
using System.Collections.Generic;
using System.ComponentModel; using System.ComponentModel;
using System.Linq; using System.Linq;
using osu.Framework.Allocation; using osu.Framework.Allocation;
@ -10,7 +11,9 @@ using osu.Framework.Localisation;
using osu.Game.Beatmaps; using osu.Game.Beatmaps;
using osu.Game.Graphics; using osu.Game.Graphics;
using osu.Game.Online.Rooms; using osu.Game.Online.Rooms;
using osu.Game.Rulesets.Mods;
using osu.Game.Screens.OnlinePlay.Components; using osu.Game.Screens.OnlinePlay.Components;
using osu.Game.Utils;
namespace osu.Game.Screens.OnlinePlay.Playlists namespace osu.Game.Screens.OnlinePlay.Playlists
{ {
@ -19,6 +22,9 @@ namespace osu.Game.Screens.OnlinePlay.Playlists
[Resolved] [Resolved]
private IBindable<WorkingBeatmap> gameBeatmap { get; set; } = null!; private IBindable<WorkingBeatmap> gameBeatmap { get; set; } = null!;
[Resolved]
private IBindable<IReadOnlyList<Mod>> mods { get; set; } = null!;
private readonly Room room; private readonly Room room;
public PlaylistsReadyButton(Room room) public PlaylistsReadyButton(Room room)
@ -63,14 +69,14 @@ namespace osu.Game.Screens.OnlinePlay.Playlists
{ {
base.Update(); base.Update();
Enabled.Value = hasRemainingAttempts && enoughTimeLeft; Enabled.Value = hasRemainingAttempts && enoughTimeLeft();
} }
public override LocalisableString TooltipText public override LocalisableString TooltipText
{ {
get get
{ {
if (!enoughTimeLeft) if (!enoughTimeLeft())
return "No time left!"; return "No time left!";
if (!hasRemainingAttempts) if (!hasRemainingAttempts)
@ -80,9 +86,16 @@ namespace osu.Game.Screens.OnlinePlay.Playlists
} }
} }
private bool enoughTimeLeft => private bool enoughTimeLeft()
{
// this doesn't consider mods which apply variable rates, yet.
double rate = ModUtils.CalculateRateWithMods(mods.Value);
double hitLength = Math.Round(gameBeatmap.Value.Track.Length / rate);
// This should probably consider the length of the currently selected item, rather than a constant 30 seconds. // This should probably consider the length of the currently selected item, rather than a constant 30 seconds.
room.EndDate != null && DateTimeOffset.UtcNow.AddSeconds(30).AddMilliseconds(gameBeatmap.Value.Track.Length) < room.EndDate; return room.EndDate != null && DateTimeOffset.UtcNow.AddSeconds(30).AddMilliseconds(hitLength) < room.EndDate;
}
protected override void Dispose(bool isDisposing) protected override void Dispose(bool isDisposing)
{ {