ED/EDMarketConnector
1
0
Fork 0
mirror of https://github.com/EDCD/EDMarketConnector.git synced 2025-04-16 09:10:35 +03:00
Code Issues Projects Releases Wiki Activity
3,243 Commits 16 Branches 276 Tags
Commit Graph

3243 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
d35f64ebd5 Suits: Handle LoadoutRemoveModule 
Currently this seems to only trigger if you 'overwrite' an equipped
weapon with another one.  The one being removed will be cited in this
event.
 2021-04-29 12:21:08 +01:00
Athanasius
218073ed73 Suits: Remove weapon from all loadouts if sold. 
Also update credits total for the sale.
 2021-04-29 12:07:48 +01:00
Athanasius
2253e45c18 Suits: Add some paranoia around Loadouts 
* Initialise to empty dict.
* try/except in case CAPI pull hasn't happened yet when parsing Journal
  events.
 2021-04-29 11:45:06 +01:00
Athanasius
e796684fc6 Suits: Handle RenameSuitLoadout 2021-04-29 11:40:59 +01:00
Athanasius
e24e0b3547 Suits: Update DeleteSuitLoadout code with alpha4 example 
Also slightly simplified this.  Leaving the try/except for now, although
it should no longer be necessary.
 2021-04-29 11:34:29 +01:00
Athanasius
bd1b86d3a3 Suits/Loadouts: Always convert to dict form for simpler downstream code. 2021-04-29 11:30:55 +01:00
Athanasius
addb178d3d Suits: Handle 'CreateSuitLoadout' 
This entails converting the Journal supplied data into CAPI form.
 2021-04-29 11:23:14 +01:00
Athanasius
29a517ce11 Suits: Note that we need an 'UpgradeSuit' example still 
The journal document has to be mistaken about cost being in credits.
 2021-04-29 10:34:03 +01:00
Athanasius
aeca211a88 Suits: Handle 'SellSuit' 2021-04-29 10:26:55 +01:00
Athanasius
c8d98bba2e suits: Guard against "no CAPI pull yet" on BuySuit 2021-04-29 10:23:39 +01:00
Athanasius
7b8c113962 suits: Record a newly bought suit in monitor.state['Suits'] 
We can't fill in the 'id' field, but this is likely the FDevID of the
suit type ?
 2021-04-29 10:12:49 +01:00
Athanasius
96d9a80956 odyssey-4: Add outlines/comments for all upcoming events 2021-04-27 11:54:15 +01:00
Athanasius
f8f4fa6bb3 L10n: Add 'Suit' to en.template 2021-04-26 23:09:22 +01:00
Athanasius
77e6b64c64 L10n: Move "Minimize to system tray" to correct position 2021-04-26 23:08:08 +01:00
Athanasius
f8a001459f
Merge pull request #1011 from SayakMukhopadhyay/enhancement/126-minimize-tray 
EDMarketConnector: Added minimize to tray on close functionality
 2021-04-26 17:19:18 +01:00
Sayak Mukhopadhyay
a52472d6e0 Fix for tray icon not stopping on app stop when minimize to tray option is disabled 2021-04-26 19:18:47 +05:30
Sayak Mukhopadhyay
fc83dcf090 Added annotations for systray 2021-04-26 16:05:40 +05:30
Sayak Mukhopadhyay
b377199119 Changed logic to handle minimize too system tray 2021-04-26 15:36:43 +05:30
Sayak Mukhopadhyay
2dddf02f9b Comments to describe the hack 2021-04-26 14:40:11 +05:30
Sayak Mukhopadhyay
fa58d2f0c2 Added windows OS checks 2021-04-26 14:23:08 +05:30