Merge pull request #27 from breca/0.91a

0.91a Hotfix

BGS Companion.py

@@ -474,7 +474,7 @@ def voucher_tracker(update, msg_queue):
             # elif update['voucher']['type'] == 'CombatBond':
             #     msg_type = 'redeemed combat bonds worth'
             else:
-                if update['voucher']['type'] == 'scannable':
+                if update['voucher']['type'] == 'scannable' or update['voucher']['type'] == 'settlement':
                     msg_type = 'redeemed data worth'
                     nice_amount = str('{:,}'.format(update['voucher']['factions'][0][-1]))
                 if update['voucher']['type'] == 'exploration':
@@ -504,7 +504,7 @@ def voucher_tracker(update, msg_queue):
                     end_msg = 'You {} {} credits for {} at {} in the {} system.'.format(msg_type, nice_amount, runtime['station_faction'], runtime['station_name'], runtime['star_system'])
 
                 #trade credits are handled seperately
-                if update['voucher']['type'] not in ['trade', 'smuggle', 'scannable']:
+                if update['voucher']['type'] not in ['trade', 'smuggle', 'scannable', 'settlement']:
                     runtime['credits'] += update['voucher']['amount']
 
         if 'mission' in update.keys():
@@ -1119,9 +1119,10 @@ def parse(self, file_data):
                             else:
                                 update['voucher']['factions'].append([f['Faction'],f['Amount']])
                                 faction_no +=1
+                elif 'Faction' in data.keys():
+                    update['voucher']['factions'].append([data['Faction'], data['Amount']])
                 else:
                     update['voucher']['factions'].append([runtime['station_faction'], data['Amount']])
-                    #update['voucher']['factions'].append([data['Faction'], data['Amount']])  ##REVIEW this seems wrong, try above
                 update['voucher']['valid'] = self.valid_voucher(update['voucher'])
 
             # filter missions out from donations
@@ -1320,7 +1321,10 @@ def valid_voucher(self, event, *commodity):
             result = 'decrease'
         elif not will_effect_influence:
             log.info('Determined this voucher is invalid (will not effect influence).')
-            log.info('Reason: {}'.format(reason))
+            if 'reason' in locals(): ##FIXME should always have a reason..
+                log.info('Reason: {}'.format(reason))
+            else:
+                log.error('Voucher {} did not specify a reason as to why it does not affect influence!'.format(str(event)))
             result = 'invalid'
         else:
             log.info('Determined this voucher is valid.')

README.md

@@ -4,7 +4,7 @@
 
 ![Carte Blanc Edition](https://i.imgur.com/cpI2vzF.png)
 
-## Current Version: 0.9a
+## Current Version: 0.91a
 
 This application parses the player's journal file and extracts
 information that pertains to the Elite Dangerous background simulation.
@@ -73,6 +73,12 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 ## Changelog:
+ * Version 0.91a Hotfix
+
+ 	Fixes for data points/surface data point vouchers.
+
+	Fixed Combat bonds being assigned the wrong faction.
+
  * Version 0.9a
  	Updated some events for Elite: Beyond.
 

bgs_version.json

@@ -1,4 +1,4 @@
 {
-  "version": "0.9a",
-  "changelog": ["* Added options window and changed menu layout to accomodate", "* Anonymously sends updates to EDDN (enabled by default)", "* Users can now opt-out of checking for updates at start of every session", "* Updated some events for Elite: Beyond", "* Now shows mission influence counts in mission copy/paste info", "* Instead of tracking EVERY commodity, Trade data now lumps them into categories (all the game cares about).", "* Additionally, trades with profit margins of over 700 credits are marked as 'High' trades, less than 700 as 'Low' Trades as these have a larger/lesser affect.", "* Trade losses are now tracked (not reported on yet), sorry", "* Altered window behaviour - child windows now appear next to parent window", "* Some groundwork to make future updates a bit more seamless (still WIP)"]
+  "version": "0.91a",
+  "changelog": ["* Fixes for data points/surface data point vouchers.", "* Fixed Combat bonds being assigned the wrong faction"]
 }

settings.ini

@@ -1,14 +1,14 @@
 [General]
 loglevel = info
 advisorfaction = Mother Gaia
-versionurl = https://github.com/breca/elite_bgs_companion/bgs_version.json?raw=true
-distributionurl = https://github.com/breca/elite_bgs_companion/BGS_Companion.zip
-version = 0.9a
+version_url = https://github.com/breca/elite_bgs_companion/blob/master/bgs_version.json?raw=true
+distribution_url = https://github.com/breca/elite_bgs_companion/latest/
+version = 0.91a
 ignoredupdate = No
 
 [Options]
-eddn_enabled = 0
-check_updates_on_start = 0
+eddn_enabled = True
+check_updates_on_start = True
 
 [Links]
 radio = https://www.radiosidewinder.com/listen-now/