From 739b563bc2b0923df13eb63ad29dce0192c0b0b1 Mon Sep 17 00:00:00 2001 From: Fabian Dill Date: Sun, 27 Jun 2021 00:23:42 +0200 Subject: [PATCH] Move required Client Version to AutoWorld --- Main.py | 5 +---- worlds/AutoWorld.py | 3 +++ worlds/factorio/__init__.py | 3 +++ 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/Main.py b/Main.py index c237cf6a..acdabdc8 100644 --- a/Main.py +++ b/Main.py @@ -497,10 +497,7 @@ def main(args, seed=None): minimum_versions = {"server": (0, 1, 1), "clients": client_versions} games = {} for slot in world.player_ids: - if world.game[slot] == "Factorio": - client_versions[slot] = (0, 1, 2) - else: - client_versions[slot] = (0, 0, 3) + client_versions[slot] = world.worlds[slot].get_required_client_version() games[slot] = world.game[slot] connect_names = {base64.b64encode(rom_name).decode(): (team, slot) for slot, team, rom_name in rom_names} diff --git a/worlds/AutoWorld.py b/worlds/AutoWorld.py index 8f94d257..9b649bfa 100644 --- a/worlds/AutoWorld.py +++ b/worlds/AutoWorld.py @@ -45,3 +45,6 @@ class World(metaclass=AutoWorldRegister): def generate_output(self): pass + + def get_required_client_version(self) -> tuple: + return 0, 0, 3 diff --git a/worlds/factorio/__init__.py b/worlds/factorio/__init__.py index 8ca0a51c..9b71bb3b 100644 --- a/worlds/factorio/__init__.py +++ b/worlds/factorio/__init__.py @@ -80,6 +80,9 @@ class Factorio(World): world.completion_condition[player] = lambda state: state.has('Victory', player) + def get_required_client_version(self) -> tuple: + return max((0, 1, 4), super(Factorio, self).get_required_client_version()) + options = factorio_options def set_custom_technologies(world: MultiWorld, player: int):