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

Make all juice nested objects from ticks

Browse Source
This commit is contained in:
Dean Herbert
2017-10-11 19:10:07 +09:00
parent 1f1bdc6162
commit 1b732c799a
2 changed files with 27 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
osu.Game.Rulesets.Catch/Objects/JuiceStream.cs
View File

@ -41,7 +41,7 @@ namespace osu.Game.Rulesets.Catch.Objects
TickDistance = scoringDistance / difficulty.SliderTickRate;
}
public IEnumerable<Droplet> Ticks
public IEnumerable<CatchBaseHit> Ticks
{
get
{
@ -53,8 +53,13 @@ namespace osu.Game.Rulesets.Catch.Objects
var minDistanceFromEnd = Velocity * 0.01;
// temporary
while (tickDistance > 100) tickDistance /= 2;
yield return new Fruit
{
Samples = Samples,
ComboColour = ComboColour,
StartTime = StartTime,
X = X
};
for (var repeat = 0; repeat < RepeatCount; repeat++)
{
@ -66,8 +71,10 @@ namespace osu.Game.Rulesets.Catch.Objects
if (d > length - minDistanceFromEnd)
break;
var distanceProgress = d / length;
var timeProgress = reversed ? 1 - distanceProgress : distanceProgress;
var timeProgress = d / length;
var distanceProgress = reversed ? 1 - timeProgress : timeProgress;
float tinyDroplet = 0;
yield return new Droplet
{
@ -81,6 +88,14 @@ namespace osu.Game.Rulesets.Catch.Objects
}))
};
}
yield return new Fruit
{
Samples = Samples,
ComboColour = ComboColour,
StartTime = repeatStartTime + repeatDuration,
X = Curve.PositionAt(reversed ? 1 : 0).X
};
}
}
}