diff --git a/Filtration.ObjectModel/BlockItemBaseTypes/ColorBlockItem.cs b/Filtration.ObjectModel/BlockItemBaseTypes/ColorBlockItem.cs index 7592642..3ae6e70 100644 --- a/Filtration.ObjectModel/BlockItemBaseTypes/ColorBlockItem.cs +++ b/Filtration.ObjectModel/BlockItemBaseTypes/ColorBlockItem.cs @@ -19,7 +19,7 @@ namespace Filtration.ObjectModel.BlockItemBaseTypes } public override string OutputText => PrefixText + " " + +Color.R + " " + Color.G + " " - + Color.B + (Color.A < 255 ? " " + Color.A : string.Empty) + + + Color.B + (Color.A != 240 ? " " + Color.A : string.Empty) + (ThemeComponent != null ? " # " + ThemeComponent.ComponentName : string.Empty); public override string SummaryText => string.Empty; diff --git a/Filtration.ObjectModel/FilteredItem.cs b/Filtration.ObjectModel/FilteredItem.cs index fc2937b..5946557 100644 --- a/Filtration.ObjectModel/FilteredItem.cs +++ b/Filtration.ObjectModel/FilteredItem.cs @@ -24,8 +24,8 @@ namespace Filtration.ObjectModel ItemFilterBlock = itemFilterBlock; BlockAction = itemFilterBlock?.Action ?? BlockAction.Show; - BackgroundColor = itemFilterBlock?.DisplayBackgroundColor ?? new Color { A = 255, R = 0, G = 0, B = 0 }; - BorderColor = itemFilterBlock?.DisplayBorderColor ?? new Color {A = 255, R = 0, G = 0, B = 0}; + BackgroundColor = itemFilterBlock?.DisplayBackgroundColor ?? new Color { A = 240, R = 0, G = 0, B = 0 }; + BorderColor = itemFilterBlock?.DisplayBorderColor ?? new Color {A = 240, R = 0, G = 0, B = 0}; FontSize = (itemFilterBlock?.DisplayFontSize ?? 34) / 1.8; SetTextColor(); diff --git a/Filtration.ObjectModel/ItemFilterBlock.cs b/Filtration.ObjectModel/ItemFilterBlock.cs index aa148d9..9062c76 100644 --- a/Filtration.ObjectModel/ItemFilterBlock.cs +++ b/Filtration.ObjectModel/ItemFilterBlock.cs @@ -243,7 +243,7 @@ namespace Filtration.ObjectModel get { var backgroundColorBlockItem = BlockItems.OfType().FirstOrDefault(); - return backgroundColorBlockItem?.Color ?? new Color { A = 255, R = 0, G = 0, B = 0 }; + return backgroundColorBlockItem?.Color ?? new Color { A = 240, R = 0, G = 0, B = 0 }; } } @@ -252,7 +252,7 @@ namespace Filtration.ObjectModel get { var borderColorBlockItem = BlockItems.OfType().FirstOrDefault(); - return borderColorBlockItem?.Color ?? new Color { A = 255, R = 0, G = 0, B = 0 }; + return borderColorBlockItem?.Color ?? new Color { A = 240, R = 0, G = 0, B = 0 }; } } diff --git a/Filtration.ObjectModel/PathOfExileNamedColors.cs b/Filtration.ObjectModel/PathOfExileNamedColors.cs index aa19e16..235e400 100644 --- a/Filtration.ObjectModel/PathOfExileNamedColors.cs +++ b/Filtration.ObjectModel/PathOfExileNamedColors.cs @@ -8,36 +8,36 @@ namespace Filtration.ObjectModel { public static Dictionary Colors => new Dictionary { - {PathOfExileNamedColor.Default, new Color {A = 255, R = 127, G = 127, B = 127}}, - {PathOfExileNamedColor.ValueDefault, new Color {A = 255, R = 255, G = 255, B = 255}}, - {PathOfExileNamedColor.Pink, new Color {A = 255, R = 255, G = 192, B = 203}}, - {PathOfExileNamedColor.DodgerBlue, new Color {A = 255, R = 30, G = 144, B = 255}}, - {PathOfExileNamedColor.Fire, new Color {A = 255, R = 150, G = 0, B = 0}}, - {PathOfExileNamedColor.Cold, new Color {A = 255, R = 54, G = 100, B = 146}}, - {PathOfExileNamedColor.Lightning, new Color {A = 255, R = 255, G = 215, B = 0}}, - {PathOfExileNamedColor.Chaos, new Color {A = 255, R = 208, G = 32, B = 144}}, - {PathOfExileNamedColor.Augmented, new Color {A = 255, R = 136, G = 136, B = 255}}, - {PathOfExileNamedColor.Crafted, new Color {A = 255, R = 184, G = 218, B = 242}}, - {PathOfExileNamedColor.Unmet, new Color {A = 255, R = 210, G = 0, B = 0}}, - {PathOfExileNamedColor.UniqueItem, new Color {A = 255, R = 175, G = 96, B = 37}}, - {PathOfExileNamedColor.RareItem, new Color {A = 255, R = 255, G = 255, B = 119}}, - {PathOfExileNamedColor.MagicItem, new Color {A = 255, R = 136, G = 136, B = 255}}, - {PathOfExileNamedColor.WhiteItem, new Color {A = 255, R = 200, G = 200, B = 200}}, - {PathOfExileNamedColor.GemItem, new Color {A = 255, R = 27, G = 162, B = 155}}, - {PathOfExileNamedColor.CurrencyItem, new Color {A = 255, R = 170, G = 158, B = 130}}, - {PathOfExileNamedColor.QuestItem, new Color {A = 255, R = 74, G = 230, B = 58}}, - {PathOfExileNamedColor.NemesisMod, new Color {A = 255, R = 255, G = 200, B = 0}}, + {PathOfExileNamedColor.Default, new Color {A = 240, R = 127, G = 127, B = 127}}, + {PathOfExileNamedColor.ValueDefault, new Color {A = 240, R = 255, G = 255, B = 255}}, + {PathOfExileNamedColor.Pink, new Color {A = 240, R = 255, G = 192, B = 203}}, + {PathOfExileNamedColor.DodgerBlue, new Color {A = 240, R = 30, G = 144, B = 255}}, + {PathOfExileNamedColor.Fire, new Color {A = 240, R = 150, G = 0, B = 0}}, + {PathOfExileNamedColor.Cold, new Color {A = 240, R = 54, G = 100, B = 146}}, + {PathOfExileNamedColor.Lightning, new Color {A = 240, R = 255, G = 215, B = 0}}, + {PathOfExileNamedColor.Chaos, new Color {A = 240, R = 208, G = 32, B = 144}}, + {PathOfExileNamedColor.Augmented, new Color {A = 240, R = 136, G = 136, B = 255}}, + {PathOfExileNamedColor.Crafted, new Color {A = 240, R = 184, G = 218, B = 242}}, + {PathOfExileNamedColor.Unmet, new Color {A = 240, R = 210, G = 0, B = 0}}, + {PathOfExileNamedColor.UniqueItem, new Color {A = 240, R = 175, G = 96, B = 37}}, + {PathOfExileNamedColor.RareItem, new Color {A = 240, R = 255, G = 255, B = 119}}, + {PathOfExileNamedColor.MagicItem, new Color {A = 240, R = 136, G = 136, B = 255}}, + {PathOfExileNamedColor.WhiteItem, new Color {A = 240, R = 200, G = 200, B = 200}}, + {PathOfExileNamedColor.GemItem, new Color {A = 240, R = 27, G = 162, B = 155}}, + {PathOfExileNamedColor.CurrencyItem, new Color {A = 240, R = 170, G = 158, B = 130}}, + {PathOfExileNamedColor.QuestItem, new Color {A = 240, R = 74, G = 230, B = 58}}, + {PathOfExileNamedColor.NemesisMod, new Color {A = 240, R = 255, G = 200, B = 0}}, {PathOfExileNamedColor.NemesisModOutline, new Color {A = 220, R = 255, G = 40, B = 0}}, - {PathOfExileNamedColor.Title, new Color {A = 255, R = 231, G = 180, B = 120}}, - {PathOfExileNamedColor.Corrupted, new Color {A = 255, R = 210, G = 0, B = 0}}, - {PathOfExileNamedColor.Favour, new Color {A = 255, R = 170, G = 158, B = 130}}, - {PathOfExileNamedColor.SupporterPackNewItem, new Color {A = 255, R = 180, G = 96, B = 0}}, - {PathOfExileNamedColor.SupporterPackItem, new Color {A = 255, R = 163, G = 141, B = 109}}, - {PathOfExileNamedColor.BloodlineMod, new Color {A = 255, R = 210, G = 0, B = 220}}, + {PathOfExileNamedColor.Title, new Color {A = 240, R = 231, G = 180, B = 120}}, + {PathOfExileNamedColor.Corrupted, new Color {A = 240, R = 210, G = 0, B = 0}}, + {PathOfExileNamedColor.Favour, new Color {A = 240, R = 170, G = 158, B = 130}}, + {PathOfExileNamedColor.SupporterPackNewItem, new Color {A = 240, R = 180, G = 96, B = 0}}, + {PathOfExileNamedColor.SupporterPackItem, new Color {A = 240, R = 163, G = 141, B = 109}}, + {PathOfExileNamedColor.BloodlineMod, new Color {A = 240, R = 210, G = 0, B = 220}}, {PathOfExileNamedColor.BloodlineModOutline, new Color {A = 200, R = 74, G = 0, B = 160}}, - {PathOfExileNamedColor.TormentMod, new Color {A = 255, R = 50, G = 230, B = 100}}, + {PathOfExileNamedColor.TormentMod, new Color {A = 240, R = 50, G = 230, B = 100}}, {PathOfExileNamedColor.TormentModOutline, new Color {A = 200, R = 0, G = 100, B = 150}}, - {PathOfExileNamedColor.CantTradeorModify, new Color {A = 255, R = 210, G = 0, B = 0}}, + {PathOfExileNamedColor.CantTradeorModify, new Color {A = 240, R = 210, G = 0, B = 0}}, }; } diff --git a/Filtration.Parser.Tests/Services/TestItemFilterBlockTranslator.cs b/Filtration.Parser.Tests/Services/TestItemFilterBlockTranslator.cs index d21aef7..311bebf 100644 --- a/Filtration.Parser.Tests/Services/TestItemFilterBlockTranslator.cs +++ b/Filtration.Parser.Tests/Services/TestItemFilterBlockTranslator.cs @@ -791,7 +791,7 @@ namespace Filtration.Parser.Tests.Services // Arrange var inputString = "Show" + Environment.NewLine + " SetTextColor 255 20 100 # Rare Item Text"; - var testComponent = new ColorThemeComponent(ThemeComponentType.TextColor, "Rare Item Text", new Color { R = 255, G = 20, B = 100}); + var testComponent = new ColorThemeComponent(ThemeComponentType.TextColor, "Rare Item Text", new Color { A = 240, R = 255, G = 20, B = 100}); var testInputThemeComponentCollection = new ThemeComponentCollection { testComponent }; // Act @@ -1735,7 +1735,7 @@ namespace Filtration.Parser.Tests.Services var expectedResult = "Show" + Environment.NewLine + " SetTextColor 54 102 255"; - _testUtility.TestBlock.BlockItems.Add(new TextColorBlockItem(new Color {A = 255, R = 54, G = 102, B = 255})); + _testUtility.TestBlock.BlockItems.Add(new TextColorBlockItem(new Color {A = 240, R = 54, G = 102, B = 255})); // Act var result = _testUtility.Translator.TranslateItemFilterBlockToString(_testUtility.TestBlock); @@ -1751,7 +1751,7 @@ namespace Filtration.Parser.Tests.Services var expectedResult = "Show" + Environment.NewLine + " SetTextColor 54 102 255 # Test Theme Component"; - var blockItem = new TextColorBlockItem(new Color {A = 255, R = 54, G = 102, B = 255}) + var blockItem = new TextColorBlockItem(new Color {A = 240, R = 54, G = 102, B = 255}) { ThemeComponent = new ColorThemeComponent(ThemeComponentType.TextColor, "Test Theme Component", new Color()) }; @@ -1975,8 +1975,8 @@ namespace Filtration.Parser.Tests.Services _testUtility.TestBlock.BlockItems.Add(new HeightBlockItem(FilterPredicateOperator.LessThanOrEqual, 6)); _testUtility.TestBlock.BlockItems.Add(new HeightBlockItem(FilterPredicateOperator.GreaterThanOrEqual, 2)); _testUtility.TestBlock.BlockItems.Add(new TextColorBlockItem(new Color {A = 56, R = 255, G = 89, B = 0})); - _testUtility.TestBlock.BlockItems.Add(new BackgroundColorBlockItem(new Color { A = 255, R = 0, G = 0, B = 0 })); - _testUtility.TestBlock.BlockItems.Add(new BorderColorBlockItem(new Color { A = 255, R = 255, G = 1, B = 254 })); + _testUtility.TestBlock.BlockItems.Add(new BackgroundColorBlockItem(new Color { A = 240, R = 0, G = 0, B = 0 })); + _testUtility.TestBlock.BlockItems.Add(new BorderColorBlockItem(new Color { A = 240, R = 255, G = 1, B = 254 })); _testUtility.TestBlock.BlockItems.Add(new FontSizeBlockItem(50)); _testUtility.TestBlock.BlockItems.Add(new SoundBlockItem("6", 90)); _testUtility.TestBlock.BlockItems.Add(new ElderItemBlockItem(true)); @@ -2013,7 +2013,7 @@ namespace Filtration.Parser.Tests.Services var textColorBlockItem = testInputBlockItems.First(b => b is TextColorBlockItem) as TextColorBlockItem; Assert.IsNotNull(textColorBlockItem); Assert.AreNotSame(testInputBlockItem, textColorBlockItem); - Assert.AreEqual(new Color { R = 240, G = 200, B = 150, A = 255}, textColorBlockItem.Color); + Assert.AreEqual(new Color { R = 240, G = 200, B = 150, A = 240}, textColorBlockItem.Color); } [Test] @@ -2104,17 +2104,17 @@ namespace Filtration.Parser.Tests.Services var textColorBlockItem = testInputBlockItems.First(b => b is TextColorBlockItem) as TextColorBlockItem; Assert.IsNotNull(textColorBlockItem); Assert.AreNotSame(testInputTextColorBlockItem, textColorBlockItem); - Assert.AreEqual(new Color {A = 255, R = 240, G = 200, B = 150}, textColorBlockItem.Color); + Assert.AreEqual(new Color {A = 240, R = 240, G = 200, B = 150}, textColorBlockItem.Color); var backgroundColorBlockItem = testInputBlockItems.First(b => b is BackgroundColorBlockItem) as BackgroundColorBlockItem; Assert.IsNotNull(backgroundColorBlockItem); Assert.AreNotSame(testInputBackgroundColorBlockItem, backgroundColorBlockItem); - Assert.AreEqual(new Color { A = 255, R = 0, G = 0, B = 0 }, backgroundColorBlockItem.Color); + Assert.AreEqual(new Color { A = 240, R = 0, G = 0, B = 0 }, backgroundColorBlockItem.Color); var borderColorBlockItem = testInputBlockItems.First(b => b is BorderColorBlockItem) as BorderColorBlockItem; Assert.IsNotNull(borderColorBlockItem); Assert.AreNotSame(testInputBorderColorBlockItem, borderColorBlockItem); - Assert.AreEqual(new Color { A = 255, R = 255, G = 255, B = 255 }, borderColorBlockItem.Color); + Assert.AreEqual(new Color { A = 240, R = 255, G = 255, B = 255 }, borderColorBlockItem.Color); var soundBlockItem = testInputBlockItems.First(b => b is SoundBlockItem) as SoundBlockItem; Assert.IsNotNull(soundBlockItem); @@ -2140,15 +2140,15 @@ namespace Filtration.Parser.Tests.Services // Assert var textColorBlockItem = testInputBlockItems.First(b => b is TextColorBlockItem) as TextColorBlockItem; Assert.IsNotNull(textColorBlockItem); - Assert.AreEqual(new Color { A = 255, R = 240, G = 200, B = 150 }, textColorBlockItem.Color); + Assert.AreEqual(new Color { A = 240, R = 240, G = 200, B = 150 }, textColorBlockItem.Color); var backgroundColorBlockItem = testInputBlockItems.First(b => b is BackgroundColorBlockItem) as BackgroundColorBlockItem; Assert.IsNotNull(backgroundColorBlockItem); - Assert.AreEqual(new Color { A = 255, R = 0, G = 0, B = 0 }, backgroundColorBlockItem.Color); + Assert.AreEqual(new Color { A = 240, R = 0, G = 0, B = 0 }, backgroundColorBlockItem.Color); var borderColorBlockItem = testInputBlockItems.First(b => b is BorderColorBlockItem) as BorderColorBlockItem; Assert.IsNotNull(borderColorBlockItem); - Assert.AreEqual(new Color { A = 255, R = 255, G = 255, B = 255 }, borderColorBlockItem.Color); + Assert.AreEqual(new Color { A = 240, R = 255, G = 255, B = 255 }, borderColorBlockItem.Color); var soundBlockItem = testInputBlockItems.First(b => b is SoundBlockItem) as SoundBlockItem; Assert.IsNotNull(soundBlockItem); @@ -2177,11 +2177,11 @@ namespace Filtration.Parser.Tests.Services // Assert var textColorBlockItem = testInputBlockItems.First(b => b is TextColorBlockItem) as TextColorBlockItem; Assert.IsNotNull(textColorBlockItem); - Assert.AreEqual(new Color { A = 255, R = 240, G = 200, B = 150 }, textColorBlockItem.Color); + Assert.AreEqual(new Color { A = 240, R = 240, G = 200, B = 150 }, textColorBlockItem.Color); var backgroundColorBlockItem = testInputBlockItems.First(b => b is BackgroundColorBlockItem) as BackgroundColorBlockItem; Assert.IsNotNull(backgroundColorBlockItem); - Assert.AreEqual(new Color { A = 255, R = 0, G = 0, B = 0 }, backgroundColorBlockItem.Color); + Assert.AreEqual(new Color { A = 240, R = 0, G = 0, B = 0 }, backgroundColorBlockItem.Color); Assert.AreEqual(0, testInputBlockItems.Count(b => b is BorderColorBlockItem)); } diff --git a/Filtration.Parser/Services/ItemFilterBlockTranslator.cs b/Filtration.Parser/Services/ItemFilterBlockTranslator.cs index 9d27596..fed51c4 100644 --- a/Filtration.Parser/Services/ItemFilterBlockTranslator.cs +++ b/Filtration.Parser/Services/ItemFilterBlockTranslator.cs @@ -688,7 +688,7 @@ namespace Filtration.Parser.Services case 3: return new Color { - A = byte.MaxValue, + A = 240, R = Convert.ToByte(argbValues[0].Value), G = Convert.ToByte(argbValues[1].Value), B = Convert.ToByte(argbValues[2].Value) diff --git a/Filtration.ThemeEditor/ViewModels/ThemeEditorViewModel.cs b/Filtration.ThemeEditor/ViewModels/ThemeEditorViewModel.cs index 14f0442..ca3db7b 100644 --- a/Filtration.ThemeEditor/ViewModels/ThemeEditorViewModel.cs +++ b/Filtration.ThemeEditor/ViewModels/ThemeEditorViewModel.cs @@ -200,7 +200,7 @@ namespace Filtration.ThemeEditor.ViewModels case ThemeComponentType.BorderColor: case ThemeComponentType.TextColor: Components.Add(new ColorThemeComponent(themeComponentType, "Untitled Component", - new Color { A = 255, R = 255, G = 255, B = 255 })); + new Color { A = 240, R = 255, G = 255, B = 255 })); break; case ThemeComponentType.FontSize: Components.Add(new IntegerThemeComponent(themeComponentType, "Untitled Component", 35)); diff --git a/Filtration/ViewModels/ReplaceColorsViewModel.cs b/Filtration/ViewModels/ReplaceColorsViewModel.cs index a9dc2e7..e1f43ee 100644 --- a/Filtration/ViewModels/ReplaceColorsViewModel.cs +++ b/Filtration/ViewModels/ReplaceColorsViewModel.cs @@ -77,7 +77,7 @@ namespace Filtration.ViewModels public Color DisplayTextColor => _replaceColorsParameterSet.ReplaceTextColor ? _replaceColorsParameterSet.NewTextColor - : new Color {A = 255, R = 255, G = 255, B = 255}; + : new Color {A = 240, R = 255, G = 255, B = 255}; public bool ReplaceTextColor { @@ -102,7 +102,7 @@ namespace Filtration.ViewModels public Color DisplayBackgroundColor => _replaceColorsParameterSet.ReplaceBackgroundColor ? _replaceColorsParameterSet.NewBackgroundColor - : new Color { A = 255, R = 0, G = 0, B = 0 }; + : new Color { A = 240, R = 0, G = 0, B = 0 }; public bool ReplaceBackgroundColor { @@ -127,7 +127,7 @@ namespace Filtration.ViewModels public Color DisplayBorderColor => _replaceColorsParameterSet.ReplaceBorderColor ? _replaceColorsParameterSet.NewBorderColor - : new Color { A = 255, R = 0, G = 0, B = 0 }; + : new Color { A = 240, R = 0, G = 0, B = 0 }; public bool ReplaceBorderColor { diff --git a/Filtration/Views/PathOfExileColors.cs b/Filtration/Views/PathOfExileColors.cs index b6b090e..0485dea 100644 --- a/Filtration/Views/PathOfExileColors.cs +++ b/Filtration/Views/PathOfExileColors.cs @@ -10,36 +10,36 @@ namespace Filtration.Views { DefaultColors = new ObservableCollection { - new ColorItem(new Color {A = 255, R=127, G = 127, B = 127}, "Default"), - new ColorItem(new Color {A = 255, R=255, G = 255, B = 255}, "Value Default"), - new ColorItem(new Color {A = 255, R=255, G = 192, B = 203}, "Pink"), - new ColorItem(new Color {A = 255, R=30, G = 144, B = 255}, "Dodger Blue"), - new ColorItem(new Color {A = 255, R=150, G = 0, B = 0}, "Fire"), - new ColorItem(new Color {A = 255, R=54, G = 100, B = 146}, "Cold"), - new ColorItem(new Color {A = 255, R=255, G = 215, B = 0}, "Lightning"), - new ColorItem(new Color {A = 255, R=208, G = 32, B = 144}, "Chaos"), - new ColorItem(new Color {A = 255, R=136, G = 136, B = 255}, "Augmented"), - new ColorItem(new Color {A = 255, R=184, G = 218, B = 242}, "Crafted"), - new ColorItem(new Color {A = 255, R=210, G = 0, B = 0}, "Unmet"), - new ColorItem(new Color {A = 255, R=175, G = 96, B = 37}, "Unique Item"), - new ColorItem(new Color {A = 255, R=255, G = 255, B = 119}, "Rare Item"), - new ColorItem(new Color {A = 255, R=136, G = 136, B = 255}, "Magic Item"), - new ColorItem(new Color {A = 255, R=200, G = 200, B = 200}, "White Item"), - new ColorItem(new Color {A = 255, R=27, G = 162, B = 155}, "Gem Item"), - new ColorItem(new Color {A = 255, R=170, G = 158, B = 130}, "Currency Item"), - new ColorItem(new Color {A = 255, R=74, G = 230, B = 58}, "Quest Item"), - new ColorItem(new Color {A = 255, R=255, G = 200, B = 0}, "Nemesis Mod"), + new ColorItem(new Color {A = 240, R=127, G = 127, B = 127}, "Default"), + new ColorItem(new Color {A = 240, R=255, G = 255, B = 255}, "Value Default"), + new ColorItem(new Color {A = 240, R=255, G = 192, B = 203}, "Pink"), + new ColorItem(new Color {A = 240, R=30, G = 144, B = 255}, "Dodger Blue"), + new ColorItem(new Color {A = 240, R=150, G = 0, B = 0}, "Fire"), + new ColorItem(new Color {A = 240, R=54, G = 100, B = 146}, "Cold"), + new ColorItem(new Color {A = 240, R=255, G = 215, B = 0}, "Lightning"), + new ColorItem(new Color {A = 240, R=208, G = 32, B = 144}, "Chaos"), + new ColorItem(new Color {A = 240, R=136, G = 136, B = 255}, "Augmented"), + new ColorItem(new Color {A = 240, R=184, G = 218, B = 242}, "Crafted"), + new ColorItem(new Color {A = 240, R=210, G = 0, B = 0}, "Unmet"), + new ColorItem(new Color {A = 240, R=175, G = 96, B = 37}, "Unique Item"), + new ColorItem(new Color {A = 240, R=255, G = 255, B = 119}, "Rare Item"), + new ColorItem(new Color {A = 240, R=136, G = 136, B = 255}, "Magic Item"), + new ColorItem(new Color {A = 240, R=200, G = 200, B = 200}, "White Item"), + new ColorItem(new Color {A = 240, R=27, G = 162, B = 155}, "Gem Item"), + new ColorItem(new Color {A = 240, R=170, G = 158, B = 130}, "Currency Item"), + new ColorItem(new Color {A = 240, R=74, G = 230, B = 58}, "Quest Item"), + new ColorItem(new Color {A = 240, R=255, G = 200, B = 0}, "Nemesis Mod"), new ColorItem(new Color {A = 220, R = 255, G = 40, B = 0}, "Nemesis Mod Outline"), - new ColorItem(new Color {A = 255, R=231, G = 180, B = 120}, "Title"), - new ColorItem(new Color {A = 255, R=210, G = 0, B = 0}, "Corrupted"), - new ColorItem(new Color {A = 255, R=170, G = 158, B = 130}, "Favour"), - new ColorItem(new Color {A = 255, R=180, G = 96, B = 0}, "Supporter Pack New Item"), - new ColorItem(new Color {A = 255, R=163, G = 141, B = 109}, "Supporter Pack Item"), - new ColorItem(new Color {A = 255, R=210, G = 0, B = 220}, "Bloodline Mod"), + new ColorItem(new Color {A = 240, R=231, G = 180, B = 120}, "Title"), + new ColorItem(new Color {A = 240, R=210, G = 0, B = 0}, "Corrupted"), + new ColorItem(new Color {A = 240, R=170, G = 158, B = 130}, "Favour"), + new ColorItem(new Color {A = 240, R=180, G = 96, B = 0}, "Supporter Pack New Item"), + new ColorItem(new Color {A = 240, R=163, G = 141, B = 109}, "Supporter Pack Item"), + new ColorItem(new Color {A = 240, R=210, G = 0, B = 220}, "Bloodline Mod"), new ColorItem(new Color {A = 200, R = 74, G = 0, B = 160}, "Bloodline Mod Outline"), - new ColorItem(new Color {A = 255, R=50, G = 230, B = 100}, "Torment Mod"), + new ColorItem(new Color {A = 240, R=50, G = 230, B = 100}, "Torment Mod"), new ColorItem(new Color {A = 200, R = 0, G = 100, B = 150}, "Torment Mod Outline"), - new ColorItem(new Color {A = 255, R=210, G = 0, B = 0}, "Can't Trade or Modify") + new ColorItem(new Color {A = 240, R=210, G = 0, B = 0}, "Can't Trade or Modify") }; }