diff --git a/Buttons/DiscoveryTile.py b/Buttons/DiscoveryTile.py index 4f8f08c..85bd44d 100644 --- a/Buttons/DiscoveryTile.py +++ b/Buttons/DiscoveryTile.py @@ -28,7 +28,7 @@ async def exploreDiscoveryTile(game: GamestateHelper, tile: str, interaction: di view = View() view.add_item(Button(label="Use it for its ability", style=discord.ButtonStyle.green, custom_id=f"FCID{player['color']}_usedDiscForAbility_{disc}_{tile}")) - view.add_item(Button(label="Get 2 Points", style=discord.ButtonStyle.red, custom_id="keepDiscForPoints")) + view.add_item(Button(label="Get 2 Points", style=discord.ButtonStyle.red, custom_id=f"FCID{player['color']}_keepDiscForPoints")) asyncio.create_task(interaction.channel.send(msg, view=view, file=file)) @staticmethod diff --git a/commands/search_commands.py b/commands/search_commands.py index a963488..2a7958b 100644 --- a/commands/search_commands.py +++ b/commands/search_commands.py @@ -261,6 +261,9 @@ async def stats(self, interaction: discord.Interaction, tourney_only:bool=False) total_faction_drafts = Counter() round_count = Counter() vp_count = Counter() + from collections import defaultdict + + scores_dict = defaultdict(list) finished_tourney_games = Counter() faction_victory_count = Counter() faction_performance = Counter() @@ -337,8 +340,10 @@ async def stats(self, interaction: discord.Interaction, tourney_only:bool=False) summary += f"{roundN}: {count} games\n" asyncio.create_task(interaction.channel.send(summary) ) summary = "Point Progression:\n" + rank = 1 for username, count in vp_count.most_common(): - summary += f"{username}: {count}/300 VPs ({str(finished_tourney_games[username])} games)\n" + summary += f"{rank}. {username}: {round(count,2)}/300 VPs ({str(finished_tourney_games[username])} games)\n" + rank += 1 asyncio.create_task(interaction.channel.send(summary) ) summary = "Faction Wins:\n" for faction, count in faction_victory_count.most_common(): diff --git a/helpers/CombatHelper.py b/helpers/CombatHelper.py index 823b0c6..bda081f 100644 --- a/helpers/CombatHelper.py +++ b/helpers/CombatHelper.py @@ -193,7 +193,7 @@ async def startCombatThreads(game: GamestateHelper, interaction: discord.Interac else: view = View() view.add_item(Button(label="Roll to Destroy Population", style=discord.ButtonStyle.green, - custom_id=f"FCID{winner}_rollDice_{pos}_{winner}_1000")) + custom_id=f"FCID{winner}_rollDice_{pos}_{winner}_1000_deleteMsg")) message = f"{playerName}, you may roll to attempt to kill enemy population." asyncio.create_task(thread2.send(message, view=view)) for combatatant in Combat.findPlayersInTile(game, tile2[1]): @@ -385,14 +385,14 @@ def getCombatButtons(game: GamestateHelper, pos: str): player_ships = tile_map[pos]["player_ships"][:] defenderSpeeds = Combat.getCombatantSpeeds(game, defender, player_ships, pos) attackerSpeeds = Combat.getCombatantSpeeds(game, attacker, player_ships, pos) - if Combat.doesCombatantHaveMissiles(game, defender, player_ships): - view.add_item(Button(label="(Defender) Roll Missiles", - style=discord.ButtonStyle.green, - custom_id=f"rollDice_{pos}_{defender}_99_defender")) - if Combat.doesCombatantHaveMissiles(game, attacker, player_ships): - view.add_item(Button(label="(Attacker) Roll Missiles", - style=discord.ButtonStyle.red, - custom_id=f"rollDice_{pos}_{attacker}_99_attacker")) + # if Combat.doesCombatantHaveMissiles(game, defender, player_ships): + # view.add_item(Button(label="(Defender) Roll Missiles", + # style=discord.ButtonStyle.green, + # custom_id=f"rollDice_{pos}_{defender}_99_defender")) + # if Combat.doesCombatantHaveMissiles(game, attacker, player_ships): + # view.add_item(Button(label="(Attacker) Roll Missiles", + # style=discord.ButtonStyle.red, + # custom_id=f"rollDice_{pos}_{attacker}_99_attacker")) for i in range(20, -20, -1): if i in defenderSpeeds: checker = "" @@ -1297,7 +1297,7 @@ async def declareAWinner(game: GamestateHelper, interaction: discord.Interaction f"once the winner is decided.**") view = View() view.add_item(Button(label="Roll to Destroy Population", style=discord.ButtonStyle.green, - custom_id=f"FCID{winner}_rollDice_{pos}_{winner}_1000")) + custom_id=f"FCID{winner}_rollDice_{pos}_{winner}_1000_deleteMsg")) message = f"{playerName}, you may roll to attempt to kill enemy population." asyncio.create_task(interaction.channel.send(message, view=view))