X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=filters_delve.txt;h=2313e8456f99bacc7420e84649f4f551573146eb;hb=refs%2Fheads%2Ffilters-delve;hp=fd4147f13ccac3027abded872a31d7249fa509e9;hpb=ef4691e6e5d206c7668de5c6e6859a3041041c2d;p=poefilter.git

diff --git a/filters_delve.txt b/filters_delve.txt
index fd4147f..2313e84 100644
--- a/filters_delve.txt
+++ b/filters_delve.txt
@@ -1,12 +1,28 @@
 import "armor.txt";
 import "weapons.txt";
 import "cards.txt";
+import "skillgems.txt";
+import "maps.txt";
+import "flasks.txt";
 
-// TODO jewels
-// TODO rings, amulets, belts
-// TODO quivers
-// TODO flasks
-// TODO maps
+category "quest"
+{
+	or
+	{
+		class "Quest Item";
+		class "Pantheon Soul";
+	};
+};
+
+category "currency.delve"
+{
+	class "Currency";
+	or
+	{
+		base_type "Fossil";
+		base_type "Resonator";
+	};
+};
 
 category "currency.essence.high_tier"
 {
@@ -53,7 +69,7 @@ category "currency.special"
 		base_type "Silver Coin";
 		base_type "Perandus Coin";
 		base_type "Splinter";
-		base_type "Breachstone";
+		base_type "Blessing";
 	};
 };
 
@@ -65,7 +81,11 @@ category "currency.mega"
 		base_type "Divine Orb";
 		base_type "Exalted Orb";
 		base_type "Mirror of Kalandra";
+		base_type "Mirror Shard";
 		base_type "Eternal Orb";
+		base_type "Orb of Annulment";
+		base_type "Harbinger's Orb";
+		base_type "Ancient Orb";
 	};
 };
 
@@ -83,7 +103,11 @@ category "currency.major"
 		base_type "Vaal Orb";
 		base_type "Orb of Regret";
 		base_type "Gemcutter's Prism";
-		base_type "Orb of Annulment";
+		base_type "Orb of Horizons";
+		base_type "Exalted Shard";
+		base_type "Annulment Shard";
+		base_type "Harbinger's Shard";
+		base_type "Ancient Shard";
 	};
 };
 
@@ -98,6 +122,11 @@ category "currency.medium"
 		base_type "Orb of Chance";
 		base_type "Glassblower's Bauble";
 		base_type "Orb of Alchemy";
+		base_type "Orb of Binding";
+		base_type "Engineer's Orb";
+		base_type "Chaos Shard";
+		base_type "Regal Shard";
+		base_type "Horizon Shard";
 	};
 };
 
@@ -110,6 +139,10 @@ category "currency.minor"
 		base_type "Orb of Transmutation";
 		base_type "Blacksmith's Whetstone";
 		base_type "Armourer's Scrap";
+		base_type "Alteration Shard";
+		base_type "Alchemy Shard";
+		base_type "Binding Shard";
+		base_type "Engineer's Shard";
 	};
 };
 
@@ -119,7 +152,9 @@ category "currency.trash"
 	or
 	{
 		base_type "Scroll of Wisdom";
+		base_type "Scroll Fragment";
 		base_type "Portal Scroll";
+		base_type "Transmutation Shard";
 	};
 };
 
@@ -131,20 +166,17 @@ category "currency.fallback"
 category "labyrinth"
 {
 	class "Labyrinth";
-	or
-	{
-		base_type "Golden Key";
-		base_type "Silver Key";
-		base_type "Treasure Key";
-		base_type "Cube Of Absorption";
-		base_type "Cogs of Disruption";
-		base_type "Orb of Elemental Dispersion";
-		base_type "Heart of the Gargoyle";
-		base_type "Sand of Eternity";
-		base_type "Bane of the Loyal";
-		base_type "Portal Shredder";
-		base_type "Rod of Detonation";
-	};
+};
+
+category "map.delve"
+{
+	class "Misc Map Item";
+	base_type "Timeworn Reliquary Key";
+};
+
+category "map.fragment"
+{
+	class "Map Fragment";
 };
 
 category "card.fallback"
@@ -152,43 +184,124 @@ category "card.fallback"
 	class "Card";
 };
 
+category "skillgem.quality"
+{
+	class "Skill Gem";
+	min_quality 1;
+};
+
+category "skillgem.fallback"
+{
+	class "Skill Gem";
+};
+
+category "jewel.abyss"
+{
+	class "Abyss Jewel";
+};
+
+category "jewel.magic"
+{
+	class "Jewel";
+	rarity Magic;
+};
+
+category "jewel.rare"
+{
+	class "Jewel";
+	rarity Rare;
+};
+
 category "unique"
 {
 	rarity Unique;
 };
 
-category "armor.endgame.relevant"
+category "accessory"
 {
-	category "armor.best_at_level";
-	min_item_level 68;
-	min_rarity Rare;
+	or
+	{
+		class "Ring";
+		class "Amulet";
+		class "Belt";
+	};
 };
 
-category "armor.endgame.base"
+category "accessory.important"
 {
-	category "armor.best_at_level";
-	min_item_level 68;
-	rarity Normal;
+	or
+	{
+		and
+		{
+			class "Ring";
+			or
+			{
+				base_type "Topaz Ring";
+				base_type "Ruby Ring";
+				base_type "Sapphire Ring";
+				base_type "Two-Stone Ring";
+				base_type "Amethyst Ring";
+				base_type "Diamond Ring";
+			};
+		};
+		and
+		{
+			class "Amulet";
+			or
+			{
+				base_type "Agate Amulet";
+				base_type "Turquoise Amulet";
+				base_type "Citrine Amulet";
+			};
+		};
+		and
+		{
+			class "Belt";
+			or
+			{
+				base_type "Rustic Sash";
+				base_type "Chain Belt";
+				base_type "Leather Belt";
+			};
+		};
+	};
 };
 
-category "armor.leveling.relevant"
+category "accessory.endgame.uncommon"
 {
-	category "armor.second_at_level";
 	or
 	{
 		and
 		{
-			max_item_level 30;
-			min_rarity Magic;
+			category "accessory";
+			min_drop_level 50;
+		};
+		and
+		{
+			class "Belt";
+			base_type "Stygian Vise";
 		};
-		min_rarity Rare;
 	};
-	max_item_level 67;
 };
 
-category "armor.leveling.sockets"
+category "equipment.endgame.6link"
+{
+	min_linked_sockets 6;
+};
+
+category "equipment.endgame.5link"
+{
+	or
+	{
+		category "weapon.best_at_level";
+		category "armor.best_at_level";
+	};
+	min_linked_sockets 5;
+	min_item_level 68;
+};
+
+category "equipment.leveling.links"
 {
-	category "armor";
 	or
 	{
 		and
@@ -205,30 +318,35 @@ category "armor.leveling.sockets"
 	max_item_level 67;
 };
 
-category "armor.leveling.base"
-{
-	category "armor.best_at_level";
-	max_item_level 67;
-	rarity Normal;
-};
-
-category "weapon.endgame.relevant"
+category "equipment.endgame.relevant"
 {
-	category "weapon.best_at_level";
+	or
+	{
+		category "armor.best_at_level";
+		category "weapon.best_at_level";
+	};
 	min_item_level 68;
 	min_rarity Rare;
 };
 
-category "weapon.endgame.base"
+category "equipment.endgame.base"
 {
-	category "weapon.best_at_level";
+	or
+	{
+		category "armor.best_at_level";
+		category "weapon.best_at_level";
+	};
 	min_item_level 68;
 	rarity Normal;
 };
 
-category "weapon.leveling.relevant"
+category "equipment.leveling.relevant"
 {
-	category "weapon.second_at_level";
+	or
+	{
+		category "armor.second_at_level";
+		category "weapon.second_at_level";
+	};
 	or
 	{
 		and
@@ -241,13 +359,32 @@ category "weapon.leveling.relevant"
 	max_item_level 67;
 };
 
-category "weapon.leveling.base"
+category "equipment.leveling.base"
 {
-	category "weapon.best_at_level";
+	or
+	{
+		category "armor.best_at_level";
+		category "weapon.best_at_level";
+	};
 	max_item_level 67;
 	rarity Normal;
 };
 
+category "quiver"
+{
+	class "Quiver";
+};
+
+category "flask.important"
+{
+	class "Flask";
+	or
+	{
+		base_type "Quicksilver Flask";
+		base_type "Quartz Flask";
+	};
+};
+
 category "recipe.6s"
 {
 	min_sockets 6;
@@ -281,6 +418,7 @@ category "recipe.chaos"
 		class "Ring";
 	};
 	min_item_level 60;
+	min_quality 15;
 	min_rarity Rare;
 };
 
@@ -299,7 +437,30 @@ category "recipe.quality.chisel"
 		base_type "Rock Breaker";
 		base_type "Gavel";
 	};
-	min_quality 15;
+	or
+	{
+		and
+		{
+			min_quality 10;
+			rarity Normal;
+		};
+		and
+		{
+			min_quality 16;
+			rarity Magic;
+		};
+		and
+		{
+			min_quality 18;
+			rarity Rare;
+		};
+	};
+};
+
+category "recipe.quality.bauble"
+{
+	class "Flask";
+	min_quality 10;
 };
 
 category "recipe.quality"
@@ -343,68 +504,98 @@ category "filler.small"
 			max_height 2;
 		};
 	};
+	max_item_level 67;
 };
 
 category "catchall";
 
 theme
 {
+	color "transparent" 0 0 0 0;
 	color "black" 0 0 0;
 	color "black.90%" 0 0 0 230;
 	color "black.75%" 0 0 0 191;
 	color "black.50%" 0 0 0 127;
 	color "normal" 200 200 200;
+	color "normal.50%" 200 200 200 127;
 	color "normal.dark.90%" 67 67 67 230;
 	color "magic" 136 136 255;
+	color "magic.50%" 136 136 255 127;
 	color "magic.dark.90%" 45 45 85 230;
 	color "rare" 255 255 119;
+	color "rare.50%" 255 255 119 127;
 	color "rare.dark.90%" 85 85 40 230;
 	color "unique" 175 96 37;
+	color "unique.dark.90%" 58 32 12 230;
 	color "currency" 170 158 130;
 	color "currency.dark.90%" 57 53 43 230;
 	color "fire" 150 0 0;
 	color "fire.50%" 150 0 0 127;
+	color "fire.dark.90%" 50 0 0 230;
 	color "lightning" 255 215 0;
 	color "chaos" 208 32 144;
+	color "chaos.dark.90%" 69 11 48 230;
 	color "quest" 74 230 58;
+	color "quest.dark.90%" 25 77 19 230;
 	color "card" 14 186 255;
 	color "skillgem" 27 162 155;
+	color "skillgem.dark.90%" 9 54 52 230;
 
-	base_font_size 32;
+	base_font_size 25;
+
+	appearance "quest"
+	{
+		font_size 1.25;
+		minimap_icon Green Star;
+		light_beam Green;
+	};
 
 	appearance "currency.trash"
 	{
-		font_size 0.65;
+		font_size 0.8;
 		background_color "black.75%";
 	};
 
 	appearance "currency.minor"
 	{
-		font_size 0.8;
+		font_size 1.0;
 		background_color "black.75%";
 	};
 
 	appearance "currency.medium"
 	{
-		font_size 0.8;
+		font_size 1.0;
 		border_color "fire.50%";
 		background_color "black.90%";
 	};
 
 	appearance "currency.major"
 	{
-		font_size 1.0;
+		font_size 1.25;
 		border_color "fire";
 		background_color "black.90%";
 		alert_sound 3 150;
+		minimap_icon Yellow Circle;
 	};
 
 	appearance "currency.mega"
 	{
-		font_size 1.0;
+		font_size 1.25;
 		border_color "fire";
-		background_color "currency.dark.90%";
+		background_color "fire.dark.90%";
 		alert_sound 1 250;
+		minimap_icon Red Circle;
+		light_beam Red;
+	};
+
+	appearance "currency.delve"
+	{
+		font_size 1.25;
+		border_color "quest";
+		background_color "quest.dark.90%";
+		alert_sound 7 150;
+		minimap_icon Green Circle;
+		light_beam Green;
 	};
 
 	appearance "currency.essence.low_tier"
@@ -430,148 +621,496 @@ theme
 
 	appearance "currency.fallback"
 	{
-		font_size 1.0;
+		font_size 1.25;
 		text_color "black";
 		background_color "currency";
 	};
 
-	appearance "labyrinth"
+	appearance "map.fragment"
+	{
+		font_size 1.25;
+		border_color "normal.50%";
+	};
+
+	appearance "map.unique.any"
+	{
+		font_size 1.25;
+		background_color "unique.dark.90%";
+		border_color "unique";
+		alert_sound 12 250;
+		minimap_icon Brown Square;
+		light_beam White;
+	};
+
+	appearance "map.normal.same_tier"
+	{
+		font_size 1.25;
+		background_color "normal.dark.90%";
+		border_color "fire";
+		alert_sound 12 250;
+		minimap_icon White Square;
+		light_beam White;
+	};
+
+	appearance "map.normal.tier-2"
+	{
+		font_size 1.25;
+		background_color "normal.dark.90%";
+		border_color "normal.50%";
+		alert_sound 16 250;
+		minimap_icon White Square;
+		light_beam White;
+	};
+
+	appearance "map.normal.tier-5"
 	{
 		font_size 1.0;
+		background_color "normal.dark.90%";
+		border_color "normal.50%";
+		alert_sound 16 250;
+		minimap_icon White Square;
+	};
+
+	appearance "map.normal.any"
+	{
+		font_size 0.8;
+		background_color "normal.dark.90%";
+		border_color "transparent";
+		alert_sound 16 150;
+	};
+
+	appearance "map.magic.same_tier"
+	{
+		font_size 1.25;
+		background_color "magic.dark.90%";
+		border_color "fire";
+		alert_sound 12 250;
+		minimap_icon Blue Square;
+		light_beam White;
+	};
+
+	appearance "map.magic.tier-2"
+	{
+		font_size 1.25;
+		background_color "magic.dark.90%";
+		border_color "magic.50%";
+		alert_sound 16 250;
+		minimap_icon Blue Square;
+		light_beam White;
+	};
+
+	appearance "map.magic.any"
+	{
+		font_size 1.0;
+		background_color "magic.dark.90%";
+		border_color "magic.50%";
+		alert_sound 16 250;
+		minimap_icon Blue Square;
+	};
+
+	appearance "map.rare.same_tier"
+	{
+		font_size 1.25;
+		background_color "rare.dark.90%";
+		border_color "fire";
+		alert_sound 12 250;
+		minimap_icon Yellow Square;
+		light_beam White;
+	};
+
+	appearance "map.rare.tier-2"
+	{
+		font_size 1.25;
+		background_color "rare.dark.90%";
+		border_color "rare.50%";
+		alert_sound 16 250;
+		minimap_icon Yellow Square;
+		light_beam White;
+	};
+
+	appearance "map.rare.any"
+	{
+		font_size 1.0;
+		background_color "rare.dark.90%";
+		border_color "rare.50%";
+		alert_sound 16 250;
+		minimap_icon Yellow Square;
+	};
+
+	appearance "labyrinth"
+	{
+		font_size 1.25;
 		text_color "quest";
 	};
 
 	appearance "card.currency"
 	{
-		font_size 1.0;
+		font_size 1.25;
 		border_color "currency";
-		alert_sound 3 150;
+		alert_sound 2 150;
+		minimap_icon Blue Triangle;
 	};
 
 	appearance "card.unique"
 	{
-		font_size 1.0;
+		font_size 1.25;
 		border_color "unique";
-		alert_sound 3 150;
+		alert_sound 2 150;
+		minimap_icon Blue Triangle;
 	};
 
 	appearance "card.rare"
 	{
-		font_size 0.8;
+		font_size 1.0;
 		border_color "rare";
+		minimap_icon White Triangle;
 	};
 
 	appearance "card.magic"
 	{
-		font_size 0.65;
+		font_size 0.8;
 		border_color "magic";
+		minimap_icon White Triangle;
 	};
 
 	appearance "card.skillgem"
 	{
-		font_size 1.0;
+		font_size 1.25;
 		border_color "skillgem";
-		alert_sound 3 150;
+		alert_sound 2 150;
+		minimap_icon Blue Triangle;
 	};
 
 	appearance "card.map"
 	{
-		font_size 1.0;
+		font_size 1.25;
 		border_color "normal";
-		alert_sound 3 150;
+		alert_sound 2 150;
+		minimap_icon Blue Triangle;
 	};
 
 	appearance "card.links"
 	{
-		font_size 1.0;
+		font_size 1.25;
 		border_color "fire";
-		alert_sound 3 150;
+		alert_sound 2 150;
+		minimap_icon Blue Triangle;
 	};
 
 	appearance "card.other"
 	{
-		font_size 1.0;
+		font_size 1.25;
+		minimap_icon White Triangle;
 	};
 
 	appearance "card.fallback"
 	{
-		font_size 1.0;
+		font_size 1.25;
 		text_color "black";
 		background_color "card";
 	};
 
-	appearance "armor.endgame.base"
+	appearance "skillgem.special.vaal"
+	{
+		font_size 1.25;
+		border_color "chaos";
+		background_color "chaos.dark.90%";
+		alert_sound 6 150;
+		minimap_icon Red Diamond;
+	};
+
+	appearance "skillgem.special.drop"
+	{
+		font_size 1.25;
+		border_color "fire";
+		background_color "fire.dark.90%";
+		alert_sound 6 150;
+		minimap_icon Red Diamond;
+	};
+
+	appearance "skillgem.price.alchemy"
+	{
+		font_size 1.25;
+		border_color "fire";
+	};
+
+	appearance "skillgem.price.chance"
+	{
+		font_size 1.0;
+		border_color "fire.50%";
+	};
+
+	appearance "skillgem.price.alteration"
+	{
+		font_size 1.0;
+		background_color "black.75%";
+	};
+
+	appearance "skillgem.price.transmute"
 	{
 		font_size 0.8;
+		background_color "black.50%";
 	};
 
-	appearance "armor.leveling.base"
+	appearance "skillgem.price.wisdom"
 	{
 		font_size 0.8;
+		background_color "black.50%";
+	};
+
+	appearance "skillgem.quality"
+	{
+		font_size 1.25;
+		border_color "currency";
+	};
+
+	appearance "skillgem.fallback"
+	{
+		font_size 1.25;
+		text_color "black";
+		background_color "skillgem";
+	};
+
+	appearance "accessory"
+	{
+		font_size 1.0;
+	};
+
+	appearance "accessory.important"
+	{
+		font_size 1.0;
+		border_color "fire.50%";
+	};
+
+	appearance "accessory.endgame.uncommon"
+	{
+		font_size 1.25;
+		border_color "fire";
+		alert_sound 10 150;
+		minimap_icon White Star;
+	};
+
+	appearance "jewel.abyss"
+	{
+		font_size 1.25;
+		border_color "fire";
+	};
+
+	appearance "jewel.magic"
+	{
+		font_size 1.0;
+	};
+
+	appearance "jewel.rare"
+	{
+		font_size 1.25;
+	};
+
+	appearance "unique"
+	{
+		font_size 1.25;
+		minimap_icon Brown Star;
+		light_beam Brown;
+	};
+
+	appearance "equipment.endgame.base"
+	{
+		font_size 1.0;
 	};
 
-	appearance "armor.leveling.sockets"
+	appearance "equipment.leveling.base"
 	{
+		font_size 1.0;
+	};
+
+	appearance "equipment.leveling.links"
+	{
+		font_size 1.25;
 		border_color "fire";
 	};
 
+	appearance "equipment.endgame.5link"
+	{
+		font_size 1.25;
+		border_color "fire";
+		alert_sound 13 150;
+		minimap_icon White Star;
+	};
+
+	appearance "equipment.endgame.6link"
+	{
+		font_size 1.25;
+		border_color "fire";
+		background_color "fire.dark.90%";
+		alert_sound 1 250;
+		minimap_icon Red Star;
+	};
+
+	appearance "quiver"
+	{
+		font_size 1.0;
+	};
+
+	appearance "flask.life.best_at_level"
+	{
+		font_size 1.0;
+	};
+
+	appearance "flask.mana.best_at_level"
+	{
+		font_size 1.0;
+	};
+
+	appearance "flask.hybrid.best_at_level"
+	{
+		font_size 1.0;
+	};
+
+	appearance "flask.utility"
+	{
+		font_size 1.0;
+	};
+
+	appearance "flask.important"
+	{
+		font_size 1.0;
+		border_color "fire.50%";
+	};
+
 	appearance "recipe.6s"
 	{
-		font_size 0.8;
+		font_size 1.25;
 		border_color "fire";
 	};
 
+	appearance "recipe.chromatic"
+	{
+		font_size 1.0;
+		border_color "fire.50%";
+		background_color "black.75%";
+	};
+
 	appearance "recipe.chaos"
 	{
-		font_size 0.8;
-		border_color "fire";
+		font_size 1.0;
+		border_color "fire.50%";
+		background_color "black.75%";
 	};
 
 	appearance "recipe.quality"
 	{
-		font_size 0.65;
+		font_size 0.8;
 		border_color "currency";
 		background_color "black.50%";
 	};
 
+	appearance "recipe.quality.bauble"
+	{
+		inherit "recipe.quality";
+	};
+
 	appearance "recipe.quality.chisel"
 	{
-		font_size 0.8;
+		font_size 1.0;
 		border_color "currency";
 		background_color "black.75%";
 	};
 
 	appearance "recipe.quality.20%"
 	{
-		font_size 0.8;
+		font_size 1.0;
 		border_color "currency";
 		background_color "black.75%";
 	};
 
+	appearance "filler.rare"
+	{
+		font_size 0.8;
+		background_color "black.50%";
+	};
+
 	appearance "filler.small"
 	{
-		font_size 0.65;
+		font_size 0.8;
 		background_color "black.50%";
 	};
 
 	appearance "catchall"
 	{
-		font_size 0.8;
+		font_size 1.0;
 		background_color "black.50%";
 	};
 };
 
-filter "delve"
+filter "delve_base"
 {
+	abstract true;
+	show "quest";
 	show "currency.*";
 	show "labyrinth";
+	show "map.unique.any";
+	show "map.delve";
+	show "map.fragment";
+	show "map.unique.any";
+	show "map.*.same_tier";
+	cancel "map.unique.same_tier";
+	show "map.*.tier-2";
+	cancel "map.unique.tier-2";
+	show "map.normal.tier-5";
+	show "map.*.any";
 	show "card.*";
+	show "skillgem.special.*";
+	show "skillgem.quality";
+	show "skillgem.price.*";
+	show "skillgem.fallback";
+	show "jewel.*";
 	show "unique";
-	show "armor.endgame.*";
-	show "armor.leveling.*";
-	show "weapon.endgame.*";
-	show "weapon.leveling.*";
+	show "accessory.endgame.uncommon";
+	show "accessory.important";
+	show "accessory";
+	show "equipment.*";
+	show "recipe.6s";
+	show "equipment.endgame.*";
+	show "equipment.leveling.*";
+	cancel "equipment.*.base";
+	show "recipe.chromatic";
+	show "recipe.quality.chisel";
+	show "equipment.*.base";
+	show "quiver";
+	show "flask.important";
+	show "flask.*.best_at_level";
+	show "flask.utility";
 	show "recipe.*";
 	show "filler.*";
+};
+
+filter "delve"
+{
+	include "delve_base";
+	hide "catchall";
+};
+
+filter "delve_endgame"
+{
+	include "delve_base";
+	cancel "*.leveling.*";
+	hide "catchall";
+};
+
+filter "delve_fast"
+{
+	hide "currency.trash";
+	include "delve_base";
+	cancel "skillgem.price.*";
+	cancel "jewel.magic";
+	cancel "accessory";
+	cancel "equipment.*.base";
+	cancel "equipment.leveling.*";
+	cancel "quiver";
+	cancel "flask.*";
+	cancel "recipe.chaos";
+	cancel "recipe.quality*";
+	cancel "recipe.chromatic";
+	cancel "filler.*";
 	hide "catchall";
 };