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

Merged changes from Vgr

Browse Source
This commit is contained in:
Jimmy Cao 2013-01-10 16:54:08 -06:00
commit 3ac2f71411
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
modules/wolfgame.py
View File

@ -2111,7 +2111,7 @@ def transition_night(cli):
cli.msg(harlot, ('You are a \u0002harlot\u0002. '+
'You may spend the night with one person per round. '+
'If you visit a victim of a wolf, or visit a wolf, '+
'you will die. Use !visit to visit a player.'))
'you will die. Use visit to visit a player.'))
else:
cli.notice(harlot, "You are a \02harlot\02.") # !simple
pm(cli, harlot, "Players: "+", ".join(pl))
@ -2124,7 +2124,7 @@ def transition_night(cli):
cli.msg(g_angel, ('You are a \u0002guardian angel\u0002. '+
'It is your job to protect the villagers. If you guard a'+
' wolf, there is a 50/50 chance of you dying, if you guard '+
'a victim, they will live. Use !guard to guard a player.'))
'a victim, they will live. Use guard to guard a player.'))
else:
cli.notice(g_angel, "You are a \02guardian angel\02.") # !simple
pm(cli, g_angel, "Players: " + ", ".join(pl))
@ -2140,7 +2140,7 @@ def transition_night(cli):
"identity of all users, even traitors.\n"+
"But, each time you use your ability, you risk a 2/5 "+
"chance of having your identity revealed to the wolves. So be "+
"careful. Use \"!id\" to identify any player during the day."))
"careful. Use \"{0}id\" to identify any player during the day.").format(botconfig.CMD_CHAR))
else:
cli.notice(dttv, "You are a \02detective\02.") # !simple
pm(cli, dttv, "Players: " + ", ".join(pl))

5
settings/wolfgame.py
View File

@ -72,7 +72,10 @@ LYNCH_MESSAGES = ("The villagers, after much debate, finally decide on lynching
"Under a lot of noise, the pitchfork-bearing villagers lynch \u0002{0}\u0002, who turned out to be... a \u0002{1}\u0002.",
"The mob drags a protesting \u0002{0}\u0002 to the hanging tree. S/He succumbs to the will of the horde, and is hanged. It is discovered (s)he was a \u0002{1}\u0002.",
"Resigned to his/her fate, \u0002{0}\u0002 is led to the gallows. After death, it is discovered (s)he was a \u0002{1}\u0002.")
RULES = ("#wolfgame channel rules: 1) Be nice to others. 2) Do not share information "+
import botconfig
RULES = (botconfig.CHANNEL + " channel rules: 1) Be nice to others. 2) Do not share information "+
"after death. 3) No bots allowed. 4) Do not play with clones.\n"+
"5) Do not quit unless you need to leave. 6) No swearing and keep it "+
"family-friendly. 7) Do not paste PM's from the bot during the game. "+