'author': 'Erebus Team',
'license': 'public domain',
'compatible': [1], # compatible module API versions
- 'depends': [], # other modules required to work properly?
+ 'depends': ['userinfo'], # other modules required to work properly?
}
# preamble
import modlib
lib = modlib.modlib(__name__)
def modstart(parent, *args, **kwargs):
- state.parent = parent
+ state.gotParent(parent)
+ lib.hookchan(state.db['chan'])(trivia_checkanswer) # we need parent for this. so it goes here.
return lib.modstart(parent, *args, **kwargs)
def modstop(*args, **kwargs):
global state
- stop()
- state.closeshop()
- del state
+ try:
+ stop()
+ state.closeshop()
+ del state
+ except Exception: pass
return lib.modstop(*args, **kwargs)
# module code
return -1
return len(haystack)-len(parts[-1])-len(needle)
+def person(num): return state.db['users'][state.db['ranks'][num]]['realnick']
+def pts(num): return str(state.db['users'][state.db['ranks'][num]]['points'])
+def country(num, default="??"): return lib.mod('userinfo')._get(person(num), 'country', default=default)
+
class TriviaState(object):
- def __init__(self, questionfile, parent=None, pointvote=False):
+ def __init__(self, parent=None, pointvote=False):
+ if parent is not None:
+ self.gotParent(parent, pointvote)
+
+ def gotParent(self, parent, pointvote=False):
self.parent = parent
- self.questionfile = questionfile
- self.db = json.load(open(questionfile, "r"))
+ self.questionfile = self.parent.cfg.get('trivia', 'jsonpath', default="./modules/trivia.json")
+ self.db = json.load(open(self.questionfile, "r"))
self.chan = self.db['chan']
self.curq = None
self.nextq = None
+ self.nextquestiontimer = None
self.steptimer = None
self.hintstr = None
self.hintanswer = None
def __del__(self):
self.closeshop()
def closeshop(self):
- if threading is not None and threading._Timer is not None and isinstance(self.steptimer, threading._Timer):
- self.steptimer.cancel()
+ if threading is not None and threading._Timer is not None:
+ if isinstance(self.steptimer, threading._Timer):
+ self.steptimer.cancel()
+ if isinstance(self.nextquestiontimer, threading._Timer):
+ self.nextquestiontimer.cancel()
+ self.nextquestiontimer = None
if json is not None and json.dump is not None:
json.dump(self.db, open(self.questionfile, "w"))#, indent=4, separators=(',', ': '))
def doGameOver(self):
msg = self.getchan().msg
- def person(num): return self.db['users'][self.db['ranks'][num]]['realnick']
- def pts(num): return str(self.db['users'][self.db['ranks'][num]]['points'])
winner = person(0)
try:
msg("\00312THE GAME IS OVER!!!")
t.statuses.update(status="Round is over! The winner was %s" % (winner))
except: pass #don't care if errors happen updating twitter.
- self.__init__(self.questionfile, self.parent, True)
+ self.__init__(self.parent, True)
def writeHof(self):
def person(num):
self.nextquestion() #start the game!
- def nextquestion(self, qskipped=False, iteration=0):
+ def nextquestion(self, qskipped=False, iteration=0, skipwait=False):
+ self.curq = None
if self.gameover == True:
return self.doGameOver()
if qskipped:
self.missedquestions += 1
else:
self.missedquestions = 0
+ if 'topicformat' in self.db and self.db['topicformat'] is not None:
+ self.getbot().conn.send("TOPIC %s" % (self.db['chan']))
if isinstance(self.steptimer, threading._Timer):
self.steptimer.cancel()
+ if isinstance(self.nextquestiontimer, threading._Timer):
+ self.nextquestiontimer.cancel()
+ self.nextquestiontimer = None
self.hintstr = None
self.hintsgiven = 0
if self.missedquestions > self.db['maxmissedquestions']:
stop()
- self.getbot().msg(self.getchan(), "%d questions unanswered! Stopping the game.")
+ self.getbot().msg(self.getchan(), "%d questions unanswered! Stopping the game." % (self.missedquestions))
+ return
- if state.nextq is not None:
- nextq = state.nextq
- state.nextq = None
+ if skipwait:
+ self._nextquestion(iteration)
+ else:
+ self.nextquestiontimer = threading.Timer(self.db['questionpause'], self._nextquestion, args=[iteration])
+ self.nextquestiontimer.start()
+
+ def _nextquestion(self, iteration):
+ if self.nextq is not None:
+ nextqid = None
+ nextq = self.nextq
+ self.nextq = None
else:
- nextq = random.choice(self.db['questions'])
+ nextqid = random.randrange(0, len(self.db['questions']))
+ nextq = self.db['questions'][nextqid]
- if nextq['question'][0] == "!":
+ if nextq[0][0] == "!":
+ nextqid = None
nextq = specialQuestion(nextq)
- if iteration < 10 and 'lastasked' in nextq and nextq['lastasked'] - time.time() < 24*60*60:
- return self.nextquestion(iteration=iteration+1) #short-circuit to pick another question
- nextq['lastasked'] = time.time()
+ if len(nextq) > 2 and nextq[2] - time.time() < 7*24*60*60 and iteration < 10:
+ return self._nextquestion(iteration=iteration+1) #short-circuit to pick another question
+ if len(nextq) > 2:
+ nextq[2] = time.time()
+ else:
+ nextq.append(time.time())
- nextq['answer'] = nextq['answer'].lower()
+ nextq[1] = nextq[1].lower()
qtext = "\00304,01Next up: "
- qary = nextq['question'].split(None)
+ if nextqid is not None:
+ qtext += "(%d) " % (nextqid)
+ qary = nextq[0].split(None)
for qword in qary:
qtext += "\00304,01"+qword+"\00301,01"+chr(random.randrange(0x61,0x7A)) #a-z
self.getbot().msg(self.chan, qtext)
self.curq = nextq
- if isinstance(self.curq['answer'], basestring): self.hintanswer = self.curq['answer']
- else: self.hintanswer = random.choice(self.curq['answer'])
+ if isinstance(self.curq[1], basestring): self.hintanswer = self.curq[1]
+ else: self.hintanswer = random.choice(self.curq[1])
self.steptimer = threading.Timer(self.db['hinttimer'], self.nexthint, args=[1])
self.steptimer.start()
def checkanswer(self, answer):
if self.curq is None:
return False
- elif isinstance(self.curq['answer'], basestring):
- return answer.lower() == self.curq['answer']
+ elif isinstance(self.curq[1], basestring):
+ return answer.lower() == self.curq[1]
else: # assume it's a list or something.
- return answer.lower() in self.curq['answer']
+ return answer.lower() in self.curq[1]
def addpoint(self, user_obj, count=1):
user_nick = str(user_obj)
self.db['users'][user] = {'points': count, 'realnick': user_nick, 'rank': len(self.db['ranks'])}
self.db['ranks'].append(user)
- self.db['ranks'].sort(key=lambda nick: state.db['users'][nick]['points'], reverse=True) #re-sort ranks, rather than dealing with anything more efficient
+ self.db['ranks'].sort(key=lambda nick: self.db['users'][nick]['points'], reverse=True) #re-sort ranks, rather than dealing with anything more efficient
for i in range(0, len(self.db['ranks'])):
nick = self.db['ranks'][i]
self.db['users'][nick]['rank'] = i
- if self.db['users'][user]['points'] >= state.db['target']:
+ if self.db['users'][user]['points'] >= self.db['target']:
self.gameover = True
return self.db['users'][user]['points']
else:
return self.db['users'][self.db['ranks'][-1]]['points']
-state = TriviaState("/home/jrunyon/erebus/modules/trivia.json") #TODO get path from config
+state = TriviaState()
-@lib.hookchan(state.db['chan'])
+# we have to hook this in modstart, since we don't know the channel until then.
def trivia_checkanswer(bot, user, chan, *args):
line = ' '.join([str(arg) for arg in args])
if state.checkanswer(line):
+ state.curq = None
bot.msg(chan, "\00312%s\003 has it! The answer was \00312%s\003. New score: %d. Rank: %d. Target: %s (%s)." % (user, line, state.addpoint(user), state.rank(user), state.targetuser(user), state.targetpoints(user)))
if state.hintsgiven == 0:
bot.msg(chan, "\00312%s\003 got an extra point for getting it before the hints! New score: %d." % (user, state.addpoint(user)))
state.nextquestion()
-@lib.hook('points', needchan=False)
-def cmd_points(bot, user, chan, realtarget, *args):
- if chan == realtarget: replyto = chan
+@lib.hook(needchan=False)
+def points(bot, user, chan, realtarget, *args):
+ if chan is not None and realtarget == chan.name: replyto = chan
else: replyto = user
if len(args) != 0: who = args[0]
bot.msg(replyto, "%s has %d points." % (who, state.points(who)))
-@lib.hook('give', clevel=lib.OP, needchan=False)
+@lib.hook(glevel=lib.STAFF, needchan=False)
@lib.argsGE(1)
-def cmd_give(bot, user, chan, realtarget, *args):
+def give(bot, user, chan, realtarget, *args):
whoto = args[0]
if len(args) > 1:
numpoints = int(args[1])
bot.msg(chan, "%s gave %s %d points. New balance: %d" % (user, whoto, numpoints, balance))
-@lib.hook('setnext', clevel=lib.OP, needchan=False)
+@lib.hook(glevel=1, needchan=False)
+def setnextid(bot, user, chan, realtarget, *args):
+ try:
+ qid = int(args[0])
+ state.nextq = state.db['questions'][qid]
+ bot.msg(user, "Done. Next question is: %s" % (state.nextq[0]))
+ except Exception as e:
+ bot.msg(user, "Error: %s" % (e))
+
+@lib.hook(glevel=lib.STAFF, needchan=False)
@lib.argsGE(1)
-def cmd_setnext(bot, user, chan, realtarget, *args):
+def setnext(bot, user, chan, realtarget, *args):
line = ' '.join([str(arg) for arg in args])
linepieces = line.split('*')
if len(linepieces) < 2:
return
question = linepieces[0].strip()
answer = linepieces[1].strip()
- state.nextq = {'question':question,'answer':answer}
+ state.nextq = [question, answer]
bot.msg(user, "Done.")
-@lib.hook('skip', clevel=lib.KNOWN, needchan=False)
-def cmd_skip(bot, user, chan, realtarget, *args):
- state.nextquestion(True)
+@lib.hook(glevel=1, needchan=False)
+def skip(bot, user, chan, realtarget, *args):
+ state.nextquestion(qskipped=True, skipwait=True)
-@lib.hook('start', needchan=False)
-def cmd_start(bot, user, chan, realtarget, *args):
- if chan == realtarget: replyto = chan
+@lib.hook(needchan=False)
+def start(bot, user, chan, realtarget, *args):
+ if chan is not None and realtarget == chan.name: replyto = chan
else: replyto = user
- if state.curq is None and state.pointvote is None:
- state.nextquestion()
+ if chan is not None and chan.name != state.db['chan']:
+ bot.msg(replyto, "That command isn't valid here.")
+ return
+
+ if state.curq is None and state.pointvote is None and state.nextquestiontimer is None:
+ bot.msg(state.db['chan'], "%s has started the game!" % (user))
+ state.nextquestion(skipwait=True)
elif state.pointvote is not None:
bot.msg(replyto, "There's a vote in progress!")
else:
bot.msg(replyto, "Game is already started!")
-#FIXME @lib.hook('stop', clevel=lib.KNOWN, needchan=False)
-@lib.hook('stop', needchan=False) #FIXME
+@lib.hook('stop', glevel=1, needchan=False)
def cmd_stop(bot, user, chan, realtarget, *args):
if stop():
bot.msg(state.chan, "Game stopped by %s" % (user))
bot.msg(user, "Game isn't running.")
def stop():
- if state.curq is not None:
- state.curq = None
+ try:
+ if state.curq is not None or state.nextq is not None:
+ state.curq = None
+ state.nextq = None
+ try:
+ state.steptimer.cancel()
+ except Exception as e:
+ print "!!! steptimer.cancel(): %s %r" % (e,e)
+ try:
+ state.nextquestiontimer.cancel()
+ state.nextquestiontimer = None
+ except Exception as e:
+ print "!!! nextquestiontimer.cancel(): %s %r" % (e,e)
+ return True
+ else:
+ return False
+ except NameError:
+ pass
+
+@lib.hook(needchan=False)
+@lib.argsGE(2)
+def badq(bot, user, chan, realtarget, *args):
+ qid = int(args[0])
+ reason = ' '.join(args[1:])
+ state.db['badqs'].append([qid, reason])
+ bot.msg(user, "Reported bad question #%d" % (qid))
+
+@lib.hook(glevel=lib.STAFF, needchan=False)
+def badqs(bot, user, chan, realtarget, *args):
+ if len(state.db['badqs']) == 0:
+ bot.msg(user, "No reports.")
+
+ for i in range(len(state.db['badqs'])):
try:
- state.steptimer.cancel()
+ report = state.db['badqs'][i]
+ bot.msg(user, "Report #%d: Q%d: %s" % (i, report[0], report[1]))
+ question = state.db['questions'][int(report[0])]
+ bot.msg(user, "- Question is: %s" % (question[0]))
+ bot.msg(user, "- Answer is: %s" % (question[1]))
except Exception as e:
- print "!!! steptimer.cancel(): e"
- return True
- else:
- return False
-
-@lib.hook('rank', needchan=False)
-def cmd_rank(bot, user, chan, realtarget, *args):
- if chan == realtarget: replyto = chan
+ bot.msg(user, "- Exception: %r" % (e))
+
+@lib.hook(glevel=lib.STAFF, needchan=False)
+def clearbadqs(bot, user, chan, realtarget, *args):
+ state.db['badqs'] = []
+ bot.msg(user, "Cleared reports.")
+
+@lib.hook(glevel=lib.STAFF, needchan=False)
+@lib.argsEQ(1)
+def delbadq(bot, user, chan, realtarget, *args):
+ qid = int(args[0])
+ del state.db['badqs'][qid]
+ bot.msg(user, "Removed report #%d" % (qid))
+
+@lib.hook(needchan=False)
+def rank(bot, user, chan, realtarget, *args):
+ if chan is not None and realtarget == chan.name: replyto = chan
else: replyto = user
if len(args) != 0: who = args[0]
bot.msg(replyto, "%s is in %d place (%s points). Target is: %s (%s points)." % (who, state.rank(who), state.points(who), state.targetuser(who), state.targetpoints(who)))
-@lib.hook('top10', needchan=False)
-def cmd_top10(bot, user, chan, realtarget, *args):
+@lib.hook(needchan=False)
+def top10(bot, user, chan, realtarget, *args):
if len(state.db['ranks']) == 0:
return bot.msg(state.db['chan'], "No one is ranked!")
- replylist = []
- for nick in state.db['ranks'][0:10]:
- user = state.db['users'][nick]
- replylist.append("%s (%s)" % (user['realnick'], user['points']))
- bot.msg(state.db['chan'], ', '.join(replylist))
+ max = len(state.db['ranks'])
+ if max > 10:
+ max = 10
+ replylist = ', '.join(["%s (%s) %s" % (person(x), country(x, "unknown"), pts(x)) for x in range(max)])
+ bot.msg(state.db['chan'], "Top %d: %s" % (max, replylist))
-@lib.hook('settarget', clevel=lib.MASTER, needchan=False)
-def cmd_settarget(bot, user, chan, realtarget, *args):
+@lib.hook(glevel=lib.ADMIN, needchan=False)
+def settarget(bot, user, chan, realtarget, *args):
try:
state.db['target'] = int(args[0])
bot.msg(state.db['chan'], "Target has been changed to %s points!" % (state.db['target']))
print e
bot.msg(user, "Failed to set target.")
-@lib.hook('vote', needchan=False)
-def cmd_vote(bot, user, chan, realtarget, *args):
+@lib.hook(needchan=False)
+def vote(bot, user, chan, realtarget, *args):
if state.pointvote is not None:
if int(args[0]) in state.voteamounts:
state.voteamounts[int(args[0])] += 1
else:
bot.msg(user, "There's no vote in progress.")
-@lib.hook('maxmissed', clevel=lib.MASTER, needchan=False)
-def cmd_maxmissed(bot, user, chan, realtarget, *args):
+@lib.hook(glevel=lib.ADMIN, needchan=False)
+def maxmissed(bot, user, chan, realtarget, *args):
try:
state.db['maxmissedquestions'] = int(args[0])
bot.msg(state.db['chan'], "Max missed questions before round ends has been changed to %s." % (state.db['maxmissedquestions']))
except:
bot.msg(user, "Failed to set maxmissed.")
-@lib.hook('hinttimer', clevel=lib.MASTER, needchan=False)
-def cmd_hinttimer(bot, user, chan, realtarget, *args):
+@lib.hook(glevel=lib.ADMIN, needchan=False)
+def hinttimer(bot, user, chan, realtarget, *args):
try:
state.db['hinttimer'] = float(args[0])
bot.msg(state.db['chan'], "Time between hints has been changed to %s." % (state.db['hinttimer']))
except:
bot.msg(user, "Failed to set hint timer.")
-@lib.hook('hintnum', clevel=lib.MASTER, needchan=False)
-def cmd_hintnum(bot, user, chan, realtarget, *args):
+@lib.hook(glevel=lib.ADMIN, needchan=False)
+def hintnum(bot, user, chan, realtarget, *args):
try:
state.db['hintnum'] = int(args[0])
bot.msg(state.db['chan'], "Max number of hints has been changed to %s." % (state.db['hintnum']))
except:
bot.msg(user, "Failed to set hintnum.")
-@lib.hook('findq', clevel=lib.KNOWN, needchan=False)
-def cmd_findquestion(bot, user, chan, realtarget, *args):
- matches = [str(i) for i in range(len(state.db['questions'])) if state.db['questions'][i]['question'] == ' '.join(args)] #FIXME: looser equality check
+@lib.hook(glevel=lib.ADMIN, needchan=False)
+def questionpause(bot, user, chan, realtarget, *args):
+ try:
+ state.db['questionpause'] = float(args[0])
+ bot.msg(state.db['chan'], "Pause between questions has been changed to %s." % (state.db['questionpause']))
+ except:
+ bot.msg(user, "Failed to set questionpause.")
+
+@lib.hook(glevel=1, needchan=False)
+def findq(bot, user, chan, realtarget, *args):
+ matches = [str(i) for i in range(len(state.db['questions'])) if state.db['questions'][i][0] == ' '.join(args)] #TODO looser equality check
if len(matches) > 1:
bot.msg(user, "Multiple matches: %s" % (', '.join(matches)))
elif len(matches) == 1:
else:
bot.msg(user, "No match.")
-@lib.hook('delq', clevel=lib.OP, needchan=False)
-@lib.hook('deleteq', clevel=lib.OP, needchan=False)
-def cmd_deletequestion(bot, user, chan, realtarget, *args):
+@lib.hook(('delq', 'deleteq'), glevel=lib.STAFF, needchan=False)
+def delq(bot, user, chan, realtarget, *args):
try:
backup = state.db['questions'][int(args[0])]
del state.db['questions'][int(args[0])]
- bot.msg(user, "Deleted %s*%s" % (backup['question'], backup['answer']))
+ bot.msg(user, "Deleted %s*%s" % (backup[0], backup[1]))
except:
bot.msg(user, "Couldn't delete that question.")
-@lib.hook('addq', clevel=lib.OP, needchan=False)
-def cmd_addquestion(bot, user, chan, realtarget, *args):
+@lib.hook(glevel=lib.STAFF, needchan=False)
+def addq(bot, user, chan, realtarget, *args):
line = ' '.join([str(arg) for arg in args])
linepieces = line.split('*')
if len(linepieces) < 2:
return
question = linepieces[0].strip()
answer = linepieces[1].strip()
- state.db['questions'].append({'question':question,'answer':answer})
+ state.db['questions'].append([question, answer])
bot.msg(user, "Done. Question is #%s" % (len(state.db['questions'])-1))
-@lib.hook('triviahelp', needchan=False)
-def cmd_triviahelp(bot, user, chan, realtarget, *args):
+@lib.hook(needchan=False)
+def triviahelp(bot, user, chan, realtarget, *args):
bot.msg(user, "START")
bot.msg(user, "TOP10")
- bot.msg(user, "POINTS [<user>]")
- bot.msg(user, "RANK [<user>]")
- if bot.parent.channel(state.db['chan']).levelof(user.auth) >= lib.KNOWN:
- bot.msg(user, "SKIP (>=KNOWN )")
- bot.msg(user, "STOP (>=KNOWN )")
- bot.msg(user, "FINDQ <question> (>=KNOWN )")
- if bot.parent.channel(state.db['chan']).levelof(user.auth) >= lib.OP:
- bot.msg(user, "GIVE <user> [<points>] (>=OP )")
- bot.msg(user, "SETNEXT <q>*<a> (>=OP )")
- bot.msg(user, "ADDQ <q>*<a> (>=OP )")
- bot.msg(user, "DELETEQ <q>*<a> (>=OP ) [aka DELQ]")
- if bot.parent.channel(state.db['chan']).levelof(user.auth) >= lib.MASTER:
- bot.msg(user, "SETTARGET <points> (>=MASTER)")
- bot.msg(user, "MAXMISSED <questions> (>=MASTER)")
- bot.msg(user, "HINTTIMER <float seconds> (>=MASTER)")
- bot.msg(user, "HINTNUM <hints> (>=MASTER)")
+ bot.msg(user, "POINTS [<user>]")
+ bot.msg(user, "RANK [<user>]")
+ bot.msg(user, "BADQ <id> <reason>")
+ if user.glevel >= 1:
+ bot.msg(user, "SKIP (>=KNOWN)")
+ bot.msg(user, "STOP (>=KNOWN)")
+ bot.msg(user, "FINDQ <question> (>=KNOWN)")
+ if user.glevel >= lib.STAFF:
+ bot.msg(user, "GIVE <user> [<points>] (>=STAFF)")
+ bot.msg(user, "SETNEXT <q>*<a> (>=STAFF)")
+ bot.msg(user, "ADDQ <q>*<a> (>=STAFF)")
+ bot.msg(user, "DELETEQ <q>*<a> (>=STAFF) [aka DELQ]")
+ bot.msg(user, "BADQS (>=STAFF)")
+ bot.msg(user, "CLEARBADQS (>=STAFF)")
+ bot.msg(user, "DELBADQ <reportid> (>=STAFF)")
+ if user.glevel >= lib.ADMIN:
+ bot.msg(user, "SETTARGET <points> (>=ADMIN)")
+ bot.msg(user, "MAXMISSED <questions> (>=ADMIN)")
+ bot.msg(user, "HINTTIMER <float seconds> (>=ADMIN)")
+ bot.msg(user, "HINTNUM <hints> (>=ADMIN)")
+ bot.msg(user, "QUESTIONPAUSE <float seconds> (>=ADMIN)")
@lib.hooknum(417)
def num_417(bot, textline):
bot.msg(state.db['chan'], "Whoops, it looks like that question didn't quite go through! (E:417). Let's try another...")
- state.nextquestion(False)
+ state.nextquestion(qskipped=False, skipwait=True)
+
+@lib.hooknum(332)
+def num_TOPIC(bot, textline):
+ pieces = textline.split(None, 4)
+ chan = pieces[3]
+ if chan != state.db['chan']:
+ return
+ gottopic = pieces[4][1:]
+
+ formatted = state.db['topicformat'] % {
+ 'chan': state.db['chan'],
+ 'top1': "%s (%s)" % (person(0), pts(0)),
+ 'top3': '/'.join([
+ "%s (%s)" % (person(x), pts(x))
+ for x in range(3) if x < len(state.db['ranks'])
+ ]),
+ 'top3c': ' '.join([
+ "%s (%s, %s)" % (person(x), pts(x), country(x))
+ for x in range(3) if x < len(state.db['ranks'])
+ ]),
+ 'top10': ' '.join([
+ "%s (%s)" % (person(x), pts(x))
+ for x in range(10) if x < len(state.db['ranks'])
+ ]),
+ 'top10c': ' '.join([
+ "%s (%s, %s)" % (person(x), pts(x), country(x))
+ for x in range(10) if x < len(state.db['ranks'])
+ ]),
+ 'target': state.db['target'],
+ }
+ if gottopic != formatted:
+ state.getbot().conn.send("TOPIC %s :%s" % (state.db['chan'], formatted))
def specialQuestion(oldq):
- newq = {'question': oldq['question'], 'answer': oldq['answer']}
- qtype = oldq['question'].upper()
+ newq = [oldq[0], oldq[1]]
+ qtype = oldq[0].upper()
if qtype == "!MONTH":
- newq['question'] = "What month is it currently (in UTC)?"
- newq['answer'] = time.strftime("%B", time.gmtime()).lower()
+ newq[0] = "What month is it currently (in UTC)?"
+ newq[1] = time.strftime("%B", time.gmtime()).lower()
elif qtype == "!MATH+":
randnum1 = random.randrange(0, 11)
randnum2 = random.randrange(0, 11)
- newq['question'] = "What is %d + %d?" % (randnum1, randnum2)
- newq['answer'] = spellout(randnum1+randnum2)
+ newq[0] = "What is %d + %d?" % (randnum1, randnum2)
+ newq[1] = spellout(randnum1+randnum2)
return newq
def spellout(num):
projects / erebus.git / blobdiff