Add ElderMap block type
This commit is contained in:
parent
f03e37602d
commit
738415f10a
|
@ -16,6 +16,6 @@ namespace Filtration.ObjectModel.BlockItemTypes
|
||||||
public override string PrefixText => "SetBackgroundColor";
|
public override string PrefixText => "SetBackgroundColor";
|
||||||
public override int MaximumAllowed => 1;
|
public override int MaximumAllowed => 1;
|
||||||
public override string DisplayHeading => "Background Color";
|
public override string DisplayHeading => "Background Color";
|
||||||
public override int SortOrder => 21;
|
public override int SortOrder => 22;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -33,6 +33,6 @@ namespace Filtration.ObjectModel.BlockItemTypes
|
||||||
|
|
||||||
public override Color SummaryBackgroundColor => Colors.MediumTurquoise;
|
public override Color SummaryBackgroundColor => Colors.MediumTurquoise;
|
||||||
public override Color SummaryTextColor => Colors.Black;
|
public override Color SummaryTextColor => Colors.Black;
|
||||||
public override int SortOrder => 18;
|
public override int SortOrder => 19;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -16,6 +16,6 @@ namespace Filtration.ObjectModel.BlockItemTypes
|
||||||
public override string PrefixText => "SetBorderColor";
|
public override string PrefixText => "SetBorderColor";
|
||||||
public override int MaximumAllowed => 1;
|
public override int MaximumAllowed => 1;
|
||||||
public override string DisplayHeading => "Border Color";
|
public override string DisplayHeading => "Border Color";
|
||||||
public override int SortOrder => 22;
|
public override int SortOrder => 23;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -33,6 +33,6 @@ namespace Filtration.ObjectModel.BlockItemTypes
|
||||||
|
|
||||||
public override Color SummaryBackgroundColor => Colors.MediumSeaGreen;
|
public override Color SummaryBackgroundColor => Colors.MediumSeaGreen;
|
||||||
public override Color SummaryTextColor => Colors.White;
|
public override Color SummaryTextColor => Colors.White;
|
||||||
public override int SortOrder => 17;
|
public override int SortOrder => 18;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -21,7 +21,7 @@ namespace Filtration.ObjectModel.BlockItemTypes
|
||||||
public override string SummaryText => "Drop Level " + FilterPredicate;
|
public override string SummaryText => "Drop Level " + FilterPredicate;
|
||||||
public override Color SummaryBackgroundColor => Colors.DodgerBlue;
|
public override Color SummaryBackgroundColor => Colors.DodgerBlue;
|
||||||
public override Color SummaryTextColor => Colors.White;
|
public override Color SummaryTextColor => Colors.White;
|
||||||
public override int SortOrder => 13;
|
public override int SortOrder => 14;
|
||||||
public override int Minimum => 0;
|
public override int Minimum => 0;
|
||||||
public override int Maximum => 100;
|
public override int Maximum => 100;
|
||||||
}
|
}
|
||||||
|
|
|
@ -0,0 +1,23 @@
|
||||||
|
using System.Windows.Media;
|
||||||
|
using Filtration.ObjectModel.BlockItemBaseTypes;
|
||||||
|
|
||||||
|
namespace Filtration.ObjectModel.BlockItemTypes
|
||||||
|
{
|
||||||
|
public sealed class ElderMapBlockItem : BooleanBlockItem
|
||||||
|
{
|
||||||
|
public ElderMapBlockItem()
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
|
public ElderMapBlockItem(bool booleanValue) : base(booleanValue)
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
|
public override string PrefixText => "ElderMap";
|
||||||
|
public override string DisplayHeading => "Elder Map";
|
||||||
|
public override Color SummaryBackgroundColor => Colors.DarkGoldenrod;
|
||||||
|
public override Color SummaryTextColor => Colors.White;
|
||||||
|
public override int SortOrder => 9;
|
||||||
|
|
||||||
|
}
|
||||||
|
}
|
|
@ -16,7 +16,7 @@ namespace Filtration.ObjectModel.BlockItemTypes
|
||||||
public override string PrefixText => "SetFontSize";
|
public override string PrefixText => "SetFontSize";
|
||||||
public override int MaximumAllowed => 1;
|
public override int MaximumAllowed => 1;
|
||||||
public override string DisplayHeading => "Font Size";
|
public override string DisplayHeading => "Font Size";
|
||||||
public override int SortOrder => 23;
|
public override int SortOrder => 24;
|
||||||
public override int Minimum => 11;
|
public override int Minimum => 11;
|
||||||
public override int Maximum => 45;
|
public override int Maximum => 45;
|
||||||
}
|
}
|
||||||
|
|
|
@ -21,7 +21,7 @@ namespace Filtration.ObjectModel.BlockItemTypes
|
||||||
public override string SummaryText => "Gem Level " + FilterPredicate;
|
public override string SummaryText => "Gem Level " + FilterPredicate;
|
||||||
public override Color SummaryBackgroundColor => Colors.DarkSlateGray;
|
public override Color SummaryBackgroundColor => Colors.DarkSlateGray;
|
||||||
public override Color SummaryTextColor => Colors.White;
|
public override Color SummaryTextColor => Colors.White;
|
||||||
public override int SortOrder => 14;
|
public override int SortOrder => 15;
|
||||||
public override int Minimum => 0;
|
public override int Minimum => 0;
|
||||||
public override int Maximum => 40;
|
public override int Maximum => 40;
|
||||||
}
|
}
|
||||||
|
|
|
@ -33,6 +33,6 @@ namespace Filtration.ObjectModel.BlockItemTypes
|
||||||
|
|
||||||
public override Color SummaryBackgroundColor => Colors.MidnightBlue;
|
public override Color SummaryBackgroundColor => Colors.MidnightBlue;
|
||||||
public override Color SummaryTextColor => Colors.White;
|
public override Color SummaryTextColor => Colors.White;
|
||||||
public override int SortOrder => 19;
|
public override int SortOrder => 20;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -21,7 +21,7 @@ namespace Filtration.ObjectModel.BlockItemTypes
|
||||||
public override string SummaryText => "Height " + FilterPredicate;
|
public override string SummaryText => "Height " + FilterPredicate;
|
||||||
public override Color SummaryBackgroundColor => Colors.LightBlue;
|
public override Color SummaryBackgroundColor => Colors.LightBlue;
|
||||||
public override Color SummaryTextColor => Colors.Black;
|
public override Color SummaryTextColor => Colors.Black;
|
||||||
public override int SortOrder => 10;
|
public override int SortOrder => 11;
|
||||||
public override int Minimum => 0;
|
public override int Minimum => 0;
|
||||||
public override int Maximum => 6;
|
public override int Maximum => 6;
|
||||||
}
|
}
|
||||||
|
|
|
@ -20,7 +20,7 @@ namespace Filtration.ObjectModel.BlockItemTypes
|
||||||
public override string SummaryText => "Item Level " + FilterPredicate;
|
public override string SummaryText => "Item Level " + FilterPredicate;
|
||||||
public override Color SummaryBackgroundColor => Colors.DarkSlateGray;
|
public override Color SummaryBackgroundColor => Colors.DarkSlateGray;
|
||||||
public override Color SummaryTextColor => Colors.White;
|
public override Color SummaryTextColor => Colors.White;
|
||||||
public override int SortOrder => 12;
|
public override int SortOrder => 13;
|
||||||
public override int Minimum => 0;
|
public override int Minimum => 0;
|
||||||
public override int Maximum => 100;
|
public override int Maximum => 100;
|
||||||
}
|
}
|
||||||
|
|
|
@ -17,6 +17,6 @@ namespace Filtration.ObjectModel.BlockItemTypes
|
||||||
public override string PrefixText => "PlayAlertSoundPositional";
|
public override string PrefixText => "PlayAlertSoundPositional";
|
||||||
public override int MaximumAllowed => 1;
|
public override int MaximumAllowed => 1;
|
||||||
public override string DisplayHeading => "Play Positional Alert Sound";
|
public override string DisplayHeading => "Play Positional Alert Sound";
|
||||||
public override int SortOrder => 25;
|
public override int SortOrder => 26;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -30,7 +30,7 @@ namespace Filtration.ObjectModel.BlockItemTypes
|
||||||
((ItemRarity) FilterPredicate.PredicateOperand).GetAttributeDescription();
|
((ItemRarity) FilterPredicate.PredicateOperand).GetAttributeDescription();
|
||||||
public override Color SummaryBackgroundColor => Colors.LightCoral;
|
public override Color SummaryBackgroundColor => Colors.LightCoral;
|
||||||
public override Color SummaryTextColor => Colors.White;
|
public override Color SummaryTextColor => Colors.White;
|
||||||
public override int SortOrder => 16;
|
public override int SortOrder => 17;
|
||||||
public override int Minimum => 0;
|
public override int Minimum => 0;
|
||||||
public override int Maximum => (int)ItemRarity.Unique;
|
public override int Maximum => (int)ItemRarity.Unique;
|
||||||
}
|
}
|
||||||
|
|
|
@ -39,7 +39,7 @@ namespace Filtration.ObjectModel.BlockItemTypes
|
||||||
|
|
||||||
public override Color SummaryBackgroundColor => Colors.GhostWhite;
|
public override Color SummaryBackgroundColor => Colors.GhostWhite;
|
||||||
public override Color SummaryTextColor => Colors.Black;
|
public override Color SummaryTextColor => Colors.Black;
|
||||||
public override int SortOrder => 9;
|
public override int SortOrder => 10;
|
||||||
|
|
||||||
private SocketColor StringToSocketColor(char socketColorString)
|
private SocketColor StringToSocketColor(char socketColorString)
|
||||||
{
|
{
|
||||||
|
|
|
@ -17,6 +17,6 @@ namespace Filtration.ObjectModel.BlockItemTypes
|
||||||
public override string PrefixText => "PlayAlertSound";
|
public override string PrefixText => "PlayAlertSound";
|
||||||
public override int MaximumAllowed => 1;
|
public override int MaximumAllowed => 1;
|
||||||
public override string DisplayHeading => "Play Alert Sound";
|
public override string DisplayHeading => "Play Alert Sound";
|
||||||
public override int SortOrder => 24;
|
public override int SortOrder => 25;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -21,7 +21,7 @@ namespace Filtration.ObjectModel.BlockItemTypes
|
||||||
public override string SummaryText => "Stack Size " + FilterPredicate;
|
public override string SummaryText => "Stack Size " + FilterPredicate;
|
||||||
public override Color SummaryBackgroundColor => Colors.DarkSlateGray;
|
public override Color SummaryBackgroundColor => Colors.DarkSlateGray;
|
||||||
public override Color SummaryTextColor => Colors.White;
|
public override Color SummaryTextColor => Colors.White;
|
||||||
public override int SortOrder => 15;
|
public override int SortOrder => 16;
|
||||||
public override int Minimum => 0;
|
public override int Minimum => 0;
|
||||||
public override int Maximum => 1000;
|
public override int Maximum => 1000;
|
||||||
}
|
}
|
||||||
|
|
|
@ -16,6 +16,6 @@ namespace Filtration.ObjectModel.BlockItemTypes
|
||||||
public override string PrefixText => "SetTextColor";
|
public override string PrefixText => "SetTextColor";
|
||||||
public override int MaximumAllowed => 1;
|
public override int MaximumAllowed => 1;
|
||||||
public override string DisplayHeading => "Text Color";
|
public override string DisplayHeading => "Text Color";
|
||||||
public override int SortOrder => 20;
|
public override int SortOrder => 21;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -21,7 +21,7 @@ namespace Filtration.ObjectModel.BlockItemTypes
|
||||||
public override string SummaryText => "Width " + FilterPredicate;
|
public override string SummaryText => "Width " + FilterPredicate;
|
||||||
public override Color SummaryBackgroundColor => Colors.MediumPurple;
|
public override Color SummaryBackgroundColor => Colors.MediumPurple;
|
||||||
public override Color SummaryTextColor => Colors.White;
|
public override Color SummaryTextColor => Colors.White;
|
||||||
public override int SortOrder => 11;
|
public override int SortOrder => 12;
|
||||||
public override int Minimum => 0;
|
public override int Minimum => 0;
|
||||||
public override int Maximum => 2;
|
public override int Maximum => 2;
|
||||||
}
|
}
|
||||||
|
|
|
@ -61,6 +61,7 @@
|
||||||
<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\ElderMapBlockItem.cs" />
|
||||||
<Compile Include="BlockItemTypes\GemLevelBlockItem.cs" />
|
<Compile Include="BlockItemTypes\GemLevelBlockItem.cs" />
|
||||||
<Compile Include="BlockItemTypes\HasExplicitModBlockItem.cs" />
|
<Compile Include="BlockItemTypes\HasExplicitModBlockItem.cs" />
|
||||||
<Compile Include="BlockItemTypes\ShapedMapBlockItem.cs" />
|
<Compile Include="BlockItemTypes\ShapedMapBlockItem.cs" />
|
||||||
|
|
|
@ -422,6 +422,23 @@ namespace Filtration.Parser.Tests.Services
|
||||||
Assert.IsFalse(blockItem.BooleanValue);
|
Assert.IsFalse(blockItem.BooleanValue);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
[Test]
|
||||||
|
public void TranslateStringToItemFilterBlock_ElderMap_ReturnsCorrectObject()
|
||||||
|
{
|
||||||
|
// Arrange
|
||||||
|
var inputString = "Show" + Environment.NewLine +
|
||||||
|
" ElderMap false";
|
||||||
|
|
||||||
|
// Act
|
||||||
|
var result = _testUtility.Translator.TranslateStringToItemFilterBlock(inputString, _testUtility.MockItemFilterScript);
|
||||||
|
|
||||||
|
// Assert
|
||||||
|
|
||||||
|
Assert.AreEqual(1, result.BlockItems.Count(b => b is ElderMapBlockItem));
|
||||||
|
var blockItem = result.BlockItems.OfType<ElderMapBlockItem>().First();
|
||||||
|
Assert.IsFalse(blockItem.BooleanValue);
|
||||||
|
}
|
||||||
|
|
||||||
[Test]
|
[Test]
|
||||||
public void TranslateStringToItemFilterBlock_Identified_ReturnsCorrectObject()
|
public void TranslateStringToItemFilterBlock_Identified_ReturnsCorrectObject()
|
||||||
{
|
{
|
||||||
|
@ -877,6 +894,7 @@ namespace Filtration.Parser.Tests.Services
|
||||||
" ElderItem true" + Environment.NewLine +
|
" ElderItem true" + Environment.NewLine +
|
||||||
" ShaperItem False" + Environment.NewLine +
|
" ShaperItem False" + Environment.NewLine +
|
||||||
" ShapedMap TRUE" + Environment.NewLine +
|
" ShapedMap TRUE" + Environment.NewLine +
|
||||||
|
" ElderMap False" + Environment.NewLine +
|
||||||
@" Class ""My Item Class"" AnotherClass ""AndAnotherClass""" + Environment.NewLine +
|
@" Class ""My Item Class"" AnotherClass ""AndAnotherClass""" + Environment.NewLine +
|
||||||
@" BaseType MyBaseType ""Another BaseType""" + Environment.NewLine +
|
@" BaseType MyBaseType ""Another BaseType""" + Environment.NewLine +
|
||||||
@" HasExplicitMod MyMod ""Another Mod""" + Environment.NewLine +
|
@" HasExplicitMod MyMod ""Another Mod""" + Environment.NewLine +
|
||||||
|
@ -915,6 +933,9 @@ namespace Filtration.Parser.Tests.Services
|
||||||
var shapedMapBlockItem = result.BlockItems.OfType<ShapedMapBlockItem>().First();
|
var shapedMapBlockItem = result.BlockItems.OfType<ShapedMapBlockItem>().First();
|
||||||
Assert.IsTrue(shapedMapBlockItem.BooleanValue);
|
Assert.IsTrue(shapedMapBlockItem.BooleanValue);
|
||||||
|
|
||||||
|
var elderMapBlockItem = result.BlockItems.OfType<ElderMapBlockItem>().First();
|
||||||
|
Assert.IsFalse(elderMapBlockItem.BooleanValue);
|
||||||
|
|
||||||
var dropLevelblockItem = result.BlockItems.OfType<DropLevelBlockItem>().First();
|
var dropLevelblockItem = result.BlockItems.OfType<DropLevelBlockItem>().First();
|
||||||
Assert.AreEqual(FilterPredicateOperator.LessThan, dropLevelblockItem.FilterPredicate.PredicateOperator);
|
Assert.AreEqual(FilterPredicateOperator.LessThan, dropLevelblockItem.FilterPredicate.PredicateOperator);
|
||||||
Assert.AreEqual(70, dropLevelblockItem.FilterPredicate.PredicateOperand);
|
Assert.AreEqual(70, dropLevelblockItem.FilterPredicate.PredicateOperand);
|
||||||
|
@ -1823,6 +1844,7 @@ namespace Filtration.Parser.Tests.Services
|
||||||
" ElderItem True" + Environment.NewLine +
|
" ElderItem True" + Environment.NewLine +
|
||||||
" ShaperItem False" + Environment.NewLine +
|
" ShaperItem False" + Environment.NewLine +
|
||||||
" ShapedMap True" + Environment.NewLine +
|
" ShapedMap True" + Environment.NewLine +
|
||||||
|
" ElderMap True" + Environment.NewLine +
|
||||||
" Height <= 6" + Environment.NewLine +
|
" Height <= 6" + Environment.NewLine +
|
||||||
" Height >= 2" + Environment.NewLine +
|
" Height >= 2" + Environment.NewLine +
|
||||||
" Width = 3" + Environment.NewLine +
|
" Width = 3" + Environment.NewLine +
|
||||||
|
@ -1881,6 +1903,7 @@ namespace Filtration.Parser.Tests.Services
|
||||||
_testUtility.TestBlock.BlockItems.Add(new ElderItemBlockItem(true));
|
_testUtility.TestBlock.BlockItems.Add(new ElderItemBlockItem(true));
|
||||||
_testUtility.TestBlock.BlockItems.Add(new ShaperItemBlockItem(false));
|
_testUtility.TestBlock.BlockItems.Add(new ShaperItemBlockItem(false));
|
||||||
_testUtility.TestBlock.BlockItems.Add(new ShapedMapBlockItem(true));
|
_testUtility.TestBlock.BlockItems.Add(new ShapedMapBlockItem(true));
|
||||||
|
_testUtility.TestBlock.BlockItems.Add(new ElderMapBlockItem(true));
|
||||||
|
|
||||||
// Act
|
// Act
|
||||||
var result = _testUtility.Translator.TranslateItemFilterBlockToString(_testUtility.TestBlock);
|
var result = _testUtility.Translator.TranslateItemFilterBlockToString(_testUtility.TestBlock);
|
||||||
|
|
|
@ -281,6 +281,11 @@ namespace Filtration.Parser.Services
|
||||||
AddStringListItemToBlockItems<HasExplicitModBlockItem>(block, trimmedLine);
|
AddStringListItemToBlockItems<HasExplicitModBlockItem>(block, trimmedLine);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
case "ElderMap":
|
||||||
|
{
|
||||||
|
AddBooleanItemToBlockItems<ElderMapBlockItem>(block, trimmedLine);
|
||||||
|
break;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -160,6 +160,7 @@ namespace Filtration.ViewModels
|
||||||
typeof (ElderItemBlockItem),
|
typeof (ElderItemBlockItem),
|
||||||
typeof (ShaperItemBlockItem),
|
typeof (ShaperItemBlockItem),
|
||||||
typeof (ShapedMapBlockItem),
|
typeof (ShapedMapBlockItem),
|
||||||
|
typeof (ElderMapBlockItem),
|
||||||
typeof (GemLevelBlockItem),
|
typeof (GemLevelBlockItem),
|
||||||
typeof (StackSizeBlockItem),
|
typeof (StackSizeBlockItem),
|
||||||
typeof (HasExplicitModBlockItem)
|
typeof (HasExplicitModBlockItem)
|
||||||
|
|
Loading…
Reference in New Issue