From e094a93e49387524050f607a8fdcfb82e551ed44 Mon Sep 17 00:00:00 2001 From: CaitSith2 Date: Mon, 15 Mar 2021 07:30:17 -0700 Subject: [PATCH] random.Random('') produces same results every single time. prevent race cheating by players using "shuffletype-", where the seed field on the other side is blank. --- Main.py | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/Main.py b/Main.py index e6ddce2f..ac048f17 100644 --- a/Main.py +++ b/Main.py @@ -116,15 +116,11 @@ def main(args, seed=None): world.shuffle[player] = shuffle if shuffle == "vanilla": world.er_seeds[player] = "vanilla" - elif seed.startswith("group-"): # renamed from team to group to not confuse with existing team name use + elif seed.startswith("group-") or seed.startswith("team-") or args.race: + # renamed from team to group to not confuse with existing team name use + # TODO: remove "team-" on breaking_changes world.er_seeds[player] = get_same_seed(world, (shuffle, seed, world.retro[player], world.mode[player], world.logic[player])) - elif seed.startswith("team-"): # TODO: remove on breaking_changes - world.er_seeds[player] = get_same_seed(world, (shuffle, seed, world.retro[player], world.mode[player], world.logic[player])) - elif not args.race: - world.er_seeds[player] = seed - elif seed: # race but with a set seed, ignore set seed and use group logic instead - world.er_seeds[player] = get_same_seed(world, (shuffle, seed, world.retro[player], world.mode[player], world.logic[player])) - else: # race but without a set seed + else: # not a race or group seed, use set seed as is. world.er_seeds[player] = seed elif world.shuffle[player] == "vanilla": world.er_seeds[player] = "vanilla"