mirror/Archipelago
1
0
Fork 1
mirror of https://github.com/ArchipelagoMW/Archipelago.git synced 2026-03-25 02:53:21 -07:00
Code Issues Packages Projects Releases Wiki Activity

Move client to Launcher Components with rest of similar clients

Browse Source
This commit is contained in:
Carter Hesterman
2024-09-05 19:47:58 -06:00
parent dc1f56f847
commit f9fd5df9fd
3 changed files with 16 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
worlds/civ_6/Civ6Client.py → Civ6Client.py
View File

@@ -6,15 +6,15 @@ from typing import Dict, List
import zipfile
from CommonClient import ClientCommandProcessor, CommonContext, get_base_parser, logger, server_loop, gui_enabled
from .Data import get_progressive_districts_data
from .DeathLink import handle_check_deathlink
from worlds.civ_6.Data import get_progressive_districts_data
from worlds.civ_6.DeathLink import handle_check_deathlink
from NetUtils import ClientStatus
import Utils
from .CivVIInterface import CivVIInterface, ConnectionState
from .Enum import CivVICheckType
from .Items import CivVIItemData, generate_item_table, get_item_by_civ_name
from .Locations import generate_era_location_table
from .TunerClient import TunerErrorException, TunerTimeoutException
from worlds.civ_6.CivVIInterface import CivVIInterface, ConnectionState
from worlds.civ_6.Enum import CivVICheckType
from worlds.civ_6.Items import CivVIItemData, generate_item_table, get_item_by_civ_name
from worlds.civ_6.Locations import generate_era_location_table
from worlds.civ_6.TunerClient import TunerErrorException, TunerTimeoutException
class CivVICommandProcessor(ClientCommandProcessor):
@@ -336,3 +336,7 @@ def debug_main():
if args.debug:
logger.setLevel(logging.DEBUG)
main(args.connect, args.password, args.name)
if __name__ == '__main__':
main()

7
worlds/LauncherComponents.py
View File

@@ -191,8 +191,11 @@ components: List[Component] = [
Component('Zillion Client', 'ZillionClient',
file_identifier=SuffixIdentifier('.apzl')),
#MegaMan Battle Network 3
Component('MMBN3 Client', 'MMBN3Client', file_identifier=SuffixIdentifier('.apbn3'))
# MegaMan Battle Network 3
Component('MMBN3 Client', 'MMBN3Client', file_identifier=SuffixIdentifier('.apbn3')),
# Civilization 6
Component("Civilization VI Client", "Civ6Client", file_identifier=SuffixIdentifier(".apcivvi"))
]

13
worlds/civ_6/__init__.py
View File

@@ -13,19 +13,6 @@ from .Options import CivVIOptions
from .Regions import create_regions
from BaseClasses import Item, ItemClassification, MultiWorld, Tutorial
from worlds.AutoWorld import World, WebWorld
from worlds.LauncherComponents import Component, SuffixIdentifier, Type, components, launch_subprocess
def run_client(url: Optional[str] = None):
print("Running Civ6 Client")
from .Civ6Client import main # lazy import
launch_subprocess(main, name="Civ6Client")
components.append(
Component("Civ6 Client", func=run_client, component_type=Type.CLIENT,
file_identifier=SuffixIdentifier(".apcivvi"))
)
class CivVIWeb(WebWorld):