mikx/Filtration
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Add support for the new block types.

Browse Source
This commit is contained in:
GlenCFL 2017-12-06 23:03:46 -05:00
parent 7b8ff1e3cb
commit 1ebbe5b5a8
6 changed files with 193 additions and 103 deletions

23
Filtration.ObjectModel/BlockItemTypes/ElderItemBlockItem.cs Normal file

@ -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;
}
}

23
Filtration.ObjectModel/BlockItemTypes/ShapedMapBlockItem.cs Normal file

@ -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;
}
}

23
Filtration.ObjectModel/BlockItemTypes/ShaperItemBlockItem.cs Normal file

@ -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;
}
}

207
Filtration.ObjectModel/Filtration.ObjectModel.csproj

@ -1,109 +1,112 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" /> <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup> <PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProjectGuid>{4AAC3BEB-1DC1-483E-9D11-0E9334E80227}</ProjectGuid> <ProjectGuid>{4AAC3BEB-1DC1-483E-9D11-0E9334E80227}</ProjectGuid>
<OutputType>Library</OutputType> <OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder> <AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Filtration.ObjectModel</RootNamespace> <RootNamespace>Filtration.ObjectModel</RootNamespace>
<AssemblyName>Filtration.ObjectModel</AssemblyName> <AssemblyName>Filtration.ObjectModel</AssemblyName>
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion> <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment> <FileAlignment>512</FileAlignment>
<TargetFrameworkProfile /> <TargetFrameworkProfile />
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols> <DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType> <DebugType>full</DebugType>
<Optimize>false</Optimize> <Optimize>false</Optimize>
<OutputPath>bin\Debug\</OutputPath> <OutputPath>bin\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants> <DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport> <ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel> <WarningLevel>4</WarningLevel>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType> <DebugType>pdbonly</DebugType>
<Optimize>true</Optimize> <Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath> <OutputPath>bin\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants> <DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport> <ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel> <WarningLevel>4</WarningLevel>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<Reference Include="PresentationCore" /> <Reference Include="PresentationCore" />
<Reference Include="System" /> <Reference Include="System" />
<Reference Include="System.ComponentModel.DataAnnotations" /> <Reference Include="System.ComponentModel.DataAnnotations" />
<Reference Include="System.Core" /> <Reference Include="System.Core" />
<Reference Include="System.Xml.Linq" /> <Reference Include="System.Xml.Linq" />
<Reference Include="System.Data.DataSetExtensions" /> <Reference Include="System.Data.DataSetExtensions" />
<Reference Include="Microsoft.CSharp" /> <Reference Include="Microsoft.CSharp" />
<Reference Include="System.Data" /> <Reference Include="System.Data" />
<Reference Include="System.Xml" /> <Reference Include="System.Xml" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Compile Include="BlockItemBaseTypes\ActionBlockItem.cs" /> <Compile Include="BlockItemBaseTypes\ActionBlockItem.cs" />
<Compile Include="BlockItemBaseTypes\BlockItemBase.cs" /> <Compile Include="BlockItemBaseTypes\BlockItemBase.cs" />
<Compile Include="BlockItemBaseTypes\BooleanBlockItem.cs" /> <Compile Include="BlockItemBaseTypes\BooleanBlockItem.cs" />
<Compile Include="BlockItemBaseTypes\ColorBlockItem.cs" /> <Compile Include="BlockItemBaseTypes\ColorBlockItem.cs" />
<Compile Include="BlockItemBaseTypes\DualIntegerBlockItem.cs" /> <Compile Include="BlockItemBaseTypes\DualIntegerBlockItem.cs" />
<Compile Include="BlockItemBaseTypes\IntegerBlockItem.cs" /> <Compile Include="BlockItemBaseTypes\IntegerBlockItem.cs" />
<Compile Include="BlockItemBaseTypes\NumericFilterPredicateBlockItem.cs" /> <Compile Include="BlockItemBaseTypes\NumericFilterPredicateBlockItem.cs" />
<Compile Include="BlockItemBaseTypes\StringListBlockItem.cs" /> <Compile Include="BlockItemBaseTypes\StringListBlockItem.cs" />
<Compile Include="BlockItemTypes\BackgroundColorBlockItem.cs" /> <Compile Include="BlockItemTypes\BackgroundColorBlockItem.cs" />
<Compile Include="BlockItemTypes\BaseTypeBlockItem.cs" /> <Compile Include="BlockItemTypes\BaseTypeBlockItem.cs" />
<Compile Include="BlockItemTypes\BorderColorBlockItem.cs" /> <Compile Include="BlockItemTypes\BorderColorBlockItem.cs" />
<Compile Include="BlockItemTypes\ClassBlockItem.cs" /> <Compile Include="BlockItemTypes\ClassBlockItem.cs" />
<Compile Include="BlockItemTypes\CorruptedBlockItem.cs" /> <Compile Include="BlockItemTypes\ShapedMapBlockItem.cs" />
<Compile Include="BlockItemTypes\DropLevelBlockItem.cs" /> <Compile Include="BlockItemTypes\ShaperItemBlockItem.cs" />
<Compile Include="BlockItemTypes\FontSizeBlockItem.cs" /> <Compile Include="BlockItemTypes\ElderItemBlockItem.cs" />
<Compile Include="BlockItemTypes\HeightBlockItem.cs" /> <Compile Include="BlockItemTypes\CorruptedBlockItem.cs" />
<Compile Include="BlockItemTypes\IdentifiedBlockItem.cs" /> <Compile Include="BlockItemTypes\DropLevelBlockItem.cs" />
<Compile Include="BlockItemTypes\ItemLevelBlockItem.cs" /> <Compile Include="BlockItemTypes\FontSizeBlockItem.cs" />
<Compile Include="BlockItemTypes\LinkedSocketsBlockItem.cs" /> <Compile Include="BlockItemTypes\HeightBlockItem.cs" />
<Compile Include="BlockItemTypes\QualityBlockItem.cs" /> <Compile Include="BlockItemTypes\IdentifiedBlockItem.cs" />
<Compile Include="BlockItemTypes\RarityBlockItem.cs" /> <Compile Include="BlockItemTypes\ItemLevelBlockItem.cs" />
<Compile Include="BlockItemTypes\SocketGroupBlockItem.cs" /> <Compile Include="BlockItemTypes\LinkedSocketsBlockItem.cs" />
<Compile Include="BlockItemTypes\SocketsBlockItem.cs" /> <Compile Include="BlockItemTypes\QualityBlockItem.cs" />
<Compile Include="BlockItemTypes\SoundBlockItem.cs" /> <Compile Include="BlockItemTypes\RarityBlockItem.cs" />
<Compile Include="BlockItemTypes\TextColorBlockItem.cs" /> <Compile Include="BlockItemTypes\SocketGroupBlockItem.cs" />
<Compile Include="BlockItemTypes\WidthBlockItem.cs" /> <Compile Include="BlockItemTypes\SocketsBlockItem.cs" />
<Compile Include="Enums\BlockAction.cs" /> <Compile Include="BlockItemTypes\SoundBlockItem.cs" />
<Compile Include="Enums\BlockItemType.cs" /> <Compile Include="BlockItemTypes\TextColorBlockItem.cs" />
<Compile Include="Enums\FilterPredicateOperator.cs" /> <Compile Include="BlockItemTypes\WidthBlockItem.cs" />
<Compile Include="Enums\FilterType.cs" /> <Compile Include="Enums\BlockAction.cs" />
<Compile Include="Enums\ItemRarity.cs" /> <Compile Include="Enums\BlockItemType.cs" />
<Compile Include="Enums\SocketColor.cs" /> <Compile Include="Enums\FilterPredicateOperator.cs" />
<Compile Include="Enums\ThemeComponentType.cs" /> <Compile Include="Enums\FilterType.cs" />
<Compile Include="Extensions\EnumHelper.cs" /> <Compile Include="Enums\ItemRarity.cs" />
<Compile Include="Extensions\ItemRarityExtensions.cs" /> <Compile Include="Enums\SocketColor.cs" />
<Compile Include="FilteredItem.cs" /> <Compile Include="Enums\ThemeComponentType.cs" />
<Compile Include="IAudioVisualBlockItem.cs" /> <Compile Include="Extensions\EnumHelper.cs" />
<Compile Include="IItemFilterBlockItem.cs" /> <Compile Include="Extensions\ItemRarityExtensions.cs" />
<Compile Include="Item.cs" /> <Compile Include="FilteredItem.cs" />
<Compile Include="ItemFilterBlock.cs" /> <Compile Include="IAudioVisualBlockItem.cs" />
<Compile Include="ItemFilterBlockGroup.cs" /> <Compile Include="IItemFilterBlockItem.cs" />
<Compile Include="ItemFilterScript.cs" /> <Compile Include="Item.cs" />
<Compile Include="ItemFilterSection.cs" /> <Compile Include="ItemFilterBlock.cs" />
<Compile Include="ItemSet.cs" /> <Compile Include="ItemFilterBlockGroup.cs" />
<Compile Include="NumericFilterPredicate.cs" /> <Compile Include="ItemFilterScript.cs" />
<Compile Include="PathOfExileNamedColors.cs" /> <Compile Include="ItemFilterSection.cs" />
<Compile Include="Enums\PathOfExileNamedColor.cs" /> <Compile Include="ItemSet.cs" />
<Compile Include="Properties\Annotations.cs" /> <Compile Include="NumericFilterPredicate.cs" />
<Compile Include="Properties\AssemblyInfo.cs" /> <Compile Include="PathOfExileNamedColors.cs" />
<Compile Include="ReplaceColorsParameterSet.cs" /> <Compile Include="Enums\PathOfExileNamedColor.cs" />
<Compile Include="Socket.cs" /> <Compile Include="Properties\Annotations.cs" />
<Compile Include="SocketGroup.cs" /> <Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="ThemeEditor\Theme.cs" /> <Compile Include="ReplaceColorsParameterSet.cs" />
<Compile Include="ThemeEditor\ThemeComponent.cs" /> <Compile Include="Socket.cs" />
<Compile Include="ThemeEditor\ThemeComponentCollection.cs" /> <Compile Include="SocketGroup.cs" />
</ItemGroup> <Compile Include="ThemeEditor\Theme.cs" />
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> <Compile Include="ThemeEditor\ThemeComponent.cs" />
<Compile Include="ThemeEditor\ThemeComponentCollection.cs" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it. <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets. Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild"> <Target Name="BeforeBuild">
</Target> </Target>
<Target Name="AfterBuild"> <Target Name="AfterBuild">
</Target> </Target>
--> -->
</Project> </Project>

15
Filtration.Parser/Services/ItemFilterBlockTranslator.cs

@ -139,6 +139,21 @@ namespace Filtration.Parser.Services
AddBooleanItemToBlockItems<IdentifiedBlockItem>(block, trimmedLine); AddBooleanItemToBlockItems<IdentifiedBlockItem>(block, trimmedLine);
break; break;
} }
case "ElderItem":
{
AddBooleanItemToBlockItems<ElderItemBlockItem>(block, trimmedLine);
break;
}
case "ShaperItem":
{
AddBooleanItemToBlockItems<ShaperItemBlockItem>(block, trimmedLine);
break;
}
case "ShapedMap":
{
AddBooleanItemToBlockItems<ShapedMapBlockItem>(block, trimmedLine);
break;
}
case "Sockets": case "Sockets":
{ {
AddNumericFilterPredicateItemToBlockItems<SocketsBlockItem>(block, trimmedLine); AddNumericFilterPredicateItemToBlockItems<SocketsBlockItem>(block, trimmedLine);

5
Filtration/ViewModels/ItemFilterBlockViewModel.cs

@ -189,7 +189,10 @@ namespace Filtration.ViewModels
typeof (ClassBlockItem), typeof (ClassBlockItem),
typeof (BaseTypeBlockItem), typeof (BaseTypeBlockItem),
typeof (IdentifiedBlockItem), typeof (IdentifiedBlockItem),
typeof (CorruptedBlockItem) typeof (CorruptedBlockItem),
typeof (ElderItemBlockItem),
typeof (ShaperItemBlockItem),
typeof (ShapedMapBlockItem)
}; };
public List<Type> AudioVisualBlockItemTypesAvailable => new List<Type> public List<Type> AudioVisualBlockItemTypesAvailable => new List<Type>