From 69c9fc3140fcd9f05d3014280781c15be65f2fd6 Mon Sep 17 00:00:00 2001 From: Roman Trapeznikov Date: Wed, 20 May 2020 21:21:35 +0300 Subject: [PATCH 1/3] fix profile colors in ffa session --- assets/src/ba_data/python/ba/_freeforallsession.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets/src/ba_data/python/ba/_freeforallsession.py b/assets/src/ba_data/python/ba/_freeforallsession.py index bad02faa..e338e370 100644 --- a/assets/src/ba_data/python/ba/_freeforallsession.py +++ b/assets/src/ba_data/python/ba/_freeforallsession.py @@ -38,7 +38,7 @@ class FreeForAllSession(MultiTeamSession): Category: Gameplay Classes """ use_teams = False - use_team_colors = True + use_team_colors = False _playlist_selection_var = 'Free-for-All Playlist Selection' _playlist_randomize_var = 'Free-for-All Playlist Randomize' _playlists_var = 'Free-for-All Playlists' From 6ff484a7779227acd25b0e7c2555c433443061f0 Mon Sep 17 00:00:00 2001 From: Roman Trapeznikov Date: Wed, 20 May 2020 21:36:57 +0300 Subject: [PATCH 2/3] avoid using `except Exception` for logic --- assets/src/ba_data/python/ba/_profile.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/assets/src/ba_data/python/ba/_profile.py b/assets/src/ba_data/python/ba/_profile.py index b49e04e7..3a7bcf93 100644 --- a/assets/src/ba_data/python/ba/_profile.py +++ b/assets/src/ba_data/python/ba/_profile.py @@ -54,12 +54,12 @@ def get_player_profile_icon(profilename: str) -> str: icon: str try: is_global = bs_config['Player Profiles'][profilename]['global'] - except Exception: + except KeyError: is_global = False if is_global: try: icon = bs_config['Player Profiles'][profilename]['icon'] - except Exception: + except KeyError: icon = _ba.charstr(SpecialChar.LOGO) else: icon = '' @@ -82,9 +82,9 @@ def get_player_profile_colors( highlight = (0.4, 0.4, 0.5) else: try: - assert profilename is not None color = profiles[profilename]['color'] - except Exception: + assert profilename is not None + except KeyError: # key off name if possible if profilename is None: # first 6 are bright-ish @@ -94,9 +94,9 @@ def get_player_profile_colors( color = PLAYER_COLORS[sum([ord(c) for c in profilename]) % 6] try: - assert profilename is not None highlight = profiles[profilename]['highlight'] - except Exception: + assert profilename is not None + except KeyError: # key off name if possible if profilename is None: # last 2 are grey and white; ignore those or we From 051dab69cd81cfe4e15b7c5e989712bbe0d826b9 Mon Sep 17 00:00:00 2001 From: Roman Trapeznikov Date: Wed, 20 May 2020 21:49:06 +0300 Subject: [PATCH 3/3] observe type-checking :/ --- assets/src/ba_data/python/ba/_profile.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/assets/src/ba_data/python/ba/_profile.py b/assets/src/ba_data/python/ba/_profile.py index 3a7bcf93..e29384c6 100644 --- a/assets/src/ba_data/python/ba/_profile.py +++ b/assets/src/ba_data/python/ba/_profile.py @@ -82,9 +82,9 @@ def get_player_profile_colors( highlight = (0.4, 0.4, 0.5) else: try: - color = profiles[profilename]['color'] assert profilename is not None - except KeyError: + color = profiles[profilename]['color'] + except (KeyError, AssertionError): # key off name if possible if profilename is None: # first 6 are bright-ish @@ -94,9 +94,9 @@ def get_player_profile_colors( color = PLAYER_COLORS[sum([ord(c) for c in profilename]) % 6] try: - highlight = profiles[profilename]['highlight'] assert profilename is not None - except KeyError: + highlight = profiles[profilename]['highlight'] + except (KeyError, AssertionError): # key off name if possible if profilename is None: # last 2 are grey and white; ignore those or we