Add ability to preserve player speed

EVAST9919 · Oct 6, 2024 · 12d1111 · 12d1111
1 parent fe3d24e
commit 12d1111
Show file tree

Hide file tree

Showing 8 changed files with 93 additions and 10 deletions.
diff --git a/osu.Game.Rulesets.Touhosu.sln.DotSettings b/osu.Game.Rulesets.Touhosu.sln.DotSettings
@@ -875,13 +875,15 @@ private void load()
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=beatmap_0027s/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=bindable/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Catmull/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=daycore/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Drawables/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=gameplay/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=hitobjects/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=keymods/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Kiai/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Leaderboard/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Leaderboards/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=nightcore/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Playfield/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=resampler/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=ruleset/@EntryIndexedValue">True</s:Boolean>

diff --git a/osu.Game.Rulesets.Touhosu/Mods/TouhosuModDaycore.cs b/osu.Game.Rulesets.Touhosu/Mods/TouhosuModDaycore.cs
@@ -1,9 +1,27 @@
-using osu.Game.Rulesets.Mods;
+using osu.Framework.Bindables;
+using osu.Game.Configuration;
+using osu.Game.Overlays.Settings;
+using osu.Game.Rulesets.Mods;
+using osu.Game.Rulesets.Touhosu.Objects;
+using osu.Game.Rulesets.Touhosu.UI;
+using osu.Game.Rulesets.UI;
 
 namespace osu.Game.Rulesets.Touhosu.Mods
 {
-    public class TouhosuModDaycore : ModDaycore
+    public class TouhosuModDaycore : ModDaycore, IApplicableToDrawableRuleset<TouhosuHitObject>
     {
         public override double ScoreMultiplier => 0.3;
+
+        [SettingSource("Preserve player speed", "Turn on to make player speed be unaffected by the song speed.", SettingControlType = typeof(SettingsCheckbox))]
+        public BindableBool PreserveSpeed { get; } = new BindableBool();
+
+        public void ApplyToDrawableRuleset(DrawableRuleset<TouhosuHitObject> drawableRuleset)
+        {
+            if (!PreserveSpeed.Value)
+                return;
+
+            var playfiled = (TouhosuPlayfield)drawableRuleset.Playfield;
+            playfiled.SpeedMultiplier = 1.0 / SpeedChange.Value;
+        }
     }
 }
diff --git a/osu.Game.Rulesets.Touhosu/Mods/TouhosuModDoubleTime.cs b/osu.Game.Rulesets.Touhosu/Mods/TouhosuModDoubleTime.cs
@@ -1,9 +1,27 @@
-using osu.Game.Rulesets.Mods;
+using osu.Framework.Bindables;
+using osu.Game.Configuration;
+using osu.Game.Overlays.Settings;
+using osu.Game.Rulesets.Mods;
+using osu.Game.Rulesets.Touhosu.Objects;
+using osu.Game.Rulesets.Touhosu.UI;
+using osu.Game.Rulesets.UI;
 
 namespace osu.Game.Rulesets.Touhosu.Mods
 {
-    public class TouhosuModDoubleTime : ModDoubleTime
+    public class TouhosuModDoubleTime : ModDoubleTime, IApplicableToDrawableRuleset<TouhosuHitObject>
     {
         public override double ScoreMultiplier => 1.1f;
+
+        [SettingSource("Preserve player speed", "Turn on to make player speed be unaffected by the song speed.", SettingControlType = typeof(SettingsCheckbox))]
+        public BindableBool PreserveSpeed { get; } = new BindableBool();
+
+        public void ApplyToDrawableRuleset(DrawableRuleset<TouhosuHitObject> drawableRuleset)
+        {
+            if (!PreserveSpeed.Value)
+                return;
+
+            var playfiled = (TouhosuPlayfield)drawableRuleset.Playfield;
+            playfiled.SpeedMultiplier = 1.0 / SpeedChange.Value;
+        }
     }
 }
diff --git a/osu.Game.Rulesets.Touhosu/Mods/TouhosuModHalfTime.cs b/osu.Game.Rulesets.Touhosu/Mods/TouhosuModHalfTime.cs
@@ -1,9 +1,27 @@
-using osu.Game.Rulesets.Mods;
+using osu.Framework.Bindables;
+using osu.Game.Configuration;
+using osu.Game.Overlays.Settings;
+using osu.Game.Rulesets.Mods;
+using osu.Game.Rulesets.Touhosu.Objects;
+using osu.Game.Rulesets.Touhosu.UI;
+using osu.Game.Rulesets.UI;
 
 namespace osu.Game.Rulesets.Touhosu.Mods
 {
-    public class TouhosuModHalfTime : ModHalfTime
+    public class TouhosuModHalfTime : ModHalfTime, IApplicableToDrawableRuleset<TouhosuHitObject>
     {
         public override double ScoreMultiplier => 0.3;
+
+        [SettingSource("Preserve player speed", "Turn on to make player speed be unaffected by the song speed.", SettingControlType = typeof(SettingsCheckbox))]
+        public BindableBool PreserveSpeed { get; } = new BindableBool();
+
+        public void ApplyToDrawableRuleset(DrawableRuleset<TouhosuHitObject> drawableRuleset)
+        {
+            if (!PreserveSpeed.Value)
+                return;
+
+            var playfiled = (TouhosuPlayfield)drawableRuleset.Playfield;
+            playfiled.SpeedMultiplier = 1.0 / SpeedChange.Value;
+        }
     }
 }
diff --git a/osu.Game.Rulesets.Touhosu/Mods/TouhosuModNightcore.cs b/osu.Game.Rulesets.Touhosu/Mods/TouhosuModNightcore.cs
@@ -1,10 +1,29 @@
-using osu.Game.Rulesets.Touhosu.Objects;
+using osu.Framework.Bindables;
+using osu.Game.Configuration;
+using osu.Game.Overlays.Settings;
+using osu.Game.Rulesets.Touhosu.Objects;
 using osu.Game.Rulesets.Mods;
+using osu.Game.Rulesets.Touhosu.UI;
+using osu.Game.Rulesets.UI;
 
 namespace osu.Game.Rulesets.Touhosu.Mods
 {
     public class TouhosuModNightcore : ModNightcore<TouhosuHitObject>
     {
         public override double ScoreMultiplier => 1.1f;
+
+        [SettingSource("Preserve player speed", "Turn on to make player speed be unaffected by the song speed.", SettingControlType = typeof(SettingsCheckbox))]
+        public BindableBool PreserveSpeed { get; } = new BindableBool();
+
+        public new void ApplyToDrawableRuleset(DrawableRuleset<TouhosuHitObject> drawableRuleset)
+        {
+            base.ApplyToDrawableRuleset(drawableRuleset);
+
+            if (!PreserveSpeed.Value)
+                return;
+
+            var playfiled = (TouhosuPlayfield)drawableRuleset.Playfield;
+            playfiled.SpeedMultiplier = 1.0 / SpeedChange.Value;
+        }
     }
 }
diff --git a/osu.Game.Rulesets.Touhosu/TouhosuRuleset.cs b/osu.Game.Rulesets.Touhosu/TouhosuRuleset.cs
@@ -25,7 +25,7 @@
 
 namespace osu.Game.Rulesets.Touhosu
 {
-    public class TouhosuRuleset : Ruleset
+    public partial class TouhosuRuleset : Ruleset
     {
         private DrawableTouhosuRuleset ruleset;
 

diff --git a/osu.Game.Rulesets.Touhosu/UI/Objects/TouhosuPlayer.cs b/osu.Game.Rulesets.Touhosu/UI/Objects/TouhosuPlayer.cs
@@ -13,7 +13,7 @@
 
 namespace osu.Game.Rulesets.Touhosu.UI.Objects
 {
-    public class TouhosuPlayer : CompositeDrawable, IKeyBindingHandler<TouhosuAction>
+    public partial class TouhosuPlayer : CompositeDrawable, IKeyBindingHandler<TouhosuAction>
     {
         public static readonly float HITBOX_SIZE = 7;
 
@@ -38,6 +38,8 @@ public HitObjectContainer HitObjects
             }
         }
 
+        public double SpeedMultiplier { get; set; } = 1.0;
+
         public override bool RemoveCompletedTransforms => false;
 
         private int horizontalDirection;
@@ -178,7 +180,7 @@ protected override void Update()
             }
             else
             {
-                move(Clock.ElapsedFrameTime, horizontalDirection, verticalDirection);
+                move(Clock.ElapsedFrameTime * SpeedMultiplier, horizontalDirection, verticalDirection);
             }
 
             if (isDead)

diff --git a/osu.Game.Rulesets.Touhosu/UI/TouhosuPlayfield.cs b/osu.Game.Rulesets.Touhosu/UI/TouhosuPlayfield.cs
@@ -23,6 +23,12 @@ public partial class TouhosuPlayfield : Playfield
         public static readonly Vector2 FULL_SIZE = new Vector2(512, 384);
         public static readonly Vector2 PLAYFIELD_SIZE = new Vector2(307, 384);
 
+        public double SpeedMultiplier
+        {
+            get => Player.SpeedMultiplier;
+            set => Player.SpeedMultiplier = value;
+        }
+
         private Sample grazeSample;
 
         public TouhosuPlayer Player;