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

Can't reliably track commodities used in missions.

Browse Source
This commit is contained in:
Jonathan Harris 2017-05-11 15:57:35 +01:00
parent f22cd0a36a
commit da09b2392e
1 changed files with 3 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
monitor.py
View File

@ -412,19 +412,9 @@ class EDLogs(FileSystemEventHandler):
self.state['Cargo'][entry['Type']] -= entry.get('Count', 1) self.state['Cargo'][entry['Type']] -= entry.get('Count', 1)
if self.state['Cargo'][entry['Type']] <= 0: if self.state['Cargo'][entry['Type']] <= 0:
self.state['Cargo'].pop(entry['Type']) self.state['Cargo'].pop(entry['Type'])
elif entry['event'] in ['MissionAccepted', 'MissionCompleted']: elif entry['event'] == 'MissionCompleted':
# Not sure whether the names for 'Commodity' and 'CommodityReward' are from the same namespace as # Not sure whether the names for 'CommodityReward' are from the same namespace as the 'Cargo' event.
# each other or from the 'Cargo' event. for reward in entry.get('CommodityReward', []):
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', []):
self.state['Cargo'][reward['Name'].lower()] += reward.get('Count', 1) self.state['Cargo'][reward['Name'].lower()] += reward.get('Count', 1)
elif entry['event'] == 'Materials': elif entry['event'] == 'Materials':