Jeopardy: add points to hint template

This commit is contained in:
oddluck 2020-02-22 17:10:03 +00:00
parent 2c40713d3a
commit 1ef8fb2b88
2 changed files with 9 additions and 3 deletions

View File

@ -148,7 +148,7 @@ conf.registerChannelValue(Jeopardy.template.restart, 'correct',
_("""The template used to render correct answer replies when autoRestart is True."""))) _("""The template used to render correct answer replies when autoRestart is True.""")))
conf.registerChannelValue(Jeopardy.template, 'hint', conf.registerChannelValue(Jeopardy.template, 'hint',
registry.String("HINT: {{hint}}{% if time %} | ({{time}} seconds remaining){% endif %}", _("""The template used to render hints."""))) registry.String("HINT: {{hint}}{% if time %} | ({{time}} seconds remaining){% endif %}{% if points %} | \x0309[${{points}}]{% endif %}", _("""The template used to render hints.""")))
conf.registerChannelValue(Jeopardy.template, 'correct', conf.registerChannelValue(Jeopardy.template, 'correct',
registry.String("\x0313{{nick}}\x03 got it! The full answer was: {{answer}}. Points: \x0309{{points}}\x03 | Round Score: \x0309{{round}}\x03 | Total: \x0309{{total}}", registry.String("\x0313{{nick}}\x03 got it! The full answer was: {{answer}}. Points: \x0309{{points}}\x03 | Round Score: \x0309{{round}}\x03 | Total: \x0309{{total}}",

View File

@ -110,6 +110,7 @@ class Jeopardy(callbacks.Plugin):
else: else:
self.question_template = Template(self.registryValue("template.question", channel)) self.question_template = Template(self.registryValue("template.question", channel))
self.questions = [] self.questions = []
self.points = 0
self.reduction = self.registryValue('hintReduction', self.channel) self.reduction = self.registryValue('hintReduction', self.channel)
self.restart = restart self.restart = restart
self.roundscores = requests.structures.CaseInsensitiveDict() self.roundscores = requests.structures.CaseInsensitiveDict()
@ -313,6 +314,7 @@ class Jeopardy(callbacks.Plugin):
self.id = q[0] self.id = q[0]
question['airdate'] = q[1] question['airdate'] = q[1]
self.p = int(q[2]) self.p = int(q[2])
self.points = self.p
question['category'] = q[3] question['category'] = q[3]
question['clue'] = q[4] question['clue'] = q[4]
self.a = q[5] self.a = q[5]
@ -457,8 +459,12 @@ class Jeopardy(callbacks.Plugin):
self.currentHint = ''.join(self.show[self.id]) self.currentHint = ''.join(self.show[self.id])
if self.hints > 0: if self.hints > 0:
self.p -= int(self.p * self.reduction) self.p -= int(self.p * self.reduction)
if self.points > self.p:
points = self.p
else:
points = None
if self.timeout > 0: if self.timeout > 0:
reply = self.hint_template.render(hint = self.currentHint, time = round(self.endTime - time.time())) reply = self.hint_template.render(hint = self.currentHint, time = round(self.endTime - time.time()), points = points)
if self.showHints or self.showTime: if self.showHints or self.showTime:
def event(): def event():
self.timedEvent() self.timedEvent()
@ -466,7 +472,7 @@ class Jeopardy(callbacks.Plugin):
if eventTime < self.endTime: if eventTime < self.endTime:
schedule.addEvent(event, eventTime, 'event_%s' % self.channel) schedule.addEvent(event, eventTime, 'event_%s' % self.channel)
else: else:
reply = self.hint_template.render(hint = self.currentHint, time = None) reply = self.hint_template.render(hint = self.currentHint, time = None, points = points)
self.reply(reply) self.reply(reply)
self.hints += 1 self.hints += 1