Fixed issue that merge feature removed implicit and tempered affix in…

…formation.
josdemmers · Jun 13, 2024 · 93d9dc6 · 93d9dc6
1 parent f560c6c
commit 93d9dc6
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 6 deletions.
diff --git a/D4Companion/ViewModels/Dialogs/ImportAffixPresetViewModel.cs b/D4Companion/ViewModels/Dialogs/ImportAffixPresetViewModel.cs
@@ -497,8 +497,7 @@ private void ImportAffixPresetDoneExecute()
         private bool CanMergeBuildsExecute()
         {
             return !string.IsNullOrWhiteSpace(SelectedAffixPresetBuild1.Name)
-                && !string.IsNullOrWhiteSpace(SelectedAffixPresetBuild2.Name)
-                && !SelectedAffixPresetBuild1.Name.Equals(SelectedAffixPresetBuild2.Name);
+                && !string.IsNullOrWhiteSpace(SelectedAffixPresetBuild2.Name);
         }
 
         private async void MergeBuildsExecute()
@@ -535,7 +534,10 @@ private async void MergeBuildsExecute()
                 {
                     Id = a.Id,
                     Type = a.Type,
-                    Color = ChangeColorBuild1 ? ColorBuild1 : a.Color
+                    Color = ChangeColorBuild1 ? ColorBuild1 : a.Color,
+                    IsGreater = a.IsGreater,
+                    IsImplicit = a.IsImplicit,
+                    IsTempered = a.IsTempered
                 };
             }));
             affixPreset.ItemAspects.AddRange(SelectedAffixPresetBuild1.ItemAspects.Select(a =>
@@ -544,7 +546,7 @@ private async void MergeBuildsExecute()
                 {
                     Id = a.Id,
                     Type = a.Type,
-                    Color = ChangeColorBuild1 ? ColorBuild1 : a.Color
+                    Color = ChangeColorBuild1 ? ColorBuild1 : a.Color,
                 };
             }));
             affixPreset.ItemSigils.AddRange(SelectedAffixPresetBuild1.ItemSigils.Select(s =>
@@ -568,6 +570,9 @@ private async void MergeBuildsExecute()
                         Id = itemAffixBuild2.Id,
                         Type = itemAffixBuild2.Type,
                         Color = ChangeColorBuild2 ? ColorBuild2 : itemAffixBuild2.Color,
+                        IsGreater = itemAffixBuild2.IsGreater,
+                        IsImplicit = itemAffixBuild2.IsImplicit,
+                        IsTempered = itemAffixBuild2.IsTempered
                     });
                 }
                 else

diff --git a/D4Companion/common.props b/D4Companion/common.props
@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
-    <FileVersion>3.6.2.0</FileVersion>
-    <Version>3.6.2.0</Version>
+    <FileVersion>3.6.3.0</FileVersion>
+    <Version>3.6.3.0</Version>
     <Copyright>Copyright © 2024</Copyright>
     <TargetFramework>net6.0-windows</TargetFramework>
   </PropertyGroup>