From 1ebbe5b5a8017062bec0935e61dbec80b8ba2254 Mon Sep 17 00:00:00 2001 From: GlenCFL Date: Wed, 6 Dec 2017 23:03:46 -0500 Subject: [PATCH] Add support for the new block types. --- .../BlockItemTypes/ElderItemBlockItem.cs | 23 ++ .../BlockItemTypes/ShapedMapBlockItem.cs | 23 ++ .../BlockItemTypes/ShaperItemBlockItem.cs | 23 ++ .../Filtration.ObjectModel.csproj | 207 +++++++++--------- .../Services/ItemFilterBlockTranslator.cs | 15 ++ .../ViewModels/ItemFilterBlockViewModel.cs | 5 +- 6 files changed, 193 insertions(+), 103 deletions(-) create mode 100644 Filtration.ObjectModel/BlockItemTypes/ElderItemBlockItem.cs create mode 100644 Filtration.ObjectModel/BlockItemTypes/ShapedMapBlockItem.cs create mode 100644 Filtration.ObjectModel/BlockItemTypes/ShaperItemBlockItem.cs diff --git a/Filtration.ObjectModel/BlockItemTypes/ElderItemBlockItem.cs b/Filtration.ObjectModel/BlockItemTypes/ElderItemBlockItem.cs new file mode 100644 index 0000000..af32bd6 --- /dev/null +++ b/Filtration.ObjectModel/BlockItemTypes/ElderItemBlockItem.cs @@ -0,0 +1,23 @@ +using System.Windows.Media; +using Filtration.ObjectModel.BlockItemBaseTypes; + +namespace Filtration.ObjectModel.BlockItemTypes +{ + public sealed class ElderItemBlockItem : BooleanBlockItem + { + public ElderItemBlockItem() + { + } + + public ElderItemBlockItem(bool booleanValue) : base(booleanValue) + { + } + + public override string PrefixText => "ElderItem"; + public override string DisplayHeading => "Elder Item"; + public override Color SummaryBackgroundColor => Colors.DarkGray; + public override Color SummaryTextColor => Colors.White; + public override int SortOrder => 19; + + } +} \ No newline at end of file diff --git a/Filtration.ObjectModel/BlockItemTypes/ShapedMapBlockItem.cs b/Filtration.ObjectModel/BlockItemTypes/ShapedMapBlockItem.cs new file mode 100644 index 0000000..88e0859 --- /dev/null +++ b/Filtration.ObjectModel/BlockItemTypes/ShapedMapBlockItem.cs @@ -0,0 +1,23 @@ +using System.Windows.Media; +using Filtration.ObjectModel.BlockItemBaseTypes; + +namespace Filtration.ObjectModel.BlockItemTypes +{ + public sealed class ShapedMapBlockItem : BooleanBlockItem + { + public ShapedMapBlockItem() + { + } + + public ShapedMapBlockItem(bool booleanValue) : base(booleanValue) + { + } + + public override string PrefixText => "ShapedMap"; + public override string DisplayHeading => "Shaped Map"; + public override Color SummaryBackgroundColor => Colors.DarkGoldenrod; + public override Color SummaryTextColor => Colors.White; + public override int SortOrder => 21; + + } +} \ No newline at end of file diff --git a/Filtration.ObjectModel/BlockItemTypes/ShaperItemBlockItem.cs b/Filtration.ObjectModel/BlockItemTypes/ShaperItemBlockItem.cs new file mode 100644 index 0000000..26a7dc6 --- /dev/null +++ b/Filtration.ObjectModel/BlockItemTypes/ShaperItemBlockItem.cs @@ -0,0 +1,23 @@ +using System.Windows.Media; +using Filtration.ObjectModel.BlockItemBaseTypes; + +namespace Filtration.ObjectModel.BlockItemTypes +{ + public sealed class ShaperItemBlockItem : BooleanBlockItem + { + public ShaperItemBlockItem() + { + } + + public ShaperItemBlockItem(bool booleanValue) : base(booleanValue) + { + } + + public override string PrefixText => "ShaperItem"; + public override string DisplayHeading => "Shaper Item"; + public override Color SummaryBackgroundColor => Colors.DimGray; + public override Color SummaryTextColor => Colors.White; + public override int SortOrder => 20; + + } +} \ No newline at end of file diff --git a/Filtration.ObjectModel/Filtration.ObjectModel.csproj b/Filtration.ObjectModel/Filtration.ObjectModel.csproj index 476cae3..4ce6dcc 100644 --- a/Filtration.ObjectModel/Filtration.ObjectModel.csproj +++ b/Filtration.ObjectModel/Filtration.ObjectModel.csproj @@ -1,109 +1,112 @@ - - - - - Debug - AnyCPU - {4AAC3BEB-1DC1-483E-9D11-0E9334E80227} - Library - Properties - Filtration.ObjectModel - Filtration.ObjectModel - v4.6.1 - 512 - - - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + Debug + AnyCPU + {4AAC3BEB-1DC1-483E-9D11-0E9334E80227} + Library + Properties + Filtration.ObjectModel + Filtration.ObjectModel + v4.6.1 + 512 + + + + true + full + false + bin\Debug\ + DEBUG;TRACE + prompt + 4 + + + pdbonly + true + bin\Release\ + TRACE + prompt + 4 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + --> \ No newline at end of file diff --git a/Filtration.Parser/Services/ItemFilterBlockTranslator.cs b/Filtration.Parser/Services/ItemFilterBlockTranslator.cs index d2b9bcf..323478e 100644 --- a/Filtration.Parser/Services/ItemFilterBlockTranslator.cs +++ b/Filtration.Parser/Services/ItemFilterBlockTranslator.cs @@ -139,6 +139,21 @@ namespace Filtration.Parser.Services AddBooleanItemToBlockItems(block, trimmedLine); break; } + case "ElderItem": + { + AddBooleanItemToBlockItems(block, trimmedLine); + break; + } + case "ShaperItem": + { + AddBooleanItemToBlockItems(block, trimmedLine); + break; + } + case "ShapedMap": + { + AddBooleanItemToBlockItems(block, trimmedLine); + break; + } case "Sockets": { AddNumericFilterPredicateItemToBlockItems(block, trimmedLine); diff --git a/Filtration/ViewModels/ItemFilterBlockViewModel.cs b/Filtration/ViewModels/ItemFilterBlockViewModel.cs index 250e4d7..c39bf0a 100644 --- a/Filtration/ViewModels/ItemFilterBlockViewModel.cs +++ b/Filtration/ViewModels/ItemFilterBlockViewModel.cs @@ -189,7 +189,10 @@ namespace Filtration.ViewModels typeof (ClassBlockItem), typeof (BaseTypeBlockItem), typeof (IdentifiedBlockItem), - typeof (CorruptedBlockItem) + typeof (CorruptedBlockItem), + typeof (ElderItemBlockItem), + typeof (ShaperItemBlockItem), + typeof (ShapedMapBlockItem) }; public List AudioVisualBlockItemTypesAvailable => new List