1
0
mirror of https://github.com/EDCD/EDMarketConnector.git synced 2025-04-12 23:37:14 +03:00

242 Commits

Author SHA1 Message Date
David Muckle
9ff3327ff7 Add code to track PP2.0 rank, merits, etc 2025-02-20 19:17:50 -05:00
David Sangrey
79ed7bee66
Merge branch 'develop' into enhancement/1654/add-shiprange-and-cargocapacity 2024-05-13 10:31:52 -04:00
David Sangrey
e573b89966
[1654] Updated setCommanderShip entry 2024-04-27 14:58:03 -04:00
David Sangrey
080d9f98f2
[1812] Handover Translations 2024-04-22 17:33:28 -04:00
David Sangrey
dd5e3812a7
[2186] Refine macOS to preserve ContextMenu 2024-04-13 14:44:44 -04:00
David Sangrey
d9c7a79155
[Minor] Update Type Hintings
No Content Changes, Shuts Up MyPy
2024-04-06 16:59:49 -04:00
David Sangrey
c1b8533cb4
[2186] Simplify myNB Files 2024-03-27 21:22:35 -04:00
Phoebe
99daff1295 Flake8 2024-02-25 20:45:59 +01:00
Phoebe
249f89f0fe Add checks to `Died` event 2024-02-25 19:46:49 +01:00
Phoebe
68a2767c39 Match remaining parts of `EscapeInterdiction` 2024-02-25 19:14:08 +01:00
Phoebe
a45527e104 Check for `EscapeInterdiction` events as well
Also rewrites the ``EscapeInterdiction`` path to match the other Interdiction paths.
2024-02-25 15:32:44 +01:00
Phoebe
af3b9d250a Check for and use `isThargoid` flag
- Check and use ``isThargoid`` flag for Interdiction events.
- Also updates the Paranoia check to also work in case of missing and not just empty parameter.
2024-02-25 15:20:14 +01:00
David Sangrey
7cac00b2e8
[635] Remove Ordered Dict 2024-01-03 23:55:12 -05:00
David Sangrey
b7633fa6e3
Handover a number of Lists to Tuples
Tuples are (slightly) more efficient for comparing if x in y. Not that it'll really matter at this scale, but it's technically better and simple to implement.

Applying to all files except theme.py, because theme.py is scary.
2023-12-27 00:29:35 -05:00
David Sangrey
c511b51003
[Translations] Update Translation Template 2023-12-06 17:41:22 -05:00
David Sangrey
e2285729df
Merge pull request #2086 from GLWine/develop
Fixed translation hook in EDSM.py and Inara.py
2023-12-06 17:17:39 -05:00
David Sangrey
173c32f314
[Minor] Update Code Checks 2023-12-06 17:15:46 -05:00
Phoebe
a3c1763f4a [2095] Standardize horizontal Padding
- Standardizes horizontal Padding.
- Fixes further padding issues.
- Part of #2095
2023-11-17 03:05:42 +01:00
Phoebe
fc9775b910 [Minor] flake8 2023-11-17 01:57:13 +01:00
Phoebe
8063cf099b [2095] Standardize vertical Padding
- Standardizes vertical Padding.
- Fixes issues with the disabled and outdated Plugin list.
- Part of #2095
2023-11-17 01:39:52 +01:00
Phoebe
07ae14be5a [2088] fix UI bugs, introduce standard
- Fixes #2088 and #2089.
- Adds usage of ``row=`` for ``.grid()`` for all config entries in included plugins.
- Changes all config pages to start at row 0.
- Starts introducing a standard for config panel layouts.
2023-11-16 22:21:57 +01:00
David Sangrey
070a3989a0
[2051] Prevent Typing Reversion
Thanks to @norohind for catching this one! I'm not up to date on my PEP585.
2023-11-10 11:33:04 -05:00
Giampiero
b0ae7f140c
Fixed translation hook line 295
Corrected the text of code line 295;
The text text="Show API Key" cannot be translated as indicated, so I rewrote it as text=_('Show API Key').
2023-10-31 01:23:59 +01:00
David Sangrey
2c803d7f4c
[2051] Core Plugin Audit
Broken out of #2068
2023-10-19 17:44:33 -04:00
Philipp Trulson
02f62b8ee6
Fix Inara URLs for station & system search 2023-09-18 22:48:00 +02:00
David Sangrey
d88bd70055
#2047 Mask API Keys in Default Plugins 2023-08-03 16:32:59 -04:00
David Sangrey
247d632cc6
#2040 First Pass - Update Build System 2023-07-26 22:49:03 -04:00
Athanasius
7b62fa1125
plugins/inara: Use state[...] values for system/station
* Also renamed system -> system_name & station -> station_name
2023-01-11 19:44:47 +00:00
Athanasius
7d4118738b
Add some missing LANG comments, as per script output 2023-01-03 11:46:27 +00:00
Athanasius
0fd835e9ac
core plugins: A little more 'children' fixup
* eddn: Needs to find status text, although really there should be a helper
  function for this.
* Removed commented out references to same in edsm and inara.
2022-12-31 16:49:29 +00:00
Athanasius
f2de70bad6
core plugins: Use nametowidget() to find system/station widgets
As we're experimenting with per-plugin frames up a level `parent.children`
would need to be `parent.parent.children`, but this way it will Just Work
without knowledge of the hierarchy.
2022-12-31 16:27:22 +00:00
aussig
41962663d8 Merge branch 'develop' into feature/847/capi-fleetcarrier 2022-12-24 08:21:18 +00:00
Athanasius
e66bae090b
plugins/inara: Minor typing fixes 2022-12-23 14:47:24 +00:00
Athanasius
26b12f5b14
plugins/inara, plug.py: Minor typing fixes 2022-12-23 14:47:18 +00:00
aussig
3e295db061 Typing of return values from killswitch.check_killswitch() 2022-12-22 17:39:20 +00:00
Athanasius
868c1d8e57
docs: Fix up references to setup.py to be to Build-exe-and-msi.py 2022-12-20 16:51:58 +00:00
Athanasius
db4f59dd16
Inara: Remove the "update 14 date passed?" check
- We're now past there and no-one should expect that messing with their clock
  will bypass this check.
2022-12-01 17:43:31 +00:00
Athanasius
4a8b5ed4b6
Merge pull request #1735 from EDCD/fix/1732/inara-do-not-send-empty-required
Inara: Drop various combat messages if empty opponentName
2022-12-01 16:41:32 +00:00
Athanasius
26413177a6
Inara: Also check opponentName on EscapeInterdiction
And sprinkly comments around giving a reason for the checks.
2022-12-01 13:45:10 +00:00
Athanasius
aac660fb05
Inara: Also catch empty opponentName for Interdict*ion* 2022-12-01 13:37:56 +00:00
Athanasius
2bbda30097
Inara: Drop addCommanderCombatInterdicted if empty opponentName
Addresses #1732 specifically.

At some point #1433 needs fully addressing (review all Inara API code for
compliance with docs).
2022-12-01 13:33:26 +00:00
Athanasius
e86110a3da
inara: Only warn for 'Legacy' if data would have been sent
* Specifically, only warn if the user option to send to Inara is active.
2022-11-30 12:07:48 +00:00
Athanasius
8a58220a66
inara: Send only Live galaxy data after Update 14
* Adds `monitor.is_live_galaxy()` for general use.
* Assumes Update 14 starts after 2022-11-29T09:00:00+00:00.  That's the
  currently schedule day, and recently the servers have been down by the time.
  Likelihood of them coming back *up* quickly seems slim to none.
* If we couldn't parse the `gameversion` from Journal using
  `semantic_version.Version.coerce()` this will fail, and assume we're on
  the Legacy galaxy.
2022-11-27 12:47:19 +00:00
Athanasius
5fa9bcd48e
inara: Wrap the <var> := <dict get> in () so <var> isn't a bool
Because, yes, 'is not' binds more tightly than ':='.
2022-08-13 18:34:28 +01:00
Athanasius
7b47dab543
inara: ApproachSettlement: Only set marketID if present in event
At least 'Ancient Ruins' generate an `ApproachSettlement` event without a
`MarketID` in the event.  Not even a key with `null` value.
2022-08-12 13:57:31 +01:00
Athanasius
dd6c6fbc36
Inara: Do not update credits from CAPI data
CAPI only has the Cmdr wallet value (and loan if applicable), without anything
for 'total assets'.  If we send Inara setCommanderCredits without
`commanderAssets` then Inara makes a bad judgement on it and sets an
incorrect total assets value.

Also:

> Do NOT set credits/assets unless you are absolutely sure they are correct. The journals currently doesn't contain crew wage cuts, so credit gains are very probably off for most of the players. Also, please, do not send each minor credits change, as it will spam player's credits log with unusable data and they won't be most likely very happy about it. It may be good to set credits just on the session start, session end and on the big changes or in hourly intervals.

So, let's just not.
2022-02-11 12:20:06 +00:00
Athanasius
30e9abb870
Inara: Change the comment for why we're using Progress, not Ranks 2022-02-08 13:34:03 +00:00
Athanasius
22f90e23aa
Inara: Trigger off 'Progress' for sending setCommanderRankPilot
Doing so from 'Rank' means the 'Progress' event hadn't happened yet, so of
course we only ever sent all zeroes for progress.

NB: Journal-v32 doc makes *no guarantee* about the order of the events.
  Is it worth trying to be paranoid about that ?  For a 100% new player
  everything would be "all zeroes", so we would likely need to tweak things
  to store `None` as default values, and check for such.
2022-02-08 13:31:00 +00:00
Athanasius
ac7cfb9b14
core plugins: Add big obvious comment about imports and windows installer 2022-02-01 14:45:30 +00:00
Athanasius
adb8055f08
Inara: Be paranoid in case of -ve credits balance 2022-01-31 15:22:36 +00:00