fix: prevent big key door modification while door shuffle is vanilla

CHANGELOG.md

@@ -7,6 +7,21 @@
 
 Changelog archive
 
+* 1.4.8.1
+  - Fixed broken doors generation
+  - Fixed bomb/arrow upgrade ignoring custom pricing
+  - Extended `money_balance` to apply to price balancing for non-custom shops.
+* 1.4.8
+  - New option: Mirror Scroll - to add the item to the starting inventory in non-doors modes (Thanks Telethar!)
+  - Customizer: Ability to customize shop prices and control money balancing. `money_balance` is a percentage betwen 0 and 100 that attempts to ensure you have that much percentage of money available for purchases. (100 is default, 0 essentially ignores money considerations)
+  - Fixed a key logic bug with decoupled doors when a big key door leads to a small key door (the small key door was missing appropriate logic)
+  - Fixed an ER bug where Bonk Fairy could be used for a mandatory connector in standard mode (boots could allow escape to be skipped)
+  - Fixed an issue with flute activation in rain mode. (thanks Codemann!)
+  - Fixed an issue with enemies in TR Dark Ride room not requiring Somaria. (Refactored the room for decoupled logic better)
+  - More HMG fixes by Muffins
+  - Fixed an issue with multi-player HMG
+  - Fixed an issue limiting number of items specified in the item pool on the GUI
+  - Minor documentation fixes (thanks Codemann!)
 * 1.4.7.2
   - Fixed an issue with shuffle_ganon/fix_gtower_exit causing a generation failure
   - More HMG fixes by Muffins

Main.py

@@ -38,7 +38,7 @@ from source.enemizer.DamageTables import DamageTable
 from source.enemizer.Enemizer import randomize_enemies
 from source.rom.DataTables import init_data_tables
 
-version_number = '1.4.8.1'
+version_number = '1.4.9'
 version_branch = '-u'
 __version__ = f'{version_number}{version_branch}'
 

RELEASENOTES.md

@@ -1,17 +1,6 @@
 # Patch Notes
 
-* 1.4.8.1
-  - Fixed broken doors generation
-  - Fixed bomb/arrow upgrade ignoring custom pricing
-  - Extended `money_balance` to apply to price balancing for non-custom shops.
-* 1.4.8
-  - New option: Mirror Scroll - to add the item to the starting inventory in non-doors modes (Thanks Telethar!)
-  - Customizer: Ability to customize shop prices and control money balancing. `money_balance` is a percentage betwen 0 and 100 that attempts to ensure you have that much percentage of money available for purchases. (100 is default, 0 essentially ignores money considerations) 
-  - Fixed a key logic bug with decoupled doors when a big key door leads to a small key door (the small key door was missing appropriate logic)
-  - Fixed an ER bug where Bonk Fairy could be used for a mandatory connector in standard mode (boots could allow escape to be skipped)
-  - Fixed an issue with flute activation in rain mode. (thanks Codemann!)
-  - Fixed an issue with enemies in TR Dark Ride room not requiring Somaria. (Refactored the room for decoupled logic better)
-  - More HMG fixes by Muffins
-  - Fixed an issue with multi-player HMG
-  - Fixed an issue limiting number of items specified in the item pool on the GUI
-  - Minor documentation fixes (thanks Codemann!)
+* 1.4.9
+  * Mirror scroll will show up on file start screen if enabled (thanks Clearmouse!)
+  * Fixes for HMG by Muffins
+  * Vanilla door shuffle prevents big key doors changes from door_type_mode

Rom.py

@@ -583,7 +583,7 @@ def patch_rom(world, rom, player, team, is_mystery=False):
     dr_flags |= DROptions.DarkWorld_Spawns  # no longer experimental
     if world.logic[player] not in ['owglitches', 'hybridglitches', 'nologic']:
         dr_flags |= DROptions.Fix_EG
-    if world.door_type_mode[player] in ['big', 'all', 'chaos']:
+    if world.door_type_mode[player] in ['big', 'all', 'chaos'] and world.doorShuffle[player] != 'vanilla':
         dr_flags |= DROptions.BigKeyDoor_Shuffle
     if world.dropshuffle[player] in ['underworld']:
         dr_flags |= DROptions.EnemyDropIndicator