Merge branch 'release/3.1.0-a2'

aussig · May 8, 2023 · 695474b · 695474b
2 parents c095a26 + 7fd7486
commit 695474b
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,13 @@
 # Change Log
 
+## v3.1.0-a2 - 2023-08-05
+
+### Bug Fixes:
+
+* Thargoid War S&R collection / dropoff wasn't being reliably tallied.
+
+
+
 ## v3.1.0-a1 - 2023-04-30
 
 ### New Features:

diff --git a/bgstally/activity.py b/bgstally/activity.py
@@ -596,7 +596,7 @@ def collect_cargo(self, journal_entry: dict, state: State):
 
         key:str = None
 
-        match journal_entry.get('Type'):
+        match journal_entry.get('Type', "").lower():
             case 'damagedescapepod': key = 'dp'
             case 'occupiedcryopod': key = 'op'
             case 'usscargoblackbox': key = 'bb'
@@ -613,7 +613,7 @@ def search_and_rescue(self, journal_entry: dict, state: State):
         """
         key:str = None
 
-        match journal_entry('Name'):
+        match journal_entry.get('Name', "").lower():
             case 'damagedescapepod': key = 'dp'
             case 'occupiedcryopod': key = 'op'
             case 'usscargoblackbox': key = 'bb'

diff --git a/load.py b/load.py
@@ -9,7 +9,7 @@
 import semantic_version
 
 PLUGIN_NAME = "BGS-Tally"
-PLUGIN_VERSION = semantic_version.Version.coerce("3.1.0-a1")
+PLUGIN_VERSION = semantic_version.Version.coerce("3.1.0-a2")
 
 # Initialise the main plugin class
 this:BGSTally = BGSTally(PLUGIN_NAME, PLUGIN_VERSION)