diff --git a/database.py b/database.py index fe563f5..69afb31 100644 --- a/database.py +++ b/database.py @@ -371,7 +371,7 @@ def add_team_obl(team): conn.commit() conn.close() -def save_obl_results(winning_team, losing_team): +def save_obl_results(winning_team, losing_team, xvi_team = None): conn = create_connection() if conn is not None: c=conn.cursor() @@ -392,7 +392,22 @@ def save_obl_results(winning_team, losing_team): obl_points += 1 c.execute("UPDATE one_big_league SET teams_beaten_list = ?, current_opponent_pool = ?, obl_points = ? WHERE team_name = ?", (list_to_newline_string(beaten_teams), list_to_newline_string(opponent_teams), obl_points, winning_team.name)) + conn.commit() + conn.close() + if xvi_team is not None: + add_obl_point(xvi_team) + return + +def add_obl_point(team): + conn = create_connection() + if conn is not None: + c=conn.cursor() + + c.execute("SELECT obl_points FROM one_big_league WHERE team_name = ?", (team.name,)) + xvi_obl_points = c.fetchone()[0] + xvi_obl_points += 1 + c.execute("UPDATE one_big_league SET obl_points = ? WHERE team_name = ?", (xvi_obl_points, team.name)) conn.commit() conn.close() return @@ -403,15 +418,15 @@ def get_obl_stats(team, full = False): c=conn.cursor() opponents_string = None while opponents_string is None: - c.execute("SELECT teams_beaten_list, current_opponent_pool, rival_name FROM one_big_league WHERE team_name = ?", (team.name,)) + c.execute("SELECT teams_beaten_list, current_opponent_pool, rival_name, obl_points FROM one_big_league WHERE team_name = ?", (team.name,)) try: - beaten_string, opponents_string, rival_name = c.fetchone() + beaten_string, opponents_string, rival_name, obl_points = c.fetchone() except TypeError: #add team to OBL + obl_points = 0 add_team_obl(team) beaten_teams = newline_string_to_list(beaten_string) opponent_teams = opponents_string - obl_points = len(beaten_teams) teams_list = [name for name, points in obl_leaderboards()] rank = teams_list.index(team.name) + 1 diff --git a/games.py b/games.py index 88a22be..84dae73 100644 --- a/games.py +++ b/games.py @@ -635,7 +635,13 @@ class game(object): if self.inning > self.max_innings and self.teams["home"].score != self.teams["away"].score: #game over self.over = True if self.max_innings >= 9: - db.save_obl_results(self.teams["home"] if self.teams["home"].score > self.teams["away"].score else self.teams["away"], self.teams["home"] if self.teams["home"].score < self.teams["away"].score else self.teams["away"]) + if self.teams["home"].score == 16: + this_xvi_team = self.teams["home"] + elif self.teams["away"].score == 16: + this_xvi_team = self.teams["away"] + else: + this_xvi_team = None + db.save_obl_results(self.teams["home"] if self.teams["home"].score > self.teams["away"].score else self.teams["away"], self.teams["home"] if self.teams["home"].score < self.teams["away"].score else self.teams["away"], xvi_team=this_xvi_team) def end_of_game_report(self): diff --git a/the_prestige.py b/the_prestige.py index 37c9646..b20a3e8 100644 --- a/the_prestige.py +++ b/the_prestige.py @@ -2112,7 +2112,9 @@ def game_over_embed(game): title_string += ".\n" winning_team = game.teams['home'].name if game.teams['home'].score > game.teams['away'].score else game.teams['away'].name - winstring = f"{game.teams['away'].score} to {game.teams['home'].score}\n" + homestring = str(game.teams["home"].score) + ("☄" if game.teams["home"].score == 16 else "") + awaystring = ("☄" if game.teams["away"].score == 16 else "") + str(game.teams["away"].score) + winstring = f"{awaystring} to {homestring}\n" if game.victory_lap and winning_team == game.teams['home'].name: winstring += f"{winning_team} wins with a victory lap!" elif winning_team == game.teams['home'].name: