Merge branch 'develop' into feature/system-overlay

aussig · Aug 29, 2023 · 1c5c285 · 1c5c285
2 parents b67a86d + f22637a
commit 1c5c285
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -13,7 +13,11 @@
 ### Changes:
 
 * Pop-up legend window now contains a list of the Thargoid vessel type abbreviations.
-* Show hand cursor over help text to make it clearer you can click it to show the legend window.
+* Show a hand cursor 👆 over help text to make it clearer you can click it to show the legend window.
+
+### Bug Fixes:
+
+* Some Orthrus kills were not being tallied because the bond value logged was 40m instead of the previous 25m. We can only detect the type of Thargoid via the bond value logged by the game, so BGS-Tally will now tally an Orthrus for both kill values.
 
 ### API Changes ([v1.2](https://studio-ws.apicur.io/sharing/281a84ad-dca9-42da-a08b-84e4b9af1b7e)):
 

diff --git a/README.md b/README.md
@@ -27,7 +27,7 @@ Full instructions for **installation and use are [here in the wiki &rarr;](https
 
 # Updating from a Previous Version
 
-Full instructions for **upgrading from a previous version are [here in the wiki &rarr;](https://github.com/aussig/BGS-Tally/wiki/Upgrade)**.
+Since v3, upgrading is fully automatic. However, if you need to do a manual upgrade for some reason, **full instructions are [here in the wiki &rarr;](https://github.com/aussig/BGS-Tally/wiki/Upgrade)**.
 
 
 # Discord Integration

diff --git a/bgstally/activity.py b/bgstally/activity.py
@@ -76,7 +76,7 @@
 CZ_GROUND_LOW_CB_MAX = 5000
 CZ_GROUND_MED_CB_MAX = 38000
 
-TW_CBS = {25000: 'r', 65000: 's', 75000: 's', 4500000: 'sg', 6500000: 'c', 20000000: 'b', 25000000: 'o', 34000000: 'm', 50000000: 'h'}
+TW_CBS = {25000: 'r', 65000: 's', 75000: 's', 4500000: 'sg', 6500000: 'c', 20000000: 'b', 25000000: 'o', 34000000: 'm', 40000000: 'o', 50000000: 'h'}
 
 
 class Activity:

diff --git a/bgstally/fleetcarrier.py b/bgstally/fleetcarrier.py
@@ -67,7 +67,7 @@ def update(self, data: dict):
 
         # Sort sell orders - a Dict of Dicts
         materials: dict = self.data.get('orders', {}).get('onfootmicroresources', {}).get('sales')
-        if materials is not None and materials != []:
+        if materials is not None and materials != {}:
             self.onfoot_mats_selling = sorted(materials.values(), key=lambda x: x['locName'])
         else:
             self.onfoot_mats_selling = []