Update SAWS presets for S9

Author: fenhl

ItemPool.py

@@ -1196,7 +1196,7 @@ def configure_random_starting_items_pool(world: World, pool: list[str]) -> list[
     if 'songs' in world.settings.random_starting_items_exclude:
         exclude_list.extend(item_groups['Song'])
     if 'bombchus' in world.settings.random_starting_items_exclude:
-        exclude_list.extend((item for item in pool if 'Bombchus' in item))
+        exclude_list.extend(item for item in pool if 'Bombchus' in item)
     if 'shields' in world.settings.random_starting_items_exclude:
         exclude_list.extend(item_groups['Shield'])
     if 'deku_upgrades' in world.settings.random_starting_items_exclude:
@@ -1205,6 +1205,17 @@ def configure_random_starting_items_pool(world: World, pool: list[str]) -> list[
         exclude_list.extend(item_groups['HealthUpgrade'])
     if 'junk' in world.settings.random_starting_items_exclude:
         exclude_list.extend(ItemInfo.junk_weight)
+    if 'other' in world.settings.random_starting_items_exclude:
+        exclude_list.extend(
+            item
+            for item in pool
+            if item not in item_groups['Song']
+            and 'Bombchus' not in item
+            and item not in item_groups['Shield']
+            and item not in ('Deku Stick Capacity', 'Deku Nut Capacity')
+            and item not in item_groups['HealthUpgrade']
+            and item not in ItemInfo.junk_weight
+        )
 
     return sorted({item for item in pool if item not in exclude_list and ItemInfo.items[item].type != 'Shop'}) # give each item the same weight regardless of how many copies there are
 

README.md

@@ -30,6 +30,7 @@ Differences between `dev-fenhl` and [`Dev-R`](https://github.com/Roman971/OoT-Ra
   * The “Key Appearance Matches Dungeon” setting has been reworked into “Distinct Item Models”, with additional options that are on by default but can be disabled to reintroduce pairs of items with the same model, including frog songs/warp songs and small keys/keyrings
   * Ganon's Castle can now be a pre-completed dungeon; new “Ganon's Castle Can Be Pre-completed” setting which can be disabled to make “Pre-completed Dungeon Count” exclude Ganon's Castle
   * New option “Specific Dungeon Rewards” for the “Rainbow Bridge Requirement”, “Ganon's Boss Key”, and “LACS Condition” settings
+  * New option “Everything Else” for the “Exclude Item Types” setting controlling randomized starting items
 * New hint types based on [Elagatua's `Dev` branch](https://github.com/Elagatua/OoT-Randomizer/tree/Dev):
   * `goal-count` tells you how many items are on the path to a goal.
   * `goal-legacy` is a variant of `goal` with many subtle differences. Notably, hints will be placed in the goal's world, not the world where the item can be found. It is used in the “Triforce Blitz S2” hint distribution.
@@ -57,7 +58,7 @@ Differences between `dev-fenhl` and [`Dev-R`](https://github.com/Roman971/OoT-Ra
   * “Vanilla (Master Quest)” and “Fast Vanilla (Master Quest)” are “Vanilla” and “Fast Vanilla” but with all dungeons from Master Quest.
   * “Ice%” is an extremely fast-paced game mode where the goal is to reach the Iron Boots chest.
   * 4th Mixed Pools Tournament” is used for [an upcoming tournament](https://midos.house/event/mp/4) with nearly full mixed pools entrance randomizer.
-  * “Standard Anti-Weekly Settings (Beginner)” disables every location that's enabled in “S7 Tournament” and enables every location that's disabled there, as well as changing some miscellaneous settings. See [the official document](https://docs.google.com/document/d/1sbL6Zju943F5qyx4QbTLUsqZqOTMmvqKVbDwJl08SGc/edit) for details.
+  * “Standard Anti-Weekly Settings (Beginner)” disables every location that's enabled in “S9 Tournament” and enables every location that's disabled there, as well as changing some miscellaneous settings. See [the official document](https://docs.google.com/document/d/1vS7JrYjlWFkXfUnT5BJSQ19ywJa-TiB7RPK7Uz0JLsU/edit) for details.
   * “Standard Anti-Weekly Settings (Advanced)” adds “Shuffle Rupees & Hearts”, “Shuffle Pots”, “Shuffle Crates”, “Shuffle Beehives”, and “Shuffle Silver Rupees”, has a minimal item pool, and adds extra ice traps.
   * “Triforce Blitz S2” is a fast-paced game mode with very powerful hints used for [a tournament](https://midos.house/event/tfb/2), taken from [Elagatua's `Dev` branch](https://github.com/Elagatua/OoT-Randomizer/tree/Dev). Note that the tournament itself was played on that branch, not this one. See [the official website](https://www.triforceblitz.com/) for details.
   * “SDG Bingo Tournament 3” is a variant of “Bingo” used for an ongoing tournament. Note that the tournament itself is being played on version 8.0 of the randomizer, not this branch. See [the official document](https://docs.google.com/document/d/1fpDPSBGH9YQeC9W3P1SMDE7FhoikVgbFTJapqKnMmL4/edit) for details.

SettingsList.py

@@ -672,7 +672,7 @@ class SettingInfos:
             these use no logic.
 
             The set of <b>Standard Anti-Weekly Settings</b> presets disables every location that's enabled in
-            “S8 Tournament” and enables every location that's disabled there, as well as changing some
+            “S9 Tournament” and enables every location that's disabled there, as well as changing some
             miscellaneous settings. See <a href="https://docs.google.com/document/d/1vS7JrYjlWFkXfUnT5BJSQ19ywJa-TiB7RPK7Uz0JLsU/edit">the SAWS document</a> for details.
 
             The other presets are for racing and/or tournaments.
@@ -3916,6 +3916,7 @@ class SettingInfos:
             'deku_upgrades':   'Deku Stick/Nut Upgrades',
             'health_upgrades': 'Health Upgrades',
             'junk':            'Junk Items',
+            'other':           'Everything Else',
         },
         default          = [],
         disabled_default = [],

data/Hints/saws.json

@@ -35,6 +35,9 @@
     "remove_items":          [
         { "item": "Zeldas Lullaby", "types": ["goal"] }
     ],
+    "misc_hint_items": {
+        "ganondorf": "Progressive Hookshot"
+    },
     "dungeons_barren_limit": 1,
     "named_items_required":  true,
     "vague_named_items":     false,

data/presets_default.json

@@ -1887,7 +1887,7 @@
         "shuffle_gerudo_fortress_heart_piece": "remove",
         "shuffle_grotto_entrances": false,
         "shuffle_dungeon_entrances": "off",
-        "shuffle_bosses": "off",
+        "shuffle_bosses": "full",
         "shuffle_ganon_tower": false,
         "shuffle_overworld_entrances": false,
         "mix_entrance_pools": [],
@@ -1966,7 +1966,10 @@
         "shuffle_silver_rupees": "vanilla",
         "silver_rupee_pouches_choice": "off",
         "silver_rupee_pouches": [],
-        "enhance_map_compass": [],
+        "enhance_map_compass": [
+            "map_mq",
+            "compass_boss_location"
+        ],
         "triforce_hunt_mode": "normal",
         "free_bombchu_drops": true,
         "logic_no_night_tokens_without_suns_song": false,
@@ -2265,9 +2268,12 @@
             "lens"
         ],
         "starting_songs": [],
-        "add_random_starting_items": false,
-        "random_starting_items_exclude": [],
-        "random_starting_items_count": 0,
+        "add_random_starting_items": true,
+        "random_starting_items_exclude": [
+            "songs",
+            "other"
+        ],
+        "random_starting_items_count": 1,
         "start_with_consumables": false,
         "start_with_rupees": true,
         "starting_hearts": 3,
@@ -2299,6 +2305,7 @@
         "plandomized_locations": {},
         "misc_hints": [
             "altar",
+            "dampe_diary",
             "ganondorf",
             "warp_songs_and_owls",
             "unique_merchants"
@@ -2332,7 +2339,7 @@
         "starting_tod": "sunset",
         "blue_fire_arrows": false,
         "fix_broken_drops": true,
-        "tcg_requires_lens": false,
+        "tcg_requires_lens": true,
         "no_collectible_hearts": false,
         "one_item_per_dungeon": false,
         "item_pool_value": "balanced",
@@ -2412,7 +2419,7 @@
         "shuffle_gerudo_fortress_heart_piece": "remove",
         "shuffle_grotto_entrances": false,
         "shuffle_dungeon_entrances": "off",
-        "shuffle_bosses": "off",
+        "shuffle_bosses": "full",
         "shuffle_ganon_tower": false,
         "shuffle_overworld_entrances": false,
         "mix_entrance_pools": [],
@@ -2491,7 +2498,10 @@
         "shuffle_silver_rupees": "anywhere",
         "silver_rupee_pouches_choice": "off",
         "silver_rupee_pouches": [],
-        "enhance_map_compass": [],
+        "enhance_map_compass": [
+            "map_mq",
+            "compass_boss_location"
+        ],
         "triforce_hunt_mode": "normal",
         "free_bombchu_drops": true,
         "logic_no_night_tokens_without_suns_song": false,
@@ -2790,9 +2800,12 @@
             "lens"
         ],
         "starting_songs": [],
-        "add_random_starting_items": false,
-        "random_starting_items_exclude": [],
-        "random_starting_items_count": 0,
+        "add_random_starting_items": true,
+        "random_starting_items_exclude": [
+            "songs",
+            "other"
+        ],
+        "random_starting_items_count": 1,
         "start_with_consumables": false,
         "start_with_rupees": true,
         "starting_hearts": 3,
@@ -2824,6 +2837,7 @@
         "plandomized_locations": {},
         "misc_hints": [
             "altar",
+            "dampe_diary",
             "ganondorf",
             "warp_songs_and_owls",
             "100_skulltulas",
@@ -2858,7 +2872,7 @@
         "starting_tod": "sunset",
         "blue_fire_arrows": false,
         "fix_broken_drops": true,
-        "tcg_requires_lens": false,
+        "tcg_requires_lens": true,
         "no_collectible_hearts": false,
         "one_item_per_dungeon": false,
         "item_pool_value": "minimal",

version.py

@@ -1,7 +1,7 @@
 __version__ = '9.0.12'
 
 # This is a supplemental version number for branches based off of main dev.
-supplementary_version = 1
+supplementary_version = 2
 
 # Pick a unique identifier byte for your fork if you are intending to have a long-lasting branch.
 # This will be 0x00 for main releases and 0x01 for main dev.