diff --git a/src/StatisticsAnalysisTool/Common/CategoryController.cs b/src/StatisticsAnalysisTool/Common/CategoryController.cs index b9265a3e6..56f74c493 100644 --- a/src/StatisticsAnalysisTool/Common/CategoryController.cs +++ b/src/StatisticsAnalysisTool/Common/CategoryController.cs @@ -261,27 +261,22 @@ public static class CategoryController {ShopSubCategory.FibergathererHelmet, LanguageController.Translation("FIBERGATHERER_HELMET")}, {ShopSubCategory.FibergathererShoes, LanguageController.Translation("FIBERGATHERER_SHOES")}, {ShopSubCategory.FibergathererBackpack, LanguageController.Translation("FIBERGATHERER_BACKPACK")}, - {ShopSubCategory.FishgathererArmor, LanguageController.Translation("FISHGATHERER_ARMOR")}, {ShopSubCategory.FishgathererHelmet, LanguageController.Translation("FISHGATHERER_HELMET")}, {ShopSubCategory.FishgathererShoes, LanguageController.Translation("FISHGATHERER_SHOES")}, {ShopSubCategory.FishgathererBackpack, LanguageController.Translation("FISHGATHERER_BACKPACK")}, - {ShopSubCategory.HidegathererArmor, LanguageController.Translation("HIDEGATHERER_ARMOR")}, {ShopSubCategory.HidegathererHelmet, LanguageController.Translation("HIDEGATHERER_HELMET")}, {ShopSubCategory.HidegathererShoes, LanguageController.Translation("HIDEGATHERER_SHOES")}, {ShopSubCategory.HidegathererBackpack, LanguageController.Translation("HIDEGATHERERR_BACKPACK")}, - {ShopSubCategory.OregathererArmor, LanguageController.Translation("OREGATHERER_ARMOR")}, {ShopSubCategory.OregathererHelmet, LanguageController.Translation("OREGATHERER_HELMET")}, {ShopSubCategory.OregathererShoes, LanguageController.Translation("OREGATHERER_SHOES")}, {ShopSubCategory.OregathererBackpack, LanguageController.Translation("OREGATHERER_BACKPACK")}, - {ShopSubCategory.RockgathererArmor, LanguageController.Translation("ROCKGATHERER_ARMOR")}, {ShopSubCategory.RockgathererHelmet, LanguageController.Translation("ROCKGATHERER_HELMET")}, {ShopSubCategory.RockgathererShoes, LanguageController.Translation("ROCKGATHERER_SHOES")}, {ShopSubCategory.RockgathererBackpack, LanguageController.Translation("ROCKGATHERER_BACKPACK")}, - {ShopSubCategory.WoodgathererArmor, LanguageController.Translation("WOODGATHERER_ARMOR")}, {ShopSubCategory.WoodgathererHelmet, LanguageController.Translation("WOODGATHERER_HELMET")}, {ShopSubCategory.WoodgathererShoes, LanguageController.Translation("WOODGATHERER_SHOES")}, diff --git a/src/StatisticsAnalysisTool/GameData/DungeonObjectData.cs b/src/StatisticsAnalysisTool/GameData/DungeonObjectData.cs index b3c9c9193..66df634a6 100644 --- a/src/StatisticsAnalysisTool/GameData/DungeonObjectData.cs +++ b/src/StatisticsAnalysisTool/GameData/DungeonObjectData.cs @@ -197,7 +197,6 @@ public static bool IsBossChest(string value) return !value.Contains("BOSS_BUFF") && value.Contains("BOSS"); } - #endregion #region Shrine diff --git a/src/StatisticsAnalysisTool/Models/DashboardObject.cs b/src/StatisticsAnalysisTool/Models/DashboardObject.cs index b5b25bedb..136137890 100644 --- a/src/StatisticsAnalysisTool/Models/DashboardObject.cs +++ b/src/StatisticsAnalysisTool/Models/DashboardObject.cs @@ -118,7 +118,6 @@ public double FavorPerHour #region Percent values - public double FameInPercent { get => _fameInPercent; diff --git a/src/StatisticsAnalysisTool/Models/DungeonStatsFilter.cs b/src/StatisticsAnalysisTool/Models/DungeonStatsFilter.cs index 1c3b7bad9..46a8d2e61 100644 --- a/src/StatisticsAnalysisTool/Models/DungeonStatsFilter.cs +++ b/src/StatisticsAnalysisTool/Models/DungeonStatsFilter.cs @@ -161,7 +161,6 @@ private void RemoveDungeonMode(DungeonMode dungeonMode) public static string TranslationExpedition => LanguageController.Translation("EXPEDITION"); public static string TranslationUnknown => LanguageController.Translation("UNKNOWN"); - public event PropertyChangedEventHandler PropertyChanged; [NotifyPropertyChangedInvocator] diff --git a/src/StatisticsAnalysisTool/Models/MarketCurrentPricesItem.cs b/src/StatisticsAnalysisTool/Models/MarketCurrentPricesItem.cs new file mode 100644 index 000000000..4c9b0890c --- /dev/null +++ b/src/StatisticsAnalysisTool/Models/MarketCurrentPricesItem.cs @@ -0,0 +1,70 @@ +using System; +using System.Windows; +using StatisticsAnalysisTool.Common; + +namespace StatisticsAnalysisTool.Models; + +public class MarketCurrentPricesItem +{ + public MarketCurrentPricesItem(MarketResponseTotal marketResponseTotal) + { + ItemTypeId = marketResponseTotal.ItemTypeId; + Location = marketResponseTotal.City; + QualityLevel = marketResponseTotal.QualityLevel; + SellPriceMin = marketResponseTotal.SellPriceMin; + SellPriceMinDate = marketResponseTotal.SellPriceMinDate; + SellPriceMax = marketResponseTotal.SellPriceMax; + SellPriceMaxDate = marketResponseTotal.SellPriceMaxDate; + BuyPriceMin = marketResponseTotal.BuyPriceMin; + BuyPriceMinDate = marketResponseTotal.BuyPriceMinDate; + BuyPriceMax = marketResponseTotal.BuyPriceMax; + BuyPriceMaxDate = marketResponseTotal.BuyPriceMaxDate; + BestSellMinPrice = marketResponseTotal.BestSellMinPrice; + BestSellMaxPrice = marketResponseTotal.BestSellMaxPrice; + BestBuyMinPrice = marketResponseTotal.BestBuyMinPrice; + BestBuyMaxPrice = marketResponseTotal.BestBuyMaxPrice; + } + + public string ItemTypeId { get; set; } + public Location Location { get; set; } + public string LocationName => Locations.GetName(Location); + public byte QualityLevel { get; set; } + public ulong SellPriceMin { get; set; } + public string SellPriceMinString => Utilities.UlongMarketPriceToString(SellPriceMin); + public DateTime SellPriceMinDate { get; set; } + public string SellPriceMinDateString => Utilities.MarketPriceDateToString(SellPriceMinDate); + public string SellPriceMinDateLastUpdateTime => Formatting.DateTimeToLastUpdateTime(SellPriceMinDate); + public ulong SellPriceMax { get; set; } + public string SellPriceMaxString => Utilities.UlongMarketPriceToString(SellPriceMax); + public DateTime SellPriceMaxDate { get; set; } + public string SellPriceMaxDateString => Utilities.MarketPriceDateToString(SellPriceMaxDate); + public string SellPriceMaxDateLastUpdateTime => Formatting.DateTimeToLastUpdateTime(SellPriceMaxDate); + public ulong BuyPriceMin { get; set; } + public string BuyPriceMinString => Utilities.UlongMarketPriceToString(BuyPriceMin); + public DateTime BuyPriceMinDate { get; set; } + public string BuyPriceMinDateString => Utilities.MarketPriceDateToString(BuyPriceMinDate); + public string BuyPriceMinDateLastUpdateTime => Formatting.DateTimeToLastUpdateTime(BuyPriceMinDate); + public ulong BuyPriceMax { get; set; } + public string BuyPriceMaxString => Utilities.UlongMarketPriceToString(BuyPriceMax); + public DateTime BuyPriceMaxDate { get; set; } + public string BuyPriceMaxDateString => Utilities.MarketPriceDateToString(BuyPriceMaxDate); + public string BuyPriceMaxDateLastUpdateTime => Formatting.DateTimeToLastUpdateTime(BuyPriceMaxDate); + public bool BestSellMinPrice { get; set; } + public bool BestSellMaxPrice { get; set; } + public bool BestBuyMinPrice { get; set; } + public bool BestBuyMaxPrice { get; set; } + + public Style LocationStyle => ItemController.LocationStyle(Location); + + public Style SellPriceMinStyle => ItemController.PriceStyle(BestSellMinPrice); + + public Style BuyPriceMaxStyle => ItemController.PriceStyle(BestBuyMaxPrice); + + public Style SellPriceMinDateStyle => ItemController.GetStyleByTimestamp(SellPriceMinDate); + + public Style SellPriceMaxDateStyle => ItemController.GetStyleByTimestamp(SellPriceMaxDate); + + public Style BuyPriceMinDateStyle => ItemController.GetStyleByTimestamp(BuyPriceMinDate); + + public Style BuyPriceMaxDateStyle => ItemController.GetStyleByTimestamp(BuyPriceMaxDate); +} \ No newline at end of file diff --git a/src/StatisticsAnalysisTool/Models/MarketOrder.cs b/src/StatisticsAnalysisTool/Models/MarketOrder.cs deleted file mode 100644 index 38d727035..000000000 --- a/src/StatisticsAnalysisTool/Models/MarketOrder.cs +++ /dev/null @@ -1,201 +0,0 @@ -using StatisticsAnalysisTool.Common; -using System; -using System.Collections.Generic; -using System.Text.Json.Serialization; -using System.Windows; -using Formatting = StatisticsAnalysisTool.Common.Formatting; - -namespace StatisticsAnalysisTool.Models -{ - public class MarketResponse - { - [JsonPropertyName("item_id")] - public string ItemTypeId { get; set; } - - [JsonPropertyName("city")] public string City { get; set; } - - [JsonPropertyName("quality")] - public int QualityLevel { get; set; } - - [JsonPropertyName("sell_price_min")] - public ulong SellPriceMin { get; set; } - - [JsonPropertyName("sell_price_min_date")] - public DateTime SellPriceMinDate { get; set; } - - [JsonPropertyName("sell_price_max")] - public ulong SellPriceMax { get; set; } - - [JsonPropertyName("sell_price_max_date")] - public DateTime SellPriceMaxDate { get; set; } - - [JsonPropertyName("buy_price_min")] - public ulong BuyPriceMin { get; set; } - - [JsonPropertyName("buy_price_min_date")] - public DateTime BuyPriceMinDate { get; set; } - - [JsonPropertyName("buy_price_max")] - public ulong BuyPriceMax { get; set; } - - [JsonPropertyName("buy_price_max_date")] - public DateTime BuyPriceMaxDate { get; set; } - } - - public class MarketResponseTotal - { - public MarketResponseTotal(MarketResponse item) - { - ItemTypeId = item.ItemTypeId; - City = Locations.GetName(item.City); - QualityLevel = (byte) item.QualityLevel; - SellPriceMin = item.SellPriceMin; - SellPriceMax = item.SellPriceMax; - BuyPriceMin = item.BuyPriceMin; - BuyPriceMax = item.BuyPriceMax; - SellPriceMinDate = item.SellPriceMinDate; - SellPriceMaxDate = item.SellPriceMaxDate; - BuyPriceMinDate = item.BuyPriceMinDate; - BuyPriceMaxDate = item.BuyPriceMaxDate; - } - - public string ItemTypeId { get; set; } - public Location City { get; set; } - public byte QualityLevel { get; set; } - public ulong SellPriceMin { get; set; } - public DateTime SellPriceMinDate { get; set; } - public ulong SellPriceMax { get; set; } - public DateTime SellPriceMaxDate { get; set; } - public ulong BuyPriceMin { get; set; } - public DateTime BuyPriceMinDate { get; set; } - public ulong BuyPriceMax { get; set; } - public DateTime BuyPriceMaxDate { get; set; } - public bool BestSellMinPrice { get; set; } - public bool BestSellMaxPrice { get; set; } - public bool BestBuyMinPrice { get; set; } - public bool BestBuyMaxPrice { get; set; } - } - - public class MarketCurrentPricesItem - { - public MarketCurrentPricesItem(MarketResponseTotal marketResponseTotal) - { - ItemTypeId = marketResponseTotal.ItemTypeId; - Location = marketResponseTotal.City; - QualityLevel = marketResponseTotal.QualityLevel; - SellPriceMin = marketResponseTotal.SellPriceMin; - SellPriceMinDate = marketResponseTotal.SellPriceMinDate; - SellPriceMax = marketResponseTotal.SellPriceMax; - SellPriceMaxDate = marketResponseTotal.SellPriceMaxDate; - BuyPriceMin = marketResponseTotal.BuyPriceMin; - BuyPriceMinDate = marketResponseTotal.BuyPriceMinDate; - BuyPriceMax = marketResponseTotal.BuyPriceMax; - BuyPriceMaxDate = marketResponseTotal.BuyPriceMaxDate; - BestSellMinPrice = marketResponseTotal.BestSellMinPrice; - BestSellMaxPrice = marketResponseTotal.BestSellMaxPrice; - BestBuyMinPrice = marketResponseTotal.BestBuyMinPrice; - BestBuyMaxPrice = marketResponseTotal.BestBuyMaxPrice; - } - - public string ItemTypeId { get; set; } - public Location Location { get; set; } - public string LocationName => Locations.GetName(Location); - public byte QualityLevel { get; set; } - public ulong SellPriceMin { get; set; } - public string SellPriceMinString => Utilities.UlongMarketPriceToString(SellPriceMin); - public DateTime SellPriceMinDate { get; set; } - public string SellPriceMinDateString => Utilities.MarketPriceDateToString(SellPriceMinDate); - public string SellPriceMinDateLastUpdateTime => Formatting.DateTimeToLastUpdateTime(SellPriceMinDate); - public ulong SellPriceMax { get; set; } - public string SellPriceMaxString => Utilities.UlongMarketPriceToString(SellPriceMax); - public DateTime SellPriceMaxDate { get; set; } - public string SellPriceMaxDateString => Utilities.MarketPriceDateToString(SellPriceMaxDate); - public string SellPriceMaxDateLastUpdateTime => Formatting.DateTimeToLastUpdateTime(SellPriceMaxDate); - public ulong BuyPriceMin { get; set; } - public string BuyPriceMinString => Utilities.UlongMarketPriceToString(BuyPriceMin); - public DateTime BuyPriceMinDate { get; set; } - public string BuyPriceMinDateString => Utilities.MarketPriceDateToString(BuyPriceMinDate); - public string BuyPriceMinDateLastUpdateTime => Formatting.DateTimeToLastUpdateTime(BuyPriceMinDate); - public ulong BuyPriceMax { get; set; } - public string BuyPriceMaxString => Utilities.UlongMarketPriceToString(BuyPriceMax); - public DateTime BuyPriceMaxDate { get; set; } - public string BuyPriceMaxDateString => Utilities.MarketPriceDateToString(BuyPriceMaxDate); - public string BuyPriceMaxDateLastUpdateTime => Formatting.DateTimeToLastUpdateTime(BuyPriceMaxDate); - public bool BestSellMinPrice { get; set; } - public bool BestSellMaxPrice { get; set; } - public bool BestBuyMinPrice { get; set; } - public bool BestBuyMaxPrice { get; set; } - - public Style LocationStyle => ItemController.LocationStyle(Location); - - public Style SellPriceMinStyle => ItemController.PriceStyle(BestSellMinPrice); - - public Style BuyPriceMaxStyle => ItemController.PriceStyle(BestBuyMaxPrice); - - public Style SellPriceMinDateStyle => ItemController.GetStyleByTimestamp(SellPriceMinDate); - - public Style SellPriceMaxDateStyle => ItemController.GetStyleByTimestamp(SellPriceMaxDate); - - public Style BuyPriceMinDateStyle => ItemController.GetStyleByTimestamp(BuyPriceMinDate); - - public Style BuyPriceMaxDateStyle => ItemController.GetStyleByTimestamp(BuyPriceMaxDate); - } - - public class MarketQualityObject - { - public string Location { get; set; } - public string LocationName => Locations.GetName(LocationType); - private Location LocationType => Locations.GetName(Location); - public ulong SellPriceMinNormal { private get; set; } - public ulong SellPriceMinGood { private get; set; } - public ulong SellPriceMinOutstanding { private get; set; } - public ulong SellPriceMinExcellent { private get; set; } - public ulong SellPriceMinMasterpiece { private get; set; } - - public string SellPriceMinNormalString => Utilities.UlongMarketPriceToString(SellPriceMinNormal); - public string SellPriceMinGoodString => Utilities.UlongMarketPriceToString(SellPriceMinGood); - public string SellPriceMinOutstandingString => Utilities.UlongMarketPriceToString(SellPriceMinOutstanding); - public string SellPriceMinExcellentString => Utilities.UlongMarketPriceToString(SellPriceMinExcellent); - public string SellPriceMinMasterpieceString => Utilities.UlongMarketPriceToString(SellPriceMinMasterpiece); - - public string SellPriceMinNormalStringInRalMoney { get; set; } - public string SellPriceMinGoodStringInRalMoney { get; set; } - public string SellPriceMinOutstandingStringInRalMoney { get; set; } - public string SellPriceMinExcellentStringInRalMoney { get; set; } - public string SellPriceMinMasterpieceStringInRalMoney { get; set; } - - public DateTime SellPriceMinNormalDate { private get; set; } - public DateTime SellPriceMinGoodDate { private get; set; } - public DateTime SellPriceMinOutstandingDate { private get; set; } - public DateTime SellPriceMinExcellentDate { private get; set; } - public DateTime SellPriceMinMasterpieceDate { private get; set; } - - public string SellPriceMinNormalDateString => Utilities.MarketPriceDateToString(SellPriceMinNormalDate); - public string SellPriceMinGoodDateString => Utilities.MarketPriceDateToString(SellPriceMinGoodDate); - public string SellPriceMinOutstandingDateString => Utilities.MarketPriceDateToString(SellPriceMinOutstandingDate); - public string SellPriceMinExcellentDateString => Utilities.MarketPriceDateToString(SellPriceMinExcellentDate); - public string SellPriceMinMasterpieceDateString => Utilities.MarketPriceDateToString(SellPriceMinMasterpieceDate); - - public Style LocationStyle => ItemController.LocationStyle(LocationType); - - public Style SellPriceMinNormalStyle => ItemController.PriceStyle(BestMinPrice() == SellPriceMinNormal); - public Style SellPriceMinGoodStyle => ItemController.PriceStyle(BestMinPrice() == SellPriceMinGood); - public Style SellPriceMinOutstandingStyle => ItemController.PriceStyle(BestMinPrice() == SellPriceMinOutstanding); - public Style SellPriceMinExcellentStyle => ItemController.PriceStyle(BestMinPrice() == SellPriceMinExcellent); - public Style SellPriceMinMasterpieceStyle => ItemController.PriceStyle(BestMinPrice() == SellPriceMinMasterpiece); - - private ulong BestMinPrice() - { - var priceList = new List - { - SellPriceMinNormal, - SellPriceMinGood, - SellPriceMinOutstanding, - SellPriceMinExcellent, - SellPriceMinMasterpiece - }; - - return ItemController.GetMinPrice(priceList); - } - } -} \ No newline at end of file diff --git a/src/StatisticsAnalysisTool/Models/MarketQualityObject.cs b/src/StatisticsAnalysisTool/Models/MarketQualityObject.cs new file mode 100644 index 000000000..fe210f3bf --- /dev/null +++ b/src/StatisticsAnalysisTool/Models/MarketQualityObject.cs @@ -0,0 +1,65 @@ +using StatisticsAnalysisTool.Common; +using System; +using System.Collections.Generic; +using System.Windows; + +namespace StatisticsAnalysisTool.Models +{ + public class MarketQualityObject + { + public string Location { get; set; } + public string LocationName => Locations.GetName(LocationType); + private Location LocationType => Locations.GetName(Location); + public ulong SellPriceMinNormal { private get; set; } + public ulong SellPriceMinGood { private get; set; } + public ulong SellPriceMinOutstanding { private get; set; } + public ulong SellPriceMinExcellent { private get; set; } + public ulong SellPriceMinMasterpiece { private get; set; } + + public string SellPriceMinNormalString => Utilities.UlongMarketPriceToString(SellPriceMinNormal); + public string SellPriceMinGoodString => Utilities.UlongMarketPriceToString(SellPriceMinGood); + public string SellPriceMinOutstandingString => Utilities.UlongMarketPriceToString(SellPriceMinOutstanding); + public string SellPriceMinExcellentString => Utilities.UlongMarketPriceToString(SellPriceMinExcellent); + public string SellPriceMinMasterpieceString => Utilities.UlongMarketPriceToString(SellPriceMinMasterpiece); + + public string SellPriceMinNormalStringInRalMoney { get; set; } + public string SellPriceMinGoodStringInRalMoney { get; set; } + public string SellPriceMinOutstandingStringInRalMoney { get; set; } + public string SellPriceMinExcellentStringInRalMoney { get; set; } + public string SellPriceMinMasterpieceStringInRalMoney { get; set; } + + public DateTime SellPriceMinNormalDate { private get; set; } + public DateTime SellPriceMinGoodDate { private get; set; } + public DateTime SellPriceMinOutstandingDate { private get; set; } + public DateTime SellPriceMinExcellentDate { private get; set; } + public DateTime SellPriceMinMasterpieceDate { private get; set; } + + public string SellPriceMinNormalDateString => Utilities.MarketPriceDateToString(SellPriceMinNormalDate); + public string SellPriceMinGoodDateString => Utilities.MarketPriceDateToString(SellPriceMinGoodDate); + public string SellPriceMinOutstandingDateString => Utilities.MarketPriceDateToString(SellPriceMinOutstandingDate); + public string SellPriceMinExcellentDateString => Utilities.MarketPriceDateToString(SellPriceMinExcellentDate); + public string SellPriceMinMasterpieceDateString => Utilities.MarketPriceDateToString(SellPriceMinMasterpieceDate); + + public Style LocationStyle => ItemController.LocationStyle(LocationType); + + public Style SellPriceMinNormalStyle => ItemController.PriceStyle(BestMinPrice() == SellPriceMinNormal); + public Style SellPriceMinGoodStyle => ItemController.PriceStyle(BestMinPrice() == SellPriceMinGood); + public Style SellPriceMinOutstandingStyle => ItemController.PriceStyle(BestMinPrice() == SellPriceMinOutstanding); + public Style SellPriceMinExcellentStyle => ItemController.PriceStyle(BestMinPrice() == SellPriceMinExcellent); + public Style SellPriceMinMasterpieceStyle => ItemController.PriceStyle(BestMinPrice() == SellPriceMinMasterpiece); + + private ulong BestMinPrice() + { + var priceList = new List + { + SellPriceMinNormal, + SellPriceMinGood, + SellPriceMinOutstanding, + SellPriceMinExcellent, + SellPriceMinMasterpiece + }; + + return ItemController.GetMinPrice(priceList); + } + } +} \ No newline at end of file diff --git a/src/StatisticsAnalysisTool/Models/MarketResponse.cs b/src/StatisticsAnalysisTool/Models/MarketResponse.cs new file mode 100644 index 000000000..c5de4ac8b --- /dev/null +++ b/src/StatisticsAnalysisTool/Models/MarketResponse.cs @@ -0,0 +1,40 @@ +using System; +using System.Text.Json.Serialization; + +namespace StatisticsAnalysisTool.Models; + +public class MarketResponse +{ + [JsonPropertyName("item_id")] + public string ItemTypeId { get; set; } + + [JsonPropertyName("city")] + public string City { get; set; } + + [JsonPropertyName("quality")] + public int QualityLevel { get; set; } + + [JsonPropertyName("sell_price_min")] + public ulong SellPriceMin { get; set; } + + [JsonPropertyName("sell_price_min_date")] + public DateTime SellPriceMinDate { get; set; } + + [JsonPropertyName("sell_price_max")] + public ulong SellPriceMax { get; set; } + + [JsonPropertyName("sell_price_max_date")] + public DateTime SellPriceMaxDate { get; set; } + + [JsonPropertyName("buy_price_min")] + public ulong BuyPriceMin { get; set; } + + [JsonPropertyName("buy_price_min_date")] + public DateTime BuyPriceMinDate { get; set; } + + [JsonPropertyName("buy_price_max")] + public ulong BuyPriceMax { get; set; } + + [JsonPropertyName("buy_price_max_date")] + public DateTime BuyPriceMaxDate { get; set; } +} \ No newline at end of file diff --git a/src/StatisticsAnalysisTool/Models/MarketResponseTotal.cs b/src/StatisticsAnalysisTool/Models/MarketResponseTotal.cs new file mode 100644 index 000000000..6bc73df01 --- /dev/null +++ b/src/StatisticsAnalysisTool/Models/MarketResponseTotal.cs @@ -0,0 +1,38 @@ +using System; +using StatisticsAnalysisTool.Common; + +namespace StatisticsAnalysisTool.Models; + +public class MarketResponseTotal +{ + public MarketResponseTotal(MarketResponse item) + { + ItemTypeId = item.ItemTypeId; + City = Locations.GetName(item.City); + QualityLevel = (byte) item.QualityLevel; + SellPriceMin = item.SellPriceMin; + SellPriceMax = item.SellPriceMax; + BuyPriceMin = item.BuyPriceMin; + BuyPriceMax = item.BuyPriceMax; + SellPriceMinDate = item.SellPriceMinDate; + SellPriceMaxDate = item.SellPriceMaxDate; + BuyPriceMinDate = item.BuyPriceMinDate; + BuyPriceMaxDate = item.BuyPriceMaxDate; + } + + public string ItemTypeId { get; set; } + public Location City { get; set; } + public byte QualityLevel { get; set; } + public ulong SellPriceMin { get; set; } + public DateTime SellPriceMinDate { get; set; } + public ulong SellPriceMax { get; set; } + public DateTime SellPriceMaxDate { get; set; } + public ulong BuyPriceMin { get; set; } + public DateTime BuyPriceMinDate { get; set; } + public ulong BuyPriceMax { get; set; } + public DateTime BuyPriceMaxDate { get; set; } + public bool BestSellMinPrice { get; set; } + public bool BestSellMaxPrice { get; set; } + public bool BestBuyMinPrice { get; set; } + public bool BestBuyMaxPrice { get; set; } +} \ No newline at end of file diff --git a/src/StatisticsAnalysisTool/Network/Notification/DungeonNotificationFragment.cs b/src/StatisticsAnalysisTool/Network/Notification/DungeonNotificationFragment.cs index 3c616f666..c3a5716e6 100644 --- a/src/StatisticsAnalysisTool/Network/Notification/DungeonNotificationFragment.cs +++ b/src/StatisticsAnalysisTool/Network/Notification/DungeonNotificationFragment.cs @@ -257,7 +257,6 @@ public bool DiedInDungeon public string DiedMessage { - get => _diedMessage; set { _diedMessage = value; diff --git a/src/StatisticsAnalysisTool/Properties/AssemblyInfo.cs b/src/StatisticsAnalysisTool/Properties/AssemblyInfo.cs index 8b64292db..5e79621ea 100644 --- a/src/StatisticsAnalysisTool/Properties/AssemblyInfo.cs +++ b/src/StatisticsAnalysisTool/Properties/AssemblyInfo.cs @@ -34,7 +34,6 @@ //[assembly: NeutralResourcesLanguage("en-US", UltimateResourceFallbackLocation.Satellite)] - [assembly: ThemeInfo( ResourceDictionaryLocation.None, //Speicherort der designspezifischen Ressourcenwörterbücher //(wird verwendet, wenn eine Ressource auf der Seite nicht gefunden wird, @@ -44,7 +43,6 @@ // designspezifischen Ressourcenwörterbuch nicht gefunden werden kann.) )] - // Versionsinformationen für eine Assembly bestehen aus den folgenden vier Werten: // // Hauptversion