Merge branch 'Dev' into dev-fenhl

# Conflicts:
#	data/presets_default.json

SettingsList.py

@@ -3177,7 +3177,7 @@ class SettingInfos:
  )
 
  shuffle_child_trade = MultipleSelect(
- gui_text = 'Shuffled Child Trade Sequence Items',
+ gui_text = 'Shuffle Child Trade Sequence Items',
  default = [],
  choices = {
  'Weird Egg': 'Weird Egg',
@@ -4556,18 +4556,20 @@ class SettingInfos:
  )
 
  adult_trade_shuffle = Checkbutton(
- gui_text = 'Shuffle All Adult Trade Items',
+ gui_text = 'Shuffle All Selected Adult Trade Items',
  gui_tooltip = '''\
- Shuffle all adult trade sequence items. If disabled,
- a random item will be selected, and Anju will always
- give an item even if Pocket Egg is not shuffled.
+ Enable to shuffle every selected Adult Trade Item.
+
+ If disabled and at least one of "Shuffle Adult Trade
+ Sequence Items" is selected, Anju will always give
+ a shuffled item even if Pocket Egg has not been shuffled.
  ''',
  shared = True,
  default = False,
  )
 
  adult_trade_start = MultipleSelect(
- gui_text = 'Adult Trade Sequence Items',
+ gui_text = 'Shuffle Adult Trade Sequence Items',
  default = ['Pocket Egg', 'Pocket Cucco', 'Cojiro', 'Odd Mushroom', 'Odd Potion', 'Poachers Saw',
  'Broken Sword', 'Prescription', 'Eyeball Frog', 'Eyedrops', 'Claim Check'],
  disabled_default = [],
@@ -4585,7 +4587,17 @@ class SettingInfos:
  'Claim Check': 'Claim Check',
  },
  gui_tooltip = '''\
- Select the items to shuffle in the adult trade sequence.
+ Select the Adult Trade Sequence items to shuffle.
+
+ If "Shuffle All Selected Adult Trade Items" is
+ enabled, every selected item will be shuffled.
+
+ If "Shuffle All Selected Adult Trade Items" is
+ disabled, only one of the selected items will be
+ shuffled. If the Odd Mushroom, Eyeball Frog, or
+ Eyedrops is removed from the player's inventory due
+ to an expired timer or game reset, that item can
+ be reacquired from its <i>non-shuffled</i> location.
  ''',
  shared = True,
  )

data/Hints/weekly.json

@@ -1,7 +1,7 @@
 {
  "name": "weekly",
  "gui_name": "Weekly",
- "description": "Hint distribution for the weekly races: 5 Always, 6 Goal, 4 Barren at ToT, 5 Sometimes, 2 Dual, 30/40/50 hinted at Skull House.",
+ "description": "Hint distribution for the weekly races: 5 Always, 6 Goal, 3 Barren (ToT), 1 Light Arrow (ToT), 2 Dual, 5 Sometimes; House of Skulltula (30/40/50).",
  "add_locations": [
  { "location": "Sheik in Kakariko", "types": ["always"] },
  { "location": "Deku Theater Skull Mask", "types": ["always"] }
@@ -18,19 +18,17 @@
  { "location": "GV Chest", "types": ["sometimes"] },
  { "location": "HC Great Fairy Reward", "types": ["sometimes"] },
  { "location": "OGC Great Fairy Reward", "types": ["sometimes"] },
+ { "location": "Water Temple River Chest", "types": ["sometimes"] },
  { "location": "Gerudo Training Ground Maze Path Final Chest", "types": ["sometimes"] },
+ { "location": "Spirit Temple Silver Gauntlets Chest", "types": ["sometimes"] },
+ { "location": "Spirit Temple Mirror Shield Chest", "types": ["sometimes"] },
  { "location": "Ice Cavern Iron Boots Chest", "types": ["sometimes"] },
  { "location": "Graveyard Dampe Race Rewards", "types": ["dual"] },
- { "location": "Graveyard Royal Family Tomb Contents", "types": ["dual"] },
- { "location": "Fire Temple Lower Loop", "types": ["dual"] },
- { "location": "Water Temple River Loop Chests", "types": ["dual"] },
- { "location": "Spirit Temple Colossus Hands", "types": ["dual"] },
- { "location": "Spirit Temple Child Lower", "types": ["dual"] },
- { "location": "Spirit Temple Adult Lower", "types": ["dual"] },
- { "location": "Shadow Temple Invisible Blades Chests", "types": ["dual"] },
- { "location": "Shadow Temple Spike Walls Room", "types": ["dual"] }
+ { "location": "Graveyard Royal Family Tomb Contents", "types": ["dual"] }
+ ],
+ "add_items": [
+ { "item": "Light Arrows", "types": ["named-item"] }
  ],
- "add_items": [],
  "remove_items": [
  { "item": "Zeldas Lullaby", "types": ["goal"] }
  ],
@@ -39,38 +37,44 @@
  "vague_named_items": false,
  "use_default_goals": true,
  "distribution": {
- "trial": {"order": 1, "weight": 0.0, "fixed": 0, "copies": 2},
- "entrance_always": {"order": 2, "weight": 0.0, "fixed": 0, "copies": 2},
- "always": {"order": 3, "weight": 0.0, "fixed": 0, "copies": 2, "remove_stones": [
+ "trial": {"order": 1, "weight": 0.0, "fixed": 0, "copies": 0, "remove_stones": [
  "ToT (Left)",
  "ToT (Left-Center)",
  "ToT (Right-Center)",
  "ToT (Right)"
  ]},
- "goal":  {"order": 4, "weight": 0.0, "fixed": 6, "copies": 2, "remove_stones": [
+ "always": {"order": 2, "weight": 0.0, "fixed": 0, "copies": 2, "remove_stones": [
  "ToT (Left)",
  "ToT (Left-Center)",
  "ToT (Right-Center)",
  "ToT (Right)"
  ]},
- "barren": {"order": 5, "weight": 0.0, "fixed": 4, "copies": 1, "priority_stones": [
+ "goal":  {"order": 3, "weight": 0.0, "fixed": 6, "copies": 2, "remove_stones": [
  "ToT (Left)",
  "ToT (Left-Center)",
  "ToT (Right-Center)",
  "ToT (Right)"
  ]},
- "entrance": {"order": 6, "weight": 0.0, "fixed": 0, "copies": 2},
- "dual": {"order": 7, "weight": 0.0, "fixed": 2, "copies": 2},
- "sometimes": {"order": 8, "weight": 1.0, "fixed": 0, "copies": 2},
- "random": {"order": 0, "weight": 0.0, "fixed": 0, "copies": 2},
- "item": {"order": 0, "weight": 0.0, "fixed": 0, "copies": 2},
- "song": {"order": 0, "weight": 0.0, "fixed": 0, "copies": 2},
- "overworld": {"order": 0, "weight": 0.0, "fixed": 0, "copies": 2},
- "dungeon": {"order": 0, "weight": 0.0, "fixed": 0, "copies": 2},
- "junk": {"order": 0, "weight": 0.0, "fixed": 0, "copies": 2},
- "named-item": {"order": 0, "weight": 0.0, "fixed": 0, "copies": 2},
- "woth": {"order": 0, "weight": 0.0, "fixed": 0, "copies": 2},
- "dual_always": {"order": 0, "weight": 0.0, "fixed": 0, "copies": 2},
- "important_check": {"order": 0, "weight": 0.0, "fixed": 0, "copies": 2}
+ "barren": {"order": 4, "weight": 0.0, "fixed": 3, "copies": 1, "priority_stones": [
+ "ToT (Left)",
+ "ToT (Left-Center)",
+ "ToT (Right-Center)"
+ ]},
+ "named-item": {"order": 5, "weight": 0.0, "fixed": 1, "copies": 1, "priority_stones": [
+ "ToT (Right)"
+ ]},
+ "dual": {"order": 6, "weight": 0.0, "fixed": 2, "copies": 2},
+ "sometimes": {"order": 7, "weight": 0.0, "fixed": 5, "copies": 2},
+ "junk": {"order": 8, "weight": 1.0, "fixed": 0, "copies": 1},
+ "entrance_always": {"order": 0, "weight": 0.0, "fixed": 0, "copies": 0},
+ "woth": {"order": 0, "weight": 0.0, "fixed": 0, "copies": 0},
+ "entrance": {"order": 0, "weight": 0.0, "fixed": 0, "copies": 0},
+ "random": {"order": 0, "weight": 0.0, "fixed": 0, "copies": 0},
+ "item": {"order": 0, "weight": 0.0, "fixed": 0, "copies": 0},
+ "song": {"order": 0, "weight": 0.0, "fixed": 0, "copies": 0},
+ "overworld": {"order": 0, "weight": 0.0, "fixed": 0, "copies": 0},
+ "dungeon": {"order": 0, "weight": 0.0, "fixed": 0, "copies": 0},
+ "dual_always": {"order": 0, "weight": 0.0, "fixed": 0, "copies": 0},
+ "important_check": {"order": 0, "weight": 0.0, "fixed": 0, "copies": 0}
  }
 }

data/presets_default.json

@@ -3837,14 +3837,14 @@
  "Claim Check"
  ]
  },
- "Standard Weekly (2024-07-05)": {
+ "Standard Weekly (2024-08-23)": {
  "aliases": [
  "Standard Weekly (Latest)",
  "weekly"
  ],
  "language": "english",
  "show_seed_info": true,
- "user_message": "Standard Weekly (2024-07-05)",
+ "user_message": "Standard Weekly (2024-08-23)",
  "world_count": 1,
  "create_spoiler": true,
  "password_lock": false,
@@ -3888,7 +3888,7 @@
  "silver_rupee_pouches_choice": "off",
  "silver_rupee_pouches": [],
  "shuffle_mapcompass": "startwith",
- "enhance_map_compass": true,
+ "enhance_map_compass": false,
  "open_deku": false,
  "open_forest": true,
  "require_gohma": false,
@@ -3902,12 +3902,10 @@
  "mq_dungeons_mode": "vanilla",
  "mq_dungeons_specific": [],
  "mq_dungeons_count": 0,
- "empty_dungeons_mode": "rewards",
+ "empty_dungeons_mode": "none",
  "empty_dungeons_specific": [],
- "empty_dungeons_rewards": [
- "Kokiri Emerald"
- ],
- "empty_dungeons_count": 1,
+ "empty_dungeons_rewards": [],
+ "empty_dungeons_count": 2,
  "shuffle_interior_entrances": "off",
  "shuffle_hideout_entrances": "off",
  "shuffle_gerudo_fortress_heart_piece": "remove",
@@ -4006,7 +4004,7 @@
  "big_poe_count": 1,
  "easier_fire_arrow_entry": false,
  "fae_torch_count": 3,
- "ruto_already_f1_jabu": true,
+ "ruto_already_f1_jabu": false,
  "fast_shadow_boat": false,
  "ocarina_songs": [],
  "correct_chest_appearances": "both",

version.py

@@ -1,7 +1,7 @@
-__version__ = '8.1.76'
+__version__ = '8.1.78'
 
 # This is a supplemental version number for branches based off of main dev.
-supplementary_version = 4
+supplementary_version = 1
 
 # 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.