Merge branch 'dev'

Triky313 · Jun 15, 2024 · e1ed7c8 · e1ed7c8
2 parents 1b785b3 + d9b5375
commit e1ed7c8
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 9 deletions.
diff --git a/src/StatisticsAnalysisTool/Network/Manager/CombatController.cs b/src/StatisticsAnalysisTool/Network/Manager/CombatController.cs
@@ -440,12 +440,12 @@ private void AddOrUpdateSpell(int causingSpellIndex, PlayerGameObject playerGame
         }
     }
 
-    private static async Task AddOrUpdateSpellFragmentAsync(ObservableCollection<UsedSpellFragment> spellsFragments, List<UsedSpell> spells)
+    private static async Task AddOrUpdateSpellFragmentAsync(ObservableCollection<UsedSpellFragment> spellsFragments, IReadOnlyCollection<UsedSpell> spells)
     {
         var fragmentsToAdd = new List<UsedSpellFragment>();
         var fragmentsToUpdate = new List<UsedSpellFragment>();
-        var totalDamage = spells.Sum(spell => spell.DamageHealValue);
-        var maxDamage = spells.Max(spell => spell.DamageHealValue);
+        var totalDamage = spells.Sum(spell => spell?.DamageHealValue) ?? 0;
+        var maxDamage = spells.Max(spell => spell?.DamageHealValue) ?? 0;
 
         await Application.Current.Dispatcher.InvokeAsync(async () =>
         {

diff --git a/src/StatisticsAnalysisTool/Network/Manager/EntityController.cs b/src/StatisticsAnalysisTool/Network/Manager/EntityController.cs
@@ -68,6 +68,7 @@ public void AddEntity(Entity entity)
                 Heal = oldEntity.Heal,
                 Overhealed = oldEntity.Overhealed,
                 IsInParty = oldEntity.IsInParty,
+                Spells = oldEntity.Spells
             };
         }
         else

diff --git a/src/StatisticsAnalysisTool/Properties/AssemblyInfo.cs b/src/StatisticsAnalysisTool/Properties/AssemblyInfo.cs
@@ -49,5 +49,5 @@
 // Sie können alle Werte angeben oder Standardwerte für die Build- und Revisionsnummern verwenden,
 // indem Sie "*" wie unten gezeigt eingeben:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("7.5.1.*")]
-[assembly: AssemblyFileVersion("7.5.1.0")]
+[assembly: AssemblyVersion("7.5.2.*")]
+[assembly: AssemblyFileVersion("7.5.2.0")]
diff --git a/src/StatisticsAnalysisTool/Styles/TrackingStyles.xaml b/src/StatisticsAnalysisTool/Styles/TrackingStyles.xaml
@@ -418,9 +418,9 @@
         </StackPanel>
     </DataTemplate>
 
-    <DataTemplate DataType="{x:Type models:MainStatObject}">
+    <DataTemplate x:Key="FactionPointStatsTemplate" DataType="{x:Type models:MainStatObject}">
         <StackPanel Orientation="Vertical" Margin="10,0,10,0" Visibility="{Binding Visibility}">
-            <Image Style="{StaticResource Tracker.Fraction.Coin.Icon}" ToolTip="{Binding TranslationTotalFactionPoints, FallbackValue='TOTAL__FACTION__POINTS'}" />
+            <Image Style="{StaticResource Tracker.Fraction.Coin.Icon}" ToolTip="{Binding TranslationTotalFactionPoints, FallbackValue='TOTAL__FACTION__POINTS'}" Width="22" Height="22" />
             <TextBlock Text="{Binding Value, StringFormat='{}{0:N0}', FallbackValue=0}" FontSize="16" Foreground="{StaticResource SolidColorBrush.Text.1}" HorizontalAlignment="Center" />
             <TextBlock FontSize="16" Text="{Binding ValuePerHour, Converter={StaticResource ValuePerHourConverter}, FallbackValue=0 /h}"
                            Foreground="{StaticResource SolidColorBrush.Text.1}" HorizontalAlignment="Center" />

diff --git a/src/StatisticsAnalysisTool/UserControls/DashboardControl.xaml b/src/StatisticsAnalysisTool/UserControls/DashboardControl.xaml
@@ -6,6 +6,7 @@
              xmlns:viewModels="clr-namespace:StatisticsAnalysisTool.ViewModels"
              xmlns:fa5="http://schemas.fontawesome.com/icons/"
              xmlns:glob="clr-namespace:System.Globalization;assembly=System.Runtime"
+             xmlns:models="clr-namespace:StatisticsAnalysisTool.Models"
              mc:Ignorable="d" 
              d:DesignHeight="1400" d:DesignWidth="800"
              d:DataContext="{d:DesignInstance Type=viewModels:MainWindowViewModel}">
@@ -50,7 +51,7 @@
                             <TextBlock FontSize="16" Text="{Binding DashboardBindings.FavorPerHour, Converter={StaticResource ValuePerHourConverter}, FallbackValue=0 /h}"
                            Foreground="{StaticResource SolidColorBrush.Text.1}" HorizontalAlignment="Center" />
                         </StackPanel>
-                        <ItemsControl ItemsSource="{Binding FactionPointStats}" />
+                        <ItemsControl ItemsSource="{Binding FactionPointStats}" ItemTemplate="{StaticResource FactionPointStatsTemplate}" />
                     </DockPanel>
                     <StackPanel Orientation="Horizontal" Margin="0,10,5,0" HorizontalAlignment="Right" VerticalAlignment="Top">
                         <StackPanel IsEnabled="{Binding IsTrackingActive, FallbackValue=false}" Width="240">

diff --git a/src/StatisticsAnalysisTool/Views/DashboardWindow.xaml b/src/StatisticsAnalysisTool/Views/DashboardWindow.xaml
@@ -60,7 +60,7 @@
                                 <TextBlock FontSize="16" Text="{Binding DashboardBindings.FavorPerHour, Converter={StaticResource ValuePerHourConverter}, FallbackValue=0 /h}"
                                Foreground="{StaticResource SolidColorBrush.Text.1}" HorizontalAlignment="Center" />
                             </StackPanel>
-                            <ItemsControl ItemsSource="{Binding FactionPointStats}" />
+                            <ItemsControl ItemsSource="{Binding FactionPointStats}" ItemTemplate="{StaticResource FactionPointStatsTemplate}" />
                         </DockPanel>
                         <Separator Background="{StaticResource SolidColorBrush.Background.3}" Height="4" Margin="0,0,0,0" VerticalAlignment="Top" />
                         <Grid>