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

work it right

Browse Source
This commit is contained in:
Bobloy 2018-04-25 13:42:40 -04:00
parent d73c452015
commit 707b0453e9
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
werewolf/builder.py
View File

@ -117,7 +117,6 @@ async def parse_code(code, game):
if len(built) < digits: if len(built) < digits:
built += c built += c
continue
try: try:
idx = int(built) idx = int(built)

16
werewolf/werewolf.py
View File

@ -123,11 +123,17 @@ class Werewolf:
""" """
Stops the current game Stops the current game
""" """
game = await self._get_game(ctx) if ctx.guild is None:
if not game: # Private message, can't get guild
await ctx.send("No game running, cannot stop") await ctx.send("Cannot start game from PM!")
return
if ctx.guild.id not in self.games or self.games[ctx.guild.id].game_over:
await ctx.send("No game to stop")
return
game = await self._get_game(ctx)
game.game_over = True game.game_over = True
await ctx.sent("Game has been stopped")
@commands.guild_only() @commands.guild_only()
@ww.command() @ww.command()
@ -196,14 +202,14 @@ class Werewolf:
async def _get_game(self, ctx: RedContext, game_code=None): async def _get_game(self, ctx: RedContext, game_code=None):
if ctx.guild is None: if ctx.guild is None:
# Private message, can't get guild # Private message, can't get guild
ctx.send("Cannot start game from PM!") await ctx.send("Cannot start game from PM!")
return None return None
if ctx.guild.id not in self.games or self.games[ctx.guild.id].game_over: if ctx.guild.id not in self.games or self.games[ctx.guild.id].game_over:
await ctx.send("Starting a new game...") await ctx.send("Starting a new game...")
role_id = await self.config.guild(ctx.guild).role_id() role_id = await self.config.guild(ctx.guild).role_id()
role = discord.utils.get(ctx.guild.roles, id=role_id) role = discord.utils.get(ctx.guild.roles, id=role_id)
if role is None: if role is None:
ctx.send("Game role is invalid, cannot start new game") await ctx.send("Game role is invalid, cannot start new game")
return None return None
self.games[ctx.guild.id] = Game(ctx.guild, role, game_code) self.games[ctx.guild.id] = Game(ctx.guild, role, game_code)