From 7f35f6f8f45bd8f1c33636fc55964c5f82a93280 Mon Sep 17 00:00:00 2001
From: Fabian Dill <fabian.dill@web.de>
Date: Sun, 26 Sep 2021 08:49:32 +0200
Subject: [PATCH] Factorio/LttP: remove some things that were marked for
 removal

---
 FactorioClient.py          | 12 +-----------
 worlds/alttp/Options.py    |  2 --
 worlds/factorio/Options.py |  1 -
 3 files changed, 1 insertion(+), 14 deletions(-)

diff --git a/FactorioClient.py b/FactorioClient.py
index e7fd0d36..f64d6cdb 100644
--- a/FactorioClient.py
+++ b/FactorioClient.py
@@ -99,13 +99,7 @@ class FactorioContext(CommonContext):
         return f"AP_{self.seed_name}_{self.auth}.zip"
 
     def print_to_game(self, text):
-        # TODO: remove around version 0.2
-        if self.mod_version < Utils.Version(0, 1, 6):
-            text = text.replace('"', '')
-            self.rcon_client.send_command(f"/sc game.print(\"[font=default-large-bold]Archipelago:[/font] "
-                                          f"{text}\")")
-        else:
-            self.rcon_client.send_command(f"/ap-print [font=default-large-bold]Archipelago:[/font] "
+        self.rcon_client.send_command(f"/ap-print [font=default-large-bold]Archipelago:[/font] "
                                           f"{text}")
 
     def on_package(self, cmd: str, args: dict):
@@ -194,10 +188,6 @@ async def factorio_server_watcher(ctx: FactorioContext):
                 factorio_server_logger.info(msg)
                 if not ctx.rcon_client and "Starting RCON interface at IP ADDR:" in msg:
                     ctx.rcon_client = factorio_rcon.RCONClient("localhost", rcon_port, rcon_password)
-                    # TODO: remove around version 0.2
-                    if ctx.mod_version < Utils.Version(0, 1, 6):
-                        ctx.rcon_client.send_command("/sc game.print('Starting Archipelago Bridge')")
-                        ctx.rcon_client.send_command("/sc game.print('Starting Archipelago Bridge')")
                     if not ctx.server:
                         logger.info("Established bridge to Factorio Server. "
                                     "Ready to connect to Archipelago via /connect")
diff --git a/worlds/alttp/Options.py b/worlds/alttp/Options.py
index 22277625..d69bb0d2 100644
--- a/worlds/alttp/Options.py
+++ b/worlds/alttp/Options.py
@@ -120,7 +120,6 @@ class Progressive(Choice):
     alias_false = 0
     alias_true = 2
     default = 2
-    alias_random = 1
 
     def want_progressives(self, random):
         return random.choice([True, False]) if self.value == self.option_grouped_random else bool(self.value)
@@ -189,7 +188,6 @@ class Palette(Choice):
     option_negative = 6
     option_dizzy = 7
     option_sick = 8
-    alias_random = 1
 
 
 class OWPalette(Palette):
diff --git a/worlds/factorio/Options.py b/worlds/factorio/Options.py
index f4b51ca1..26618f3c 100644
--- a/worlds/factorio/Options.py
+++ b/worlds/factorio/Options.py
@@ -108,7 +108,6 @@ class Progressive(Choice):
     alias_false = 0
     alias_true = 2
     default = 2
-    alias_random = 1
 
     def want_progressives(self, random):
         return random.choice([True, False]) if self.value == self.option_grouped_random else bool(self.value)