sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-07-01 16:29:58 +09:00
Code Issues Packages Projects Releases Wiki Activity

Make hitobjects only have one judgement + result

Browse Source
This commit is contained in:
smoogipoo
2018-08-03 15:38:48 +09:00
parent 0da6c8c1a7
commit 2a4994e5ce
29 changed files with 66 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
osu.Game/Rulesets/Objects/HitObject.cs
View File

@ -3,7 +3,6 @@
using System;
using System.Collections.Generic;
using System.Linq;
using Newtonsoft.Json;
using osu.Framework.Extensions.IEnumerableExtensions;
using osu.Framework.Lists;
@ -64,8 +63,7 @@ namespace osu.Game.Rulesets.Objects
[JsonIgnore]
public IReadOnlyList<HitObject> NestedHitObjects => nestedHitObjects.Value;
private readonly List<Judgement> judgements = new List<Judgement>();
public IReadOnlyList<Judgement> Judgements => judgements;
public Judgement Judgement { get; private set; }
/// <summary>
/// Applies default values to this HitObject.
@ -76,8 +74,7 @@ namespace osu.Game.Rulesets.Objects
{
ApplyDefaultsToSelf(controlPointInfo, difficulty);
judgements.Clear();
judgements.AddRange(CreateJudgements());
Judgement = CreateJudgement();
if (nestedHitObjects.IsValueCreated)
nestedHitObjects.Value.Clear();
@ -111,7 +108,7 @@ namespace osu.Game.Rulesets.Objects
{
}
protected virtual IEnumerable<Judgement> CreateJudgements() => Enumerable.Empty<Judgement>();
protected virtual Judgement CreateJudgement() => null;
protected void AddNested(HitObject hitObject) => nestedHitObjects.Value.Add(hitObject);