Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: Update coriolis-data to current master Ref, Regenerate Modules.json / Ships.json #2346

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from

Conversation

CMDR-WDX
Copy link

Description

This resolves some errors being thrown by monitor.py - Errors are still thrown for Cobra MkV, but this data is not yet present in coriolis-data:

KeyError: 'Cobra MkV'
2024-12-27 16:52:55.822 UTC - DEBUG - 25749:127525049116352:25774 monitor.EDLogs.parse_entry:1836: Invalid journal entry:
b'{ "timestamp":"2024-12-23T22:46:29Z", "event":"Loadout", "Ship":"cobramkv", ...Abbreviated...\r\n'
Traceback (most recent call last):
  File "/media/projects/2024-Q4/EDMarketConnector/monitor.py", line 707, in parse_entry
    fuel = {'Main': cap, 'Reserve': ships[ship]['reserveFuelCapacity']}
                                    ~~~~~^^^^^^
KeyError: 'Cobra MkV'
2024-12-27 16:52:55.893 UTC - DEBUG - 25749:127525049116352:25774 monitor.EDLogs.parse_entry:1836: Invalid journal entry:
b'{ "timestamp":"2024-12-23T23:02:38Z", "event":"Loadout", "Ship":"cobramkv", "ShipID":249, , ...Abbreviated...\r\n'
Traceback (most recent call last):
  File "/media/projects/2024-Q4/EDMarketConnector/monitor.py", line 707, in parse_entry
    fuel = {'Main': cap, 'Reserve': ships[ship]['reserveFuelCapacity']}
                                    ~~~~~^^^^^^
KeyError: 'Cobra MkV'

Also, removed hpt_multicannon_fixed_small_advanced and hpt_multicannon_fixed_medium_advanced from manual entry in coriolis-update-files.py as they are now present in the JSON generated by coriolis-data

Type of Change

  • Add Cobra Mk5 and Mandalay to internal list of Ships
  • Update coriolis-data to point to current master branch, regenerate ships and outfitting json
    • minor adjustment to json generation logic as additional modules are now present in the JSON

How Tested

I started up EDMC and can see that I no longer get errors for the Mandalay.
The Cobra5 still errors due to missing data from the coriolis-data repo. Could wait with merging until coriolis-data also has that new info, or follow up with another PR 🤷

Notes

Main motivator was me getting annoyed at the entire Loadout Event being printed on Startup when I was playing around with plugins :D
I haven't discussed this PR anywhere yet.

…son / Ships.json

This resolves some errors being thrown by monitor.py - Errors are still thrown for Cobra MkV, but this data is not yet present in coriolis-data

Also, removed hpt_multicannon_fixed_small_advanced and hpt_multicannon_fixed_medium_advanced from manual entry in coriolis-update-files.py as they are now present in the JSON generated by coriolis-data
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant