Add !MaxCombo! and rename live max combo token to !CurrentMaxCombo!

resolves #17
Piotrekol · Feb 24, 2018 · 74b0b72 · 74b0b72
1 parent 847b8cd
commit 74b0b72
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/osu!StreamCompanion/Code/Modules/MapDataParsers/Parser1/OutputPattern.cs b/osu!StreamCompanion/Code/Modules/MapDataParsers/Parser1/OutputPattern.cs
@@ -13,7 +13,7 @@ public class OutputPattern : EventArgs, INotifyPropertyChanged, ICloneable
     {
         private static readonly List<string> _memoryFormatTokens = new List<string>
         {
-            "!acc!", "!300!", "!100!", "!50!", "!miss!", "!time!", "!combo!", "!comboMax!", "!PpIfMapEndsNow!", "!PpIfRestFced!", "!AccIfRestFced!"
+            "!acc!", "!300!", "!100!", "!50!", "!miss!", "!time!", "!combo!", "!CurrentMaxCombo!", "!PpIfMapEndsNow!", "!PpIfRestFced!", "!AccIfRestFced!"
         };
 
         public ReadOnlyCollection<string> MemoryFormatTokens => _memoryFormatTokens.AsReadOnly();

diff --git a/osu!StreamCompanion/Code/Modules/MapDataParsers/Parser1/PatternEdit.cs b/osu!StreamCompanion/Code/Modules/MapDataParsers/Parser1/PatternEdit.cs
@@ -50,7 +50,7 @@ public OutputPattern Current
             { "!miss!", "15" },
             { "!time!", "116,5" },
             { "!combo!", "124" },
-            { "!comboMax!", "1000" },
+            { "!CurrentMaxCombo!", "1000" },
             { "!PpIfMapEndsNow!", "99,52pp" },
             { "!PpIfRestFced!", "257,27pp" },
             { "!AccIfRestFced!", "99,54%" }

diff --git a/osu!StreamCompanion/Code/Modules/MapDataReplacements/PP/PpReplacements.cs b/osu!StreamCompanion/Code/Modules/MapDataReplacements/PP/PpReplacements.cs
@@ -33,6 +33,7 @@ public Dictionary<string, string> GetMapReplacements(MapSearchResult map)
         {
             var ret = new Dictionary<string, string>
             {
+                {"!MaxCombo!", ""},
                 {"!SSPP!", ""},
                 {"!99.9PP!", ""},
                 {"!99PP!", ""},
@@ -67,6 +68,8 @@ public Dictionary<string, string> GetMapReplacements(MapSearchResult map)
                     {
                         var beatmap = Beatmap.Read(reader);
 
+                        ret["!MaxCombo!"] = beatmap.GetMaxCombo().ToString(CultureInfo.InvariantCulture);
+
                         var beatmapCalc = diffCalculator.Calc(beatmap, Mods.NoMod);
 
                         ret["!SSPP!"] = GetPp(beatmap, 100d).ToString(CultureInfo.InvariantCulture);