ED/EDMarketConnector
1
0
Fork 0
mirror of https://github.com/EDCD/EDMarketConnector.git synced 2025-04-14 08:17:13 +03:00
Code Issues Projects Releases Wiki Activity

Don't handle CargoDepot event

Browse Source 
Can't track Wing mission cargo accurately so ignore.
This reverts commit 73d7e7a41be0888ea8154c04c7b6386d8eb6f86f.
This commit is contained in:
Jonathan Harris 2018-03-08 10:54:51 +00:00
parent c8f6eff6a3
commit 055d59c3d6
1 changed files with 0 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
monitor.py
View File

@ -106,7 +106,6 @@ class EDLogs(FileSystemEventHandler):
self.coordinates = None
self.systemaddress = None
self.started = None # Timestamp of the LoadGame event
self.missioncargo = {} # For tracking cargo in wing missions
# Cmdr state shared with EDSM and plugins
self.state = {
@ -322,7 +321,6 @@ class EDLogs(FileSystemEventHandler):
self.coordinates = None
self.systemaddress = None
self.started = None
self.missioncargo = {}
self.state = {
'Captain' : None,
'Cargo' : defaultdict(int),
@ -358,7 +356,6 @@ class EDLogs(FileSystemEventHandler):
self.stationservices = None
self.coordinates = None
self.systemaddress = None
self.missioncargo = {}
self.started = timegm(strptime(entry['timestamp'], '%Y-%m-%dT%H:%M:%SZ'))
self.state.update({ # Don't set Ship, ShipID etc since this will reflect Fighter or SRV if starting in those
'Captain' : None,
@ -490,13 +487,6 @@ class EDLogs(FileSystemEventHandler):
self.state['Cargo'][commodity] -= item.get('Count', 1)
if self.state['Cargo'][commodity] <= 0:
self.state['Cargo'].pop(commodity)
elif entry['event'] == 'CargoDepot':
if entry['MissionID'] in self.missioncargo:
commodity = self.missioncargo[entry['MissionID']]
self.state['Cargo'][commodity] += entry.get('ItemsCollected', 0)
self.state['Cargo'][commodity] -= entry.get('ItemsDelivered', 0)
if self.state['Cargo'][commodity] <= 0:
self.state['Cargo'].pop(commodity)
elif entry['event'] == 'Materials':
for category in ['Raw', 'Manufactured', 'Encoded']:
@ -551,11 +541,6 @@ class EDLogs(FileSystemEventHandler):
module['Engineering'].pop('ExperimentalEffect', None)
module['Engineering'].pop('ExperimentalEffect_Localised', None)
elif entry['event'] == 'MissionAccepted':
if 'Commodity' in entry:
self.missioncargo[entry['MissionID']] = self.canonicalise(entry['Commodity'])
elif entry['event'] == 'MissionAbandoned':
self.missioncargo.pop(entry['MissionID'], None)
elif entry['event'] == 'MissionCompleted':
for reward in entry.get('CommodityReward', []):
commodity = self.canonicalise(reward['Name'])
@ -564,7 +549,6 @@ class EDLogs(FileSystemEventHandler):
if 'Category' in reward: # Category not present in E:D 3.0
material = self.canonicalise(reward['Name'])
self.state[self.canonicalise(reward['Category']).capitalize()][material] += reward.get('Count', 1)
self.missioncargo.pop(entry['MissionID'], None)
elif entry['event'] == 'EngineerContribution':
commodity = self.canonicalise(entry.get('Commodity'))
if commodity: