monorail
/
Archipelago
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove remaining ALTTP import from CommonClient.py and fix /missing in FactorioClient.py

This commit is contained in:
Fabian Dill 2021-07-12 20:07:02 +02:00
parent 14cadbf80d
commit b0c1a7acce
3 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
CommonClient.py
View File

@ -14,8 +14,7 @@ from Utils import Version
# logging note: # logging note:
# logging.* gets send to only the text console, logger.* gets send to the WebUI as well, if it's initialized. # logging.* gets send to only the text console, logger.* gets send to the WebUI as well, if it's initialized.
from worlds import network_data_package from worlds import network_data_package, AutoWorldRegister
from worlds.alttp import Items, Regions
logger = logging.getLogger("Client") logger = logging.getLogger("Client")
@ -54,7 +53,7 @@ class ClientCommandProcessor(CommandProcessor):
"""List all missing location checks, from your local game state""" """List all missing location checks, from your local game state"""
count = 0 count = 0
checked_count = 0 checked_count = 0
for location, location_id in Regions.lookup_name_to_id.items(): for location, location_id in AutoWorldRegister.world_types[self.ctx.game].item_name_to_id.items():
if location_id < 0: if location_id < 0:
continue continue
if location_id not in self.ctx.locations_checked: if location_id not in self.ctx.locations_checked:
@ -92,6 +91,8 @@ class CommonContext():
starting_reconnect_delay = 5 starting_reconnect_delay = 5
current_reconnect_delay = starting_reconnect_delay current_reconnect_delay = starting_reconnect_delay
command_processor = ClientCommandProcessor command_processor = ClientCommandProcessor
game: None
def __init__(self, server_address, password, found_items: bool): def __init__(self, server_address, password, found_items: bool):
# server state # server state
self.server_address = server_address self.server_address = server_address

1
FactorioClient.py
View File

@ -64,6 +64,7 @@ class FactorioCommandProcessor(ClientCommandProcessor):
class FactorioContext(CommonContext): class FactorioContext(CommonContext):
command_processor = FactorioCommandProcessor command_processor = FactorioCommandProcessor
game = "Factorio"
def __init__(self, *args, **kwargs): def __init__(self, *args, **kwargs):
super(FactorioContext, self).__init__(*args, **kwargs) super(FactorioContext, self).__init__(*args, **kwargs)

2
LttPClient.py
View File

@ -57,6 +57,8 @@ class LttPCommandProcessor(ClientCommandProcessor):
class Context(CommonContext): class Context(CommonContext):
command_processor = LttPCommandProcessor command_processor = LttPCommandProcessor
game = "A Link to the Past"
def __init__(self, snes_address, server_address, password, found_items): def __init__(self, snes_address, server_address, password, found_items):
super(Context, self).__init__(server_address, password, found_items) super(Context, self).__init__(server_address, password, found_items)