Skip to content

Commit

Permalink
Merge branch 'CleanUpTask'
Browse files Browse the repository at this point in the history
  • Loading branch information
Triky313 committed Apr 7, 2022
2 parents bf0468a + cbc7cfc commit a5b6677
Show file tree
Hide file tree
Showing 11 changed files with 213 additions and 212 deletions.
5 changes: 0 additions & 5 deletions src/StatisticsAnalysisTool/Common/CategoryController.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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")},
Expand Down
1 change: 0 additions & 1 deletion src/StatisticsAnalysisTool/GameData/DungeonObjectData.cs
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,6 @@ public static bool IsBossChest(string value)
return !value.Contains("BOSS_BUFF") && value.Contains("BOSS");
}


#endregion

#region Shrine
Expand Down
1 change: 0 additions & 1 deletion src/StatisticsAnalysisTool/Models/DashboardObject.cs
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,6 @@ public double FavorPerHour

#region Percent values


public double FameInPercent
{
get => _fameInPercent;
Expand Down
1 change: 0 additions & 1 deletion src/StatisticsAnalysisTool/Models/DungeonStatsFilter.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down
70 changes: 70 additions & 0 deletions src/StatisticsAnalysisTool/Models/MarketCurrentPricesItem.cs
Original file line number Diff line number Diff line change
@@ -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);
}
201 changes: 0 additions & 201 deletions src/StatisticsAnalysisTool/Models/MarketOrder.cs

This file was deleted.

Loading

0 comments on commit a5b6677

Please sign in to comment.