Skip to content

Finbranch #335

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Fingon00 merged 2 commits into from
Dec 31, 2024
Merged

Finbranch #335

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
117d17d
Update search_commands.py
Fingon00 Dec 31, 2024
0bf0a1f
Small fixes
Fingon00 Dec 31, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Buttons/DiscoveryTile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
7 changes: 6 additions & 1 deletion commands/search_commands.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down Expand Up @@ -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():
Expand Down
20 changes: 10 additions & 10 deletions helpers/CombatHelper.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]):
Expand Down Expand Up @@ -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 = ""
Expand Down Expand Up @@ -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))

Expand Down
Loading