implement more specific hint options

data/presets/Beginner.yaml

@@ -25,11 +25,17 @@ World 1:
   chest_type_matches_contents: all_contents
   small_keys_in_fancy_chests: 'off'
   path_hints: '3'
+  path_hints_on_fi: 'off'
+  path_hints_on_gossip_stones: 'on'
   barren_hints: '2'
+  barren_hints_on_fi: 'off'
+  barren_hints_on_gossip_stones: 'on'
   location_hints: '7'
+  location_hints_on_fi: 'off'
+  location_hints_on_gossip_stones: 'on'
   item_hints: '3'
-  fi_hints: 'off'
-  gossip_stone_hints: 'on'
+  item_hints_on_fi: 'off'
+  item_hints_on_gossip_stones: 'on'
   song_hints: direct
   impa_sot_hint: 'on'
   cryptic_hint_text: 'off'

data/presets/Chestless.yaml

@@ -25,11 +25,17 @@ World 1:
   chest_type_matches_contents: 'off'
   small_keys_in_fancy_chests: 'off'
   path_hints: '3'
+  path_hints_on_fi: 'on'
+  path_hints_on_gossip_stones: 'off'
   barren_hints: '2'
+  barren_hints_on_fi: 'on'
+  barren_hints_on_gossip_stones: 'off'
   location_hints: '7'
+  location_hints_on_fi: 'on'
+  location_hints_on_gossip_stones: 'off'
   item_hints: '3'
-  fi_hints: 'on'
-  gossip_stone_hints: 'off'
+  item_hints_on_fi: 'on'
+  item_hints_on_gossip_stones: 'off'
   song_hints: direct
   impa_sot_hint: 'on'
   cryptic_hint_text: 'off'

data/presets/Max Settings.yaml

@@ -25,11 +25,17 @@ World 1:
   chest_type_matches_contents: all_contents
   small_keys_in_fancy_chests: 'off'
   path_hints: '4'
+  path_hints_on_fi: 'off'
+  path_hints_on_gossip_stones: 'on'
   barren_hints: '3'
+  barren_hints_on_fi: 'off'
+  barren_hints_on_gossip_stones: 'on'
   location_hints: '7'
+  location_hints_on_fi: 'off'
+  location_hints_on_gossip_stones: 'on'
   item_hints: '3'
-  fi_hints: 'off'
-  gossip_stone_hints: 'on'
+  item_hints_on_fi: 'off'
+  item_hints_on_gossip_stones: 'on'
   song_hints: direct
   impa_sot_hint: 'on'
   cryptic_hint_text: 'off'

data/settings_list.yaml

@@ -304,6 +304,26 @@
   options:
     - 0-7: "Select the number of path hints you would like to generate."
 
+- name: path_hints_on_fi
+  default_option: "off"
+  pretty_name: On Fi # Hint type is implied by groupbox
+  pretty_options:
+    - "Off"
+    - "On"
+  options:
+    - "off": "Path hints will not be placed on Fi."
+    - "on": "Path hints will be placed on Fi and can be seen by calling Fi and asking her for hints. If path hints are also on placed on gossip stones, then the hints will be split evenly between the two options."
+
+- name: path_hints_on_gossip_stones
+  default_option: "on"
+  pretty_name: On Gossip Stones # Hint type is implied by groupbox
+  pretty_options:
+    - "Off"
+    - "On"
+  options:
+    - "off": "Path hints will not be placed on gossip stones."
+    - "on": "Path hints will be placed on gossip stones and can be seen by talking to them. If path hints are also on placed on Fi, then the hints will be split evenly between the two options."
+
 - name: barren_hints
   default_option: 2
   pretty_name: Barren Hints
@@ -312,6 +332,26 @@
   options:
     - 0-7: "Select the number of barren hints you would like to generate."
 
+- name: barren_hints_on_fi
+  default_option: "off"
+  pretty_name: On Fi # Hint type is implied by groupbox
+  pretty_options:
+    - "Off"
+    - "On"
+  options:
+    - "off": "Barren hints will not be placed on Fi."
+    - "on": "Barren hints will be placed on Fi and can be seen by calling Fi and asking her for hints. If barren hints are also on placed on gossip stones, then the hints will be split evenly between the two options."
+
+- name: barren_hints_on_gossip_stones
+  default_option: "on"
+  pretty_name: On Gossip Stones # Hint type is implied by groupbox
+  pretty_options:
+    - "Off"
+    - "On"
+  options:
+    - "off": "Barren hints will not be placed on gossip stones."
+    - "on": "Barren hints will be placed on gossip stones and can be seen by talking to them. If barren hints are also on placed on Fi, then the hints will be split evenly between the two options."
+
 - name: location_hints
   default_option: 7 # assumes always_hints is on
   pretty_name: Location Hints
@@ -320,6 +360,26 @@
   options:
     - 0-7: "Select the number of location hints you would like to generate."
 
+- name: location_hints_on_fi
+  default_option: "off"
+  pretty_name: On Fi # Hint type is implied by groupbox
+  pretty_options:
+    - "Off"
+    - "On"
+  options:
+    - "off": "Location hints will not be placed on Fi."
+    - "on": "Location hints will be placed on Fi and can be seen by calling Fi and asking her for hints. If location hints are also on placed on gossip stones, then the hints will be split evenly between the two options."
+
+- name: location_hints_on_gossip_stones
+  default_option: "on"
+  pretty_name: On Gossip Stones # Hint type is implied by groupbox
+  pretty_options:
+    - "Off"
+    - "On"
+  options:
+    - "off": "Location hints will not be placed on gossip stones."
+    - "on": "Location hints will be placed on gossip stones and can be seen by talking to them. If location hints are also on placed on Fi, then the hints will be split evenly between the two options."
+
 - name: item_hints
   default_option: 3
   pretty_name: Item Hints
@@ -328,25 +388,25 @@
   options:
     - 0-7: "Select the number of item hints you would like to generate."
 
-- name: fi_hints
-  default_option: "on"
-  pretty_name: Fi Hints
+- name: item_hints_on_fi
+  default_option: "off"
+  pretty_name: On Fi # Hint type is implied by groupbox
   pretty_options:
     - "Off"
     - "On"
   options:
-    - "off": "Hints will not be placed on Fi."
-    - "on": "Hints will be placed on Fi and can be seen by calling Fi and asking her for hints."
+    - "off": "Item hints will not be placed on Fi."
+    - "on": "Item hints will be placed on Fi and can be seen by calling Fi and asking her for hints. If item hints are also on placed on gossip stones, then the hints will be split evenly between the two options."
 
-- name: gossip_stone_hints
-  default_option: "off"
-  pretty_name: Gossip Stone Hints
+- name: item_hints_on_gossip_stones
+  default_option: "on"
+  pretty_name: On Gossip Stones # Hint type is implied by groupbox
   pretty_options:
     - "Off"
     - "On"
   options:
-    - "off": "Hints will not be placed on Gossip Stones."
-    - "on": "Hints will be placed on Gossip Stones and can be seen by talking to them."
+    - "off": "Item hints will not be placed on gossip stones."
+    - "on": "Item hints will be placed on gossip stones and can be seen by talking to them. If item hints are also on placed on Fi, then the hints will be split evenly between the two options."
 
 - name: song_hints
   default_option: "direct"

gui/tracker.py

@@ -1697,7 +1697,7 @@ def update_areas_locations(self) -> None:
 
         self.world.assign_hint_regions_and_goal_locations()
         all_locations = self.world.get_all_item_locations()
-        if self.world.setting("gossip_stone_hints") == "on":
+        if self.world.is_placing_hints_on_gossip_stones():
             all_locations.extend(self.world.get_gossip_stones())
         for location in all_locations:
             for area_name in set(