sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-08-04 07:06:35 +09:00
Code Issues Packages Projects Releases Wiki Activity

Disallow starting gameplay if there's not enough time in the room

Browse Source
This commit is contained in:
smoogipoo
2018-12-19 10:52:15 +09:00
parent 1051584f0f
commit 2c000a9a1d
5 changed files with 49 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
osu.Game/Screens/Multi/Match/Components/Info.cs
View File

@ -36,7 +36,7 @@ namespace osu.Game.Screens.Multi.Match.Components
public readonly Bindable<GameType> Type = new Bindable<GameType>();
public readonly Bindable<IEnumerable<Mod>> Mods = new Bindable<IEnumerable<Mod>>();
public Info()
public Info(Room room)
{
RelativeSizeAxes = Axes.X;
AutoSizeAxes = Axes.Y;
@ -106,7 +106,7 @@ namespace osu.Game.Screens.Multi.Match.Components
Children = new Drawable[]
{
viewBeatmapButton = new ViewBeatmapButton(),
readyButton = new ReadyButton
readyButton = new ReadyButton(room)
{
Action = () => OnStart?.Invoke()
}

49
osu.Game/Screens/Multi/Match/Components/ReadyButton.cs
View File

@ -1,11 +1,13 @@
// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
using System;
using System.Linq;
using osu.Framework.Allocation;
using osu.Framework.Configuration;
using osu.Framework.Graphics;
using osu.Game.Beatmaps;
using osu.Game.Online.Multiplayer;
using osuTK;
namespace osu.Game.Screens.Multi.Match.Components
@ -14,11 +16,19 @@ namespace osu.Game.Screens.Multi.Match.Components
{
public readonly IBindable<BeatmapInfo> Beatmap = new Bindable<BeatmapInfo>();
private readonly Room room;
[Resolved]
private IBindableBeatmap gameBeatmap { get; set; }
[Resolved]
private BeatmapManager beatmaps { get; set; }
public ReadyButton()
private bool hasBeatmap;
public ReadyButton(Room room)
{
this.room = room;
RelativeSizeAxes = Axes.Y;
Size = new Vector2(200, 1);
@ -30,24 +40,43 @@ namespace osu.Game.Screens.Multi.Match.Components
{
beatmaps.ItemAdded += beatmapAdded;
Beatmap.BindValueChanged(updateEnabledState, true);
Beatmap.BindValueChanged(updateBeatmap, true);
}
private void updateEnabledState(BeatmapInfo beatmap)
private void updateBeatmap(BeatmapInfo beatmap)
{
if (beatmap?.OnlineBeatmapID == null)
{
Enabled.Value = false;
return;
}
hasBeatmap = false;
Enabled.Value = beatmaps.QueryBeatmap(b => b.OnlineBeatmapID == beatmap.OnlineBeatmapID) != null;
if (beatmap?.OnlineBeatmapID == null)
return;
hasBeatmap = beatmaps.QueryBeatmap(b => b.OnlineBeatmapID == beatmap.OnlineBeatmapID) != null;
}
private void beatmapAdded(BeatmapSetInfo model, bool existing, bool silent)
{
if (model.Beatmaps.Any(b => b.OnlineBeatmapID == Beatmap.Value.OnlineBeatmapID))
Schedule(() => Enabled.Value = true);
Schedule(() => hasBeatmap = true);
}
protected override void Update()
{
base.Update();
updateEnabledState();
}
private void updateEnabledState()
{
if (gameBeatmap.Value == null)
{
Enabled.Value = false;
return;
}
bool hasEnoughTime = DateTimeOffset.UtcNow.AddSeconds(30).AddMilliseconds(gameBeatmap.Value.Track.Length) < room.EndDate;
Enabled.Value = hasBeatmap && hasEnoughTime;
}
protected override void Dispose(bool isDisposing)