From 342487f80077c2f0a4d0f05a0fd6d6f9767783c4 Mon Sep 17 00:00:00 2001 From: GlenCFL Date: Thu, 7 Dec 2017 09:15:22 -0500 Subject: [PATCH] Update the ordering of the BlockItems. --- .../BlockItemTypes/BackgroundColorBlockItem.cs | 2 +- .../BlockItemTypes/BaseTypeBlockItem.cs | 2 +- .../BlockItemTypes/BorderColorBlockItem.cs | 2 +- Filtration.ObjectModel/BlockItemTypes/ClassBlockItem.cs | 2 +- .../BlockItemTypes/CorruptedBlockItem.cs | 2 +- .../BlockItemTypes/DropLevelBlockItem.cs | 2 +- .../BlockItemTypes/ElderItemBlockItem.cs | 4 ++-- .../BlockItemTypes/FontSizeBlockItem.cs | 2 +- Filtration.ObjectModel/BlockItemTypes/HeightBlockItem.cs | 2 +- .../BlockItemTypes/IdentifiedBlockItem.cs | 2 +- .../BlockItemTypes/ItemLevelBlockItem.cs | 2 +- .../BlockItemTypes/LinkedSocketsBlockItem.cs | 2 +- .../BlockItemTypes/PositionalSoundBlockItem.cs | 2 +- Filtration.ObjectModel/BlockItemTypes/RarityBlockItem.cs | 2 +- .../BlockItemTypes/ShapedMapBlockItem.cs | 4 ++-- .../BlockItemTypes/ShaperItemBlockItem.cs | 4 ++-- .../BlockItemTypes/SocketGroupBlockItem.cs | 2 +- Filtration.ObjectModel/BlockItemTypes/SoundBlockItem.cs | 2 +- .../BlockItemTypes/TextColorBlockItem.cs | 2 +- Filtration.ObjectModel/BlockItemTypes/WidthBlockItem.cs | 2 +- Filtration/Resources/ItemBaseTypes.txt | 5 +++++ Filtration/Resources/ItemClasses.txt | 8 +++++--- 22 files changed, 33 insertions(+), 26 deletions(-) diff --git a/Filtration.ObjectModel/BlockItemTypes/BackgroundColorBlockItem.cs b/Filtration.ObjectModel/BlockItemTypes/BackgroundColorBlockItem.cs index 1bcc0bf..3765b3a 100644 --- a/Filtration.ObjectModel/BlockItemTypes/BackgroundColorBlockItem.cs +++ b/Filtration.ObjectModel/BlockItemTypes/BackgroundColorBlockItem.cs @@ -16,6 +16,6 @@ namespace Filtration.ObjectModel.BlockItemTypes public override string PrefixText => "SetBackgroundColor"; public override int MaximumAllowed => 1; public override string DisplayHeading => "Background Color"; - public override int SortOrder => 15; + public override int SortOrder => 18; } } diff --git a/Filtration.ObjectModel/BlockItemTypes/BaseTypeBlockItem.cs b/Filtration.ObjectModel/BlockItemTypes/BaseTypeBlockItem.cs index e959210..cb78a03 100644 --- a/Filtration.ObjectModel/BlockItemTypes/BaseTypeBlockItem.cs +++ b/Filtration.ObjectModel/BlockItemTypes/BaseTypeBlockItem.cs @@ -33,6 +33,6 @@ namespace Filtration.ObjectModel.BlockItemTypes public override Color SummaryBackgroundColor => Colors.MediumTurquoise; public override Color SummaryTextColor => Colors.Black; - public override int SortOrder => 11; + public override int SortOrder => 16; } } diff --git a/Filtration.ObjectModel/BlockItemTypes/BorderColorBlockItem.cs b/Filtration.ObjectModel/BlockItemTypes/BorderColorBlockItem.cs index 4da4384..3668f33 100644 --- a/Filtration.ObjectModel/BlockItemTypes/BorderColorBlockItem.cs +++ b/Filtration.ObjectModel/BlockItemTypes/BorderColorBlockItem.cs @@ -16,6 +16,6 @@ namespace Filtration.ObjectModel.BlockItemTypes public override string PrefixText => "SetBorderColor"; public override int MaximumAllowed => 1; public override string DisplayHeading => "Border Color"; - public override int SortOrder => 16; + public override int SortOrder => 19; } } diff --git a/Filtration.ObjectModel/BlockItemTypes/ClassBlockItem.cs b/Filtration.ObjectModel/BlockItemTypes/ClassBlockItem.cs index 8d9e45b..3da7e0a 100644 --- a/Filtration.ObjectModel/BlockItemTypes/ClassBlockItem.cs +++ b/Filtration.ObjectModel/BlockItemTypes/ClassBlockItem.cs @@ -33,6 +33,6 @@ namespace Filtration.ObjectModel.BlockItemTypes public override Color SummaryBackgroundColor => Colors.MediumSeaGreen; public override Color SummaryTextColor => Colors.White; - public override int SortOrder => 10; + public override int SortOrder => 15; } } diff --git a/Filtration.ObjectModel/BlockItemTypes/CorruptedBlockItem.cs b/Filtration.ObjectModel/BlockItemTypes/CorruptedBlockItem.cs index 02ba979..baf492b 100644 --- a/Filtration.ObjectModel/BlockItemTypes/CorruptedBlockItem.cs +++ b/Filtration.ObjectModel/BlockItemTypes/CorruptedBlockItem.cs @@ -20,4 +20,4 @@ namespace Filtration.ObjectModel.BlockItemTypes public override int SortOrder => 5; } -} \ No newline at end of file +} diff --git a/Filtration.ObjectModel/BlockItemTypes/DropLevelBlockItem.cs b/Filtration.ObjectModel/BlockItemTypes/DropLevelBlockItem.cs index adf1ab2..a9f77c7 100644 --- a/Filtration.ObjectModel/BlockItemTypes/DropLevelBlockItem.cs +++ b/Filtration.ObjectModel/BlockItemTypes/DropLevelBlockItem.cs @@ -21,7 +21,7 @@ namespace Filtration.ObjectModel.BlockItemTypes public override string SummaryText => "Drop Level " + FilterPredicate; public override Color SummaryBackgroundColor => Colors.DodgerBlue; public override Color SummaryTextColor => Colors.White; - public override int SortOrder => 9; + public override int SortOrder => 13; public override int Minimum => 0; public override int Maximum => 100; } diff --git a/Filtration.ObjectModel/BlockItemTypes/ElderItemBlockItem.cs b/Filtration.ObjectModel/BlockItemTypes/ElderItemBlockItem.cs index af32bd6..0068879 100644 --- a/Filtration.ObjectModel/BlockItemTypes/ElderItemBlockItem.cs +++ b/Filtration.ObjectModel/BlockItemTypes/ElderItemBlockItem.cs @@ -17,7 +17,7 @@ namespace Filtration.ObjectModel.BlockItemTypes public override string DisplayHeading => "Elder Item"; public override Color SummaryBackgroundColor => Colors.DarkGray; public override Color SummaryTextColor => Colors.White; - public override int SortOrder => 19; + public override int SortOrder => 6; } -} \ No newline at end of file +} diff --git a/Filtration.ObjectModel/BlockItemTypes/FontSizeBlockItem.cs b/Filtration.ObjectModel/BlockItemTypes/FontSizeBlockItem.cs index ffbf68a..62feaf7 100644 --- a/Filtration.ObjectModel/BlockItemTypes/FontSizeBlockItem.cs +++ b/Filtration.ObjectModel/BlockItemTypes/FontSizeBlockItem.cs @@ -16,7 +16,7 @@ namespace Filtration.ObjectModel.BlockItemTypes public override string PrefixText => "SetFontSize"; public override int MaximumAllowed => 1; public override string DisplayHeading => "Font Size"; - public override int SortOrder => 17; + public override int SortOrder => 20; public override int Minimum => 11; public override int Maximum => 45; } diff --git a/Filtration.ObjectModel/BlockItemTypes/HeightBlockItem.cs b/Filtration.ObjectModel/BlockItemTypes/HeightBlockItem.cs index ccc9727..cd06ae0 100644 --- a/Filtration.ObjectModel/BlockItemTypes/HeightBlockItem.cs +++ b/Filtration.ObjectModel/BlockItemTypes/HeightBlockItem.cs @@ -21,7 +21,7 @@ namespace Filtration.ObjectModel.BlockItemTypes public override string SummaryText => "Height " + FilterPredicate; public override Color SummaryBackgroundColor => Colors.LightBlue; public override Color SummaryTextColor => Colors.Black; - public override int SortOrder => 7; + public override int SortOrder => 10; public override int Minimum => 0; public override int Maximum => 6; } diff --git a/Filtration.ObjectModel/BlockItemTypes/IdentifiedBlockItem.cs b/Filtration.ObjectModel/BlockItemTypes/IdentifiedBlockItem.cs index 48f10a2..fd17250 100644 --- a/Filtration.ObjectModel/BlockItemTypes/IdentifiedBlockItem.cs +++ b/Filtration.ObjectModel/BlockItemTypes/IdentifiedBlockItem.cs @@ -20,4 +20,4 @@ namespace Filtration.ObjectModel.BlockItemTypes public override int SortOrder => 4; } -} \ No newline at end of file +} diff --git a/Filtration.ObjectModel/BlockItemTypes/ItemLevelBlockItem.cs b/Filtration.ObjectModel/BlockItemTypes/ItemLevelBlockItem.cs index 638d6d2..ace3d69 100644 --- a/Filtration.ObjectModel/BlockItemTypes/ItemLevelBlockItem.cs +++ b/Filtration.ObjectModel/BlockItemTypes/ItemLevelBlockItem.cs @@ -20,7 +20,7 @@ namespace Filtration.ObjectModel.BlockItemTypes public override string SummaryText => "Item Level " + FilterPredicate; public override Color SummaryBackgroundColor => Colors.DarkSlateGray; public override Color SummaryTextColor => Colors.White; - public override int SortOrder => 13; + public override int SortOrder => 12; public override int Minimum => 0; public override int Maximum => 100; } diff --git a/Filtration.ObjectModel/BlockItemTypes/LinkedSocketsBlockItem.cs b/Filtration.ObjectModel/BlockItemTypes/LinkedSocketsBlockItem.cs index 7763f0b..ce5369a 100644 --- a/Filtration.ObjectModel/BlockItemTypes/LinkedSocketsBlockItem.cs +++ b/Filtration.ObjectModel/BlockItemTypes/LinkedSocketsBlockItem.cs @@ -21,7 +21,7 @@ namespace Filtration.ObjectModel.BlockItemTypes public override string SummaryText => "Linked Sockets " + FilterPredicate; public override Color SummaryBackgroundColor => Colors.Gold; public override Color SummaryTextColor => Colors.Black; - public override int SortOrder => 0; + public override int SortOrder => 1; public override int Minimum => 0; public override int Maximum => 6; } diff --git a/Filtration.ObjectModel/BlockItemTypes/PositionalSoundBlockItem.cs b/Filtration.ObjectModel/BlockItemTypes/PositionalSoundBlockItem.cs index c7d746e..076b845 100644 --- a/Filtration.ObjectModel/BlockItemTypes/PositionalSoundBlockItem.cs +++ b/Filtration.ObjectModel/BlockItemTypes/PositionalSoundBlockItem.cs @@ -19,4 +19,4 @@ namespace Filtration.ObjectModel.BlockItemTypes public override string DisplayHeading => "Play Positional Alert Sound"; public override int SortOrder => 22; } -} \ No newline at end of file +} diff --git a/Filtration.ObjectModel/BlockItemTypes/RarityBlockItem.cs b/Filtration.ObjectModel/BlockItemTypes/RarityBlockItem.cs index 7bd2af0..24ac5ef 100644 --- a/Filtration.ObjectModel/BlockItemTypes/RarityBlockItem.cs +++ b/Filtration.ObjectModel/BlockItemTypes/RarityBlockItem.cs @@ -30,7 +30,7 @@ namespace Filtration.ObjectModel.BlockItemTypes ((ItemRarity) FilterPredicate.PredicateOperand).GetAttributeDescription(); public override Color SummaryBackgroundColor => Colors.LightCoral; public override Color SummaryTextColor => Colors.White; - public override int SortOrder => 12; + public override int SortOrder => 14; public override int Minimum => 0; public override int Maximum => (int)ItemRarity.Unique; } diff --git a/Filtration.ObjectModel/BlockItemTypes/ShapedMapBlockItem.cs b/Filtration.ObjectModel/BlockItemTypes/ShapedMapBlockItem.cs index 88e0859..550a6da 100644 --- a/Filtration.ObjectModel/BlockItemTypes/ShapedMapBlockItem.cs +++ b/Filtration.ObjectModel/BlockItemTypes/ShapedMapBlockItem.cs @@ -17,7 +17,7 @@ namespace Filtration.ObjectModel.BlockItemTypes public override string DisplayHeading => "Shaped Map"; public override Color SummaryBackgroundColor => Colors.DarkGoldenrod; public override Color SummaryTextColor => Colors.White; - public override int SortOrder => 21; + public override int SortOrder => 8; } -} \ No newline at end of file +} diff --git a/Filtration.ObjectModel/BlockItemTypes/ShaperItemBlockItem.cs b/Filtration.ObjectModel/BlockItemTypes/ShaperItemBlockItem.cs index 26a7dc6..fc92b19 100644 --- a/Filtration.ObjectModel/BlockItemTypes/ShaperItemBlockItem.cs +++ b/Filtration.ObjectModel/BlockItemTypes/ShaperItemBlockItem.cs @@ -17,7 +17,7 @@ namespace Filtration.ObjectModel.BlockItemTypes public override string DisplayHeading => "Shaper Item"; public override Color SummaryBackgroundColor => Colors.DimGray; public override Color SummaryTextColor => Colors.White; - public override int SortOrder => 20; + public override int SortOrder => 7; } -} \ No newline at end of file +} diff --git a/Filtration.ObjectModel/BlockItemTypes/SocketGroupBlockItem.cs b/Filtration.ObjectModel/BlockItemTypes/SocketGroupBlockItem.cs index 185ee99..932d264 100644 --- a/Filtration.ObjectModel/BlockItemTypes/SocketGroupBlockItem.cs +++ b/Filtration.ObjectModel/BlockItemTypes/SocketGroupBlockItem.cs @@ -39,7 +39,7 @@ namespace Filtration.ObjectModel.BlockItemTypes public override Color SummaryBackgroundColor => Colors.GhostWhite; public override Color SummaryTextColor => Colors.Black; - public override int SortOrder => 6; + public override int SortOrder => 9; private SocketColor StringToSocketColor(char socketColorString) { diff --git a/Filtration.ObjectModel/BlockItemTypes/SoundBlockItem.cs b/Filtration.ObjectModel/BlockItemTypes/SoundBlockItem.cs index 2995394..1d8233a 100644 --- a/Filtration.ObjectModel/BlockItemTypes/SoundBlockItem.cs +++ b/Filtration.ObjectModel/BlockItemTypes/SoundBlockItem.cs @@ -17,6 +17,6 @@ namespace Filtration.ObjectModel.BlockItemTypes public override string PrefixText => "PlayAlertSound"; public override int MaximumAllowed => 1; public override string DisplayHeading => "Play Alert Sound"; - public override int SortOrder => 18; + public override int SortOrder => 21; } } diff --git a/Filtration.ObjectModel/BlockItemTypes/TextColorBlockItem.cs b/Filtration.ObjectModel/BlockItemTypes/TextColorBlockItem.cs index 1cb6ba9..81f36a6 100644 --- a/Filtration.ObjectModel/BlockItemTypes/TextColorBlockItem.cs +++ b/Filtration.ObjectModel/BlockItemTypes/TextColorBlockItem.cs @@ -16,6 +16,6 @@ namespace Filtration.ObjectModel.BlockItemTypes public override string PrefixText => "SetTextColor"; public override int MaximumAllowed => 1; public override string DisplayHeading => "Text Color"; - public override int SortOrder => 14; + public override int SortOrder => 17; } } diff --git a/Filtration.ObjectModel/BlockItemTypes/WidthBlockItem.cs b/Filtration.ObjectModel/BlockItemTypes/WidthBlockItem.cs index 2fa7102..b646547 100644 --- a/Filtration.ObjectModel/BlockItemTypes/WidthBlockItem.cs +++ b/Filtration.ObjectModel/BlockItemTypes/WidthBlockItem.cs @@ -21,7 +21,7 @@ namespace Filtration.ObjectModel.BlockItemTypes public override string SummaryText => "Width " + FilterPredicate; public override Color SummaryBackgroundColor => Colors.MediumPurple; public override Color SummaryTextColor => Colors.White; - public override int SortOrder => 8; + public override int SortOrder => 11; public override int Minimum => 0; public override int Maximum => 2; } diff --git a/Filtration/Resources/ItemBaseTypes.txt b/Filtration/Resources/ItemBaseTypes.txt index 206d93e..7adad26 100644 --- a/Filtration/Resources/ItemBaseTypes.txt +++ b/Filtration/Resources/ItemBaseTypes.txt @@ -208,6 +208,8 @@ Carnal Mitts Carnal Sceptre Cartographer's Chisel Cartographer's Delight +Cartographer's Seal +Cartographer's Sextant Carved Wand Carving Knife Cast On Critical Strike Support @@ -1199,6 +1201,7 @@ Shadow Sceptre Shagreen Boots Shagreen Gloves Shagreen Tower Shield +Shaper's Orb Shaper's Orb (Tier 1) Shaper's Orb (Tier 10) Shaper's Orb (Tier 2) @@ -1309,6 +1312,7 @@ Spiraled Foil Spiraled Wand Spirit Offering Splendid Round Shield +Splinter Splinter of Chayula Splinter of Esh Splinter of Tul @@ -1686,6 +1690,7 @@ Wasteland Map Waterways Map Waxed Garb Wealth and Power +Weeping Essence Weeping Essence of Anger Weeping Essence of Contempt Weeping Essence of Doubt diff --git a/Filtration/Resources/ItemClasses.txt b/Filtration/Resources/ItemClasses.txt index c03f48d..fd87671 100644 --- a/Filtration/Resources/ItemClasses.txt +++ b/Filtration/Resources/ItemClasses.txt @@ -1,16 +1,18 @@ Abyss Jewel Active Skill Gems Amulets +Axe Belts Body Armours Boots Bows Claws -Critical Utility Flasks Currency Daggers Divination Card Fishing Rods +Flasks +Gems Gloves Helmets Hybrid Flasks @@ -21,10 +23,10 @@ Labyrinth Trinket Large Relics Leaguestone Life Flasks +Mace Mana Flasks Map Fragments Maps -Medium Relics Misc Map Items One Hand Axes One Hand Maces @@ -36,10 +38,10 @@ Quivers Rings Sceptres Shields -Small Relics Stackable Currency Staves Support Skill Gems +Sword Thrusting One Hand Swords Two Hand Axes Two Hand Maces