ADD: colours to players on teams
This commit is contained in:
@@ -39,13 +39,13 @@ class Match:
|
||||
self.round = self.current_tick["team_rounds_total"].values[0]
|
||||
|
||||
if self.round >= 8:
|
||||
self.team_1.is_ct = False
|
||||
self.team_2.is_ct = True
|
||||
self.team_1.set_t()
|
||||
self.team_2.set_ct()
|
||||
self.team_1.score = int(self.current_tick[self.current_tick["team_num"] == 3]["team_rounds_total"].values[0])
|
||||
self.team_2.score = int(self.current_tick[self.current_tick["team_num"] == 2]["team_rounds_total"].values[0])
|
||||
else:
|
||||
self.team_1.is_ct = True
|
||||
self.team_2.is_ct = False
|
||||
self.team_1.set_ct()
|
||||
self.team_2.set_t()
|
||||
self.team_1.score = int(self.current_tick[self.current_tick["team_num"] == 2]["team_rounds_total"].values[0])
|
||||
self.team_2.score = int(self.current_tick[self.current_tick["team_num"] == 3]["team_rounds_total"].values[0])
|
||||
|
||||
@@ -56,4 +56,7 @@ class Match:
|
||||
self._update_round()
|
||||
|
||||
def get_players(self) -> list[Player]:
|
||||
return self.team_1.players + self.team_2.players
|
||||
return self.team_1.players + self.team_2.players
|
||||
|
||||
def get_teams(self) -> list[Team]:
|
||||
return [self.team_1, self.team_2]
|
||||
@@ -38,15 +38,17 @@ class Renderer:
|
||||
def render_players(self):
|
||||
"""Draws everything on screen."""
|
||||
self.map_coord_controller.update_screen_size(self.screen.get_width(), self.screen.get_height())
|
||||
for player in self.match.get_players():
|
||||
if player.dead:
|
||||
continue
|
||||
mapped_x, mapped_y = self.map_coord_controller.map_to_screen(player.x, player.y)
|
||||
pygame.draw.circle(self.screen, (255, 255, 255), (mapped_x, mapped_y), 5)
|
||||
|
||||
# Draw player name
|
||||
text = self.small_font.render(player.name, True, (255, 255, 255))
|
||||
self.screen.blit(text, (mapped_x + 10, mapped_y))
|
||||
for team in self.match.get_teams():
|
||||
for player in team.players:
|
||||
if player.dead:
|
||||
continue
|
||||
mapped_x, mapped_y = self.map_coord_controller.map_to_screen(player.x, player.y)
|
||||
pygame.draw.circle(self.screen, team.colour, (mapped_x, mapped_y), 5)
|
||||
|
||||
# Draw player name
|
||||
text = self.small_font.render(player.name, True, (255, 255, 255))
|
||||
self.screen.blit(text, (mapped_x + 10, mapped_y))
|
||||
|
||||
pygame.display.flip() # Update display
|
||||
|
||||
|
||||
@@ -1,13 +1,22 @@
|
||||
from models.player import Player
|
||||
|
||||
class Team:
|
||||
def __init__(self, is_ct=False):
|
||||
def __init__(self):
|
||||
self.players = []
|
||||
self.is_ct = is_ct
|
||||
self.is_ct = False
|
||||
self.colour = 'brown'
|
||||
self.score = 0
|
||||
|
||||
def add_player(self, player: Player):
|
||||
self.players.append(player)
|
||||
|
||||
def remove_player(self, player: Player):
|
||||
self.players.remove(player)
|
||||
self.players.remove(player)
|
||||
|
||||
def set_ct(self):
|
||||
self.is_ct = True
|
||||
self.colour = 'blue'
|
||||
|
||||
def set_t(self):
|
||||
self.is_ct = False
|
||||
self.colour = 'brown'
|
||||
Reference in New Issue
Block a user