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

[1654] Updated setCommanderShip entry

Browse Source
This commit is contained in:
David Sangrey 2024-04-27 14:58:03 -04:00
parent a830f40454
commit e573b89966
No known key found for this signature in database
GPG Key ID: 3AEADBB0186884BC
1 changed files with 21 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
plugins/inara.py
View File

@ -553,23 +553,6 @@ def journal_entry( # noqa: C901, CCR001
# Ship change # Ship change
if event_name == 'Loadout' and this.shipswap: if event_name == 'Loadout' and this.shipswap:
cur_ship = {
'shipType': state['ShipType'],
'shipGameID': state['ShipID'],
'shipName': state['ShipName'], # Can be None
'shipIdent': state['ShipIdent'], # Can be None
'isCurrentShip': True,
}
if state['HullValue']:
cur_ship['shipHullValue'] = state['HullValue']
if state['ModulesValue']:
cur_ship['shipModulesValue'] = state['ModulesValue']
cur_ship['shipRebuyCost'] = state['Rebuy']
new_add_event('setCommanderShip', entry['timestamp'], cur_ship)
this.loadout = make_loadout(state) this.loadout = make_loadout(state)
new_add_event('setCommanderShipLoadout', entry['timestamp'], this.loadout) new_add_event('setCommanderShipLoadout', entry['timestamp'], this.loadout)
this.shipswap = False this.shipswap = False
@ -857,7 +840,7 @@ def journal_entry( # noqa: C901, CCR001
for ship in this.fleet: for ship in this.fleet:
new_add_event('setCommanderShip', entry['timestamp'], ship) new_add_event('setCommanderShip', entry['timestamp'], ship)
# Loadout # Loadout
if event_name == 'Loadout' and not this.newsession: if event_name == 'Loadout':
loadout = make_loadout(state) loadout = make_loadout(state)
if this.loadout != loadout: if this.loadout != loadout:
this.loadout = loadout this.loadout = loadout
@ -871,6 +854,26 @@ def journal_entry( # noqa: C901, CCR001
new_add_event('setCommanderShipLoadout', entry['timestamp'], this.loadout) new_add_event('setCommanderShipLoadout', entry['timestamp'], this.loadout)
cur_ship = {
'shipType': state['ShipType'],
'shipGameID': state['ShipID'],
'shipName': state['ShipName'], # Can be None
'shipIdent': state['ShipIdent'], # Can be None
'isCurrentShip': True,
'shipMaxJumpRange': entry['MaxJumpRange'],
'shipCargoCapacity': entry['CargoCapacity']
}
if state['HullValue']:
cur_ship['shipHullValue'] = state['HullValue']
if state['ModulesValue']:
cur_ship['shipModulesValue'] = state['ModulesValue']
if state['Rebuy']:
cur_ship['shipRebuyCost'] = state['Rebuy']
new_add_event('setCommanderShip', entry['timestamp'], cur_ship)
# Stored modules # Stored modules
if event_name == 'StoredModules': if event_name == 'StoredModules':
items = {mod['StorageSlot']: mod for mod in entry['Items']} # Impose an order items = {mod['StorageSlot']: mod for mod in entry['Items']} # Impose an order