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

Remove bureaucrat

Browse Source 
Closes #220.
This commit is contained in:
nyuszika7h 2016-06-23 22:20:33 +02:00
parent 9009304db0
commit e83e6caac3
3 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/gamemodes.py
View File

@ -1281,7 +1281,6 @@ class MaelstromMode(GameMode):
addroles["assassin"] = random.randrange(3) addroles["assassin"] = random.randrange(3)
addroles["cursed villager"] = random.randrange(3) addroles["cursed villager"] = random.randrange(3)
addroles["mayor"] = random.randrange(2) addroles["mayor"] = random.randrange(2)
addroles["bureaucrat"] = random.randrange(2)
if random.randrange(100) == 0 and addroles.get("villager", 0) > 0: if random.randrange(100) == 0 and addroles.get("villager", 0) > 0:
addroles["blessed villager"] = 1 addroles["blessed villager"] = 1

4
src/settings.py
View File

@ -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 )), ("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 )), ("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 )), ("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 # 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 ("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"})), ("mayor" , frozenset({"fool", "jester", "monster"})),
("assassin" , WOLF_ROLES | {"traitor", "seer", "augur", "oracle", "harlot", "detective", "bodyguard", "guardian angel", "lycan", "priest", "wild child"}), ("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"}),
("blessed villager" , frozenset(ROLE_GUIDE.keys()) - {"villager", "blessed villager", "mayor", "bureaucrat"}),
]) ])
# make sharpshooter restrictions at least the same as gunner # make sharpshooter restrictions at least the same as gunner

4
src/wolfgame.py
View File

@ -2096,7 +2096,7 @@ def hurry_up(cli, gameid, change):
weight = 0 # more pacifists than impatience totems weight = 0 # more pacifists than impatience totems
elif imp_count == pac_count and v not in var.VOTES[votee]: 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 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 weight *= 2
numvotes += weight numvotes += weight
if numvotes > maxfound[0]: if numvotes > maxfound[0]:
@ -2230,7 +2230,7 @@ def chk_decision(cli, force = ""):
weight = 0 # more pacifists than impatience totems weight = 0 # more pacifists than impatience totems
elif imp_count == pac_count and v not in var.VOTES[votee]: 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 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 weight *= 2
numvotes += weight numvotes += weight