Separate Bagu's Note from Town Quest Items

I think it's just more fun to have Bagu be a special case where you have to find his woods in case you happen to need his note to cross Saria, instead of it just being another required tile to check.

So, I think it's good if you can add the Mirror and Water without that being tied to adding Bagu's Note.

Author: initsu

CrossPlatformUI/Lang/Resources.resx

@@ -318,12 +318,15 @@ spells to the pool of items that can appear in general locations.</value>
 adds the Up and Down stabs to the general item pool.</value>
 	</data>
 	<data name="IncludeTownQuestItemsinShuffleToolTip" xml:space="preserve">
-<value>Adds Bagu&apos;s letter (allowing passage of the Saria moat), the mirror (allowing the spell in
-Saria), and the water (allowing the spell in Nabooru) to be added to the general pool. An
-item from the general pool will replace them when you talk to Bagu, check under the table,
-or check the fountain.</value>
+<value>Adds the mirror (allowing the spell in Saria), and the water (allowing the spell in Nabooru)
+to be added to the general pool. An item from the general pool will replace the item you get when you check
+under the table, or check the fountain.</value>
 	</data>
-	<data name="ShuffleSmallItemsToolTip" xml:space="preserve">
+    <data name="IncludeBagusNoteInShuffleToolTip" xml:space="preserve">
+<value>Adds Bagu&apos;s letter (allowing passage of the Saria moat) to the general pool. An item
+from the general pool will replace the item you get when you talk to Bagu.</value>
+	</data>
+    <data name="ShuffleSmallItemsToolTip" xml:space="preserve">
 <value>Replaces each small item (red/blue jar, key, 1-up, or P-Bag) with another random small
 item. This includes item locations in the shuffle pool and general locations not shuffled
 that contain small items.</value>

CrossPlatformUI/Views/Tabs/ItemsView.axaml

@@ -61,20 +61,21 @@
             >
                 <ToolTip.Tip><TextBlock Text="{x:Static lang:Resources.IncludeSpellsinShuffleToolTip}"/></ToolTip.Tip>
             </CheckBox>
-            <CheckBox
-                IsThreeState="True"
-                IsChecked="{Binding Main.Config.IncludeSwordTechsInShuffle}"
-                Content="Include Sword Techniques in Shuffle"
-            >
+            <CheckBox IsChecked="{Binding Main.Config.IncludeSwordTechsInShuffle}"
+                      IsThreeState="True"
+                      Content="Include Sword Techniques in Shuffle">
                 <ToolTip.Tip><TextBlock Text="{x:Static lang:Resources.IncludeSwordTechniquesinShuffleToolTip}"/></ToolTip.Tip>
             </CheckBox>
-            <CheckBox
-                IsThreeState="True"
-                IsChecked="{Binding Main.Config.IncludeQuestItemsInShuffle}"
-                Content="Include Town Quest Items in Shuffle"
-            >
+            <CheckBox IsChecked="{Binding Main.Config.IncludeQuestItemsInShuffle}"
+                      IsThreeState="True"
+                      Content="Include Mirror &amp; Water in Shuffle">
                 <ToolTip.Tip><TextBlock Text="{x:Static lang:Resources.IncludeTownQuestItemsinShuffleToolTip}"/></ToolTip.Tip>
             </CheckBox>
+            <CheckBox IsChecked="{Binding Main.Config.IncludeBagusNoteInShuffle}"
+                      IsThreeState="True"
+                      Content="Include Bagu's Letter in Shuffle">
+                <ToolTip.Tip><TextBlock Text="{x:Static lang:Resources.IncludeBagusNoteInShuffleToolTip}"/></ToolTip.Tip>
+            </CheckBox>
         </StackPanel>
         <StackPanel Grid.Column="1">
             <CheckBox

RandomizerCore/Hyrule.cs

@@ -648,9 +648,12 @@ private void ShuffleItems()
             ShuffleSpells();
         }
 
-        if (props.IncludeQuestItemsInShuffle)
+        if (props.IncludeBagusNoteInShuffle)
         {
             shufflableItems.Add(Collectable.BAGUS_NOTE);
+        }
+        if (props.IncludeQuestItemsInShuffle)
+        {
             if (props.StartWithSpellItems)
             {
                 shufflableItems.Add(minorItems[r.Next(minorItems.Count)]);
@@ -2148,7 +2151,7 @@ List<Location> GetPalacesWithItems(IEnumerable<Location> palaces) =>
         {
             itemLocs.Add(westHyrule.pbagCave);
         }
-        if (props.IncludeQuestItemsInShuffle)
+        if (props.IncludeBagusNoteInShuffle)
         {
             itemLocs.Add(westHyrule.bagu);
         }

RandomizerCore/RandomizerConfiguration.cs

@@ -350,6 +350,7 @@ private bool palaceStylesAnyMetastyleSelected()
     public bool blockingRoomsInAnyPalaceIncluded() => palaceStylesAreNotAllVanillaOrShuffled();
 
     [Reactive]
+    [ConditionallyIncludeInFlags]
     private PalaceDropStyle palaceDropStyle;
     public bool palaceDropStyleIncluded() => palaceStylesAreNotAllVanillaOrShuffled();
 
@@ -559,6 +560,9 @@ private bool palaceStylesAnyMetastyleSelected()
     [Reactive]
     private bool? includeQuestItemsInShuffle;
 
+    [Reactive]
+    private bool? includeBagusNoteInShuffle;
+
     //Drops
     [Reactive]
     private bool shuffleItemDropFrequency;
@@ -1417,9 +1421,10 @@ public RandomizerProperties Export(Random r)
         properties.PbagItemShuffle = includePBagCavesInItemShuffle ?? GetIndeterminateFlagValue(r);
         properties.StartWithSpellItems = removeSpellItems ?? GetIndeterminateFlagValue(r);
         properties.ShufflePbagXp = shufflePBagAmounts ?? GetIndeterminateFlagValue(r);
-        properties.IncludeQuestItemsInShuffle = includeQuestItemsInShuffle ?? GetIndeterminateFlagValue(r);
         properties.IncludeSpellsInShuffle = includeSpellsInShuffle ?? GetIndeterminateFlagValue(r);
         properties.IncludeSwordTechsInShuffle = includeSwordTechsInShuffle ?? GetIndeterminateFlagValue(r);
+        properties.IncludeQuestItemsInShuffle = includeQuestItemsInShuffle ?? GetIndeterminateFlagValue(r);
+        properties.IncludeBagusNoteInShuffle = IncludeBagusNoteInShuffle ?? GetIndeterminateFlagValue(r);
 
         //Drops
         properties.ShuffleItemDropFrequency = shuffleItemDropFrequency;

RandomizerCore/RandomizerProperties.cs

@@ -171,8 +171,9 @@ public class RandomizerProperties
     public bool MixOverworldPalaceItems { get; set; }
     public bool IncludeSpellsInShuffle { get; set; }
     public bool IncludeSwordTechsInShuffle { get; set; }
-    //Bagu's note / fountain water / saria mirror
+    //Fountain water / Saria mirror
     public bool IncludeQuestItemsInShuffle { get; set; }
+    public bool IncludeBagusNoteInShuffle { get; set; }
     public bool RandomizeSmallItems { get; set; }
     public bool ExtraKeys { get; set; }
     public bool AllowImportantItemDuplicates { get; set; }