From e0479922ccb11fe6eb3f76961b767489e0bafb24 Mon Sep 17 00:00:00 2001 From: aerinon Date: Tue, 1 Jun 2021 14:52:23 -0600 Subject: [PATCH] Msu minor fix Bosses simple fix Boss shuffle mystery fix --- Bosses.py | 2 +- Main.py | 2 +- Mystery.py | 6 +++--- RELEASENOTES.md | 6 ++++++ Rom.py | 2 +- data/base2current.bps | Bin 133024 -> 133035 bytes 6 files changed, 12 insertions(+), 6 deletions(-) diff --git a/Bosses.py b/Bosses.py index c1f311ef..ebf8b4dd 100644 --- a/Bosses.py +++ b/Bosses.py @@ -174,7 +174,7 @@ def place_bosses(world, player): boss_locations.remove(['Ice Palace', None]) placeable_bosses.remove('Kholdstare') - if world.boss_shuffle[player] == "basic": # vanilla bosses shuffled + if world.boss_shuffle[player] == "simple": # vanilla bosses shuffled bosses = placeable_bosses + ['Armos Knights', 'Lanmolas', 'Moldorm'] else: # all bosses present, the three duplicates chosen at random bosses = all_bosses + [random.choice(placeable_bosses) for _ in range(3)] diff --git a/Main.py b/Main.py index a64e317f..919ba67f 100644 --- a/Main.py +++ b/Main.py @@ -27,7 +27,7 @@ from Fill import sell_potions, sell_keys, balance_multiworld_progression, balanc from ItemList import generate_itempool, difficulties, fill_prizes, customize_shops from Utils import output_path, parse_player_names -__version__ = '0.4.0.4-u' +__version__ = '0.4.0.5-u' class EnemizerError(RuntimeError): diff --git a/Mystery.py b/Mystery.py index e9d438de..271e8194 100644 --- a/Mystery.py +++ b/Mystery.py @@ -187,9 +187,9 @@ def roll_settings(weights): ret.item_functionality = get_choice('item_functionality') - old_style_bosses = {'simple': 'basic', - 'full': 'normal', - 'random': 'chaos'} + old_style_bosses = {'basic': 'simple', + 'normal': 'full', + 'chaos': 'random'} boss_choice = get_choice('boss_shuffle') if boss_choice in old_style_bosses.keys(): boss_choice = old_style_bosses[boss_choice] diff --git a/RELEASENOTES.md b/RELEASENOTES.md index 6bbab2ce..5f392a15 100644 --- a/RELEASENOTES.md +++ b/RELEASENOTES.md @@ -10,6 +10,12 @@ Thanks to qadan, cheuer, & compiling # Bug Fixes and Notes. +* 0.4.0.5 + * Insanity - less restrictions on exiting (all modes) + * Fix for simple bosses shuffle + * Fix for boss shuffle from Mystery.py + * Minor msu fade out bug (thanks codemann8) + * Other bug fixes (thanks Catobat) * 0.4.0.4 * Added --shufflelinks option * Moved spawning as a bunny indoors to experimental diff --git a/Rom.py b/Rom.py index 3dab4c8e..02310146 100644 --- a/Rom.py +++ b/Rom.py @@ -27,7 +27,7 @@ from EntranceShuffle import door_addresses, exit_ids JAP10HASH = '03a63945398191337e896e5771f77173' -RANDOMIZERBASEHASH = '32b289d8294deba1603c75bb1321d3da' +RANDOMIZERBASEHASH = 'f8f1b851b091d50af2b87283ea79ed90' class JsonRom(object): diff --git a/data/base2current.bps b/data/base2current.bps index abda4b8c6894e42f2fc35fa6a2747920bfa7c6b9..97c703b32d372808a204f8aa3af275183f0d3004 100644 GIT binary patch delta 1486 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 TzwtRD0wtQ={^LL2G|T@3cS~B+