Game: annoucning when the deck is shuffled

This commit is contained in:
Elnath 2021-06-14 01:12:36 +02:00
parent b6184624f8
commit 41af88bdb1
1 changed files with 4 additions and 3 deletions

View File

@ -453,9 +453,9 @@ class Game:
else: else:
self.config["discard"].append(policy_str) self.config["discard"].append(policy_str)
self.config["drawn"] = None self.config["drawn"] = None
await self.announce_latest_enacted_policy()
if len(self.config["deck"]) < 3: if len(self.config["deck"]) < 3:
await self.shuffle_discard_into_deck() await self.shuffle_discard_into_deck()
await self.announce_latest_enacted_policy()
@game_started @game_started
@save_on_success @save_on_success
@ -463,6 +463,7 @@ class Game:
self.config["deck"].extend(self.config["discard"]) self.config["deck"].extend(self.config["discard"])
self.config["discard"] = [] self.config["discard"] = []
random.shuffle(self.config["deck"]) random.shuffle(self.config["deck"])
await self.get_announcements_channel().send("*The policy deck has been shuffled with the discard pile*")
@game_started @game_started
@save_on_success @save_on_success
@ -470,9 +471,9 @@ class Game:
logger.debug(f"[{self.guild.name}] Enacting top policy in {delay} seconds...") logger.debug(f"[{self.guild.name}] Enacting top policy in {delay} seconds...")
await asyncio.sleep(delay) await asyncio.sleep(delay)
self.config["enacted"].append(self.config["deck"].pop(0)) self.config["enacted"].append(self.config["deck"].pop(0))
await self.announce_latest_enacted_policy()
if len(self.config["deck"]) < 3: if len(self.config["deck"]) < 3:
await self.shuffle_discard_into_deck() await self.shuffle_discard_into_deck()
await self.announce_latest_enacted_policy()
@game_started @game_started
async def announce_latest_enacted_policy(self): async def announce_latest_enacted_policy(self):
@ -499,9 +500,9 @@ class Game:
async def veto(self): async def veto(self):
self.config["discard"].extend(self.config["drawn"]) self.config["discard"].extend(self.config["drawn"])
self.config["drawn"] = None self.config["drawn"] = None
await self.get_announcements_channel().send(f"<@&{self.get_player_role_id()}>\n:person_gesturing_no: The government used the veto power! No policies have been enacted. :person_gesturing_no:", allowed_mentions = discord.AllowedMentions(roles = True))
if len(self.config["deck"]) < 3: if len(self.config["deck"]) < 3:
await self.shuffle_discard_into_deck() await self.shuffle_discard_into_deck()
await self.get_announcements_channel().send(f"<@&{self.get_player_role_id()}>\n:person_gesturing_no: The government used the veto power! No policies have been enacted. :person_gesturing_no:", allowed_mentions = discord.AllowedMentions(roles = True))
await self.increase_chaos() await self.increase_chaos()
@game_started @game_started