From 700f0a86b991fc3cfea18318b3ab1307bda57e86 Mon Sep 17 00:00:00 2001
From: occluder <69414142+occluder@users.noreply.github.com>
Date: Tue, 17 Feb 2026 14:08:52 +0300
Subject: [PATCH 1/6] Add running total of platinum and ducats to 'Auto Add'
 window

---
 WFInfo/AutoAddViewModel.cs | 76 +++++++++++++++++++++++++++++++++++---
 WFInfo/AutoCount.xaml      | 18 +++++++--
 2 files changed, 84 insertions(+), 10 deletions(-)

diff --git a/WFInfo/AutoAddViewModel.cs b/WFInfo/AutoAddViewModel.cs
index 6fc2a29f..253c6106 100644
--- a/WFInfo/AutoAddViewModel.cs
+++ b/WFInfo/AutoAddViewModel.cs
@@ -2,14 +2,18 @@
 using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
+using System.Globalization;
 
 namespace WFInfo
 {
     public class AutoAddViewModel : INPC
     {
         private ObservableCollection<AutoAddSingleItem> _itemList;
+        private double _totalPlatinum;
+        private int _totalDucats;
+        private const NumberStyles styles = NumberStyles.AllowDecimalPoint | NumberStyles.AllowThousands | NumberStyles.AllowExponent;
 
-        public  ObservableCollection<AutoAddSingleItem> ItemList
+        public ObservableCollection<AutoAddSingleItem> ItemList
         {
             get => _itemList;
             private set
@@ -18,6 +22,26 @@ private set
                 RaisePropertyChanged();
             }
         }
+
+        public double TotalPlatinum
+        {
+            get => _totalPlatinum;
+            private set
+            {
+                _totalPlatinum = value;
+                RaisePropertyChanged();
+            }
+        }
+        public int TotalDucats
+        {
+            get => _totalDucats;
+            private set
+            {
+                _totalDucats = value;
+                RaisePropertyChanged();
+            }
+        }
+
         public AutoAddViewModel()
         {
             _itemList = new ObservableCollection<AutoAddSingleItem>();
@@ -26,13 +50,46 @@ public AutoAddViewModel()
         public void addItem(AutoAddSingleItem item)
         {
             _itemList.Add(item);
-            RaisePropertyChanged();
+            UpdateTotalsForOptionChange(null, item.ActiveOption);
         }
 
         public void removeItem(AutoAddSingleItem item)
         {
+            UpdateTotalsForOptionChange(item.ActiveOption, null);
             _itemList.Remove(item);
-            RaisePropertyChanged();
+        }
+
+        public void UpdateTotalsForOptionChange(string previousOption, string newOption)
+        {
+            if (!string.IsNullOrEmpty(previousOption))
+            {
+                JObject previousJob = (JObject)Main.dataBase.marketData.GetValue(previousOption);
+                string previousPlat = previousJob["plat"].ToObject<string>();
+                string previousDucats = previousJob["ducats"].ToObject<string>();
+                if (double.TryParse(previousPlat, styles, CultureInfo.InvariantCulture, out double previousPlatValue))
+                {
+                    TotalPlatinum -= previousPlatValue;
+                }
+                if (int.TryParse(previousDucats, styles, CultureInfo.InvariantCulture, out int previousDucatValue))
+                {
+                    TotalDucats -= previousDucatValue;
+                }
+            }
+
+            if (!string.IsNullOrEmpty(newOption))
+            {
+                JObject newJob = (JObject)Main.dataBase.marketData.GetValue(newOption);
+                string newPlat = newJob["plat"].ToObject<string>();
+                string newDucats = newJob["ducats"].ToObject<string>();
+                if (double.TryParse(newPlat, styles, CultureInfo.InvariantCulture, out double newPlatValue))
+                {
+                    TotalPlatinum += newPlatValue;
+                }
+                if (int.TryParse(newDucats, styles, CultureInfo.InvariantCulture, out int newDucatValue))
+                {
+                    TotalDucats += newDucatValue;
+                }
+            }
         }
     }
 
@@ -58,8 +115,14 @@ public string ActiveOption
             get => _activeOption;
             set
             {
-                _activeOption = value;
-                RaisePropertyChanged();
+                // FIXME: breakpoint here doesn't always get hit (active option doesn't get changed). why?
+                if (_activeOption != value)
+                {
+                    string previousOption = _activeOption;
+                    _activeOption = value;
+                    RaisePropertyChanged();
+                    _parent?.UpdateTotalsForOptionChange(previousOption, _activeOption);
+                }
             }
         }
 
@@ -75,7 +138,8 @@ public AutoAddSingleItem(List<string> options, int activeIndex, AutoAddViewModel
             if (activeIndex >= 0 && options != null)
             {
                 ActiveOption = options[activeIndex];
-            } else
+            }
+            else
             {
                 ActiveOption = "";
             }
diff --git a/WFInfo/AutoCount.xaml b/WFInfo/AutoCount.xaml
index 9bc512ce..1ccb3ec6 100644
--- a/WFInfo/AutoCount.xaml
+++ b/WFInfo/AutoCount.xaml
@@ -195,16 +195,26 @@
         </ScrollViewer>
         <Grid Grid.Row="2">
             <Grid.ColumnDefinitions>
-                <ColumnDefinition></ColumnDefinition>
-                <ColumnDefinition></ColumnDefinition>
+                <ColumnDefinition Width="*" />
+                <ColumnDefinition Width="Auto" MinWidth="100" />
+                <ColumnDefinition Width="Auto" MinWidth="100" />
             </Grid.ColumnDefinitions>
-            <Label Grid.Column="0" Content="Save all" Foreground="#506464" FontSize="14" Style="{StaticResource Label_Button}">
+
+            <StackPanel Grid.Column="0" Orientation="Horizontal" HorizontalAlignment="Center">
+                <Label Content="Total:" Foreground="#506464" FontSize="14" />
+                <Image x:Name="platImage1" Width="20" Source="Resources/plat.gif" Height="20" />
+                <Label Content="{Binding viewModel.TotalPlatinum, StringFormat='{}{0:0.##}'}" Foreground="#506464" FontSize="14" />
+                <Image x:Name="firstDucatImage1" Width="20" Source="Resources/ducat_w.gif" Height="20" />
+                <Label Content="{Binding viewModel.TotalDucats}" Foreground="#506464" FontSize="14" />
+            </StackPanel>
+            
+            <Label Grid.Column="1" Content="Save all" Foreground="#506464" FontSize="14" Style="{StaticResource Label_Button}">
                 <Label.InputBindings>
                     <MouseBinding MouseAction="LeftClick" Command="{Binding IncrementAll}" />
                 </Label.InputBindings>
             </Label>
 
-            <Label Grid.Column="1" Content="Dismiss all" Foreground="#506464" FontSize="14" Style="{StaticResource Label_Button}">
+            <Label Grid.Column="2" Content="Dismiss all" Foreground="#506464" FontSize="14" Style="{StaticResource Label_Button}">
                 <Label.InputBindings>
                     <MouseBinding MouseAction="LeftClick" Command="{Binding RemoveAll}" />
                 </Label.InputBindings>

From ae758e51d3a1c719401f2178d53fb5279110777d Mon Sep 17 00:00:00 2001
From: occluder <69414142+occluder@users.noreply.github.com>
Date: Tue, 17 Feb 2026 21:11:08 +0300
Subject: [PATCH 2/6] Fix combobox not updating ActiveOption

---
 WFInfo/AutoAddViewModel.cs | 2 ++
 WFInfo/AutoCount.xaml      | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/WFInfo/AutoAddViewModel.cs b/WFInfo/AutoAddViewModel.cs
index 253c6106..5eb7488b 100644
--- a/WFInfo/AutoAddViewModel.cs
+++ b/WFInfo/AutoAddViewModel.cs
@@ -51,12 +51,14 @@ public void addItem(AutoAddSingleItem item)
         {
             _itemList.Add(item);
             UpdateTotalsForOptionChange(null, item.ActiveOption);
+            RaisePropertyChanged();
         }
 
         public void removeItem(AutoAddSingleItem item)
         {
             UpdateTotalsForOptionChange(item.ActiveOption, null);
             _itemList.Remove(item);
+            RaisePropertyChanged();
         }
 
         public void UpdateTotalsForOptionChange(string previousOption, string newOption)
diff --git a/WFInfo/AutoCount.xaml b/WFInfo/AutoCount.xaml
index 1ccb3ec6..90fcba9c 100644
--- a/WFInfo/AutoCount.xaml
+++ b/WFInfo/AutoCount.xaml
@@ -162,7 +162,7 @@
                                     BorderBrush="#FF0F0F0F"
                                     HorizontalAlignment="Stretch"
                                     ItemsSource="{Binding RewardOptions}"
-                                    SelectedItem="{Binding ActiveOption, Mode=TwoWay}"
+                                    SelectedItem="{Binding ActiveOption, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
                                     Margin="5,3" Template="{DynamicResource ComboBoxTemplate}" Style="{DynamicResource ComboBoxStyle1}">
                                 </ComboBox>
                             </DataTemplate>
@@ -203,7 +203,7 @@
             <StackPanel Grid.Column="0" Orientation="Horizontal" HorizontalAlignment="Center">
                 <Label Content="Total:" Foreground="#506464" FontSize="14" />
                 <Image x:Name="platImage1" Width="20" Source="Resources/plat.gif" Height="20" />
-                <Label Content="{Binding viewModel.TotalPlatinum, StringFormat='{}{0:0.##}'}" Foreground="#506464" FontSize="14" />
+                <Label Content="{Binding viewModel.TotalPlatinum}" ContentStringFormat="{}{0:0.##}" Foreground="#506464" FontSize="14" />
                 <Image x:Name="firstDucatImage1" Width="20" Source="Resources/ducat_w.gif" Height="20" />
                 <Label Content="{Binding viewModel.TotalDucats}" Foreground="#506464" FontSize="14" />
             </StackPanel>

From dc6f7e7c9f1838dec3e850a8994fd4f2288e334e Mon Sep 17 00:00:00 2001
From: occluder <69414142+occluder@users.noreply.github.com>
Date: Tue, 17 Feb 2026 21:19:19 +0300
Subject: [PATCH 3/6] remove FIXME

---
 WFInfo/AutoAddViewModel.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/WFInfo/AutoAddViewModel.cs b/WFInfo/AutoAddViewModel.cs
index 5eb7488b..ce126cdd 100644
--- a/WFInfo/AutoAddViewModel.cs
+++ b/WFInfo/AutoAddViewModel.cs
@@ -117,7 +117,6 @@ public string ActiveOption
             get => _activeOption;
             set
             {
-                // FIXME: breakpoint here doesn't always get hit (active option doesn't get changed). why?
                 if (_activeOption != value)
                 {
                     string previousOption = _activeOption;

From 777512f87c49169548f9a023a6e03a01e9aa47dd Mon Sep 17 00:00:00 2001
From: occluder <69414142+occluder@users.noreply.github.com>
Date: Wed, 18 Feb 2026 11:51:11 +0300
Subject: [PATCH 4/6] Move items' value to each individual AutoAddSingleItem,
 sum on changes to ItemList

---
 WFInfo/AutoAddViewModel.cs | 105 ++++++++++++++++++++++---------------
 1 file changed, 63 insertions(+), 42 deletions(-)

diff --git a/WFInfo/AutoAddViewModel.cs b/WFInfo/AutoAddViewModel.cs
index ce126cdd..4a69685e 100644
--- a/WFInfo/AutoAddViewModel.cs
+++ b/WFInfo/AutoAddViewModel.cs
@@ -2,7 +2,9 @@
 using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
+using System.ComponentModel;
 using System.Globalization;
+using System.Linq;
 
 namespace WFInfo
 {
@@ -11,7 +13,6 @@ public class AutoAddViewModel : INPC
         private ObservableCollection<AutoAddSingleItem> _itemList;
         private double _totalPlatinum;
         private int _totalDucats;
-        private const NumberStyles styles = NumberStyles.AllowDecimalPoint | NumberStyles.AllowThousands | NumberStyles.AllowExponent;
 
         public ObservableCollection<AutoAddSingleItem> ItemList
         {
@@ -45,53 +46,44 @@ private set
         public AutoAddViewModel()
         {
             _itemList = new ObservableCollection<AutoAddSingleItem>();
+            _itemList.CollectionChanged += CollectionChanged;
         }
 
         public void addItem(AutoAddSingleItem item)
         {
+            item.PropertyChanged += ItemChanged;
             _itemList.Add(item);
-            UpdateTotalsForOptionChange(null, item.ActiveOption);
-            RaisePropertyChanged();
         }
 
         public void removeItem(AutoAddSingleItem item)
         {
-            UpdateTotalsForOptionChange(item.ActiveOption, null);
+            item.PropertyChanged -= ItemChanged;
             _itemList.Remove(item);
-            RaisePropertyChanged();
+            RecalculateTotals();
         }
 
-        public void UpdateTotalsForOptionChange(string previousOption, string newOption)
+        private void ItemChanged(object sender, PropertyChangedEventArgs e)
         {
-            if (!string.IsNullOrEmpty(previousOption))
+            if (e.PropertyName == nameof(AutoAddSingleItem.PlatinumValue) || e.PropertyName == nameof(AutoAddSingleItem.DucatValue))
             {
-                JObject previousJob = (JObject)Main.dataBase.marketData.GetValue(previousOption);
-                string previousPlat = previousJob["plat"].ToObject<string>();
-                string previousDucats = previousJob["ducats"].ToObject<string>();
-                if (double.TryParse(previousPlat, styles, CultureInfo.InvariantCulture, out double previousPlatValue))
-                {
-                    TotalPlatinum -= previousPlatValue;
-                }
-                if (int.TryParse(previousDucats, styles, CultureInfo.InvariantCulture, out int previousDucatValue))
-                {
-                    TotalDucats -= previousDucatValue;
-                }
+                RecalculateTotals();
             }
+        }
 
-            if (!string.IsNullOrEmpty(newOption))
-            {
-                JObject newJob = (JObject)Main.dataBase.marketData.GetValue(newOption);
-                string newPlat = newJob["plat"].ToObject<string>();
-                string newDucats = newJob["ducats"].ToObject<string>();
-                if (double.TryParse(newPlat, styles, CultureInfo.InvariantCulture, out double newPlatValue))
-                {
-                    TotalPlatinum += newPlatValue;
-                }
-                if (int.TryParse(newDucats, styles, CultureInfo.InvariantCulture, out int newDucatValue))
-                {
-                    TotalDucats += newDucatValue;
-                }
-            }
+        private void CollectionChanged(object sender, System.Collections.Specialized.NotifyCollectionChangedEventArgs e)
+        {
+            RecalculateTotals();
+        }
+
+        private void RecalculateTotals()
+        {
+            TotalPlatinum = _itemList.Sum(item => item.PlatinumValue);
+            TotalDucats = _itemList.Sum(item => item.DucatValue);
+        }
+
+        ~AutoAddViewModel()
+        {
+            _itemList.CollectionChanged -= CollectionChanged;
         }
     }
 
@@ -99,7 +91,11 @@ public class AutoAddSingleItem : INPC
     {
         public AutoAddViewModel _parent;
 
+        private const NumberStyles style = NumberStyles.AllowDecimalPoint | NumberStyles.AllowThousands | NumberStyles.AllowExponent;
         private ObservableCollection<string> _rewardOptions;
+        private string _activeOption;
+        private double _platinumValue;
+        private int _ducatValue;
 
         public ObservableCollection<string> RewardOptions
         {
@@ -111,7 +107,6 @@ private set
             }
         }
 
-        private string _activeOption;
         public string ActiveOption
         {
             get => _activeOption;
@@ -119,13 +114,30 @@ public string ActiveOption
             {
                 if (_activeOption != value)
                 {
-                    string previousOption = _activeOption;
                     _activeOption = value;
+                    UpdateValues();
                     RaisePropertyChanged();
-                    _parent?.UpdateTotalsForOptionChange(previousOption, _activeOption);
                 }
             }
         }
+        public double PlatinumValue
+        {
+            get => _platinumValue;
+            private set
+            {
+                _platinumValue = value;
+                RaisePropertyChanged();
+            }
+        }
+        public int DucatValue
+        {
+            get => _ducatValue;
+            private set
+            {
+                _ducatValue = value;
+                RaisePropertyChanged();
+            }
+        }
 
         public SimpleCommand Increment { get; }
 
@@ -133,20 +145,29 @@ public string ActiveOption
 
         public AutoAddSingleItem(List<string> options, int activeIndex, AutoAddViewModel parent)
         {
-
             RewardOptions = new ObservableCollection<string>(options);
             activeIndex = Math.Min(RewardOptions.Count - 1, activeIndex);
-            if (activeIndex >= 0 && options != null)
+            ActiveOption = activeIndex >= 0 && options != null ? options[activeIndex] : "";
+            _parent = parent;
+            Remove = new SimpleCommand(() => RemoveFromParent());
+            Increment = new SimpleCommand(() => AddCount(true));
+        }
+
+        private void UpdateValues()
+        {
+            if (!string.IsNullOrEmpty(ActiveOption))
             {
-                ActiveOption = options[activeIndex];
+                JObject job = (JObject)Main.dataBase.marketData.GetValue(ActiveOption);
+                string plat = job["plat"].ToObject<string>();
+                string ducats = job["ducats"].ToObject<string>();
+                PlatinumValue = double.TryParse(plat, style, CultureInfo.InvariantCulture, out double platValue) ? platValue : 0;
+                DucatValue = int.TryParse(ducats, style, CultureInfo.InvariantCulture, out int ducatValue) ? ducatValue : 0;
             }
             else
             {
-                ActiveOption = "";
+                PlatinumValue = 0;
+                DucatValue = 0;
             }
-            _parent = parent;
-            Remove = new SimpleCommand(() => RemoveFromParent());
-            Increment = new SimpleCommand(() => AddCount(true));
         }
 
         public void AddCount(bool save)

From c649c7dece684baf91769f35823165460b604a7a Mon Sep 17 00:00:00 2001
From: occluder <69414142+occluder@users.noreply.github.com>
Date: Wed, 18 Feb 2026 12:01:47 +0300
Subject: [PATCH 5/6] implement coderabbit suggestions

---
 WFInfo/AutoAddViewModel.cs | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/WFInfo/AutoAddViewModel.cs b/WFInfo/AutoAddViewModel.cs
index 4a69685e..e5f911fa 100644
--- a/WFInfo/AutoAddViewModel.cs
+++ b/WFInfo/AutoAddViewModel.cs
@@ -80,11 +80,6 @@ private void RecalculateTotals()
             TotalPlatinum = _itemList.Sum(item => item.PlatinumValue);
             TotalDucats = _itemList.Sum(item => item.DucatValue);
         }
-
-        ~AutoAddViewModel()
-        {
-            _itemList.CollectionChanged -= CollectionChanged;
-        }
     }
 
     public class AutoAddSingleItem : INPC
@@ -147,7 +142,7 @@ public AutoAddSingleItem(List<string> options, int activeIndex, AutoAddViewModel
         {
             RewardOptions = new ObservableCollection<string>(options);
             activeIndex = Math.Min(RewardOptions.Count - 1, activeIndex);
-            ActiveOption = activeIndex >= 0 && options != null ? options[activeIndex] : "";
+            ActiveOption = activeIndex >= 0 ? options[activeIndex] : "";
             _parent = parent;
             Remove = new SimpleCommand(() => RemoveFromParent());
             Increment = new SimpleCommand(() => AddCount(true));

From 46da23a9c1b5a8bd6d530625b2ecee254f40bcab Mon Sep 17 00:00:00 2001
From: occluder <69414142+occluder@users.noreply.github.com>
Date: Wed, 18 Feb 2026 12:02:47 +0300
Subject: [PATCH 6/6] reduce redundant re-calculations

---
 WFInfo/AutoAddViewModel.cs | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/WFInfo/AutoAddViewModel.cs b/WFInfo/AutoAddViewModel.cs
index e5f911fa..67c7a7f6 100644
--- a/WFInfo/AutoAddViewModel.cs
+++ b/WFInfo/AutoAddViewModel.cs
@@ -59,7 +59,6 @@ public void removeItem(AutoAddSingleItem item)
         {
             item.PropertyChanged -= ItemChanged;
             _itemList.Remove(item);
-            RecalculateTotals();
         }
 
         private void ItemChanged(object sender, PropertyChangedEventArgs e)
@@ -120,8 +119,11 @@ public double PlatinumValue
             get => _platinumValue;
             private set
             {
-                _platinumValue = value;
-                RaisePropertyChanged();
+                if (_platinumValue != value)
+                {
+                    _platinumValue = value;
+                    RaisePropertyChanged();
+                }
             }
         }
         public int DucatValue
@@ -129,8 +131,11 @@ public int DucatValue
             get => _ducatValue;
             private set
             {
-                _ducatValue = value;
-                RaisePropertyChanged();
+                if (_ducatValue != value)
+                {
+                    _ducatValue = value;
+                    RaisePropertyChanged();
+                }
             }
         }