sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-07-01 16:29:58 +09:00
Code Issues Packages Projects Releases Wiki Activity

Change descriptions and special section

Browse Source
This commit is contained in:
Joseph Madamba
2018-03-14 01:05:19 -07:00
committed by GitHub
parent d122aa80e4
commit 1eeacb7bf7
16 changed files with 7 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
osu.Game.Rulesets.Mania/Mods/ManiaModKey1.cs
View File

@ -1,8 +1,6 @@
// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>. // Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
using osu.Game.Graphics;
namespace osu.Game.Rulesets.Mania.Mods namespace osu.Game.Rulesets.Mania.Mods
{ {
public class ManiaModKey1 : ManiaKeyMod public class ManiaModKey1 : ManiaKeyMod
@ -10,7 +8,6 @@ namespace osu.Game.Rulesets.Mania.Mods
public override int KeyCount => 1; public override int KeyCount => 1;
public override string Name => "One Key"; public override string Name => "One Key";
public override string ShortenedName => "1K"; public override string ShortenedName => "1K";
public override FontAwesome Icon => FontAwesome.fa_question;
public override string Description => @"Play with one key."; public override string Description => @"Play with one key.";
} }
} }

3
osu.Game.Rulesets.Mania/Mods/ManiaModKey2.cs
View File

@ -1,8 +1,6 @@
// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>. // Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
using osu.Game.Graphics;
namespace osu.Game.Rulesets.Mania.Mods namespace osu.Game.Rulesets.Mania.Mods
{ {
public class ManiaModKey2 : ManiaKeyMod public class ManiaModKey2 : ManiaKeyMod
@ -10,7 +8,6 @@ namespace osu.Game.Rulesets.Mania.Mods
public override int KeyCount => 2; public override int KeyCount => 2;
public override string Name => "Two Keys"; public override string Name => "Two Keys";
public override string ShortenedName => "2K"; public override string ShortenedName => "2K";
public override FontAwesome Icon => FontAwesome.fa_question;
public override string Description => @"Play with two keys."; public override string Description => @"Play with two keys.";
} }
} }

3
osu.Game.Rulesets.Mania/Mods/ManiaModKey3.cs
View File

@ -1,8 +1,6 @@
// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>. // Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
using osu.Game.Graphics;
namespace osu.Game.Rulesets.Mania.Mods namespace osu.Game.Rulesets.Mania.Mods
{ {
public class ManiaModKey3 : ManiaKeyMod public class ManiaModKey3 : ManiaKeyMod
@ -10,7 +8,6 @@ namespace osu.Game.Rulesets.Mania.Mods
public override int KeyCount => 3; public override int KeyCount => 3;
public override string Name => "Three Keys"; public override string Name => "Three Keys";
public override string ShortenedName => "3K"; public override string ShortenedName => "3K";
public override FontAwesome Icon => FontAwesome.fa_question;
public override string Description => @"Play with three keys."; public override string Description => @"Play with three keys.";
} }
} }

3
osu.Game.Rulesets.Mania/Mods/ManiaModKey4.cs
View File

@ -1,8 +1,6 @@
// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>. // Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
using osu.Game.Graphics;
namespace osu.Game.Rulesets.Mania.Mods namespace osu.Game.Rulesets.Mania.Mods
{ {
public class ManiaModKey4 : ManiaKeyMod public class ManiaModKey4 : ManiaKeyMod
@ -10,7 +8,6 @@ namespace osu.Game.Rulesets.Mania.Mods
public override int KeyCount => 4; public override int KeyCount => 4;
public override string Name => "Four Keys"; public override string Name => "Four Keys";
public override string ShortenedName => "4K"; public override string ShortenedName => "4K";
public override FontAwesome Icon => FontAwesome.fa_question;
public override string Description => @"Play with four keys."; public override string Description => @"Play with four keys.";
} }
} }

3
osu.Game.Rulesets.Mania/Mods/ManiaModKey5.cs
View File

@ -1,8 +1,6 @@
// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>. // Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
using osu.Game.Graphics;
namespace osu.Game.Rulesets.Mania.Mods namespace osu.Game.Rulesets.Mania.Mods
{ {
public class ManiaModKey5 : ManiaKeyMod public class ManiaModKey5 : ManiaKeyMod
@ -10,7 +8,6 @@ namespace osu.Game.Rulesets.Mania.Mods
public override int KeyCount => 5; public override int KeyCount => 5;
public override string Name => "Five Keys"; public override string Name => "Five Keys";
public override string ShortenedName => "5K"; public override string ShortenedName => "5K";
public override FontAwesome Icon => FontAwesome.fa_question;
public override string Description => @"Play with five keys."; public override string Description => @"Play with five keys.";
} }
} }

3
osu.Game.Rulesets.Mania/Mods/ManiaModKey6.cs
View File

@ -1,8 +1,6 @@
// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>. // Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
using osu.Game.Graphics;
namespace osu.Game.Rulesets.Mania.Mods namespace osu.Game.Rulesets.Mania.Mods
{ {
public class ManiaModKey6 : ManiaKeyMod public class ManiaModKey6 : ManiaKeyMod
@ -10,7 +8,6 @@ namespace osu.Game.Rulesets.Mania.Mods
public override int KeyCount => 6; public override int KeyCount => 6;
public override string Name => "Six Keys"; public override string Name => "Six Keys";
public override string ShortenedName => "6K"; public override string ShortenedName => "6K";
public override FontAwesome Icon => FontAwesome.fa_question;
public override string Description => @"Play with six keys."; public override string Description => @"Play with six keys.";
} }
} }

3
osu.Game.Rulesets.Mania/Mods/ManiaModKey7.cs
View File

@ -1,8 +1,6 @@
// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>. // Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
using osu.Game.Graphics;
namespace osu.Game.Rulesets.Mania.Mods namespace osu.Game.Rulesets.Mania.Mods
{ {
public class ManiaModKey7 : ManiaKeyMod public class ManiaModKey7 : ManiaKeyMod
@ -10,7 +8,6 @@ namespace osu.Game.Rulesets.Mania.Mods
public override int KeyCount => 7; public override int KeyCount => 7;
public override string Name => "Seven Keys"; public override string Name => "Seven Keys";
public override string ShortenedName => "7K"; public override string ShortenedName => "7K";
public override FontAwesome Icon => FontAwesome.fa_question;
public override string Description => @"Play with seven keys."; public override string Description => @"Play with seven keys.";
} }
} }

3
osu.Game.Rulesets.Mania/Mods/ManiaModKey8.cs
View File

@ -1,8 +1,6 @@
// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>. // Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
using osu.Game.Graphics;
namespace osu.Game.Rulesets.Mania.Mods namespace osu.Game.Rulesets.Mania.Mods
{ {
public class ManiaModKey8 : ManiaKeyMod public class ManiaModKey8 : ManiaKeyMod
@ -10,7 +8,6 @@ namespace osu.Game.Rulesets.Mania.Mods
public override int KeyCount => 8; public override int KeyCount => 8;
public override string Name => "Eight Keys"; public override string Name => "Eight Keys";
public override string ShortenedName => "8K"; public override string ShortenedName => "8K";
public override FontAwesome Icon => FontAwesome.fa_question;
public override string Description => @"Play with eight keys."; public override string Description => @"Play with eight keys.";
} }
} }

3
osu.Game.Rulesets.Mania/Mods/ManiaModKey9.cs
View File

@ -1,8 +1,6 @@
// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>. // Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
using osu.Game.Graphics;
namespace osu.Game.Rulesets.Mania.Mods namespace osu.Game.Rulesets.Mania.Mods
{ {
public class ManiaModKey9 : ManiaKeyMod public class ManiaModKey9 : ManiaKeyMod
@ -10,7 +8,6 @@ namespace osu.Game.Rulesets.Mania.Mods
public override int KeyCount => 9; public override int KeyCount => 9;
public override string Name => "Nine Keys"; public override string Name => "Nine Keys";
public override string ShortenedName => "9K"; public override string ShortenedName => "9K";
public override FontAwesome Icon => FontAwesome.fa_question;
public override string Description => @"Play with nine keys."; public override string Description => @"Play with nine keys.";
} }
} }

2
osu.Game.Rulesets.Mania/Mods/ManiaModMirror.cs
View File

@ -2,7 +2,6 @@
// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
using osu.Framework.Extensions.IEnumerableExtensions; using osu.Framework.Extensions.IEnumerableExtensions;
using osu.Game.Graphics;
using osu.Game.Rulesets.Mania.Objects; using osu.Game.Rulesets.Mania.Objects;
using osu.Game.Rulesets.Mania.UI; using osu.Game.Rulesets.Mania.UI;
using osu.Game.Rulesets.Mods; using osu.Game.Rulesets.Mods;
@ -15,7 +14,6 @@ namespace osu.Game.Rulesets.Mania.Mods
{ {
public override string Name => "Mirror"; public override string Name => "Mirror";
public override string ShortenedName => "MR"; public override string ShortenedName => "MR";
public override FontAwesome Icon => FontAwesome.fa_question;
public override ModType Type => ModType.Special; public override ModType Type => ModType.Special;
public override double ScoreMultiplier => 1; public override double ScoreMultiplier => 1;
public override bool Ranked => true; public override bool Ranked => true;

2
osu.Game/Overlays/Mods/ModSelectOverlay.cs
View File

@ -287,7 +287,7 @@ namespace osu.Game.Overlays.Mods
Anchor = Anchor.TopCentre, Anchor = Anchor.TopCentre,
Action = modButtonPressed, Action = modButtonPressed,
}, },
new AssistedSection new SpecialSection
{ {
RelativeSizeAxes = Axes.X, RelativeSizeAxes = Axes.X,
Origin = Anchor.TopCentre, Origin = Anchor.TopCentre,

4
osu.Game/Overlays/Mods/AssistedSection.cs → osu.Game/Overlays/Mods/SpecialSection.cs
View File

@ -8,7 +8,7 @@ using osu.Game.Rulesets.Mods;
namespace osu.Game.Overlays.Mods namespace osu.Game.Overlays.Mods
{ {
public class AssistedSection : ModSection public class SpecialSection : ModSection
{ {
protected override Key[] ToggleKeys => new[] { Key.Z, Key.X, Key.C, Key.V, Key.B, Key.N, Key.M }; protected override Key[] ToggleKeys => new[] { Key.Z, Key.X, Key.C, Key.V, Key.B, Key.N, Key.M };
public override ModType ModType => ModType.Special; public override ModType ModType => ModType.Special;
@ -19,7 +19,7 @@ namespace osu.Game.Overlays.Mods
SelectedColour = colours.BlueLight; SelectedColour = colours.BlueLight;
} }
public AssistedSection() public SpecialSection()
{ {
Header = @"Special"; Header = @"Special";
} }

2
osu.Game/Rulesets/Mods/ModDaycore.cs
View File

@ -12,7 +12,7 @@ namespace osu.Game.Rulesets.Mods
public override string Name => "Daycore"; public override string Name => "Daycore";
public override string ShortenedName => "DC"; public override string ShortenedName => "DC";
public override FontAwesome Icon => FontAwesome.fa_question; public override FontAwesome Icon => FontAwesome.fa_question;
public override string Description => "whoaaaaa..."; public override string Description => "Whoaaaaa...";
public override void ApplyToClock(IAdjustableClock clock) public override void ApplyToClock(IAdjustableClock clock)
{ {

2
osu.Game/Rulesets/Mods/ModDoubleTime.cs
View File

@ -13,7 +13,7 @@ namespace osu.Game.Rulesets.Mods
public override string ShortenedName => "DT"; public override string ShortenedName => "DT";
public override FontAwesome Icon => FontAwesome.fa_osu_mod_doubletime; public override FontAwesome Icon => FontAwesome.fa_osu_mod_doubletime;
public override ModType Type => ModType.DifficultyIncrease; public override ModType Type => ModType.DifficultyIncrease;
public override string Description => "Zoooooooooom"; public override string Description => "Zoooooooooom...";
public override bool Ranked => true; public override bool Ranked => true;
public override Type[] IncompatibleMods => new[] { typeof(ModHalfTime) }; public override Type[] IncompatibleMods => new[] { typeof(ModHalfTime) };

2
osu.Game/Rulesets/Mods/ModNightcore.cs
View File

@ -12,7 +12,7 @@ namespace osu.Game.Rulesets.Mods
public override string Name => "Nightcore"; public override string Name => "Nightcore";
public override string ShortenedName => "NC"; public override string ShortenedName => "NC";
public override FontAwesome Icon => FontAwesome.fa_osu_mod_nightcore; public override FontAwesome Icon => FontAwesome.fa_osu_mod_nightcore;
public override string Description => "uguuuuuuuu"; public override string Description => "Uguuuuuuuu...";
public override void ApplyToClock(IAdjustableClock clock) public override void ApplyToClock(IAdjustableClock clock)
{ {

2
osu.Game/osu.Game.csproj
View File

@ -553,7 +553,7 @@
<Compile Include="Overlays\MainSettings.cs" /> <Compile Include="Overlays\MainSettings.cs" />
<Compile Include="Overlays\MedalOverlay.cs" /> <Compile Include="Overlays\MedalOverlay.cs" />
<Compile Include="Overlays\MedalSplash\DrawableMedal.cs" /> <Compile Include="Overlays\MedalSplash\DrawableMedal.cs" />
<Compile Include="Overlays\Mods\AssistedSection.cs" /> <Compile Include="Overlays\Mods\SpecialSection.cs" />
<Compile Include="Overlays\Mods\DifficultyIncreaseSection.cs" /> <Compile Include="Overlays\Mods\DifficultyIncreaseSection.cs" />
<Compile Include="Overlays\Mods\DifficultyReductionSection.cs" /> <Compile Include="Overlays\Mods\DifficultyReductionSection.cs" />
<Compile Include="Overlays\Mods\ModButton.cs" /> <Compile Include="Overlays\Mods\ModButton.cs" />