h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-11-11 12:17:26 +08:00
Code Issues Releases Wiki Activity

Rename bash -> swell.

Browse Source
This commit is contained in:
smoogipooo 2017-03-25 20:57:49 +09:00
parent a7cea811f4
commit e7941859e4
5 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osu.Game.Modes.Taiko/Beatmaps/TaikoBeatmapConverter.cs
View File

@ -61,7 +61,7 @@ namespace osu.Game.Modes.Taiko.Beatmaps
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,

16
osu.Game.Modes.Taiko/Objects/Drawable/DrawableBash.cs → osu.Game.Modes.Taiko/Objects/Drawable/DrawableSwell.cs
View File

@ -10,7 +10,7 @@ using System;
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 @@ namespace osu.Game.Modes.Taiko.Objects.Drawable
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 @@ namespace osu.Game.Modes.Taiko.Objects.Drawable
userHits++;
if (userHits == bash.RequiredHits)
if (userHits == swell.RequiredHits)
{
Judgement.Result = HitResult.Hit;
Judgement.TaikoResult = TaikoHitResult.Great;
@ -51,7 +51,7 @@ namespace osu.Game.Modes.Taiko.Objects.Drawable
if (Judgement.TimeOffset < 0)
return;
if (userHits > bash.RequiredHits / 2)
if (userHits > swell.RequiredHits / 2)
{
Judgement.Result = HitResult.Hit;
Judgement.TaikoResult = TaikoHitResult.Good;

4
osu.Game.Modes.Taiko/Objects/Bash.cs → osu.Game.Modes.Taiko/Objects/Swell.cs
View File

@ -8,14 +8,14 @@ using osu.Game.Modes.Objects.Types;
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; }

2
osu.Game.Modes.Taiko/Scoring/TaikoScoreProcessor.cs
View File

@ -165,7 +165,7 @@ namespace osu.Game.Modes.Taiko.Scoring
SecondHit = obj.Accented
});
}
else if (obj is Bash)
else if (obj is Swell)
{
AddJudgement(new TaikoJudgement
{

4
osu.Game.Modes.Taiko/osu.Game.Modes.Taiko.csproj
View File

@ -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" />