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

Shooting a werecrow tells you it was one.

Browse Source 
Also some other small changes.
This commit is contained in:
jacob1 2014-02-07 23:48:55 -05:00
parent 781317785d
commit 193387bb0f
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
modules/wolfgame.py
View File

@ -403,10 +403,11 @@ def join(cli, nick, chann_, rest):
var.PHASE = "join" var.PHASE = "join"
var.WAITED = 0 var.WAITED = 0
var.GAME_ID = time.time() var.GAME_ID = time.time()
var.JOINED_THIS_GAME.append(cloak)
var.CAN_START_TIME = datetime.now() + timedelta(seconds=var.MINIMUM_WAIT) var.CAN_START_TIME = datetime.now() + timedelta(seconds=var.MINIMUM_WAIT)
cli.msg(chan, ('\u0002{0}\u0002 has started a game of Werewolf. '+ cli.msg(chan, ('\u0002{0}\u0002 has started a game of Werewolf. '+
'Type "{1}join" to join. Type "{1}start" to start the game. '+ 'Type "{1}join" to join. Type "{1}start" to start the game. '+
'Type "{1}wait" to increase join wait time.').format(nick, botconfig.CMD_CHAR)) 'Type "{1}wait" to increase start wait time.').format(nick, botconfig.CMD_CHAR))
elif nick in pl: elif nick in pl:
cli.notice(nick, "You're already playing!") cli.notice(nick, "You're already playing!")
elif len(pl) >= var.MAX_PLAYERS: elif len(pl) >= var.MAX_PLAYERS:
@ -1445,8 +1446,7 @@ def transition_day(cli, gameid=0):
if r < var.GUARDIAN_ANGEL_DIES_CHANCE: if r < var.GUARDIAN_ANGEL_DIES_CHANCE:
message.append(("\02{0}\02, a \02guardian angel\02, "+ message.append(("\02{0}\02, a \02guardian angel\02, "+
"made the unfortunate mistake of guarding a wolf "+ "made the unfortunate mistake of guarding a wolf "+
"last night, attempted to escape, but failed "+ "last night, and is now dead.").format(gangel))
"and is now dead.").format(gangel))
var.LOGGER.logBare(gangel, "KILLEDWHENGUARDINGWOLF") var.LOGGER.logBare(gangel, "KILLEDWHENGUARDINGWOLF")
dead.append(gangel) dead.append(gangel)
cli.msg(chan, "\n".join(message)) cli.msg(chan, "\n".join(message))
@ -1670,10 +1670,10 @@ def shoot(cli, nick, chann_, rest):
var.LOGGER.logMessage("{0} shoots {1} with a silver bullet!".format(nick, victim)) var.LOGGER.logMessage("{0} shoots {1} with a silver bullet!".format(nick, victim))
victimrole = var.get_role(victim) victimrole = var.get_role(victim)
if victimrole in ("wolf", "werecrow"): if victimrole in ("wolf", "werecrow"):
cli.msg(chan, ("\u0002{0}\u0002 is a wolf, and is dying from "+ cli.msg(chan, ("\u0002{0}\u0002 is a {1}, and is dying from "+
"the silver bullet.").format(victim)) "the silver bullet.").format(victim, victimrole))
var.LOGGER.logMessage(("{0} is a wolf, and is dying from the "+ var.LOGGER.logMessage(("{0} is a {1}, and is dying from the "+
"silver bullet.").format(victim)) "silver bullet.").format(victim, victimrole))
if not del_player(cli, victim): if not del_player(cli, victim):
return return
elif random.random() <= var.MANSLAUGHTER_CHANCE: elif random.random() <= var.MANSLAUGHTER_CHANCE: