ED/EDMarketConnector
1
0
Fork 0
mirror of https://github.com/EDCD/EDMarketConnector.git synced 2025-06-12 13:22:54 +03:00
Code Issues Projects Releases Wiki Activity

Suits: Fully implement mapping to sane (English only for now) names

Browse Source
This commit is contained in:
Athanasius 2021-05-25 15:24:21 +01:00
parent f85213b318
commit dba3fba8e3
3 changed files with 28 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
EDMarketConnector.py
View File

@ -629,7 +629,7 @@ class AppWindow(object):
self.suit['text'] = f'<{_("Unknown")}>' self.suit['text'] = f'<{_("Unknown")}>'
return return
suitname = suit['locName'] suitname = suit['edmcName']
if (suitloadout := monitor.state.get('SuitLoadoutCurrent')) is None: if (suitloadout := monitor.state.get('SuitLoadoutCurrent')) is None:
self.suit['text'] = '' self.suit['text'] = ''
@ -927,7 +927,7 @@ class AppWindow(object):
if monitor.state.get('SuitCurrent') is not None: if monitor.state.get('SuitCurrent') is not None:
if (loadout := data.get('loadout')) is not None: if (loadout := data.get('loadout')) is not None:
if (suit := loadout.get('suit')) is not None: if (suit := loadout.get('suit')) is not None:
if (suitname := suit.get('locName')) is not None: if (suitname := suit.get('edmcName')) is not None:
# We've been paranoid about loadout->suit->suitname, now just assume loadouts is there # We've been paranoid about loadout->suit->suitname, now just assume loadouts is there
loadout_name = index_possibly_sparse_list( loadout_name = index_possibly_sparse_list(
data['loadouts'], loadout['loadoutSlotId'] data['loadouts'], loadout['loadoutSlotId']

15
edmc_data.py
View File

@ -495,3 +495,18 @@ ship_name_map = {
'viper_mkiv': 'Viper MkIV', 'viper_mkiv': 'Viper MkIV',
'vulture': 'Vulture', 'vulture': 'Vulture',
} }
# Odyssey Suit Names
edmc_suit_shortnames = {
'Artemis Suit': 'Artemis',
'Dominator Suit': 'Dominator',
'Flight Suit': 'Flight',
'Maverick Suit': 'Maverick',
}
edmc_suit_symbol_to_en = {
'explorationsuit': 'Artemis Suit',
'flightsuit': 'Flight Suit',
'tacticalsuit': 'Dominator Suit',
'utilitysuit': 'Maverick Suit',
}

12
monitor.py
View File

@ -19,6 +19,7 @@ if TYPE_CHECKING:
import util_ships import util_ships
from config import config from config import config
from edmc_data import edmc_suit_shortnames, edmc_suit_symbol_to_en
from EDMCLogging import get_main_logger from EDMCLogging import get_main_logger
logger = get_main_logger() logger = get_main_logger()
@ -1604,12 +1605,21 @@ class EDLogs(FileSystemEventHandler): # type: ignore # See below
""" """
# TODO: Localisation ? # TODO: Localisation ?
# Stage 1: Is it in `$<type>_Class<X>_Name;` form ? # Stage 1: Is it in `$<type>_Class<X>_Name;` form ?
if (m := re.fullmatch(r'^\$([^_]+)_Class([0-9]+)_Name$', name)): if m := re.fullmatch(r'^\$([^_]+)_Class([0-9]+)_Name;$', name):
n, c = m.group(1, 2) n, c = m.group(1, 2)
name = n name = n
# Stage 2: Is it in `<type>_class<x>` form ? # Stage 2: Is it in `<type>_class<x>` form ?
elif m := re.fullmatch(r'^([^_]+)_class([0-9]+)$', name):
n, c = m.group(1, 2)
name = n
# Now turn either of those into an English '<type> Suit' form
name = edmc_suit_symbol_to_en.get(name.lower(), name)
# Stage 3: Is it in verbose `<type> Suit` form ? # Stage 3: Is it in verbose `<type> Suit` form ?
name = edmc_suit_shortnames.get(name, name)
return name return name
def suitloadout_store_from_event(self, entry) -> Tuple[int, int]: def suitloadout_store_from_event(self, entry) -> Tuple[int, int]: