Merge branch 'StorageHistory' into dev

Triky313 · Aug 12, 2024 · b36e82d · b36e82d
2 parents 464daf6 + 78587cd
commit b36e82d
Show file tree

Hide file tree

Showing 27 changed files with 457 additions and 182 deletions.
diff --git a/src/StatisticsAnalysisTool/Cluster/ClusterController.cs b/src/StatisticsAnalysisTool/Cluster/ClusterController.cs
@@ -72,8 +72,8 @@ public void SetAndResetValues(ClusterInfo currentCluster)
         _trackingController.CombatController.ResetDamageMeterByClusterChange();
         _trackingController.StatisticController.SetKillsDeathsValues();
         _trackingController.VaultController.ResetDiscoveredItems();
-        _trackingController.VaultController.ResetVaultContainer();
-        _trackingController.VaultController.ResetCurrentVaultInfo();
+        _trackingController.VaultController.ResetInternalVaultContainer();
+        _trackingController.VaultController.ResetCurrentInternalVault();
         _trackingController.TreasureController.RemoveTemporaryTreasures();
         _trackingController.TreasureController.UpdateLootedChestsDashboardUi();
         _trackingController.LootController.ResetLocalPlayerDiscoveredLoot();

diff --git a/src/StatisticsAnalysisTool/Models/NetworkModel/ContainerItem.cs b/src/StatisticsAnalysisTool/Models/NetworkModel/ContainerItem.cs
diff --git a/src/StatisticsAnalysisTool/Models/NetworkModel/ItemContainerObject.cs b/src/StatisticsAnalysisTool/Models/NetworkModel/ItemContainerObject.cs
@@ -20,4 +20,5 @@ public ItemContainerObject(long? objectId, Guid privateContainerGuid, Guid conta
     public Guid PrivateContainerGuid { get; set; }
     public Guid ContainerGuid { get; set; }
     public List<long> SlotItemIds { get; set; }
+    public double RepairCosts { get; set; }
 }
diff --git a/src/StatisticsAnalysisTool/Models/NetworkModel/Vault.cs b/src/StatisticsAnalysisTool/Models/NetworkModel/Vault.cs
diff --git a/src/StatisticsAnalysisTool/Network/Handler/BankVaultInfoEventHandler.cs b/src/StatisticsAnalysisTool/Network/Handler/BankVaultInfoEventHandler.cs
@@ -1,7 +1,7 @@
 using StatisticsAnalysisTool.Network.Events;
 using StatisticsAnalysisTool.Network.Manager;
+using StatisticsAnalysisTool.StorageHistory;
 using System.Threading.Tasks;
-using StatisticsAnalysisTool.Models.NetworkModel;
 
 namespace StatisticsAnalysisTool.Network.Handler;
 
@@ -18,7 +18,7 @@ protected override async Task OnActionAsync(BankVaultInfoEvent value)
     {
         if (_trackingController.IsTrackingAllowedByMainCharacter())
         {
-            _trackingController.VaultController.SetCurrentVault(new VaultInfo(value.ObjectId, value.LocationGuidString, value.VaultGuidList, value.VaultNames, value.IconTags));
+            _trackingController.VaultController.SetCurrentVault(new InternalVault(value.ObjectId, value.LocationGuidString, value.VaultGuidList, value.VaultNames, value.IconTags));
         }
 
         await Task.CompletedTask;

diff --git a/src/StatisticsAnalysisTool/Network/Handler/NewEquipmentItemEventHandler.cs b/src/StatisticsAnalysisTool/Network/Handler/NewEquipmentItemEventHandler.cs
@@ -19,7 +19,7 @@ protected override async Task OnActionAsync(NewEquipmentItemEvent value)
     {
         if (_trackingController.IsTrackingAllowedByMainCharacter())
         {
-            _trackingController.VaultController.Add(value.Item);
+            _trackingController.VaultController.AddDiscoveredItem(value.Item);
         }
 
         _trackingController.EntityController.AddEquipmentItem(new EquipmentItemInternal

diff --git a/src/StatisticsAnalysisTool/Network/Handler/NewFurnitureItemEventHandler.cs b/src/StatisticsAnalysisTool/Network/Handler/NewFurnitureItemEventHandler.cs
@@ -18,7 +18,7 @@ protected override async Task OnActionAsync(NewFurnitureItemEvent value)
     {
         if (_trackingController.IsTrackingAllowedByMainCharacter())
         {
-            _trackingController.VaultController.Add(value.Item);
+            _trackingController.VaultController.AddDiscoveredItem(value.Item);
         }
 
         EstimatedMarketValueController.Add(value.Item.ItemIndex, value.Item.EstimatedMarketValueInternal, value.Item.Quality);

diff --git a/src/StatisticsAnalysisTool/Network/Handler/NewJournalItemEventHandler.cs b/src/StatisticsAnalysisTool/Network/Handler/NewJournalItemEventHandler.cs
@@ -19,7 +19,7 @@ protected override async Task OnActionAsync(NewJournalItemEvent value)
     {
         if (_trackingController.IsTrackingAllowedByMainCharacter())
         {
-            _trackingController.VaultController.Add(value.Item);
+            _trackingController.VaultController.AddDiscoveredItem(value.Item);
         }
 
         EstimatedMarketValueController.Add(value.Item.ItemIndex, value.Item.EstimatedMarketValueInternal, value.Item.Quality);

diff --git a/src/StatisticsAnalysisTool/Network/Handler/NewKillTrophyItemHandler.cs b/src/StatisticsAnalysisTool/Network/Handler/NewKillTrophyItemHandler.cs
@@ -18,7 +18,7 @@ protected override async Task OnActionAsync(NewKillTrophyItemEvent value)
     {
         if (_trackingController.IsTrackingAllowedByMainCharacter())
         {
-            _trackingController.VaultController.Add(value.Item);
+            _trackingController.VaultController.AddDiscoveredItem(value.Item);
         }
 
         EstimatedMarketValueController.Add(value.Item.ItemIndex, value.Item.EstimatedMarketValueInternal, value.Item.Quality);

diff --git a/src/StatisticsAnalysisTool/Network/Handler/NewLaborerItemEventHandler.cs b/src/StatisticsAnalysisTool/Network/Handler/NewLaborerItemEventHandler.cs
@@ -18,7 +18,7 @@ protected override async Task OnActionAsync(NewLaborerItemEvent value)
     {
         if (_trackingController.IsTrackingAllowedByMainCharacter())
         {
-            _trackingController.VaultController.Add(value.Item);
+            _trackingController.VaultController.AddDiscoveredItem(value.Item);
         }
 
         EstimatedMarketValueController.Add(value.Item.ItemIndex, value.Item.EstimatedMarketValueInternal, value.Item.Quality);

diff --git a/src/StatisticsAnalysisTool/Network/Handler/NewSimpleItemEventHandler.cs b/src/StatisticsAnalysisTool/Network/Handler/NewSimpleItemEventHandler.cs
@@ -18,7 +18,7 @@ protected override async Task OnActionAsync(NewSimpleItemEvent value)
     {
         if (_trackingController.IsTrackingAllowedByMainCharacter())
         {
-            _trackingController.VaultController.Add(value.Item);
+            _trackingController.VaultController.AddDiscoveredItem(value.Item);
         }
 
         EstimatedMarketValueController.Add(value.Item.ItemIndex, value.Item.EstimatedMarketValueInternal, value.Item.Quality);

diff --git a/src/StatisticsAnalysisTool/Network/Manager/TrackingController.cs b/src/StatisticsAnalysisTool/Network/Manager/TrackingController.cs
@@ -13,6 +13,7 @@
 using StatisticsAnalysisTool.Localization;
 using StatisticsAnalysisTool.Network.PacketProviders;
 using StatisticsAnalysisTool.Party;
+using StatisticsAnalysisTool.StorageHistory;
 using StatisticsAnalysisTool.Trade;
 using StatisticsAnalysisTool.Trade.Mails;
 using StatisticsAnalysisTool.Trade.Market;

diff --git a/src/StatisticsAnalysisTool/StorageHistory/ContainerItem.cs b/src/StatisticsAnalysisTool/StorageHistory/ContainerItem.cs
@@ -0,0 +1,32 @@
+using StatisticsAnalysisTool.Common;
+using StatisticsAnalysisTool.Models;
+using StatisticsAnalysisTool.ViewModels;
+
+namespace StatisticsAnalysisTool.StorageHistory;
+
+public class ContainerItem : BaseViewModel
+{
+    private int _itemIndex;
+    private int _quantity;
+
+    public int ItemIndex
+    {
+        get => _itemIndex;
+        set
+        {
+            _itemIndex = value;
+            OnPropertyChanged();
+        }
+    }
+
+    public int Quantity
+    {
+        get => _quantity;
+        set
+        {
+            _quantity = value;
+            OnPropertyChanged();
+        }
+    }
+    public Item Item => ItemController.GetItemByIndex(ItemIndex);
+}
diff --git a/src/StatisticsAnalysisTool/StorageHistory/ContainerItemDto.cs b/src/StatisticsAnalysisTool/StorageHistory/ContainerItemDto.cs
@@ -0,0 +1,11 @@
+using System.Text.Json.Serialization;
+
+namespace StatisticsAnalysisTool.StorageHistory;
+
+public class ContainerItemDto
+{
+    [JsonPropertyName("I")]
+    public int ItemIndex { get; set; }
+    [JsonPropertyName("Q")]
+    public int Quantity { get; set; }
+}
diff --git a/...ysisTool/Models/NetworkModel/VaultInfo.cs → ...lysisTool/StorageHistory/InternalVault.cs b/...ysisTool/Models/NetworkModel/VaultInfo.cs → ...lysisTool/StorageHistory/InternalVault.cs
@@ -3,11 +3,11 @@
 using System;
 using System.Collections.Generic;
 
-namespace StatisticsAnalysisTool.Models.NetworkModel;
+namespace StatisticsAnalysisTool.StorageHistory;
 
-public class VaultInfo
+public class InternalVault
 {
-    public VaultInfo(long? objectId, string locationGuidString, List<Guid> containerGuidList, List<string> containerNames, List<string> containerIconTags)
+    public InternalVault(long? objectId, string locationGuidString, List<Guid> containerGuidList, List<string> containerNames, List<string> containerIconTags)
     {
         ObjectId = objectId;
         LocationGuidString = locationGuidString;
@@ -24,4 +24,5 @@ public VaultInfo(long? objectId, string locationGuidString, List<Guid> container
     public MapType MapType => WorldData.GetMapType(LocationGuidString);
     public string MainLocationIndex { get; set; }
     public string UniqueClusterName { get; set; }
+    public double RepairCosts { get; set; }
 }
diff --git a/src/StatisticsAnalysisTool/StorageHistory/StorageHistoryMapping.cs b/src/StatisticsAnalysisTool/StorageHistory/StorageHistoryMapping.cs
@@ -0,0 +1,71 @@
+using System.Collections.ObjectModel;
+using System.Linq;
+
+namespace StatisticsAnalysisTool.StorageHistory;
+
+public static class StorageHistoryMapping
+{
+    public static VaultDto Mapping(Vault vault)
+    {
+        return new VaultDto()
+        {
+            Location = vault.Location,
+            MainLocationIndex = vault.MainLocationIndex,
+            MapType = vault.MapType,
+            VaultContainer = vault.VaultContainer.Select(Mapping).ToList()
+        };
+    }
+
+    public static Vault Mapping(VaultDto vaultDto)
+    {
+        return new Vault()
+        {
+            Location = vaultDto.Location,
+            MainLocationIndex = vaultDto.MainLocationIndex,
+            MapType = vaultDto.MapType,
+            VaultContainer = vaultDto.VaultContainer.Select(Mapping).ToList()
+        };
+    }
+
+    public static VaultContainerDto Mapping(VaultContainer vaultContainer)
+    {
+        return new VaultContainerDto()
+        {
+            LastUpdate = vaultContainer.LastUpdate,
+            Guid = vaultContainer.Guid,
+            Name = vaultContainer.Name,
+            Icon = vaultContainer.Icon,
+            Items = vaultContainer.Items.Select(Mapping).ToList()
+        };
+    }
+
+    public static VaultContainer Mapping(VaultContainerDto vaultContainerDto)
+    {
+        return new VaultContainer()
+        {
+            LastUpdate = vaultContainerDto.LastUpdate,
+            Guid = vaultContainerDto.Guid,
+            Name = vaultContainerDto.Name,
+            Icon = vaultContainerDto.Icon,
+            Items = new ObservableCollection<ContainerItem>(vaultContainerDto.Items.Select(Mapping))
+        };
+    }
+
+    public static ContainerItemDto Mapping(ContainerItem containerItem)
+    {
+        return new ContainerItemDto()
+        {
+            ItemIndex = containerItem.ItemIndex,
+            Quantity = containerItem.Quantity
+        };
+    }
+
+    public static ContainerItem Mapping(ContainerItemDto containerItemDto)
+    {
+        return new ContainerItem()
+        {
+            ItemIndex = containerItemDto.ItemIndex,
+            Quantity = containerItemDto.Quantity
+        };
+    }
+}
diff --git a/src/StatisticsAnalysisTool/StorageHistory/Vault.cs b/src/StatisticsAnalysisTool/StorageHistory/Vault.cs
@@ -0,0 +1,75 @@
+using StatisticsAnalysisTool.Cluster;
+using StatisticsAnalysisTool.GameFileData;
+using StatisticsAnalysisTool.Localization;
+using StatisticsAnalysisTool.ViewModels;
+using System.Collections.Generic;
+
+namespace StatisticsAnalysisTool.StorageHistory;
+
+public class Vault : BaseViewModel
+{
+    private string _location;
+    private string _mainLocationIndex;
+    private MapType _mapType;
+    private List<VaultContainer> _vaultContainer = new();
+
+    public string Location
+    {
+        get => _location;
+        set
+        {
+            _location = value;
+            OnPropertyChanged();
+        }
+    }
+
+    public string MainLocationIndex
+    {
+        get => _mainLocationIndex;
+        set
+        {
+            _mainLocationIndex = value;
+            OnPropertyChanged();
+        }
+    }
+
+    public MapType MapType
+    {
+        get => _mapType;
+        set
+        {
+            _mapType = value;
+            OnPropertyChanged();
+        }
+    }
+
+    public List<VaultContainer> VaultContainer
+    {
+        get => _vaultContainer;
+        set
+        {
+            _vaultContainer = value;
+            OnPropertyChanged();
+        }
+    }
+
+    public string MainLocation => WorldData.GetUniqueNameOrDefault(MainLocationIndex);
+
+    public string LocationDisplayString
+    {
+        get
+        {
+            if (MapType is MapType.Hideout)
+            {
+                return $"{Location} ({LocalizationController.Translation("HIDEOUT")}) - {MainLocation}";
+            }
+
+            if (MapType is MapType.Island)
+            {
+                return $"{Location} ({LocalizationController.Translation("ISLAND")})";
+            }
+
+            return Location;
+        }
+    }
+}