01:31:39 Elo | c'est pas abidjan bordel

[bots/salesman.git] / salesman.py

diff --git a/salesman.py b/salesman.py
index 342b93f01c1975a151fcd2287e8d33156fae9d41..08971517172d26d84381f8baa68c6123e31ed90b 100755 (executable)
--- a/salesman.py
+++ b/salesman.py
@@ -168,8 +168,6 @@ class Salesman(ircbot.SingleServerIRCBot):
         # 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]
-        # on peut jouer capitale -> pays ou pays -> capitale
-        enigme,answer=random.choice([[capitale,pays],[pays,capitale]])
         # on incrémente la choisie
         played[id_choisi]+=1
         # on enregistre le played_file
@@ -580,7 +578,7 @@ class Salesman(ircbot.SingleServerIRCBot):
         return self.serv.get_nickname()
     nick = property(_getnick)
     
-    def update_activity(self,canal,pseudo,message,force=False):
+    def update_activity(self,canal="",pseudo="",message="",force=False):
         if force or (not pseudo in config.idle_bots and all([not re.match(ignore, message) for ignore in config.idle_messages])):
             self.last_activity[canal]=time.time()
     def is_active(self,canal):