From 515e0726621c112a2713f23e0dda46ae1ff48ee3 Mon Sep 17 00:00:00 2001 From: Piotrekol <4990365+Piotrekol@users.noreply.github.com> Date: Fri, 30 Jul 2021 23:32:47 +0200 Subject: [PATCH] Misc: Rename Omod to NM (NoMod) --- App/Presenters/Controls/UserTopGeneratorPresenter.cs | 2 +- CollectionManagerDll/DataTypes/Beatmap.cs | 2 +- CollectionManagerDll/DataTypes/Mods.cs | 2 +- CollectionManagerDll/Modules/ModParser/ModParser.cs | 12 ++++++------ .../Modules/ModParser/ModParserTests.cs | 8 ++++---- .../Modules/BeatmapFilter/BeatmapFilter.cs | 6 +++--- GuiComponents/Controls/BeatmapListingView.cs | 2 +- 7 files changed, 17 insertions(+), 17 deletions(-) diff --git a/App/Presenters/Controls/UserTopGeneratorPresenter.cs b/App/Presenters/Controls/UserTopGeneratorPresenter.cs index e367a38..b52682d 100644 --- a/App/Presenters/Controls/UserTopGeneratorPresenter.cs +++ b/App/Presenters/Controls/UserTopGeneratorPresenter.cs @@ -55,7 +55,7 @@ private void ViewOnStart(object sender, EventArgs eventArgs) foreach (var splitModCombination in splitModCombinations) { var splitMods = Regex.Split(splitModCombination, @"([A-Za-z]{2})").Where(s => !string.IsNullOrEmpty(s)).ToList(); - Mods mods = Mods.Omod; + Mods mods = Mods.Nm; foreach (var mod in splitMods) { if (Enum.TryParse(mod, true, out Mods parsedMod)) diff --git a/CollectionManagerDll/DataTypes/Beatmap.cs b/CollectionManagerDll/DataTypes/Beatmap.cs index ca74db9..f62d533 100644 --- a/CollectionManagerDll/DataTypes/Beatmap.cs +++ b/CollectionManagerDll/DataTypes/Beatmap.cs @@ -78,7 +78,7 @@ public string MapSetLink public PlayModeStars ModPpStars = new PlayModeStars(); public double StarsNomod => Stars(PlayMode); - public double Stars(PlayMode playMode, Mods mods = Mods.Omod) + public double Stars(PlayMode playMode, Mods mods = Mods.Nm) { mods = mods & Mods.MapChanging; if (ModPpStars.ContainsKey(_playMode) && ModPpStars[_playMode].ContainsKey((int)mods)) diff --git a/CollectionManagerDll/DataTypes/Mods.cs b/CollectionManagerDll/DataTypes/Mods.cs index 9b95923..3d01a51 100644 --- a/CollectionManagerDll/DataTypes/Mods.cs +++ b/CollectionManagerDll/DataTypes/Mods.cs @@ -5,7 +5,7 @@ namespace CollectionManager.DataTypes [Flags] public enum Mods { - Omod = 0, + Nm = 0, Nf = 1 << 0, Ez = 1 << 1, Td = 1 << 2, //Touch device diff --git a/CollectionManagerDll/Modules/ModParser/ModParser.cs b/CollectionManagerDll/Modules/ModParser/ModParser.cs index cb5b83c..885760e 100644 --- a/CollectionManagerDll/Modules/ModParser/ModParser.cs +++ b/CollectionManagerDll/Modules/ModParser/ModParser.cs @@ -23,13 +23,13 @@ public OsuMod(Mods value, string shortMod, string longMod) public string ShortNoModText { - get { return _mods.Find(f => f.Value == Mods.Omod).ShortMod; } - set { _mods.Find(f => f.Value == Mods.Omod).ShortMod = value; } + get { return _mods.Find(f => f.Value == Mods.Nm).ShortMod; } + set { _mods.Find(f => f.Value == Mods.Nm).ShortMod = value; } } public string LongNoModText { - get { return _mods.Find(f => f.Value == Mods.Omod).LongMod; } - set { _mods.Find(f => f.Value == Mods.Omod).LongMod = value; } + get { return _mods.Find(f => f.Value == Mods.Nm).LongMod; } + set { _mods.Find(f => f.Value == Mods.Nm).LongMod = value; } } public ReadOnlyCollection AllMods => _mods.AsReadOnly(); public List HiddenMods { get; } = new List @@ -37,7 +37,7 @@ public string LongNoModText }; private readonly List _mods = new List() { - new OsuMod(Mods.Omod, "None", "None"), + new OsuMod(Mods.Nm, "None", "None"), new OsuMod(Mods.Nf, "NF", "No Fail"), new OsuMod(Mods.Ez, "EZ", "Easy"), new OsuMod(Mods.Td, "TD","Touch Device"), @@ -76,7 +76,7 @@ public string LongNoModText public Mods GetModsFromInt(int mods) { - Mods eMods = Mods.Omod; + Mods eMods = Mods.Nm; foreach (var mod in _mods) { if (!IsModHidden(mod) && (mods & (int)mod.Value) > 0) diff --git a/CollectionManagerDllTests/Modules/ModParser/ModParserTests.cs b/CollectionManagerDllTests/Modules/ModParser/ModParserTests.cs index 6a67dda..a096bc5 100644 --- a/CollectionManagerDllTests/Modules/ModParser/ModParserTests.cs +++ b/CollectionManagerDllTests/Modules/ModParser/ModParserTests.cs @@ -104,7 +104,7 @@ public void ModsHiding1() public void NoModText1() { _modParser = new ModParser(); - var mods = Mods.Omod; + var mods = Mods.Nm; var result = _modParser.GetModsFromEnum((int)mods); Assert.IsTrue(result.Count(s => s == ',') == 0); @@ -114,7 +114,7 @@ public void NoModText1() public void NoModText2() { _modParser = new ModParser(); - var mods = Mods.Omod; + var mods = Mods.Nm; var result = _modParser.GetModsFromEnum((int)mods, true); Assert.IsTrue(result.Count(s => s == ',') == 0); @@ -124,7 +124,7 @@ public void NoModText2() public void NoModText3() { _modParser = new ModParser(); - var mods = Mods.Omod; + var mods = Mods.Nm; _modParser.LongNoModText = "No mods enabled"; Assert.IsTrue(_modParser.LongNoModText == "No mods enabled"); _modParser.ShortNoModText = "N/A"; @@ -139,7 +139,7 @@ public void NoModText3() public void NoModText4() { _modParser = new ModParser(); - var mods = Mods.Omod; + var mods = Mods.Nm; _modParser.LongNoModText = "No mods enabled"; Assert.IsTrue(_modParser.LongNoModText == "No mods enabled"); _modParser.ShortNoModText = "N/A"; diff --git a/CollectionManagerExtensionsDll/Modules/BeatmapFilter/BeatmapFilter.cs b/CollectionManagerExtensionsDll/Modules/BeatmapFilter/BeatmapFilter.cs index 6069a7d..ce5ed07 100644 --- a/CollectionManagerExtensionsDll/Modules/BeatmapFilter/BeatmapFilter.cs +++ b/CollectionManagerExtensionsDll/Modules/BeatmapFilter/BeatmapFilter.cs @@ -78,7 +78,7 @@ public void UpdateSearch(string searchString) if (!words.Any(s => s.Contains("mods"))) { - CurrentMods = Mods.Omod; + CurrentMods = Mods.Nm; } foreach (string w in words) @@ -98,7 +98,7 @@ public void UpdateSearch(string searchString) } } - public Mods CurrentMods { get; private set; } = Mods.Omod; + public Mods CurrentMods { get; private set; } = Mods.Nm; public PlayMode CurrentPlayMode { get; private set; } = PlayMode.Osu; private double GetStars(Beatmap b) => b.Stars(CurrentPlayMode, CurrentMods); @@ -203,7 +203,7 @@ private searchFilter GetSearchFilter(string searchWord) { case "mods": var splitMods = Regex.Split(val, @"([A-Za-z]{2})").Where(s => !string.IsNullOrEmpty(s)).ToList(); - Mods mods = Mods.Omod; + Mods mods = Mods.Nm; foreach (var mod in splitMods) { if (Enum.TryParse(mod, true, out Mods parsedMod)) diff --git a/GuiComponents/Controls/BeatmapListingView.cs b/GuiComponents/Controls/BeatmapListingView.cs index 56b8324..b5819ad 100644 --- a/GuiComponents/Controls/BeatmapListingView.cs +++ b/GuiComponents/Controls/BeatmapListingView.cs @@ -110,7 +110,7 @@ private void UpdateResultsCount() label_resultsCount.Text = string.Format("{0} {1}", count, count == 1 ? "map" : "maps"); } public static DateTime d = new DateTime(2006, 1, 1); - private Mods _currentMods = Mods.Omod; + private Mods _currentMods = Mods.Nm; private PlayMode _currentPlayMode = PlayMode.Osu; private DifficultyCalculator _difficultyCalculator = new DifficultyCalculator(); private void InitListView()