sync from FB to GitHub 6302 - Option/Overview work

Author: FilterBlade Pipeline Agent

FbPoe1Configs/CustomizerDefault.options

@@ -271,25 +271,25 @@ Chapter(){
                 ElementAdder_Tier("?LifeForceNewTier", "LifeForceFunc");
             }
 
-            Section("Incursion Vials", "IncursionVial", "E") {
-                TierListToolBar("Vial");
-                QuickUI([0.0, "Incursion Vials T1", "vials;t1"], "SH", [], "S Tier", ["IncursionVials", "O"]);
-                QuickUI([0.0, "Incursion Vials T2", "vials;t2"], "SH", [], "A Tier", ["IncursionVials", "O"]);
-                QuickUI([0.0, "Incursion Vials T3", "vials;t3"], "SH", [], "Others", ["IncursionVials", "O"]);
+            Section("Tattoos", "HonouredTattoooftheWiseMan", "E") {
+                Function TattooFunc($s, $shd = "SHD", $title) { QuickUI($s, $shd, [], $title, ["AncTrialTattoos", "O"]); }
 
-                // new vial tiers
-                Function VialTierList($s, $shd = "SHD", $text) { QuickUI($s, $shd, [], $text, ["IncursionVials", "O"]); }
-                Conditional("?IncVialNewTier") { Show; Class Currency; SetTextColor 0 0 0 255; SetBackgroundColor 159 15 213 255; SetBorderColor 0 0 0 255; SetFontSize 45; PlayAlertSound 2 300; }
-                ElementAdder_Tier("?IncVialNewTier", "VialTierList");
+                TierListToolBar("Tattoo");
 
-                Conditional("?VialNewTiersHidden") { }
-                ElementAdder_Tier("?VialNewTiersHidden", null, true, "IncursionVials", "OH");
-            }
+                Description("Tattoos are rewards from the trials - these are applied to your skill tree and replace stat-granting nodes with other effects!");
+                TattooFunc([0.0, "Tattoos Tier 1", "currency->trial->tattoo;t1"], "SH", "S Tier");
+                TattooFunc([0.0, "Tattoos Tier 2", "currency->trial->tattoo;t2"], "SH", "A Tier");
+                TattooFunc([0.0, "Tattoos Tier 3", "currency->trial->tattoo;t3"], "SH", "B Tier");
+                TattooFunc([0.0, "Tattoos Tier 4", "currency->trial->tattoo;t4"], "SH", "Others");
 
-            //        Section("Hinekora's Lock", "HinekorasLock") {
-            //            // crafting prediction items thingy
-            //            QuickUI([0.0, "Hinekora's Lock", "currency->trial->orblike;t1"], "S", [], null, null, "Hinekor's lock is a valuable reward from the trial. Once applied on an item, you'll foresee the outcome of currency items used on the same item - until you'll actually use one of them.");
-            //        }
+                // new tiers
+                Conditional("?AncTrialTattooTier") { }
+                ElementAdder_Tier("?AncTrialTattooTier", "TattooFunc");
+
+                // hide tier
+                Conditional("?AncTrialTattooHidden") { }
+                ElementAdder_Tier("?AncTrialTattooHidden", null, true, "AncTrialTattoos", "OH");
+            }
 
             Section("Omens", "OmenoftheSoulDevourer", "E") {
                 Function OmenFunc($s, $shd = "SHD", $title) { QuickUI($s, $shd, [], $title, ["AncTrialOmens", "O"]); }
@@ -313,6 +313,22 @@ Chapter(){
                 ElementAdder_Tier("?AncTrialOmensHidden", null, true, "AncTrialOmens", "OH");
             }
 
+
+            Section("Incursion Vials", "IncursionVial", "E") {
+                TierListToolBar();
+                QuickUI([0.0, "Incursion Vials T1", "vials;t1"], "SH", [], "S Tier", ["IncursionVials", "O"]);
+                QuickUI([0.0, "Incursion Vials T2", "vials;t2"], "SH", [], "A Tier", ["IncursionVials", "O"]);
+                QuickUI([0.0, "Incursion Vials T3", "vials;t3"], "SH", [], "Others", ["IncursionVials", "O"]);
+
+                // new vial tiers
+                Function VialTierList($s, $shd = "SHD", $text) { QuickUI($s, $shd, [], $text, ["IncursionVials", "O"]); }
+                Conditional("?IncVialNewTier") { Show; Class Currency; SetTextColor 0 0 0 255; SetBackgroundColor 159 15 213 255; SetBorderColor 0 0 0 255; SetFontSize 45; PlayAlertSound 2 300; }
+                ElementAdder_Tier("?IncVialNewTier", "VialTierList");
+
+                Conditional("?VialNewTiersHidden") { }
+                ElementAdder_Tier("?VialNewTiersHidden", null, true, "IncursionVials", "OH");
+            }
+
             Section("Runegrafts", "RuneGraft", "E") {
                 // generated via manualUtil_GenerateOptFileTierListCode(); util function!
                 Function RunegraftsFunc($s, $shd = "SHD", $text) { QuickUI($s, $shd, [], $text, ["B:Runegraft of", "O"]); }
@@ -548,55 +564,6 @@ Chapter(){
             QuickUI([0.0, "Pearlescent Amulet", "exoticbaseslower;exoticpearl"], "SH", []);
             //QuickUI([0.0, "Ghostflame Blade", "exoticbaseslower;exoticghostflame"], "SH", []);
         }
-
-    }
-
-    // todo: move/remove!!
-    Section("Current League: Mirage + Ancestors", "Mirage_CoinofRestoration") {
-
-        //===================================================================================================
-        // CURRENT EVENT
-        //===================================================================================================
-
-        Section("Phrecia+Ancestors", "HonouredTattoooftheWiseMan", "E")
-        {
-            Section("Tattoos", "HonouredTattoooftheWiseMan", "E") {
-                Function TattooFunc($s, $shd = "SHD", $title) { QuickUI($s, $shd, [], $title, ["AncTrialTattoos", "O"]); }
-
-                TierListToolBar("Tattoo");
-
-                Description("Tattoos are rewards from the trials - these are applied to your skill tree and replace stat-granting nodes with other effects!");
-                TattooFunc([0.0, "Tattoos Tier 1", "currency->trial->tattoo;t1"], "SH", "S Tier");
-                TattooFunc([0.0, "Tattoos Tier 2", "currency->trial->tattoo;t2"], "SH", "A Tier");
-                TattooFunc([0.0, "Tattoos Tier 3", "currency->trial->tattoo;t3"], "SH", "B Tier");
-                TattooFunc([0.0, "Tattoos Tier 4", "currency->trial->tattoo;t4"], "SH", "Others");
-
-                // new tiers
-                Conditional("?AncTrialTattooTier") { }
-                ElementAdder_Tier("?AncTrialTattooTier", "TattooFunc");
-
-                // hide tier
-                Conditional("?AncTrialTattooHidden") { }
-                ElementAdder_Tier("?AncTrialTattooHidden", null, true, "AncTrialTattoos", "OH");
-            }
-
-            Section("Silver Coins", "Silver Coin") {
-                QuickUI([0.0, "SilverCoinEvent", "currency->leagueexclusive;silvercoin"], "SH", [], "Silver Coins for the Trial", []);
-            }
-        }
-
-        Description("All other Mirage drops are part of the 'standard' tierlists. For instance all currency drops, astrolabes and coins are part of the currency tierlist.");
-
-        QuickUI([0.0, "Cord Belt", "exoticbaseslower;exoticmiragebases"], "SH", [], "Mirage Exclusive: Cord Belt");
-        QuickUI([0.0, "Mirage Stygian", "exoticbaseslower;stygianmirage"], "SH", [], "Stygian Vise with Mirage Mods");
-        Description("If imbued gems can drop, this will catch them (and any other imbued item). Better handling will be added once we know more.");
-        QuickUI([0.0, "Imbued", "artefact->misc;anyimbued"], "SH", [], "Any Imbued Drop");
-        Description("A little birdy said these may drop from mirage...");
-        QuickUI([0.0, "Enchanted Contracts", "heist->contract;enchanted"], "SH", []);
-        QuickUI([0.0, "Enchanted Blueprints", "heist->blueprint;enchanted"], "SH", []);
-        Description("The iron flask is in huge demand during mirage league. I've added a special rule to give it temporary massive highlight bonuses. I'll look for a more permanent solution next league.");
-        QuickUI([0.0, "ApexTierBasetypes84", "exoticbases;ecotinkbases84"], "SH", ["ItemLevel"], "Iron Flask: 84", []);
-        QuickUI([0.0, "ApexTierBasetypesAny", "exoticbases;ecotinkbases"], "SH", ["ItemLevel"], "Iron Flask", []);
     }
 
 }
@@ -766,24 +733,26 @@ Chapter() {
             }
         }
 
-        Section("Maps - Pinnacle, Exotic, Influenced, ...", "T17")
+        Section("Maps - Influenced, Nightmare, Unique and Exotics", "T17")
         {
-            Title("Pinnacle Maps");
-            QuickUI([0.0, "Pinnacle - Zana (High Tier)", "maps->influenced;zanamap"], "SH", ["MapTier"]);
-            QuickUI([0.0, "Pinnacle - Zana (Low Tier)", "maps->influenced;zanamaplow"], "SH", ["MapTier"]);
-
             Title("Influenced Maps");
-            QuickUI([0.0, "New Influenced Maps", "maps->influenced;infconquerors"], "SH", ["MapTier"], "Conqueror Maps");
-//            QuickUI([0.0, "Map appearance (ShaperMap)", "maps->influenced;infshaper"], "SH", ["MapTier"], "Shaper Maps:");
             QuickUI([0.0, "Shaper Guardian Maps", "maps->nightmare;shaperguardianmaps"], "SH", ["MapTier"]);
             QuickUI([0.0, "Map appearance (ElderMap)", "maps->influenced;infelder"], "SH", ["MapTier"], "Elder Maps:");
-            Title("Exotic Corruptions");
+            QuickUI([0.0, "New Influenced Maps", "maps->influenced;infconquerors"], "SH", ["MapTier"], "Conqueror Maps");
+//            QuickUI([0.0, "Map appearance (ShaperMap)", "maps->influenced;infshaper"], "SH", ["MapTier"], "Shaper Maps:");
+
+            Title("Originator & Nightmare Maps");
+            QuickUI([0.0, "Nightmare Maps", "maps->nightmare;nightmaremaps"], "SH", [], "Nightmare (T17) Maps");
+            QuickUI([0.0, "Pinnacle - Zana (High Tier)", "maps->influenced;zanamap"], "SH", ["MapTier"], "Originator / Zana Maps (High)");
+            QuickUI([0.0, "Pinnacle - Zana (Low Tier)", "maps->influenced;zanamaplow"], "SH", ["MapTier"], "Originator / Zana Maps (Low)");
+
+            Title("Unique Maps");
+            QuickUI([0.0, "Unique Maps Multi", "uniques->maps;multispecial"], "SH", []);
+
+            Title("Exotic Variations");
             QuickUI([0.0, "Vaal Temple Map", "maps->vaaltemple;any"], "SH", []);
             QuickUI([0.0, "8-Mod Corrupted Maps", "maps->corruptedspecial;mod8"], "SH", ["MapTier"], null, ["Maps", "ASO"]);
-
             QuickUI([0.0, "Valdo Maps", "maps->nightmare;valdomaps"], "SH", []);
-            QuickUI([0.0, "Nightmare Maps", "maps->nightmare;nightmaremaps"], "SH", []); // todo: sort @NS
-            QuickUI([0.0, "Unique Maps Multi", "uniques->maps;multispecial"], "SH", []);
 
             Title("League Based Maps");
             QuickUI([0.0, "Delirium High Maps", "maps->enchanted;t1"], "SHD", ["MapTier"], "Delirium or Enchanted (T14+)");
@@ -918,6 +887,12 @@ Chapter() {
                 ElementAdder_Tier("?HeistBlueprintNewTiersHidden", null, true, "HeistBlueprints", "HO");
             }
 
+            Section ("Enchanted Contracts and Blueprints", "HeistGrandBlueprint")
+            {
+                QuickUI([0.0, "Enchanted Blueprints", "heist->blueprint;enchanted"], "SH", []);
+                QuickUI([0.0, "Enchanted Contracts", "heist->contract;enchanted"], "SH", []);
+            }
+
             Title("Custom Rules");
 
             Section("Custom Contract Rules", "HeistContract") {
@@ -2023,6 +1998,13 @@ Chapter() {
             ElementAdder_Tier("?WombgiftsNewTierFiltering", "WombgiftsCustomFiltering");
         }
 
+        Section ("Apex Tier Bases")
+        {
+            Description("Special rule to give sudden meta items temporary massive highlights.");
+            QuickUI([0.0, "ApexTierBasetypes84", "exoticbases;ecotinkbases84"], "SH", ["ItemLevel"], "Iron Flask: 84", []);
+            QuickUI([0.0, "ApexTierBasetypesAny", "exoticbases;ecotinkbases"], "SH", ["ItemLevel"], "Iron Flask", []);
+        }
+
         Section ("Wombgifts", "MetamorphSampleOrganHeart")
         {
             // generated via manualUtil_GenerateOptFileTierListCode(); util function!
@@ -2095,7 +2077,7 @@ Chapter() {
             //QuickUI([1.0, "Remaining Talismans", "rare->exotic->talisman;any"], "SH", ["ItemLevel"]);
         }
 
-        Section("Expedition Ward-Bases", "WardBase") {
+        Section("Expedition Ward-Bases & Iron Flask", "WardBase") {
             // Runic Helm, Runic Crest, Runic Crown
             Description("Expedition introduced a new defence mechanic, Ward, in addition to the traditional ones like Armour or Evasion. Ward can only be found on these new BaseTypes:");
             QuickUI([0.0, "Expedition Ward Bases", "exoticbases;exoticexpeditionbases"], "SH", ["ItemLevel?", "Rarity?", "ExpeditionWardBases", "Identified?"]);
@@ -2214,6 +2196,11 @@ Chapter() {
         Title("Currently Unobtainable");
 
         Section("Currently Unobtainable", "JuggernautsUrsineCharmoftheChampion") {
+            QuickUI([0.0, "Cord Belt", "exoticbaseslower;exoticmiragebases"], "SH", [], "Mirage Exclusive: Cord Belt");
+            QuickUI([0.0, "Mirage Stygian", "exoticbaseslower;stygianmirage"], "SH", [], "Stygian Vise with Mirage Mods");
+            Description("If imbued gems can drop, this will catch them (and any other imbued item). Better handling will be added once we know more.");
+            QuickUI([0.0, "Imbued", "artefact->misc;anyimbued"], "SH", [], "Any Imbued Drop");
+
             QuickUI([0.0, "Items with Crucible passive tree", "exotic->crucible;crucibleany"], "SH", ["DropLevel", "Rarity", "ItemLevel"]);
             QuickUI([0.0, "Kalandra Lake exclusive Bases", "exoticbases;exoticlakekala"], "SH", ["Rarity", "ItemLevel"], null, ["Gear", "OS"]);
         }
@@ -2742,6 +2729,10 @@ Chapter() {
                 QuickUI([0.0, "Unique Idols", "uniques;exuniqueidols"], "SH", ["ItemLevel", "AreaLevel"], "Unique Idols");
             }
 
+            Section("Silver Coins", "Silver Coin") {
+                QuickUI([0.0, "SilverCoinEvent", "currency->leagueexclusive;silvercoin"], "SH", [], "Silver Coins for the Trial", []);
+            }
+
             Section("Untiered Items", "StackedDeck")
             {
                 Warning("You should never see these items. Either your filter is outdated or there is a problem in your filter.");

FbPoe1Configs/Overview.options

@@ -21,7 +21,6 @@ StyleSection("RARE CURRENCY", "Their powerful effects aside high currencies act
 
 StyleSection("MID-TIER CURRENCY", "Rather common, but unless sold in bulk, not too expensive. Often used in basic crafting.") {
     Search S0("skip", "Alterations") { BaseType "Orb of Alteration"; }
-    Search S0("skip", "Chromatics") { BaseType "Chromatic Orb"; }
     Search S0("skip", "Jeweller's Orbs") { BaseType "Jeweller's Orb"; }
     Search S0("skip", "Chance Orbs") { BaseType "Orb of Chance"; }
     SS_Item("S0");
@@ -51,17 +50,20 @@ StyleSection("Gold", "You can find gold all throughout the game. It's picked up
     SS_Item("S0");
 }
 
-SS_SectionTitle("Current League: 3.28 Mirage");
+SS_SectionTitle("Current League: 3.29 Allflame");
 
-StyleSection("Mirage League", "Mirages drop coins that can be used to imbue gems and restore specific uniques. Additionally mirages modify other mechanics to drop exotic loot!") {
-    Search S0("skip") { BaseType "Coin of Knowledge"; }
-    Search S0("skip") { BaseType "Cord Belt"; ItemLevel 80; Rarity Normal; }
+StyleSection("Allflame League", "Dead Man's Sulphur, Ducats and all kind of precious items can be found on the seafloor!") {
+    Search S0("skip") { BaseType "Coral Reef Chart"; ItemLevel 70; Rarity Rare; }
+    Search S0("skip") { BaseType "Dead Man's Sulphur"; StackSize 50; }
+    Search S0("skip") { BaseType "Dead Man's Sulphur"; StackSize 250; }
+    Search S0("skip") { BaseType "Dead Man's Sulphur"; StackSize 1000; }
+    Search S0("skip") { BaseType "Brinehook's Ducat"; }
     SS_Item("S0");
 }
 
-StyleSection("Astrolabes", "Astrolabes are a new way to juice up maps in the endgame. These are found after defeating the incarnations of Dread, Neglect and Fear.") {
-    Search S0("skip") { BaseType "Nameless Astrolabe"; }
-    Search S0("skip") { BaseType "Templar Astrolabe"; }
+StyleSection("Vestigial Uniques", "Consume uniques in the Timeless Conflict (Legion) with Enshrouding Crystals. A random 'vestigial' unique will hatch - empowered by the consumed unique.") {
+    Search S0("skip") { BaseType "Vaal Enshrouding Crystal"; }
+    Search S0("skip") { BaseType "Dragonscale Boots"; Rarity Unique; ItemLevel 70; Vestigial True; }
     SS_Item("S0");
 }
 
@@ -130,13 +132,6 @@ StyleSection("Map Upgrades!", "The filter highlights map drops of a higher tier
     SS_Item("S0");
 }
 
-StyleSection("Unique Maps!", "Unique maps are treated like any other unique and are highlighted based on price.") {
-    Search S0("skip", null, "uniques->maps;multispecial") { ItemLevel 79; Rarity Unique; }
-    SS_Item("S0");
-}
-
-SS_Ad();
-
 SS_SectionTitle("Rare Items");
 
 StyleSection("Rare Colors", "The <b>Background</b> of a rare item describes its <b>Tier</b> - the relative usefulness of the item in the current meta. Opaque or colorful backgrounds are better.<div style='text-align: center;'><img src="assets/img/ItemHoverBox/ItemHoverBoxDivider_Unique.png"><br></div>The <b>Border</b> describes the <b>properties</b>: Tiny items have a green, small items a white and big items a black border. Corrupted items come with a red border.<div style='text-align: center;'><img src="assets/img/ItemHoverBox/ItemHoverBoxDivider_Unique.png"><br></div>The <b>Text color</b> is orange, instead of yellow, if the <b>itemLevel</b> is 75 or above, meaning that you can use the item for the Regal recipe instead of the chaos one.") {
@@ -187,6 +182,8 @@ StyleSection("Weapon&Armour Tier 4", "These items are usually rendered fairly un
     SS_InfoBox(["Detailed explanation", "A chaos recipe is selling a full “set” of rare items to a vendor - One amulet, two rings, one chest armor, etc… at the same time. The vendor will reward you with one Chaos Orb if all items are itemlevel 60+.<hr>If all items are unidentified, you’ll receive two Chaos Orbs instead. If all items are unidentified and have 20% quality, you’ll get three Chaos Orbs. If all items have an itemlevel of 75+, you’ll get Regal Orbs instead."]);
 }
 
+SS_Ad();
+
 SS_SectionTitle("Noteworthy Rares");
 
 StyleSection("INFLUENCED ITEMS", "These items drop from influenced maps in the endgame. They come with their own exclusive set of mods. High level versions of these items on certain basetypes can be very valuable and are great crafting bases.") {
@@ -294,13 +291,7 @@ StyleSection("Tier 3 crafting bases", "Additional less commonly used crafting ba
 SS_SectionTitle("Special Purpose Bases");
 
 StyleSection("Teal Highlight!", "Any item with a teal highlight has something special about it! Typical reasons are: enchants, fractured, synthesis, identified mods, incursion mods, delve mods, abyss sockets etc. Their price differs and it often requires a manual check.") {
-    Search S0("skip", null, "exotic->synthesised;synthclasses") { ItemLevel 74; Corrupted False; Rarity Rare; SynthesisedItem True;  }
-    SS_Item("S0");
-}
-
-StyleSection("Special: Synthesis", "Synthesed items have a special implicit. Some implicits like +1 frenzy charges or curses on hit can be in very high demand.") {
-    Search S0("skip", null, "exotic->synthesised;synthselected") { ItemLevel 74; Corrupted False; Rarity Rare; SynthesisedItem True;  BaseType "Hubris Circlet";  }
-    Search S0("skip", null, "exotic->synthesised;synthrandom") { ItemLevel 74; Corrupted False; Rarity Rare; SynthesisedItem True; BaseType "Lathi";  }
+    Search S0("skip", null, "exotic->synthesised;synthclasses") { ItemLevel 74; Corrupted False; Rarity Rare; FracturedItem True;  }
     SS_Item("S0");
 }
 
@@ -468,6 +459,12 @@ StyleSection("DELVE FOSSILS", "Fossils are originally found in the Azurite mine
     SS_Item("S0");
 }
 
+StyleSection("Astrolabes", "Astrolabes are a new way to juice up maps in the endgame. These are found after defeating the incarnations of Dread, Neglect and Fear.") {
+    Search S0("skip") { BaseType "Nameless Astrolabe"; }
+    Search S0("skip") { BaseType "Templar Astrolabe"; }
+    SS_Item("S0");
+}
+
 StyleSection("Forbidden Tome", "Sanctum forbidden tomes. Valuable, especially early on. Run by specialized players early on for good chances of dropping pure Divines.")
 {
     Search S0("skip", "Victory for ASA") { BaseType "Forbidden Tome"; AreaLevel 80; }