WhatTheMike/Fox-V3
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Still going on events

Browse Source
This commit is contained in:
bobloy 2020-09-21 11:17:59 -04:00
parent fe1f11b2eb
commit 28bf2a73e1
2 changed files with 32 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
chatter/chat.py
View File

@ -434,7 +434,7 @@ class Chatter(Cog):
else: else:
await ctx.maybe_send_embed("Error occurred :(") await ctx.maybe_send_embed("Error occurred :(")
@commands.Cog.listener() @Cog.listener()
async def on_message_without_command(self, message: discord.Message): async def on_message_without_command(self, message: discord.Message):
""" """
Credit to https://github.com/Twentysix26/26-Cogs/blob/master/cleverbot/cleverbot.py Credit to https://github.com/Twentysix26/26-Cogs/blob/master/cleverbot/cleverbot.py

52
werewolf/game.py
View File

@ -1,6 +1,7 @@
import asyncio import asyncio
import logging import logging
import random import random
from collections import deque
from typing import List, Any, Dict, Set, Union from typing import List, Any, Dict, Set, Union
import discord import discord
@ -85,6 +86,8 @@ class Game:
self.loop = asyncio.get_event_loop() self.loop = asyncio.get_event_loop()
self.action_queue = deque()
# def __del__(self): # def __del__(self):
# """ # """
# Cleanup channels as necessary # Cleanup channels as necessary
@ -275,8 +278,14 @@ class Game:
and repeat with _at_day_start() again and repeat with _at_day_start() again
""" """
await self._at_day_start()
# Once cycle ends, this will trigger end_game self.action_queue.append(self._at_day_start())
while self.action_queue:
await self.action_queue.popleft()
#
# await self._at_day_start()
# # Once cycle ends, this will trigger end_game
await self._end_game() # Handle open channels await self._end_game() # Handle open channels
async def _at_game_start(self): # ID 0 async def _at_game_start(self): # ID 0
@ -331,7 +340,7 @@ class Game:
if check(): if check():
return return
await self._at_day_end() self.action_queue.append(self._at_day_end())
async def _at_voted(self, target): # ID 2 async def _at_voted(self, target): # ID 2
if self.game_over: if self.game_over:
@ -405,7 +414,7 @@ class Game:
self.ongoing_vote = False self.ongoing_vote = False
if not self.can_vote: if not self.can_vote:
await self._at_day_end() self.action_queue.append(self._at_day_end())
else: else:
await self.normal_perms(self.village_channel) # No point if about to be night await self.normal_perms(self.village_channel) # No point if about to be night
@ -440,7 +449,7 @@ class Game:
await self._notify(5) await self._notify(5)
await asyncio.sleep(5) await asyncio.sleep(5)
await self._at_night_start() self.action_queue.append(self._at_night_start())
async def _at_night_start(self): # ID 6 async def _at_night_start(self): # ID 6
if self.game_over: if self.game_over:
@ -457,7 +466,7 @@ class Game:
) )
await asyncio.sleep(3) # .5 minutes FixMe to 30 Later await asyncio.sleep(3) # .5 minutes FixMe to 30 Later
await self._at_night_end() self.action_queue.append(self._at_night_end())
async def _at_night_end(self): # ID 7 async def _at_night_end(self): # ID 7
if self.game_over: if self.game_over:
@ -465,7 +474,7 @@ class Game:
await self._notify(7) await self._notify(7)
await asyncio.sleep(10) await asyncio.sleep(10)
await self._at_day_start() self.action_queue.append(self._at_day_start())
async def _at_visit(self, target, source): # ID 8 async def _at_visit(self, target, source): # ID 8
if self.game_over: if self.game_over:
@ -475,20 +484,21 @@ class Game:
async def _notify(self, event, data=None): async def _notify(self, event, data=None):
for i in range(1, 7): # action guide 1-6 (0 is no action) for i in range(1, 7): # action guide 1-6 (0 is no action)
self.bot.dispatch(f"red.fox.werewolf.{event}", data=data, priority=i) # self.bot.dispatch(f"red.fox.werewolf.{event}", data=data, priority=i)
# tasks = [] # self.bot.extra_events
# # Role priorities tasks = []
# role_order = [role for role in self.roles if role.action_list[event][1] == i] # Role priorities
# for role in role_order: role_order = [role for role in self.roles if role.action_list[event][1] == i]
# tasks.append(asyncio.ensure_future(role.on_event(event, data), loop=self.loop)) for role in role_order:
# # VoteGroup priorities tasks.append(asyncio.ensure_future(role.on_event(event, data), loop=self.loop))
# vote_order = [vg for vg in self.vote_groups.values() if vg.action_list[event][1] == i] # VoteGroup priorities
# for vote_group in vote_order: vote_order = [vg for vg in self.vote_groups.values() if vg.action_list[event][1] == i]
# tasks.append( for vote_group in vote_order:
# asyncio.ensure_future(vote_group.on_event(event, data), loop=self.loop) tasks.append(
# ) asyncio.ensure_future(vote_group.on_event(event, data), loop=self.loop)
# if tasks: )
# await asyncio.gather(*tasks) if tasks:
await asyncio.gather(*tasks)
# Run same-priority task simultaneously # Run same-priority task simultaneously
############END Notify structure############ ############END Notify structure############