From 8856e6c79e2109d7f934d8a3ff92cbbd6d80d4b6 Mon Sep 17 00:00:00 2001 From: aussig Date: Sun, 30 Apr 2023 07:40:24 +0100 Subject: [PATCH 1/3] Add new section to CHANGELOG --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3a0e3d7..ffadc6f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # Change Log +## v3.1.0-xx - xxxx-xx-xx + + + ## v3.1.0-a1 - 2023-04-30 ### New Features: From 5ba71b207ac5f89ac74b6b811fa0dec6b7a17fe2 Mon Sep 17 00:00:00 2001 From: aussig Date: Mon, 8 May 2023 09:44:38 +0100 Subject: [PATCH 2/3] Use case insensitive matching on S&R tally --- CHANGELOG.md | 4 ++++ bgstally/activity.py | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ffadc6f..9a6a3bf 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,10 @@ ## v3.1.0-xx - xxxx-xx-xx +### Bug Fixes: + +* Thargoid War S&R collection / dropoff wasn't being reliably tallied. + ## v3.1.0-a1 - 2023-04-30 diff --git a/bgstally/activity.py b/bgstally/activity.py index 3dc4fff..afe2af5 100644 --- 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' From 7fd7486bc85cc2f5d0c21362ab2aa9460200cad5 Mon Sep 17 00:00:00 2001 From: aussig Date: Mon, 8 May 2023 09:46:13 +0100 Subject: [PATCH 3/3] Update version and CHANGELOG for release --- CHANGELOG.md | 2 +- load.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9a6a3bf..901f371 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ # Change Log -## v3.1.0-xx - xxxx-xx-xx +## v3.1.0-a2 - 2023-08-05 ### Bug Fixes: diff --git a/load.py b/load.py index f541605..76b2c7e 100644 --- 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)