From ec0a5df5a14267b2c13c7b5fc7595918c76292c4 Mon Sep 17 00:00:00 2001 From: espeon65536 Date: Mon, 20 Sep 2021 15:58:13 -0500 Subject: [PATCH] give Song from Impa and ZL as starting items if skip_child_zelda is on --- worlds/oot/__init__.py | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/worlds/oot/__init__.py b/worlds/oot/__init__.py index 903dd1ef..ae22d603 100644 --- a/worlds/oot/__init__.py +++ b/worlds/oot/__init__.py @@ -650,12 +650,16 @@ class OOTWorld(World): # If skip child zelda is active and Song from Impa is unfilled, put a local giveable item into it. impa = self.world.get_location("Song from Impa", self.player) - if self.skip_child_zelda and impa.item is None: - from .SaveContext import SaveContext - item_to_place = self.world.random.choice(list(item for item in self.world.itempool if - item.player == self.player and item.name in SaveContext.giveable_items)) - impa.place_locked_item(item_to_place) - self.world.itempool.remove(item_to_place) + if self.skip_child_zelda: + if impa.item is None: + from .SaveContext import SaveContext + item_to_place = self.world.random.choice(list(item for item in self.world.itempool if + item.player == self.player and item.name in SaveContext.giveable_items)) + impa.place_locked_item(item_to_place) + self.world.itempool.remove(item_to_place) + # Give items to startinventory + self.world.push_precollected(impa.item) + self.world.push_precollected(self.create_item("Zeldas Letter")) # Exclude locations in Ganon's Castle proportional to the number of items required to make the bridge # Check for dungeon ER later