diff --git a/CHANGELOG.md b/CHANGELOG.md index d3c0de79..94736e42 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,10 @@ # Changelog +### 0.1.7.2 +- Fixed music algorithm to play correct track in OW Shuffle +- Removed convenient portal on WDM in OW Layout Shuffle +- Fixed Mystery to not spoil OW Shuffle in filename + ### 0.1.7.1 - Improved bomb logic to consider tree pulls, bush crabs, and stun prize - Fixed Mystery to use new updated OW mode terminology diff --git a/Main.py b/Main.py index 715b0ace..007595de 100644 --- a/Main.py +++ b/Main.py @@ -261,7 +261,7 @@ def main(args, seed=None, fish=None): customize_shops(world, player) balance_money_progression(world) - if world.owShuffle[1] != 'vanilla' or world.owSwap[1] != 'vanilla': + if world.owShuffle[1] != 'vanilla' or world.owSwap[1] != 'vanilla' or world.seed.startsWith('M'): outfilebase = f'OR_{args.outputname if args.outputname else world.seed}' else: outfilebase = f'DR_{args.outputname if args.outputname else world.seed}' diff --git a/OverworldShuffle.py b/OverworldShuffle.py index 65c3effb..612a5f7e 100644 --- a/OverworldShuffle.py +++ b/OverworldShuffle.py @@ -2,7 +2,7 @@ import RaceRandom as random, logging, copy from BaseClasses import OWEdge, WorldType, RegionType, Direction, Terrain, PolSlot from OWEdges import OWTileRegions, OWTileGroups, OWEdgeGroups, OpenStd, parallel_links, IsParallel -__version__ = '0.1.7.1-u' +__version__ = '0.1.7.2-u' def link_overworld(world, player): # setup mandatory connections diff --git a/Rom.py b/Rom.py index aea11ce7..cab4cc48 100644 --- a/Rom.py +++ b/Rom.py @@ -31,7 +31,7 @@ from OverworldShuffle import default_flute_connections, flute_data JAP10HASH = '03a63945398191337e896e5771f77173' -RANDOMIZERBASEHASH = '5ed6e672720482d3448a25b07f5fa92b' +RANDOMIZERBASEHASH = 'b71ccf874145fd21bf215b4b553e26ad' class JsonRom(object): @@ -639,12 +639,12 @@ def patch_rom(world, rom, player, team, enemized, is_mystery=False): rom.write_byte(0x18004C, 0x01) # patch for allowing Frogsmith to enter multi-entrance caves # patches map data specific for OW Shuffle - inverted_buffer[0x03] = inverted_buffer[0x03] | 0x2 # convenient portal on WDM + #inverted_buffer[0x03] = inverted_buffer[0x03] | 0x2 # convenient portal on WDM inverted_buffer[0x1A] = inverted_buffer[0x1A] | 0x2 # rocks added to prevent OWG hardlock inverted_buffer[0x1B] = inverted_buffer[0x1B] | 0x2 # rocks added to prevent OWG hardlock inverted_buffer[0x22] = inverted_buffer[0x22] | 0x2 # rocks added to prevent OWG hardlock inverted_buffer[0x3F] = inverted_buffer[0x3F] | 0x2 # added C to terrain - inverted_buffer[0x43] = inverted_buffer[0x43] | 0x2 # convenient portal on WDDM + #inverted_buffer[0x43] = inverted_buffer[0x43] | 0x2 # convenient portal on WDDM inverted_buffer[0x5A] = inverted_buffer[0x5A] | 0x2 # rocks added to prevent OWG hardlock inverted_buffer[0x5B] = inverted_buffer[0x5B] | 0x2 # rocks added to prevent OWG hardlock inverted_buffer[0x62] = inverted_buffer[0x62] | 0x2 # rocks added to prevent OWG hardlock diff --git a/data/base2current.bps b/data/base2current.bps index abfc0e3e..290c3057 100644 Binary files a/data/base2current.bps and b/data/base2current.bps differ