Bienvenue à Flo

[bots/salesman.git] / salesman.py

diff --git a/salesman.py b/salesman.py
index 9717cbff960989d8b3ca36015d6b6239d4ad7144..64dcd002a23926d81e8a9c280c202310109a173c 100755 (executable)
--- a/salesman.py
+++ b/salesman.py
@@ -61,7 +61,8 @@ def ignore_event(serv, ev):
         else:
             exceptit = bool(irclib.mask_matches(usermask, exceptmask))
         blackit = bool(irclib.mask_matches(usermask, blackmask))
-        return blackit and not exceptit
+        if blackit and not exceptit:
+            return True
 
 def reussi(message,answer,auteur):
     if auteur in config.level3:
@@ -177,7 +178,7 @@ class Salesman(ircbot.SingleServerIRCBot):
         mini=min(played.values())
         # on choisit un id dans ceux qui ont ce nombre d'occurences
         id_choisi=random.choice([k for k,v in played.items() if v==mini])
-        capitale,pays=dec[id_choisi]
+        enigme,answer=dec[id_choisi]
         # on incrémente la choisie
         played[id_choisi]+=1
         # on enregistre le played_file