Commit Graph
6677 Commits
Author SHA1 Message Date
Athanasius 3005991a3c Merge pull request #1161 from EDCD/enhancement/odyssey-inventory-4.0.0.400
Align ShipLocker and BackPack code with ED 4.0.0.400
2021-06-10 19:35:34 +01:00
Athanasius 2c8d70f67d ShipLocker: Always load from the file, but be paranoid about it
We'll log the "missing keys, file?" line at TRACE for now, until we're
sure all this code is OK.
2021-06-10 14:45:41 +01:00
Athanasius 107c44a2a9 Inara: Fix the all() generator for ShipLocker check 2021-06-10 14:36:50 +01:00
Athanasius e754568b28 ShipLocker: Fix the all() generator 2021-06-10 14:31:26 +01:00
Athanasius 2353889ed2 monitor: Make 'empty ShipLocker event' log be TRACE 2021-06-10 14:21:33 +01:00
Athanasius 937aaccec4 ShipLockerJSON: Ensure initialised, and document it. 2021-06-10 14:20:27 +01:00
Athanasius 7051aba656 ShipLocker/Backpack: Use one event for the now-pass'ed ones.
Also, just dropped `TransferMicroResources` entirely as it's no longer
present (and would be irrelevant).
2021-06-10 14:08:57 +01:00
Athanasius a7722f70fe No need for [] if it's a generator inside all() anyway. 2021-06-10 14:04:38 +01:00
Athanasius 9fa02b51c3 Inara: Update to use ShipLocker, possibly from file. 2021-06-10 12:52:15 +01:00
Athanasius 3ea0bcce5e BackPack: No need to worry about Resurrect. 2021-06-10 12:44:46 +01:00
Athanasius ae18071f13 Backpack: Factor out the "make it empty" code. 2021-06-10 12:39:53 +01:00
Athanasius 8b6c0e50ac Backpack: Zero out when we Embark, as it's all then in ShipLocker 2021-06-10 12:37:59 +01:00
Athanasius 09c81a21f6 ShipLocker: do *NOT* zero out BackPack when handling this event
Just need to ensure we do on Embark (or Death? but likely fresh events
then anyway?).

Certainly if Journal event order is ever Backpack *then* ShipLocker this
would erroneously zero out the backpack.
2021-06-10 12:34:30 +01:00
Athanasius b02729ebdc Backpack/ShipLocker: TransferMicroResources is gone as of 4.0.0.400 2021-06-10 12:32:40 +01:00
Athanasius f942e76313 monitor: BackPackMaterials shouldn't be a thing any more 2021-06-10 12:28:37 +01:00
Athanasius c2d75e7f1d Credits: UpgradeWeapon should now include a credits cost.
Need to see 4.0.0.400 event for this and UpgradeSuit to be sure they
don't also cite materials costs.  But the hope is there'd be a new
empty/file `ShipLocker` event anyway.
2021-06-10 12:24:13 +01:00
Athanasius 59b410341c ShipLocker: Can now ignore SellMicroResources for inventory purposes
`ShipLocker` empty/file event has full new inventory.
2021-06-10 12:22:56 +01:00
Athanasius db43442504 ShipLocker: Ignore TradeMicroResources for inventory purposes
We get `ShipLocker`/file with full new inventory.
2021-06-10 12:21:40 +01:00
Athanasius c3a46a8415 ShipLocker: 4.0.0.400 - can ignore BuyMicroResources for inventory purposes
As the new `ShipLocker` is present in 'empty' form, with full new
inventory in the file.
2021-06-10 12:19:35 +01:00
Athanasius f852a185e4 Backpack: 4.0.0.400 - Can still ignore this for inventory purposes 2021-06-10 12:18:00 +01:00
Athanasius 8f05282d63 Backpack: 4.0.0.400 - can still ignore CollectItems 2021-06-10 12:17:15 +01:00
Athanasius 2b1ca8031c Backpack: Still don't need to worry about UseConsumable in 4.0.0.400 2021-06-10 12:16:14 +01:00
Athanasius 7934754482 ShipLocker: New event that replaces ShipLockerMaterials
On startup, embark, disembark this is a full event, otherwise it signals
writing of new ShipLocker.json file.
2021-06-10 12:12:02 +01:00
Athanasius 7989910140 Merge pull request #1160 from EDCD/dependabot/pip/develop/types-requests-0.1.9
build(deps-dev): bump types-requests from 0.1.8 to 0.1.9
2021-06-10 08:20:37 +01:00
dependabot[bot] 452528ae87 build(deps-dev): bump types-requests from 0.1.8 to 0.1.9
Bumps [types-requests](https://github.com/python/typeshed) from 0.1.8 to 0.1.9.
- [Release notes](https://github.com/python/typeshed/releases)
- [Commits](https://github.com/python/typeshed/commits)

---
updated-dependencies:
- dependency-name: types-requests
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-06-10 05:18:22 +00:00
Athanasius 83358f87e1 requirements.txt: mypy 0.900+ needs separate types-requests 2021-06-09 08:26:40 +01:00
Athanasius 3e3fbbd653 Merge pull request #1157 from EDCD/dependabot/pip/develop/mypy-0.901
build(deps-dev): bump mypy from 0.812 to 0.901
2021-06-09 08:21:18 +01:00
dependabot[bot] fb5d5a736c build(deps-dev): bump mypy from 0.812 to 0.901
Bumps [mypy](https://github.com/python/mypy) from 0.812 to 0.901.
- [Release notes](https://github.com/python/mypy/releases)
- [Commits](https://github.com/python/mypy/compare/v0.812...v0.901)

---
updated-dependencies:
- dependency-name: mypy
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-06-09 05:28:32 +00:00
Athanasius 2d6a78a865 Merge pull request #1090 from A-UNDERSCORE-D/fix/1082-dont-spam-on-error
Don't spam a stacktrace on requests.ConnectionError
2021-06-07 18:09:31 +01:00
A_D 09a0b70891 Switched logs to warning 2021-06-07 19:07:24 +02:00
A_D a79cde641e Removed unused import 2021-06-07 19:06:30 +02:00
A_D c4e9767974 Don't spam a stacktrace on requests.ConnectionError
ConnectionErrors are expected and not something we can fix. The
exception handler that was catching these previously is a catchall
intended to stop EDMC as a whole from crashing from something
unexpected.

Closes #1082
2021-06-07 19:06:27 +02:00
Athanasius 93e19ba33c Merge pull request #1142 from A-UNDERSCORE-D/fix/503-eddn-more-verbose-error
Made EDDN logs more verbose
2021-06-07 17:14:19 +01:00
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 13ba5fede9 Merge pull request #1153 from EDCD/fix/1074/translations-full-phrases
Translations: General cleanup pass
2021-06-07 17:01:32 +01:00
Athanasius efbc51c714 EDMarketConnector: Improve legacy LANG comments 2021-06-07 16:56:53 +01:00
Athanasius eb8b357e27 l10n script: 'No comment for' on stderr 2021-06-07 16:51:08 +01:00
Athanasius 2de39f60ab l10n script: Complain if there's no current/prev LANG comment 2021-06-07 16:50:28 +01:00
Athanasius 3f3e007305 pre-commit: *Ensure* the LANG_comments always runs 2021-06-07 16:39:19 +01:00
Athanasius 9e8bd1926b pre-commit: Run scripts/find_localised_strings.py
This will report on any missing LANG comments at commit time. NB: set to
run on all files in case of L10n/en.template changes.
2021-06-07 16:37:53 +01:00
Athanasius 631446f619 Translations: Final LANG comments
The script now outputs nothing about Unknown comments
2021-06-07 16:02:39 +01:00
Athanasius f4af278a80 prefs.py: Contiuning LANG comment pass 2021-06-07 16:00:28 +01:00
Athanasius 1495ba9206 prefs.py: Properly .grid() the 'Plugins folder' label 2021-06-07 15:56:50 +01:00
Athanasius fc96c6362f prefs.py: Initial LANG comment pass
Pausing for a possible bug fix
2021-06-07 15:54:20 +01: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 cc0e39b7c2 l10n.py: LANG comment pass 2021-06-07 15:34:14 +01:00
Athanasius 2351ee0f02 EDMarketConnector: LANG comment pass 2021-06-07 15:32:52 +01:00
Athanasius 1b58e91fa2 l10n script: Only report 'Unknown comment' if we didn't find a LANG one
So if we have a before LANG comment, then don't report the actual line
for a bad comment.

And if we have a current_line valid LANG comment, then don't report the
above_line as unknown.
2021-06-07 15:27:09 +01:00