From c48fe4cdfbde1007615ffa26088d1e8cacbe6531 Mon Sep 17 00:00:00 2001 From: Athanasius Date: Thu, 27 May 2021 17:28:52 +0100 Subject: [PATCH 1/2] Suits: Set edmcName in CurrentSuit from CAPI, and ensure displayed --- EDMarketConnector.py | 2 ++ companion.py | 3 +++ 2 files changed, 5 insertions(+) diff --git a/EDMarketConnector.py b/EDMarketConnector.py index 5e0a0f4c..ed4f829c 100755 --- a/EDMarketConnector.py +++ b/EDMarketConnector.py @@ -983,6 +983,8 @@ class AppWindow(object): if play_sound and play_bad: hotkeymgr.play_bad() + self.update_suit_text() + self.suit_show_if_set() self.cooldown() def journal_event(self, event): # noqa: C901, CCR001 # Currently not easily broken up. diff --git a/companion.py b/companion.py index 953e5fb4..72dafc70 100644 --- a/companion.py +++ b/companion.py @@ -688,6 +688,9 @@ class Session(object): else: monitor.state['Suits'] = suits + # We need to be setting our edmcName for all suits + monitor.state['SuitCurrent']['edmcName'] = monitor.suit_sane_name(monitor.state['SuitCurrent']['locName']) + if (suit_loadouts := data.get('loadouts')) is None: logger.warning('CAPI data had "suit" but no (suit) "loadouts"') From 72242764fdea7cf38d65327d73e5321ae7a4f622 Mon Sep 17 00:00:00 2001 From: Athanasius Date: Thu, 27 May 2021 17:33:56 +0100 Subject: [PATCH 2/2] Suits: Set edmcName on CAPI data for all suits. --- companion.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/companion.py b/companion.py index 72dafc70..fd56a4de 100644 --- a/companion.py +++ b/companion.py @@ -689,7 +689,11 @@ class Session(object): monitor.state['Suits'] = suits # We need to be setting our edmcName for all suits - monitor.state['SuitCurrent']['edmcName'] = monitor.suit_sane_name(monitor.state['SuitCurrent']['locName']) + loc_name = monitor.state['SuitCurrent'].get('locName', monitor.state['SuitCurrent']['name']) + monitor.state['SuitCurrent']['edmcName'] = monitor.suit_sane_name(loc_name) + for s in monitor.state['Suits']: + loc_name = monitor.state['Suits'][s].get('locName', monitor.state['Suits'][s]['name']) + monitor.state['Suits'][s]['edmcName'] = monitor.suit_sane_name(loc_name) if (suit_loadouts := data.get('loadouts')) is None: logger.warning('CAPI data had "suit" but no (suit) "loadouts"')