From a20a9e89e7ec4a7ad25951d767d6d1ab89777a6f Mon Sep 17 00:00:00 2001 From: CookieCat Date: Mon, 23 Oct 2023 22:30:06 -0400 Subject: [PATCH] more fixes --- worlds/ahit/Locations.py | 2 +- worlds/ahit/Options.py | 1 - worlds/ahit/Regions.py | 7 +++++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/worlds/ahit/Locations.py b/worlds/ahit/Locations.py index 7825b1fe2d..0a43bc1367 100644 --- a/worlds/ahit/Locations.py +++ b/worlds/ahit/Locations.py @@ -722,7 +722,7 @@ zero_jumps_expert = { misc_required=["No Bonk Badge"], dlc_flags=HatDLC.death_wish), - "Sleepy Subcon (Zero Jumps)": LocData(0, "Sleepy Subcon", required_hats=[HatType.ICE], dlc_flags=HatDLC.death_wish), + "Sleepy Subcon (Zero Jumps)": LocData(0, "Time Rift - Sleepy Subcon", required_hats=[HatType.ICE], dlc_flags=HatDLC.death_wish), "Ship Shape (Zero Jumps)": LocData(0, "Ship Shape", required_hats=[HatType.ICE], dlc_flags=HatDLC.dlc1_dw), } diff --git a/worlds/ahit/Options.py b/worlds/ahit/Options.py index 96c35c5fc7..863f940f0a 100644 --- a/worlds/ahit/Options.py +++ b/worlds/ahit/Options.py @@ -61,7 +61,6 @@ def adjust_options(world: World): world.multiworld.ShuffleActContracts[world.player].value = 0 world.multiworld.EnableDLC1[world.player].value = 0 world.multiworld.LogicDifficulty[world.player].value = -1 - world.multiworld.KnowledgeChecks[world.player].value = 0 world.multiworld.DWTimePieceRequirement[world.player].value = 0 diff --git a/worlds/ahit/Regions.py b/worlds/ahit/Regions.py index 0322f08e72..8534a38ec1 100644 --- a/worlds/ahit/Regions.py +++ b/worlds/ahit/Regions.py @@ -832,8 +832,11 @@ def get_shuffled_region(self, region: str) -> str: def create_thug_shops(world: World): - min_items: int = world.multiworld.NyakuzaThugMinShopItems[world.player].value - max_items: int = world.multiworld.NyakuzaThugMaxShopItems[world.player].value + min_items: int = min(world.multiworld.NyakuzaThugMinShopItems[world.player].value, + world.multiworld.NyakuzaThugMaxShopItems[world.player].value) + + max_items: int = max(world.multiworld.NyakuzaThugMaxShopItems[world.player].value, + world.multiworld.NyakuzaThugMinShopItems[world.player].value) count: int = -1 step: int = 0 old_name: str = ""