Browse Source

!rforce gunner now works

master
jcao219 13 years ago
parent
commit
acc26cbc3e
  1. 3
      var.py
  2. 13
      wolfgame.py

3
var.py

@ -16,7 +16,8 @@ AWAY = [] # cloaks of people who are away.
# HIT MISS SUICIDE # HIT MISS SUICIDE
GUN_CHANCES = ( 5/7 , 1/7 , 1/7 ) GUN_CHANCES = ( 5/7 , 1/7 , 1/7 )
DRUNK_GUN_CHANCES = ( 4/7 , 2/7 , 1/7 ) DRUNK_GUN_CHANCES = ( 4/7 , 2/7 , 1/7 )
MANSLAUGHTER_CHANCE = 1/5 MANSLAUGHTER_CHANCE = 1/5 # ACCIDENTAL HEADSHOT (FATAL)
GUNNER_KILLS_WOLF_AT_NIGHT_CHANCE = 1/2 GUNNER_KILLS_WOLF_AT_NIGHT_CHANCE = 1/2
GUARDIAN_ANGEL_DIES_CHANCE = 1/2 GUARDIAN_ANGEL_DIES_CHANCE = 1/2
DETECTIVE_REVEALED_CHANCE = 2/5 DETECTIVE_REVEALED_CHANCE = 2/5

13
wolfgame.py

@ -2031,24 +2031,29 @@ if botconfig.DEBUG_MODE:
if len(rst) < 2: if len(rst) < 2:
cli.msg(chan, "The syntax is incorrect.") cli.msg(chan, "The syntax is incorrect.")
return return
who = rst.pop(0).strip() who = rst.pop(0).strip().lower()
who.replace("_", " ") who.replace("_", " ")
if who not in var.ROLES or not var.ROLES[who]: if (who not in var.ROLES or not var.ROLES[who]) and (who != "gunner"
or var.PHASE in ("none", "join")):
cli.msg(chan, nick+": invalid role") cli.msg(chan, nick+": invalid role")
return return
elif who == "gunner":
tgt = list(var.GUNNERS.keys())
else:
tgt = var.ROLES[who]
cmd = rst.pop(0).lower().replace(botconfig.CMD_CHAR, "", 1) cmd = rst.pop(0).lower().replace(botconfig.CMD_CHAR, "", 1)
if cmd in PM_COMMANDS.keys() and not PM_COMMANDS[cmd][0].owner_only: if cmd in PM_COMMANDS.keys() and not PM_COMMANDS[cmd][0].owner_only:
for fn in PM_COMMANDS[cmd]: for fn in PM_COMMANDS[cmd]:
for guy in var.ROLES[who]: for guy in tgt:
fn(cli, guy, " ".join(rst)) fn(cli, guy, " ".join(rst))
cli.msg(chan, "Operation successful.") cli.msg(chan, "Operation successful.")
#if var.PHASE == "night": <- Causes problems with night starting twice. #if var.PHASE == "night": <- Causes problems with night starting twice.
# chk_nightdone(cli) # chk_nightdone(cli)
elif cmd.lower() in COMMANDS.keys() and not COMMANDS[cmd][0].owner_only: elif cmd.lower() in COMMANDS.keys() and not COMMANDS[cmd][0].owner_only:
for fn in COMMANDS[cmd]: for fn in COMMANDS[cmd]:
for guy in var.ROLES[who]: for guy in tgt:
fn(cli, guy, chan, " ".join(rst)) fn(cli, guy, chan, " ".join(rst))
cli.msg(chan, "Operation successful.") cli.msg(chan, "Operation successful.")
else: else:

Loading…
Cancel
Save