Merge 'Include random starting items in effective starting items' (#2575)

Author: fenhl

CHANGELOG.md

@@ -4,6 +4,7 @@
 * Fix a visual bug where ice traps appear very large if Link is wearing the Bunny Hood or hovering using the Hover Boots.
 * Fix a vanilla bug where the player can become unable to move when the Hookshot is pulled but fails to load.
 * Fix a bug where the item on the `Song from Saria` location could be obtained multiple times by savewarping on the first frame after obtaining it, then returning to the location.
+* Fix a generator failure when a dungeon reward is selected as a random starting item and the Temple of Time altar is set to hint dungeon reward locations.
 
 # 9.1
 

Hints.py

@@ -1834,10 +1834,7 @@ def build_misc_item_hints(world: World, messages: list[Message], allow_duplicate
     for hint_type, data in misc_item_hint_table.items():
         if hint_type in world.settings.misc_hints:
             item = world.misc_hint_items[hint_type]
-            if (
-                (item in world.distribution.effective_starting_items and world.distribution.effective_starting_items[item].count > 0) or
-                (item in world.distribution.randomized_starting_items and world.distribution.randomized_starting_items[item] > 0)
-            ):
+            if item in world.distribution.effective_starting_items and world.distribution.effective_starting_items[item].count > 0:
                 if item == data['default_item']:
                     text = data['default_item_text'].format(area='#your pocket#')
                 else:

ItemPool.py

@@ -1043,7 +1043,6 @@ def get_pool_core(world: World) -> tuple[list[str], dict[str, Item]]:
         world.randomized_starting_items[selected_item] = world.randomized_starting_items.get(selected_item, 0) + 1
         pool.remove(selected_item)
         pool.extend(get_junk_item())
-    add_random_starting_items_ammo(world.randomized_starting_items)
     for item, count in world.randomized_starting_items.items():
         if item in REWARD_COLORS and count > 0:
             world.hinted_dungeon_reward_locations[item] = None
@@ -1136,10 +1135,3 @@ def configure_random_starting_items_pool(world: World, pool: list[str]) -> list[
         exclude_list.extend(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
-
-
-def add_random_starting_items_ammo(randomized_starting_items: dict[str, int]) -> None:
-    for item in StartingItems.inventory.values():
-        if item.item_name in randomized_starting_items and item.ammo:
-            for ammo, qty in item.ammo.items():
-                randomized_starting_items[ammo] = qty[randomized_starting_items[item.item_name] - 1]

Patches.py

@@ -2000,7 +2000,6 @@ def update_scrub_text(message: bytearray, text_replacement: list[str], default_p
 
     # actually write the save table to rom
     world.distribution.give_items(world, save_context)
-    world.distribution.give_randomized_items(world, save_context)
     if world.settings.starting_age == 'adult':
         # When starting as adult, the pedestal doesn't handle child default equips when going back child the first time, so we have to equip them ourselves
         save_context.equip_default_items('child')

Plandomizer.py

@@ -1050,10 +1050,6 @@ def give_items(self, world: World, save_context: SaveContext) -> None:
                 continue
             save_context.give_item(world, name, record.count)
 
-    def give_randomized_items(self, world: World, save_context: SaveContext) -> None:
-        for item, count in world.randomized_starting_items.items():
-            save_context.give_item(world, item, count)
-
     def get_starting_item(self, item: str) -> int:
         items = self.starting_items
         if item in items:
@@ -1082,6 +1078,9 @@ def starting_items(self) -> dict[str, StarterRecord]:
     def configure_effective_starting_items(self, worlds: list[World], world: World) -> None:
         items = {item_name: record.copy() for item_name, record in self.starting_items.items()}
 
+        for item, count in world.randomized_starting_items.items():
+            add_starting_item_with_ammo(items, item, count)
+
         if world.settings.start_with_rupees:
             add_starting_item_with_ammo(items, 'Rupees', 999)
         if world.settings.start_with_consumables:

version.py

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