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

Get wolves working

Browse Source
This commit is contained in:
Bobloy 2018-04-09 14:00:12 -04:00
parent 1883b71e24
commit 67ec9e5cc8
2 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
werewolf/game.py
View File

@ -18,7 +18,7 @@ class Game:
default_secret_channel = { default_secret_channel = {
"channel": None, "channel": None,
"players": [], "players": [],
"votegroup": None "votegroup": None # uninitialized VoteGroup
} }
# def __new__(cls, guild, game_code): # def __new__(cls, guild, game_code):
@ -28,7 +28,7 @@ class Game:
def __init__(self, guild, game_code): def __init__(self, guild, game_code):
self.guild = guild self.guild = guild
self.game_code = ["Villager"] self.game_code = ["VanillaWerewolf"]
self.roles = [] self.roles = []
@ -43,8 +43,8 @@ class Game:
self.channel_category = None self.channel_category = None
self.village_channel = None self.village_channel = None
self.p_channels = {} self.p_channels = {} # uses default_secret_channel
self.vote_groups = {} self.vote_groups = {} # ID : VoteGroup()
self.loop = asyncio.get_event_loop() self.loop = asyncio.get_event_loop()
@ -91,18 +91,20 @@ class Game:
self.guild.me: discord.PermissionOverwrite(read_messages=True) self.guild.me: discord.PermissionOverwrite(read_messages=True)
} }
for member in self.p_channels[channel_id]["players"]: for player in self.p_channels[channel_id]["players"]:
overwrite[member] = discord.PermissionOverwrite(read_messages=True) overwrite[player.member] = discord.PermissionOverwrite(read_messages=True)
channel = await self.guild.create_text_channel(channel_id, overwrites=overwrite, reason="Werewolf secret channel", category=self.channel_category) channel = await self.guild.create_text_channel(channel_id, overwrites=overwrite, reason="Ww game secret channel", category=self.channel_category)
self.p_channels[channel_id]["channel"] = channel self.p_channels[channel_id]["channel"] = channel
if self.p_channels[channel_id]["votegroup"] is not None: if self.p_channels[channel_id]["votegroup"] is not None:
vote_group = self.p_channels[channel_id]["votegroup"](self, channel) vote_group = self.p_channels[channel_id]["votegroup"](self, channel)
await vote_group.register_player() await vote_group.register_players([player in self.p_channels[channel_id]["players"]])
self.vote_groups[channel_id] = self.p_channels[channel_id]["votegroup"](self, channel)
self.vote_groups[channel_id] = vote_group
print("Pre-cycle") print("Pre-cycle")
await asyncio.sleep(1) await asyncio.sleep(1)
await self._cycle() # Start the loop await self._cycle() # Start the loop
@ -250,7 +252,7 @@ class Game:
for role in role_order: for role in role_order:
tasks.append(asyncio.ensure_future(role.on_event(event, data), loop=self.loop)) tasks.append(asyncio.ensure_future(role.on_event(event, data), loop=self.loop))
# VoteGroup priorities # VoteGroup priorities
vote_order = [votes for votes in self.vote_groups.values() if votes.action_list[event][1]==i] vote_order = [vg for vg in self.vote_groups.values() if vg.action_list[event][1]==i]
for vote_group in vote_order: for vote_group in vote_order:
tasks.append(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))
@ -272,7 +274,7 @@ class Game:
return await channel.send(embed=embed) return await channel.send(embed=embed)
async def register_channel(self, channel_id, player, votegroup=None): async def register_channel(self, channel_id, role, votegroup=None):
""" """
Queue a channel to be created by game_start Queue a channel to be created by game_start
""" """
@ -281,7 +283,7 @@ class Game:
await asyncio.sleep(1) await asyncio.sleep(1)
self.p_channels[channel_id]["players"].append(player) self.p_channels[channel_id]["players"].append(role.player)
if votegroup: if votegroup:
self.p_channels[channel_id]["votegroup"] = votegroup self.p_channels[channel_id]["votegroup"] = votegroup

8
werewolf/votegroup.py
View File

@ -37,7 +37,7 @@ class VoteGroup:
See Game class for event guide See Game class for event guide
""" """
await action_list[event][0](data) await self.action_list[event][0](data)
async def _at_game_start(self, data=None): async def _at_game_start(self, data=None):
pass pass
@ -79,11 +79,11 @@ class VoteGroup:
# Do what you voted on # Do what you voted on
pass pass
async def register_player(self, player): async def register_players(self, *players):
""" """
Add a player to player list Extend players by passed list
""" """
self.players.append(player) self.players.extend(players)
async def remove_player(self, player): async def remove_player(self, player):
""" """