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

Refactors/renames

Browse Source
This commit is contained in:
Dean Herbert
2018-11-30 16:11:09 +09:00
parent 831cd3ed59
commit 3727955911
11 changed files with 77 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
osu.Game/Online/API/Requests/GetScoresRequest.cs
View File

@ -34,7 +34,7 @@ namespace osu.Game.Online.API.Requests
private void onSuccess(APIScores r)
{
foreach (APIScoreInfo score in r.Scores)
score.ApplyBeatmap(beatmap);
score.Beatmap = beatmap;
}
protected override WebRequest CreateWebRequest()

34
osu.Game/Online/API/Requests/Responses/APIScoreInfo.cs
View File

@ -33,9 +33,6 @@ namespace osu.Game.Online.API.Requests.Responses
set => User = value;
}
[JsonProperty(@"mode_int")]
public int OnlineRulesetID { get; set; }
[JsonProperty(@"score_id")]
private long onlineScoreID
{
@ -51,7 +48,7 @@ namespace osu.Game.Online.API.Requests.Responses
[JsonProperty(@"beatmap")]
private BeatmapInfo beatmap
{
set => BeatmapInfo = value;
set => Beatmap = value;
}
[JsonProperty(@"beatmapset")]
@ -60,10 +57,10 @@ namespace osu.Game.Online.API.Requests.Responses
set
{
// extract the set ID to its correct place.
BeatmapInfo.BeatmapSet = new BeatmapSetInfo { OnlineBeatmapSetID = value.ID };
Beatmap.BeatmapSet = new BeatmapSetInfo { OnlineBeatmapSetID = value.ID };
value.ID = 0;
BeatmapInfo.Metadata = value;
Beatmap.Metadata = value;
}
}
@ -98,21 +95,32 @@ namespace osu.Game.Online.API.Requests.Responses
}
}
[JsonProperty(@"mode_int")]
public int OnlineRulesetID { get; set; }
[JsonProperty(@"mods")]
private string[] modStrings { get; set; }
public void ApplyBeatmap(BeatmapInfo beatmap)
public override BeatmapInfo Beatmap
{
BeatmapInfo = beatmap;
ApplyRuleset(beatmap.Ruleset);
get => base.Beatmap;
set
{
base.Beatmap = value;
Ruleset = value.Ruleset;
}
}
public void ApplyRuleset(RulesetInfo ruleset)
public override RulesetInfo Ruleset
{
Ruleset = ruleset;
get => base.Ruleset;
set
{
base.Ruleset = value;
// Evaluate the mod string
Mods = Ruleset.CreateInstance().GetAllMods().Where(mod => modStrings.Contains(mod.ShortenedName)).ToArray();
// Evaluate the mod string
Mods = Ruleset.CreateInstance().GetAllMods().Where(mod => modStrings.Contains(mod.ShortenedName)).ToArray();
}
}
}
}