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

Remove care/kill color/bold/startspam settings

Browse Source
This commit is contained in:
skizzerz 2016-07-16 22:48:18 -05:00
parent 04577f15dd
commit d2dc4d2deb
3 changed files with 1 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
messages/en.json
View File

@ -223,12 +223,6 @@
"account_death_2": "\u0002{0}\u0002 fell into a river and was swept away. The villagers couldn't save the \u0002{1}\u0002.",
"account_death_no_reveal": "\u0002{0}\u0002 has died of a heart attack.",
"account_death_no_reveal_2": "\u0002{0}\u0002 fell into a river and was swept away.",
"kick_bold": "{0} {1} :Using bold is not allowed",
"notice_no_bold": "Using bold in the channel is not allowed.",
"kick_color": "{0} {1} :Using color is not allowed",
"notice_no_color": "Using color in the channel is not allowed.",
"startspam_warn": "{0}: Spamming the start command is not allowed.",
"startspam_kick": "{0} {1} :Spamming the start command is not allowed.",
"goat_fail": "This can only be done once per day.",
"not_enough_parameters": "Not enough parameters.",
"goat_target_not_in_channel": "\u0002{0}\u0002 is not in this channel.",

9
src/settings.py
View File

@ -147,15 +147,6 @@ MAD_SCIENTIST_SKIPS_DEAD_PLAYERS = 16
# village wins if and only if they can unanimously !vote the bot during the day
VILLAGERGAME_CHANCE = 0
CARE_BOLD = False
CARE_COLOR = False
CARE_STARTSPAM = False
CARE_STARTSPAM_LIMIT = 3
KILL_COLOR = False
KILL_BOLD = False
KILL_STARTSPAM = False
KILL_STARTSPAM_LIMIT = 4
# HIT MISS SUICIDE HEADSHOT
GUN_CHANCES = ( 5/7 , 1/7 , 1/7 , 2/5 )
WOLF_GUN_CHANCES = ( 5/7 , 1/7 , 1/7 , 2/5 )

19
src/wolfgame.py
View File

@ -3455,16 +3455,6 @@ def update_last_said(cli, nick, chan, rest):
var.LAST_SAID_TIME[nick] = datetime.now()
fullstring = "".join(rest)
if var.CARE_BOLD and BOLD in fullstring:
if var.KILL_BOLD:
cli.send("KICK " + messages["kick_bold"].format(botconfig.CHANNEL, nick))
else:
cli.notice(nick, messages["notice_no_bold"])
if var.CARE_COLOR and any(code in fullstring for code in ["\u0003", "\u0016", "\u001f" ]):
if var.KILL_COLOR:
cli.send("KICK " + messages["kick_color"].format(botconfig.CHANNEL, nick))
else:
cli.notice(nick, messages["notice_no_color"])
@hook("join")
def on_join(cli, raw_nick, chan, acc="*", rname=""):
@ -7497,14 +7487,7 @@ def start(cli, nick, chan, forced = False, restart = ""):
var.LAST_START[nick][0] + timedelta(seconds=var.START_RATE_LIMIT) >
datetime.now() and not restart):
var.LAST_START[nick][1] += 1
if (var.CARE_STARTSPAM and var.KILL_STARTSPAM and
var.LAST_START[nick][1] >= var.KILL_STARTSPAM_LIMIT):
cli.send("KICK " + messages["startspam_kick"].format(botconfig.CHANNEL, nick))
elif var.CARE_STARTSPAM and var.LAST_START[nick][1] >= var.CARE_STARTSPAM_LIMIT:
cli.msg(chan, messages["startspam_warn"].format(nick))
cli.notice(nick, messages["command_ratelimited"])
else:
cli.notice(nick, messages["command_ratelimited"])
cli.notice(nick, messages["command_ratelimited"])
return
if restart: