Merge branch 'master' into BreakTouch

.vscode/launch.json

@@ -7,7 +7,7 @@
  "request": "launch",
  "program": "dotnet",
  "args": [
- "${workspaceRoot}/osu.Game.Rulesets.Sentakki.Tests/bin/Debug/net6.0/osu.Game.Rulesets.Sentakki.Tests.dll"
+ "${workspaceRoot}/osu.Game.Rulesets.Sentakki.Tests/bin/Debug/net8.0/osu.Game.Rulesets.Sentakki.Tests.dll"
  ],
  "cwd": "${workspaceRoot}",
  "preLaunchTask": "Build",

README.md

@@ -1,20 +1,30 @@
 ![sentakki](assets/logov3.png)
 
-# sentakki
-
+---
 [![.NET Core](https://github.com/LumpBloom7/sentakki/workflows/.NET%20Core/badge.svg)](https://github.com/LumpBloom7/sentakki/actions?query=workflow%3A%22.NET+Core%22)
 [![CodeFactor](https://www.codefactor.io/repository/github/lumpbloom7/sentakki/badge)](https://www.codefactor.io/repository/github/lumpbloom7/sentakki)
 [![Crowdin](https://badges.crowdin.net/sentakki/localized.svg)](https://crowdin.com/project/sentakki)
 [![Discord Shield](https://discordapp.com/api/guilds/700619421466624050/widget.png?style=shield)](https://discord.gg/CQPNADu)
 
 [![ko-fi](https://www.ko-fi.com/img/githubbutton_sm.svg)](https://ko-fi.com/E1E01N56M)
 
-An attempt to recreate Sega's maimai within osu!lazer, while making it more flexible.
+sentakki is a recreation of maimaiDX for use within osu, taking advantage of the longevity and the osu ecosystem for features such as multiplayer, beatmap listing, and leaderboards.
 
 ## Status
 
 All the essential note types have been implemented. Features like editor is being developed on the side, since lazer doesn't support third party ruleset editors yet. PP/diff calc haven't been given considered yet, and it is currently open to ideas.
 
+## Demo videos
+
+These charts have been ported from maimaiDX, but conversions of osu!std charts are also supported.
+|||
+|:---:|:---:|
+|<video src="https://github.com/LumpBloom7/sentakki/assets/12001167/20c5c1af-084b-478c-a8b3-2975c0672f42"/>|<video src="https://github.com/LumpBloom7/sentakki/assets/12001167/250ba2fe-e22f-48e8-8f64-aff91a7afe4b"/>|
+|<video src="https://github.com/LumpBloom7/sentakki/assets/12001167/a0170ef2-9472-4008-8ca2-b813c335c897"/>|<video src="https://github.com/LumpBloom7/sentakki/assets/12001167/58e9c427-6e14-4e08-bec9-e3a2c00ca7de"/>|
+
+
+
+
 ## Trying the ruleset
 
 Prebuilt binaries are provided for users who doesn't want to create a development environment. Releases are guaranteed to work with the latest version of lazer at the time of release.
@@ -32,7 +42,7 @@ Prebuilt binaries are provided for users who doesn't want to create a developmen
 
 Some prerequisites are required before attempting to debug or develop:
 
-* A desktop platform with the .NET 5 SDK or higher installed.
+* A desktop platform with the .NET 8 SDK or higher installed.
 * An IDE with support for C#, providing auto completion and syntax highlighting. I recommend using Visual Studio 2019 or Visual Studio Code.
 * Other requirements are shared with osu!lazer and osu!framework
 
@@ -47,7 +57,7 @@ cd sentakki
 
 To update the source code to the latest commit, run the following command inside the osu directory:
 
-```she
+```sh
 git pull
 ```
 

osu.Game.Rulesets.Sentakki.Tests/VisualTestRunner.cs

@@ -10,7 +10,7 @@ public static class VisualTestRunner
  [STAThread]
  public static int Main(string[] args)
  {
- using (DesktopGameHost host = Host.GetSuitableDesktopHost(@"osu", new HostOptions { BindIPC = true }))
+ using (DesktopGameHost host = Host.GetSuitableDesktopHost(@"osu"))
  {
  host.Run(new OsuTestBrowser());
  return 0;

osu.Game.Rulesets.Sentakki.Tests/osu.Game.Rulesets.Sentakki.Tests.csproj

@@ -10,17 +10,16 @@
  <AssemblyName>osu.Game.Rulesets.Sentakki.Tests</AssemblyName>
  </PropertyGroup>
  <ItemGroup Label="Package References">
- <PackageReference Include="Appveyor.TestLogger" Version="2.0.0"/>
- <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0"/>
- <PackageReference Include="NUnit" Version="3.13.3"/>
+ <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0"/>
+ <PackageReference Include="NUnit" Version="4.1.0"/>
  <PackageReference Include="NUnit3TestAdapter" Version="4.5.0"/>
  </ItemGroup>
  <ItemGroup>
  <ProjectReference Include="..\osu.Game.Rulesets.Sentakki\osu.Game.Rulesets.Sentakki.csproj"/>
  </ItemGroup>
  <PropertyGroup Label="Project">
  <OutputType>WinExe</OutputType>
- <TargetFramework>net6.0</TargetFramework>
+ <TargetFramework>net8.0</TargetFramework>
  <RootNamespace>osu.Game.Rulesets.Sentakki.Tests</RootNamespace>
  </PropertyGroup>
 </Project>

osu.Game.Rulesets.Sentakki/Beatmaps/Converter/SentakkiBeatmapConverter.Slider.cs

@@ -73,7 +73,7 @@ private SentakkiHitObject convertSlider(HitObject original)
  },
  Lane = lane.NormalizePath(),
  StartTime = original.StartTime,
- NodeSamples = nodeSamples,
+ Samples = nodeSamples.FirstOrDefault(),
  Break = headBreak
  };
 

osu.Game.Rulesets.Sentakki/Beatmaps/SentakkiBeatmapConverterOld.cs

@@ -310,7 +310,7 @@ private SentakkiHitObject createTouchNote(HitObject original)
  },
  Lane = noteLane,
  StartTime = original.StartTime,
- NodeSamples = samples,
+ Samples = samples.FirstOrDefault(),
  Break = hasBreakHead
  };
  }

osu.Game.Rulesets.Sentakki/Configuration/SentakkiRulesetConfigManager.cs

@@ -26,7 +26,6 @@ protected override void InitialiseDefaults()
  SetDefault(SentakkiRulesetSettings.LaneInputMode, LaneInputMode.Button);
  SetDefault(SentakkiRulesetSettings.SnakingSlideBody, true);
  SetDefault(SentakkiRulesetSettings.DetailedJudgements, false);
- SetDefault(SentakkiRulesetSettings.BreakSampleVolume, 1.0, 0.0, 1.0, 0.01);
  }
 
  public override TrackedSettings CreateTrackedSettings() => new TrackedSettings
@@ -50,6 +49,5 @@ public enum SentakkiRulesetSettings
  LaneInputMode,
  SnakingSlideBody,
  DetailedJudgements,
- BreakSampleVolume
  }
 }

osu.Game.Rulesets.Sentakki/Judgements/SentakkiJudgementResult.cs

@@ -20,5 +20,5 @@ public new HitResult Type
  }
  }
 
- public bool Critical { get; private set; }
+ public bool Critical { get; set; }
 }

osu.Game.Rulesets.Sentakki/Localisation/SentakkiSettingsSubsectionStrings.cs

@@ -43,7 +43,7 @@ public static class SentakkiSettingsSubsectionStrings
  /// <summary>
  /// "Touch note fade-in speed"
  /// </summary>
- public static LocalisableString TouchNoteFadeInSpeed => new TranslatableString(getKey(@"touch_note_fade_in_speed"), @"Touch note fade-in speed");
+ public static LocalisableString TouchNoteEntrySpeed => new TranslatableString(getKey(@"touch_note_entry_speed"), @"Touch note entry speed");
 
  /// <summary>
  /// "Ring Opacity"
@@ -58,11 +58,6 @@ public static class SentakkiSettingsSubsectionStrings
  public static LocalisableString LaneInputModeButton => new TranslatableString(getKey(@"lane_input_mode_button"), @"Button");
  public static LocalisableString LaneInputModeSensor => new TranslatableString(getKey(@"lane_input_mode_sensor"), @"Sensor");
 
- /// <summary>
- /// "Break sample volume"
- /// </summary>
- public static LocalisableString BreakSampleVolume => new TranslatableString(getKey(@"break_sample_volume"), @"Break sample volume");
-
  public static LocalisableString EntrySpeedTooltip(float speed, double time)
  => new TranslatableString(getKey(@"entry_speed_tooltip"), @"{0} ({1}ms)", speed > 10 ? Sonic : $"{speed:N2}", $"{time:N0}");
 

osu.Game.Rulesets.Sentakki/Mods/SentakkiModHardRock.cs

@@ -4,13 +4,15 @@
 using osu.Game.Configuration;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Objects;
+using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Rulesets.Sentakki.Localisation.Mods;
+using osu.Game.Rulesets.Sentakki.Objects.Drawables;
 using osu.Game.Rulesets.Sentakki.Scoring;
 
 namespace osu.Game.Rulesets.Sentakki.Mods
 {
- public class SentakkiModHardRock : ModHardRock, IApplicableToHitObject
+ public class SentakkiModHardRock : ModHardRock, IApplicableToHitObject, IApplicableToDrawableHitObject
  {
  public override double ScoreMultiplier => 1;
 
@@ -28,6 +30,9 @@ public override void ApplyToDifficulty(BeatmapDifficulty difficulty)
  [SettingSource(typeof(SentakkiModHardRockStrings), nameof(SentakkiModHardRockStrings.MinimumResult), nameof(SentakkiModHardRockStrings.MinimumResultDescription))]
  public Bindable<SentakkiHitResult> MinimumValidResult { get; } = new Bindable<SentakkiHitResult>(SentakkiHitResult.Good);
 
+ [SettingSource("Enable strict slider tracking")]
+ public Bindable<bool> StrictSliderTracking { get; } = new Bindable<bool>(false);
+
  public void ApplyToHitObject(HitObject hitObject)
  {
  // Nested HitObjects should get the same treatment
@@ -41,6 +46,14 @@ public void ApplyToHitObject(HitObject hitObject)
  shw.JudgementMode = JudgementMode.Value;
  }
 
+ public void ApplyToDrawableHitObject(DrawableHitObject drawable)
+ {
+ if (drawable is not DrawableSlideCheckpoint slideCheckpoint)
+ return;
+
+ slideCheckpoint.StrictSliderTracking = StrictSliderTracking.Value;
+ }
+
  public enum SentakkiHitResult
  {
  Good = 3,

osu.Game.Rulesets.Sentakki/Mods/SentakkiModRelax.cs

@@ -16,6 +16,7 @@ public class SentakkiModRelax : Mod, IApplicableAfterBeatmapConversion
  public override string Name => "Relax";
 
  public override string Acronym => "RX";
+ public override ModType Type => ModType.DifficultyReduction;
 
  public override LocalisableString Description => "All notes are EX notes, you've got nothing to prove!";
 

osu.Game.Rulesets.Sentakki/Mods/SentakkiModTouchDevice.cs

@@ -1,7 +1,9 @@
+using System;
 using osu.Game.Rulesets.Mods;
 
 namespace osu.Game.Rulesets.Sentakki.Mods;
 
 public class SentakkiModTouchDevice : ModTouchDevice
 {
+ public override Type[] IncompatibleMods => Array.Empty<Type>();
 }