mirror of https://github.com/ppy/osu
Rename bash -> swell.
This commit is contained in:
parent
a7cea811f4
commit
e7941859e4
|
@ -61,7 +61,7 @@ private TaikoHitObject convertHitObject(HitObject original)
|
|||
if (endTimeData != null)
|
||||
{
|
||||
// We compute the end time manually to add in the Bash convert factor
|
||||
return new Bash
|
||||
return new Swell
|
||||
{
|
||||
StartTime = original.StartTime,
|
||||
Sample = original.Sample,
|
||||
|
|
|
@ -10,7 +10,7 @@
|
|||
|
||||
namespace osu.Game.Modes.Taiko.Objects.Drawable
|
||||
{
|
||||
public class DrawableBash : DrawableTaikoHitObject
|
||||
public class DrawableSwell : DrawableTaikoHitObject
|
||||
{
|
||||
/// <summary>
|
||||
/// A list of keys which this HitObject will accept. These are the standard Taiko keys for now.
|
||||
|
@ -19,16 +19,16 @@ public class DrawableBash : DrawableTaikoHitObject
|
|||
private List<Key> validKeys { get; } = new List<Key>(new[] { Key.D, Key.F, Key.J, Key.K });
|
||||
|
||||
/// <summary>
|
||||
/// The amount of times the user has hit this bash.
|
||||
/// The amount of times the user has hit this swell.
|
||||
/// </summary>
|
||||
private int userHits;
|
||||
|
||||
private readonly Bash bash;
|
||||
private readonly Swell swell;
|
||||
|
||||
public DrawableBash(Bash bash)
|
||||
: base(bash)
|
||||
public DrawableSwell(Swell swell)
|
||||
: base(swell)
|
||||
{
|
||||
this.bash = bash;
|
||||
this.swell = swell;
|
||||
}
|
||||
|
||||
protected override void CheckJudgement(bool userTriggered)
|
||||
|
@ -40,7 +40,7 @@ protected override void CheckJudgement(bool userTriggered)
|
|||
|
||||
userHits++;
|
||||
|
||||
if (userHits == bash.RequiredHits)
|
||||
if (userHits == swell.RequiredHits)
|
||||
{
|
||||
Judgement.Result = HitResult.Hit;
|
||||
Judgement.TaikoResult = TaikoHitResult.Great;
|
||||
|
@ -51,7 +51,7 @@ protected override void CheckJudgement(bool userTriggered)
|
|||
if (Judgement.TimeOffset < 0)
|
||||
return;
|
||||
|
||||
if (userHits > bash.RequiredHits / 2)
|
||||
if (userHits > swell.RequiredHits / 2)
|
||||
{
|
||||
Judgement.Result = HitResult.Hit;
|
||||
Judgement.TaikoResult = TaikoHitResult.Good;
|
|
@ -8,14 +8,14 @@
|
|||
|
||||
namespace osu.Game.Modes.Taiko.Objects
|
||||
{
|
||||
public class Bash : TaikoHitObject, IHasEndTime
|
||||
public class Swell : TaikoHitObject, IHasEndTime
|
||||
{
|
||||
public double EndTime { get; set; }
|
||||
|
||||
public double Duration => EndTime - StartTime;
|
||||
|
||||
/// <summary>
|
||||
/// The number of hits required to complete the bash successfully.
|
||||
/// The number of hits required to complete the swell successfully.
|
||||
/// </summary>
|
||||
public int RequiredHits { get; protected set; }
|
||||
|
|
@ -165,7 +165,7 @@ protected override void ComputeTargets(Beatmap<TaikoHitObject> beatmap)
|
|||
SecondHit = obj.Accented
|
||||
});
|
||||
}
|
||||
else if (obj is Bash)
|
||||
else if (obj is Swell)
|
||||
{
|
||||
AddJudgement(new TaikoJudgement
|
||||
{
|
||||
|
|
|
@ -52,9 +52,9 @@
|
|||
<Compile Include="Judgements\TaikoDrumRollTickJudgement.cs" />
|
||||
<Compile Include="Judgements\TaikoJudgement.cs" />
|
||||
<Compile Include="Judgements\TaikoHitResult.cs" />
|
||||
<Compile Include="Objects\Bash.cs" />
|
||||
<Compile Include="Objects\Swell.cs" />
|
||||
<Compile Include="Objects\Drawable\Pieces\AccentedCirclePiece.cs" />
|
||||
<Compile Include="Objects\Drawable\DrawableBash.cs" />
|
||||
<Compile Include="Objects\Drawable\DrawableSwell.cs" />
|
||||
<Compile Include="Objects\Drawable\DrawableTaikoHitObject.cs" />
|
||||
<Compile Include="Objects\DrumRoll.cs" />
|
||||
<Compile Include="Objects\DrumRollTick.cs" />
|
||||
|
|
Loading…
Reference in New Issue