Revert "Fix reset_modes"
This reverts commit a02b9792bb985a51719d636742b739c359eefd53.
This commit is contained in:
parent
a02b9792bb
commit
610b33b2a6
@ -160,7 +160,7 @@ def reset_settings():
|
|||||||
setattr(var, attr, var.ORIGINAL_SETTINGS[attr])
|
setattr(var, attr, var.ORIGINAL_SETTINGS[attr])
|
||||||
dict.clear(var.ORIGINAL_SETTINGS)
|
dict.clear(var.ORIGINAL_SETTINGS)
|
||||||
|
|
||||||
def reset_modes(cli, chan):
|
def reset_modes(cli):
|
||||||
cli.mode(chan, "-m")
|
cli.mode(chan, "-m")
|
||||||
cmodes = []
|
cmodes = []
|
||||||
for plr in var.list_players():
|
for plr in var.list_players():
|
||||||
@ -208,7 +208,7 @@ def forced_exit(cli, nick, *rest): # Admin Only
|
|||||||
if var.PHASE in ("day", "night"):
|
if var.PHASE in ("day", "night"):
|
||||||
stop_game(cli)
|
stop_game(cli)
|
||||||
else:
|
else:
|
||||||
reset_modes(cli, botconfig.CHANNEL)
|
reset_modes(cli)
|
||||||
reset(cli)
|
reset(cli)
|
||||||
|
|
||||||
cli.quit("Forced quit from "+nick)
|
cli.quit("Forced quit from "+nick)
|
||||||
@ -223,7 +223,7 @@ def restart_program(cli, nick, *rest):
|
|||||||
if var.PHASE in ("day", "night"):
|
if var.PHASE in ("day", "night"):
|
||||||
stop_game(cli)
|
stop_game(cli)
|
||||||
else:
|
else:
|
||||||
reset_modes(cli, botconfig.CHANNEL)
|
reset_modes(cli)
|
||||||
reset(cli)
|
reset(cli)
|
||||||
|
|
||||||
cli.quit("Forced restart from "+nick)
|
cli.quit("Forced restart from "+nick)
|
||||||
@ -810,7 +810,7 @@ def stop_game(cli, winner = ""):
|
|||||||
var.plural(role)))
|
var.plural(role)))
|
||||||
cli.msg(chan, " ".join(roles_msg))
|
cli.msg(chan, " ".join(roles_msg))
|
||||||
|
|
||||||
reset_modes(cli, chan)
|
reset_modes(cli)
|
||||||
|
|
||||||
plrl = []
|
plrl = []
|
||||||
for role,ppl in var.ORIGINAL_ROLES.items():
|
for role,ppl in var.ORIGINAL_ROLES.items():
|
||||||
@ -880,7 +880,7 @@ def chk_win(cli, end_game = True):
|
|||||||
|
|
||||||
if lpl == 0:
|
if lpl == 0:
|
||||||
#cli.msg(chan, "No more players remaining. Game ended.")
|
#cli.msg(chan, "No more players remaining. Game ended.")
|
||||||
reset_modes(cli, chan)
|
reset_modes(cli)
|
||||||
reset(cli)
|
reset(cli)
|
||||||
return True
|
return True
|
||||||
|
|
||||||
@ -2653,7 +2653,7 @@ def reset_game(cli, nick, chan, rest):
|
|||||||
if var.PHASE != "join":
|
if var.PHASE != "join":
|
||||||
stop_game(cli)
|
stop_game(cli)
|
||||||
else:
|
else:
|
||||||
reset_modes(cli, botconfig.CHANNEL)
|
reset_modes(cli)
|
||||||
reset(cli)
|
reset(cli)
|
||||||
|
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user