Skip to content

add 1-10k #201

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
AiAe merged 1 commit into from
Jun 9, 2025
Merged

add 1-10k #201

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion Quaver.API/Enums/GameMode.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,15 @@ namespace Quaver.API.Enums
public enum GameMode
{
Keys4 = 1,
Keys7 = 2
Keys7 = 2,

Keys1 = 3,
Keys2 = 4,
Keys3 = 5,
Keys5 = 6,
Keys6 = 7,
Keys8 = 8,
Keys9 = 9,
Keys10 = 10,
}
}
88 changes: 76 additions & 12 deletions Quaver.API/Helpers/ModeHelper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@ namespace Quaver.API.Helpers
{
public static class ModeHelper
{
public static int MaxKeyCount => Enum.GetValues(typeof(GameMode)).Length;

/// <summary>
/// Converts game mode to short hand version.
/// </summary>
Expand All @@ -21,19 +23,25 @@ public static class ModeHelper
/// <exception cref="ArgumentOutOfRangeException"></exception>
public static string ToShortHand(GameMode mode, bool hasScratch = false)
{
string res;
switch (mode)
{
case GameMode.Keys4:
if (hasScratch)
return "4K+1";
return "4K";
case GameMode.Keys7:
if (hasScratch)
return "7K+1";
return "7K";
case GameMode.Keys4: res = "4K"; break;
case GameMode.Keys7: res = "7K"; break;

case GameMode.Keys1: res = "1K"; break;
case GameMode.Keys2: res = "2K"; break;
case GameMode.Keys3: res = "3K"; break;
case GameMode.Keys5: res = "5K"; break;
case GameMode.Keys6: res = "6K"; break;
case GameMode.Keys8: res = "8K"; break;
case GameMode.Keys9: res = "9K"; break;
case GameMode.Keys10: res = "10K"; break;
default:
throw new ArgumentOutOfRangeException(nameof(mode), mode, null);
}

return res + (hasScratch ? "+1" : "");
}

/// <summary>
Expand All @@ -46,13 +54,69 @@ public static string ToLongHand(GameMode mode)
{
switch (mode)
{
case GameMode.Keys4:
return "4 Keys";
case GameMode.Keys7:
return "7 Keys";
case GameMode.Keys4: return "4 Keys";
case GameMode.Keys7: return "7 Keys";

case GameMode.Keys1: return "1 Keys";
case GameMode.Keys2: return "2 Keys";
case GameMode.Keys3: return "3 Keys";
case GameMode.Keys5: return "5 Keys";
case GameMode.Keys6: return "6 Keys";
case GameMode.Keys8: return "8 Keys";
case GameMode.Keys9: return "9 Keys";
case GameMode.Keys10: return "10 Keys";
default:
throw new ArgumentOutOfRangeException(nameof(mode), mode, null);
}
}

public static int ToKeyCount(GameMode mode, bool hasScratch = false)
{
int res;
switch (mode)
{

case GameMode.Keys4: res = 4; break;
case GameMode.Keys7: res = 7; break;

case GameMode.Keys1: res = 1; break;
case GameMode.Keys2: res = 2; break;
case GameMode.Keys3: res = 3; break;
case GameMode.Keys5: res = 5; break;
case GameMode.Keys6: res = 6; break;
case GameMode.Keys8: res = 8; break;
case GameMode.Keys9: res = 9; break;
case GameMode.Keys10: res = 10; break;
default:
throw new ArgumentOutOfRangeException(nameof(mode), mode, null);
}

return res + (hasScratch ? 1 : 0);
}

public static GameMode FromKeyCount(int keyCount)
{
switch (keyCount)
{
case 4: return GameMode.Keys4;
case 7: return GameMode.Keys7;

case 1: return GameMode.Keys1;
case 2: return GameMode.Keys2;
case 3: return GameMode.Keys3;
case 5: return GameMode.Keys5;
case 6: return GameMode.Keys6;
case 8: return GameMode.Keys8;
case 9: return GameMode.Keys9;
case 10: return GameMode.Keys10;
default: throw new ArgumentOutOfRangeException(nameof(keyCount), keyCount, null);
}
}

public static bool IsKeyMode(GameMode mode)
{
// we only have keys gamemode for now...
return true;
}
}
}
13 changes: 2 additions & 11 deletions Quaver.API/Maps/Parsers/Malody/MalodyFile.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
using Newtonsoft.Json;
using Quaver.API.Enums;
using Quaver.API.Helpers;
using Quaver.API.Maps.Structures;
using System;
using System.Collections.Generic;
Expand Down Expand Up @@ -57,17 +58,7 @@ public Qua ToQua()
if (Meta.Mode != 0)
throw new ArgumentException("Only the 'Key' Malody game mode can be converted to Qua");

switch (Meta.Keymode.Keymode)
{
case 4:
qua.Mode = GameMode.Keys4;
break;
case 7:
qua.Mode = GameMode.Keys7;
break;
default:
throw new InvalidEnumArgumentException();
}
qua.Mode = ModeHelper.FromKeyCount(Meta.Keymode.Keymode);

foreach (var tp in TimingPoints)
{
Expand Down
23 changes: 3 additions & 20 deletions Quaver.API/Maps/Parsers/OsuBeatmap.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -293,7 +293,7 @@
case "CircleSize":
KeyCount = int.Parse(value, CultureInfo.InvariantCulture);

if (KeyCount != 4 && KeyCount != 7 && KeyCount != 5 && KeyCount != 8)
if (KeyCount < 1 || KeyCount > ModeHelper.MaxKeyCount)
IsValid = false;
break;
case "OverallDifficulty":
Expand Down Expand Up @@ -369,7 +369,7 @@
}
}
}
catch (Exception e)

Check warning on line 372 in Quaver.API/Maps/Parsers/OsuBeatmap.cs

View workflow job for this annotation

GitHub Actions / build 

The variable 'e' is declared but never used

Check warning on line 372 in Quaver.API/Maps/Parsers/OsuBeatmap.cs

View workflow job for this annotation

GitHub Actions / build 

The variable 'e' is declared but never used
{
IsValid = false;
}
Expand Down Expand Up @@ -421,7 +421,7 @@
}
}
}
catch (Exception e)

Check warning on line 424 in Quaver.API/Maps/Parsers/OsuBeatmap.cs

View workflow job for this annotation

GitHub Actions / build 

The variable 'e' is declared but never used
{
IsValid = false;
}
Expand Down Expand Up @@ -476,27 +476,10 @@
Tags = Tags,
Creator = Creator,
DifficultyName = Version,
Description = $"This is a Quaver converted version of {Creator}'s map."
Description = $"This is a Quaver converted version of {Creator}'s map.",
Mode = ModeHelper.FromKeyCount(KeyCount)
};

// Get the correct game mode based on the amount of keys the map has.
switch (KeyCount)
{
case 4:
qua.Mode = GameMode.Keys4;
break;
case 7:
qua.Mode = GameMode.Keys7;
break;
case 8:
qua.Mode = GameMode.Keys7;
qua.HasScratchKey = true;
break;
default:
qua.Mode = (GameMode)(-1);
break;
}

foreach (var path in CustomAudioSamples)
{
qua.CustomAudioSamples.Add(new CustomAudioSampleInfo()
Expand Down
Loading
Loading