Vergelijk commits

...

3 Commits

3 gewijzigde bestanden met toevoegingen van 36 en 36 verwijderingen
  1. +5
    -5
      subs.txt
  2. +7
    -5
      teampicker.py
  3. +24
    -26
      teams.txt

+ 5
- 5
subs.txt Bestand weergeven

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

+ 7
- 5
teampicker.py Bestand weergeven

@@ -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
@@ -31,7 +31,7 @@ SIZE = WIDTH, HEIGHT = 1920, 1080

BGIMG = pygame.image.load("sub_crown_bg_2.png")

FONT = pygame.font.SysFont("Fetamont", 50)
FONT = pygame.font.SysFont("Fetamont", 45)
SUBFONTHEIGHT = 35
SUBFONT = pygame.font.SysFont("Fetamont", SUBFONTHEIGHT)
OFFWHITE = (224, 224, 224)
@@ -41,7 +41,7 @@ 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 May 2021 Team Picker")

# Set up team text positioning references
#
@@ -56,7 +56,7 @@ ROWHEIGHT = int((HEIGHT-ROWSTART)/10)
TEAMSFILE = "teams.txt"

TEAMNUMCOLS = 3
TEAMNUMROWS = 9
TEAMNUMROWS = 10

TEAMCOLS = []
TEAMROWS = []
@@ -72,7 +72,7 @@ for i in range(TEAMNUMROWS):
SUBSFILE = "subs.txt"
SUBS = []

SUBNUMROWS = 8
SUBNUMROWS = 9
SUBROWHEIGHT = int((HEIGHT-ROWSTART)/9)
SUBROWS = []

@@ -160,6 +160,8 @@ def setup_team_board():
name = fh.readline().strip()
if name == "":
continue
if "donkey" in name:
name = name.split(' ', 1)[1]
print("Adding {} at {},{}".format(name,
TEAMCOLS[col],
TEAMROWS[row]))


+ 24
- 26
teams.txt Bestand weergeven

@@ -1,26 +1,24 @@
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
Belgium
Italy
Russia
Poland
Ukraine
Spain
France
Turkey
England
Czech Republic
Finland
Sweden
Croatia
Austria
Netherlands
Germany
Portugal
Switzerland
Denmark
Wales
North Macedonia
Hungary
Slovakia
Scotland

Laden…
Annuleren
Opslaan