update osu version

Flutterish · Sep 17, 2021 · 8f9535b · 8f9535b
1 parent c508e75
commit 8f9535b
Show file tree

Hide file tree

Showing 16 changed files with 27 additions and 46 deletions.
diff --git a/Hitokori/Difficulty/Skills/Reading.cs b/Hitokori/Difficulty/Skills/Reading.cs
@@ -5,14 +5,13 @@
 
 namespace osu.Game.Rulesets.Hitokori.Difficulty.Skills {
 	public class Reading : StrainSkill {
-		protected override double SkillMultiplier => 0.6;
-		protected override double StrainDecayBase => 0.6;
+		protected override double DecayWeight => 0.6;
 
 		private const double DIRECTION_CHANGE_BONUS = 1.05;
 
 		public Reading ( Mod[] mods ) : base( mods ) { }
 
-		protected override double StrainValueOf ( DifficultyHitObject current ) {
+		protected override double StrainValueAt ( DifficultyHitObject current ) {
 			HitokoriDifficultyHitObject hitokoriCurrent = (HitokoriDifficultyHitObject)current;
 
 			double strain = CalculateAngleStrain( hitokoriCurrent.HitAngle );
@@ -30,5 +29,7 @@ protected override double StrainValueOf ( DifficultyHitObject current ) {
 		private double CalculateAngleStrain ( double angle ) {
 			return Math.Abs( ( Math.Abs( angle ) - Math.PI ) / ( Math.PI * 3 / 2 ) );
 		}
+
+		protected override double CalculateInitialStrain ( double time ) => 0;
 	}
 }
diff --git a/Hitokori/Difficulty/Skills/Speed.cs b/Hitokori/Difficulty/Skills/Speed.cs
@@ -5,8 +5,7 @@
 
 namespace osu.Game.Rulesets.Hitokori.Difficulty.Skills {
 	public class Speed : StrainSkill {
-		protected override double SkillMultiplier => 0.8;
-		protected override double StrainDecayBase => 0.6;
+		protected override double DecayWeight => 0.6;
 
 		/// <summary>
 		/// The BPM where strain stops increasing
@@ -20,11 +19,13 @@ public class Speed : StrainSkill {
 
 		public Speed ( Mod[] mods ) : base( mods ) { }
 
-		protected override double StrainValueOf ( DifficultyHitObject current ) {
+		protected override double StrainValueAt ( DifficultyHitObject current ) {
 			HitokoriDifficultyHitObject hitokoriCurrent = (HitokoriDifficultyHitObject)current;
 			double bpm = Math.Min( hitokoriCurrent.BPM, MAX_BPM );
 
 			return Math.Pow( bpm / BASE_BPM, 0.6 );
 		}
+
+		protected override double CalculateInitialStrain ( double time ) => 0;
 	}
 }
diff --git a/Hitokori/Mods/HitokoriModAuto.cs b/Hitokori/Mods/HitokoriModAuto.cs
@@ -1,14 +1,13 @@
-using System.Collections.Generic;
-using osu.Framework.Graphics.Sprites;
+using osu.Framework.Graphics.Sprites;
 using osu.Game.Beatmaps;
 using osu.Game.Graphics;
 using osu.Game.Rulesets.Hitokori.Beatmaps;
-using osu.Game.Rulesets.Hitokori.Objects.Base;
 using osu.Game.Rulesets.Hitokori.Replays;
 using osu.Game.Rulesets.Hitokori.Utils;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Scoring;
 using osu.Game.Users;
+using System.Collections.Generic;
 
 namespace osu.Game.Rulesets.Hitokori.Mods {
 	public class HitokoriModAuto : ModAutoplay {

diff --git a/Hitokori/Objects/Drawables/AutoModBot/Bot.cs b/Hitokori/Objects/Drawables/AutoModBot/Bot.cs
@@ -3,7 +3,6 @@
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Graphics.Textures;
-using osu.Framework.IO.Stores;
 using osu.Game.Rulesets.Hitokori.Utils;
 
 namespace osu.Game.Rulesets.Hitokori.Objects.Drawables.AutoModBot {

diff --git a/Hitokori/Objects/Drawables/Tiles/DrawableHoldTile.cs b/Hitokori/Objects/Drawables/Tiles/DrawableHoldTile.cs
@@ -1,5 +1,6 @@
 using osu.Framework.Graphics;
 using osu.Framework.Input.Bindings;
+using osu.Framework.Input.Events;
 using osu.Game.Rulesets.Hitokori.Objects.Base;
 using osu.Game.Rulesets.Hitokori.Objects.Drawables.AutoModBot;
 using osu.Game.Rulesets.Hitokori.Objects.Drawables.Trails;
@@ -67,15 +68,15 @@ protected override void CheckForResult ( bool userTriggered, double timeOffset )
 		public double Duration { get => Tile.Duration; set => Tile.Duration = value; }
 
 		HitokoriAction? HoldButton;
-		public bool OnPressed ( HitokoriAction action ) { // BUG beatmaps that have a hold tile last end prematurely?
+		public bool OnPressed ( KeyBindingPressEvent<HitokoriAction> action ) { // BUG beatmaps that have a hold tile last end prematurely?
 			if ( Clock.ElapsedFrameTime < 0 ) return true;
 			if ( StartPoint.Judged ) return false;
-			BeginHold( action );
+			BeginHold( action.Action );
 			return true;
 		}
 
-		public void OnReleased ( HitokoriAction action ) {
-			Release( action );
+		public void OnReleased ( KeyBindingReleaseEvent<HitokoriAction> action ) {
+			Release( action.Action );
 			HoldButton = null;
 		}
 

diff --git a/Hitokori/Objects/Drawables/Tiles/DrawableSpinTile.cs b/Hitokori/Objects/Drawables/Tiles/DrawableSpinTile.cs
@@ -1,4 +1,5 @@
 using osu.Framework.Input.Bindings;
+using osu.Framework.Input.Events;
 using osu.Game.Rulesets.Hitokori.Objects.Base;
 using osu.Game.Rulesets.Hitokori.Objects.Drawables.AutoModBot;
 using osu.Game.Rulesets.Hitokori.Settings;
@@ -56,13 +57,13 @@ protected override void CheckForResult ( bool userTriggered, double timeOffset )
 			}
 		}
 
-		public bool OnPressed ( HitokoriAction action ) {
+		public bool OnPressed ( KeyBindingPressEvent<HitokoriAction> action ) {
 			var next = Points.FirstOrDefault( X => !X.Judged );
 			if ( next is null ) return false;
 			Playfield.Click( AutoClickType.Press );
 			UpdateResult( true );
 			return true;
 		}
-		public void OnReleased ( HitokoriAction action ) { }
+		public void OnReleased ( KeyBindingReleaseEvent<HitokoriAction> action ) { }
 	}
 }
diff --git a/Hitokori/Objects/Drawables/Tiles/DrawableTapTile.cs b/Hitokori/Objects/Drawables/Tiles/DrawableTapTile.cs
@@ -1,4 +1,5 @@
 using osu.Framework.Input.Bindings;
+using osu.Framework.Input.Events;
 using osu.Game.Rulesets.Hitokori.Objects.Base;
 using osu.Game.Rulesets.Hitokori.Objects.Drawables.AutoModBot;
 using osu.Game.Rulesets.Hitokori.Settings;
@@ -31,13 +32,13 @@ protected override void CheckForResult ( bool userTriggered, double timeOffset )
 				PressPoint.TryToHitAtOffset( timeOffset );
 			}
 		}
-		public bool OnPressed ( HitokoriAction action ) {
+		public bool OnPressed ( KeyBindingPressEvent<HitokoriAction> action ) {
 			if ( PressPoint.Judged ) return false;
 			Playfield.Click( AutoClickType.Press );
 			UpdateResult( userTriggered: true );
 			return true;
 		}
-		public void OnReleased ( HitokoriAction action ) { }
+		public void OnReleased ( KeyBindingReleaseEvent<HitokoriAction> action ) { }
 
 		protected override void AddNestedHitObject ( DrawableHitObject hitObject ) {
 			AddInternal( PressPoint = hitObject as DrawableTilePoint );

diff --git a/Hitokori/Settings/HitokoriSettingsManager.cs b/Hitokori/Settings/HitokoriSettingsManager.cs
@@ -1,12 +1,7 @@
 using osu.Framework.Bindables;
-using osu.Framework.Configuration;
 using osu.Game.Configuration;
 using osu.Game.Rulesets.Configuration;
-using osuTK;
 using osuTK.Graphics;
-using System;
-using System.Collections.Generic;
-using System.Linq;
 
 namespace osu.Game.Rulesets.Hitokori.Settings {
 	public class HitokoriSettingsManager : RulesetConfigManager<HitokoriSetting> {

diff --git a/Hitokori/TextureGeneration.cs b/Hitokori/TextureGeneration.cs
@@ -1,14 +1,8 @@
-using osu.Framework.Graphics;
-using osu.Framework.Graphics.Textures;
+using osu.Framework.Graphics.Textures;
 using osuTK;
-using osuTK.Graphics;
 using SixLabors.ImageSharp;
 using SixLabors.ImageSharp.PixelFormats;
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace osu.Game.Rulesets.Hitokori {
 	public static class TextureGeneration {

diff --git a/Hitokori/UI/ColorPickerControl.HuePicker.cs b/Hitokori/UI/ColorPickerControl.HuePicker.cs
@@ -76,7 +76,7 @@ protected override void LoadComplete () {
 			Sample notchSample;
 			[BackgroundDependencyLoader]
 			private void load ( ISampleStore samples ) {
-				notchSample = samples.Get( "UI/sliderbar-notch" );
+				notchSample = samples.Get( "UI/notch-tick" );
 			}
 
 			protected override bool OnDragStart ( DragStartEvent e ) {

diff --git a/Hitokori/UI/ColorPickerControl.SVPicker.cs b/Hitokori/UI/ColorPickerControl.SVPicker.cs
@@ -1,5 +1,4 @@
 using osu.Framework.Allocation;
-using osu.Framework.Audio;
 using osu.Framework.Audio.Sample;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
@@ -8,7 +7,6 @@
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Graphics.Textures;
 using osu.Framework.Input.Events;
-using osu.Game.Graphics.UserInterface;
 using osuTK;
 using osuTK.Graphics;
 using System;
@@ -65,7 +63,7 @@ protected override void LoadComplete () {
 			Sample notchSample;
 			[BackgroundDependencyLoader]
 			private void load ( ISampleStore samples ) {
-				notchSample = samples.Get( "UI/sliderbar-notch" );
+				notchSample = samples.Get( "UI/notch-tick" );
 			}
 
 			protected override bool OnDragStart ( DragStartEvent e ) {

diff --git a/Hitokori/UI/ColorPickerControl.cs b/Hitokori/UI/ColorPickerControl.cs
@@ -8,7 +8,6 @@
 using osu.Game.Rulesets.Hitokori.Utils;
 using osuTK;
 using osuTK.Graphics;
-using Sentry;
 using System.Linq;
 
 namespace osu.Game.Rulesets.Hitokori.UI {

diff --git a/Hitokori/UI/HitokoriSettingsSubsection.cs b/Hitokori/UI/HitokoriSettingsSubsection.cs
@@ -1,6 +1,5 @@
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
-using osu.Framework.Graphics.Cursor;
 using osu.Framework.Localisation;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Overlays.Settings;

diff --git a/Hitokori/UI/OrbitalColorPicker.cs b/Hitokori/UI/OrbitalColorPicker.cs
@@ -1,16 +1,9 @@
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
-using osu.Framework.Graphics.Shapes;
 using osu.Game.Rulesets.Hitokori.Objects.Base;
 using osu.Game.Rulesets.Hitokori.Objects.Drawables.Hitokori;
-using osu.Game.Rulesets.Hitokori.Settings;
 using osu.Game.Rulesets.Hitokori.Utils;
 using osuTK;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace osu.Game.Rulesets.Hitokori.UI {
 	public class OrbitalColorPicker : ColorPickerControl {

diff --git a/Hitokori/osu.Game.Rulesets.Hitokori.csproj b/Hitokori/osu.Game.Rulesets.Hitokori.csproj
@@ -6,7 +6,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="ppy.osu.Game" Version="2021.720.0" />
+    <PackageReference Include="ppy.osu.Game" Version="2021.916.0" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/Tests/TestSceneOsuGame.cs b/Tests/TestSceneOsuGame.cs
@@ -13,15 +13,15 @@ public class TestSceneOsuGame : OsuTestScene {
 		[BackgroundDependencyLoader]
 		private void load ( GameHost host, OsuGameBase gameBase ) {
 			OsuGame game = new OsuGame();
-			game.SetHost( host );
 
 			Children = new Drawable[] {
 				new Box {
 					RelativeSizeAxes = Axes.Both,
 					Colour = Color4.Black,
 				},
-				game
 			};
+
+			AddGame( game );
 		}
 	}
 }