Athanasius
55fa06dd73
systray: Remove another bit of code.
...
If a user had enabled the 'Minimize to systray' option then this would
cause the window to disappear on minimise, with no way to get it back.
2021-05-05 21:21:20 +01:00
Athanasius
346e4902f0
Merge pull request #1029 from EDCD/fix/odyssey-alpha4-Docked
...
Address taxi different Docked event.
2021-05-05 12:27:10 +01:00
Athanasius
f1ca2b8283
Separate 'Docked' processing to own conditional.
...
A taxi 'Docked' event has much less data than an own-ship one. Rather
than put tortured conditionals into the
Location/FSDJump/CarrierJump/Docked conditional I've split Docked into
its own.
There should always be one of the other events to set things like
SystemAddress before a 'Docked' event, so limiting the new conditional
to setting/changing only the station-related state variables.
2021-05-05 12:20:24 +01:00
Athanasius
b3032c4c95
Merge pull request #1028 from EDCD/enhancement/odyssey-dropshipdeploy
...
Set OnFoot for DropshipDeploy, but ignore BookDropship
2021-05-05 12:19:53 +01:00
Athanasius
692856bbe1
Disembark: Use the alpha4-new flag to detect if on-station
2021-05-05 11:42:29 +01:00
Athanasius
5f29c866e7
Dropship: Set OnFoot for DropshipDeploy, but ignore BookDropship
...
See the comment added to BookDropship code for why we're ignoring it.
2021-05-05 11:34:10 +01:00
Athanasius
dfb85bae17
.python_version -> 3.9.5
2021-05-05 10:50:51 +01:00
Athanasius
ea2c59041c
Update GH windows build to use Python 3.9.5
2021-05-05 10:45:45 +01:00
Athanasius
63dc0e2840
Merge pull request #1027 from EDCD/fix/1026/module-moving-costs
...
Be paranoid about presence of 'Cost' on some Journal events
2021-05-05 10:44:25 +01:00
Athanasius
543e0477c2
Don't assume ModuleRetrieve/Store have a Cost.
...
The Journal doc says they do, but one report of ModuleRetrieve saying it
doesn't, and ModuleStore does say "Cost (if any)".
2021-05-05 10:01:07 +01:00
Athanasius
5bd0680631
Merge pull request #1025 from EDCD/dependabot/pip/develop/pytest-6.2.4
...
build(deps-dev): bump pytest from 6.2.3 to 6.2.4
2021-05-05 08:18:54 +01:00
Athanasius
a5adbd89f1
Merge pull request #1024 from EDCD/dependabot/pip/develop/watchdog-2.1.0
...
build(deps): bump watchdog from 2.0.3 to 2.1.0
2021-05-05 08:18:34 +01:00
dependabot[bot]
60b84b340c
build(deps-dev): bump pytest from 6.2.3 to 6.2.4
...
Bumps [pytest](https://github.com/pytest-dev/pytest ) from 6.2.3 to 6.2.4.
- [Release notes](https://github.com/pytest-dev/pytest/releases )
- [Changelog](https://github.com/pytest-dev/pytest/blob/main/CHANGELOG.rst )
- [Commits](https://github.com/pytest-dev/pytest/compare/6.2.3...6.2.4 )
Signed-off-by: dependabot[bot] <support@github.com >
2021-05-05 05:54:45 +00:00
dependabot[bot]
a66f3b24a5
build(deps): bump watchdog from 2.0.3 to 2.1.0
...
Bumps [watchdog](https://github.com/gorakhargosh/watchdog ) from 2.0.3 to 2.1.0.
- [Release notes](https://github.com/gorakhargosh/watchdog/releases )
- [Changelog](https://github.com/gorakhargosh/watchdog/blob/master/changelog.rst )
- [Commits](https://github.com/gorakhargosh/watchdog/compare/v2.0.3...v2.1.0 )
Signed-off-by: dependabot[bot] <support@github.com >
2021-05-05 05:54:38 +00:00
Athanasius
310b2785f1
Merge pull request #1022 from EDCD/dependabot/pip/develop/autopep8-1.5.7
...
build(deps-dev): bump autopep8 from 1.5.6 to 1.5.7
2021-05-03 08:20:24 +01:00
dependabot[bot]
22116d4687
build(deps-dev): bump autopep8 from 1.5.6 to 1.5.7
...
Bumps [autopep8](https://github.com/hhatto/autopep8 ) from 1.5.6 to 1.5.7.
- [Release notes](https://github.com/hhatto/autopep8/releases )
- [Commits](https://github.com/hhatto/autopep8/compare/v1.5.6...v1.5.7 )
Signed-off-by: dependabot[bot] <support@github.com >
2021-05-03 07:01:27 +00:00
Athanasius
10d6c432a4
Append " (beta)" to Cmdr name when appropriate
...
Closes #1021
2021-05-02 10:31:57 +01:00
Athanasius
818bb56032
requirements: comment out infi.systray for now
2021-05-01 19:37:38 +01:00
Athanasius
86e6362b88
Changelog: Remove systray entry
2021-05-01 19:33:23 +01:00
Athanasius
316201eb77
systray: Disable whilst we figure out py2exe packaging issue
2021-05-01 19:32:53 +01:00
Athanasius
09cbf1225d
Update translations
2021-05-01 17:58:08 +01:00
Athanasius
f9db23e25d
Pre-Release 5.0.0-beta7: appversion and changelog
2021-05-01 17:56:13 +01:00
Athanasius
d95fa5424e
Merge pull request #1017 from EDCD/enhancement/odyssey-alpha4-fixes
...
Misc fixes for Odyssey
2021-05-01 16:54:24 +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
f6cb69ebad
Embark: Keep monitor.station set when Embarking OnStation.
2021-05-01 13:12:14 +01:00
Athanasius
7c7609f2ee
Cargo: Update ship cargo on CargoTransfer event
...
We missed this when it was brought in with Fleet Carriers in 2020.
2021-05-01 12:15:57 +01:00
Athanasius
812398ee0d
Credits: Review and add/tweak code for all Journal events
...
There are a few where either the v30 Journal doc is wrong/has an
ommision, or we genuinely don't get the required information.
2021-05-01 12:03:45 +01:00
Athanasius
77d96f61c7
Odyssey Credits: Update for book/cancel Taxi/Dropship
2021-05-01 10:50:20 +01:00
Athanasius
d74b886587
Update credits for SellOrganicData
2021-05-01 10:46:25 +01:00
Athanasius
751002bf1a
Suits: Guards for if we don't have CAPI data yet
...
We still need each try/except in case:
1. Journal has you buying a suit, or creating a SuitLoadout.
2. It then has you selling/deleting a different one.
3. But no CAPI data yet, so we don't know about that different one.
2021-05-01 10:42:54 +01:00
Athanasius
81104ca973
Suits: Only debug log if we can't find loadout for DeleteSuitLoadout
2021-05-01 10:31:08 +01:00
Athanasius
0e18666054
Suits: Only process SwitchSuitLoadout if we know about Suits and Loadouts
2021-05-01 10:25:39 +01:00
Athanasius
3ab8b97562
Suits: We might not know about SuitLoadout being switched to
2021-05-01 10:19:10 +01:00
Athanasius
c867d4c282
CAPI: Don't auto-update on Taxi Docked, but do on Disembark in-station
...
Closes #1016
2021-05-01 10:14:35 +01:00
Athanasius
b4295058cc
Merge pull request #1015 from EDCD/enhancement/odyssey-alpha4-items
...
Items: Odyssey alpha4 changes/updates.
2021-05-01 10:02:37 +01:00
Athanasius
6d58863a40
Suits: Fix 'mame' typo
2021-04-30 15:42:10 +01:00
Athanasius
60b2045ea4
Items: Fix DropItems and CollectItems
...
Tested as actually working.
2021-04-30 15:21:47 +01:00
Athanasius
e1a63c2879
Items: Correct UseConsumable code
2021-04-30 15:12:12 +01:00
Athanasius
f89ed7999e
Items: Implement CollectItems, DropItems and UseConsumable
...
The paranoia when subtracting from counts is because of the lack of
fresh `BackPackMaterials` if relogging whilst on foot.
2021-04-30 14:44:20 +01:00
Athanasius
422b766586
Items: Decrement BackPack Consumable on UseConsumable
2021-04-30 14:30:37 +01:00
Athanasius
1f8215ed92
Items: ShipLockerMaterials now has Data
...
But also, we're not getting a `BackPackMaterials` at the same time to be
sure of the state of things.
2021-04-30 13:56:26 +01:00
Athanasius
8e8c9fa3ff
Items: Data is now in BackPackMaterials as well
2021-04-30 13:50:52 +01:00
Athanasius
ae49797632
Merge pull request #1013 from EDCD/enhancement/odyssey-alpha4-suits
...
Odyssey Alpha4 extra suits-related support
2021-04-30 12:30:06 +01:00
Athanasius
eed4402340
Suits: Init monitor.state['Suits'] to empty dict
2021-04-30 10:53:38 +01:00
Athanasius
30b8a5eead
Suits: Log if a buy/sell event doesn't contain Price
2021-04-30 10:49:39 +01:00
Athanasius
203fb051b0
Suits: Simplify BuySuit code.
2021-04-30 10:47:09 +01:00
Athanasius
ac4f052695
Suits: Update credits on BuyWeapon
...
Also cleaning out some verbose comments.
2021-04-29 12:38:01 +01:00
Athanasius
7b76e327ce
Suits: Always set 'id' to None
...
Better to get a `None` value than a KeyError.
2021-04-29 12:32:31 +01:00
Athanasius
d27075cb38
Suits: Handle LoadoutEquipModule event
...
We're assuming weapons only at this point. Might need adjustment when
we get access to engineering.
2021-04-29 12:28:45 +01:00
Athanasius
dependabot[bot]