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

fix doing !roles default when in another game mode

Browse Source 
has to check ORIGINAL_SETTINGS to get them since 'default' itself doesn't define any settings
This commit is contained in:
jacob1 2015-03-09 00:40:34 -04:00
parent 1e7783bad5
commit 47100dd2eb
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
modules/wolfgame.py
View File

@ -6658,10 +6658,12 @@ def listroles(cli, nick, chan, rest):
gamemode, _ = complete_match(rest[0], var.GAME_MODES.keys() - ["roles"]) gamemode, _ = complete_match(rest[0], var.GAME_MODES.keys() - ["roles"])
if gamemode in var.GAME_MODES.keys() and gamemode != "roles" and not var.GAME_MODES[gamemode][4]: if gamemode in var.GAME_MODES.keys() and gamemode != "roles" and not var.GAME_MODES[gamemode][4]:
mode = var.GAME_MODES[gamemode][0]() mode = var.GAME_MODES[gamemode][0]()
if hasattr(mode, "ROLE_INDEX"): if hasattr(mode, "ROLE_INDEX") and hasattr(mode, "ROLE_GUIDE"):
roleindex = getattr(mode, "ROLE_INDEX") roleindex = getattr(mode, "ROLE_INDEX")
if hasattr(mode, "ROLE_GUIDE"):
roleguide = getattr(mode, "ROLE_GUIDE") roleguide = getattr(mode, "ROLE_GUIDE")
elif gamemode == "default" and "ROLE_INDEX" in var.ORIGINAL_SETTINGS and "ROLE_GUIDE" in var.ORIGINAL_SETTINGS:
roleindex = var.ORIGINAL_SETTINGS["ROLE_INDEX"]
roleguide = var.ORIGINAL_SETTINGS["ROLE_GUIDE"]
rest.pop(0) rest.pop(0)
else: else:
if gamemode in var.GAME_MODES and var.GAME_MODES[gamemode][4]: if gamemode in var.GAME_MODES and var.GAME_MODES[gamemode][4]: