X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=filters_delve.txt;h=3366247d34b555f5101fb7d9bd05419127c030d8;hb=df4acdc9786ec61cc6729dbef80fc7e2cbe73866;hp=7ca17ffb81d44cf24a5cc1cb3be6cbe27c1bb7ba;hpb=e5a3e8e16d536dc63889a963fd694ea60e92a24f;p=poefilter.git

diff --git a/filters_delve.txt b/filters_delve.txt
index 7ca17ff..3366247 100644
--- a/filters_delve.txt
+++ b/filters_delve.txt
@@ -5,9 +5,6 @@ import "skillgems.txt";
 import "maps.txt";
 import "flasks.txt";
 
-// TODO jewels
-// TODO quivers
-
 category "quest"
 {
 	or
@@ -156,12 +153,35 @@ category "card.fallback"
 	class "Card";
 };
 
+category "skillgem.quality"
+{
+	class "Skill Gem";
+	min_quality 1;
+};
+
+category "skillgem.fallback"
+{
+	class "Skill Gem";
+};
+
+category "jewel.magic"
+{
+	class "Jewel";
+	rarity Magic;
+};
+
+category "jewel.rare"
+{
+	class "Jewel";
+	rarity Rare;
+};
+
 category "unique"
 {
 	rarity Unique;
 };
 
-category "jewelry"
+category "accessory"
 {
 	or
 	{
@@ -171,9 +191,9 @@ category "jewelry"
 	};
 };
 
-category "jewelry.endgame.uncommon"
+category "accessory.endgame.uncommon"
 {
-	category "jewelry";
+	category "accessory";
 	min_drop_level 50;
 };
 
@@ -211,23 +231,35 @@ category "equipment.leveling.links"
 	max_item_level 67;
 };
 
-category "armor.endgame.relevant"
+category "equipment.endgame.relevant"
 {
-	category "armor.best_at_level";
+	or
+	{
+		category "armor.best_at_level";
+		category "weapon.best_at_level";
+	};
 	min_item_level 68;
 	min_rarity Rare;
 };
 
-category "armor.endgame.base"
+category "equipment.endgame.base"
 {
-	category "armor.best_at_level";
+	or
+	{
+		category "armor.best_at_level";
+		category "weapon.best_at_level";
+	};
 	min_item_level 68;
 	rarity Normal;
 };
 
-category "armor.leveling.relevant"
+category "equipment.leveling.relevant"
 {
-	category "armor.second_at_level";
+	or
+	{
+		category "armor.second_at_level";
+		category "weapon.second_at_level";
+	};
 	or
 	{
 		and
@@ -240,47 +272,20 @@ category "armor.leveling.relevant"
 	max_item_level 67;
 };
 
-category "armor.leveling.base"
+category "equipment.leveling.base"
 {
-	category "armor.best_at_level";
-	max_item_level 67;
-	rarity Normal;
-};
-
-category "weapon.endgame.relevant"
-{
-	category "weapon.best_at_level";
-	min_item_level 68;
-	min_rarity Rare;
-};
-
-category "weapon.endgame.base"
-{
-	category "weapon.best_at_level";
-	min_item_level 68;
-	rarity Normal;
-};
-
-category "weapon.leveling.relevant"
-{
-	category "weapon.second_at_level";
 	or
 	{
-		and
-		{
-			max_item_level 30;
-			min_rarity Magic;
-		};
-		min_rarity Rare;
+		category "armor.best_at_level";
+		category "weapon.best_at_level";
 	};
 	max_item_level 67;
+	rarity Normal;
 };
 
-category "weapon.leveling.base"
+category "quiver"
 {
-	category "weapon.best_at_level";
-	max_item_level 67;
-	rarity Normal;
+	class "Quiver";
 };
 
 category "recipe.6s"
@@ -431,30 +436,30 @@ theme
 	color "skillgem" 27 162 155;
 	color "skillgem.dark.90%" 9 54 52 230;
 
-	base_font_size 32;
+	base_font_size 25;
 
 	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;
@@ -462,7 +467,7 @@ theme
 
 	appearance "currency.mega"
 	{
-		font_size 1.0;
+		font_size 1.25;
 		border_color "fire";
 		background_color "fire.dark.90%";
 		alert_sound 1 250;
@@ -491,336 +496,359 @@ theme
 
 	appearance "currency.fallback"
 	{
-		font_size 1.0;
+		font_size 1.25;
 		text_color "black";
 		background_color "currency";
 	};
 
 	appearance "map.fragment"
 	{
-		font_size 1.0;
+		font_size 1.25;
 		border_color "normal.50%";
 	};
 
 	appearance "map.normal.same_tier"
 	{
-		font_size 1.0;
+		font_size 1.25;
 		background_color "normal.dark.90%";
 		border_color "fire";
 	};
 
 	appearance "map.normal.tier-1"
 	{
-		font_size 1.0;
+		font_size 1.25;
 		background_color "normal.dark.90%";
 		border_color "normal.50%";
 	};
 
 	appearance "map.normal.tier-2"
 	{
-		font_size 0.8;
+		font_size 1.0;
 		background_color "normal.dark.90%";
 		border_color "normal.50%";
 	};
 
 	appearance "map.normal.any"
 	{
-		font_size 0.65;
+		font_size 0.8;
 		background_color "normal.dark.90%";
 		border_color "transparent";
 	};
 
 	appearance "map.magic.same_tier"
 	{
-		font_size 1.0;
+		font_size 1.25;
 		background_color "magic.dark.90%";
 		border_color "fire";
 	};
 
 	appearance "map.magic.tier-1"
 	{
-		font_size 1.0;
+		font_size 1.25;
 		background_color "magic.dark.90%";
 		border_color "magic.50%";
 	};
 
 	appearance "map.magic.tier-2"
 	{
-		font_size 0.8;
+		font_size 1.0;
 		background_color "magic.dark.90%";
 		border_color "magic.50%";
 	};
 
 	appearance "map.magic.any"
 	{
-		font_size 0.65;
+		font_size 0.8;
 		background_color "magic.dark.90%";
 		border_color "transparent";
 	};
 
 	appearance "map.rare.same_tier"
 	{
-		font_size 1.0;
+		font_size 1.25;
 		background_color "rare.dark.90%";
 		border_color "fire";
 	};
 
 	appearance "map.rare.tier-1"
 	{
-		font_size 1.0;
+		font_size 1.25;
 		background_color "rare.dark.90%";
 		border_color "rare.50%";
 	};
 
 	appearance "map.rare.tier-2"
 	{
-		font_size 0.8;
+		font_size 1.0;
 		background_color "rare.dark.90%";
 		border_color "rare.50%";
 	};
 
 	appearance "map.rare.any"
 	{
-		font_size 0.65;
+		font_size 0.8;
 		background_color "rare.dark.90%";
 		border_color "transparent";
 	};
 
 	appearance "labyrinth"
 	{
-		font_size 1.0;
+		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;
 	};
 
 	appearance "card.unique"
 	{
-		font_size 1.0;
+		font_size 1.25;
 		border_color "unique";
 		alert_sound 3 150;
 	};
 
 	appearance "card.rare"
 	{
-		font_size 0.8;
+		font_size 1.0;
 		border_color "rare";
 	};
 
 	appearance "card.magic"
 	{
-		font_size 0.65;
+		font_size 0.8;
 		border_color "magic";
 	};
 
 	appearance "card.skillgem"
 	{
-		font_size 1.0;
+		font_size 1.25;
 		border_color "skillgem";
 		alert_sound 3 150;
 	};
 
 	appearance "card.map"
 	{
-		font_size 1.0;
+		font_size 1.25;
 		border_color "normal";
 		alert_sound 3 150;
 	};
 
 	appearance "card.links"
 	{
-		font_size 1.0;
+		font_size 1.25;
 		border_color "fire";
 		alert_sound 3 150;
 	};
 
 	appearance "card.other"
 	{
-		font_size 1.0;
+		font_size 1.25;
 	};
 
 	appearance "card.fallback"
 	{
-		font_size 1.0;
+		font_size 1.25;
 		text_color "black";
 		background_color "card";
 	};
 
-	appearance "skillgem.vaal"
+	appearance "skillgem.special.vaal"
 	{
-		font_size 1.0;
+		font_size 1.25;
 		border_color "chaos";
 		background_color "chaos.dark.90%";
+		alert_sound 3 150;
 	};
 
-	appearance "skillgem.drop"
+	appearance "skillgem.special.drop"
 	{
-		font_size 1.0;
+		font_size 1.25;
 		border_color "fire";
 		background_color "fire.dark.90%";
+		alert_sound 1 250;
 	};
 
-	appearance "skillgem.alchemy"
+	appearance "skillgem.price.alchemy"
 	{
-		font_size 1.0;
+		font_size 1.25;
 		border_color "fire";
 	};
 
-	appearance "skillgem.chance"
+	appearance "skillgem.price.chance"
 	{
-		font_size 0.8;
+		font_size 1.0;
 		border_color "fire.50%";
 	};
 
-	appearance "skillgem.alteration"
+	appearance "skillgem.price.alteration"
 	{
-		font_size 0.8;
+		font_size 1.0;
 		background_color "black.75%";
 	};
 
-	appearance "skillgem.transmute"
+	appearance "skillgem.price.transmute"
 	{
-		font_size 0.65;
+		font_size 0.8;
 		background_color "black.50%";
 	};
 
-	appearance "skillgem.wisdom"
+	appearance "skillgem.price.wisdom"
 	{
-		font_size 0.65;
+		font_size 0.8;
 		background_color "black.50%";
 	};
 
-	appearance "jewelry"
+	appearance "skillgem.quality"
 	{
-		font_size 0.8;
+		font_size 1.25;
+		border_color "currency";
 	};
 
-	appearance "jewelry.endgame.uncommon"
+	appearance "skillgem.fallback"
+	{
+		font_size 1.25;
+		text_color "black";
+		background_color "skillgem";
+	};
+
+	appearance "accessory"
 	{
 		font_size 1.0;
+	};
+
+	appearance "accessory.endgame.uncommon"
+	{
+		font_size 1.25;
 		border_color "fire";
 		alert_sound 3 150;
 	};
 
-	appearance "armor.endgame.base"
+	appearance "jewel.magic"
 	{
-		font_size 0.8;
+		font_size 1.0;
 	};
 
-	appearance "armor.leveling.base"
+	appearance "jewel.rare"
 	{
-		font_size 0.8;
+		font_size 1.25;
 	};
 
-	appearance "weapon.endgame.base"
+	appearance "equipment.endgame.base"
 	{
-		font_size 0.8;
+		font_size 1.0;
 	};
 
-	appearance "weapon.leveling.base"
+	appearance "equipment.leveling.base"
 	{
-		font_size 0.8;
+		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 3 150;
 	};
 
 	appearance "equipment.endgame.6link"
 	{
+		font_size 1.25;
 		border_color "fire";
 		background_color "fire.dark.90%";
 		alert_sound 1 250;
 	};
 
+	appearance "quiver"
+	{
+		font_size 1.0;
+	};
+
 	appearance "flask.life.best_at_level"
 	{
-		font_size 0.8;
+		font_size 1.0;
 	};
 
 	appearance "flask.mana.best_at_level"
 	{
-		font_size 0.8;
+		font_size 1.0;
 	};
 
 	appearance "flask.hybrid.best_at_level"
 	{
-		font_size 0.8;
+		font_size 1.0;
 	};
 
 	appearance "flask.utility"
 	{
-		font_size 0.8;
+		font_size 1.0;
 	};
 
 	appearance "recipe.6s"
 	{
-		font_size 0.8;
+		font_size 1.0;
 		border_color "fire";
 	};
 
 	appearance "recipe.chromatic"
 	{
-		font_size 0.8;
+		font_size 1.0;
 		border_color "fire.50%";
 		background_color "black.75%";
 	};
 
 	appearance "recipe.chaos"
 	{
-		font_size 0.8;
+		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.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.65;
+		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%";
 	};
 };
@@ -836,22 +864,23 @@ filter "delve"
 	show "map.magic.*";
 	show "map.normal.*";
 	show "card.*";
-	show "skillgem.*";
+	show "skillgem.quality";
+	show "skillgem.special.*";
+	show "skillgem.price.*";
+	show "skillgem.fallback";
+	show "jewel.*";
 	show "unique";
-	show "jewelry.endgame.uncommon";
-	show "jewelry";
+	show "accessory.endgame.uncommon";
+	show "accessory";
 	show "equipment.*";
 	show "recipe.6s";
-	show "armor.endgame.*";
-	show "armor.leveling.*";
-	show "weapon.endgame.*";
-	show "weapon.leveling.*";
-	cancel "armor.*.base";
-	cancel "weapon.*.base";
+	show "equipment.endgame.*";
+	show "equipment.leveling.*";
+	cancel "equipment.*.base";
 	show "recipe.chromatic";
 	show "recipe.quality.chisel";
-	show "armor.*.base";
-	show "weapon.*.base";
+	show "equipment.*.base";
+	show "quiver";
 	show "flask.*";
 	show "recipe.*";
 	show "filler.*";