Merge pull request #381 from riffnshred/beta

VERSION

@@ -1 +1 @@
-1.6.9
+1.6.10

src/boards/stanley_cup_champions.py

@@ -4,8 +4,8 @@
 
 class StanleyCupChampions:
     def __init__(self, data, matrix, sleepEvent):
-        debug.info("Stanley cup champions id: {}".format(data.ScChampions_id))
-        self.team_id = data.ScChampions_id
+        debug.info("Stanley cup champions id: {}".format(data.cup_winner_id))
+        self.team_id = data.cup_winner_id
         if self.team_id is None:
             return
         self.team_abbrev = data.teams_info[self.team_id].abbreviation

src/data/data.py

@@ -180,7 +180,7 @@ def __init__(self, config):
         self.refresh_playoff()
 
         # Stanley cup champions
-        self.ScChampions_id = self.check_stanley_cup_champion()
+        self.cup_winner_id = self.check_stanley_cup_champion()
 
 
     #
@@ -528,8 +528,7 @@ def check_stanley_cup_champion(self):
             for x in range(len(self.current_round.series[0].matchupTeams)):
                 if self.current_round.series[0].matchupTeams[x].seriesRecord.wins >= 4:
                     return self.current_round.series[0].matchupTeams[x].team.id
-                else:
-                    return False
+                return
 
     def series_by_conference():
         """

src/main.py

@@ -27,7 +27,7 @@
 
 SCRIPT_NAME = "NHL-LED-SCOREBOARD"
 
-SCRIPT_VERSION = "1.6.9"
+SCRIPT_VERSION = "1.6.10"
 
 
 def run():

src/renderer/main.py

@@ -166,8 +166,8 @@ def __render_game_day(self):
                 sbrenderer = ScoreboardRenderer(self.data, self.matrix, self.scoreboard)
                 self.check_new_goals()
                 if self.data.isPlayoff and self.data.stanleycup_round:
-                    self.check_stanley_cup_champion()
-                    if self.data.ScChampions_id:
+                    self.data.check_stanley_cup_champion()
+                    if self.data.cup_winner_id:
                         StanleyCupChampions(self.data, self.matrix, self.sleepEvent).render()
 
                 self.__render_postgame(sbrenderer)
@@ -180,8 +180,8 @@ def __render_game_day(self):
                 sbrenderer = ScoreboardRenderer(self.data, self.matrix, self.scoreboard)
                 self.check_new_goals()
                 if self.data.isPlayoff and self.data.stanleycup_round:
-                    self.check_stanley_cup_champion()
-                    if self.data.ScChampions_id:
+                    self.data.check_stanley_cup_champion()
+                    if self.data.cup_winner_id:
                         StanleyCupChampions(self.data, self.matrix, self.sleepEvent).render()
                 self.__render_postgame(sbrenderer)
 
@@ -407,5 +407,5 @@ def draw_end_of_game_indicator(self):
         self.matrix.graphics.DrawLine(self.matrix.matrix, (self.matrix.width * .5) - 9, self.matrix.height - 1, (self.matrix.width * .5) + 9, self.matrix.height - 1, color)
 
     def test_stanley_cup_champion(self, team_id):
-        self.data.ScChampions_id = team_id
-        StanleyCupChampions(self.data, self.matrix, self.sleepEvent).render()
+        self.data.cup_winner_id = team_id
+        StanleyCupChampions(self.data, self.matrix, self.sleepEvent).render()