Update for PoE 3.8 (#138)

Added new block type BlightedMap
Updated static data
This commit is contained in:
azakhi 2019-09-11 14:45:28 +03:00 committed by Ben Wallis
parent 757fc46e6b
commit dcd963a210
8 changed files with 99 additions and 10 deletions

View File

@ -0,0 +1,23 @@
using System.Windows.Media;
using Filtration.ObjectModel.BlockItemBaseTypes;
using Filtration.ObjectModel.Enums;
namespace Filtration.ObjectModel.BlockItemTypes
{
public sealed class BlightedMapBlockItem : BooleanBlockItem
{
public BlightedMapBlockItem()
{
}
public BlightedMapBlockItem(bool booleanValue) : base(booleanValue)
{
}
public override string PrefixText => "BlightedMap";
public override string DisplayHeading => "Blighted Map";
public override Color SummaryBackgroundColor => Colors.Khaki;
public override Color SummaryTextColor => Colors.Black;
public override BlockItemOrdering SortOrder => BlockItemOrdering.BligtedMap;
}
}

View File

@ -18,6 +18,7 @@ namespace Filtration.ObjectModel.Enums
MapTier, MapTier,
ShapedMap, ShapedMap,
ElderMap, ElderMap,
BligtedMap,
SocketGroup, SocketGroup,
Height, Height,
Width, Width,

View File

@ -63,6 +63,7 @@
<Compile Include="BlockItemTypes\AnyEnchantmentBlockItem.cs" /> <Compile Include="BlockItemTypes\AnyEnchantmentBlockItem.cs" />
<Compile Include="BlockItemTypes\BackgroundColorBlockItem.cs" /> <Compile Include="BlockItemTypes\BackgroundColorBlockItem.cs" />
<Compile Include="BlockItemTypes\BaseTypeBlockItem.cs" /> <Compile Include="BlockItemTypes\BaseTypeBlockItem.cs" />
<Compile Include="BlockItemTypes\BlightedMapBlockItem.cs" />
<Compile Include="BlockItemTypes\FracturedItemBlockItem.cs" /> <Compile Include="BlockItemTypes\FracturedItemBlockItem.cs" />
<Compile Include="BlockItemTypes\HasEnchantmentBlockItem.cs" /> <Compile Include="BlockItemTypes\HasEnchantmentBlockItem.cs" />
<Compile Include="BlockItemTypes\MapTierBlockItem.cs" /> <Compile Include="BlockItemTypes\MapTierBlockItem.cs" />

View File

@ -419,6 +419,11 @@ namespace Filtration.Parser.Services
AddNumericFilterPredicateItemToBlockItems<MapTierBlockItem>(block, trimmedLine); AddNumericFilterPredicateItemToBlockItems<MapTierBlockItem>(block, trimmedLine);
break; break;
} }
case "BlightedMap":
{
AddBooleanItemToBlockItems<BlightedMapBlockItem>(block, trimmedLine);
break;
}
} }
if (!string.IsNullOrWhiteSpace(blockComment) && block.BlockItems.Count > 1) if (!string.IsNullOrWhiteSpace(blockComment) && block.BlockItems.Count > 1)

View File

@ -16,6 +16,7 @@ Additional Accuracy Support
Advanced Traps Support Advanced Traps Support
Aetheric Fossil Aetheric Fossil
Agate Amulet Agate Amulet
Akil's Prophecy
Albino Rhoa Feather Albino Rhoa Feather
Alchemy Shard Alchemy Shard
Alder Spiked Shield Alder Spiked Shield
@ -27,6 +28,7 @@ Alluring Bounty
Alone in the Darkness Alone in the Darkness
Alteration Shard Alteration Shard
Amber Amulet Amber Amulet
Amber Oil
Ambush Boots Ambush Boots
Ambush Leaguestone Ambush Leaguestone
Ambush Mitts Ambush Mitts
@ -98,6 +100,8 @@ Aventail Helmet
Avian Slippers Avian Slippers
Avian Twins Talisman Avian Twins Talisman
Awl Awl
Azure Oil
Azyran's Reward
Baleful Gem Baleful Gem
Ball Lightning Ball Lightning
Bane Bane
@ -134,6 +138,7 @@ Binding Shard
Birth of the Three Birth of the Three
Bismuth Flask Bismuth Flask
Black Maw Talisman Black Maw Talisman
Black Oil
Black Rose of Anarchy Black Rose of Anarchy
Black Venom Black Venom
Blacksmith's Whetstone Blacksmith's Whetstone
@ -144,6 +149,7 @@ Bladefall
Bladestorm Bladestorm
Blasphemy Support Blasphemy Support
Blast Rain Blast Rain
Blastchain Mine Support
Blessed Orb Blessed Orb
Blessing of Chayula Blessing of Chayula
Blessing of Esh Blessing of Esh
@ -279,6 +285,7 @@ Cemetery Map
Ceremonial Axe Ceremonial Axe
Ceremonial Kite Shield Ceremonial Kite Shield
Ceremonial Mace Ceremonial Mace
Cerulean Ring
Chain Belt Chain Belt
Chain Boots Chain Boots
Chain Gloves Chain Gloves
@ -296,6 +303,7 @@ Chaos Shard
Chaotic Disposition Chaotic Disposition
Charan's Sword Charan's Sword
Charged Dash Charged Dash
Charged Mines Support
Charged Traps Support Charged Traps Support
Chateau Map Chateau Map
Chayula's Breachstone Chayula's Breachstone
@ -311,6 +319,7 @@ City Square Map
Clarity Clarity
Clasped Boots Clasped Boots
Clasped Mitts Clasped Mitts
Clear Oil
Cleave Cleave
Cleaver Cleaver
Close Combat Support Close Combat Support
@ -320,6 +329,7 @@ Cloth Belt Piece
Cluster Traps Support Cluster Traps Support
Clutching Talisman Clutching Talisman
Cobalt Jewel Cobalt Jewel
Cobra Lash
Cogs of Disruption Cogs of Disruption
Coiled Staff Coiled Staff
Cold Penetration Support Cold Penetration Support
@ -352,6 +362,7 @@ Contagion
Controlled Destruction Support Controlled Destruction Support
Conversion Trap Conversion Trap
Convocation Convocation
Convoking Wand
Copper Kris Copper Kris
Copper Plate Copper Plate
Copper Sword Copper Sword
@ -377,6 +388,7 @@ Cremation
Crescent Staff Crescent Staff
Crested Tower Shield Crested Tower Shield
Crimson Jewel Crimson Jewel
Crimson Oil
Crimson Raiment Crimson Raiment
Crimson Round Shield Crimson Round Shield
Crimson Temple Map Crimson Temple Map
@ -434,6 +446,7 @@ Deafening Essence of Wrath
Deafening Essence of Zeal Deafening Essence of Zeal
Death Death
Death Bow Death Bow
Deathmark Support
Decadent Incubator Decadent Incubator
Decanter Spiritus Decanter Spiritus
Decay Support Decay Support
@ -520,6 +533,7 @@ Elegant Foil
Elegant Ringmail Elegant Ringmail
Elegant Round Shield Elegant Round Shield
Elegant Sword Elegant Sword
Elemental Army Support
Elemental Damage with Attacks Support Elemental Damage with Attacks Support
Elemental Focus Support Elemental Focus Support
Elemental Hit Elemental Hit
@ -608,7 +622,9 @@ Faster Attacks Support
Faster Casting Support Faster Casting Support
Faster Projectiles Support Faster Projectiles Support
Faun's Horn Faun's Horn
Feeding Frenzy Support
Fencer Helm Fencer Helm
Feral Incubator
Festival Mask Festival Mask
Field Lamellar Field Lamellar
Fields Map Fields Map
@ -617,7 +633,6 @@ Fine Incubator
Fingerless Silk Gloves Fingerless Silk Gloves
Fir Round Shield Fir Round Shield
Fire Arrow Quiver Fire Arrow Quiver
Fire Nova Mine
Fire Penetration Support Fire Penetration Support
Fire Trap Fire Trap
Fireball Fireball
@ -655,7 +670,6 @@ Fragment of the Hydra
Fragment of the Minotaur Fragment of the Minotaur
Fragment of the Phoenix Fragment of the Phoenix
Fragmented Incubator Fragmented Incubator
Freeze Mine
Freezing Pulse Freezing Pulse
Frenzy Frenzy
Fright Claw Fright Claw
@ -702,6 +716,7 @@ Gilded Divination Scarab
Gilded Elder Scarab Gilded Elder Scarab
Gilded Fossil Gilded Fossil
Gilded Harbinger Scarab Gilded Harbinger Scarab
Gilded Legion Scarab
Gilded Perandus Scarab Gilded Perandus Scarab
Gilded Reliquary Scarab Gilded Reliquary Scarab
Gilded Sallet Gilded Sallet
@ -739,6 +754,7 @@ Golden Kris
Golden Mantle Golden Mantle
Golden Mask Golden Mask
Golden Obi Golden Obi
Golden Oil
Golden Page Golden Page
Golden Plate Golden Plate
Golden Wreath Golden Wreath
@ -801,6 +817,7 @@ Herald of Purity
Herald of Thunder Herald of Thunder
Heterochromia Heterochromia
Hexclaw Talisman Hexclaw Talisman
High-Impact Mine Support
Highborn Bow Highborn Bow
Highborn Staff Highborn Staff
Highland Blade Highland Blade
@ -831,6 +848,7 @@ Ice Shot
Ice Spear Ice Spear
Ice Trap Ice Trap
Iceberg Map Iceberg Map
Icicle Mine
Ignite Proliferation Support Ignite Proliferation Support
Imbued Wand Imbued Wand
Immolate Support Immolate Support
@ -855,11 +873,13 @@ Increased Duration Support
Infantry Brigandine Infantry Brigandine
Infernal Axe Infernal Axe
Infernal Blow Infernal Blow
Infernal Legion Support
Infernal Sword Infernal Sword
Infested Valley Map Infested Valley Map
Infused Channelling Support Infused Channelling Support
Infused Incubator Infused Incubator
Innervate Support Innervate Support
Inspiration Support
Intensify Support Intensify Support
Invasion Leaguestone Invasion Leaguestone
Inya's Key Inya's Key
@ -1006,6 +1026,7 @@ Mausoleum Map
Mawr Blaidd Mawr Blaidd
Maze Map Maze Map
Maze of the Minotaur Map Maze of the Minotaur Map
Meat Shield Support
Meatgrinder Meatgrinder
Medicine Chest Medicine Chest
Medium Hybrid Flask Medium Hybrid Flask
@ -1036,7 +1057,6 @@ Military Staff
Mind Cage Mind Cage
Minefield Support Minefield Support
Mineral Pools Map Mineral Pools Map
Minion and Totem Elemental Resistance Support
Minion Damage Support Minion Damage Support
Minion Life Support Minion Life Support
Minion Speed Support Minion Speed Support
@ -1055,6 +1075,7 @@ Moon Orb
Moon Staff Moon Staff
Moon Temple Map Moon Temple Map
Moonstone Ring Moonstone Ring
More is Never Enough
Morning Star Morning Star
Mortal Grief Mortal Grief
Mortal Hope Mortal Hope
@ -1085,12 +1106,14 @@ Necromancer Silks
Necromancy Net Necromancy Net
Necropolis Map Necropolis Map
Nemesis Leaguestone Nemesis Leaguestone
Nightblade Support
Nightmare Bascinet Nightmare Bascinet
Nightmare Mace Nightmare Mace
No Traces No Traces
Noble Axe Noble Axe
Noble Claw Noble Claw
Noble Tricorne Noble Tricorne
Nook's Crown
Nubuck Boots Nubuck Boots
Nubuck Gloves Nubuck Gloves
Oak Buckler Oak Buckler
@ -1109,6 +1132,7 @@ Onyx Amulet
Opal Ring Opal Ring
Opal Sceptre Opal Sceptre
Opal Wand Opal Wand
Opalescent Oil
Orb of Alchemy Orb of Alchemy
Orb of Alteration Orb of Alteration
Orb of Annulment Orb of Annulment
@ -1150,6 +1174,7 @@ Perfect Fossil
Perfection Perfection
Perforate Perforate
Pernarch Pernarch
Pestilent Strike
Petrified Club Petrified Club
Phantasmagoria Map Phantasmagoria Map
Phantom Mace Phantom Mace
@ -1163,6 +1188,7 @@ Pine Buckler
Pinnacle Tower Shield Pinnacle Tower Shield
Pit Map Pit Map
Pit of the Chimera Map Pit of the Chimera Map
Plague Bearer
Plague Mask Plague Mask
Plank Kite Shield Plank Kite Shield
Plate Vest Plate Vest
@ -1185,6 +1211,7 @@ Polished Cartography Scarab
Polished Divination Scarab Polished Divination Scarab
Polished Elder Scarab Polished Elder Scarab
Polished Harbinger Scarab Polished Harbinger Scarab
Polished Legion Scarab
Polished Perandus Scarab Polished Perandus Scarab
Polished Reliquary Scarab Polished Reliquary Scarab
Polished Shaper Scarab Polished Shaper Scarab
@ -1240,6 +1267,7 @@ Purity of Elements
Purity of Fire Purity of Fire
Purity of Ice Purity of Ice
Purity of Lightning Purity of Lightning
Pyroclast Mine
Quarterstaff Quarterstaff
Quartz Flask Quartz Flask
Quartz Sceptre Quartz Sceptre
@ -1270,7 +1298,6 @@ Reaver Sword
Rebirth Rebirth
Reckoning Reckoning
Recurve Bow Recurve Bow
Reduced Mana Support
Redwood Spiked Shield Redwood Spiked Shield
Reef Map Reef Map
Reflex Bow Reflex Bow
@ -1285,8 +1312,8 @@ Reinforced Steel Net
Reinforced Tower Shield Reinforced Tower Shield
Rejuvenation Totem Rejuvenation Totem
Relic Chambers Map Relic Chambers Map
Remembrance
Remnant of Corruption Remnant of Corruption
Remote Mine Support
Residence Map Residence Map
Ribbon Spool Ribbon Spool
Righteous Fire Righteous Fire
@ -1323,6 +1350,7 @@ Rusted Divination Scarab
Rusted Elder Scarab Rusted Elder Scarab
Rusted Harbinger Scarab Rusted Harbinger Scarab
Rusted Hatchet Rusted Hatchet
Rusted Legion Scarab
Rusted Perandus Scarab Rusted Perandus Scarab
Rusted Reliquary Scarab Rusted Reliquary Scarab
Rusted Shaper Scarab Rusted Shaper Scarab
@ -1404,6 +1432,7 @@ Seismic Trap
Sekhem Sekhem
Sekhema Feather Sekhema Feather
Sentinel Jacket Sentinel Jacket
Sepia Oil
Sepulchre Map Sepulchre Map
Serpent Wand Serpent Wand
Serpentine Staff Serpentine Staff
@ -1422,7 +1451,6 @@ Shagreen Gloves
Shagreen Tower Shield Shagreen Tower Shield
Shaper's Orb Shaper's Orb
Shaper's Orb (Tier 1) Shaper's Orb (Tier 1)
Shaper's Orb (Tier 10)
Shaper's Orb (Tier 2) Shaper's Orb (Tier 2)
Shaper's Orb (Tier 3) Shaper's Orb (Tier 3)
Shaper's Orb (Tier 4) Shaper's Orb (Tier 4)
@ -1431,6 +1459,7 @@ Shaper's Orb (Tier 6)
Shaper's Orb (Tier 7) Shaper's Orb (Tier 7)
Shaper's Orb (Tier 8) Shaper's Orb (Tier 8)
Shaper's Orb (Tier 9) Shaper's Orb (Tier 9)
Shaper's Orb (Tier 10)
Shard of Fate Shard of Fate
Sharkskin Boots Sharkskin Boots
Sharkskin Gloves Sharkskin Gloves
@ -1485,6 +1514,7 @@ Silver Coin
Silver Flask Silver Flask
Silver Key Silver Key
Silver Locket Silver Locket
Silver Oil
Simple Iron Net Simple Iron Net
Simple Robe Simple Robe
Simple Rope Net Simple Rope Net
@ -1577,6 +1607,7 @@ Storm Blade
Storm Brand Storm Brand
Storm Burst Storm Burst
Storm Call Storm Call
Stormblast Mine
Strand Map Strand Map
Strapped Boots Strapped Boots
Strapped Leather Strapped Leather
@ -1592,6 +1623,7 @@ Stygian Vise
Sulphur Flask Sulphur Flask
Sulphur Vents Map Sulphur Vents Map
Summit Map Summit Map
Summon Carrion Golem
Summon Chaos Golem Summon Chaos Golem
Summon Flame Golem Summon Flame Golem
Summon Holy Relic Summon Holy Relic
@ -1599,7 +1631,8 @@ Summon Ice Golem
Summon Lightning Golem Summon Lightning Golem
Summon Phantasm on Kill Support Summon Phantasm on Kill Support
Summon Raging Spirit Summon Raging Spirit
Summon Skeleton Summon Skeletons
Summon Skitterbots
Summon Stone Golem Summon Stone Golem
Sun Leather Sun Leather
Sun Orb Sun Orb
@ -1610,11 +1643,13 @@ Sunken City Map
Supreme Spiked Shield Supreme Spiked Shield
Sweep Sweep
Swift Affliction Support Swift Affliction Support
Swift Assembly Support
Talisman Leaguestone Talisman Leaguestone
Talon Axe Talon Axe
Tangled Fossil Tangled Fossil
Tarnished Spirit Shield Tarnished Spirit Shield
Teak Round Shield Teak Round Shield
Teal Oil
Tectonic Slam Tectonic Slam
Tempered Foil Tempered Foil
Tempest Leaguestone Tempest Leaguestone
@ -1636,6 +1671,7 @@ The Arena Champion
The Army of Blood The Army of Blood
The Artist The Artist
The Avenger The Avenger
The Bargain
The Battle Born The Battle Born
The Beast The Beast
The Betrayal The Betrayal
@ -1656,11 +1692,14 @@ The Chains that Bind
The Coming Storm The Coming Storm
The Conduit The Conduit
The Cursed King The Cursed King
The Damned
The Dapper Prodigy The Dapper Prodigy
The Dark Mage The Dark Mage
The Darkest Dream The Darkest Dream
The Deal
The Deceiver The Deceiver
The Deep Ones The Deep Ones
The Demon
The Demoness The Demoness
The Devastator The Devastator
The Doctor The Doctor
@ -1678,6 +1717,7 @@ The Ethereal
The Explorer The Explorer
The Eye of Desire The Eye of Desire
The Eye of Fury The Eye of Fury
The Eye of Terror
The Eye of the Dragon The Eye of the Dragon
The Fathomless Depths The Fathomless Depths
The Feast The Feast
@ -1697,6 +1737,7 @@ The Golden Era
The Hale Heart The Hale Heart
The Harvester The Harvester
The Hermit The Hermit
The Heroic Shot
The Hoarder The Hoarder
The Hunger The Hunger
The Immortal The Immortal
@ -1727,10 +1768,12 @@ The Mayor
The Mercenary The Mercenary
The Messenger The Messenger
The Metalsmith's Gift The Metalsmith's Gift
The Mountain
The Nurse The Nurse
The Oath The Oath
The Obscured The Obscured
The Offering The Offering
The Old Man
The One With All The One With All
The Opulent The Opulent
The Pack Leader The Pack Leader
@ -1739,6 +1782,7 @@ The Penitent
The Poet The Poet
The Polymath The Polymath
The Porcupine The Porcupine
The Price of Loyalty
The Price of Protection The Price of Protection
The Primordial The Primordial
The Professor The Professor
@ -1760,8 +1804,10 @@ The Seeker
The Sephirot The Sephirot
The Shaper's Key The Shaper's Key
The Shaper's Realm The Shaper's Realm
The Side Quest
The Sigil The Sigil
The Siren The Siren
The Skeleton
The Soul The Soul
The Spark and the Flame The Spark and the Flame
The Spoiled Prince The Spoiled Prince
@ -1799,6 +1845,7 @@ The Wilted Rose
The Wind The Wind
The Witch The Witch
The Wolf The Wolf
The Wolf's Legacy
The Wolf's Shadow The Wolf's Shadow
The Wolven King's Bite The Wolven King's Bite
The Wolverine The Wolverine
@ -1951,6 +1998,9 @@ Vault Map
Velvet Gloves Velvet Gloves
Velvet Slippers Velvet Slippers
Vengeance Vengeance
Venom Gyre
Verdant Oil
Vermillion Ring
Vial of Awakening Vial of Awakening
Vial of Consequence Vial of Consequence
Vial of Dominance Vial of Dominance
@ -1963,17 +2013,20 @@ Vial of the Ritual
Vial of Transcendence Vial of Transcendence
Vicious Projectiles Support Vicious Projectiles Support
Vigilant Strike Vigilant Strike
Vile Power
Vile Staff Vile Staff
Vile Toxins Support Vile Toxins Support
Villa Map Villa Map
Vine Circlet Vine Circlet
Vinia's Token Vinia's Token
Violet Oil
Viper Strike Viper Strike
Viridian Jewel Viridian Jewel
Visored Sallet Visored Sallet
Vitality Vitality
Void Axe Void Axe
Void Manipulation Support Void Manipulation Support
Void of the Elements
Void Sceptre Void Sceptre
Volatile Dead Volatile Dead
Volatile Power Volatile Power
@ -2043,6 +2096,7 @@ Wild Strike
Wings of Vastiri Wings of Vastiri
Winter Orb Winter Orb
Wither Wither
Withering Step
Withering Touch Support Withering Touch Support
Wolf Pelt Wolf Pelt
Woodful Staff Woodful Staff

View File

@ -10,6 +10,7 @@ Claws
Currency Currency
Daggers Daggers
Delve Socketable Currency Delve Socketable Currency
Delve Stackable Socketable Currency
Divination Card Divination Card
Fishing Rods Fishing Rods
Flasks Flasks
@ -41,6 +42,7 @@ Quest Items
Quivers Quivers
Relics Relics
Rings Rings
Rune Dagger
Sceptres Sceptres
Shields Shields
Small Relics Small Relics
@ -54,3 +56,4 @@ Two Hand Maces
Two Hand Swords Two Hand Swords
Utility Flasks Utility Flasks
Wands Wands
Warstaff

View File

@ -137,10 +137,11 @@ namespace Filtration.ViewModels.DesignTime
typeof (MapTierBlockItem), typeof (MapTierBlockItem),
typeof (ShapedMapBlockItem), typeof (ShapedMapBlockItem),
typeof (ElderMapBlockItem), typeof (ElderMapBlockItem),
typeof (BlightedMapBlockItem),
typeof (GemLevelBlockItem), typeof (GemLevelBlockItem),
typeof (StackSizeBlockItem), typeof (StackSizeBlockItem),
typeof (HasExplicitModBlockItem), typeof (HasExplicitModBlockItem),
typeof (HasEnchantmentBlockItem) typeof (HasEnchantmentBlockItem),
}; };
public List<Type> AudioVisualBlockItemTypesAvailable { get; } public List<Type> AudioVisualBlockItemTypesAvailable { get; }
public Color DisplayTextColor => Colors.Red; public Color DisplayTextColor => Colors.Red;

View File

@ -234,10 +234,11 @@ namespace Filtration.ViewModels
typeof (MapTierBlockItem), typeof (MapTierBlockItem),
typeof (ShapedMapBlockItem), typeof (ShapedMapBlockItem),
typeof (ElderMapBlockItem), typeof (ElderMapBlockItem),
typeof (BlightedMapBlockItem),
typeof (GemLevelBlockItem), typeof (GemLevelBlockItem),
typeof (StackSizeBlockItem), typeof (StackSizeBlockItem),
typeof (HasExplicitModBlockItem), typeof (HasExplicitModBlockItem),
typeof (HasEnchantmentBlockItem) typeof (HasEnchantmentBlockItem),
}; };
public List<Type> AudioVisualBlockItemTypesAvailable => new List<Type> public List<Type> AudioVisualBlockItemTypesAvailable => new List<Type>