1
0
mirror of https://github.com/EDCD/EDMarketConnector.git synced 2025-04-19 10:27:38 +03:00

415 Commits

Author SHA1 Message Date
A_D
17980ac6ad
Added localisation 2021-06-07 18:10:25 +02:00
A_D
e6c8183bfc
made EDDN errors more verbose 2021-06-07 18:09:18 +02:00
Athanasius
4fa0521438 other core plugins: LANG comment pass 2021-06-07 15:43:32 +01:00
Athanasius
a412ec1382 plugins/coriolis.py: LANG comment pass 2021-06-07 15:35:24 +01:00
Athanasius
09da4576bf plugins/coriolis: Correct case of translated string 2021-06-05 08:54:55 +01:00
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
Athanasius
4273e2b551
Merge pull request #1130 from EDCD/enhancement/1127-inara-odyssey-support
Update INARA plugin to support new odyssey API endpoints
2021-06-04 12:14:23 +01:00
Athanasius
d5bb0cce5d EDSM: credentials() should just return None if no apikey 2021-06-04 10:21:56 +01:00
Athanasius
7bae9afe02 EDSM: Don't blindly assume we *already* have EDSM cmdr name and apikey 2021-06-04 10:16:52 +01: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
A_D
fe90f1f0b3
Cleaned up imports, removed incase imports
closes EDCD/EDMarketConnector#569
2021-05-28 14:46:51 +02:00
A_D
2dd80e8314
Set dropdown default to currently selected option 2021-05-28 13:09:42 +02:00
A_D
4c658577f4
Forgot to re-localise when reading from conf 2021-05-28 13:05:49 +02:00
A_D
82c5292d0a
Fixed formatting 2021-05-28 12:11:51 +02:00
A_D
d8d90f14c0
Fixed _ being redefined 2021-05-28 12:06:57 +02:00
A_D
9edc86c2d8
Fixed auto switching between localised and unlocalised 2021-05-28 11:57:16 +02:00
A_D
37b37eae56
Fixed localisation 2021-05-28 11:51:14 +02:00
A_D
ebb5ac49bc
Added reset buttons for links 2021-05-28 11:51:14 +02:00
A_D
d0272fd298
Fixed 'default' vs 'auto' 2021-05-28 11:51:14 +02:00
A_D
10de03298b
added selector for alpha/beta/auto URL targeting
closes EDCD/EDMarketConnector#823
2021-05-28 11:51:13 +02:00
A_D
be6e9e6b4e
Added support for choosing coriolis URL
Closes EDCD/EDMarketConnector#491
2021-05-28 11:51:10 +02:00
Athanasius
5e0bcb29a9
Merge pull request #1084 from EDCD/fix/1078/odyssey-partial-engineerprogress-event
EngineerProgress: Extra validation paranoia
2021-05-21 11:01:26 +01:00
Athanasius
e5909e9024 EDSM: Use loaded BackPack data, not the empty event. 2021-05-20 18:26:51 +01: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
389a781de3 translations: Also edsm killswitch phrase 2021-05-17 10:21:39 +01:00
Athanasius
b862f6b00a Translations: Add killswitch 'disabled' messages. 2021-05-17 10:18:04 +01:00
Athanasius
cba2f32cef plugins/eddn: export_journal_entry didn't have is_odyssey arg added 2021-05-15 08:17:58 +01:00
Athanasius
58c740bc6c plugins/eddn: Set odyssey flag in extra messages
1. journal outfitting
2. journal shipyard
3. journal commodities

As these are sourced from the additional .json files via a load over
`entry` contents we need to re-set `entry['odyssey']` and then make sure
we use it.
2021-05-12 18:18:41 +01:00
Athanasius
86a17e5e4c plugins/eddn: Utilise this.odyssey to augment CAPI-sourced messages
NB: Currently EDDN gateway doesn't have the updated schemas, so the
export_commodities() throws an exception and thus neither outfitting or
shipyard exports are even attempted.
2021-05-12 17:55:20 +01:00
Athanasius
8dfd638f28 plugins/eddn: Store Odyssey boolean in This state.
This is so we can access it in cmdr_data() as well.
2021-05-12 17:29:15 +01:00
Athanasius
97a6d07c51 plugins/eddn: Send bool 'odyssey' in all event messages.
This is so listeners can make decision on if/how/when to store data that
might be from base/horizons or Odyssey.
2021-05-12 17:14:58 +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
Athanasius
02052dd90e EDDB: Don't blank station when Embarking OnStation to own ship. 2021-05-01 13:47:52 +01:00