morgan/Grinch-AP
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix Factorio Recipe Time randomization not being deterministic

Browse Source
This commit is contained in:
Fabian Dill
2021-06-11 14:47:13 +02:00
parent 278f40471b
commit 760fb32016
5 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
worlds/alttp/Rom.py
View File

@@ -80,7 +80,7 @@ class LocalRom(object):
self.write_bytes(startaddress + i, bytearray(data))
def encrypt(self, world, player):
local_random = world.rom_seeds[player]
local_random = world.slot_seeds[player]
key = bytes(local_random.getrandbits(8 * 16).to_bytes(16, 'big'))
self.write_bytes(0x1800B0, bytearray(key))
self.write_int16(0x180087, 1)
@@ -384,7 +384,7 @@ def patch_enemizer(world, team: int, player: int, rom: LocalRom, enemizercli):
max_enemizer_tries = 5
for i in range(max_enemizer_tries):
enemizer_seed = str(world.rom_seeds[player].randint(0, 999999999))
enemizer_seed = str(world.slot_seeds[player].randint(0, 999999999))
enemizer_command = [os.path.abspath(enemizercli),
'--rom', randopatch_path,
'--seed', enemizer_seed,
@@ -414,7 +414,7 @@ def patch_enemizer(world, team: int, player: int, rom: LocalRom, enemizercli):
continue
for j in range(i + 1, max_enemizer_tries):
world.rom_seeds[player].randint(0, 999999999)
world.slot_seeds[player].randint(0, 999999999)
# Sacrifice all remaining random numbers that would have been used for unused enemizer tries.
# This allows for future enemizer bug fixes to NOT affect the rest of the seed's randomness
break
@@ -760,7 +760,7 @@ def get_nonnative_item_sprite(game):
return game_to_id.get(game, 0x6B) # default to Power Star
def patch_rom(world, rom, player, team, enemized):
local_random = world.rom_seeds[player]
local_random = world.slot_seeds[player]
# progressive bow silver arrow hint hack
prog_bow_locs = world.find_items('Progressive Bow', player)
@@ -1643,7 +1643,7 @@ def patch_rom(world, rom, player, team, enemized):
rom.write_byte(0xFEE41, 0x2A) # preopen bombable exit
if world.tile_shuffle[player]:
tile_set = TileSet.get_random_tile_set(world.rom_seeds[player])
tile_set = TileSet.get_random_tile_set(world.slot_seeds[player])
rom.write_byte(0x4BA21, tile_set.get_speed())
rom.write_byte(0x4BA1D, tile_set.get_len())
rom.write_bytes(0x4BA2A, tile_set.get_bytes())
@@ -1774,7 +1774,7 @@ def hud_format_text(text):
def apply_rom_settings(rom, beep, color, quickswap, fastmenu, disable_music, sprite: str, palettes_options,
world=None, player=1, allow_random_on_event=False, reduceflashing=False,
triforcehud: str = None):
local_random = random if not world else world.rom_seeds[player]
local_random = random if not world else world.slot_seeds[player]
# enable instant item menu
if fastmenu == 'instant':
@@ -2091,7 +2091,7 @@ def write_string_to_rom(rom, target, string):
def write_strings(rom, world, player, team):
local_random = world.rom_seeds[player]
local_random = world.slot_seeds[player]
tt = TextTable()
tt.removeUnwantedText()