diff --git a/Filtration.ObjectModel/Enums/ItemRarity.cs b/Filtration.ObjectModel/Enums/ItemRarity.cs index affa59e..2e33b12 100644 --- a/Filtration.ObjectModel/Enums/ItemRarity.cs +++ b/Filtration.ObjectModel/Enums/ItemRarity.cs @@ -4,8 +4,6 @@ namespace Filtration.ObjectModel.Enums { public enum ItemRarity { - [Description("Not Set")] - NotSet, [Description("Normal")] Normal, [Description("Magic")] diff --git a/Filtration.ObjectModel/Extensions/ItemRarityExtensions.cs b/Filtration.ObjectModel/Extensions/ItemRarityExtensions.cs index 943a1e3..5631b96 100644 --- a/Filtration.ObjectModel/Extensions/ItemRarityExtensions.cs +++ b/Filtration.ObjectModel/Extensions/ItemRarityExtensions.cs @@ -16,23 +16,20 @@ namespace Filtration.ObjectModel.Extensions } case ItemRarity.Normal: { - return PathOfExileNamedColors.Colors[PathOfExileNamedColor.WhiteItem]; - } + return PathOfExileNamedColors.Colors[PathOfExileNamedColor.WhiteItem]; + } case ItemRarity.Rare: { - return PathOfExileNamedColors.Colors[PathOfExileNamedColor.RareItem]; - } + return PathOfExileNamedColors.Colors[PathOfExileNamedColor.RareItem]; + } case ItemRarity.Unique: { - return PathOfExileNamedColors.Colors[PathOfExileNamedColor.UniqueItem]; - } - case ItemRarity.NotSet: - { - return PathOfExileNamedColors.Colors[PathOfExileNamedColor.QuestItem]; + return PathOfExileNamedColors.Colors[PathOfExileNamedColor.UniqueItem]; } - default: + { throw new ArgumentOutOfRangeException(nameof(itemRarity), itemRarity, null); + } } } } diff --git a/Filtration.ObjectModel/Item.cs b/Filtration.ObjectModel/Item.cs index 84e1e80..55ab1d7 100644 --- a/Filtration.ObjectModel/Item.cs +++ b/Filtration.ObjectModel/Item.cs @@ -121,10 +121,8 @@ namespace Filtration.ObjectModel return PathOfExileNamedColors.Colors[PathOfExileNamedColor.QuestItem]; } - return ItemRarity != ItemRarity.NotSet ? ItemRarity.DefaultRarityTextColor() : PathOfExileNamedColors.Colors[PathOfExileNamedColor.WhiteItem]; + return ItemRarity.DefaultRarityTextColor(); } } - - } }