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

Handle type/strength changes from samples changes

Browse Source
This commit is contained in:
Dean Herbert
2020-09-23 18:09:40 +09:00
parent 8f3eb9a422
commit 9a0e5ac154
5 changed files with 43 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableHit.cs
View File

@ -61,19 +61,29 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
});
}
private HitSampleInfo[] rimSamples => HitObject.Samples.Where(s => s.Name == HitSampleInfo.HIT_CLAP || s.Name == HitSampleInfo.HIT_WHISTLE).ToArray();
protected override void LoadSamples(bool changed)
{
base.LoadSamples(changed);
if (changed)
type.Value = rimSamples.Any() ? HitType.Rim : HitType.Centre;
}
private void updateSamplesFromTypeChange()
{
var rimSamples = HitObject.Samples.Where(s => s.Name == HitSampleInfo.HIT_CLAP || s.Name == HitSampleInfo.HIT_WHISTLE).ToArray();
var samples = rimSamples;
bool isRimType = HitObject.Type == HitType.Rim;
if (isRimType != rimSamples.Any())
if (isRimType != samples.Any())
{
if (isRimType)
HitObject.Samples.Add(new HitSampleInfo { Name = HitSampleInfo.HIT_CLAP });
else
{
foreach (var sample in rimSamples)
foreach (var sample in samples)
HitObject.Samples.Remove(sample);
}
}

30
osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableTaikoHitObject.cs
View File

@ -1,19 +1,19 @@
// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
// See the LICENCE file in the repository root for full licence text.
using osu.Framework.Graphics;
using osu.Framework.Input.Bindings;
using osu.Game.Rulesets.Objects.Drawables;
using osuTK;
using System.Linq;
using osu.Game.Audio;
using System.Collections.Generic;
using System.Linq;
using osu.Framework.Allocation;
using osu.Framework.Bindables;
using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Primitives;
using osu.Framework.Input.Bindings;
using osu.Game.Audio;
using osu.Game.Rulesets.Objects;
using osu.Game.Rulesets.Objects.Drawables;
using osu.Game.Skinning;
using osuTK;
namespace osu.Game.Rulesets.Taiko.Objects.Drawables
{
@ -152,17 +152,27 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
RecreatePieces();
}
private HitSampleInfo[] strongSamples => HitObject.Samples.Where(s => s.Name == HitSampleInfo.HIT_FINISH).ToArray();
protected override void LoadSamples(bool changed)
{
base.LoadSamples(changed);
if (changed)
isStrong.Value = strongSamples.Any();
}
private void updateSamplesFromStrong()
{
var strongSamples = HitObject.Samples.Where(s => s.Name == HitSampleInfo.HIT_FINISH).ToArray();
var samples = strongSamples;
if (isStrong.Value != strongSamples.Any())
if (isStrong.Value != samples.Any())
{
if (isStrong.Value)
HitObject.Samples.Add(new HitSampleInfo { Name = HitSampleInfo.HIT_FINISH });
else
{
foreach (var sample in strongSamples)
foreach (var sample in samples)
HitObject.Samples.Remove(sample);
}
}
@ -174,8 +184,6 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
MainPiece?.Expire();
Content.Add(MainPiece = CreateMainPiece());
LoadSamples();
}
protected override void AddNestedHitObject(DrawableHitObject hitObject)