ED/EDMarketConnector
1
0
Fork 0
mirror of https://github.com/EDCD/EDMarketConnector.git synced 2025-06-05 09:53:33 +03:00
Code Issues Projects Releases Wiki Activity

More stat tweaks.

Browse Source 
Show "stolenGoods" fields.
This commit is contained in:
Jonathan Harris 2015-06-24 01:04:39 +01:00
parent 3a7bcb2dbd
commit bc65b6ea23
1 changed files with 35 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
stats.py
View File

@ -232,24 +232,38 @@ class StatsResults(tk.Toplevel):
('Bounties claimed', ['stats', 'crime', 'bounty', 'qty']), ('Bounties claimed', ['stats', 'crime', 'bounty', 'qty']),
('Lifetime bounty value', ['stats', 'crime', 'bounty', 'value'], CR), ('Lifetime bounty value', ['stats', 'crime', 'bounty', 'value'], CR),
('Highest bounty issued', ['stats', 'crime', 'bounty', 'highest', 'value'], CR), ('Highest bounty issued', ['stats', 'crime', 'bounty', 'highest', 'value'], CR),
('Commodities stolen', ['stats', 'crime', 'stolenCargo', 'qty']),
('Profit from stolen commodities',['stats', 'crime', 'stolenCargo', 'value'], CR),
]: ]:
self.addstat(page, data, *thing) self.addstat(page, data, *thing)
self.addpagespacer(page)
self.addpageheader(page, ['Piracy'])
if data['stats'].get('crime',{}).get('stolenCargo'):
for thing in [
('Profit from stolen cargo', ['stats', 'crime', 'stolenCargo', 'value'], CR),
('Cargo stolen', ['stats', 'crime', 'stolenCargo', 'qty']),
]:
self.addstat(page, data, *thing)
for thing in [
('Profit from stolen goods', ['stats', 'stolenGoods', 'profit'], CR),
('Goods stolen', ['stats', 'stolenGoods', 'qty']),
('Average profit', (['stats', 'stolenGoods', 'profit'], ['stats', 'stolenGoods', 'count']), CR),
('Highest single transaction', ['stats', 'stolenGoods', 'largestProfit', 'value'], CR),
]:
self.addstat(page, data, *thing)
try:
if not data['stats']['stolenGoods']['largestProfit']['qty']: raise Exception()
self.addpagerow(page, ['', '%d %s' % (data['stats']['stolenGoods']['largestProfit']['qty'], companion.commodity_map.get(data['stats']['stolenGoods']['largestProfit']['commodity'], data['stats']['stolenGoods']['largestProfit']['commodity']))])
except:
pass
notebook.add(page, text='Rep') notebook.add(page, text='Rep')
page = self.addpage(notebook, ['Ship', 'System', 'Station'], align=tk.W) page = self.addpage(notebook, ['Ship', 'System', 'Station'], align=tk.W)
try: try:
if isinstance(data['ships'], list): current = data['commander'].get('currentShipId')
for ship in data['ships']: # 'ships' can be an array or a dict indexed by str(int). Perhaps the latter if you've sold ships?
self.addpagerow(page, [companion.ship_map.get(ship['name'], ship['name']), for key in (isinstance(data['ships'], list) and range(len(data['ships'])) or sorted(data['ships'].keys(), key=int)):
ship['starsystem']['name'], ship['station']['name']], align=tk.W) ship = data['ships'][key]
else: self.addpagerow(page, [companion.ship_map.get(ship['name'], ship['name']) + (int(key)==current and ' *' or ''),
current = data['commander'].get('currentShipId') ship['starsystem']['name'], ship['station']['name']], align=tk.W)
for key in sorted(data['ships'].keys(), key=int):
ship = data['ships'][key]
self.addpagerow(page, [companion.ship_map.get(ship['name'], ship['name']) + (int(key)==current and ' *' or ''),
ship['starsystem']['name'], ship['station']['name']], align=tk.W)
except: except:
if __debug__: print_exc() if __debug__: print_exc()
notebook.add(page, text='Ships') notebook.add(page, text='Ships')
@ -331,19 +345,22 @@ class StatsResults(tk.Toplevel):
for key in content: for key in content:
value = value[key] value = value[key]
elif isinstance(content, tuple): elif isinstance(content, tuple):
dividend = data
divisor = data divisor = data
for key in content[0]:
dividend = dividend[key]
for key in content[1]: for key in content[1]:
divisor = divisor[key] divisor = divisor[key]
value = dividend / divisor if divisor:
dividend = data
for key in content[0]:
dividend = dividend[key]
value = dividend / divisor
else:
value = 0
else: else:
value = content value = content
if transform is None: if transform is None:
value = '{:,}'.format(value) value = '{:,}'.format(int(value))
elif isinstance(transform, basestring): elif isinstance(transform, basestring):
value = '{:,}'.format(value) + ' ' + transform value = '{:,}'.format(int(value)) + ' ' + transform
else: else:
value = '{:,}'.format(int(transform(value))) value = '{:,}'.format(int(transform(value)))
except: except: