falso
/
oddluck-limnoria-plugins
mirror of https://github.com/oddluck/limnoria-plugins.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Jeopardy: better end of round checking.

This commit is contained in:
Gordon Shumway 2020-02-02 18:10:38 -05:00 committed by GitHub
parent 9cf70d693e
commit fc00296b8d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Jeopardy/plugin.py
View File

@ -125,7 +125,8 @@ class Jeopardy(callbacks.Plugin):
self.show = {} self.show = {}
self.revealed = {} self.revealed = {}
self.shuffled = shuffle self.shuffled = shuffle
self.answered = False self.correct = False
self.answered = 0
stopped[channel] = False stopped[channel] = False
if self.questionfile != 'jservice.io': if self.questionfile != 'jservice.io':
f = open(self.questionfile, 'r') f = open(self.questionfile, 'r')
@ -238,7 +239,7 @@ class Jeopardy(callbacks.Plugin):
def newquestion(self, channel): def newquestion(self, channel):
inactiveShutoff = self.registryValue('inactiveShutoff', channel) inactiveShutoff = self.registryValue('inactiveShutoff', channel)
if self.num == 0: if self.num == 0 or self.answered == self.total or self.numAsked == self.total:
self.stop(channel) self.stop(channel)
return return
elif self.unanswered > inactiveShutoff and inactiveShutoff > 0: elif self.unanswered > inactiveShutoff and inactiveShutoff > 0:
@ -284,7 +285,7 @@ class Jeopardy(callbacks.Plugin):
question[channel] = "\x03{0}{1}".format(color, self.q) question[channel] = "\x03{0}{1}".format(color, self.q)
self.reply(channel, question[channel]) self.reply(channel, question[channel])
ans = self.a[0] ans = self.a[0]
self.answered = False self.correct = False
if "(" in self.a[0]: if "(" in self.a[0]:
a1, a2, a3 = re.match("(.*)\((.*)\)(.*)", self.a[0]).groups() a1, a2, a3 = re.match("(.*)\((.*)\)(.*)", self.a[0]).groups()
self.a.append(a1 + a3) self.a.append(a1 + a3)
@ -353,7 +354,8 @@ class Jeopardy(callbacks.Plugin):
if self.hints >= self.numHints: if self.hints >= self.numHints:
self.reply(channel, 'No one got the answer! It was: {0}'.format(self.a[0])) self.reply(channel, 'No one got the answer! It was: {0}'.format(self.a[0]))
self.unanswered += 1 self.unanswered += 1
self.answered = True self.corect = True
self.answered += 1
self.newquestion(channel) self.newquestion(channel)
else: else:
self.hint(channel) self.hint(channel)
@ -394,7 +396,7 @@ class Jeopardy(callbacks.Plugin):
def answer(self, msg): def answer(self, msg):
if not self.answered: if not self.correct:
channel = msg.args[0] channel = msg.args[0]
correct = False correct = False
for ans in self.a: for ans in self.a:
@ -427,7 +429,8 @@ class Jeopardy(callbacks.Plugin):
self.roundscores[name] += self.p self.roundscores[name] += self.p
self.unanswered = 0 self.unanswered = 0
self.reply(channel, "{0} got it! The full answer was: {1}. Points: {2} | Round Score: {3} | Total: {4}".format(msg.nick, self.a[0], self.p, self.roundscores[name], self.scores[name])) self.reply(channel, "{0} got it! The full answer was: {1}. Points: {2} | Round Score: {3} | Total: {4}".format(msg.nick, self.a[0], self.p, self.roundscores[name], self.scores[name]))
self.answered = True self.correct = True
self.answered += 1
try: try:
schedule.removeEvent('next_%s' % channel) schedule.removeEvent('next_%s' % channel)
schedule.removeEvent('new_%s' % channel) schedule.removeEvent('new_%s' % channel)