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

398 Commits

Author SHA1 Message Date
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
Athanasius
22dbd4e048 EDDN: Fix building of "ships this station sells" list.
This likely hadn't been tested since a rewrite due to pre-Odyssey alpha
having broken CAPI without shipyard_list on normal stations.
2021-04-12 08:31:48 +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
bc6557dd9c Quieten various TRACE log output.
* A lot of this is commented out.  It might be useful in the future, but
  is just too noisy for now.
* Changed the protocol webserver to info, as it is.
* Left the EDSM 'not 1XX, 2XX or 5XX' in as it's a warning, so 'pass's
  on the conditional bodies that would be empty now trace's are
  commented.
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
bd4489974d EDSM plugin now maintaining Station Name when on_foot 2021-04-12 08:30:51 +01:00
Athanasius
f45f817fa2 EDDB plugin now setting Station name correctly on_foot
* monitor.on_foot is now monitor.state['on_foot'] as plugins need to
  access it.
* EDDB:journal_entry() now stores that in this.on_foot to check later.
* this.on_foot checked in cmdr_data() to actually set station name from
  that data if needs be.  This avoids setting it to STATION_UNDOCKED if
  data['commander']['docked'] is False, when we're on_foot.
2021-04-12 08:30:51 +01:00
Athanasius
567cfdb9ca Will now send data to EDDN when on-foot in-station.
NB: No shipyard in tests because data['ships']['shipyard_list'] is an
empty list.  This might be the bug not having been fixed, or the station
might genuinely have no ships for sale.  We have no way to check in
Odyssey Alpha Phase 1.
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