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

Support for Path of Exile 3.5 and Betrayal league. (#108)

Browse Source 
* Fix #107 by pulling SortOrder form an enum.
* Add initial support for the Prophecy block item.
* Update the static data.
* Hook Prophecy data into the static data service.
* Fill out the initial prophecy data.
This commit is contained in:
Glen M
2018-12-05 01:59:10 -05:00
committed by Ben Wallis
parent 4b6cee9d94
commit 7ce5aaa861
51 changed files with 1030 additions and 542 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Filtration/Filtration.csproj
View File

@@ -462,6 +462,7 @@
<DependentUpon>Settings.settings</DependentUpon>
<DesignTimeSharedInput>True</DesignTimeSharedInput>
</Compile>
<EmbeddedResource Include="Resources\Prophecies.txt" />
<EmbeddedResource Include="Resources\ItemMods.txt" />
<Resource Include="Resources\loading_spinner.gif" />
<EmbeddedResource Include="Properties\Resources.resx">

35
Filtration/Properties/Resources.Designer.cs generated
View File

@@ -225,19 +225,21 @@ namespace Filtration.Properties {
}
/// <summary>
/// Looks up a localized string similar to A Mother&apos;s Parting Gift
/// Looks up a localized string similar to A Dab of Ink
///A Mother&apos;s Parting Gift
///Abandoned Wealth
///Aberrant Fossil
///Abyssal Axe
///Abyssal Cry
///Abyssal Sceptre
///Academy Map
///Acid Lakes Map
///Acid Caverns Map
///Added Chaos Damage Support
///Added Cold Damage Support
///Added Fire Damage Support
///Added Lightning Damage Support
///Additional Accuracy Support
///Advanced Traps Support
///Aetheric Fossil
///Agate Amulet
///Albino Rhoa Feather
@@ -251,10 +253,7 @@ namespace Filtration.Properties {
///Amber Amulet
///Ambush Boots
///Ambush Leaguestone
///Ambush Mitts
///Ambusher
///Amethyst Flask
///Amethyst [rest of string was truncated]&quot;;.
///Ambush [rest of string was truncated]&quot;;.
/// </summary>
internal static string ItemBaseTypes {
get {
@@ -266,7 +265,7 @@ namespace Filtration.Properties {
/// Looks up a localized string similar to Abyss Jewel
///Active Skill Gems
///Amulets
///Axe
///Axes
///Belts
///Body Armours
///Boots
@@ -288,12 +287,13 @@ namespace Filtration.Properties {
///Labyrinth Map Item
///Labyrinth Trinket
///Large Relics
///Leaguestone
///Leaguestones
///Life Flasks
///Mace
///Maces
///Mana Flasks
///Map Fragments
///Maps
///Medium Relics
///Misc Map Items
///One Hand Axes
///One Hand Maces
@@ -302,14 +302,12 @@ namespace Filtration.Properties {
///Piece
///Quest Items
///Quivers
///Relics
///Rings
///Sceptres
///Shields
///Stackable Currency
///Staves
///Support Skill Gems
///Sword
///T [rest of string was truncated]&quot;;.
///Small Relics
///Stackable Curre [rest of string was truncated]&quot;;.
/// </summary>
internal static string ItemClasses {
get {
@@ -382,6 +380,15 @@ namespace Filtration.Properties {
}
}
/// <summary>
/// Looks up a localized string similar to A Gracious Master.
/// </summary>
internal static string Prophecies {
get {
return ResourceManager.GetString("Prophecies", resourceCulture);
}
}
/// <summary>
/// Looks up a localized resource of type System.IO.UnmanagedMemoryStream similar to System.IO.MemoryStream.
/// </summary>

3
Filtration/Properties/Resources.resx
View File

@@ -211,4 +211,7 @@
<data name="ItemMods" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\ItemMods.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
</data>
<data name="Prophecies" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\Prophecies.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
</data>
</root>

79
Filtration/Resources/ItemBaseTypes.txt
View File

@@ -1,11 +1,12 @@
A Mother's Parting Gift
A Dab of Ink
A Mother's Parting Gift
Abandoned Wealth
Aberrant Fossil
Abyssal Axe
Abyssal Cry
Abyssal Sceptre
Academy Map
Acid Lakes Map
Acid Caverns Map
Added Chaos Damage Support
Added Cold Damage Support
Added Fire Damage Support
@@ -71,6 +72,7 @@ Arctic Breath
Arena Map
Arena Plate
Arid Lake Map
Armageddon Brand
Arming Axe
Armourer's Scrap
Armoury Map
@@ -168,6 +170,7 @@ Bone Crypt Map
Bone Helmet
Bone Offering
Bone Spirit Shield
Bonechill Support
Bonespire Talisman
Boon of the First Ones
Boot Blade
@@ -176,6 +179,7 @@ Bottled Storm
Bound Fossil
Boundless Realms
Bowyer's Dream
Brand Recall
Branded Kite Shield
Brass Maul
Brass Spirit Shield
@@ -352,6 +356,7 @@ Courthouse Map
Courtyard Map
Coves Map
Coveted Possession
Crater Map
Cremation
Crescent Staff
Crested Tower Shield
@@ -461,6 +466,7 @@ Dragonscale Boots
Dragonscale Doublet
Dragonscale Gauntlets
Dragoon Sword
Dread Banner
Dread Maul
Dream Mace
Driftwood Club
@@ -636,6 +642,7 @@ Full Plate
Full Ringmail
Full Scale Armour
Full Wyrmscale
Fungal Hollow Map
Gardens Map
Gavel
Gemcutter's Prism
@@ -650,13 +657,26 @@ Ghetto Map
Giant Life Flask
Giant Mana Flask
Gift of the Gemling Queen
Gilded Ambush Scarab
Gilded Axe
Gilded Bestiary Scarab
Gilded Breach Scarab
Gilded Buckler
Gilded Cartography Scarab
Gilded Divination Scarab
Gilded Elder Scarab
Gilded Fossil
Gilded Harbinger Scarab
Gilded Perandus Scarab
Gilded Reliquary Scarab
Gilded Sallet
Gilded Shaper Scarab
Gilded Sulphite Scarab
Gilded Torment Scarab
Girded Tower Shield
Glacial Cascade
Glacial Hammer
Glacier Map
Gladiator Helmet
Gladiator Plate
Gladius
@@ -689,7 +709,6 @@ Golden Plate
Golden Wreath
Goliath Gauntlets
Goliath Greaves
Gorge Map
Gouger
Grace
Graceful Sword
@@ -859,6 +878,7 @@ Lacquered Helmet
Lair Map
Lair of the Hydra Map
Laminated Kite Shield
Lancing Steel
Lantador's Lost Love
Lapis Amulet
Large Hybrid Flask
@@ -867,7 +887,7 @@ Large Mana Flask
Last Hope
Lathi
Latticed Ringmail
Lava Chamber Map
Lava Chambers Map
Lava Lake Map
Layered Kite Shield
Lead Sceptre
@@ -888,9 +908,9 @@ Lesser Poison Support
Leyline Map
Life Gain on Hit Support
Life Leech Support
Light and Truth
Light Brigandine
Light Quiver
Light and Truth
Lighthouse Map
Lightning Arrow
Lightning Penetration Support
@@ -975,14 +995,14 @@ Military Staff
Mind Cage
Minefield Support
Mineral Pools Map
Minion and Totem Elemental Resistance Support
Minion Damage Support
Minion Life Support
Minion Speed Support
Minion and Totem Elemental Resistance Support
Mirage Archer Support
Mirror Arrow
Mirror Shard
Mirror of Kalandra
Mirror Shard
Mirrored Spiked Shield
Mitts
Molten Shell
@@ -1000,6 +1020,7 @@ Mortal Ignorance
Mortal Rage
Mosaic Kite Shield
Mud Geyser Map
Multiple Totems Support
Multiple Traps Support
Multistrike Support
Murder Boots
@@ -1110,7 +1131,19 @@ Poignard
Point Blank Support
Poison Support
Poleaxe
Polished Ambush Scarab
Polished Bestiary Scarab
Polished Breach Scarab
Polished Cartography Scarab
Polished Divination Scarab
Polished Elder Scarab
Polished Harbinger Scarab
Polished Perandus Scarab
Polished Reliquary Scarab
Polished Shaper Scarab
Polished Spiked Shield
Polished Sulphite Scarab
Polished Torment Scarab
Port Map
Portal
Portal Scroll
@@ -1132,6 +1165,7 @@ Primeval Rapier
Primitive Alchemical Resonator
Primitive Chaotic Resonator
Primitive Staff
Primordial Blocks Map
Primordial Pool Map
Primordial Staff
Prismatic Fossil
@@ -1160,9 +1194,9 @@ Quartz Wand
Quicksilver Flask
Quilted Jacket
Racecourse Map
Rain Tempter
Rain of Arrows
Rain of Chaos
Rain Tempter
Raise Spectre
Raise Zombie
Rallying Cry
@@ -1226,10 +1260,22 @@ Ruby Flask
Ruby Ring
Rugged Quiver
Runic Hatchet
Rusted Ambush Scarab
Rusted Bestiary Scarab
Rusted Breach Scarab
Rusted Cartography Scarab
Rusted Coif
Rusted Divination Scarab
Rusted Elder Scarab
Rusted Harbinger Scarab
Rusted Hatchet
Rusted Perandus Scarab
Rusted Reliquary Scarab
Rusted Shaper Scarab
Rusted Spike
Rusted Sulphite Scarab
Rusted Sword
Rusted Torment Scarab
Rustic Sash
Ruthless Support
Sabre
@@ -1335,6 +1381,7 @@ Sharkskin Gloves
Sharkskin Tunic
Sharktooth Arrow Quiver
Sharktooth Claw
Shattering Steel
Shield Charge
Shipyard Map
Shock Nova
@@ -1445,7 +1492,6 @@ Splinter of Xoph
Splintered Tower Shield
Split Arrow
Splitnewt Talisman
Springs Map
Stacked Deck
Stag Sceptre
Static Strike
@@ -1467,6 +1513,7 @@ Stone Hammer
Stone of Passage
Storm Barrier Support
Storm Blade
Storm Brand
Storm Burst
Storm Call
Strand Map
@@ -1599,14 +1646,17 @@ The King's Blade
The King's Heart
The Last One Standing
The Lich
The Life Thief
The Lion
The Lord in Black
The Lover
The Lunaris Priestess
The Master
The Master Artisan
The Mayor
The Mercenary
The Metalsmith's Gift
The Nurse
The Oath
The Obscured
The Offering
@@ -1628,6 +1678,7 @@ The Risk
The Rite of Elements
The Road to Power
The Ruthless Ceinture
The Sacrifice
The Saint's Treasure
The Samurai's Eye
The Scarred Meadow
@@ -1711,7 +1762,6 @@ Torment Leaguestone
Tornado Shot
Tornado Wand
Torture Cage
Torture Chamber Map
Totemic Maul
Tower Key
Tower Map
@@ -1719,8 +1769,8 @@ Toxic Rain
Toxic Sewer Map
Tranquillity
Transmutation Shard
Trap Support
Trap and Mine Damage Support
Trap Support
Trapper Boots
Trapper Mitts
Trarthan Powder
@@ -1729,7 +1779,6 @@ Treasure Key
Tribal Circlet
Tribal Club
Tribal Maul
Tribunal Map
Tricorne
Trisula
Triumphant Lamellar
@@ -1815,16 +1864,16 @@ Vault Map
Velvet Gloves
Velvet Slippers
Vengeance
Vial Of Power
Vial of Awakening
Vial of Consequence
Vial of Dominance
Vial of Fate
Vial Of Power
Vial of Sacrifice
Vial of Summoning
Vial of Transcendence
Vial of the Ghost
Vial of the Ritual
Vial of Transcendence
Vicious Projectiles Support
Vigilant Strike
Vile Staff
@@ -1865,6 +1914,7 @@ Wailing Essence of Wrath
Wailing Essence of Zeal
Walnut Spirit Shield
War Axe
War Banner
War Buckler
War Hammer
War Plate
@@ -1902,6 +1952,7 @@ Widowsilk Robe
Wild Leather
Wild Strike
Wings of Vastiri
Winter Orb
Wither
Withering Touch Support
Wolf Pelt

20
Filtration/Resources/ItemMods.txt
View File

@@ -61,6 +61,7 @@ Carved
Caster's
Catalysed
Catalyzing
Catarina's Veiled
Caustic
Cauterising
Cautious
@@ -115,6 +116,7 @@ Duelist's
Eldritch
Electrocuting
Electromantic
Elreon's Veiled
Elephant's
Emanant
Emperor's
@@ -172,9 +174,12 @@ Glinting
Glittering
Glowing
Glyphic
Gravicius' Veiled
Gremlin's
Grounded
Guatelitzi's
Guff's Veiled
Haku's Veiled
Hailing
Hale
Halting
@@ -218,16 +223,19 @@ Instilled
Interpermeated
Interpolated
Ionising
It That Fled's Veiled
Jagged
Jinxing
Journeyman's
Judging
Korell's Veiled
Lacquered
Lamprey's
Lava Caller's
Layered
Leadership
Legend's
Leo's Veiled
Lethal
Lich's
Lively
@@ -306,6 +314,7 @@ Resonating
Resplendent
Rhino's
Ribbed
Rin's Veiled
Ripping
Robust
Rotund
@@ -384,6 +393,7 @@ Thundering
Thwarting
Titan's
Topotante's
Tora's Veiled
Trapping
Tul's
Turncoat's
@@ -399,8 +409,10 @@ Unwavering
Unworldly
Urchin's
Vaal
Vagan's Veiled
Vampire's
Vaporous
Veiled
Vicious
Victor's
Vigorous
@@ -410,6 +422,7 @@ Vivacious
Vivid
Volcanic
Volleying
Vorici's Veiled
Wailing
Warding
Warlock's
@@ -436,6 +449,7 @@ of Accuracy
of Adamantite Skin
of Adaption
of Adrenaline
of Aisling's Veil
of Amassment
of Anger
of Animation
@@ -459,6 +473,7 @@ of Bloodlines
of Burning
of Calamity
of Calm
of Cameria's Veil
of Celebration
of Champions
of Chilling
@@ -547,6 +562,7 @@ of Havoc
of Haze
of Heat
of Hemomancy
of Hillock's Veil
of Hindering
of Hoarding
of Hordes
@@ -563,6 +579,8 @@ of Intelligence
of Intercepting
of Ire
of Iron Skin
of Janus' Veil
of Jorgin's Veil
of Joy
of Legerdemain
of Light
@@ -621,6 +639,7 @@ of Resistance
of Restoration
of Retaliation
of Righteousness
of Riker's Veil
of Rime
of Ruin
of Runes
@@ -774,6 +793,7 @@ of the Titan
of the Troll
of the Underground
of the Universe
of the Veil
of the Virtuoso
of the Volcano
of the Wall

241
Filtration/Resources/Prophecies.txt Normal file
View File

@@ -0,0 +1,241 @@
A Call into the Void
A Dishonourable Death
A Firm Foothold
A Forest of False Idols
A Gracious Master
A Master Seeks Help
A Prodigious Hand
A Regal Death
A Rift in Time
A Valuable Combination
A Vision of Ice and Fire
A Whispered Prayer
Abnormal Effulgence
Against the Tide
Agony at Dusk
An Unseen Peril
Anarchy's End
Anarchy's End I
Anarchy's End II
Anarchy's End III
Anarchy's End IV
Ancient Doom
Baptism by Death
Battle Hardened
Beyond Sight
Beyond Sight I
Beyond Sight II
Beyond Sight III
Beyond Sight IV
Black Devotion
Blind Faith
Blinding Light
Blood in the Eyes
Blood of the Betrayed
Bountiful Traps
Burning Dread
Cleanser of Sins
Cold Blooded Fury
Cold Greed
Crimson Hues
Crushing Squall
Custodians of Silence
Dance of Steel
Dark Instincts
Darktongue's Shriek
Day of Sacrifice
Day of Sacrifice I
Day of Sacrifice II
Day of Sacrifice III
Day of Sacrifice IV
Deadly Rivalry
Deadly Rivalry I
Deadly Rivalry II
Deadly Rivalry III
Deadly Rivalry IV
Deadly Rivalry V
Deadly Twins
Defiled in the Sceptre
Dying Cry
Echoes of Witchcraft
End of the Light
Ending the Torment
Erased from Memory
Erasmus' Gift
Faith Exhumed
Fallow At Last
Fated Connections
Fear's Wide Reach
Fire and Brimstone
Fire and Ice
Fire from the Sky
Fire, Wood and Stone
Flesh of the Beast
Forceful Exorcism
From Death Springs Life
From The Void
Gilded Within
Golden Touch
Graceful Flames
Greed's Folly
Heart of the Fire
Heavy Blows
Hidden Reinforcements
Hidden Vaal Pathways
Holding the Bridge
Hunter's Lesson
Ice from Above
In the Grasp of Corruption
Kalandra's Craft
Last of the Wildmen
Lasting Impressions
Lightning Falls
Living Fires
Lost in the Pages
Monstrous Treasure
Mouth of Horrors
Mysterious Invaders
Nature's Resilience
Nemesis of Greed
Notched Flesh
Overflowing Riches
Path of Betrayal
Plague of Frogs
Plague of Rats
Pleasure and Pain
Pools of Wealth
Possessed Foe
Power Magnified
Rebirth
Reforged Bonds
Resistant to Change
Risen Blood
Roth's Legacy
Severed Limbs
Smothering Tendrils
Soil, Worms and Blood
Song of the Sekhema
Storm on the Horizon
Storm on the Reef
Strong as a Bull
Sun's Punishment
Thaumaturgical History
Thaumaturgical History I
Thaumaturgical History II
Thaumaturgical History III
Thaumaturgical History IV
The Alchemist
The Ambitious Bandit
The Ambitious Bandit I
The Ambitious Bandit II
The Ambitious Bandit III
The Apex Predator
The Beautiful Guide
The Beginning and the End
The Bishop's Legacy
The Bloody Flowers Redux
The Bowstring's Music
The Brothers of Necromancy
The Brutal Enforcer
The Child of Lunaris
The Corrupt
The Cursed Choir
The Dreaded Rhoa
The Dream Trial
The Dreamer's Dream
The Eagle's Cry
The Fall of an Empire
The Feral Lord
The Feral Lord I
The Feral Lord II
The Feral Lord III
The Feral Lord IV
The Feral Lord V
The Flayed Man
The Flow of Energy
The Forgotten Garrison
The Forgotten Soldiers
The Fortune Teller's Collection
The Four Feral Exiles
The God of Misfortune
The Great Leader of the North
The Great Mind of the North
The Hardened Armour
The Hollow Pledge
The Hungering Swarm
The Invader
The Jeweller's Touch
The Karui Rebellion
The King and the Brambles
The King's Path
The Lady in Black
The Last Watch
The Lost Maps
The Lost Undying
The Malevolent Witch
The Misunderstood Queen
The Mysterious Gift
The Nest
The Nightmare Awakens
The Petrified
The Plaguemaw
The Plaguemaw I
The Plaguemaw II
The Plaguemaw III
The Plaguemaw IV
The Plaguemaw V
The Prison Guard
The Prison Key
The Queen's Sacrifice
The Queen's Vaults
The Scout
The Servant's Heart
The Sharpened Blade
The Silverwood
The Singular Spirit
The Sinner's Stone
The Snuffed Flame
The Soulless Beast
The Stockkeeper
The Storm Spire
The Sword King's Passion
The Trembling Earth
The Twins
The Unbreathing Queen
The Unbreathing Queen I
The Unbreathing Queen II
The Unbreathing Queen III
The Unbreathing Queen IV
The Unbreathing Queen V
The Undead Brutes
The Undead Storm
The Vanguard
The Walking Mountain
The Ward's Ward
The Warmongers
The Warmongers I
The Warmongers II
The Warmongers III
The Warmongers IV
The Watcher's Watcher
The Wealthy Exile
Touched by the Wind
Trapped in the Tower
Trash to Treasure
Twice Enchanted
Unbearable Whispers
Unbearable Whispers I
Unbearable Whispers II
Unbearable Whispers III
Unbearable Whispers IV
Unbearable Whispers V
Undead Uprising
Unnatural Energy
Vaal Invasion
Vaal Winds
Visions of the Drowned
Vital Transformation
Waiting in Ambush
Weeping Death
Wind and Thunder
Winter's Mournful Melodies

4
Filtration/Services/StaticDataService.cs
View File

@@ -11,6 +11,7 @@ namespace Filtration.Services
IEnumerable<string> ItemBaseTypes { get; }
IEnumerable<string> ItemClasses { get; }
IEnumerable<string> ItemMods { get; }
IEnumerable<string> Prophecies { get; }
}
internal class StaticDataService : IStaticDataService
@@ -26,11 +27,14 @@ namespace Filtration.Services
public IEnumerable<string> ItemMods { get; private set; }
public IEnumerable<string> Prophecies { get; private set; }
private void PopulateStaticData()
{
ItemBaseTypes = new LineReader(() => new StringReader(Resources.ItemBaseTypes)).ToList();
ItemClasses = new LineReader(() => new StringReader(Resources.ItemClasses)).ToList();
ItemMods = new LineReader(() => new StringReader(Resources.ItemMods)).ToList();
Prophecies = new LineReader(() => new StringReader(Resources.Prophecies)).ToList();
}
}
}

23
Filtration/UserControls/BlockItemControl.xaml
View File

@@ -1,7 +1,7 @@
<UserControl x:Class="Filtration.UserControls.BlockItemControl"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:userControls="clr-namespace:Filtration.UserControls"
xmlns:commonConverters="clr-namespace:Filtration.Common.Converters;assembly=Filtration.Common"
@@ -11,7 +11,7 @@
xmlns:enums="clr-namespace:Filtration.ObjectModel.Enums;assembly=Filtration.ObjectModel"
xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
xmlns:views="clr-namespace:Filtration.Views"
mc:Ignorable="d"
mc:Ignorable="d"
d:DataContext="{d:DesignInstance Type=userControls:BlockItemControl}"
d:DesignHeight="200" d:DesignWidth="190">
<UserControl.Resources>
@@ -46,12 +46,12 @@
<RadioButton IsChecked="{Binding BooleanValue, Converter={StaticResource BoolInverterConverter}}">False</RadioButton>
</WrapPanel>
</DataTemplate>
<!-- NumericFilterPredicate Template -->
<DataTemplate DataType="{x:Type blockItemBaseTypes:NumericFilterPredicateBlockItem}">
<userControls:NumericFilterPredicateControl Margin="5,5,5,5" NumericFilterPredicate="{Binding FilterPredicate}" Minimum="{Binding Minimum, Mode=OneTime}" Maximum="{Binding Maximum, Mode=OneTime}" />
</DataTemplate>
<!-- Rarity Template -->
<DataTemplate DataType="{x:Type blockItemTypes:RarityBlockItem}">
<StackPanel Orientation="Horizontal" Margin="5,5,5,5">
@@ -70,12 +70,17 @@
<DataTemplate DataType="{x:Type blockItemTypes:ClassBlockItem}">
<userControls:EditableListBoxControl Margin="5,5,5,5" ItemsSource="{Binding Items}" AutoCompleteItemsSource="{Binding ElementName=TopLevelGrid, Path=DataContext.AutoCompleteItemClasses}" />
</DataTemplate>
<!-- Base Type Template -->
<DataTemplate DataType="{x:Type blockItemTypes:BaseTypeBlockItem}">
<userControls:EditableListBoxControl Margin="5,5,5,5" ItemsSource="{Binding Items}" AutoCompleteItemsSource="{Binding ElementName=TopLevelGrid, Path=DataContext.AutoCompleteItemBaseTypes}" />
</DataTemplate>
<!-- Prophecy Template -->
<DataTemplate DataType="{x:Type blockItemTypes:ProphecyBlockItem}">
<userControls:EditableListBoxControl Margin="5,5,5,5" ItemsSource="{Binding Items}" AutoCompleteItemsSource="{Binding ElementName=TopLevelGrid, Path=DataContext.AutoCompleteProphecies}" />
</DataTemplate>
<!-- Explicit Mods Template -->
<DataTemplate DataType="{x:Type blockItemTypes:HasExplicitModBlockItem}">
<userControls:EditableListBoxControl Margin="5,5,5,5" ItemsSource="{Binding Items}" AutoCompleteItemsSource="{Binding ElementName=TopLevelGrid, Path=DataContext.AutocompleteItemMods}" />
@@ -114,12 +119,12 @@
<StackPanel>
<xctk:ColorPicker SelectedColor="{Binding Color}" AvailableColors="{Binding ElementName=BlockItemContentControl, Path=DataContext.AvailableColors }" ShowAvailableColors="True" AvailableColorsHeader="Path of Exile Colors"/>
<userControls:ThemeComponentSelectionControl ThemeComponent="{Binding ThemeComponent}"
Margin="0,2,0,2">
<userControls:ThemeComponentSelectionControl.AvailableThemeComponents>
<MultiBinding Converter="{StaticResource AvailableThemeComponentsConverter}">
<Binding Path="DataContext.Script.ThemeComponents" RelativeSource="{RelativeSource AncestorType={x:Type views:ItemFilterScriptView}}"/>
<Binding Path="." />
<Binding Path="." />
</MultiBinding>
</userControls:ThemeComponentSelectionControl.AvailableThemeComponents>
</userControls:ThemeComponentSelectionControl>
@@ -164,7 +169,7 @@
</userControls:ThemeComponentSelectionControl>
</WrapPanel>
</DataTemplate>
<!-- Positional Sound Template -->
<DataTemplate DataType="{x:Type blockItemTypes:PositionalSoundBlockItem}">
<WrapPanel HorizontalAlignment="Left">
@@ -225,7 +230,7 @@
<Button Grid.Column="0" Grid.Row="0" Command="{Binding Path=DataContext.PlayCustomSoundCommand, RelativeSource={RelativeSource AncestorType={x:Type views:ItemFilterBlockView}}}" Width="20" Height="20" Background="Transparent" BorderBrush="Transparent">
<Image Source="/Filtration;component/Resources/Icons/speaker_icon.png" VerticalAlignment="Center" HorizontalAlignment="Center" />
</Button>
<ComboBox Grid.Column="1" Grid.Row="0" ItemsSource="{Binding Path=DataContext.CustomSoundsAvailable, UpdateSourceTrigger=PropertyChanged, RelativeSource={RelativeSource AncestorType={x:Type views:ItemFilterScriptView}}}"
<ComboBox Grid.Column="1" Grid.Row="0" ItemsSource="{Binding Path=DataContext.CustomSoundsAvailable, UpdateSourceTrigger=PropertyChanged, RelativeSource={RelativeSource AncestorType={x:Type views:ItemFilterScriptView}}}"
SelectedValue="{Binding Value, UpdateSourceTrigger=PropertyChanged}" Style="{StaticResource MetroComboBox}"/>
<Button Grid.Column="1" Grid.Row="0" Command="{Binding Path=DataContext.CustomSoundFileDialogCommand, RelativeSource={RelativeSource AncestorType={x:Type views:ItemFilterBlockView}}}"
Width="20" Height="20" Background="Transparent" BorderBrush="Transparent" Margin="0,0,30,0" VerticalAlignment="Center" HorizontalAlignment="Right">

4
Filtration/ViewModels/DesignTime/DesignTimeItemFilterBlockViewModel.cs
View File

@@ -104,13 +104,14 @@ namespace Filtration.ViewModels.DesignTime
{
get { return Block.BlockItems.Where(b => !(b is IAudioVisualBlockItem)); }
}
public IEnumerable<IItemFilterBlockItem> AudioVisualBlockItems { get; }
public bool AdvancedBlockGroup { get; }
public bool AudioVisualBlockItemsGridVisible { get; set; }
public bool DisplaySettingsPopupOpen { get; set; }
public IEnumerable<string> AutoCompleteItemClasses { get; }
public IEnumerable<string> AutoCompleteItemBaseTypes { get; }
public IEnumerable<string> AutoCompleteProphecies { get; }
public IEnumerable<string> AutocompleteItemMods { get; }
public List<Type> BlockItemTypesAvailable => new List<Type>
{
@@ -125,6 +126,7 @@ namespace Filtration.ViewModels.DesignTime
typeof (SocketGroupBlockItem),
typeof (ClassBlockItem),
typeof (BaseTypeBlockItem),
typeof (ProphecyBlockItem),
typeof (IdentifiedBlockItem),
typeof (CorruptedBlockItem),
typeof (ElderItemBlockItem),

4
Filtration/ViewModels/ItemFilterBlockViewModel.cs
View File

@@ -50,6 +50,7 @@ namespace Filtration.ViewModels
bool DisplaySettingsPopupOpen { get; set; }
IEnumerable<string> AutoCompleteItemClasses { get; }
IEnumerable<string> AutoCompleteItemBaseTypes { get; }
IEnumerable<string> AutoCompleteProphecies { get; }
IEnumerable<string> AutocompleteItemMods { get; }
List<Type> BlockItemTypesAvailable { get; }
List<Type> AudioVisualBlockItemTypesAvailable { get; }
@@ -203,6 +204,8 @@ namespace Filtration.ViewModels
public IEnumerable<string> AutoCompleteItemBaseTypes => _staticDataService.ItemBaseTypes;
public IEnumerable<string> AutoCompleteProphecies => _staticDataService.Prophecies;
public IEnumerable<string> AutocompleteItemMods => _staticDataService.ItemMods;
public List<Type> BlockItemTypesAvailable => new List<Type>
@@ -218,6 +221,7 @@ namespace Filtration.ViewModels
typeof (SocketGroupBlockItem),
typeof (ClassBlockItem),
typeof (BaseTypeBlockItem),
typeof (ProphecyBlockItem),
typeof (IdentifiedBlockItem),
typeof (CorruptedBlockItem),
typeof (ElderItemBlockItem),