From: zonidjan Date: Thu, 21 May 2015 03:58:55 +0000 (-0500) Subject: more work on trivia X-Git-Url: https://jfr.im/git/erebus.git/commitdiff_plain/c695f740c380a2e8dd575d3aa0b8bee8c3d6af93?ds=sidebyside more work on trivia --- diff --git a/erebus.py b/erebus.py index 66f6cd2..2ce5e18 100644 --- a/erebus.py +++ b/erebus.py @@ -53,6 +53,9 @@ class Erebus(object): self.chans.append(chan) def part(self, chan): self.chans.remove(chan) + def quit(self): + for chan in self.chans: + self.chans.remove(chan) def __str__(self): return self.nick def __repr__(self): return "" % (self.nick,self.glevel) @@ -141,12 +144,12 @@ class Erebus(object): def randbot(self): #get Bot() randomly for b in self.bots.itervalues(): return b #TODO - def user(self, nick, justjoined=False): - nick = nick.lower() + def user(self, _nick, justjoined=False): + nick = _nick.lower() if nick in self.users: return self.users[nick] else: - user = self.User(nick) + user = self.User(_nick) self.users[nick] = user if justjoined: diff --git a/modules/trivia.py b/modules/trivia.py index 0762bed..a1ed94b 100644 --- a/modules/trivia.py +++ b/modules/trivia.py @@ -1,7 +1,16 @@ # Erebus IRC bot - Author: Erebus Team -# simple module example +# trivia module # This file is released into the public domain; see http://unlicense.org/ +#TODO: +# timers (stop game/skip question/hinting) +# bonus points +# ability to REDUCE users points +# dynamic questions +# v2 +# team play +# statistics + # module info modinfo = { 'author': 'Erebus Team', @@ -30,14 +39,26 @@ class TriviaState(object): self.db = json.load(open(questionfile, "r")) self.chan = self.db['chan'] self.curq = None + self.nextq = None def __del__(self): - json.dump(self.db, open(self.questionfile, "w"), indent=4, separators=(',',': ')) + if json is not None and json.dump is not None: + json.dump(self.db, open(self.questionfile, "w"), indent=4, separators=(',',': ')) def nextquestion(self): - nextq = random.choice(self.db['questions']) - self.curq = nextq - self.parent.channel(self.chan).bot.msg(self.chan, "Next up: %s" % (nextq['question'])) + if state.nextq is not None: + nextq = state.nextq + self.curq = nextq + state.nextq = None + else: + nextq = random.choice(self.db['questions']) + self.curq = nextq + + qtext = "\00300,01Next up: " + qary = nextq['question'].split(None) + for qword in qary: + qtext += "\00300,01"+qword+"\00301,01"+chr(random.randrange(32,126)) + self.parent.channel(self.chan).bot.msg(self.chan, qtext) def checkanswer(self, answer): if self.curq is None: @@ -61,7 +82,9 @@ class TriviaState(object): nextperson = self.db['ranks'][oldrank-1] if self.db['users'][user]['points'] > self.db['users'][nextperson]['points']: self.db['ranks'][oldrank-1] = user + self.db['users'][user]['rank'] = oldrank-1 self.db['ranks'][oldrank] = nextperson + self.db['users'][nextperson]['rank'] = oldrank oldrank = oldrank-1 else: break @@ -75,25 +98,36 @@ class TriviaState(object): return 0 def rank(self, user): - user = str(user) - return self.db['users'][user]['rank'] + user = str(user).lower() + return self.db['users'][user]['rank']+1 - def targetuser(self, user): return "TODO" #TODO - def targetpoints(self, user): return 0 #TODO + def targetuser(self, user): + user = str(user).lower() + rank = self.db['users'][user]['rank'] + if rank == 0: + return "you're in the lead!" + else: + return self.db['ranks'][rank-1] + def targetpoints(self, user): + user = str(user).lower() + rank = self.db['users'][user]['rank'] + if rank == 0: + return "N/A" + else: + return self.db['users'][self.db['ranks'][rank-1]]['points'] -state = TriviaState("/home/jrunyon/erebus/modules/trivia.json") #TODO +state = TriviaState("/home/jrunyon/erebus/modules/trivia.json") #TODO get path from config @lib.hookchan(state.db['chan']) def trivia_checkanswer(bot, user, chan, *args): line = ' '.join([str(arg) for arg in args]) - bot.msg('dimecadmium', line) if state.checkanswer(line): - bot.msg(chan, "\00308%s\003 has it! The answer was \00308%s\003. Current points: %d. Rank: %d. Target: %s (%d)." % (user, line, state.addpoint(user), state.rank(user), state.targetuser(user), state.targetpoints(user))) + bot.msg(chan, "\00308%s\003 has it! The answer was \00308%s\003. Current points: %d. Rank: %d. Target: %s (%s)." % (user, line, state.addpoint(user), state.rank(user), state.targetuser(user), state.targetpoints(user))) state.nextquestion() @lib.hook('points') def cmd_points(bot, user, chan, realtarget, *args): - if chan is not None: replyto = chan + if chan == realtarget: replyto = chan else: replyto = user if len(args) != 0: who = args[0] @@ -104,18 +138,55 @@ def cmd_points(bot, user, chan, realtarget, *args): @lib.hook('give', clevel=lib.OP) @lib.argsGE(1) def cmd_give(bot, user, chan, realtarget, *args): - if len(args) > 1 and args[1] != 1: - bot.msg(user, "Giving more than one point is not yet implemented.") - return NotImplemented - whoto = args[0] - balance = state.addpoint(whoto) - bot.msg(chan, "%s gave %s %d points. New balance: %d" % (user, whoto, 1, balance)) + if len(args) > 1: + numpoints = int(args[1]) + else: + numpoints = 1 + balance = state.addpoint(whoto, numpoints) + bot.msg(chan, "%s gave %s %d points. New balance: %d" % (user, whoto, numpoints, balance)) + +@lib.hook('setnext', clevel=lib.OP) +@lib.argsGE(1) +def cmd_setnext(bot, user, chan, realtarget, *args): + line = ' '.join([str(arg) for arg in args]) + linepieces = line.split('*') + question = linepieces[0].strip() + answer = linepieces[1].strip() + state.nextq = {'question':question,'answer':answer} + bot.msg(user, "Done.") + +@lib.hook('skip', clevel=lib.KNOWN) +def cmd_skip(bot, user, chan, realtarget, *args): + state.nextquestion() + +@lib.hook('start') +def cmd_start(bot, user, chan, realtarget, *args): + if chan == realtarget: replyto = chan + else: replyto = user + + if state.curq is None: + state.nextquestion() + else: + bot.msg(replyto, "Game is already started!") + +@lib.hook('stop', clevel=lib.KNOWN) +def cmd_stop(bot, user, chan, realtarget, *args): + if chan == realtarget: replyto = chan + else: replyto = user + + if state.curq is not None: + state.curq = None + bot.msg(chan, "Game ended by %s" % (user)) + else: + bot.msg(replyto, "Game isn't running.") @lib.hook('rank') -@lib.argsEQ(1) def cmd_rank(bot, user, chan, realtarget, *args): - if chan is not None: replyto = chan + if chan == realtarget: replyto = chan else: replyto = user - bot.msg(replyto, "%s is in %d place." % (args[0], state.rank(args[0]))) + if len(args) != 0: who = args[0] + else: who = user + + bot.msg(replyto, "%s is in %d place." % (who, state.rank(who)))