bump osu, add defaults for color bindables

Flutterish · Mar 11, 2021 · e550774 · e550774
1 parent 874f06f
commit e550774
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 12 deletions.
diff --git a/Hitokori/Difficulty/HitokoriDifficultyCalculator.cs b/Hitokori/Difficulty/HitokoriDifficultyCalculator.cs
@@ -37,8 +37,8 @@ protected override IEnumerable<DifficultyHitObject> CreateDifficultyHitObjects (
 			}
 		}
 
-		protected override Skill[] CreateSkills ( IBeatmap beatmap ) {
-			return new Skill[] { new Reading(), new Speed() };
+		protected override Skill[] CreateSkills ( IBeatmap beatmap, Mod[] mods ) {
+			return new Skill[] { new Reading( mods ), new Speed( mods ) };
 		}
 	}
 }
diff --git a/Hitokori/Difficulty/Skills/Reading.cs b/Hitokori/Difficulty/Skills/Reading.cs
@@ -1,5 +1,6 @@
 using osu.Game.Rulesets.Difficulty.Preprocessing;
 using osu.Game.Rulesets.Difficulty.Skills;
+using osu.Game.Rulesets.Mods;
 using System;
 
 namespace osu.Game.Rulesets.Hitokori.Difficulty.Skills {
@@ -9,6 +10,8 @@ public class Reading : Skill {
 
 		private const double DIRECTION_CHANGE_BONUS = 1.05;
 
+		public Reading ( Mod[] mods ) : base( mods ) { }
+
 		protected override double StrainValueOf ( DifficultyHitObject current ) {
 			HitokoriDifficultyHitObject hitokoriCurrent = (HitokoriDifficultyHitObject)current;
 

diff --git a/Hitokori/Difficulty/Skills/Speed.cs b/Hitokori/Difficulty/Skills/Speed.cs
@@ -1,5 +1,6 @@
 using osu.Game.Rulesets.Difficulty.Preprocessing;
 using osu.Game.Rulesets.Difficulty.Skills;
+using osu.Game.Rulesets.Mods;
 using System;
 
 namespace osu.Game.Rulesets.Hitokori.Difficulty.Skills {
@@ -17,6 +18,8 @@ public class Speed : Skill {
 		/// </summary>
 		private const double BASE_BPM = 120;
 
+		public Speed ( Mod[] mods ) : base( mods ) { }
+
 		protected override double StrainValueOf ( DifficultyHitObject current ) {
 			HitokoriDifficultyHitObject hitokoriCurrent = (HitokoriDifficultyHitObject)current;
 			double bpm = Math.Min( hitokoriCurrent.BPM, MAX_BPM );

diff --git a/Hitokori/Objects/Drawables/Hitokori/Hi.cs b/Hitokori/Objects/Drawables/Hitokori/Hi.cs
@@ -8,10 +8,10 @@ namespace osu.Game.Rulesets.Hitokori.Objects.Drawables.Hitokori {
 	public class Hi : StandardOrbital {
 		public Hi ( IHasTilePosition parent, Radius radius ) : base( parent, radius, Color4.Red ) { }
 
-		Bindable<Color4> color = new();
-		[BackgroundDependencyLoader]
+		Bindable<Color4> color = new( Color4.Red );
+		[BackgroundDependencyLoader(permitNulls: true)]
 		private void load ( HitokoriSettingsManager config ) {
-			config.BindWith( HitokoriSetting.HiColor, color );
+			config?.BindWith( HitokoriSetting.HiColor, color );
 			color.BindValueChanged( v => {
 				Colour = v.NewValue;
 			}, true );

diff --git a/Hitokori/Objects/Drawables/Hitokori/Kori.cs b/Hitokori/Objects/Drawables/Hitokori/Kori.cs
@@ -8,10 +8,10 @@ namespace osu.Game.Rulesets.Hitokori.Objects.Drawables.Hitokori {
 	public class Kori : StandardOrbital {
 		public Kori ( IHasTilePosition parent, Radius radius ) : base( parent, radius, Color4.Blue ) { }
 
-		Bindable<Color4> color = new();
-		[BackgroundDependencyLoader]
+		Bindable<Color4> color = new( Color4.Blue );
+		[BackgroundDependencyLoader(permitNulls: true)]
 		private void load ( HitokoriSettingsManager config ) {
-			config.BindWith( HitokoriSetting.KoriColor, color );
+			config?.BindWith( HitokoriSetting.KoriColor, color );
 			color.BindValueChanged( v => {
 				Colour = v.NewValue;
 			}, true );

diff --git a/Hitokori/Objects/Drawables/Hitokori/TheUnwantedChild.cs b/Hitokori/Objects/Drawables/Hitokori/TheUnwantedChild.cs
@@ -8,10 +8,10 @@ namespace osu.Game.Rulesets.Hitokori.Objects.Drawables.Hitokori {
 	public class TheUnwantedChild : StandardOrbital {
 		public TheUnwantedChild ( IHasTilePosition parent, Radius radius ) : base( parent, radius, Color4.Green ) { }
 
-		Bindable<Color4> color = new();
-		[BackgroundDependencyLoader]
+		Bindable<Color4> color = new( Color4.Green );
+		[BackgroundDependencyLoader(permitNulls: true)]
 		private void load ( HitokoriSettingsManager config ) {
-			config.BindWith( HitokoriSetting.GreenBitchColor, color );
+			config?.BindWith( HitokoriSetting.GreenBitchColor, color );
 			color.BindValueChanged( v => {
 				Colour = v.NewValue;
 			}, true );

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.226.0" />
+    <PackageReference Include="ppy.osu.Game" Version="2021.312.0" />
   </ItemGroup>
 
   <ItemGroup>