From 7c7609f2ee70750ba5f44192a76c1d434d4d87cb Mon Sep 17 00:00:00 2001 From: Athanasius Date: Sat, 1 May 2021 12:15:57 +0100 Subject: [PATCH] Cargo: Update ship cargo on `CargoTransfer` event We missed this when it was brought in with Fleet Carriers in 2020. --- monitor.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/monitor.py b/monitor.py index e6a873e8..8bb9cd8b 100644 --- a/monitor.py +++ b/monitor.py @@ -783,8 +783,14 @@ class EDLogs(FileSystemEventHandler): # type: ignore # See below self.state['Cargo'].update({self.canonicalise(x['Name']): x['Count'] for x in clean}) elif event_type == 'CargoTransfer': - # TODO: Transfers between ship and FC/SRV - pass + for c in entry['Transfers']: + name = self.canonicalise(c['Type']) + if c['Direction'] == 'toship': + self.state['Cargo'][name] += c['Count'] + + else: + # So it's *from* the ship + self.state['Cargo'][name] -= c['Count'] elif event_type == 'ShipLockerMaterials': # This event has the current totals, so drop any current data