Skip to content

Commit 67dd3ba

Browse files
committed
update game | tweaks
1 parent 1d3bb49 commit 67dd3ba

10 files changed

+23
-10
lines changed

tau/osu.Game.Rulesets.tau/Judgements/TauJudgement.cs

+6
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,9 @@ protected override int NumericResultFor(HitResult result)
1919

2020
case HitResult.Great:
2121
return 300;
22+
23+
case HitResult.Good:
24+
return 150;
2225
}
2326
}
2427

@@ -32,6 +35,9 @@ protected override double HealthIncreaseFor(HitResult result)
3235
case HitResult.Miss:
3336
return -0.02;
3437

38+
case HitResult.Good:
39+
return -0.01;
40+
3541
case HitResult.Great:
3642
return 0.01;
3743
}

tau/osu.Game.Rulesets.tau/Mods/TauModAutoHold.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ public class TauModAutoHold : Mod
1212
{
1313
public override string Name => "Auto Hold";
1414
public override string Acronym => "AH";
15-
public override IconUsage Icon => OsuIcon.ModSpunout;
15+
public override IconUsage? Icon => OsuIcon.ModSpunout;
1616
public override ModType Type => ModType.DifficultyReduction;
1717
public override string Description => @"Hold beat will automatically be completed.";
1818
public override double ScoreMultiplier => 0.9;

tau/osu.Game.Rulesets.tau/Mods/TauModBlinds.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ public class TauModBlinds : Mod, IApplicableToDrawableRuleset<TauHitObject>, IAp
2424
public override string Description => "Play with blinds on your screen.";
2525
public override string Acronym => "BL";
2626

27-
public override IconUsage Icon => FontAwesome.Solid.Adjust;
27+
public override IconUsage? Icon => FontAwesome.Solid.Adjust;
2828
public override ModType Type => ModType.DifficultyIncrease;
2929

3030
public override bool Ranked => false;

tau/osu.Game.Rulesets.tau/Mods/TauModFlashlight.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
using osu.Framework.Graphics;
77
using osu.Framework.Input;
88
using osu.Framework.Input.Events;
9-
using osu.Framework.MathUtils;
9+
using osu.Framework.Utils;
1010
using osu.Game.Rulesets.Mods;
1111
using osu.Game.Rulesets.Tau.Objects;
1212
using osuTK;

tau/osu.Game.Rulesets.tau/Objects/Drawables/DrawabletauHitObject.cs

+6-1
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,7 @@ protected override void UpdateInitialTransforms()
7272
protected override void CheckForResult(bool userTriggered, double timeOffset)
7373
{
7474
Debug.Assert(HitObject.HitWindows != null);
75+
7576
if (CheckValidation == null) return;
7677

7778
if (!userTriggered)
@@ -87,6 +88,7 @@ protected override void CheckForResult(bool userTriggered, double timeOffset)
8788
if (timeOffset >= 0 && Result != null && validated)
8889
{
8990
var result = HitObject.HitWindows.ResultFor(timeOffset);
91+
9092
if (result >= HitResult.Meh)
9193
result = HitResult.Great;
9294

@@ -111,6 +113,7 @@ protected override void UpdateStateTransforms(ArmedState state)
111113
case ArmedState.Idle:
112114
LifetimeStart = HitObject.StartTime - HitObject.TimePreempt;
113115
HitAction = null;
116+
114117
break;
115118

116119
case ArmedState.Hit:
@@ -123,6 +126,7 @@ protected override void UpdateStateTransforms(ArmedState state)
123126
.FadeOut(time_fade_hit);
124127

125128
this.FadeOut(time_fade_hit);
129+
126130
break;
127131

128132
case ArmedState.Miss:
@@ -135,6 +139,7 @@ protected override void UpdateStateTransforms(ArmedState state)
135139
.FadeOut(time_fade_miss);
136140

137141
this.FadeOut(time_fade_miss);
142+
138143
break;
139144
}
140145
}
@@ -154,6 +159,6 @@ public bool OnPressed(TauAction action)
154159
return result;
155160
}
156161

157-
public bool OnReleased(TauAction action) => false;
162+
public void OnReleased(TauAction action) { }
158163
}
159164
}

tau/osu.Game.Rulesets.tau/Objects/tauHitObject.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ public class TauHitObject : HitObject, IHasComboInformation
1717
public override Judgement CreateJudgement() => new TauJudgement();
1818

1919
public double TimePreempt = 600;
20-
public double TimeFadeIn = 100;
20+
public double TimeFadeIn = 400;
2121

2222
public float Angle { get; set; }
2323
public Vector2 PositionToEnd { get; set; }

tau/osu.Game.Rulesets.tau/Replays/tauFramedReplayInputHandler.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
using System.Diagnostics;
66
using System.Linq;
77
using osu.Framework.Input.StateChanges;
8-
using osu.Framework.MathUtils;
8+
using osu.Framework.Utils;
99
using osu.Game.Replays;
1010
using osu.Game.Rulesets.Replays;
1111
using osuTK;

tau/osu.Game.Rulesets.tau/Scoring/TauHitWindows.cs

+3-1
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ public override bool IsHitResultAllowed(HitResult result)
1212
switch (result)
1313
{
1414
case HitResult.Great:
15+
case HitResult.Good:
1516
case HitResult.Miss:
1617
return true;
1718
}
@@ -22,7 +23,8 @@ public override bool IsHitResultAllowed(HitResult result)
2223
protected override DifficultyRange[] GetRanges() => new[]
2324
{
2425
new DifficultyRange(HitResult.Great, 199, 199, 199),
25-
new DifficultyRange(HitResult.Miss, 200, 200, 200),
26+
new DifficultyRange(HitResult.Good, 299, 250, 200),
27+
new DifficultyRange(HitResult.Miss, 300, 300, 300),
2628
};
2729
}
2830
}

tau/osu.Game.Rulesets.tau/UI/KiaiHitExplosion.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
using osu.Framework.Graphics;
66
using osu.Framework.Graphics.Containers;
77
using osu.Framework.Graphics.Effects;
8-
using osu.Framework.MathUtils;
8+
using osu.Framework.Utils;
99
using osu.Game.Rulesets.Objects.Drawables;
1010
using osuTK;
1111
using osuTK.Graphics;

tau/osu.Game.Rulesets.tau/osu.Game.Rulesets.tau.csproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
<EmbeddedResource Include="Resources\**" />
1212
</ItemGroup>
1313
<ItemGroup>
14-
<PackageReference Include="ppy.osu.Framework" Version="2019.1227.1" />
15-
<PackageReference Include="ppy.osu.Game" Version="2019.1227.0" />
14+
<PackageReference Include="ppy.osu.Framework" Version="2020.305.0" />
15+
<PackageReference Include="ppy.osu.Game" Version="2020.306.0" />
1616
</ItemGroup>
1717
<ItemGroup>
1818
<Folder Include="Resources\Samples\Gameplay" />

0 commit comments

Comments
 (0)