(Dec 2021) Update for NHL94 (again!)

Display should be looked at, I did horriblwe things but it looks okay in
for 12 teams now

subs.txt

@@ -1,8 +1,8 @@
+etho8282
 costello_
-ksyme99
-hil42
-rarestmonkey
-mattgamerguy666
-meblu42
 burgiuk
+rarestmonkey
+maothecat
 idiotictendencies
+mattgamerguy666
+pandacat42

teampicker.py

@@ -4,7 +4,7 @@
 #
 # Two files provided:
 #  - subs.txt -- 8 subscribers
-#  - teams.txt -- 26 teams
+#  - teams.txt -- 30 teams
 #
 # Pseudocode:
 #   Split screen in 1:3
@@ -21,7 +21,7 @@ import random
 import pygame
 
 pygame.init()
-random.seed("BERTIE BEEF BAGGIO")
+random.seed("bertiebdec2021")
 
 HIGHLIGHTEVENT = pygame.USEREVENT + 1  # user specified event
 CLEAREVENT = pygame.USEREVENT + 2  # user specified event
@@ -31,8 +31,8 @@ SIZE = WIDTH, HEIGHT = 1920, 1080
 
 BGIMG = pygame.image.load("sub_crown_bg_2.png")
 
-FONT = pygame.font.SysFont("Fetamont", 50)
-SUBFONTHEIGHT = 35
+FONT = pygame.font.SysFont("Fetamont", 40)
+SUBFONTHEIGHT = 45
 SUBFONT = pygame.font.SysFont("Fetamont", SUBFONTHEIGHT)
 OFFWHITE = (224, 224, 224)
 HIGHLIGHT = (255, 209, 0)
@@ -41,22 +41,24 @@ RED = (186, 20, 31)
 PURPLE = (121, 35, 158)
 
 screen = pygame.display.set_mode(SIZE)
-pygame.display.set_caption("Sub Crown Nov 2020 Team Picker")
+pygame.display.set_caption("Sub Crown October 2021 Team Picker")
 
 # Set up team text positioning references
 #
 # 26 teams so 3 cols, 9 rows
 
-COLSTART = int(WIDTH/3)
-COLWIDTH = int((WIDTH-COLSTART)/3)
+TEAMSFILE = "teams.txt"
 
-ROWSTART = int(HEIGHT/12)
-ROWHEIGHT = int((HEIGHT-ROWSTART)/10)
+TEAMNUMCOLS = 2
+TEAMNUMROWS = 18
 
-TEAMSFILE = "teams.txt"
+# COLSTART = int(WIDTH/TEAMNUMCOLS)
+COLSTART = int(WIDTH/(TEAMNUMCOLS+1))
+COLWIDTH = int((WIDTH-COLSTART)/TEAMNUMCOLS)
 
-TEAMNUMCOLS = 3
-TEAMNUMROWS = 9
+ROWSTART = int(HEIGHT/(TEAMNUMROWS+2))
+# ROWHEIGHT = int((HEIGHT-ROWSTART)/TEAMNUMROWS)
+ROWHEIGHT = int((HEIGHT-ROWSTART)/(TEAMNUMROWS-5))
 
 TEAMCOLS = []
 TEAMROWS = []
@@ -72,7 +74,7 @@ for i in range(TEAMNUMROWS):
 SUBSFILE = "subs.txt"
 SUBS = []
 
-SUBNUMROWS = 8
+SUBNUMROWS = 9
 SUBROWHEIGHT = int((HEIGHT-ROWSTART)/9)
 SUBROWS = []
 
@@ -138,6 +140,22 @@ class Highlighter(object):
         if self.iterations >= self.max:
             # Choosing time
             self.lastchoice = -1
+            # # ** Name-specific choices! ** # #
+            # for tsub in SUBS:
+            #    if tsub.team == "":
+            #        choosing_sub = tsub
+            #        break
+            # for j in range(len(TEAMS)):
+            #    if "amy" not in choosing_sub.sub:
+            #        if TEAMS[j].team.lower(
+            #        ).startswith(choosing_sub.sub[0].lower()):
+            #            TEAMS[j].choose()
+            #            break
+            #    else:
+            #        if TEAMS[j].team.lower().startswith("a"):
+            #            TEAMS[j].choose()
+            #            break
+            # # End Name-specific stuff # #
             TEAMS[-1].choose()
             pygame.time.set_timer(HIGHLIGHTEVENT, 0)  # Disable highlight
             pygame.time.set_timer(CHOOSEEVENT, 5000, True)  # make choice
@@ -152,19 +170,27 @@ def draw_text(text, font, text_col, x, y):
     screen.blit(img, (x, y))
 
 
-def setup_team_board():
+def setup_team_board(randomise_teams=False):
     """Grab teams from text file and set their positions"""
+    teamlist = []
+
     with open(TEAMSFILE, "r") as fh:
-        for row in range(TEAMNUMROWS):
-            for col in range(TEAMNUMCOLS):
-                name = fh.readline().strip()
-                if name == "":
-                    continue
-                print("Adding {} at {},{}".format(name,
-                                                  TEAMCOLS[col],
-                                                  TEAMROWS[row]))
-                TEAMS.append(Team(name,
-                                  TEAMROWS[row], TEAMCOLS[col]))
+        teams = fh.readlines()
+        teamlist = [team.rstrip() for team in teams if team != ""]
+
+    if randomise_teams:
+        random.shuffle(teamlist)
+
+    for row in range(TEAMNUMROWS):
+        for col in range(TEAMNUMCOLS):
+            if len(teamlist) == 0:
+                continue
+            name = teamlist.pop(0)
+            print("Adding {} at {},{}".format(name,
+                                              TEAMCOLS[col],
+                                              TEAMROWS[row]))
+            TEAMS.append(Team(name,
+                              TEAMROWS[row], TEAMCOLS[col]))
 
 
 def setup_subs():
@@ -182,7 +208,7 @@ for line in open(SUBSFILE, "r"):
 print(SUBS)
 
 random.shuffle(SUBS)
-setup_team_board()
+setup_team_board(randomise_teams=True)
 random.shuffle(TEAMS)
 setup_subs()
 
@@ -221,6 +247,12 @@ while True:
         elif event.type == CHOOSEEVENT:
             for sub in SUBS:
                 if sub.team == "":
+                    # # Name-specific again # #
+                    # for k in range(len(TEAMS)):
+                    #    if TEAMS[k].colour == RED:
+                    #        sub.team = TEAMS.pop(k).team
+                    #        break
+                    # # End name-specific # #
                     sub.team = TEAMS.pop().team
                     pygame.time.set_timer(CLEAREVENT, 100, True)
                     break

teams.txt

@@ -1,26 +1,26 @@
-Anaheim
-Boston
-Buffalo
-Calgary
-Chicago
-Dallas
-Detroit
-Edmonton
-Florida
-Hartford
-Los Angeles
-Montreal
-New Jersey
-NY Islanders
-NY Rangers
-Ottawa
-Philadelphia
-Pittsburgh
-Quebec
-San Jose
-St Louis
-Tampa Bay
-Toronto
-Vancouver
-Washington
-Winnipeg
+Anaheim Mighty Ducks
+Boston Bruins
+Buffalo Sabres
+Calgary Flames
+Chicago Blackhawks
+Dallas Stars
+Detroit Red Wings
+Edmonton Oilers
+Florida Panthers
+Hartford Whalers
+Los Angeles Kings
+Montreal Canadiens
+New Jersey Devils
+New York Islanders
+New York Rangers
+Ottawa Senators
+Philadelphia Flyers
+Pittsburgh Penguins
+Quebec Nordiques
+San Jose Sharks
+St. Louis Blues
+Tampa Bay Lightning
+Toronto Maple Leafs
+Vancouver Canucks
+Washington Capitals
+Winnipeg Jets