X-Git-Url: https://jfr.im/git/erebus.git/blobdiff_plain/8770f6efd426fd5c42df7cbd44106815537ae10f..4b5f28dde311d1f8cc5cce200329207e95f4d8f0:/modules/trivia.py

diff --git a/modules/trivia.py b/modules/trivia.py
index cba7a72..1f949bd 100644
--- a/modules/trivia.py
+++ b/modules/trivia.py
@@ -6,7 +6,7 @@
 modinfo = {
 	'author': 'Erebus Team',
 	'license': 'public domain',
-	'compatible': [1,2],
+	'compatible': [2],
 	'depends': ['userinfo'],
 	'softdeps': ['help'],
 }
@@ -298,7 +298,7 @@ class TriviaState(object):
 			nextqid = None
 			nextq = specialQuestion(nextq)
 
-		if len(nextq) > 2 and nextq[2] - time.time() < 7*24*60*60 and iteration < 10:
+		if len(nextq) > 2 and time.time() - nextq[2] < 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()
@@ -411,10 +411,10 @@ def trivia_checkanswer(bot, user, chan, *args):
 			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(glevel=1, needchan=False)
+@lib.hook(glevel=1, needchan=False, wantchan=True)
 @lib.help(None, "saves the trivia database")
 def save(bot, user, chan, realtarget, *args):
-	if chan is not None and realtarget == chan.name: replyto = chan
+	if chan is not None: replyto = chan
 	else: replyto = user
 
 	if state.savedb():
@@ -422,10 +422,10 @@ def save(bot, user, chan, realtarget, *args):
 	else:
 		bot.msg(replyto, "Save failed!")
 
-@lib.hook(needchan=False)
+@lib.hook(needchan=False, wantchan=True)
 @lib.help("[<user>]", "shows how many points you or someone has")
 def points(bot, user, chan, realtarget, *args):
-	if chan is not None and realtarget == chan.name: replyto = chan
+	if chan is not None: eplyto = chan
 	else: replyto = user
 
 	if len(args) != 0: who = args[0]
@@ -466,7 +466,7 @@ def setnextid(bot, user, chan, realtarget, *args):
 @lib.argsGE(1)
 def setnext(bot, user, chan, realtarget, *args):
 	line = ' '.join([str(arg) for arg in args])
-	linepieces = line.split('*')
+	linepieces = line.split('*', 1)
 	if len(linepieces) < 2:
 		bot.msg(user, "Error: need <question>*<answer>")
 		return
@@ -480,10 +480,10 @@ def setnext(bot, user, chan, realtarget, *args):
 def skip(bot, user, chan, realtarget, *args):
 	state.nextquestion(qskipped=True, skipwait=True)
 
-@lib.hook(needchan=False)
+@lib.hook(needchan=False, wantchan=True)
 @lib.help(None, "starts the trivia game")
 def start(bot, user, chan, realtarget, *args):
-	if chan is not None and realtarget == chan.name: replyto = chan
+	if chan is not None: replyto = chan
 	else: replyto = user
 
 	if chan is not None and chan.name != state.db['chan']:
@@ -568,10 +568,10 @@ def delbadq(bot, user, chan, realtarget, *args):
 	except:
 		bot.msg(user, "Failed!")
 
-@lib.hook(needchan=False)
+@lib.hook(needchan=False, wantchan=True)
 @lib.help("[<user>]", "shows you or someone else's rank")
 def rank(bot, user, chan, realtarget, *args):
-	if chan is not None and realtarget == chan.name: replyto = chan
+	if chan is not None: replyto = chan
 	else: replyto = user
 
 	if len(args) != 0: who = args[0]
@@ -752,7 +752,7 @@ def addq(bot, user, chan, realtarget, *args):
 		questions = state.questions
 
 	line = ' '.join([str(arg) for arg in args])
-	linepieces = line.split('*')
+	linepieces = line.split('*', 1)
 	if len(linepieces) < 2:
 		bot.msg(user, "Error: need <question>*<answer>")
 		return
@@ -838,7 +838,8 @@ def triviahelp(bot, user, chan, realtarget, *args):
 @lib.hooknum(417)
 def num_417(bot, textline):
 #	bot.fastmsg(state.db['chan'], "Whoops, it looks like that question didn't quite go through! (E:417). Let's try another...")
-	state.nextquestion(qskipped=False, skipwait=True)
+	if state.curq is not None:
+		state.nextquestion(qskipped=False, skipwait=True)
 
 @lib.hooknum(332)
 def num_TOPIC(bot, textline):
@@ -884,16 +885,50 @@ def specialQuestion(oldq):
 		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)
+		try:
+			maxnum = int(oldq[1])
+		except ValueError:
+			maxnum = 10
+		randnum1 = random.randrange(0, maxnum+1)
+		randnum2 = random.randrange(0, maxnum+1)
 		newq[0] = "What is %d + %d?" % (randnum1, randnum2)
 		newq[1] = spellout(randnum1+randnum2)
+	elif qtype == "!ALGEBRA+":
+		try:
+			num1, num2 = [int(i) for i in oldq[1].split('!')]
+		except ValueError:
+			num1, num2 = 10, 10
+		randnum1 = random.randrange(0, num1+1)
+		randnum2 = random.randrange(randnum1, num2+1)
+		newq[0] = "What is x? %d = %d + x" % (randnum2, randnum1)
+		newq[1] = spellout(randnum2-randnum1)
 	else: pass #default to not modifying
 	return newq
 
 def spellout(num):
-	return [
-		"zero", "one", "two", "three", "four", "five", "six", "seven", "eight",
-		"nine", "ten", "eleven", "twelve", "thirteen", "fourteen", "fifteen",
-		"sixteen", "seventeen", "eighteen", "nineteen", "twenty"
-	][num]
+	ones = ['', 'one', 'two', 'three', 'four', 'five', 'six', 'seven', 'eight', 'nine']
+	teens = ['ten', 'eleven', 'twelve', 'thirteen', 'fourteen', 'fifteen', 'sixteen', 'seventeen', 'eighteen', 'nineteen']
+	tens = ['', '', 'twenty', 'thirty', 'fourty', 'fifty', 'sixty', 'seventy', 'eighty', 'ninety']
+
+	if num == 0:
+		return 'zero'
+
+	ihundreds = num / 100
+	itens = num % 100 / 10
+	iones = num % 10
+	buf = []
+
+	if ihundreds > 0:
+		buf.append("%s hundred" % (ones[ihundreds]))
+	if itens > 1:
+		buf.append(tens[itens])
+	if itens == 1:
+		buf.append(teens[iones])
+	elif iones > 0:
+		buf.append(ones[iones])
+	return ' '.join(buf)
+#	return [
+#		"zero", "one", "two", "three", "four", "five", "six", "seven", "eight",
+#		"nine", "ten", "eleven", "twelve", "thirteen", "fourteen", "fifteen",
+#		"sixteen", "seventeen", "eighteen", "nineteen", "twenty"
+#	][num]