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

Delay night properly in villagergame

Browse Source
This commit is contained in:
skizzerz 2016-11-23 16:26:06 -06:00
parent ed7d3eda6a
commit a01f8860d0
2 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/gamemodes.py
View File

@ -185,17 +185,16 @@ class VillagergameMode(GameMode):
"crazed shaman" : ( 0 , 0 , 0 , 0 , 1 ), "crazed shaman" : ( 0 , 0 , 0 , 0 , 1 ),
"cursed villager" : ( 0 , 1 , 1 , 1 , 1 ), "cursed villager" : ( 0 , 1 , 1 , 1 , 1 ),
}) })
self.delaying_night = False
def startup(self): def startup(self):
events.add_listener("chk_win", self.chk_win) events.add_listener("chk_win", self.chk_win)
events.add_listener("chk_nightdone", self.prolong_night) events.add_listener("chk_nightdone", self.chk_nightdone)
events.add_listener("transition_day_begin", self.transition_day) events.add_listener("transition_day_begin", self.transition_day)
events.add_listener("retribution_kill", self.on_retribution_kill, priority=4) events.add_listener("retribution_kill", self.on_retribution_kill, priority=4)
def teardown(self): def teardown(self):
events.remove_listener("chk_win", self.chk_win) events.remove_listener("chk_win", self.chk_win)
events.remove_listener("chk_nightdone", self.prolong_night) events.remove_listener("chk_nightdone", self.chk_nightdone)
events.remove_listener("transition_day_begin", self.transition_day) events.remove_listener("transition_day_begin", self.transition_day)
events.remove_listener("retribution_kill", self.on_retribution_kill, priority=4) events.remove_listener("retribution_kill", self.on_retribution_kill, priority=4)
@ -210,15 +209,17 @@ class VillagergameMode(GameMode):
else: else:
evt.data["winner"] = None evt.data["winner"] = None
def prolong_night(self, evt, cli, var): def chk_nightdone(self, evt, cli, var):
evt.data["nightroles"].append(botconfig.NICK) transition_day = evt.data["transition_day"]
evt.data["transition_day"] = lambda cli2, gameid=0: self.prolong_night(cli2, var, gameid, transition_day)
if not self.delaying_night: def prolong_night(self, cli, var, gameid, transition_day):
nspecials = len(var.ROLES["seer"] | var.ROLES["harlot"] | var.ROLES["shaman"] | var.ROLES["crazed shaman"]) nspecials = len(var.ROLES["seer"] | var.ROLES["harlot"] | var.ROLES["shaman"] | var.ROLES["crazed shaman"])
rand = random.randint(5 if nspecials else 0, 30) rand = random.gauss(5, 3)
self.delaying_night = True if rand <= 0 and nspecials > 0:
transition_day(cli, gameid=curnight)
t = threading.Timer(rand, evt.data["transition_day"], args=(cli,), kwargs={"gameid": var.NIGHT_ID}) else:
t = threading.Timer(abs(rand), transition_day, args=(cli,), kwargs={"gameid": gameid})
t.start() t.start()
def transition_day(self, evt, cli, var): def transition_day(self, evt, cli, var):

2
src/wolfgame.py
View File

@ -5658,8 +5658,8 @@ def transition_night(cli):
chan = botconfig.CHANNEL chan = botconfig.CHANNEL
var.NIGHT_ID = time.time()
if var.NIGHT_TIME_LIMIT > 0: if var.NIGHT_TIME_LIMIT > 0:
var.NIGHT_ID = time.time()
t = threading.Timer(var.NIGHT_TIME_LIMIT, transition_day, [cli, var.NIGHT_ID]) t = threading.Timer(var.NIGHT_TIME_LIMIT, transition_day, [cli, var.NIGHT_ID])
var.TIMERS["night"] = (t, var.NIGHT_ID, var.NIGHT_TIME_LIMIT) var.TIMERS["night"] = (t, var.NIGHT_ID, var.NIGHT_TIME_LIMIT)
t.daemon = True t.daemon = True