Merge "Document wonder_talk2 and remove the ones in Thieves' hideout" (…

…#2232)

README.md

@@ -115,6 +115,7 @@ issue. You should always Hard Reset to avoid this issue entirely.
 * New options `Custom (count)` and `Custom (%)` for the `Ice Traps` setting.
 * Now supports custom music written for the Majora's Mask Randomizer.
 * New Magic Meter item model to allow magic drops to be shuffled in the future.
+* New hidden `plandomized_locations` setting to allow presets to place specific items at specific locations.
 
 ### 8.2
 

Settings.py

@@ -285,6 +285,9 @@ def reset_distribution(self) -> None:
         for location in self.disabled_locations:
             self.distribution.add_location(location, '#Junk')
 
+        for location in self.plandomized_locations:
+            self.distribution.add_location(location, self.plandomized_locations[location])
+
     def check_dependency(self, setting_name: str, check_random: bool = True) -> bool:
         return self.get_dependency(setting_name, check_random) is None
 

SettingsList.py

@@ -3637,6 +3637,7 @@ class SettingInfos:
     )
 
     hint_dist_user = SettingInfoDict(None, None, True, {})
+    plandomized_locations = SettingInfoDict("Plandomized Locations", None, True, {})
 
     misc_hints = MultipleSelect(
         gui_text        = 'Misc. Hints',

data/presets_default.json

@@ -158,6 +158,7 @@
         "hint_dist": "very_strong",
         "item_hints": [],
         "hint_dist_user": {},
+        "plandomized_locations": {},
         "misc_hints": [
             "altar",
             "dampe_diary",
@@ -363,6 +364,7 @@
         "hint_dist": "tournament",
         "item_hints": [],
         "hint_dist_user": {},
+        "plandomized_locations": {},
         "misc_hints": [
             "altar",
             "ganondorf",
@@ -571,6 +573,7 @@
         "hint_dist": "weekly",
         "item_hints": [],
         "hint_dist_user": {},
+        "plandomized_locations": {},
         "misc_hints": [
             "altar",
             "ganondorf",
@@ -780,6 +783,7 @@
         "hint_dist": "ddr",
         "item_hints": [],
         "hint_dist_user": {},
+        "plandomized_locations": {},
         "misc_hints": [
             "altar",
             "dampe_diary",
@@ -994,6 +998,7 @@
         "hint_dist": "scrubs",
         "item_hints": [],
         "hint_dist_user": {},
+        "plandomized_locations": {},
         "misc_hints": [
             "ganondorf",
             "20_skulltulas",
@@ -1199,6 +1204,7 @@
         "hint_dist": "mw_path",
         "item_hints": [],
         "hint_dist_user": {},
+        "plandomized_locations": {},
         "misc_hints": [
             "altar",
             "ganondorf",
@@ -1578,6 +1584,7 @@
         "hint_dist": "useless",
         "item_hints": [],
         "hint_dist_user": {},
+        "plandomized_locations": {},
         "misc_hints": [],
         "text_shuffle": "complete",
         "damage_multiplier": "ohko",
@@ -1772,6 +1779,7 @@
         "hint_dist": "bingo",
         "item_hints": [],
         "hint_dist_user": {},
+        "plandomized_locations": {},
         "misc_hints": [
             "altar",
             "ganondorf",
@@ -1991,6 +1999,7 @@
         "hint_dist": "league",
         "item_hints": [],
         "hint_dist_user": {},
+        "plandomized_locations": {},
         "misc_hints": [
             "altar",
             "ganondorf",
@@ -2206,6 +2215,7 @@
         "hint_dist": "coop",
         "item_hints": [],
         "hint_dist_user": {},
+        "plandomized_locations": {},
         "misc_hints": [
             "altar",
             "ganondorf",
@@ -2390,6 +2400,7 @@
         "hint_dist": "very_strong_magic",
         "item_hints": [],
         "hint_dist_user": {},
+        "plandomized_locations": {},
         "misc_hints": [
             "altar",
             "dampe_diary",

data/settings_mapping.json

@@ -179,7 +179,8 @@
             "triforce_count_per_world",
             "triforce_goal_per_world",
             "free_bombchu_drops",
-            "one_item_per_dungeon"
+            "one_item_per_dungeon",
+            "plandomized_locations"
           ]
         },
         {

version.py

@@ -1,4 +1,4 @@
-__version__ = '8.2.7'
+__version__ = '8.2.8'
 
 # This is a supplemental version number for branches based off of main dev.
 supplementary_version = 0