Updated some stuff hey

Code/irc/puzzle.py

@@ -1,19 +1,20 @@
 #!/usr/bin/python
 import random
 import inflect
+import quote_puzzle
 
 p = inflect.engine()
 primes = [11, 13, 17, 19, 23, 29, 31, 37, 41, 43, 47, 53, 59, 61, 67, 71]
-obfuscate = True
 
-def make_puzzle():
+def make_puzzle(obfuscate=True):
   answer = 0
   puzzle = random.choice(["Prove you're not a robot: ", "Are you a robot?: ", "Anti-bot check: ", "Counter-cndorphant measures: ", "Cosnok countermeasures: "])
   puzzle += random.choice(["What is", "How many is", "What do you get from", "What do you get with", "What is the value of", "Can you answer", "Can you tell me"])
   puzzle += " "
-  roll = random.randrange(0,6)
+  roll = random.randrange(0,10)
   var1 = random.randrange(1,10)
   var2 = random.randrange(1,10)
+  let1_ord = random.randrange(ord('a'), ord('z')+1)
 
   if roll == 0:
       answer = var1 + var2
@@ -36,13 +37,31 @@ def make_puzzle():
       answer = var1 ** var2
       puzzle += p.number_to_words(var1) + " to the " + p.ordinal(p.number_to_words(var2)) + " power"
   elif roll == 5:
-      p1 = primes[random.randrange(0,len(primes))]
-      p2 = primes[random.randrange(0,len(primes))]
+      p1 = random.choice(primes)
+      p2 = random.choice(primes)
       answer = str(min(p1,p2)) + ',' + str(max(p1,p2))
       puzzle += p.number_to_words(p1 * p2) + " when factored into its two primes (answer in the form of the two primes with a comma between)"
+  elif roll == 6:
+      prime = random.choice(primes)
+      answer = prime % var1
+      puzzle += p.number_to_words(prime) + " modulus " + p.number_to_words(var1)
+  elif roll == 7:
+      if let1_ord + var1 > ord('z'):
+          let1_ord -= var1
+      answer = chr(let1_ord + var1)
+      puzzle = "What letter comes " + p.number_to_words(var1) + " letters after '" + chr(let1_ord) + "'"
+      obfuscate = False
+  elif roll == 8:
+      if let1_ord - var1 < ord('a'):
+          let1_ord += var1
+      answer = chr(let1_ord - var1)
+      puzzle = "What letter comes " + p.number_to_words(var1) + " letters before '" + chr(let1_ord) + "'"
+      obfuscate = False
+  elif roll == 9:
+      answer, puzzle = quote_puzzle.get_quote()
+      obfuscate = False
 
-
-  puzzle += "? (Answer with numbers)"
+  puzzle += "?"
   if obfuscate == True:
       for _ in range(3):
           idx = random.randrange(len(puzzle)-1) #get between 0 and string length