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

Add support for hit explosions

Browse Source
This commit is contained in:
smoogipoo
2020-04-27 12:23:53 +09:00
parent 81df22d2a7
commit 7dc090cc24
4 changed files with 31 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs
View File

@ -10,7 +10,6 @@ using osu.Game.Graphics;
using osu.Game.Rulesets.Objects.Drawables;
using osu.Game.Rulesets.Judgements;
using osu.Game.Rulesets.Objects;
using osu.Game.Rulesets.Scoring;
using osu.Game.Rulesets.UI;
using osu.Game.Rulesets.UI.Scrolling;
using osu.Game.Rulesets.Taiko.Objects.Drawables;
@ -197,8 +196,13 @@ namespace osu.Game.Rulesets.Taiko.UI
break;
case TaikoDrumRollTickJudgement _:
if (result.IsHit)
playDrumrollHit((DrawableDrumRollTick)judgedObject);
if (!result.IsHit)
return;
var drawableTick = (DrawableDrumRollTick)judgedObject;
addDrumRollHit(drawableTick);
addExplosion(drawableTick, drawableTick.JudgementType);
break;
default:
@ -213,25 +217,19 @@ namespace osu.Game.Rulesets.Taiko.UI
if (!result.IsHit)
break;
bool isRim = (judgedObject.HitObject as Hit)?.Type == HitType.Rim;
hitExplosionContainer.Add(new HitExplosion(judgedObject, isRim));
if (judgedObject.HitObject.Kiai)
kiaiExplosionContainer.Add(new KiaiHitExplosion(judgedObject, isRim));
addExplosion(judgedObject, (judgedObject.HitObject as Hit)?.Type ?? HitType.Centre);
break;
}
}
private void playDrumrollHit(DrawableDrumRollTick drumrollTick)
private void addDrumRollHit(DrawableDrumRollTick drawableTick)
{
TaikoAction action = drumrollTick.JudgedAction;
bool isStrong = drumrollTick.HitObject.IsStrong;
double time = drumrollTick.HitObject.GetEndTime();
bool isStrong = drawableTick.HitObject.IsStrong;
double time = drawableTick.HitObject.GetEndTime();
DrawableHit drawableHit;
if (action == TaikoAction.LeftRim || action == TaikoAction.RightRim)
if (drawableTick.JudgementType == HitType.Rim)
drawableHit = new DrawableFlyingRimHit(time, isStrong);
else
drawableHit = new DrawableFlyingCentreHit(time, isStrong);
@ -239,6 +237,14 @@ namespace osu.Game.Rulesets.Taiko.UI
drumRollHitContainer.Add(drawableHit);
}
private void addExplosion(DrawableHitObject drawableObject, HitType type)
{
hitExplosionContainer.Add(new HitExplosion(drawableObject, type));
if (drawableObject.HitObject.Kiai)
kiaiExplosionContainer.Add(new KiaiHitExplosion(drawableObject, type));
}
private class ProxyContainer : LifetimeManagementContainer
{
public new MarginPadding Padding