Skip to content

Commit 726c1c5

Browse files
committed
Merge 'Add boss_goal_names hint distro option' (#2416)
2 parents 3c3b204 + 393b7d1 commit 726c1c5

10 files changed

Lines changed: 38585 additions & 38818 deletions

File tree

ASM/build/asm_symbols.txt

Lines changed: 742 additions & 742 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

ASM/build/bundle.o

-1.24 KB
Binary file not shown.

ASM/build/c_symbols.txt

Lines changed: 723 additions & 724 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
# Dev
2+
3+
* New hint distribution field `boss_goal_names` can be set to `false` to force dungeon reward names to be used for goal text instead of boss names even if dungeon rewards are on bosses.
4+
15
# 9.0
26

37
## New Settings and Options

Goals.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ def update_reachable_goals(self, starting_search: Search, full_search: Search) -
148148

149149
def replace_goal_names(worlds: list[World]) -> None:
150150
for world in worlds:
151-
if world.settings.shuffle_dungeon_rewards in ('vanilla', 'reward'):
151+
if world.hint_dist_user['boss_goal_names'] and world.settings.shuffle_dungeon_rewards in ('vanilla', 'reward'):
152152
bosses = [
153153
location
154154
for location in world.get_filled_locations()

World.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -183,6 +183,8 @@ def __init__(self, world_id: int, settings: Settings, resolve_randomized_setting
183183
self.hint_dist_user['upgrade_hints'] = 'off'
184184
if 'combine_trial_hints' not in self.hint_dist_user:
185185
self.hint_dist_user['combine_trial_hints'] = False
186+
if 'boss_goal_names' not in self.hint_dist_user:
187+
self.hint_dist_user['boss_goal_names'] = True
186188

187189
# Validate hint distribution format
188190
# Originally built when I was just adding the type distributions

data/generated/patch_symbols.json

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)