Merge 'Fix songs as items to only depend on settings' (#2478)

fenhl · fenhl · commit 2c6cd9860b7c · 2025-11-16T13:06:46.000Z
diff --git a/Patches.py b/Patches.py
@@ -448,7 +448,7 @@ def make_bytes(txt: str, size: int) -> list[int]:
         world.settings.shuffle_song_items != 'song'
         or world.distribution.songs_as_items
         or any(name in song_list and record.count for name, record in world.settings.starting_items.items())
-        or any(name in song_list and count for name, count in world.randomized_starting_items.items())
+        or (world.settings.random_starting_items_count > 0 and 'songs' not in world.settings.random_starting_items_exclude)
         or world.settings.shuffle_individual_ocarina_notes
     )
     if songs_as_items:
diff --git a/version.py b/version.py
@@ -1,4 +1,4 @@
-__version__ = '8.3.57'
+__version__ = '8.3.58'
 
 # This is a supplemental version number for branches based off of main dev.
 supplementary_version = 0

Original file line number	Diff line number	Diff line change
`@@ -448,7 +448,7 @@ def make_bytes(txt: str, size: int) -> list[int]:`
`448`	`448`	`world.settings.shuffle_song_items != 'song'`
`449`	`449`	`or world.distribution.songs_as_items`
`450`	`450`	`or any(name in song_list and record.count for name, record in world.settings.starting_items.items())`
`451`		`- or any(name in song_list and count for name, count in world.randomized_starting_items.items())`
	`451`	`+ or (world.settings.random_starting_items_count > 0 and 'songs' not in world.settings.random_starting_items_exclude)`
`452`	`452`	`or world.settings.shuffle_individual_ocarina_notes`
`453`	`453`	`)`
`454`	`454`	`if songs_as_items:`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-__version__ = '8.3.57'`
	`1`	`+__version__ = '8.3.58'`
`2`	`2`
`3`	`3`	`# This is a supplemental version number for branches based off of main dev.`
`4`	`4`	`supplementary_version = 0`