From dd6c6fbc3638b79c5183a7a156f0d8a726420926 Mon Sep 17 00:00:00 2001
From: Athanasius <github@miggy.org>
Date: Fri, 11 Feb 2022 12:20:06 +0000
Subject: [PATCH] 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.
---
plugins/inara.py | 22 ++--------------------
1 file changed, 2 insertions(+), 20 deletions(-)
diff --git a/plugins/inara.py b/plugins/inara.py
index 9388d5da..23387c3a 100644
--- a/plugins/inara.py
+++ b/plugins/inara.py
@@ -1384,26 +1384,8 @@ def cmdr_data(data: CAPIData, is_beta): # noqa: CCR001
this.station_link.update_idletasks()
if config.get_int('inara_out') and not is_beta and not this.multicrew and credentials(this.cmdr):
- if (
- abs(this.last_credits - data['commander']['credits']) >=
- min(abs(this.last_credits * CREDITS_DELTA_MIN_FRACTION), CREDITS_DELTA_MIN_ABSOLUTE)
- ):
- this.filter_events(
- Credentials(this.cmdr, this.FID, str(credentials(this.cmdr))),
- lambda e: e.name != 'setCommanderCredits'
- )
-
- # this.events = [x for x in this.events if x['eventName'] != 'setCommanderCredits'] # Remove any unsent
- new_add_event(
- 'setCommanderCredits',
- data['timestamp'],
- {
- 'commanderCredits': data['commander']['credits'],
- 'commanderLoan': data['commander'].get('debt', 0),
- }
- )
-
- this.last_credits = int(data['commander']['credits'])
+ # Only here to ensure the conditional is correct for future additions
+ pass
def make_loadout(state: Dict[str, Any]) -> OrderedDictT[str, Any]: # noqa: CCR001