From f9a11484a93c0fca14144e8be6857e4a5b804f48 Mon Sep 17 00:00:00 2001 From: codemann8 Date: Wed, 3 Dec 2025 10:53:30 -0600 Subject: [PATCH] Merged in DR v1.5.0 --- Main.py | 2 +- Rom.py | 2 +- data/base2current.bps | Bin 138591 -> 138568 bytes 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Main.py b/Main.py index bc2d4eb3..a25f6bc0 100644 --- a/Main.py +++ b/Main.py @@ -969,7 +969,6 @@ def copy_world_premature(world, player, create_flute_exits=True): ret.can_take_damage = world.can_take_damage ret.difficulty_requirements = world.difficulty_requirements.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.compassshuffle = world.compassshuffle.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.flute_mode = world.flute_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_gt = world.crystals_needed_for_gt.copy() ret.crystals_ganon_orig = world.crystals_ganon_orig.copy() diff --git a/Rom.py b/Rom.py index f4ffb56e..673bafd8 100644 --- a/Rom.py +++ b/Rom.py @@ -43,7 +43,7 @@ from source.enemizer.Enemizer import write_enemy_shuffle_settings JAP10HASH = '03a63945398191337e896e5771f77173' -RANDOMIZERBASEHASH = '59b577d7bbbde676a16f0ff779be9e58' +RANDOMIZERBASEHASH = '5d9af807fe843aa8af4dd3fd0a539dd8' class JsonRom(object): diff --git a/data/base2current.bps b/data/base2current.bps index 5dc37ae738ded32dfe265d76ebed9716e9ee0e4d..aad0f7ece26cb5d4ca243fb61cb91a85b6ef972c 100644 GIT binary patch delta 2116 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