notnull/banned
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fixed some bugs

Browse Source
This commit is contained in:
Jimmy Cao 2011-07-06 02:33:00 -05:00
parent 21db485932
commit 25369f43be
1 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
wolfgame.py
View File

@ -5,6 +5,7 @@ import decorators
from datetime import datetime, timedelta
import threading
import random
import copy
COMMANDS = {}
PM_COMMANDS = {}
@ -269,7 +270,7 @@ def chk_win(cli):
cli.msg(chan, "No more players remaining. Game ended.")
reset(cli)
return True
if len(vars.ROLES["wolf"]) >= lpl / 2:
elif len(vars.ROLES["wolf"]) >= lpl / 2:
cli.msg(chan, ("Game over! There are the same number of wolves as "+
"villagers. The wolves eat everyone, and win."))
elif not len(vars.ROLES["wolf"]) and not vars.ROLES.get("traitor", 0):
@ -282,6 +283,15 @@ def chk_win(cli):
else:
return False
if vars.DAY_START_TIME:
now = datetime.now()
td = now - vars.DAY_START_TIME
vars.DAY_TIMEDELTA += td
if vars.NIGHT_START_TIME:
now = datetime.now()
td = now - vars.NIGHT_START_TIME
vars.NIGHT_TIMEDELTA += td
daymin, daysec = vars.DAY_TIMEDELTA.seconds // 60, vars.DAY_TIMEDELTA.seconds % 60
nitemin, nitesec = vars.NIGHT_TIMEDELTA.seconds // 60, vars.NIGHT_TIMEDELTA.seconds % 60
total = vars.DAY_TIMEDELTA + vars.NIGHT_TIMEDELTA
@ -375,6 +385,7 @@ def transition_day(cli):
vars.DAY_START_TIME = datetime.now()
td = vars.DAY_START_TIME - vars.NIGHT_START_TIME
vars.NIGHT_START_TIME = None
vars.NIGHT_TIMEDELTA += td
min, sec = td.seconds // 60, td.seconds % 60
@ -539,6 +550,7 @@ def transition_night(cli):
daydur_msg = ""
if vars.NIGHT_TIMEDELTA: # transition from day
td = vars.NIGHT_START_TIME - vars.DAY_START_TIME
vars.DAY_START_TIME = None
vars.DAY_TIMEDELTA += td
min, sec = td.seconds // 60, td.seconds % 60
daydur_msg = "Day lasted \u0002{0:0>2}:{1:0>2}. ".format(min,sec)
@ -647,9 +659,11 @@ def start(cli, nick, chan, rest):
"game (a theme of Mafia).").format(", ".join(vars.list_players())))
cli.mode(chan, "+m")
vars.ORIGINAL_ROLES = vars.ROLES.copy() # Make a copy
vars.ORIGINAL_ROLES = copy.deepcopy(vars.ROLES) # Make a copy
vars.DAY_TIMEDELTA = timedelta(0)
vars.NIGHT_TIMEDELTA = timedelta(0)
vars.DAY_START_TIME = None
vars.NIGHT_START_TIME = None
transition_night(cli)