From e83e6caac39814ce3dd0e803d65c83affa71baa6 Mon Sep 17 00:00:00 2001 From: nyuszika7h Date: Thu, 23 Jun 2016 22:20:33 +0200 Subject: [PATCH] Remove bureaucrat Closes #220. --- src/gamemodes.py | 1 - src/settings.py | 4 +--- src/wolfgame.py | 4 ++-- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/src/gamemodes.py b/src/gamemodes.py index 00645c9..1d4bec6 100644 --- a/src/gamemodes.py +++ b/src/gamemodes.py @@ -1281,7 +1281,6 @@ class MaelstromMode(GameMode): addroles["assassin"] = random.randrange(3) addroles["cursed villager"] = random.randrange(3) addroles["mayor"] = random.randrange(2) - addroles["bureaucrat"] = random.randrange(2) if random.randrange(100) == 0 and addroles.get("villager", 0) > 0: addroles["blessed villager"] = 1 diff --git a/src/settings.py b/src/settings.py index c1820a4..527004f 100644 --- a/src/settings.py +++ b/src/settings.py @@ -274,7 +274,6 @@ ROLE_GUIDE = OrderedDict([ # This is order-sensitive - many parts of the code re ("sharpshooter" , ( 0 , 0 , 0 , 0 , 0 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 )), ("mayor" , ( 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 1 , 1 )), ("assassin" , ( 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 )), - ("bureaucrat" , ( 0 , 0 , 0 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 )), ]) # Harlot dies when visiting, seer sees as wolf, gunner kills when shooting, GA and bodyguard have a chance at dying when guarding @@ -305,8 +304,7 @@ TEMPLATE_RESTRICTIONS = OrderedDict([ ("sharpshooter" , frozenset()), # the above gets automatically added to the set. this set is the list of roles that can be gunner but not sharpshooter ("mayor" , frozenset({"fool", "jester", "monster"})), ("assassin" , WOLF_ROLES | {"traitor", "seer", "augur", "oracle", "harlot", "detective", "bodyguard", "guardian angel", "lycan", "priest", "wild child"}), - ("bureaucrat" , frozenset()), - ("blessed villager" , frozenset(ROLE_GUIDE.keys()) - {"villager", "blessed villager", "mayor", "bureaucrat"}), + ("blessed villager" , frozenset(ROLE_GUIDE.keys()) - {"villager", "blessed villager", "mayor"}), ]) # make sharpshooter restrictions at least the same as gunner diff --git a/src/wolfgame.py b/src/wolfgame.py index f860bb4..fa74780 100644 --- a/src/wolfgame.py +++ b/src/wolfgame.py @@ -2096,7 +2096,7 @@ def hurry_up(cli, gameid, change): weight = 0 # more pacifists than impatience totems elif imp_count == pac_count and v not in var.VOTES[votee]: weight = 0 # impatience and pacifist cancel each other out, so don't count impatience - if v in var.ROLES["bureaucrat"] or v in var.INFLUENTIAL: # the two do not stack + if v in var.INFLUENTIAL: weight *= 2 numvotes += weight if numvotes > maxfound[0]: @@ -2230,7 +2230,7 @@ def chk_decision(cli, force = ""): weight = 0 # more pacifists than impatience totems elif imp_count == pac_count and v not in var.VOTES[votee]: weight = 0 # impatience and pacifist cancel each other out, so don't count impatience - if v in var.ROLES["bureaucrat"] | var.INFLUENTIAL: # the two do not stack + if v in var.INFLUENTIAL: weight *= 2 numvotes += weight