From 055d59c3d66640b5dfbb3070ff7153a061675417 Mon Sep 17 00:00:00 2001
From: Jonathan Harris <github@marginal.org.uk>
Date: Thu, 8 Mar 2018 10:54:51 +0000
Subject: [PATCH] Don't handle CargoDepot event
Can't track Wing mission cargo accurately so ignore.
This reverts commit 73d7e7a41be0888ea8154c04c7b6386d8eb6f86f.
---
monitor.py | 16 ----------------
1 file changed, 16 deletions(-)
diff --git a/monitor.py b/monitor.py
index 69d582ef..4096002f 100644
--- a/monitor.py
+++ b/monitor.py
@@ -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: