From f6d8bcb955fb7eb8dd4e49e0b485f97033b82f2b Mon Sep 17 00:00:00 2001 From: Elnath Date: Thu, 10 Jun 2021 23:50:38 +0200 Subject: [PATCH] Game: renamed started_only decorator to game_started --- GameFiles/Game.py | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/GameFiles/Game.py b/GameFiles/Game.py index e0bfd50..81382e1 100644 --- a/GameFiles/Game.py +++ b/GameFiles/Game.py @@ -8,7 +8,7 @@ import discord logger = logging.getLogger(__name__) -def started_only(func): +def game_started(func): """ Decorator for *methods* of Game that need the game to be started. """ @@ -55,65 +55,65 @@ class Game: def is_started(self): return self.config["game_started"] - @started_only + @game_started def get_players_id(self) -> List[int]: return self.config["players"] - @started_only + @game_started def get_players(self) -> List[discord.Member]: return [self.guild.get_member(player) for player in self.get_players_id()] - @started_only + @game_started def get_player_info(self, player: Union[int, discord.Member]): if isinstance(player, discord.Member): player = player.id return self.config["player_info"][str(player)] - @started_only + @game_started def get_gm_role_id(self) -> int: return self.config["gm_role"] - @started_only + @game_started def get_gm_role(self) -> discord.Role: return self.guild.get_role(self.get_gm_role_id()) - @started_only + @game_started def is_gm(self, user: discord.Member) -> bool: return self.get_gm_role() in user.roles - @started_only + @game_started def get_player_role_id(self) -> int: return self.config["player_role"] - @started_only + @game_started def get_player_role(self) -> discord.Role: return self.guild.get_role(self.get_player_role_id()) - @started_only + @game_started def get_game_category_id(self) -> int: return self.config["category"] - @started_only + @game_started def get_game_category(self) -> discord.CategoryChannel: return self.guild.get_channel(self.get_game_category_id()) - @started_only + @game_started def get_announcements_channel_id(self) -> int: return self.config["announce_chan"] - @started_only + @game_started def get_announcements_channel(self) -> discord.TextChannel: return self.guild.get_channel(self.get_announcements_channel_id()) - @started_only + @game_started def get_votes_channel_id(self) -> int: return self.config["votes_chan"] - @started_only + @game_started def get_votes_channel(self) -> discord.TextChannel: return self.guild.get_channel(self.get_votes_channel_id()) - @started_only + @game_started def is_vote_running(self) -> bool: return self.config["vote"] is not None @@ -124,13 +124,13 @@ class Game: vote_count[self.config["vote"][str(player_id)]] += 1 return vote_count[True] > vote_count[False] - @started_only + @game_started def get_player_channel_id(self, player: Union[int, discord.Member]) -> int: if isinstance(player, discord.Member): player = player.id return self.config["player_info"][str(player)]["channel"] - @started_only + @game_started def get_player_channel(self, player: Union[int, discord.Member]) -> discord.TextChannel: return self.guild.get_channel(self.get_player_channel_id(player)) @@ -184,7 +184,7 @@ class Game: self.config["game_started"] = True self.save_function() - @started_only + @game_started async def delete(self): category = self.get_game_category() for channel in category.channels: