morgan/Grinch-AP
1
0
Fork 0
mirror of https://github.com/MarioSpore/Grinch-AP.git synced 2025-10-21 20:21:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

Factorio/LttP: remove some things that were marked for removal

Browse Source
This commit is contained in:
Fabian Dill
2021-09-26 08:49:32 +02:00
parent 8b9e278593
commit 7f35f6f8f4
3 changed files with 1 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
FactorioClient.py
View File

@@ -99,13 +99,7 @@ class FactorioContext(CommonContext):
return f"AP_{self.seed_name}_{self.auth}.zip" return f"AP_{self.seed_name}_{self.auth}.zip"
def print_to_game(self, text): def print_to_game(self, text):
# TODO: remove around version 0.2 self.rcon_client.send_command(f"/ap-print [font=default-large-bold]Archipelago:[/font] "
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] "
f"{text}") f"{text}")
def on_package(self, cmd: str, args: dict): def on_package(self, cmd: str, args: dict):
@@ -194,10 +188,6 @@ async def factorio_server_watcher(ctx: FactorioContext):
factorio_server_logger.info(msg) factorio_server_logger.info(msg)
if not ctx.rcon_client and "Starting RCON interface at IP ADDR:" in 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) 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: if not ctx.server:
logger.info("Established bridge to Factorio Server. " logger.info("Established bridge to Factorio Server. "
"Ready to connect to Archipelago via /connect") "Ready to connect to Archipelago via /connect")

2
worlds/alttp/Options.py
View File

@@ -120,7 +120,6 @@ class Progressive(Choice):
alias_false = 0 alias_false = 0
alias_true = 2 alias_true = 2
default = 2 default = 2
alias_random = 1
def want_progressives(self, random): def want_progressives(self, random):
return random.choice([True, False]) if self.value == self.option_grouped_random else bool(self.value) 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_negative = 6
option_dizzy = 7 option_dizzy = 7
option_sick = 8 option_sick = 8
alias_random = 1
class OWPalette(Palette): class OWPalette(Palette):

1
worlds/factorio/Options.py
View File

@@ -108,7 +108,6 @@ class Progressive(Choice):
alias_false = 0 alias_false = 0
alias_true = 2 alias_true = 2
default = 2 default = 2
alias_random = 1
def want_progressives(self, random): def want_progressives(self, random):
return random.choice([True, False]) if self.value == self.option_grouped_random else bool(self.value) return random.choice([True, False]) if self.value == self.option_grouped_random else bool(self.value)