Skip to content

Commit

Permalink
bump
Browse files Browse the repository at this point in the history
  • Loading branch information
Flutterish committed Nov 18, 2023
1 parent e8ad86d commit 65f8f70
Show file tree
Hide file tree
Showing 10 changed files with 24 additions and 25 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@
</PropertyGroup>
<ItemGroup Label="Package References">
<PackageReference Include="Appveyor.TestLogger" Version="2.0.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.2.0" />
<PackageReference Include="NUnit" Version="3.13.3" />
<PackageReference Include="NUnit3TestAdapter" Version="4.2.1" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
<PackageReference Include="NUnit" Version="3.14.0" />
<PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
<PackageReference Update="Microsoft.EntityFrameworkCore.Sqlite" Version="2.1.4" />
</ItemGroup>
<ItemGroup>
Expand Down
3 changes: 2 additions & 1 deletion osu.Game.Rulesets.Solosu/Mods/SolosuModAutopilot.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
using osu.Framework.Graphics.Sprites;
using osu.Framework.Localisation;
using osu.Game.Graphics;
using osu.Game.Rulesets.Mods;
using System;
Expand All @@ -7,7 +8,7 @@ namespace osu.Game.Rulesets.Solosu.Mods {
public class SolosuModAutopilot : Mod {
public override IconUsage? Icon => OsuIcon.ModAutopilot;
public override ModType Type => ModType.Automation;
public override string Description => "No need to move, just tap to the rhythm";
public override LocalisableString Description => "No need to move, just tap to the rhythm";
public override string Name => "Autopilot";
public override string Acronym => "AP";
public override double ScoreMultiplier => 1;
Expand Down
14 changes: 6 additions & 8 deletions osu.Game.Rulesets.Solosu/Mods/SolosuModAutoplay.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
using osu.Game.Beatmaps;
using osu.Framework.Localisation;
using osu.Game.Beatmaps;
using osu.Game.Online.API.Requests.Responses;
using osu.Game.Rulesets.Mods;
using osu.Game.Rulesets.Solosu.Replays;
Expand All @@ -8,13 +9,10 @@

namespace osu.Game.Rulesets.Solosu.Mods {
public class SolosuModAutoplay : ModAutoplay {
public override Score CreateReplayScore ( IBeatmap beatmap, IReadOnlyList<Mod> mods ) => new Score {
ScoreInfo = new ScoreInfo {
User = new APIUser { Username = "Autosu" },
},
Replay = new SolosuAutoGenerator( beatmap ).Generate(),
};
public override ModReplayData CreateReplayData ( IBeatmap beatmap, IReadOnlyList<Mod> mods ) => new( new SolosuAutoGenerator( beatmap ).Generate(), new() {
Username = "Autosu"
} );

public override string Description => SolosuRuleset.GetLocalisedHack( Localisation.ModStrings.AutoplayDescription );
public override LocalisableString Description => Localisation.ModStrings.AutoplayDescription;
}
}
5 changes: 3 additions & 2 deletions osu.Game.Rulesets.Solosu/Mods/SolosuModNoFail.cs
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
using osu.Game.Rulesets.Mods;
using osu.Framework.Localisation;
using osu.Game.Rulesets.Mods;

namespace osu.Game.Rulesets.Solosu.Mods {
public class SolosuModNoFail : ModNoFail {
public override string Description => SolosuRuleset.GetLocalisedHack( Localisation.ModStrings.NoFailDescription );
public override LocalisableString Description => Localisation.ModStrings.NoFailDescription;
}
}
5 changes: 3 additions & 2 deletions osu.Game.Rulesets.Solosu/Mods/SolosuModRelax.cs
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
using osu.Game.Rulesets.Mods;
using osu.Framework.Localisation;
using osu.Game.Rulesets.Mods;
using System;

namespace osu.Game.Rulesets.Solosu.Mods {
public class SolosuModRelax : ModRelax {
public override string Description => "No need to click, just follow the path";
public override LocalisableString Description => "No need to click, just follow the path";
public override Type[] IncompatibleMods => new[] { typeof( SolosuModAutopilot ), typeof( ModAutoplay ) };
public override bool HasImplementation => true;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,10 @@ protected override void OnApply () {
protected override void OnFree () {
base.OnFree();
foreach ( var i in parts ) {
RemoveInternal( i );
RemoveInternal( i, disposeImmediately: false );
}
parts.Clear();
foreach ( var i in bonuses ) RemoveInternal( i );
foreach ( var i in bonuses ) RemoveInternal( i, disposeImmediately: false );
bonuses.Clear();
}
protected override void AddNestedHitObject ( DrawableHitObject hitObject ) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ protected override void OnApply () {
List<DrawableBonus> bonuses = new();
protected override void OnFree () {
base.OnFree();
foreach ( var i in bonuses ) RemoveInternal( i );
foreach ( var i in bonuses ) RemoveInternal( i, disposeImmediately: false );
bonuses.Clear();
}
protected override void AddNestedHitObject ( DrawableHitObject hitObject ) {
Expand Down
6 changes: 3 additions & 3 deletions osu.Game.Rulesets.Solosu/SolosuRuleset.cs
Original file line number Diff line number Diff line change
Expand Up @@ -69,10 +69,10 @@ public override IEnumerable<KeyBinding> GetDefaultKeyBindings ( int variant = 0
protected override IEnumerable<HitResult> GetValidHitResults ()
=> results.Keys;

public override string GetDisplayNameForHitResult ( HitResult result )
=> GetLocalisedHack( results[ result ] ); // TODO this cant be localised yet
public override LocalisableString GetDisplayNameForHitResult ( HitResult result )
=> results[ result ];

public override StatisticRow[] CreateStatisticsForScore ( ScoreInfo score, IBeatmap playableBeatmap ) => new StatisticRow[]
public override StatisticItem[] CreateStatisticsForScore ( ScoreInfo score, IBeatmap playableBeatmap ) => new StatisticItem[]
{

};
Expand Down
2 changes: 0 additions & 2 deletions osu.Game.Rulesets.Solosu/UI/Wireframe.cs
Original file line number Diff line number Diff line change
Expand Up @@ -43,11 +43,9 @@ public void AddLine ( Vertice from, Vertice to, int segments ) {
[BackgroundDependencyLoader]
private void load ( ShaderManager shaders ) {
TextureShader = shaders.Load( VertexShaderDescriptor.TEXTURE_2, FragmentShaderDescriptor.TEXTURE );
RoundedTextureShader = shaders.Load( VertexShaderDescriptor.TEXTURE_2, FragmentShaderDescriptor.TEXTURE_ROUNDED );
}

public IShader TextureShader { get; protected set; }
public IShader RoundedTextureShader { get; protected set; }

protected override DrawNode CreateDrawNode ()
=> new WireframeDrawNode( this );
Expand Down
2 changes: 1 addition & 1 deletion osu.Game.Rulesets.Solosu/osu.Game.Rulesets.Solosu.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<EmbeddedResource Include="Resources\**" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="ppy.osu.Game" Version="2022.810.2" />
<PackageReference Include="ppy.osu.Game" Version="2023.1114.1" />
</ItemGroup>
<ItemGroup>
<Folder Include="Resources\Samples\Gameplay" />
Expand Down

0 comments on commit 65f8f70

Please sign in to comment.