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

use make_stasis correctly

Browse Source 
remove stasis when a player returns (sort of)
This commit is contained in:
Eitan Adler 2013-06-01 16:04:19 +02:00
parent 9a1571fbf4
commit 80d494bf86
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
modules/wolfgame.py
View File

@ -1006,14 +1006,14 @@ def reaper(cli, gameid):
cli.msg(chan, ("\02{0}\02 died due to a fatal attack by wild animals. Appears (s)he "+ cli.msg(chan, ("\02{0}\02 died due to a fatal attack by wild animals. Appears (s)he "+
"was a \02{1}\02.").format(dcedplayer, var.get_role(dcedplayer))) "was a \02{1}\02.").format(dcedplayer, var.get_role(dcedplayer)))
if var.PHASE != "join": if var.PHASE != "join":
make_stasis(cloak, var.PART_STASIS_PENALTY) make_stasis(dcedplayer, var.PART_STASIS_PENALTY)
if not del_player(cli, dcedplayer, devoice = False): if not del_player(cli, dcedplayer, devoice = False):
return return
elif what == "part" and (datetime.now() - timeofdc) > timedelta(seconds=var.PART_GRACE_TIME): elif what == "part" and (datetime.now() - timeofdc) > timedelta(seconds=var.PART_GRACE_TIME):
cli.msg(chan, ("\02{0}\02 died due to eating poisonous berries. Appears (s)he was "+ cli.msg(chan, ("\02{0}\02 died due to eating poisonous berries. Appears (s)he was "+
"a \02{1}\02.").format(dcedplayer, var.get_role(dcedplayer))) "a \02{1}\02.").format(dcedplayer, var.get_role(dcedplayer)))
if var.PHASE != "join": if var.PHASE != "join":
make_stais(cloak, var.PART_STASIS_PENALTY) make_stasis(dcedplayer, var.PART_STASIS_PENALTY)
if not del_player(cli, dcedplayer, devoice = False): if not del_player(cli, dcedplayer, devoice = False):
return return
time.sleep(10) time.sleep(10)
@ -1053,6 +1053,7 @@ def on_join(cli, raw_nick, chan, acc="*", rname=""):
del var.DISCONNECTED[nick] del var.DISCONNECTED[nick]
var.LAST_SAID_TIME[nick] = datetime.now() var.LAST_SAID_TIME[nick] = datetime.now()
cli.msg(chan, "\02{0}\02 has returned to the village.".format(nick)) cli.msg(chan, "\02{0}\02 has returned to the village.".format(nick))
make_stasis(nick, var.PART_STASIS_PENALTY)
for r,rlist in var.ORIGINAL_ROLES.items(): for r,rlist in var.ORIGINAL_ROLES.items():
if "(dced)"+nick in rlist: if "(dced)"+nick in rlist:
rlist.remove("(dced)"+nick) rlist.remove("(dced)"+nick)