Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump ppy.osu.Game from 2024.718.0 to 2024.816.0 #384

Merged
merged 2 commits into from
Aug 17, 2024
Merged

Bump ppy.osu.Game from 2024.718.0 to 2024.816.0 #384

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b2b4baa
Bump ppy.osu.Game from 2024.718.0 to 2024.816.0
dependabot[bot] Aug 16, 2024
fb6a46a
Update to accommodate lazer update
LumpBloom7 Aug 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 0 additions & 6 deletions osu.Game.Rulesets.Rush/Objects/Drawables/DrawableRushJudgement.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,6 @@ public partial class DrawableRushJudgement : DrawableJudgement
private const float judgement_movement = 300;

public DrawableRushJudgement()
: this(null, null)
{
}

public DrawableRushJudgement(JudgementResult result, DrawableRushHitObject judgedObject)
: base(result, judgedObject)
{
Anchor = Anchor.Centre;
Origin = Anchor.Centre;
Expand Down
12 changes: 9 additions & 3 deletions osu.Game.Rulesets.Rush/UI/RushPlayfield.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@
using osu.Game.Rulesets.Rush.Objects.Drawables;
using osu.Game.Rulesets.Rush.UI.Fever;
using osu.Game.Rulesets.Rush.UI.Ground;
using osu.Game.Rulesets.Scoring;
using osu.Game.Rulesets.UI;
using osu.Game.Rulesets.UI.Scrolling;
using osuTK;

Expand Down Expand Up @@ -62,7 +64,7 @@ public IEnumerable<DrawableHitObject> AllAliveHitObjects
}
}

private DrawablePool<DrawableRushJudgement> judgementPool;
private JudgementPooler<DrawableRushJudgement> judgementPool;
private DrawablePool<DefaultHitExplosion> explosionPool;
private DrawablePool<StarSheetHitExplosion> sheetExplosionPool;
private DrawablePool<HeartHitExplosion> heartExplosionPool;
Expand Down Expand Up @@ -126,7 +128,11 @@ private void load()

AddRangeInternal(new Drawable[]
{
judgementPool = new DrawablePool<DrawableRushJudgement>(5),
judgementPool = new JudgementPooler<DrawableRushJudgement>(new[]{
HitResult.Great,
HitResult.Good,
HitResult.Miss
}),
explosionPool = new DrawablePool<DefaultHitExplosion>(15),
sheetExplosionPool = new DrawablePool<StarSheetHitExplosion>(10),
heartExplosionPool = new DrawablePool<HeartHitExplosion>(2),
Expand Down Expand Up @@ -201,7 +207,7 @@ private void onNewResult(DrawableHitObject judgedObject, JudgementResult result)
// Display judgement results in a drawable for objects that allow it.
if (rushJudgedObject.DisplayResult)
{
DrawableRushJudgement judgementDrawable = judgementPool.Get(j => j.Apply(result, judgedObject));
DrawableRushJudgement judgementDrawable = judgementPool.Get(result.Type, j => j.Apply(result, judgedObject));
LanedHitLane judgementLane = LanedHitLane.Air;

// TODO: showing judgements based on the judged object suggests that
Expand Down
2 changes: 1 addition & 1 deletion osu.Game.Rulesets.Rush/osu.Game.Rulesets.Rush.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,6 @@
</EmbeddedResource>
</ItemGroup>
<ItemGroup>
<PackageReference Include="ppy.osu.Game" Version="2024.718.0" />
<PackageReference Include="ppy.osu.Game" Version="2024.816.0" />
</ItemGroup>
</Project>
Loading