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

Rename SelectedMods -> Mods

Browse Source
This commit is contained in:
smoogipoo
2019-04-10 12:03:57 +09:00
parent 1c952e58cc
commit 4310f07a5c
26 changed files with 55 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
osu.Game/Screens/Select/MatchSongSelect.cs
View File

@ -42,7 +42,7 @@ namespace osu.Game.Screens.Select
RulesetID = Ruleset.Value.ID ?? 0
};
item.RequiredMods.AddRange(SelectedMods.Value);
item.RequiredMods.AddRange(Mods.Value);
Selected?.Invoke(item);
@ -61,12 +61,12 @@ namespace osu.Game.Screens.Select
{
Ruleset.Value = CurrentItem.Value.Ruleset;
Beatmap.Value = beatmaps.GetWorkingBeatmap(CurrentItem.Value.Beatmap);
SelectedMods.Value = CurrentItem.Value.RequiredMods ?? Enumerable.Empty<Mod>();
Mods.Value = CurrentItem.Value.RequiredMods ?? Enumerable.Empty<Mod>();
}
Beatmap.Disabled = true;
Ruleset.Disabled = true;
SelectedMods.Disabled = true;
Mods.Disabled = true;
return false;
}
@ -77,7 +77,7 @@ namespace osu.Game.Screens.Select
Beatmap.Disabled = false;
Ruleset.Disabled = false;
SelectedMods.Disabled = false;
Mods.Disabled = false;
}
}
}

4
osu.Game/Screens/Select/PlaySongSelect.cs
View File

@ -52,10 +52,10 @@ namespace osu.Game.Screens.Select
var auto = Ruleset.Value.CreateInstance().GetAutoplayMod();
var autoType = auto.GetType();
var mods = SelectedMods.Value;
var mods = Mods.Value;
if (mods.All(m => m.GetType() != autoType))
{
SelectedMods.Value = mods.Append(auto);
Mods.Value = mods.Append(auto);
removeAutoModOnResume = true;
}
}

10
osu.Game/Screens/Select/SongSelect.cs
View File

@ -85,7 +85,7 @@ namespace osu.Game.Screens.Select
[Cached]
[Cached(Type = typeof(IBindable<IEnumerable<Mod>>))]
private readonly Bindable<IEnumerable<Mod>> selectedMods = new Bindable<IEnumerable<Mod>>(Enumerable.Empty<Mod>()); // Bound to the game's mods, but is not reset on exiting
private readonly Bindable<IEnumerable<Mod>> mods = new Bindable<IEnumerable<Mod>>(Enumerable.Empty<Mod>()); // Bound to the game's mods, but is not reset on exiting
protected SongSelect()
{
@ -219,7 +219,7 @@ namespace osu.Game.Screens.Select
[BackgroundDependencyLoader(true)]
private void load(BeatmapManager beatmaps, AudioManager audio, DialogOverlay dialog, OsuColour colours, SkinManager skins)
{
selectedMods.BindTo(SelectedMods);
mods.BindTo(Mods);
if (Footer != null)
{
@ -394,7 +394,7 @@ namespace osu.Game.Screens.Select
{
Logger.Log($"ruleset changed from \"{decoupledRuleset.Value}\" to \"{ruleset}\"");
selectedMods.Value = Enumerable.Empty<Mod>();
mods.Value = Enumerable.Empty<Mod>();
decoupledRuleset.Value = ruleset;
// force a filter before attempting to change the beatmap.
@ -529,8 +529,8 @@ namespace osu.Game.Screens.Select
if (Beatmap.Value.Track != null)
Beatmap.Value.Track.Looping = false;
selectedMods.UnbindAll();
SelectedMods.Value = Enumerable.Empty<Mod>();
mods.UnbindAll();
Mods.Value = Enumerable.Empty<Mod>();
return false;
}