monorail
/
Archipelago
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update maseya z3pr handling to latest version

This commit is contained in:
Fabian Dill 2020-08-30 15:57:26 +02:00
parent fadf073acd
commit 1f12c60cc2
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Rom.py
View File

@ -29,6 +29,7 @@ import Patch
try: try:
from maseya import z3pr from maseya import z3pr
from maseya.z3pr.palette_randomizer import build_offsets_array
except: except:
z3pr = None z3pr = None
@ -1510,14 +1511,16 @@ def apply_rom_settings(rom, beep, color, quickswap, fastmenu, disable_music, spr
"randomize_overworld": ow_palettes == 'random' "randomize_overworld": ow_palettes == 'random'
} }
if any(options.values()): if any(options.values()):
data_dir = local_path("data") if is_bundled() else None
offsets_array = build_offsets_array(options, data_dir)
ColorF = z3pr.ColorF ColorF = z3pr.ColorF
data_dir = local_path("data") if is_bundled() else None def next_color_generator():
while True:
yield ColorF(local_random.random(), local_random.random(), local_random.random())
def next_color(): z3pr.randomize(rom.buffer, "maseya", offsets_iterator=offsets_array, color_generator=next_color_generator())
return ColorF(local_random.random(), local_random.random(), local_random.random())
z3pr.randomize(rom.buffer, "maseya", next_color, options, data_dir)
else: else:
logging.warning("Could not find z3pr palette shuffle. " logging.warning("Could not find z3pr palette shuffle. "
"If you want improved palette shuffling please install the maseya-z3pr package.") "If you want improved palette shuffling please install the maseya-z3pr package.")