Commit Graph
168 Commits
Author SHA1 Message Date
Athanasius 1d3ee4d6a9 Inara: Fix case on Inara 'marketID' key 2021-06-04 18:58:41 +01:00
Athanasius 7a69ca5e6b Inara: Remove useless/wrong setCommanderTravelLocation from SupercruiseEntry
This is old code, pre-dating the move to EDCD.  We could only possibly
set the system name and address from this, and would always have already
set this from login Location event, or any jump-in event.
2021-06-04 18:57:05 +01:00
Athanasius f6777f0237 Inara: Only ApproachSettlement if we have system & fix key case
* If you're near a settlement on login you get an ApproachSettlement
  before `monitor` has system set to pass into `journal_entry()`.
* We had a case-type of an Inara API key, so it wasn't setting the
  BodyName.
* TRACE level logging of what we actually send to Inara.
2021-06-04 18:45:43 +01:00
Athanasius fa0a7c48a2 Inara: setCommanderTravelLocation for SupercruiseExit and ApproachSettlement 2021-06-04 17:47:32 +01:00
Athanasius 07065b0bf3 inara: Comment out generic setCommanderTravelLocation event
This interferes with more specific such events, i.e. from Journal
`Location` event, if sent in the same batch.
2021-06-04 17:35:37 +01:00
A_D 88193cb30f be sure to include body with lat/long 2021-06-04 17:56:31 +02:00
A_D 607729b77b added setCommanderTravelLocation from Location event 2021-06-04 00:15:57 +02:00
A_D 8a94a57e78 Removed debug warnings and bool 2021-06-02 21:46:52 +02:00
A_D 86de3769d2 Fixed nonplural var containing plural names 2021-06-02 13:15:57 +02:00
A_D 2a68b81170 Fixed broken suitMods field 2021-06-02 12:32:32 +02:00
A_D 571db43257 Update Engineering for suits 2021-06-02 12:28:06 +02:00
A_D 2f684a91e3 removed monitor.planet use 2021-06-02 11:57:28 +02:00
A_D c737753a8b Fixed comment 2021-06-01 14:32:17 +02:00
A_D 41c826f536 delCommanderSuitLoadout done, update in-progress 2021-06-01 14:31:34 +02:00
A_D a06095aba0 Start on setCommanderSuitLoadout 2021-06-01 09:42:41 +02:00
A_D d69d0245f2 Implemented ship locker materials 2021-05-31 16:51:38 +02:00
A_D 0322fd37b1 Started updating existing events with taxi info 2021-05-31 12:58:37 +02:00
A_D 11ec6bfe49 Start implementing addCommanderTravelLand 2021-05-31 11:33:05 +02:00
Athanasius 278a78c09a plugins/inara: Don't try to send None-system location
I'm not sure normal use can cause this, but it's an easy obvious check.
2021-05-20 17:34:09 +01:00
Athanasius b862f6b00a Translations: Add killswitch 'disabled' messages. 2021-05-17 10:18:04 +01:00
Athanasius 7f45953012 plugins/station: *Do* set station from BodyType/Body always
The 'if not this.station' was early paranoia when first getting things
working with Odyssey.  It prevents a relog from Horizons (i.e. different
location) from correctly picking up an Odyssey login station when
on-foot in concourse.

Also, EDSM was defaulting wrongly for this.station_marketid.  Not that
the plugin even *uses* that at this time.
2021-05-12 10:56:43 +01:00
Athanasius 844e6115e3 Also handle Embark (properly) in EDSM and Inara plugins. 2021-05-01 13:50:45 +01:00
A_D d0bc006f9f Cleared final mypy errors in inara 2021-04-12 08:31:47 +01:00
Athanasius 878a247604 inara: A few final type fixups 2021-04-12 08:31:47 +01:00
Athanasius aaceaf0f52 inara: More type fixing 2021-04-12 08:31:47 +01:00
Athanasius 7ef6c17fa1 inara: Fix 'fleet' type 2021-04-12 08:31:47 +01:00
Athanasius 3ea6dac00b inara: Further cleanup
* missing 'this' variables declared in This.__init__()
* Types up to end of journal_entry()
2021-04-12 08:31:47 +01:00
Athanasius 6e98cf04d9 inara: Begin conversion to 'This' class. 2021-04-12 08:31:47 +01:00
Athanasius 8cbf37624c Inara: Ignore cognitive complexity & snake_case a var 2021-04-12 08:31:47 +01:00
Athanasius f494a948eb inara: Rename ALLCAPS function vars for padding. 2021-04-12 08:31:47 +01:00
Athanasius 9fd14a3980 Inara: Don't send a setCommanderReputationMajorFaction if we have no Reputations
Sure the `for k, v in ...` means not sending any that are empty/none,
but it will still send the event, just with *no* reputations.

When you're on a fresh character you have no reputations yet, so avoid
causing an Inara API error, including status line text.

Close #581
2021-04-12 08:31:47 +01:00
Athanasius 5edf8d5b59 Change monitor.state['on_foot'] to 'OnFoot' for consistency 2021-04-12 08:30:51 +01:00
Athanasius 734cb9ed11 Inara plugin now maintains Station Name when on_foot 2021-04-12 08:30:51 +01:00
Athanasius d585dd9233 Also str() appversion in EDSM and Inara plugins 2021-04-01 14:46:43 +01:00
Athanasius 2f9789afdd Update all code to use config.appversion() as a function
This *also* caught some instances where appversion_nobuild should
already have been used, so those were both changed and updated to a
function call.
2021-04-01 14:45:52 +01:00
Athanasius 3ed08f0f7e plugins/inara: Avoid Tk event_generate() calls during shutdown
# Conflicts:
#	plugins/inara.py
2021-04-01 14:45:48 +01:00
A_D b5a8c03980 Added missing whitespace 2021-04-01 14:45:48 +01:00
A_D b694bdc965 Added per-event killswitch 2021-04-01 14:45:48 +01:00
A_D 6374fbbeb8 Added event disabling
You can now disable specific event handlers in plugins
2021-04-01 14:45:47 +01:00
A_D 70087a27e4 Added total journal cutoff killswitches 2021-04-01 14:45:47 +01:00
A_D 8dca6783fc Fixed spelling, added utility methods 2021-04-01 14:45:47 +01:00
A_D d5b62d957b Added support for comments in kill switches 2021-04-01 14:45:47 +01:00
A_D f10cd9d70f Dont exit inara worker thread 2021-04-01 14:45:47 +01:00
A_D d81093760e Added hooks into killswitches in plugins 2021-04-01 14:45:47 +01:00
A_D 278480b99f replaced ors with defaults in config usage 2021-04-01 14:45:46 +01:00
Athanasius 25852997c5 Updated all source to use new config methods
# Conflicts:
#	monitor.py
2021-04-01 14:45:46 +01:00
Athanasius bd670b7ff1 Updated plugins to expect that CAPI data is safe
# Conflicts:
#	plugins/eddn.py
2021-04-01 14:45:45 +01:00
Athanasius 9b09d8bd07 plugins/inara: Close down logging & Remove unused this.queue.
* The new_worker/NewThis doesn't currently have a mechanism to ask the
 new_worker to exit.  It's relying on being a daemon thread and dying
 once all non-daemon (i.e. main) threads have exited.
2021-04-01 14:45:44 +01:00
Athanasius aab2a58a2d Reduce some log spam:
* Comment out the traceback in plugins/eddn.py, the return is enough.
* 'Called with no event_queue' can be TRACE.
* Don't care about "Everything was alright, the near-neutral status just
  wasn't stored." from Inara.
2021-03-23 13:48:44 +00:00
Athanasius 462cd25312 config: Make config.shutting_down() a property, and change 'callers' 2021-01-11 16:54:09 +00:00