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

fix duplication and possible empty player list in the message previously charmed players get

Browse Source
This commit is contained in:
jacob1 2015-08-28 01:35:30 -04:00
parent 36c56f8f5f
commit 5bc3a96203
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/wolfgame.py
View File

@ -3745,13 +3745,18 @@ def transition_day(cli, gameid=0):
if len(tobecharmedlist) == 1: if len(tobecharmedlist) == 1:
message = "\u0002{0}\u0002 is now charmed!".format(tobecharmedlist[0]) message = "\u0002{0}\u0002 is now charmed!".format(tobecharmedlist[0])
elif len(tobecharmedlist) == 2: elif len(tobecharmedlist) == 2:
message = "\u0002{0}\u0002 and \u0002{1}\u0002 are now charmed".format(tobecharmedlist[0], tobecharmedlist[1]) message = "\u0002{0}\u0002 and \u0002{1}\u0002 are now charmed!".format(tobecharmedlist[0], tobecharmedlist[1])
else: else:
message = "\u0002{0}\u0002, and \u0002{1}\u0002 are also charmed!".format( message = "\u0002{0}\u0002, and \u0002{1}\u0002 are also charmed!".format(
"\u0002, \u0002".join(tobecharmedlist[:-1]), tobecharmedlist[-1]) "\u0002, \u0002".join(tobecharmedlist[:-1]), tobecharmedlist[-1])
pm(cli, victim, message + (" now charmed! Previously charmed players: " previouscharmed = var.CHARMED - {victim}
"{0}").format("\u0002, \u0002".join(var.CHARMED - {victim}))) if len(previouscharmed):
pm(cli, victim, message + (" Previously charmed players: "
"{0}").format("\u0002, \u0002".join(previouscharmed)))
else:
pm(cli, victim, message)
var.CHARMED.update(var.TOBECHARMED) var.CHARMED.update(var.TOBECHARMED)
var.TOBECHARMED.clear() var.TOBECHARMED.clear()