Skip to content

Commit 0107f5e

Browse files
committed
Feat(#93): Updated Constants and fixed some typos for game modes
1 parent d7f369b commit 0107f5e

File tree

4 files changed

+42
-14
lines changed

4 files changed

+42
-14
lines changed

VexTrack.sln.DotSettings.user

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
2+
<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AThrowHelper_002Ecs_002Fl_003AC_0021_003FUsers_003Ftim_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FSourcesCache_003F2c8e7ca976f350cba9836d5565dac56b11e0b56656fa786460eb1395857a6fa_003FThrowHelper_002Ecs_002Fz_003A3_002D2/@EntryIndexedValue">ForceIncluded</s:String></wpf:ResourceDictionary>

VexTrack/Core/Constants.cs

Lines changed: 28 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -32,24 +32,40 @@ static class Constants
3232
public static readonly List<string> Maps = new List<string>()
3333
{
3434
"Ascent",
35+
"Split",
36+
"Fracture",
3537
"Bind",
3638
"Breeze",
37-
"Fracture",
38-
"Haven",
39+
"Abyss",
40+
"Lotus",
41+
"Sunset",
42+
"Peral",
3943
"Icebox",
40-
"Split",
41-
"None"
44+
"Corrode",
45+
"Haven",
46+
"Disctrict",
47+
"Kasbah",
48+
"Drift",
49+
"Glitch",
50+
"Piazza",
51+
"Skirmish A",
52+
"Skirmish B",
53+
"Skirmish C",
54+
"Custom"
4255
};
4356

4457
public static readonly List<string> Gamemodes = new List<string>()
4558
{
4659
"Unrated",
47-
"Competetive",
60+
"Competitive",
61+
"Swiftplay",
4862
"Spike Rush",
63+
"Team Deathmatch",
4964
"Deathmatch",
5065
"Escalation",
5166
"Replication",
52-
"Snowballfight",
67+
"Snowball Fight",
68+
"Skirmish",
5369
"Custom"
5470
};
5571

@@ -58,11 +74,14 @@ static class Constants
5874
[Gamemodes[0]] = "Score",
5975
[Gamemodes[1]] = "Score",
6076
[Gamemodes[2]] = "Score",
61-
[Gamemodes[3]] = "Placement",
77+
[Gamemodes[3]] = "Score",
6278
[Gamemodes[4]] = "Score",
63-
[Gamemodes[5]] = "Score",
79+
[Gamemodes[5]] = "Placement",
6480
[Gamemodes[6]] = "Score",
65-
[Gamemodes[7]] = "None"
81+
[Gamemodes[7]] = "Score",
82+
[Gamemodes[8]] = "Score",
83+
[Gamemodes[9]] = "Score",
84+
[Gamemodes[10]] = "None"
6685
};
6786

6887
public static readonly Dictionary<string, int> StreakStatusOrder = new Dictionary<string, int>

VexTrack/Core/TrackingData.cs

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -273,7 +273,18 @@ public static void LoadData()
273273
string map = (string)historyEntry["map"];
274274
string description = (string)historyEntry["description"];
275275

276-
if (map == null || map == "") map = Constants.Maps.Last();
276+
// Fix previous typos
277+
if (gamemode == "Competetive")
278+
{
279+
gamemode = "Competitive";
280+
reSave = true;
281+
}
282+
283+
if (gamemode == "Snowballfight")
284+
{
285+
gamemode = "Snowball Fight";
286+
reSave = true;
287+
}
277288

278289
string gameMode, desc;
279290
int score, enemyScore;

VexTrack/VexTrack.csproj

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,6 @@
2626
<Content Include="Images\VexTrack.ico" />
2727
</ItemGroup>
2828

29-
<ItemGroup>
30-
<Folder Include="Fonts\" />
31-
</ItemGroup>
32-
3329
<ItemGroup>
3430
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
3531
<PackageReference Include="OxyPlot.Wpf" Version="2.0.0" />

0 commit comments

Comments
 (0)