diff --git a/MultiServer.py b/MultiServer.py index d946183c..2f313b3e 100644 --- a/MultiServer.py +++ b/MultiServer.py @@ -470,9 +470,6 @@ async def on_client_connected(ctx: Context, client: Client): # Name them by feature or fork, as you feel is appropriate. 'tags': ctx.tags, 'version': Utils.version_tuple, - # TODO ~0.2.0 remove forfeit_mode and remaining_mode in favor of permissions - 'forfeit_mode': ctx.forfeit_mode, - 'remaining_mode': ctx.remaining_mode, 'permissions': get_permissions(ctx), 'hint_cost': ctx.hint_cost, 'location_check_points': ctx.location_check_points, @@ -502,10 +499,6 @@ async def on_client_joined(ctx: Context, client: Client): f"{ctx.get_aliased_name(client.team, client.slot)} (Team #{client.team + 1}) " f"playing {ctx.games[client.slot]} has joined. " f"Client({version_str}), {client.tags}).") - # TODO: remove with 0.2 - if client.version < Version(0, 1, 7): - ctx.notify_client(client, - "Warning: Your client's datapackage handling may be unsupported soon. (Version < 0.1.7)") ctx.client_connection_timers[client.team, client.slot] = datetime.datetime.now(datetime.timezone.utc) diff --git a/Options.py b/Options.py index 682c44a6..71a6e6f3 100644 --- a/Options.py +++ b/Options.py @@ -139,10 +139,8 @@ class Choice(Option): @classmethod def from_text(cls, text: str) -> Choice: text = text.lower() - # TODO: turn on after most people have adjusted their yamls to no longer have suboptions with "random" in them - # maybe in 0.2? - # if text == "random": - # return cls(random.choice(list(cls.options.values()))) + if text == "random": + return cls(random.choice(list(cls.name_lookup))) for optionname, value in cls.options.items(): if optionname == text: return cls(value) diff --git a/worlds/__init__.py b/worlds/__init__.py index 61014a2b..f193a9f8 100644 --- a/worlds/__init__.py +++ b/worlds/__init__.py @@ -27,10 +27,6 @@ for world_name, world in AutoWorldRegister.world_types.items(): lookup_any_location_id_to_name.update(world.location_id_to_name) network_data_package = { - # Remove with 0.2.0 - "lookup_any_location_id_to_name": lookup_any_location_id_to_name, # legacy, to be removed - "lookup_any_item_id_to_name": lookup_any_item_id_to_name, # legacy, to be removed - "version": sum(world.data_version for world in AutoWorldRegister.world_types.values()), "games": games, } diff --git a/worlds/alttp/Options.py b/worlds/alttp/Options.py index d69bb0d2..64b07890 100644 --- a/worlds/alttp/Options.py +++ b/worlds/alttp/Options.py @@ -231,13 +231,6 @@ class HeartColor(Choice): option_green = 2 option_yellow = 3 - @classmethod - def from_text(cls, text: str) -> Choice: - # remove when this becomes a base Choice feature - if text == "random": - return cls(random.randint(0, 3)) - return super(HeartColor, cls).from_text(text) - class QuickSwap(DefaultOnToggle): displayname = "L/R Quickswapping"