X-Git-Url: http://gitweb.pimeys.fr/?p=bots%2Fhung.git;a=blobdiff_plain;f=hung.py;h=2c3e7086dbb9955b8b5e970cf8e30a1a5b736911;hp=dbeff29e5c60d0736ed6209c62eeaedfd195907d;hb=HEAD;hpb=8429f696faa48f834b5583d3b80bc11809716423

diff --git a/hung.py b/hung.py
index dbeff29..2c3e708 100755
--- a/hung.py
+++ b/hung.py
@@ -32,7 +32,7 @@ def get_config_logfile(serveur):
 
 def log(serveur,channel,auteur=None,message=None):
     f=open(get_config_logfile(serveur),"a")
-    if auteur==message==None:
+    if auteur == message == None:
         # alors c'est que c'est pas un channel mais juste une ligne de log
         chain="%s %s"%(time.strftime("%F %T"),channel)
     else:
@@ -42,6 +42,17 @@ def log(serveur,channel,auteur=None,message=None):
         print chain
     f.close()
 
+def ignore_event(serv, ev):
+    """Retourne ``True`` si il faut ignorer cet évènement."""
+    for (blackmask, exceptmask) in config.blacklisted_masks:
+        usermask = ev.source()
+        if exceptmask is None:
+            exceptit = False
+        else:
+            exceptit = bool(irclib.mask_matches(usermask, exceptmask))
+        blackit = bool(irclib.mask_matches(usermask, blackmask))
+        if blackit and not exceptit:
+            return True
 
 class UnicodeBotError(Exception):
     pass
@@ -75,7 +86,7 @@ def is_mot(mot,liste):
     real_word = "".join([lettre[0] for lettre in liste])
     real_word = real_word.decode("utf8").lower()
     mot=remplace_accents(mot.decode("utf8"))
-    return mot==real_word
+    return mot.startswith(real_word)
 
 class Hung(ircbot.SingleServerIRCBot):
     def __init__(self,serveur,debug=False):
@@ -124,6 +135,8 @@ class Hung(ircbot.SingleServerIRCBot):
             return (False,message)
 
     def on_privmsg(self, serv, ev):
+        if ignore_event(serv, ev):
+            return
         message=ev.arguments()[0]
         auteur = irclib.nm_to_n(ev.source())
         try:
@@ -339,6 +352,8 @@ class Hung(ircbot.SingleServerIRCBot):
         self.affiche_mot(serv, canal, begin="Devinez")
 
     def on_pubmsg(self, serv, ev):
+        if ignore_event(serv, ev):
+            return
         auteur = irclib.nm_to_n(ev.source())
         canal = ev.target()
         message = ev.arguments()[0]
@@ -433,7 +448,7 @@ class Hung(ircbot.SingleServerIRCBot):
                         # On perd une chance
                         self.lives[canal] -= 1
                         if self.lives[canal] > 0:
-                            serv.privmsg(canal, "Pas de %s. Plus que %s chances…" % (giv_let, self.lives[canal]))
+                            serv.privmsg(canal, "Pas de %s. Plus que %s chance%s…" % (giv_let, self.lives[canal], "s" * (self.lives[canal] > 1)))
                         if self.lives[canal] == 0:
                             serv.privmsg(canal, "Pas de %s." % (giv_let))
                             self.perd(serv, canal)
@@ -447,6 +462,8 @@ class Hung(ircbot.SingleServerIRCBot):
 
 
     def on_action(self, serv, ev):
+        if ignore_event(serv, ev):
+            return
         action = ev.arguments()[0]
         auteur = irclib.nm_to_n(ev.source())
         channel = ev.target()
@@ -512,9 +529,9 @@ class Hung(ircbot.SingleServerIRCBot):
     def gagne(self, serv, canal, bonus=None, bonusvalue=2):
         serv.privmsg(canal,"Bravo !")
         realword = self.reveal_word(serv, canal)
-        nlettre=float(len(realword.replace("'","").replace("-","")))
+        nlettre=float(len([l for l in realword if not l in config.non_guess_chars]))
         contribs=["%s:%s%%%s"%(pseudo,str(int(100*contrib/nlettre)),("+bonus(%s)"%(bonusvalue))*(bonus==pseudo)) for pseudo,contrib in self.play_status[canal][2].items()]
-        contribs_score={pseudo:int(10*contrib/nlettre) for pseudo,contrib in self.play_status[canal][2].items()}
+        contribs_score={pseudo:int(10.0*contrib/nlettre)+(bonusvalue*(bonus==pseudo)) for pseudo,contrib in self.play_status[canal][2].items()}
         self.add_score(contribs_score)
         serv.privmsg(canal,"Contributions : %s"%("  ".join(contribs)) )
         self.play_status[canal]=[None,None,None]