From f45a6279d52f920c99fb8c7a0d4bf2fee36d5d6e Mon Sep 17 00:00:00 2001 From: skizzerz Date: Sat, 19 Jul 2014 18:47:17 -0500 Subject: [PATCH] Time lord changes: Bump day time down to 60s and night time down to 30s Time lord triggers if they die during day for any reason (except idling) Reduce rate limit for !time to 10s instead of 60 --- modules/wolfgame.py | 47 +++++++++++++++++++++----------------------- settings/wolfgame.py | 12 +++++------ 2 files changed, 28 insertions(+), 31 deletions(-) diff --git a/modules/wolfgame.py b/modules/wolfgame.py index 4fa7a8a..9b9c189 100644 --- a/modules/wolfgame.py +++ b/modules/wolfgame.py @@ -886,31 +886,6 @@ def chk_decision(cli): var.LOGGER.logMessage(tmsg.replace("\02", "")) var.LOGGER.logBare(votee, "MAD SCIENTIST") cli.msg(botconfig.CHANNEL, tmsg) - # other - elif votee in var.ROLES["time lord"]: - if "DAY_TIME_LIMIT_WARN" not in var.ORIGINAL_SETTINGS: - var.ORIGINAL_SETTINGS["DAY_TIME_LIMIT_WARN"] = var.DAY_TIME_LIMIT_WARN - if "DAY_TIME_LIMIT_CHANGE" not in var.ORIGINAL_SETTINGS: - var.ORIGINAL_SETTINGS["DAY_TIME_LIMIT_CHANGE"] = var.DAY_TIME_LIMIT_CHANGE - if "SHORT_DAY_LIMIT_WARN" not in var.ORIGINAL_SETTINGS: - var.ORIGINAL_SETTINGS["SHORT_DAY_LIMIT_WARN"] = var.SHORT_DAY_LIMIT_WARN - if "SHORT_DAY_LIMIT_CHANGE" not in var.ORIGINAL_SETTINGS: - var.ORIGINAL_SETTINGS["SHORT_DAY_LIMIT_CHANGE"] = var.SHORT_DAY_LIMIT_CHANGE - if "NIGHT_TIME_LIMIT" not in var.ORIGINAL_SETTINGS: - var.ORIGINAL_SETTINGS["NIGHT_TIME_LIMIT"] = var.NIGHT_TIME_LIMIT - if "NIGHT_TIME_WARN" not in var.ORIGINAL_SETTINGS: - var.ORIGINAL_SETTINGS["NIGHT_TIME_WARN"] = var.NIGHT_TIME_WARN - var.DAY_TIME_LIMIT_WARN = var.TIME_LORD_DAY_WARN - var.DAY_TIME_LIMIT_CHANGE = var.TIME_LORD_DAY_CHANGE - var.SHORT_DAY_LIMIT_WARN = var.TIME_LORD_DAY_WARN - var.SHORT_DAY_LIMIT_CHANGE = var.TIME_LORD_DAY_CHANGE - var.NIGHT_TIME_LIMIT = var.TIME_LORD_NIGHT_LIMIT - var.NIGHT_TIME_WARN = var.TIME_LORD_NIGHT_WARN - aftermessage = ("Tick tock! Since the village has lynched the time lord, " + - "day will now only last {0} seconds and night will now only " + - "last {1} seconds!").format( - var.TIME_LORD_DAY_WARN + var.TIME_LORD_DAY_CHANGE, - var.TIME_LORD_NIGHT_LIMIT) if var.ROLE_REVEAL: lmsg = random.choice(var.LYNCH_MESSAGES).format(votee, var.get_reveal_role(votee)) @@ -1347,6 +1322,28 @@ def del_player(cli, nick, forced_death = False, devoice = True, end_game = True, elif nick == clone and nick in var.CLONED: del var.CLONED[nick] + if nickrole == "time lord" and var.GHOSTPHASE == "day": + if "DAY_TIME_LIMIT_WARN" not in var.ORIGINAL_SETTINGS: + var.ORIGINAL_SETTINGS["DAY_TIME_LIMIT_WARN"] = var.DAY_TIME_LIMIT_WARN + if "DAY_TIME_LIMIT_CHANGE" not in var.ORIGINAL_SETTINGS: + var.ORIGINAL_SETTINGS["DAY_TIME_LIMIT_CHANGE"] = var.DAY_TIME_LIMIT_CHANGE + if "SHORT_DAY_LIMIT_WARN" not in var.ORIGINAL_SETTINGS: + var.ORIGINAL_SETTINGS["SHORT_DAY_LIMIT_WARN"] = var.SHORT_DAY_LIMIT_WARN + if "SHORT_DAY_LIMIT_CHANGE" not in var.ORIGINAL_SETTINGS: + var.ORIGINAL_SETTINGS["SHORT_DAY_LIMIT_CHANGE"] = var.SHORT_DAY_LIMIT_CHANGE + if "NIGHT_TIME_LIMIT" not in var.ORIGINAL_SETTINGS: + var.ORIGINAL_SETTINGS["NIGHT_TIME_LIMIT"] = var.NIGHT_TIME_LIMIT + if "NIGHT_TIME_WARN" not in var.ORIGINAL_SETTINGS: + var.ORIGINAL_SETTINGS["NIGHT_TIME_WARN"] = var.NIGHT_TIME_WARN + var.DAY_TIME_LIMIT_WARN = var.TIME_LORD_DAY_WARN + var.DAY_TIME_LIMIT_CHANGE = var.TIME_LORD_DAY_CHANGE + var.SHORT_DAY_LIMIT_WARN = var.TIME_LORD_DAY_WARN + var.SHORT_DAY_LIMIT_CHANGE = var.TIME_LORD_DAY_CHANGE + var.NIGHT_TIME_LIMIT = var.TIME_LORD_NIGHT_LIMIT + var.NIGHT_TIME_WARN = var.TIME_LORD_NIGHT_WARN + cli.msg(botconfig.CHANNEL, ("Tick tock! Since the time lord has died during the day, " + + "day will now only last {0} seconds and night will now only " + + "last {1} seconds!").format(var.TIME_LORD_DAY_WARN + var.TIME_LORD_DAY_CHANGE, var.TIME_LORD_NIGHT_LIMIT)) if nickrole == "vengeful ghost": if var.GHOSTPHASE == "night": var.VENGEFUL_GHOSTS[nick] = "wolves" diff --git a/settings/wolfgame.py b/settings/wolfgame.py index d497cc1..c665c59 100644 --- a/settings/wolfgame.py +++ b/settings/wolfgame.py @@ -10,7 +10,7 @@ VOTES_RATE_LIMIT = 60 ADMINS_RATE_LIMIT = 300 GSTATS_RATE_LIMIT = 0 PSTATS_RATE_LIMIT = 0 -TIME_RATE_LIMIT = 60 +TIME_RATE_LIMIT = 10 SHOTS_MULTIPLIER = .12 # ceil(shots_multiplier * len_players) = bullets given SHARPSHOOTER_MULTIPLIER = 0.06 MIN_PLAYERS = 4 @@ -25,11 +25,11 @@ JOIN_TIME_LIMIT = 3600 SHORT_DAY_PLAYERS = 6 # Number of players left to have a short day SHORT_DAY_LIMIT_WARN = 400 SHORT_DAY_LIMIT_CHANGE = 120 -# If time lord is lynched, the timers get set to this instead (90s day, 60s night) -TIME_LORD_DAY_WARN = 60 -TIME_LORD_DAY_CHANGE = 30 -TIME_LORD_NIGHT_LIMIT = 60 -TIME_LORD_NIGHT_WARN = 40 +# If time lord is lynched, the timers get set to this instead (60s day, 30s night) +TIME_LORD_DAY_WARN = 45 +TIME_LORD_DAY_CHANGE = 15 +TIME_LORD_NIGHT_LIMIT = 30 +TIME_LORD_NIGHT_WARN = 20 KILL_IDLE_TIME = 300 WARN_IDLE_TIME = 180 PART_GRACE_TIME = 30