diff --git a/monitor.py b/monitor.py index 797c221a..035467bc 100644 --- a/monitor.py +++ b/monitor.py @@ -412,19 +412,9 @@ class EDLogs(FileSystemEventHandler): self.state['Cargo'][entry['Type']] -= entry.get('Count', 1) if self.state['Cargo'][entry['Type']] <= 0: self.state['Cargo'].pop(entry['Type']) - elif entry['event'] in ['MissionAccepted', 'MissionCompleted']: - # Not sure whether the names for 'Commodity' and 'CommodityReward' are from the same namespace as - # each other or from the 'Cargo' event. - if event.get('Commodity'): - symbol = re.match('\$(.+)_Name;', event.get('Commodity')) - commodity = (symbol and symbol.group(1) or event.get('Commodity')).lower() - if entry['event'] == 'MissionAccepted': - self.state['Cargo'][commodity] += entry.get('Count', 1) - else: - self.state['Cargo'][commodity] -= entry.get('Count', 1) - if self.state['Cargo'][commodity] <= 0: - self.state['Cargo'].pop(commodity) - for reward in event.get('CommodityReward', []): + elif entry['event'] == 'MissionCompleted': + # Not sure whether the names for 'CommodityReward' are from the same namespace as the 'Cargo' event. + for reward in entry.get('CommodityReward', []): self.state['Cargo'][reward['Name'].lower()] += reward.get('Count', 1) elif entry['event'] == 'Materials':