update game | tweaks

taulazer · Mar 8, 2020 · 67dd3ba · 67dd3ba
1 parent 1d3bb49
commit 67dd3ba
Show file tree

Hide file tree

Showing 10 changed files with 23 additions and 10 deletions.
diff --git a/tau/osu.Game.Rulesets.tau/Judgements/TauJudgement.cs b/tau/osu.Game.Rulesets.tau/Judgements/TauJudgement.cs
@@ -19,6 +19,9 @@ protected override int NumericResultFor(HitResult result)
 
                 case HitResult.Great:
                     return 300;
+
+                case HitResult.Good:
+                    return 150;
             }
         }
 
@@ -32,6 +35,9 @@ protected override double HealthIncreaseFor(HitResult result)
                 case HitResult.Miss:
                     return -0.02;
 
+                case HitResult.Good:
+                    return -0.01;
+
                 case HitResult.Great:
                     return 0.01;
             }

diff --git a/tau/osu.Game.Rulesets.tau/Mods/TauModAutoHold.cs b/tau/osu.Game.Rulesets.tau/Mods/TauModAutoHold.cs
@@ -12,7 +12,7 @@ public class TauModAutoHold : Mod
     {
         public override string Name => "Auto Hold";
         public override string Acronym => "AH";
-        public override IconUsage Icon => OsuIcon.ModSpunout;
+        public override IconUsage? Icon => OsuIcon.ModSpunout;
         public override ModType Type => ModType.DifficultyReduction;
         public override string Description => @"Hold beat will automatically be completed.";
         public override double ScoreMultiplier => 0.9;

diff --git a/tau/osu.Game.Rulesets.tau/Mods/TauModBlinds.cs b/tau/osu.Game.Rulesets.tau/Mods/TauModBlinds.cs
@@ -24,7 +24,7 @@ public class TauModBlinds : Mod, IApplicableToDrawableRuleset<TauHitObject>, IAp
         public override string Description => "Play with blinds on your screen.";
         public override string Acronym => "BL";
 
-        public override IconUsage Icon => FontAwesome.Solid.Adjust;
+        public override IconUsage? Icon => FontAwesome.Solid.Adjust;
         public override ModType Type => ModType.DifficultyIncrease;
 
         public override bool Ranked => false;

diff --git a/tau/osu.Game.Rulesets.tau/Mods/TauModFlashlight.cs b/tau/osu.Game.Rulesets.tau/Mods/TauModFlashlight.cs
@@ -6,7 +6,7 @@
 using osu.Framework.Graphics;
 using osu.Framework.Input;
 using osu.Framework.Input.Events;
-using osu.Framework.MathUtils;
+using osu.Framework.Utils;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Tau.Objects;
 using osuTK;

diff --git a/tau/osu.Game.Rulesets.tau/Objects/Drawables/DrawabletauHitObject.cs b/tau/osu.Game.Rulesets.tau/Objects/Drawables/DrawabletauHitObject.cs
@@ -72,6 +72,7 @@ protected override void UpdateInitialTransforms()
         protected override void CheckForResult(bool userTriggered, double timeOffset)
         {
             Debug.Assert(HitObject.HitWindows != null);
+
             if (CheckValidation == null) return;
 
             if (!userTriggered)
@@ -87,6 +88,7 @@ protected override void CheckForResult(bool userTriggered, double timeOffset)
             if (timeOffset >= 0 && Result != null && validated)
             {
                 var result = HitObject.HitWindows.ResultFor(timeOffset);
+
                 if (result >= HitResult.Meh)
                     result = HitResult.Great;
 
@@ -111,6 +113,7 @@ protected override void UpdateStateTransforms(ArmedState state)
                 case ArmedState.Idle:
                     LifetimeStart = HitObject.StartTime - HitObject.TimePreempt;
                     HitAction = null;
+
                     break;
 
                 case ArmedState.Hit:
@@ -123,6 +126,7 @@ protected override void UpdateStateTransforms(ArmedState state)
                        .FadeOut(time_fade_hit);
 
                     this.FadeOut(time_fade_hit);
+
                     break;
 
                 case ArmedState.Miss:
@@ -135,6 +139,7 @@ protected override void UpdateStateTransforms(ArmedState state)
                        .FadeOut(time_fade_miss);
 
                     this.FadeOut(time_fade_miss);
+
                     break;
             }
         }
@@ -154,6 +159,6 @@ public bool OnPressed(TauAction action)
             return result;
         }
 
-        public bool OnReleased(TauAction action) => false;
+        public void OnReleased(TauAction action) { }
     }
 }
diff --git a/tau/osu.Game.Rulesets.tau/Objects/tauHitObject.cs b/tau/osu.Game.Rulesets.tau/Objects/tauHitObject.cs
@@ -17,7 +17,7 @@ public class TauHitObject : HitObject, IHasComboInformation
         public override Judgement CreateJudgement() => new TauJudgement();
 
         public double TimePreempt = 600;
-        public double TimeFadeIn = 100;
+        public double TimeFadeIn = 400;
 
         public float Angle { get; set; }
         public Vector2 PositionToEnd { get; set; }

diff --git a/tau/osu.Game.Rulesets.tau/Replays/tauFramedReplayInputHandler.cs b/tau/osu.Game.Rulesets.tau/Replays/tauFramedReplayInputHandler.cs
@@ -5,7 +5,7 @@
 using System.Diagnostics;
 using System.Linq;
 using osu.Framework.Input.StateChanges;
-using osu.Framework.MathUtils;
+using osu.Framework.Utils;
 using osu.Game.Replays;
 using osu.Game.Rulesets.Replays;
 using osuTK;

diff --git a/tau/osu.Game.Rulesets.tau/Scoring/TauHitWindows.cs b/tau/osu.Game.Rulesets.tau/Scoring/TauHitWindows.cs
@@ -12,6 +12,7 @@ public override bool IsHitResultAllowed(HitResult result)
             switch (result)
             {
                 case HitResult.Great:
+                case HitResult.Good:
                 case HitResult.Miss:
                     return true;
             }
@@ -22,7 +23,8 @@ public override bool IsHitResultAllowed(HitResult result)
         protected override DifficultyRange[] GetRanges() => new[]
         {
             new DifficultyRange(HitResult.Great, 199, 199, 199),
-            new DifficultyRange(HitResult.Miss, 200, 200, 200),
+            new DifficultyRange(HitResult.Good, 299, 250, 200),
+            new DifficultyRange(HitResult.Miss, 300, 300, 300),
         };
     }
 }
diff --git a/tau/osu.Game.Rulesets.tau/UI/KiaiHitExplosion.cs b/tau/osu.Game.Rulesets.tau/UI/KiaiHitExplosion.cs
@@ -5,7 +5,7 @@
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Effects;
-using osu.Framework.MathUtils;
+using osu.Framework.Utils;
 using osu.Game.Rulesets.Objects.Drawables;
 using osuTK;
 using osuTK.Graphics;

diff --git a/tau/osu.Game.Rulesets.tau/osu.Game.Rulesets.tau.csproj b/tau/osu.Game.Rulesets.tau/osu.Game.Rulesets.tau.csproj
@@ -11,8 +11,8 @@
     <EmbeddedResource Include="Resources\**" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="ppy.osu.Framework" Version="2019.1227.1" />
-    <PackageReference Include="ppy.osu.Game" Version="2019.1227.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2020.305.0" />
+    <PackageReference Include="ppy.osu.Game" Version="2020.306.0" />
   </ItemGroup>
   <ItemGroup>
     <Folder Include="Resources\Samples\Gameplay" />