From ea745ff22e1d66a6386a40341cb0427af525a762 Mon Sep 17 00:00:00 2001 From: aerinon Date: Sat, 30 Apr 2022 15:28:29 -0600 Subject: [PATCH] Hotfix for paired doors Also made dashable filter work --- DoorShuffle.py | 6 ++++-- Main.py | 2 +- RELEASENOTES.md | 3 +++ Rom.py | 2 +- data/base2current.bps | Bin 93063 -> 93062 bytes 5 files changed, 9 insertions(+), 4 deletions(-) diff --git a/DoorShuffle.py b/DoorShuffle.py index 8dfcb726..0d36a2b0 100644 --- a/DoorShuffle.py +++ b/DoorShuffle.py @@ -1810,8 +1810,10 @@ ohko_forbidden = { def filter_dashable_candidates(candidates, world): - forbidden_set = dashable_forbidden if world.timer in ['ohko', 'timed-ohko'] else ohko_forbidden - return [x for x in candidates if x not in forbidden_set and x.dest not in forbidden_set] + forbidden_set = dashable_forbidden + if world.timer in ['ohko', 'timed-ohko']: + forbidden_set = ohko_forbidden.union(dashable_forbidden) + return [x for x in candidates if x.name not in forbidden_set and x.dest.name not in forbidden_set] def shuffle_bombable_dashable(bd_candidates, world, player): diff --git a/Main.py b/Main.py index 7421e8cb..ba55ad46 100644 --- a/Main.py +++ b/Main.py @@ -31,7 +31,7 @@ from Utils import output_path, parse_player_names from source.item.FillUtil import create_item_pool_config, massage_item_pool, district_item_pool_config from source.tools.BPS import create_bps_from_data -__version__ = '1.0.2.0-v' +__version__ = '1.0.2.1-v' from source.classes.BabelFish import BabelFish diff --git a/RELEASENOTES.md b/RELEASENOTES.md index 668c1c52..ebaf2919 100644 --- a/RELEASENOTES.md +++ b/RELEASENOTES.md @@ -157,6 +157,9 @@ Same as above but both small keys and bigs keys of the dungeon are not allowed o #### Volatile +* 1.0.2.1 + * Fix for paired doors + * Fix for forbidding certain dashable doors (it actually does something this time) * 1.0.2.0 * Updated baserom to bleeding edge * Pottery and enemy SRAM re-located to final destination diff --git a/Rom.py b/Rom.py index 554f3451..3819158a 100644 --- a/Rom.py +++ b/Rom.py @@ -37,7 +37,7 @@ from source.dungeon.RoomList import Room0127 JAP10HASH = '03a63945398191337e896e5771f77173' -RANDOMIZERBASEHASH = '8b87b7c4f37ab57463b93c5afd353299' +RANDOMIZERBASEHASH = '490b6fa137b3f76a76d4e4905ddfb34b' class JsonRom(object): diff --git a/data/base2current.bps b/data/base2current.bps index ecddb99bb1d1ae348ba05409d10987cebdec1886..0f751ab3d93517643c9682d32f5a16a11fcf30d6 100644 GIT binary patch delta 99 zcmV-p0G$7a*9C^x1+Y>93&k)33k3iH01i#@gIoc(Tmb-VfWJ)(p+EjX0h%(5B2tRCtu+DCH3+@zAaD<% Fl>qn>AnX7D delta 100 zcmV-q0Gt1Y*9C{y1+Y>93XL!V3k8U&HciQcT>-aU0RaLF3!S9`DFFY41Fx4ew`mLk zA1NgpH-I!?aFj64^Xx2!b*(lrRM|8FVs G6`PA*hazeK