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

close to running

Browse Source
This commit is contained in:
bobloy 2018-04-07 19:28:44 -04:00
parent 92ffcb43de
commit ccb8d83dc0
7 changed files with 64 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
werewolf/builder.py
View File

@ -21,13 +21,14 @@ role_list = [Villager, VanillaWerewolf]
# 0,0,0,1,11,12,E1,R1,R1,R1,R2,P2 # 0,0,0,1,11,12,E1,R1,R1,R1,R2,P2
# pre-letter = exact role position # pre-letter = exact role position
# double digit position pre-empted by - # double digit position pre-empted by `-`
async def parse_code(code): async def parse_code(code):
out = [] out = []
#Do the magic described above #Do the magic described above
decode = code.copy() # for now, pass exact names decode = code.copy() # for now, pass exact names
for role_id in decode: for role_id in decode:
print(role_id)
if role_id == "Villager": if role_id == "Villager":
role = Villager role = Villager
if role_id == "VanillaWerewolf": if role_id == "VanillaWerewolf":

53
werewolf/game.py
View File

@ -1,5 +1,4 @@
import asyncio import asyncio
import discord import discord
from datetime import datetime, timedelta from datetime import datetime, timedelta
@ -29,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 = ["VanillaWerewolf", "Villager", "Villager"] self.game_code = ["Villager"]
self.roles = [] self.roles = []
@ -61,14 +60,14 @@ class Game:
""" """
if self.game_code: if self.game_code:
await self.get_roles() await self.get_roles()
else:
await ctx.send("Number of players does not match number of roles, adjust before starting")
return False
if len(self.players) != self.roles: if len(self.players) != len(self.roles):
await ctx.send("Player count does not match role count, cannot start") await ctx.send("Player count does not match role count, cannot start")
self.roles = [] self.roles = []
return False return False
await self.assign_roles()
# Create category and channel with individual overwrites # Create category and channel with individual overwrites
overwrite = { overwrite = {
self.guild.default_role: discord.PermissionOverwrite(read_messages=False, send_messages=True), self.guild.default_role: discord.PermissionOverwrite(read_messages=False, send_messages=True),
@ -83,7 +82,8 @@ class Game:
self.village_channel = await self.guild.create_text_channel("Village Square", overwrites=overwrite, reason="New game of werewolf", category=self.channel_category) self.village_channel = await self.guild.create_text_channel("Village Square", overwrites=overwrite, reason="New game of werewolf", category=self.channel_category)
# Assuming everything worked so far # Assuming everything worked so far
await self._at_day_start() # This will queue channels and votegroups to be made print("Pre-game_start")
await self._at_game_start() # This will queue channels and votegroups to be made
for channel_id in self.p_channels: for channel_id in self.p_channels:
overwrite = { overwrite = {
@ -103,6 +103,9 @@ class Game:
await vote_group.register_player() await vote_group.register_player()
self.vote_groups[channel_id] = self.p_channels[channel_id]["votegroup"](self, channel) self.vote_groups[channel_id] = self.p_channels[channel_id]["votegroup"](self, channel)
print("Pre-cycle")
await asyncio.sleep(1)
await self._cycle() # Start the loop
############START Notify structure############ ############START Notify structure############
async def _cycle(self): async def _cycle(self):
@ -139,7 +142,7 @@ class Game:
self.can_vote = True self.can_vote = True
asyncio.sleep(240) # 4 minute days await asyncio.sleep(240) # 4 minute days
if not self.can_vote or self.game_over: if not self.can_vote or self.game_over:
return return
@ -157,7 +160,7 @@ class Game:
await self.all_but_perms(self.village_channel, target) await self.all_but_perms(self.village_channel, target)
await self.village_channel.send("{} will be put to trial and has 30 seconds to defend themselves".format(target.mention)) await self.village_channel.send("{} will be put to trial and has 30 seconds to defend themselves".format(target.mention))
asyncio.sleep(30) await asyncio.sleep(30)
await self.village_channel.set_permissions(target, read_messages=True) await self.village_channel.set_permissions(target, read_messages=True)
@ -166,7 +169,7 @@ class Game:
await self.village_channel.add_reaction("👍") await self.village_channel.add_reaction("👍")
await self.village_channel.add_reaction("👎") await self.village_channel.add_reaction("👎")
asyncio.sleep(15) await asyncio.sleep(15)
reaction_list = message.reactions reaction_list = message.reactions
@ -215,7 +218,7 @@ class Game:
await self.village_channel.send("**The sun sets on the village...**") await self.village_channel.send("**The sun sets on the village...**")
await self._notify(5) await self._notify(5)
asyncio.sleep(30) await asyncio.sleep(30)
await self._at_night_start() await self._at_night_start()
async def _at_night_start(self): # ID 6 async def _at_night_start(self): # ID 6
@ -223,11 +226,11 @@ class Game:
return return
await self._notify(6) await self._notify(6)
asyncio.sleep(120) # 2 minutes await asyncio.sleep(120) # 2 minutes
asyncio.sleep(90) # 1.5 minutes await asyncio.sleep(90) # 1.5 minutes
asyncio.sleep(30) # .5 minutes await asyncio.sleep(30) # .5 minutes
await self._at_night_end() await self._at_night_end()
@ -236,22 +239,22 @@ class Game:
return return
await self._notify(7) await self._notify(7)
asyncio.sleep(15) await asyncio.sleep(15)
await self._at_day_start() await self._at_day_start()
async def _notify(self, event, data=None): async def _notify(self, event, data=None):
for i in range(10): for i in range(8):
tasks = [] tasks = []
# Role priorities # Role priorities
role_order = [role for role in self.roles if role.action_list[event][1]==i] role_order = [role for role in self.roles if role.action_list[event][1]==i]
for role in role_order: for role in role_order:
tasks.append(asyncio.ensure_future(role.on_event(event, data))) 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 = [votes for votes in self.vote_groups.values() if votes.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))) tasks.append(asyncio.ensure_future(vote_group.on_event(event, data), loop=self.loop))
self.loop.run_until_complete(asyncio.gather(*tasks)) await asyncio.gather(*tasks)
# Run same-priority task simultaneously # Run same-priority task simultaneously
############END Notify structure############ ############END Notify structure############
@ -374,10 +377,10 @@ class Game:
await self.dead_perms(target.member) await self.dead_perms(target.member)
async def get_roles(self, game_code=None): async def get_roles(self, game_code=None):
if game_code: if game_code is not None:
self.game_code=game_code self.game_code=game_code
if not self.game_code: if self.game_code is None:
return False return False
self.roles = await parse_code(self.game_code) self.roles = await parse_code(self.game_code)
@ -385,6 +388,14 @@ class Game:
if not self.roles: if not self.roles:
return False return False
async def assign_roles(self):
"""len(self.roles) must == len(self.players)"""
shuffle(self.roles)
for idx, role in enumerate(self.roles):
self.roles[idx] = role(self)
await self.roles[idx].assign_player(self.players[idx])
async def get_player_by_member(self, member): async def get_player_by_member(self, member):
for player in self.players: for player in self.players:
if player.member == member: if player.member == member:

2
werewolf/role.py
View File

@ -71,7 +71,7 @@ class Role:
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 assign_player(self, player): async def assign_player(self, player):

10
werewolf/roles/vanillawerewolf.py
View File

@ -21,10 +21,10 @@ class VanillaWerewolf(Role):
def __init__(self, game): def __init__(self, game):
# self.game = game self.game = game
# self.player = None self.player = None
# self.blocked = False self.blocked = False
# self.properties = {} # Extra data for other roles (i.e. arsonist) self.properties = {} # Extra data for other roles (i.e. arsonist)
self.action_list = [ self.action_list = [
(self._at_game_start, 0), # (Action, Priority) (self._at_game_start, 0), # (Action, Priority)
(self._at_day_start, 0), (self._at_day_start, 0),
@ -41,7 +41,7 @@ class VanillaWerewolf(Role):
# 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 assign_player(self, player): # async def assign_player(self, player):
# """ # """

24
werewolf/roles/villager.py
View File

@ -15,19 +15,29 @@ class Villager(Role):
Lynch players during the day with `[p]ww lynch <ID>` Lynch players during the day with `[p]ww lynch <ID>`
""" """
# def __init__(self, game): def __init__(self, game):
# self.game = game self.game = game
# self.player = None self.player = None
# self.blocked = False self.blocked = False
# self.secret_channel = None self.properties = {} # Extra data for other roles (i.e. arsonist)
# self.properties = {} # Extra data for other roles (i.e. arsonist)
self.action_list = [
(self._at_game_start, 0), # (Action, Priority)
(self._at_day_start, 0),
(self._at_voted, 0),
(self._at_kill, 0),
(self._at_hang, 0),
(self._at_day_end, 0),
(self._at_night_start, 0),
(self._at_night_end, 0)
]
# async def on_event(self, event, data): # async def on_event(self, event, data):
# """ # """
# 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 assign_player(self, player): # async def assign_player(self, player):

11
werewolf/votegroups/wolfvote.py
View File

@ -19,12 +19,11 @@ class WolfVote(VoteGroup):
"**{ID}** - {target} was found torn to shreds"] "**{ID}** - {target} was found torn to shreds"]
def __init__(self, game, channel): def __init__(self, game, channel):
# self.game = game self.game = game
# self.channel = channel self.channel = channel
# self.players = [] self.players = []
# self.vote_results = {} self.vote_results = {}
# self.properties = {} # Extra data for other options self.properties = {} # Extra data for other options
super().__init__(game, channel)
self.killer = None # Added killer self.killer = None # Added killer

4
werewolf/werewolf.py
View File

@ -79,7 +79,7 @@ class Werewolf:
""" """
Checks number of players and attempts to start the game Checks number of players and attempts to start the game
""" """
game = self._get_game(guild) game = self._get_game(ctx.guild)
if not game: if not game:
await ctx.send("No game running, cannot start") await ctx.send("No game running, cannot start")
@ -90,7 +90,7 @@ class Werewolf:
""" """
Vote for a player by ID Vote for a player by ID
""" """
game = self._get_game(guild) game = self._get_game(ctx.guild)
if not game: if not game:
await ctx.send("No game running, cannot vote") await ctx.send("No game running, cannot vote")