Merge pull request #431 from wbonbon/master

update UltraScouter
anoyetta · Nov 18, 2024 · 37b913a · 37b913a
2 parents 74f660a + a9b3d76
commit 37b913a
Show file tree

Hide file tree

Showing 8 changed files with 38 additions and 5 deletions.
diff --git a/source/@MasterVersion.txt b/source/@MasterVersion.txt
@@ -1 +1 @@
-v10.4.1
+v10.4.2
diff --git a/source/ACT.Hojoring.Common/Version.cs b/source/ACT.Hojoring.Common/Version.cs
@@ -1,4 +1,4 @@
 using System.Reflection;
 
-[assembly: AssemblyVersion("10.4.0.1")]
-[assembly: AssemblyFileVersion("10.4.0.1")]
+[assembly: AssemblyVersion("10.4.0.2")]
+[assembly: AssemblyFileVersion("10.4.0.2")]
diff --git a/source/ACT.UltraScouter/ACT.UltraScouter.Core/Config/FFLogs.cs b/source/ACT.UltraScouter/ACT.UltraScouter.Core/Config/FFLogs.cs
@@ -110,6 +110,14 @@ public FFLogsDifficulty Difficulty
             set => this.SetProperty(ref this.difficulty, value);
         }
 
+        private FFLogsMetric metric = FFLogsMetric.rdps;
+        [DataMember]
+        public FFLogsMetric Metric
+        {
+            get => this.metric;
+            set => this.SetProperty(ref this.metric, value);
+        }
+
         private double refreshInterval = 8.0d;
 
         [DataMember]

diff --git a/source/ACT.UltraScouter/ACT.UltraScouter.Core/Config/Settings.Defaults.cs b/source/ACT.UltraScouter/ACT.UltraScouter.Core/Config/Settings.Defaults.cs
@@ -242,6 +242,7 @@ public partial class Settings :
                 FromCommandTTL = 14.0d,
                 CategoryColors = FFLogs.DefaultCategoryColors,
                 Partition = FFLogsPartitions.Standard,
+                Metric = FFLogsMetric.rdps,
             }},
 
             #endregion Target

diff --git a/...T.UltraScouter/ACT.UltraScouter.Core/Config/UI/ViewModels/TargetConfigViewModel.FFLogs.cs b/...T.UltraScouter/ACT.UltraScouter.Core/Config/UI/ViewModels/TargetConfigViewModel.FFLogs.cs
@@ -24,6 +24,8 @@ public partial class TargetConfigViewModel
 
         public IEnumerable<FFLogsDifficulty> FFLogsDifficulties => Enum.GetValues(typeof(FFLogsDifficulty)).Cast<FFLogsDifficulty>();
 
+        public IEnumerable<FFLogsMetric> FFLogsMetrics => Enum.GetValues(typeof(FFLogsMetric)).Cast<FFLogsMetric>();
+
         private ICommand ffLogsDisplayTextFontCommand;
         private ICommand ffLogsDisplayTextColorCommand;
         private ICommand ffLogsDisplayTextOutlineColorCommand;

diff --git a/source/ACT.UltraScouter/ACT.UltraScouter.Core/Config/UI/Views/FFLogsConfigView.xaml b/source/ACT.UltraScouter/ACT.UltraScouter.Core/Config/UI/Views/FFLogsConfigView.xaml
@@ -42,7 +42,7 @@
     </ResourceDictionary>
   </Page.Resources>
 
-  <ScrollViewer>
+  <ScrollViewer Height="1074">
     <StackPanel Margin="20">
       <CheckBox
         Margin="0 0 0 0"
@@ -161,8 +161,17 @@
         Width="120"
         ItemsSource="{Binding FFLogsDifficulties, Mode=OneWay}"
         SelectedItem="{Binding FFLogs.Difficulty, Mode=TwoWay}" />
-
+        
       <Label
+        Margin="0 10 0 0"
+        Content="FFLogs metric" />
+      <ComboBox
+        HorizontalAlignment="Left"
+        Width="80"
+        ItemsSource="{Binding FFLogsMetrics, Mode=OneWay}"
+        SelectedItem="{Binding FFLogs.Metric, Mode=TwoWay}" />
+
+            <Label
         Margin="0 25 0 0"
         Content="FFLogs API Tester" />
       <StackPanel Margin="8 0 0 0">

diff --git a/source/ACT.UltraScouter/ACT.UltraScouter.Core/Models/FFLogs/Enums.cs b/source/ACT.UltraScouter/ACT.UltraScouter.Core/Models/FFLogs/Enums.cs
@@ -35,4 +35,16 @@ public enum FFLogsDifficulty
         Normal = 100,
         Savage = 101,
     }
+
+    public enum FFLogsMetric
+    {
+        [Display(Name = "rDPS")]
+        rdps = 0,
+        [Display(Name = "aDPS")]
+        adps = 1,
+        [Display(Name = "nDPS")]
+        ndps = 2,
+        [Display(Name = "cDPS")]
+        cdps = 3,
+    }
 }
diff --git a/source/ACT.UltraScouter/ACT.UltraScouter.Core/Models/FFLogs/ParseTotalModel.cs b/source/ACT.UltraScouter/ACT.UltraScouter.Core/Models/FFLogs/ParseTotalModel.cs
@@ -512,6 +512,7 @@ public async Task GetParseAsync(
 
                 var query = HttpUtility.ParseQueryString(string.Empty);
                 query["timeframe"] = "historical";
+                query["metric"] = Settings.Instance.FFLogs.Metric.ToString();
                 query["api_key"] = Settings.Instance.FFLogs.ApiKey;
 
                 if (partition != FFLogsPartitions.Current)