From fa1b93252cdac4968a231c8561880e139cd50e9f Mon Sep 17 00:00:00 2001 From: espeon65536 Date: Fri, 1 Oct 2021 09:20:40 -0500 Subject: [PATCH] OoT: place Deku Shields first in closed forest + shopsanity --- worlds/oot/__init__.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/worlds/oot/__init__.py b/worlds/oot/__init__.py index 6e9149e4..309913f8 100644 --- a/worlds/oot/__init__.py +++ b/worlds/oot/__init__.py @@ -641,7 +641,11 @@ class OOTWorld(World): shop_locations = list( filter(lambda location: location.type == 'Shop' and location.name not in self.shop_prices, self.world.get_unfilled_locations(player=self.player))) - shop_items.sort(key=lambda item: int(item.advancement)) # place progression shop items first + shop_items.sort(key=lambda item: { + 'Buy Deku Shield': 3*int(self.open_forest == 'closed'), + 'Buy Goron Tunic': 2, + 'Buy Zora Tunic': 2 + }.get(item.name, int(item.advancement))) # place Deku Shields if needed, then tunics, then other advancement, then junk self.world.random.shuffle(shop_locations) for item in shop_items: self.world.itempool.remove(item)