From: Hung IRC Bot Date: Fri, 18 May 2012 21:28:06 +0000 (+0200) Subject: Merge branch 'master' of /git/Hung X-Git-Url: http://gitweb.pimeys.fr/?p=bots%2Fhung.git;a=commitdiff_plain;h=35bf3770d2774d62f9454b07b6df4e793ae6c133;hp=-c Merge branch 'master' of /git/Hung --- 35bf3770d2774d62f9454b07b6df4e793ae6c133 diff --combined hung.py index 0ad4a37,5c7a672..9582bc0 --- a/hung.py +++ b/hung.py @@@ -31,7 -31,7 +31,7 @@@ config_logfile_template="hung.%s.log def get_config_logfile(serveur): serveurs={"acoeur.crans.org":"acoeur","irc.crans.org":"crans"} return config_logfile_template%(serveurs[serveur]) -config_overops=["[20-100]","[20-100]_"] +config_overops=["[20-100]","[20-100]_","Petite-Peste","PEB"] config_ops=[] config_report_bugs_to=["[20-100]"] @@@ -281,7 -281,7 +281,7 @@@ class Hung(ircbot.SingleServerIRCBot) indice = random.randrange(0,len(mots)) mot,definition=mots[indice],defs[indice] # ' et - sont considérés comme déjà devinés - mot = [(lettre,lettre in "'-") for lettre in list(mot)] + mot = [(lettre,lettre in "'-()") for lettre in list(mot)] self.play_status[canal]=[mot,definition,{}] self.affiche_mot(serv, canal, begin="Devinez") @@@ -338,8 -338,8 +338,8 @@@ liste=self.play_status[canal][0] listeapres=[(lettre[0],lettre[1] or lettre[0]==giv_let) for lettre in liste] if liste!=listeapres: - nbtrouvees=(sum([lettre[1] for lettre in listeapres if not lettre[0] in "'-"]) - - sum([lettre[1] for lettre in liste if not lettre[0] in "'-"])) + nbtrouvees=(sum([lettre[1] for lettre in listeapres if not lettre[0] in "'-()"]) + - sum([lettre[1] for lettre in liste if not lettre[0] in "'-()"])) if self.play_status[canal][2].has_key(auteur): self.play_status[canal][2][auteur]+= nbtrouvees else: