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

partial matches work with !game/!fgame, also using !fgame on an invalid roleset will no longer reset it to default

Browse Source
This commit is contained in:
jacob1 2014-11-28 22:41:03 -05:00
parent c964b556de
commit 788707ffb1
1 changed files with 34 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
modules/wolfgame.py
View File

@ -5942,21 +5942,32 @@ def game(cli, nick, chan, rest):
return return
if rest: if rest:
roleset = rest.split(' ')[0] roleset = rest.lower().split()[0]
else: else:
rolesets = ", ".join(["\002{}\002".format(roleset) if len(var.list_players()) in range(var.GAME_MODES[roleset][1], rolesets = ", ".join(["\002{}\002".format(roleset) if len(var.list_players()) in range(var.GAME_MODES[roleset][1],
var.GAME_MODES[roleset][2]+1) else roleset for roleset in var.GAME_MODES.keys() if var.GAME_MODES[roleset][3] > 0]) var.GAME_MODES[roleset][2]+1) else roleset for roleset in var.GAME_MODES.keys() if var.GAME_MODES[roleset][3] > 0])
cli.notice(nick, "No roleset specified. Available rolesets: " + rolesets) cli.notice(nick, "No roleset specified. Available rolesets: " + rolesets)
return return
if roleset in var.GAME_MODES.keys(): if roleset not in var.GAME_MODES.keys():
if var.GAME_MODES[roleset][3] > 0: #players can vote by only using partial name
var.ROLESET_VOTES[cloak] = roleset matches = 0
cli.msg(chan, "\002{0}\002 votes for the \002{1}\002 roleset.".format(nick, roleset)) possibleroleset = roleset
for gamemode in var.GAME_MODES.keys():
if gamemode.startswith(roleset) and var.GAME_MODES[gamemode][3] > 0:
possibleroleset = gamemode
matches += 1
if matches != 1:
cli.notice(nick, "\002{0}\002 isn't a valid roleset.".format(roleset))
return
else: else:
cli.notice(nick, "You can't vote for that roleset.") roleset = possibleroleset
if var.GAME_MODES[roleset][3] > 0:
var.ROLESET_VOTES[cloak] = roleset
cli.msg(chan, "\002{0}\002 votes for the \002{1}\002 roleset.".format(nick, roleset))
else: else:
cli.notice(nick, "\002{0}\002 isn't a valid roleset.".format(roleset)) cli.notice(nick, "You can't vote for that roleset.")
def game_help(args=''): def game_help(args=''):
return "Votes to make a specific roleset more likely. Available game mode setters: " +\ return "Votes to make a specific roleset more likely. Available game mode setters: " +\
@ -6116,14 +6127,25 @@ if botconfig.DEBUG_MODE or botconfig.ALLOWED_NORMAL_MODE_COMMANDS:
cli.notice(nick, 'You\'re currently not playing.') cli.notice(nick, 'You\'re currently not playing.')
return return
rest = rest.strip().lower()
if rest: if rest:
if cgamemode(cli, rest): rest = roleset = rest.lower().split()[0]
if rest not in var.GAME_MODES.keys():
#players can vote by only using partial name
matches = 0
for gamemode in var.GAME_MODES.keys():
if gamemode.startswith(rest):
roleset = gamemode
matches += 1
if matches != 1:
cli.notice(nick, "\002{0}\002 isn't a valid roleset.".format(rest))
return
if cgamemode(cli, roleset):
cli.msg(chan, ('\u0002{}\u0002 has changed the game settings ' cli.msg(chan, ('\u0002{}\u0002 has changed the game settings '
'successfully.').format(nick)) 'successfully.').format(nick))
var.FGAMED = True var.FGAMED = True
else:
cli.notice(nick, fgame.__doc__())
def fgame_help(args=''): def fgame_help(args=''):
args = args.strip() args = args.strip()