Merged in DR v1.5.0

This commit is contained in:
codemann8
2025-12-03 10:53:30 -06:00
parent e48a4faf7c
commit f9a11484a9
3 changed files with 2 additions and 2 deletions

View File

@@ -969,7 +969,6 @@ def copy_world_premature(world, player, create_flute_exits=True):
ret.can_take_damage = world.can_take_damage ret.can_take_damage = world.can_take_damage
ret.difficulty_requirements = world.difficulty_requirements.copy() ret.difficulty_requirements = world.difficulty_requirements.copy()
ret.fix_fake_world = world.fix_fake_world.copy() ret.fix_fake_world = world.fix_fake_world.copy()
ret.lamps_needed_for_dark_rooms = world.lamps_needed_for_dark_rooms
ret.mapshuffle = world.mapshuffle.copy() ret.mapshuffle = world.mapshuffle.copy()
ret.compassshuffle = world.compassshuffle.copy() ret.compassshuffle = world.compassshuffle.copy()
ret.keyshuffle = world.keyshuffle.copy() ret.keyshuffle = world.keyshuffle.copy()
@@ -978,6 +977,7 @@ def copy_world_premature(world, player, create_flute_exits=True):
ret.bombbag = world.bombbag.copy() ret.bombbag = world.bombbag.copy()
ret.flute_mode = world.flute_mode.copy() ret.flute_mode = world.flute_mode.copy()
ret.bow_mode = world.bow_mode.copy() ret.bow_mode = world.bow_mode.copy()
ret.free_lamp_cone = world.free_lamp_cone.copy()
ret.crystals_needed_for_ganon = world.crystals_needed_for_ganon.copy() ret.crystals_needed_for_ganon = world.crystals_needed_for_ganon.copy()
ret.crystals_needed_for_gt = world.crystals_needed_for_gt.copy() ret.crystals_needed_for_gt = world.crystals_needed_for_gt.copy()
ret.crystals_ganon_orig = world.crystals_ganon_orig.copy() ret.crystals_ganon_orig = world.crystals_ganon_orig.copy()

2
Rom.py
View File

@@ -43,7 +43,7 @@ from source.enemizer.Enemizer import write_enemy_shuffle_settings
JAP10HASH = '03a63945398191337e896e5771f77173' JAP10HASH = '03a63945398191337e896e5771f77173'
RANDOMIZERBASEHASH = '59b577d7bbbde676a16f0ff779be9e58' RANDOMIZERBASEHASH = '5d9af807fe843aa8af4dd3fd0a539dd8'
class JsonRom(object): class JsonRom(object):

Binary file not shown.